diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies
index b5df01a..7cae3fb 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":"connectivity_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/connectivity_plus-5.0.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_core","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_core-2.32.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_messaging","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_messaging-14.9.4/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"geocoding_ios","path":"/home/vjrj/.pub-cache/hosted/pub.dev/geocoding_ios-2.3.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"in_app_review","path":"/home/vjrj/.pub-cache/hosted/pub.dev/in_app_review-2.0.11/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"location","path":"/home/vjrj/.pub-cache/hosted/pub.dev/location-5.0.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/package_info_plus-6.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/home/vjrj/.pub-cache/hosted/pub.dev/path_provider_foundation-2.6.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"sentry_flutter","path":"/home/vjrj/.pub-cache/hosted/pub.dev/sentry_flutter-7.20.2/","native_build":true,"dependencies":["package_info_plus"],"dev_dependency":false},{"name":"share_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/share_plus-7.2.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"/home/vjrj/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.6/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_ios","path":"/home/vjrj/.pub-cache/hosted/pub.dev/url_launcher_ios-6.4.1/","native_build":true,"dependencies":[],"dev_dependency":false}],"android":[{"name":"connectivity_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/connectivity_plus-5.0.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_core","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_core-2.32.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_messaging","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_messaging-14.9.4/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"geocoding_android","path":"/home/vjrj/.pub-cache/hosted/pub.dev/geocoding_android-3.3.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"in_app_review","path":"/home/vjrj/.pub-cache/hosted/pub.dev/in_app_review-2.0.11/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"location","path":"/home/vjrj/.pub-cache/hosted/pub.dev/location-5.0.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/package_info_plus-6.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_android","path":"/home/vjrj/.pub-cache/hosted/pub.dev/path_provider_android-2.2.22/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"sentry_flutter","path":"/home/vjrj/.pub-cache/hosted/pub.dev/sentry_flutter-7.20.2/","native_build":true,"dependencies":["package_info_plus"],"dev_dependency":false},{"name":"share_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/share_plus-7.2.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_android","path":"/home/vjrj/.pub-cache/hosted/pub.dev/shared_preferences_android-2.4.21/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_android","path":"/home/vjrj/.pub-cache/hosted/pub.dev/url_launcher_android-6.3.28/","native_build":true,"dependencies":[],"dev_dependency":false}],"macos":[{"name":"connectivity_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/connectivity_plus-5.0.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_core","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_core-2.32.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_messaging","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_messaging-14.9.4/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"in_app_review","path":"/home/vjrj/.pub-cache/hosted/pub.dev/in_app_review-2.0.11/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"location","path":"/home/vjrj/.pub-cache/hosted/pub.dev/location-5.0.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/package_info_plus-6.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/home/vjrj/.pub-cache/hosted/pub.dev/path_provider_foundation-2.6.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"sentry_flutter","path":"/home/vjrj/.pub-cache/hosted/pub.dev/sentry_flutter-7.20.2/","native_build":true,"dependencies":["package_info_plus"],"dev_dependency":false},{"name":"share_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/share_plus-7.2.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"/home/vjrj/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.6/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_macos","path":"/home/vjrj/.pub-cache/hosted/pub.dev/url_launcher_macos-3.2.5/","native_build":true,"dependencies":[],"dev_dependency":false}],"linux":[{"name":"connectivity_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/connectivity_plus-5.0.2/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/package_info_plus-6.0.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"path_provider_linux","path":"/home/vjrj/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"sentry_flutter","path":"/home/vjrj/.pub-cache/hosted/pub.dev/sentry_flutter-7.20.2/","native_build":true,"dependencies":["package_info_plus"],"dev_dependency":false},{"name":"share_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/share_plus-7.2.2/","native_build":false,"dependencies":["url_launcher_linux"],"dev_dependency":false},{"name":"shared_preferences_linux","path":"/home/vjrj/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/","native_build":false,"dependencies":["path_provider_linux"],"dev_dependency":false},{"name":"url_launcher_linux","path":"/home/vjrj/.pub-cache/hosted/pub.dev/url_launcher_linux-3.2.2/","native_build":true,"dependencies":[],"dev_dependency":false}],"windows":[{"name":"connectivity_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/connectivity_plus-5.0.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_core","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_core-2.32.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/package_info_plus-6.0.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"path_provider_windows","path":"/home/vjrj/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"sentry_flutter","path":"/home/vjrj/.pub-cache/hosted/pub.dev/sentry_flutter-7.20.2/","native_build":true,"dependencies":["package_info_plus"],"dev_dependency":false},{"name":"share_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/share_plus-7.2.2/","native_build":true,"dependencies":["url_launcher_windows"],"dev_dependency":false},{"name":"shared_preferences_windows","path":"/home/vjrj/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1/","native_build":false,"dependencies":["path_provider_windows"],"dev_dependency":false},{"name":"url_launcher_windows","path":"/home/vjrj/.pub-cache/hosted/pub.dev/url_launcher_windows-3.1.5/","native_build":true,"dependencies":[],"dev_dependency":false}],"web":[{"name":"connectivity_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/connectivity_plus-5.0.2/","dependencies":[],"dev_dependency":false},{"name":"firebase_core_web","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_core_web-2.17.5/","dependencies":[],"dev_dependency":false},{"name":"firebase_messaging_web","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_messaging_web-3.8.7/","dependencies":["firebase_core_web"],"dev_dependency":false},{"name":"location_web","path":"/home/vjrj/.pub-cache/hosted/pub.dev/location_web-4.2.0/","dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/package_info_plus-6.0.0/","dependencies":[],"dev_dependency":false},{"name":"sentry_flutter","path":"/home/vjrj/.pub-cache/hosted/pub.dev/sentry_flutter-7.20.2/","dependencies":["package_info_plus"],"dev_dependency":false},{"name":"share_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/share_plus-7.2.2/","dependencies":["url_launcher_web"],"dev_dependency":false},{"name":"shared_preferences_web","path":"/home/vjrj/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.3/","dependencies":[],"dev_dependency":false},{"name":"url_launcher_web","path":"/home/vjrj/.pub-cache/hosted/pub.dev/url_launcher_web-2.4.2/","dependencies":[],"dev_dependency":false}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":[]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"firebase_messaging","dependencies":["firebase_core","firebase_messaging_web"]},{"name":"firebase_messaging_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"geocoding","dependencies":["geocoding_android","geocoding_ios"]},{"name":"geocoding_android","dependencies":[]},{"name":"geocoding_ios","dependencies":[]},{"name":"in_app_review","dependencies":[]},{"name":"location","dependencies":["location_web"]},{"name":"location_web","dependencies":[]},{"name":"package_info_plus","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"sentry_flutter","dependencies":["package_info_plus"]},{"name":"share_plus","dependencies":["url_launcher_web","url_launcher_windows","url_launcher_linux"]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2026-03-11 16:49:22.351156","version":"3.41.2","swift_package_manager_enabled":{"ios":false,"macos":false}}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/connectivity_plus-5.0.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_core","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_core-2.32.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_messaging","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_messaging-14.9.4/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"geocoding_ios","path":"/home/vjrj/.pub-cache/hosted/pub.dev/geocoding_ios-2.3.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"in_app_review","path":"/home/vjrj/.pub-cache/hosted/pub.dev/in_app_review-2.0.11/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"location","path":"/home/vjrj/.pub-cache/hosted/pub.dev/location-5.0.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/package_info_plus-6.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/home/vjrj/.pub-cache/hosted/pub.dev/path_provider_foundation-2.6.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"sentry_flutter","path":"/home/vjrj/.pub-cache/hosted/pub.dev/sentry_flutter-7.20.2/","native_build":true,"dependencies":["package_info_plus"],"dev_dependency":false},{"name":"share_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/share_plus-7.2.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"/home/vjrj/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.6/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_ios","path":"/home/vjrj/.pub-cache/hosted/pub.dev/url_launcher_ios-6.4.1/","native_build":true,"dependencies":[],"dev_dependency":false}],"android":[{"name":"connectivity_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/connectivity_plus-5.0.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_core","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_core-2.32.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_messaging","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_messaging-14.9.4/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"geocoding_android","path":"/home/vjrj/.pub-cache/hosted/pub.dev/geocoding_android-3.3.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"in_app_review","path":"/home/vjrj/.pub-cache/hosted/pub.dev/in_app_review-2.0.11/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"location","path":"/home/vjrj/.pub-cache/hosted/pub.dev/location-5.0.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/package_info_plus-6.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_android","path":"/home/vjrj/.pub-cache/hosted/pub.dev/path_provider_android-2.2.22/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"sentry_flutter","path":"/home/vjrj/.pub-cache/hosted/pub.dev/sentry_flutter-7.20.2/","native_build":true,"dependencies":["package_info_plus"],"dev_dependency":false},{"name":"share_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/share_plus-7.2.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_android","path":"/home/vjrj/.pub-cache/hosted/pub.dev/shared_preferences_android-2.4.21/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_android","path":"/home/vjrj/.pub-cache/hosted/pub.dev/url_launcher_android-6.3.28/","native_build":true,"dependencies":[],"dev_dependency":false}],"macos":[{"name":"connectivity_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/connectivity_plus-5.0.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_core","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_core-2.32.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_messaging","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_messaging-14.9.4/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"in_app_review","path":"/home/vjrj/.pub-cache/hosted/pub.dev/in_app_review-2.0.11/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"location","path":"/home/vjrj/.pub-cache/hosted/pub.dev/location-5.0.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/package_info_plus-6.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/home/vjrj/.pub-cache/hosted/pub.dev/path_provider_foundation-2.6.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"sentry_flutter","path":"/home/vjrj/.pub-cache/hosted/pub.dev/sentry_flutter-7.20.2/","native_build":true,"dependencies":["package_info_plus"],"dev_dependency":false},{"name":"share_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/share_plus-7.2.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"/home/vjrj/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.6/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_macos","path":"/home/vjrj/.pub-cache/hosted/pub.dev/url_launcher_macos-3.2.5/","native_build":true,"dependencies":[],"dev_dependency":false}],"linux":[{"name":"connectivity_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/connectivity_plus-5.0.2/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/package_info_plus-6.0.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"path_provider_linux","path":"/home/vjrj/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"sentry_flutter","path":"/home/vjrj/.pub-cache/hosted/pub.dev/sentry_flutter-7.20.2/","native_build":true,"dependencies":["package_info_plus"],"dev_dependency":false},{"name":"share_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/share_plus-7.2.2/","native_build":false,"dependencies":["url_launcher_linux"],"dev_dependency":false},{"name":"shared_preferences_linux","path":"/home/vjrj/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/","native_build":false,"dependencies":["path_provider_linux"],"dev_dependency":false},{"name":"url_launcher_linux","path":"/home/vjrj/.pub-cache/hosted/pub.dev/url_launcher_linux-3.2.2/","native_build":true,"dependencies":[],"dev_dependency":false}],"windows":[{"name":"connectivity_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/connectivity_plus-5.0.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_core","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_core-2.32.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/package_info_plus-6.0.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"path_provider_windows","path":"/home/vjrj/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"sentry_flutter","path":"/home/vjrj/.pub-cache/hosted/pub.dev/sentry_flutter-7.20.2/","native_build":true,"dependencies":["package_info_plus"],"dev_dependency":false},{"name":"share_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/share_plus-7.2.2/","native_build":true,"dependencies":["url_launcher_windows"],"dev_dependency":false},{"name":"shared_preferences_windows","path":"/home/vjrj/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1/","native_build":false,"dependencies":["path_provider_windows"],"dev_dependency":false},{"name":"url_launcher_windows","path":"/home/vjrj/.pub-cache/hosted/pub.dev/url_launcher_windows-3.1.5/","native_build":true,"dependencies":[],"dev_dependency":false}],"web":[{"name":"connectivity_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/connectivity_plus-5.0.2/","dependencies":[],"dev_dependency":false},{"name":"firebase_core_web","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_core_web-2.17.5/","dependencies":[],"dev_dependency":false},{"name":"firebase_messaging_web","path":"/home/vjrj/.pub-cache/hosted/pub.dev/firebase_messaging_web-3.8.7/","dependencies":["firebase_core_web"],"dev_dependency":false},{"name":"location_web","path":"/home/vjrj/.pub-cache/hosted/pub.dev/location_web-4.2.0/","dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/package_info_plus-6.0.0/","dependencies":[],"dev_dependency":false},{"name":"sentry_flutter","path":"/home/vjrj/.pub-cache/hosted/pub.dev/sentry_flutter-7.20.2/","dependencies":["package_info_plus"],"dev_dependency":false},{"name":"share_plus","path":"/home/vjrj/.pub-cache/hosted/pub.dev/share_plus-7.2.2/","dependencies":["url_launcher_web"],"dev_dependency":false},{"name":"shared_preferences_web","path":"/home/vjrj/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.3/","dependencies":[],"dev_dependency":false},{"name":"url_launcher_web","path":"/home/vjrj/.pub-cache/hosted/pub.dev/url_launcher_web-2.4.2/","dependencies":[],"dev_dependency":false}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":[]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"firebase_messaging","dependencies":["firebase_core","firebase_messaging_web"]},{"name":"firebase_messaging_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"geocoding","dependencies":["geocoding_android","geocoding_ios"]},{"name":"geocoding_android","dependencies":[]},{"name":"geocoding_ios","dependencies":[]},{"name":"in_app_review","dependencies":[]},{"name":"location","dependencies":["location_web"]},{"name":"location_web","dependencies":[]},{"name":"package_info_plus","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"sentry_flutter","dependencies":["package_info_plus"]},{"name":"share_plus","dependencies":["url_launcher_web","url_launcher_windows","url_launcher_linux"]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2026-03-12 08:59:08.583521","version":"3.41.2","swift_package_manager_enabled":{"ios":false,"macos":false}}
\ No newline at end of file
diff --git a/lib/activeFires.dart b/lib/active_fires.dart
similarity index 97%
rename from lib/activeFires.dart
rename to lib/active_fires.dart
index b813a48..b8be979 100644
--- a/lib/activeFires.dart
+++ b/lib/active_fires.dart
@@ -6,15 +6,15 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:redux/redux.dart';
 
 import 'colors.dart';
-import 'firesSpinner.dart';
+import 'fires_spinner.dart';
 import 'generated/i18n.dart';
-import 'genericMap.dart';
-import 'globalFiresBottomStats.dart';
-import 'locationUtils.dart';
-import 'mainDrawer.dart';
-import 'models/appState.dart';
-import 'models/yourLocation.dart';
-import 'placesAutocompleteUtils.dart';
+import 'generic_map.dart';
+import 'global_fires_bottom_stats.dart';
+import 'location_utils.dart';
+import 'main_drawer.dart';
+import 'models/app_state.dart';
+import 'models/your_location.dart';
+import 'places_autocomplete_utils.dart';
 import 'redux/actions.dart';
 import 'widgets/rounded_btn.dart';
 
diff --git a/lib/attributionMapPlugin.dart b/lib/attribution_map_plugin.dart
similarity index 100%
rename from lib/attributionMapPlugin.dart
rename to lib/attribution_map_plugin.dart
diff --git a/lib/compassMapPlugin.dart b/lib/compass_map_plugin.dart
similarity index 100%
rename from lib/compassMapPlugin.dart
rename to lib/compass_map_plugin.dart
diff --git a/lib/customBottomAppBar.dart b/lib/custom_bottom_app_bar.dart
similarity index 100%
rename from lib/customBottomAppBar.dart
rename to lib/custom_bottom_app_bar.dart
diff --git a/lib/customMoment.dart b/lib/custom_moment.dart
similarity index 100%
rename from lib/customMoment.dart
rename to lib/custom_moment.dart
diff --git a/lib/customStepper.dart b/lib/custom_stepper.dart
similarity index 100%
rename from lib/customStepper.dart
rename to lib/custom_stepper.dart
diff --git a/lib/dummyMapPlugin.dart b/lib/dummy_map_plugin.dart
similarity index 100%
rename from lib/dummyMapPlugin.dart
rename to lib/dummy_map_plugin.dart
diff --git a/lib/fileUtils.dart b/lib/file_utils.dart
similarity index 100%
rename from lib/fileUtils.dart
rename to lib/file_utils.dart
diff --git a/lib/fireAlert.dart b/lib/fire_alert.dart
similarity index 96%
rename from lib/fireAlert.dart
rename to lib/fire_alert.dart
index 463f14b..5c3fb2f 100644
--- a/lib/fireAlert.dart
+++ b/lib/fire_alert.dart
@@ -3,11 +3,11 @@ import 'package:flutter/material.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import 'customStepper.dart';
+import 'custom_stepper.dart';
 import 'generated/i18n.dart';
-import 'mainDrawer.dart';
-import 'models/yourLocation.dart';
-import 'placesAutocompleteUtils.dart';
+import 'main_drawer.dart';
+import 'models/your_location.dart';
+import 'places_autocomplete_utils.dart';
 
 class FireAlert extends StatefulWidget {
   const FireAlert({super.key});
diff --git a/lib/fireMarkType.dart b/lib/fire_mark_type.dart
similarity index 100%
rename from lib/fireMarkType.dart
rename to lib/fire_mark_type.dart
diff --git a/lib/fireMarker.dart b/lib/fire_marker.dart
similarity index 88%
rename from lib/fireMarker.dart
rename to lib/fire_marker.dart
index 805dfe1..ea2fe45 100644
--- a/lib/fireMarker.dart
+++ b/lib/fire_marker.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
 
-import 'fireMarkType.dart';
-import 'fireMarkerIcon.dart';
+import 'fire_mark_type.dart';
+import 'fire_marker_icon.dart';
 
 /// Create a Marker with custom positioning for fires and other map objects
 Marker fireMarker(
diff --git a/lib/fireMarkerIcon.dart b/lib/fire_marker_icon.dart
similarity index 95%
rename from lib/fireMarkerIcon.dart
rename to lib/fire_marker_icon.dart
index 445209f..1956f9f 100644
--- a/lib/fireMarkerIcon.dart
+++ b/lib/fire_marker_icon.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 import 'colors.dart';
-import 'fireMarkType.dart';
+import 'fire_mark_type.dart';
 
 class FireMarkerIcon extends StatelessWidget {
   const FireMarkerIcon(this.type, {super.key});
diff --git a/lib/fireNotificationList.dart b/lib/fire_notification_list.dart
similarity index 97%
rename from lib/fireNotificationList.dart
rename to lib/fire_notification_list.dart
index 3ac57a6..9cc63a9 100644
--- a/lib/fireNotificationList.dart
+++ b/lib/fire_notification_list.dart
@@ -4,14 +4,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:redux/redux.dart';
 
-import 'customMoment.dart';
-import 'firesSpinner.dart';
+import 'custom_moment.dart';
+import 'fires_spinner.dart';
 import 'generated/i18n.dart';
-import 'genericMap.dart';
-import 'mainDrawer.dart';
-import 'models/appState.dart';
-import 'models/fireNotification.dart';
-import 'models/yourLocation.dart';
+import 'generic_map.dart';
+import 'main_drawer.dart';
+import 'models/app_state.dart';
+import 'models/fire_notification.dart';
+import 'models/your_location.dart';
 import 'redux/actions.dart';
 
 @immutable
diff --git a/lib/firesApp.dart b/lib/fires_app.dart
similarity index 88%
rename from lib/firesApp.dart
rename to lib/fires_app.dart
index 842a718..2b9d1e8 100644
--- a/lib/firesApp.dart
+++ b/lib/fires_app.dart
@@ -3,20 +3,20 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:redux/redux.dart';
 
-import 'activeFires.dart';
-import 'fireAlert.dart';
-import 'fireNotificationList.dart';
+import 'active_fires.dart';
+import 'fire_alert.dart';
+import 'fire_notification_list.dart';
 import 'generated/i18n.dart';
 import 'globals.dart';
-import 'homePage.dart';
-import 'introPage.dart';
-import 'models/appState.dart';
-import 'monitoredAreas.dart';
-import 'privacyPage.dart';
+import 'home_page.dart';
+import 'intro_page.dart';
+import 'models/app_state.dart';
+import 'monitored_areas.dart';
+import 'privacy_page.dart';
 import 'sandbox.dart';
-import 'supportPage.dart';
+import 'support_page.dart';
 import 'theme.dart';
-import 'themeDev.dart';
+import 'theme_dev.dart';
 import 'widgets/material_app_with_intro.dart';
 
 class FiresApp extends StatefulWidget {
@@ -59,7 +59,7 @@ class _FiresAppState extends State<FiresApp> {
 
   @override
   Widget build(BuildContext context) {
-    final StatefulWidget home = const MaterialAppWithIntroHome(
+    const StatefulWidget home = MaterialAppWithIntroHome(
         introWidget, continueWidget, 'showInitialWizard-2018-06-27-01');
     return StoreProvider<AppState>(
         store: store,
diff --git a/lib/firesSpinner.dart b/lib/fires_spinner.dart
similarity index 100%
rename from lib/firesSpinner.dart
rename to lib/fires_spinner.dart
diff --git a/lib/genericMap.dart b/lib/generic_map.dart
similarity index 97%
rename from lib/genericMap.dart
rename to lib/generic_map.dart
index 3114916..cfa5fa6 100644
--- a/lib/genericMap.dart
+++ b/lib/generic_map.dart
@@ -7,26 +7,26 @@ import 'package:latlong2/latlong.dart';
 import 'package:redux/src/store.dart';
 import 'package:share_plus/share_plus.dart';
 
-import 'attributionMapPlugin.dart';
+import 'attribution_map_plugin.dart';
 import 'colors.dart';
-import 'compassMapPlugin.dart';
-import 'customMoment.dart';
-import 'dummyMapPlugin.dart';
-import 'fireMarkType.dart';
-import 'fireMarker.dart';
+import 'compass_map_plugin.dart';
+import 'custom_moment.dart';
+import 'dummy_map_plugin.dart';
+import 'fire_mark_type.dart';
+import 'fire_marker.dart';
 import 'generated/i18n.dart';
-import 'genericMapBottom.dart';
+import 'generic_map_bottom.dart';
 import 'globals.dart' as globals;
-import 'layerSelectorMapPlugin.dart';
-import 'locationUtils.dart';
-import 'models/appState.dart';
-import 'models/falsePositiveTypes.dart';
-import 'models/fireNotification.dart';
-import 'models/yourLocation.dart';
+import 'layer_selector_map_plugin.dart';
+import 'location_utils.dart';
+import 'models/app_state.dart';
+import 'models/false_positive_types.dart';
+import 'models/fire_notification.dart';
+import 'models/your_location.dart';
 import 'redux/actions.dart';
-import 'sentryReport.dart';
+import 'sentry_report.dart';
 import 'slider.dart';
-import 'zoomMapPlugin.dart';
+import 'zoom_map_plugin.dart';
 
 @immutable
 class _ViewModel {
diff --git a/lib/genericMapBottom.dart b/lib/generic_map_bottom.dart
similarity index 95%
rename from lib/genericMapBottom.dart
rename to lib/generic_map_bottom.dart
index f1c9581..adcbc94 100644
--- a/lib/genericMapBottom.dart
+++ b/lib/generic_map_bottom.dart
@@ -3,14 +3,14 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 
 import 'colors.dart';
-import 'customBottomAppBar.dart';
-import 'customMoment.dart';
+import 'custom_bottom_app_bar.dart';
+import 'custom_moment.dart';
 import 'generated/i18n.dart';
-import 'models/appState.dart';
-import 'models/falsePositiveTypes.dart';
-import 'models/fireMapState.dart';
-import 'models/fireNotification.dart';
-import 'models/yourLocation.dart';
+import 'models/app_state.dart';
+import 'models/false_positive_types.dart';
+import 'models/fire_map_state.dart';
+import 'models/fire_notification.dart';
+import 'models/your_location.dart';
 import 'utils/widget_utils.dart';
 
 typedef OnSave = void Function();
diff --git a/lib/globalFiresBottomStats.dart b/lib/global_fires_bottom_stats.dart
similarity index 97%
rename from lib/globalFiresBottomStats.dart
rename to lib/global_fires_bottom_stats.dart
index 8c3528f..2e49713 100644
--- a/lib/globalFiresBottomStats.dart
+++ b/lib/global_fires_bottom_stats.dart
@@ -5,8 +5,8 @@ import 'package:get_it/get_it.dart';
 import 'package:http/http.dart' as http;
 
 import 'colors.dart';
-import 'customBottomAppBar.dart';
-import 'customMoment.dart';
+import 'custom_bottom_app_bar.dart';
+import 'custom_moment.dart';
 import 'generated/i18n.dart';
 
 class GlobalFiresBottomStats extends StatefulWidget {
diff --git a/lib/homePage.dart b/lib/home_page.dart
similarity index 97%
rename from lib/homePage.dart
rename to lib/home_page.dart
index 2d2e775..ff115af 100644
--- a/lib/homePage.dart
+++ b/lib/home_page.dart
@@ -6,16 +6,16 @@ import 'package:flutter_redux/flutter_redux.dart';
 import 'package:get_it/get_it.dart';
 import 'package:redux/redux.dart';
 
-import 'activeFires.dart';
+import 'active_fires.dart';
 import 'colors.dart';
-import 'fireAlert.dart';
-import 'fireNotificationList.dart';
-import 'firesSpinner.dart';
+import 'fire_alert.dart';
+import 'fire_notification_list.dart';
+import 'fires_spinner.dart';
 import 'generated/i18n.dart';
-import 'mainDrawer.dart';
-import 'models/appState.dart';
-import 'models/fireNotification.dart';
-import 'objectIdUtils.dart';
+import 'main_drawer.dart';
+import 'models/app_state.dart';
+import 'models/fire_notification.dart';
+import 'object_id_utils.dart';
 import 'redux/actions.dart';
 
 @immutable
diff --git a/lib/introPage.dart b/lib/intro_page.dart
similarity index 97%
rename from lib/introPage.dart
rename to lib/intro_page.dart
index 725d0df..07b39cb 100644
--- a/lib/introPage.dart
+++ b/lib/intro_page.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 import 'generated/i18n.dart';
-import 'homePage.dart';
+import 'home_page.dart';
 import 'widgets/app_intro_page.dart';
 
 class IntroPage extends AppIntroPage {
diff --git a/lib/layerSelectorMapPlugin.dart b/lib/layer_selector_map_plugin.dart
similarity index 97%
rename from lib/layerSelectorMapPlugin.dart
rename to lib/layer_selector_map_plugin.dart
index 23cd2d1..976f4ee 100644
--- a/lib/layerSelectorMapPlugin.dart
+++ b/lib/layer_selector_map_plugin.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:redux/redux.dart';
 
-import 'models/appState.dart';
-import 'redux/fireMapActions.dart';
+import 'models/app_state.dart';
+import 'redux/fire_map_actions.dart';
 
 /// Layer selector widget for changing map layers
 class LayerSelectorMapPluginWidget extends StatelessWidget {
diff --git a/lib/locationUtils.dart b/lib/location_utils.dart
similarity index 98%
rename from lib/locationUtils.dart
rename to lib/location_utils.dart
index a402706..a00c046 100644
--- a/lib/locationUtils.dart
+++ b/lib/location_utils.dart
@@ -7,7 +7,7 @@ import 'package:location/location.dart';
 import 'package:objectid/objectid.dart';
 
 import 'generated/i18n.dart';
-import 'models/yourLocation.dart';
+import 'models/your_location.dart';
 
 Future<YourLocation> getUserLocation(
     GlobalKey<ScaffoldState> scaffoldKey) async {
diff --git a/lib/mainCommon.dart b/lib/main_common.dart
similarity index 95%
rename from lib/mainCommon.dart
rename to lib/main_common.dart
index 5bbb78c..23800b6 100644
--- a/lib/mainCommon.dart
+++ b/lib/main_common.dart
@@ -6,13 +6,13 @@ import 'package:get_it/get_it.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:redux/redux.dart';
 
-import 'firesApp.dart';
+import 'fires_app.dart';
 import 'globals.dart' as globals;
-import 'models/appState.dart';
-import 'models/firesApi.dart';
-import 'redux/fetchDataMiddleware.dart';
+import 'models/app_state.dart';
+import 'models/fires_api.dart';
+import 'redux/fetch_data_middleware.dart';
 import 'redux/reducers.dart';
-import 'sentryReport.dart';
+import 'sentry_report.dart';
 import 'utils/secret_loader.dart';
 
 Future<PackageInfo> loadPackageInfo() async {
diff --git a/lib/mainDev.dart b/lib/main_dev.dart
similarity index 96%
rename from lib/mainDev.dart
rename to lib/main_dev.dart
index 8fc847d..18b676d 100644
--- a/lib/mainDev.dart
+++ b/lib/main_dev.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:redux/redux.dart';
 
 import 'globals.dart' as globals;
-import 'mainCommon.dart';
+import 'main_common.dart';
 
 enum LogLevel { none, actions, all }
 
diff --git a/lib/mainDrawer.dart b/lib/main_drawer.dart
similarity index 96%
rename from lib/mainDrawer.dart
rename to lib/main_drawer.dart
index 79331a4..78d10c5 100644
--- a/lib/mainDrawer.dart
+++ b/lib/main_drawer.dart
@@ -3,17 +3,17 @@ import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:redux/src/store.dart';
 
-import 'activeFires.dart';
+import 'active_fires.dart';
 import 'colors.dart';
-import 'fireAlert.dart';
-import 'fireNotificationList.dart';
+import 'fire_alert.dart';
+import 'fire_notification_list.dart';
 import 'generated/i18n.dart';
 import 'globals.dart' as globals;
-import 'models/appState.dart';
-import 'monitoredAreas.dart';
-import 'privacyPage.dart';
+import 'models/app_state.dart';
+import 'monitored_areas.dart';
+import 'privacy_page.dart';
 import 'sandbox.dart';
-import 'supportPage.dart';
+import 'support_page.dart';
 
 @immutable
 class _ViewModel {
diff --git a/lib/mainProd.dart b/lib/main_prod.dart
similarity index 92%
rename from lib/mainProd.dart
rename to lib/main_prod.dart
index 2b9c152..4041bbc 100644
--- a/lib/mainProd.dart
+++ b/lib/main_prod.dart
@@ -2,8 +2,8 @@ import 'package:redux/src/store.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 
 import 'globals.dart' as globals;
-import 'mainCommon.dart';
-import 'models/appState.dart';
+import 'main_common.dart';
+import 'models/app_state.dart';
 import 'utils/secret_loader.dart';
 
 Future<void> main() async {
diff --git a/lib/markdownPage.dart b/lib/markdown_page.dart
similarity index 97%
rename from lib/markdownPage.dart
rename to lib/markdown_page.dart
index 68579b3..40037ee 100644
--- a/lib/markdownPage.dart
+++ b/lib/markdown_page.dart
@@ -5,7 +5,7 @@ import 'package:flutter/services.dart' show rootBundle;
 import 'package:flutter_markdown/flutter_markdown.dart';
 
 import 'globals.dart' as globals;
-import 'mainDrawer.dart';
+import 'main_drawer.dart';
 
 abstract class MarkdownPage extends StatefulWidget {
   const MarkdownPage(
diff --git a/lib/models/appState.g.dart b/lib/models/appState.g.dart
deleted file mode 100644
index 88aad69..0000000
--- a/lib/models/appState.g.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'appState.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-AppState _$AppStateFromJson(Map json) => $checkedCreate(
-      'AppState',
-      json,
-      ($checkedConvert) {
-        final val = AppState(
-          yourLocations: $checkedConvert(
-              'yourLocations',
-              (v) =>
-                  (v as List<dynamic>?)
-                      ?.map((e) => YourLocation.fromJson(
-                          Map<String, dynamic>.from(e as Map)))
-                      .toList() ??
-                  const <YourLocation>[]),
-          fireNotifications: $checkedConvert(
-              'fireNotifications',
-              (v) =>
-                  (v as List<dynamic>?)
-                      ?.map((e) => FireNotification.fromJson(
-                          Map<String, dynamic>.from(e as Map)))
-                      .toList() ??
-                  const <FireNotification>[]),
-          isLoading: $checkedConvert('isLoading', (v) => v as bool? ?? false),
-        );
-        return val;
-      },
-    );
-
-Map<String, dynamic> _$AppStateToJson(AppState instance) => <String, dynamic>{
-      'isLoading': instance.isLoading,
-      'yourLocations': instance.yourLocations.map((e) => e.toJson()).toList(),
-      'fireNotifications':
-          instance.fireNotifications.map((e) => e.toJson()).toList(),
-    };
diff --git a/lib/models/appState.dart b/lib/models/app_state.dart
similarity index 97%
rename from lib/models/appState.dart
rename to lib/models/app_state.dart
index 954a05a..c1a1df1 100644
--- a/lib/models/appState.dart
+++ b/lib/models/app_state.dart
@@ -7,14 +7,14 @@ import 'package:latlong2/latlong.dart';
 import 'package:meta/meta.dart';
 
 import '../utils/widget_utils.dart';
-import 'fireMapState.dart';
-import 'fireNotification.dart';
+import 'fire_map_state.dart';
+import 'fire_notification.dart';
 import 'user.dart';
-import 'yourLocation.dart';
+import 'your_location.dart';
 
-export 'fireMapState.dart';
+export 'fire_map_state.dart';
 
-part 'appState.g.dart';
+part 'app_state.g.dart';
 
 @immutable
 @JsonSerializable()
diff --git a/lib/models/basicLocation.dart b/lib/models/basic_location.dart
similarity index 89%
rename from lib/models/basicLocation.dart
rename to lib/models/basic_location.dart
index d3f42a6..ffa2405 100644
--- a/lib/models/basicLocation.dart
+++ b/lib/models/basic_location.dart
@@ -20,8 +20,8 @@ class BasicLocation implements Comparable<BasicLocation> {
   }
 
   @override
-  bool operator ==(Object o) =>
-      o is BasicLocation && o.lat == lat && o.lon == lon;
+  bool operator ==(Object other) =>
+      other is BasicLocation && other.lat == lat && other.lon == lon;
 
   @override
   int get hashCode {
diff --git a/lib/models/falsePositiveTypes.dart b/lib/models/false_positive_types.dart
similarity index 100%
rename from lib/models/falsePositiveTypes.dart
rename to lib/models/false_positive_types.dart
diff --git a/lib/models/fireNotification.g.dart b/lib/models/fireNotification.g.dart
deleted file mode 100644
index 3491be7..0000000
--- a/lib/models/fireNotification.g.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'fireNotification.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-FireNotification _$FireNotificationFromJson(Map json) => $checkedCreate(
-      'FireNotification',
-      json,
-      ($checkedConvert) {
-        final val = FireNotification(
-          id: $checkedConvert('id', (v) => objectIdFromJson(v as String)),
-          lat: $checkedConvert('lat', (v) => (v as num).toDouble()),
-          lon: $checkedConvert('lon', (v) => (v as num).toDouble()),
-          description: $checkedConvert('description', (v) => v as String),
-          when: $checkedConvert('when', (v) => DateTime.parse(v as String)),
-          read: $checkedConvert('read', (v) => v as bool),
-          sealed: $checkedConvert('sealed', (v) => v as String),
-          subsId:
-              $checkedConvert('subsId', (v) => objectIdFromJson(v as String)),
-        );
-        return val;
-      },
-    );
-
-Map<String, dynamic> _$FireNotificationToJson(FireNotification instance) =>
-    <String, dynamic>{
-      'id': objectIdToJson(instance.id),
-      'lat': instance.lat,
-      'lon': instance.lon,
-      'description': instance.description,
-      'when': instance.when.toIso8601String(),
-      'sealed': instance.sealed,
-      'subsId': objectIdToJson(instance.subsId),
-      'read': instance.read,
-    };
diff --git a/lib/models/fireMapState.dart b/lib/models/fire_map_state.dart
similarity index 97%
rename from lib/models/fireMapState.dart
rename to lib/models/fire_map_state.dart
index c9d8ba1..ee42122 100644
--- a/lib/models/fireMapState.dart
+++ b/lib/models/fire_map_state.dart
@@ -1,7 +1,7 @@
 import 'package:meta/meta.dart';
 
-import 'fireNotification.dart';
-import 'yourLocation.dart';
+import 'fire_notification.dart';
+import 'your_location.dart';
 
 enum FireMapStatus {
   view,
diff --git a/lib/models/fireNotification.dart b/lib/models/fire_notification.dart
similarity index 98%
rename from lib/models/fireNotification.dart
rename to lib/models/fire_notification.dart
index 3036397..dbef19b 100644
--- a/lib/models/fireNotification.dart
+++ b/lib/models/fire_notification.dart
@@ -5,7 +5,7 @@ import 'package:objectid/objectid.dart';
 import '../objectIdUtils.dart';
 import '../utils/widget_utils.dart';
 
-part 'fireNotification.g.dart';
+part 'fire_notification.g.dart';
 
 @immutable
 @JsonSerializable()
diff --git a/lib/models/fireNotificationsPersist.dart b/lib/models/fire_notifications_persist.dart
similarity index 97%
rename from lib/models/fireNotificationsPersist.dart
rename to lib/models/fire_notifications_persist.dart
index 28d4549..d3a8b34 100644
--- a/lib/models/fireNotificationsPersist.dart
+++ b/lib/models/fire_notifications_persist.dart
@@ -4,7 +4,7 @@ import 'dart:convert';
 import 'package:shared_preferences/src/shared_preferences_legacy.dart';
 
 import '../globals.dart' as globals;
-import 'fireNotification.dart';
+import 'fire_notification.dart';
 
 const String fireNotificationKey = 'fireNotifications';
 
diff --git a/lib/models/firesApi.dart b/lib/models/fires_api.dart
similarity index 99%
rename from lib/models/firesApi.dart
rename to lib/models/fires_api.dart
index dced0e8..5273065 100644
--- a/lib/models/firesApi.dart
+++ b/lib/models/fires_api.dart
@@ -9,9 +9,9 @@ import 'package:latlong2/latlong.dart';
 import '../globals.dart' as globals;
 import '../objectIdUtils.dart';
 import '../redux/actions.dart';
-import 'appState.dart';
+import 'app_state.dart';
 import 'falsePositiveTypes.dart';
-import 'yourLocation.dart';
+import 'your_location.dart';
 
 class FiresApi {
   FiresApi() {
diff --git a/lib/models/yourLocation.g.dart b/lib/models/yourLocation.g.dart
deleted file mode 100644
index db3acc2..0000000
--- a/lib/models/yourLocation.g.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'yourLocation.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-YourLocation _$YourLocationFromJson(Map json) => $checkedCreate(
-      'YourLocation',
-      json,
-      ($checkedConvert) {
-        final val = YourLocation(
-          id: $checkedConvert('id', (v) => objectIdFromJson(v as String)),
-          lat: $checkedConvert('lat', (v) => (v as num).toDouble()),
-          lon: $checkedConvert('lon', (v) => (v as num).toDouble()),
-          description:
-              $checkedConvert('description', (v) => v as String? ?? ''),
-          distance:
-              $checkedConvert('distance', (v) => (v as num?)?.toInt() ?? 10),
-          currentNumFires:
-              $checkedConvert('currentNumFires', (v) => (v as num?)?.toInt()),
-          subscribed: $checkedConvert('subscribed', (v) => v as bool? ?? false),
-        );
-        return val;
-      },
-    );
-
-Map<String, dynamic> _$YourLocationToJson(YourLocation instance) =>
-    <String, dynamic>{
-      'id': objectIdToJson(instance.id),
-      'lat': instance.lat,
-      'lon': instance.lon,
-      'description': instance.description,
-      'subscribed': instance.subscribed,
-      'distance': instance.distance,
-      'currentNumFires': instance.currentNumFires,
-    };
diff --git a/lib/models/yourLocation.dart b/lib/models/your_location.dart
similarity index 98%
rename from lib/models/yourLocation.dart
rename to lib/models/your_location.dart
index cd7a30e..db393e6 100644
--- a/lib/models/yourLocation.dart
+++ b/lib/models/your_location.dart
@@ -4,7 +4,7 @@ import 'package:objectid/objectid.dart';
 
 import '../objectIdUtils.dart';
 
-part 'yourLocation.g.dart';
+part 'your_location.g.dart';
 
 @immutable
 @JsonSerializable()
diff --git a/lib/models/yourLocationPersist.dart b/lib/models/your_location_persist.dart
similarity index 97%
rename from lib/models/yourLocationPersist.dart
rename to lib/models/your_location_persist.dart
index 2ae6bba..8d92c85 100644
--- a/lib/models/yourLocationPersist.dart
+++ b/lib/models/your_location_persist.dart
@@ -4,7 +4,7 @@ import 'dart:convert';
 import 'package:shared_preferences/src/shared_preferences_legacy.dart';
 
 import '../globals.dart' as globals;
-import 'yourLocation.dart';
+import 'your_location.dart';
 
 const String locationKey = 'yourlocations';
 
diff --git a/lib/monitoredAreas.dart b/lib/monitored_areas.dart
similarity index 96%
rename from lib/monitoredAreas.dart
rename to lib/monitored_areas.dart
index 6c5a2fb..6b0ef4d 100644
--- a/lib/monitoredAreas.dart
+++ b/lib/monitored_areas.dart
@@ -5,11 +5,11 @@ import 'package:latlong2/latlong.dart';
 import 'package:redux/src/store.dart';
 
 import 'colors.dart';
-import 'compassMapPlugin.dart';
-import 'customBottomAppBar.dart';
+import 'compass_map_plugin.dart';
+import 'custom_bottom_app_bar.dart';
 import 'generated/i18n.dart';
-import 'mainDrawer.dart';
-import 'models/appState.dart';
+import 'main_drawer.dart';
+import 'models/app_state.dart';
 
 @immutable
 class _ViewModel {
diff --git a/lib/objectIdUtils.dart b/lib/object_id_utils.dart
similarity index 100%
rename from lib/objectIdUtils.dart
rename to lib/object_id_utils.dart
diff --git a/lib/placesAutocompleteUtils.dart b/lib/places_autocomplete_utils.dart
similarity index 99%
rename from lib/placesAutocompleteUtils.dart
rename to lib/places_autocomplete_utils.dart
index 38481ec..7f52c16 100644
--- a/lib/placesAutocompleteUtils.dart
+++ b/lib/places_autocomplete_utils.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:geocoding/geocoding.dart';
 import 'package:objectid/objectid.dart';
 
-import 'models/yourLocation.dart';
+import 'models/your_location.dart';
 
 /// Open a places dialog for selecting a location using geocoding.
 /// Allows users to search for places by name and get coordinates.
diff --git a/lib/privacyPage.dart b/lib/privacy_page.dart
similarity index 90%
rename from lib/privacyPage.dart
rename to lib/privacy_page.dart
index a7daf41..f46b7a1 100644
--- a/lib/privacyPage.dart
+++ b/lib/privacy_page.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
-import 'fileUtils.dart';
+import 'file_utils.dart';
 import 'generated/i18n.dart';
-import 'markdownPage.dart';
+import 'markdown_page.dart';
 
 class PrivacyPage extends MarkdownPage {
 
diff --git a/lib/redux/actions.dart b/lib/redux/actions.dart
index bbecfa4..b30a192 100644
--- a/lib/redux/actions.dart
+++ b/lib/redux/actions.dart
@@ -1,4 +1,4 @@
-export 'appActions.dart';
-export 'fireMapActions.dart';
-export 'fireNotificationActions.dart';
-export 'yourLocationActions.dart';
+export 'app_actions.dart';
+export 'fire_map_actions.dart';
+export 'fire_notification_actions.dart';
+export 'your_location_actions.dart';
diff --git a/lib/redux/appActions.dart b/lib/redux/app_actions.dart
similarity index 100%
rename from lib/redux/appActions.dart
rename to lib/redux/app_actions.dart
diff --git a/lib/redux/appReducer.dart b/lib/redux/app_reducer.dart
similarity index 100%
rename from lib/redux/appReducer.dart
rename to lib/redux/app_reducer.dart
diff --git a/lib/redux/errorReducer.dart b/lib/redux/error_reducer.dart
similarity index 100%
rename from lib/redux/errorReducer.dart
rename to lib/redux/error_reducer.dart
diff --git a/lib/redux/fetchDataMiddleware.dart b/lib/redux/fetch_data_middleware.dart
similarity index 100%
rename from lib/redux/fetchDataMiddleware.dart
rename to lib/redux/fetch_data_middleware.dart
diff --git a/lib/redux/fireMapActions.dart b/lib/redux/fire_map_actions.dart
similarity index 100%
rename from lib/redux/fireMapActions.dart
rename to lib/redux/fire_map_actions.dart
diff --git a/lib/redux/fireMapReducer.dart b/lib/redux/fire_map_reducer.dart
similarity index 100%
rename from lib/redux/fireMapReducer.dart
rename to lib/redux/fire_map_reducer.dart
diff --git a/lib/redux/fireNotificationActions.dart b/lib/redux/fire_notification_actions.dart
similarity index 100%
rename from lib/redux/fireNotificationActions.dart
rename to lib/redux/fire_notification_actions.dart
diff --git a/lib/redux/fireNotificationReducer.dart b/lib/redux/fire_notification_reducer.dart
similarity index 100%
rename from lib/redux/fireNotificationReducer.dart
rename to lib/redux/fire_notification_reducer.dart
diff --git a/lib/redux/loadedReducer.dart b/lib/redux/loaded_reducer.dart
similarity index 100%
rename from lib/redux/loadedReducer.dart
rename to lib/redux/loaded_reducer.dart
diff --git a/lib/redux/loadingReducer.dart b/lib/redux/loading_reducer.dart
similarity index 100%
rename from lib/redux/loadingReducer.dart
rename to lib/redux/loading_reducer.dart
diff --git a/lib/redux/userReducer.dart b/lib/redux/user_reducer.dart
similarity index 100%
rename from lib/redux/userReducer.dart
rename to lib/redux/user_reducer.dart
diff --git a/lib/redux/yourLocationActions.dart b/lib/redux/your_location_actions.dart
similarity index 100%
rename from lib/redux/yourLocationActions.dart
rename to lib/redux/your_location_actions.dart
diff --git a/lib/redux/yourLocationsReducer.dart b/lib/redux/your_locations_reducer.dart
similarity index 100%
rename from lib/redux/yourLocationsReducer.dart
rename to lib/redux/your_locations_reducer.dart
diff --git a/lib/sentryReport.dart b/lib/sentry_report.dart
similarity index 100%
rename from lib/sentryReport.dart
rename to lib/sentry_report.dart
diff --git a/lib/supportPage.dart b/lib/support_page.dart
similarity index 99%
rename from lib/supportPage.dart
rename to lib/support_page.dart
index 8d7f935..e96333c 100644
--- a/lib/supportPage.dart
+++ b/lib/support_page.dart
@@ -4,7 +4,7 @@ import 'package:share_plus/share_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'generated/i18n.dart';
-import 'mainDrawer.dart';
+import 'main_drawer.dart';
 
 class SupportPage extends StatefulWidget {
   const SupportPage({super.key});
diff --git a/lib/themeDev.dart b/lib/theme_dev.dart
similarity index 100%
rename from lib/themeDev.dart
rename to lib/theme_dev.dart
diff --git a/lib/widgets/app_intro_page.dart b/lib/widgets/app_intro_page.dart
index 1af461c..dd10abd 100644
--- a/lib/widgets/app_intro_page.dart
+++ b/lib/widgets/app_intro_page.dart
@@ -13,8 +13,8 @@ class AppIntroItem {
   final String subTitle;
 }
 
-typedef void OnIntroFinish(BuildContext context);
-typedef List<AppIntroItem> ListItems(BuildContext context);
+typedef OnIntroFinish = void Function(BuildContext context);
+typedef ListItems = List<AppIntroItem> Function(BuildContext context);
 
 abstract class AppIntroPage extends StatelessWidget {
   const AppIntroPage(
@@ -43,16 +43,15 @@ class _AppIntroPageSelector extends StatelessWidget {
   final OnIntroFinish onFinish;
 
   void _handleArrowButtonPress(BuildContext context, int delta) {
-    final TabController? controller = DefaultTabController.of(context);
-    if (controller != null && !controller.indexIsChanging)
+    final TabController controller = DefaultTabController.of(context)!;
+    if (!controller.indexIsChanging)
       controller.animateTo(
           (controller.index + delta).clamp(0, items(context).length - 1));
   }
 
   @override
   Widget build(BuildContext context) {
-    final TabController? controller = DefaultTabController.of(context);
-    if (controller == null) return const SizedBox.shrink();
+    final TabController controller = DefaultTabController.of(context)!;
 
     final ThemeData theme = Theme.of(context);
     final Color color = theme.colorScheme.secondary;
@@ -122,6 +121,7 @@ class _AppIntroPageSelector extends StatelessWidget {
           Container(
               margin: const EdgeInsets.only(top: 16.0),
               child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: compactWidgets(<Widget?>[
                     IconButton(
                         icon: const Icon(Icons.chevron_left),
@@ -142,8 +142,7 @@ class _AppIntroPageSelector extends StatelessWidget {
                           }
                         },
                         tooltip: 'Page forward'),
-                  ]),
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween)),
+                  ]))),
         ],
       ),
     );
diff --git a/lib/widgets/material_app_with_intro.dart b/lib/widgets/material_app_with_intro.dart
index 9be60ae..a7db9f2 100644
--- a/lib/widgets/material_app_with_intro.dart
+++ b/lib/widgets/material_app_with_intro.dart
@@ -1,12 +1,19 @@
-import 'package:flutter/material.dart';
-import 'package:meta/meta.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'dart:async';
 
+import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
 @immutable
 abstract class MaterialAppWithIntro extends StatelessWidget {
-  const MaterialAppWithIntro(this.name, this.theme, this.routes,
-      this.introWidget, this.continueWidget, this.prefsKey);
+  const MaterialAppWithIntro(
+    this.name,
+    this.theme,
+    this.routes,
+    this.introWidget,
+    this.continueWidget,
+    this.prefsKey, {
+    super.key,
+  });
 
   final String name;
   final ThemeData theme;
@@ -28,7 +35,11 @@ abstract class MaterialAppWithIntro extends StatelessWidget {
 
 class MaterialAppWithIntroHome extends StatefulWidget {
   const MaterialAppWithIntroHome(
-      this.introWidget, this.continueWidget, this.prefsKey);
+    this.introWidget,
+    this.continueWidget,
+    this.prefsKey, {
+    super.key,
+  });
 
   final WidgetBuilder introWidget;
   final WidgetBuilder continueWidget;
@@ -59,7 +70,7 @@ class _MaterialAppWithIntroState extends State<MaterialAppWithIntroHome> {
   Future<void> checkFirstStart() async {
     final String initialWizardKey = prefsKey;
     final SharedPreferences prefs = await SharedPreferences.getInstance();
-    final bool showInitialWizard = (prefs.getBool(initialWizardKey) ?? true);
+    final bool showInitialWizard = prefs.getBool(initialWizardKey) ?? true;
 
     if (showInitialWizard) {
       await prefs.setBool(initialWizardKey, false);
diff --git a/lib/widgets/rounded_btn.dart b/lib/widgets/rounded_btn.dart
index c664519..91e8a72 100644
--- a/lib/widgets/rounded_btn.dart
+++ b/lib/widgets/rounded_btn.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 /// Used primarily in the active fires page.
 class RoundedBtn extends StatelessWidget {
   const RoundedBtn({
+    super.key,
     required this.icon,
     required this.text,
     required this.onPressed,
@@ -18,10 +19,12 @@ class RoundedBtn extends StatelessWidget {
     required BuildContext context,
     required String route,
     required Color backColor,
+    Key? key,
     TextStyle textStyle = const TextStyle(fontSize: 20.0, color: Colors.white),
     Color fontColor = Colors.white,
   }) {
     return RoundedBtn(
+      key: key,
       icon: icon,
       text: text,
       onPressed: () {
diff --git a/lib/zoomMapPlugin.dart b/lib/zoom_map_plugin.dart
similarity index 100%
rename from lib/zoomMapPlugin.dart
rename to lib/zoom_map_plugin.dart