diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json
index ccff4f6..cfc8abf 100644
--- a/.dart_tool/package_config.json
+++ b/.dart_tool/package_config.json
@@ -243,7 +243,7 @@
},
{
"name": "google_fonts",
- "rootUri": "file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.2",
+ "rootUri": "file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.3",
"packageUri": "lib/",
"languageVersion": "2.12"
},
@@ -255,7 +255,7 @@
},
{
"name": "google_maps_flutter_platform_interface",
- "rootUri": "file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.5",
+ "rootUri": "file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.6",
"packageUri": "lib/",
"languageVersion": "2.12"
},
@@ -279,7 +279,7 @@
},
{
"name": "google_sign_in_ios",
- "rootUri": "file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.2.7",
+ "rootUri": "file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.3.1",
"packageUri": "lib/",
"languageVersion": "2.14"
},
@@ -656,7 +656,7 @@
"languageVersion": "2.16"
}
],
- "generated": "2022-05-19T11:16:41.835067Z",
+ "generated": "2022-05-20T08:15:04.120257Z",
"generator": "pub",
"generatorVersion": "2.16.2"
}
diff --git a/.dart_tool/package_config_subset b/.dart_tool/package_config_subset
index a91d383..295b84f 100644
--- a/.dart_tool/package_config_subset
+++ b/.dart_tool/package_config_subset
@@ -152,16 +152,16 @@ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartl
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_api_headers-1.3.0/lib/
google_fonts
2.12
-file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.2/
-file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.2/lib/
+file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.3/
+file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.3/lib/
google_maps_flutter
2.14
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter-2.1.5/
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter-2.1.5/lib/
google_maps_flutter_platform_interface
2.12
-file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.5/
-file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.5/lib/
+file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.6/
+file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.6/lib/
google_maps_webservice
2.12
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_webservice-0.0.20-nullsafety.5/
@@ -176,8 +176,8 @@ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartl
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_android-5.2.7/lib/
google_sign_in_ios
2.14
-file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.2.7/
-file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.2.7/lib/
+file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.3.1/
+file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.3.1/lib/
google_sign_in_platform_interface
2.12
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_platform_interface-2.1.3/
diff --git a/.flutter-plugins b/.flutter-plugins
index f014fb7..eb35fa9 100644
--- a/.flutter-plugins
+++ b/.flutter-plugins
@@ -15,7 +15,7 @@ google_api_headers=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\
google_maps_flutter=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_maps_flutter-2.1.5\\
google_sign_in=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in-5.3.1\\
google_sign_in_android=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in_android-5.2.7\\
-google_sign_in_ios=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in_ios-5.2.7\\
+google_sign_in_ios=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in_ios-5.3.1\\
google_sign_in_web=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in_web-0.10.1+2\\
location=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\location-4.4.0\\
location_web=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\location_web-3.1.1\\
diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies
index 0b078a8..7b2430d 100644
--- a/.flutter-plugins-dependencies
+++ b/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"geocoding","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geocoding-2.0.4\\\\","dependencies":[]},{"name":"geolocator_apple","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_apple-2.1.3\\\\","dependencies":[]},{"name":"google_maps_flutter","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_maps_flutter-2.1.5\\\\","dependencies":[]},{"name":"google_sign_in_ios","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_ios-5.2.7\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-1.4.2\\\\","dependencies":[]},{"name":"path_provider_ios","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_ios-2.0.9\\\\","dependencies":[]},{"name":"webview_flutter_wkwebview","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter_wkwebview-2.7.5\\\\","dependencies":[]}],"android":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-2.0.6\\\\","dependencies":[]},{"name":"geocoding","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geocoding-2.0.4\\\\","dependencies":[]},{"name":"geolocator_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_android-3.1.8\\\\","dependencies":[]},{"name":"google_api_headers","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_api_headers-1.3.0\\\\","dependencies":["package_info_plus"]},{"name":"google_maps_flutter","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_maps_flutter-2.1.5\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"google_sign_in_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_android-5.2.7\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-1.4.2\\\\","dependencies":[]},{"name":"path_provider_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_android-2.0.14\\\\","dependencies":[]},{"name":"webview_flutter_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter_android-2.8.8\\\\","dependencies":[]}],"macos":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"geolocator_apple","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_apple-2.1.3\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus_macos","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_macos-1.3.0\\\\","dependencies":[]},{"name":"path_provider_macos","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-2.0.6\\\\","dependencies":[]}],"linux":[{"name":"package_info_plus_linux","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_linux-1.0.5\\\\","dependencies":[]},{"name":"path_provider_linux","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-2.1.6\\\\","dependencies":[]}],"windows":[{"name":"geolocator_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_windows-0.1.1\\\\","dependencies":[]},{"name":"package_info_plus_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_windows-1.0.5\\\\","dependencies":[]},{"name":"path_provider_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-2.0.6\\\\","dependencies":[]}],"web":[{"name":"firebase_auth_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth_web-1.3.1\\\\","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core_web-1.6.4\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"geolocator_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_web-2.1.5\\\\","dependencies":[]},{"name":"google_sign_in_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_web-0.10.1+2\\\\","dependencies":[]},{"name":"location_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location_web-3.1.1\\\\","dependencies":[]},{"name":"package_info_plus_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_web-1.0.5\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"firebase_auth","dependencies":["firebase_auth_web","firebase_core"]},{"name":"firebase_auth_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"flutter_native_splash","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"geocoding","dependencies":[]},{"name":"geolocator","dependencies":["geolocator_android","geolocator_apple","geolocator_web","geolocator_windows"]},{"name":"geolocator_android","dependencies":[]},{"name":"geolocator_apple","dependencies":[]},{"name":"geolocator_web","dependencies":[]},{"name":"geolocator_windows","dependencies":[]},{"name":"google_api_headers","dependencies":["package_info_plus"]},{"name":"google_maps_flutter","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"google_sign_in","dependencies":["google_sign_in_android","google_sign_in_ios","google_sign_in_web"]},{"name":"google_sign_in_android","dependencies":[]},{"name":"google_sign_in_ios","dependencies":[]},{"name":"google_sign_in_web","dependencies":[]},{"name":"location","dependencies":["location_web"]},{"name":"location_web","dependencies":[]},{"name":"package_info_plus","dependencies":["package_info_plus_linux","package_info_plus_macos","package_info_plus_windows","package_info_plus_web"]},{"name":"package_info_plus_linux","dependencies":[]},{"name":"package_info_plus_macos","dependencies":[]},{"name":"package_info_plus_web","dependencies":[]},{"name":"package_info_plus_windows","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_ios","path_provider_linux","path_provider_macos","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_ios","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2022-05-19 13:16:41.946103","version":"2.10.5"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"geocoding","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geocoding-2.0.4\\\\","dependencies":[]},{"name":"geolocator_apple","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_apple-2.1.3\\\\","dependencies":[]},{"name":"google_maps_flutter","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_maps_flutter-2.1.5\\\\","dependencies":[]},{"name":"google_sign_in_ios","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_ios-5.3.1\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-1.4.2\\\\","dependencies":[]},{"name":"path_provider_ios","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_ios-2.0.9\\\\","dependencies":[]},{"name":"webview_flutter_wkwebview","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter_wkwebview-2.7.5\\\\","dependencies":[]}],"android":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-2.0.6\\\\","dependencies":[]},{"name":"geocoding","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geocoding-2.0.4\\\\","dependencies":[]},{"name":"geolocator_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_android-3.1.8\\\\","dependencies":[]},{"name":"google_api_headers","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_api_headers-1.3.0\\\\","dependencies":["package_info_plus"]},{"name":"google_maps_flutter","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_maps_flutter-2.1.5\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"google_sign_in_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_android-5.2.7\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-1.4.2\\\\","dependencies":[]},{"name":"path_provider_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_android-2.0.14\\\\","dependencies":[]},{"name":"webview_flutter_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter_android-2.8.8\\\\","dependencies":[]}],"macos":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"geolocator_apple","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_apple-2.1.3\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus_macos","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_macos-1.3.0\\\\","dependencies":[]},{"name":"path_provider_macos","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-2.0.6\\\\","dependencies":[]}],"linux":[{"name":"package_info_plus_linux","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_linux-1.0.5\\\\","dependencies":[]},{"name":"path_provider_linux","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-2.1.6\\\\","dependencies":[]}],"windows":[{"name":"geolocator_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_windows-0.1.1\\\\","dependencies":[]},{"name":"package_info_plus_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_windows-1.0.5\\\\","dependencies":[]},{"name":"path_provider_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-2.0.6\\\\","dependencies":[]}],"web":[{"name":"firebase_auth_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth_web-1.3.1\\\\","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core_web-1.6.4\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"geolocator_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_web-2.1.5\\\\","dependencies":[]},{"name":"google_sign_in_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_web-0.10.1+2\\\\","dependencies":[]},{"name":"location_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location_web-3.1.1\\\\","dependencies":[]},{"name":"package_info_plus_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_web-1.0.5\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"firebase_auth","dependencies":["firebase_auth_web","firebase_core"]},{"name":"firebase_auth_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"flutter_native_splash","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"geocoding","dependencies":[]},{"name":"geolocator","dependencies":["geolocator_android","geolocator_apple","geolocator_web","geolocator_windows"]},{"name":"geolocator_android","dependencies":[]},{"name":"geolocator_apple","dependencies":[]},{"name":"geolocator_web","dependencies":[]},{"name":"geolocator_windows","dependencies":[]},{"name":"google_api_headers","dependencies":["package_info_plus"]},{"name":"google_maps_flutter","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"google_sign_in","dependencies":["google_sign_in_android","google_sign_in_ios","google_sign_in_web"]},{"name":"google_sign_in_android","dependencies":[]},{"name":"google_sign_in_ios","dependencies":[]},{"name":"google_sign_in_web","dependencies":[]},{"name":"location","dependencies":["location_web"]},{"name":"location_web","dependencies":[]},{"name":"package_info_plus","dependencies":["package_info_plus_linux","package_info_plus_macos","package_info_plus_windows","package_info_plus_web"]},{"name":"package_info_plus_linux","dependencies":[]},{"name":"package_info_plus_macos","dependencies":[]},{"name":"package_info_plus_web","dependencies":[]},{"name":"package_info_plus_windows","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_ios","path_provider_linux","path_provider_macos","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_ios","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2022-05-20 10:15:04.263203","version":"2.10.5"}
\ No newline at end of file
diff --git a/.packages b/.packages
index 4c29037..b6cc46c 100644
--- a/.packages
+++ b/.packages
@@ -3,7 +3,7 @@
#
# For more info see: https://dart.dev/go/dot-packages-deprecation
#
-# Generated by pub on 2022-05-19 13:16:41.821064.
+# Generated by pub on 2022-05-20 10:15:04.107254.
archive:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/archive-3.3.0/lib/
args:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/args-2.3.1/lib/
async:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/lib/
@@ -44,13 +44,13 @@ geolocator_web:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/h
geolocator_windows:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/geolocator_windows-0.1.1/lib/
get:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/get-4.6.3/lib/
google_api_headers:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_api_headers-1.3.0/lib/
-google_fonts:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.2/lib/
+google_fonts:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.3/lib/
google_maps_flutter:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter-2.1.5/lib/
-google_maps_flutter_platform_interface:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.5/lib/
+google_maps_flutter_platform_interface:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.6/lib/
google_maps_webservice:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_webservice-0.0.20-nullsafety.5/lib/
google_sign_in:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in-5.3.1/lib/
google_sign_in_android:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_android-5.2.7/lib/
-google_sign_in_ios:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.2.7/lib/
+google_sign_in_ios:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.3.1/lib/
google_sign_in_platform_interface:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_platform_interface-2.1.3/lib/
google_sign_in_web:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_web-0.10.1+2/lib/
http:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.13.4/lib/
diff --git a/lib/HomePage.dart b/lib/HomePage.dart
index d3262df..d6d8b1a 100644
--- a/lib/HomePage.dart
+++ b/lib/HomePage.dart
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
import 'BottomNavPage.dart';
import 'package:flutter_applicationdemo/CreateAccountPage.dart';
import 'globals.dart';
@@ -26,36 +27,25 @@ class _HomePageState extends State<HomePage> {
padding: EdgeInsets.fromLTRB(80, 80, 80, 0),
child: Text(
'Sun Chasers',
- style: TextStyle(
- fontSize: 40,
+ style: GoogleFonts.libreBaskerville(
+ fontSize: 35,
color: globals.TEXTCOLOR,
- shadows: <Shadow>[
- Shadow(
- offset: Offset(2, 2),
- blurRadius: 10.0,
- color: Color.fromARGB(255, 0, 0, 0),
- ),
- ],
),
- ),
+ ),
),
+
const SizedBox(height: 10),
Text(
'The #1 Sunny Spot Finder',
- style: TextStyle(
- fontSize: 25,
- color: globals.TEXTCOLOR,
- shadows: <Shadow>[
- Shadow(
- offset: Offset(2, 2),
- blurRadius: 12.5,
- color: globals.SHADOWCOLOR,
- ),
- ]
+ style: GoogleFonts.libreBaskerville(
+ fontSize: 20,
+ fontWeight: FontWeight. bold,
+ color: globals.TEXTCOLOR,
),
),
+
Container(
padding: EdgeInsets.fromLTRB(80, 40, 80, 80),
child: ElevatedButton(
diff --git a/lib/SettingsPage.dart b/lib/SettingsPage.dart
index 89c11db..ed3a189 100644
--- a/lib/SettingsPage.dart
+++ b/lib/SettingsPage.dart
@@ -240,14 +240,8 @@ class _SettingsPageState extends State<SettingsPage> {
'Manage account',
style: TextStyle(
fontSize: 20,
+ fontWeight: FontWeight. bold,
color: Colors.black,
- shadows: <Shadow>[
- Shadow(
- offset: Offset(2, 2),
- blurRadius: 12.5,
- color: Color.fromARGB(255, 0, 0, 0),
- ),
- ],
),
),
),
@@ -271,14 +265,8 @@ class _SettingsPageState extends State<SettingsPage> {
'Leave feedback',
style: TextStyle(
fontSize: 20,
+ fontWeight: FontWeight. bold,
color: Colors.black,
- shadows: <Shadow>[
- Shadow(
- offset: Offset(2, 2),
- blurRadius: 12.5,
- color: Color.fromARGB(255, 0, 0, 0),
- ),
- ],
),
),
),
@@ -302,14 +290,8 @@ class _SettingsPageState extends State<SettingsPage> {
'Log out',
style: TextStyle(
fontSize: 20,
+ fontWeight: FontWeight. bold,
color: Colors.black,
- shadows: <Shadow>[
- Shadow(
- offset: Offset(2, 2),
- blurRadius: 12.5,
- color: Color.fromARGB(255, 0, 0, 0),
- ),
- ],
),
),
),
diff --git a/pubspec.lock b/pubspec.lock
index 72d4b62..08e3050 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -281,7 +281,7 @@ packages:
name: google_fonts
url: "https://pub.dartlang.org"
source: hosted
- version: "2.3.2"
+ version: "2.3.3"
google_maps_flutter:
dependency: "direct main"
description:
@@ -295,7 +295,7 @@ packages:
name: google_maps_flutter_platform_interface
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.5"
+ version: "2.1.6"
google_maps_webservice:
dependency: transitive
description:
@@ -323,7 +323,7 @@ packages:
name: google_sign_in_ios
url: "https://pub.dartlang.org"
source: hosted
- version: "5.2.7"
+ version: "5.3.1"
google_sign_in_platform_interface:
dependency: transitive
description: