fixed black theme reset

.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\connectivity-0.4.3+4\\\\","dependencies":[]},{"name":"flutter_keyboard_visibility","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility-0.7.0\\\\","dependencies":[]},{"name":"flutter_webview_plugin","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_webview_plugin-0.3.11\\\\","dependencies":[]},{"name":"geolocator","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator-5.0.1\\\\","dependencies":["google_api_availability","location_permissions"]},{"name":"google_api_availability","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\google_api_availability-2.0.1\\\\","dependencies":[]},{"name":"location_permissions","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\location_permissions-2.0.2\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.1.2\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\permission_handler-3.1.0\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.8\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher-5.4.5\\\\","dependencies":[]},{"name":"webview_flutter","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter-0.3.9+1\\\\","dependencies":[]}],"android":[{"name":"connectivity","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\connectivity-0.4.3+4\\\\","dependencies":[]},{"name":"flutter_keyboard_visibility","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility-0.7.0\\\\","dependencies":[]},{"name":"flutter_webview_plugin","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_webview_plugin-0.3.11\\\\","dependencies":[]},{"name":"geolocator","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator-5.0.1\\\\","dependencies":["google_api_availability","location_permissions"]},{"name":"google_api_availability","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\google_api_availability-2.0.1\\\\","dependencies":[]},{"name":"location_permissions","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\location_permissions-2.0.2\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.1.2\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\permission_handler-3.1.0\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.8\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher-5.4.5\\\\","dependencies":[]},{"name":"webview_flutter","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter-0.3.9+1\\\\","dependencies":[]}],"macos":[{"name":"shared_preferences_macos","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_macos-0.0.1+10\\\\","dependencies":[]},{"name":"url_launcher_macos","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher_macos-0.0.1+5\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]},{"name":"shared_preferences_linux","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_linux-0.0.2+1\\\\","dependencies":["path_provider_linux"]}],"windows":[],"web":[{"name":"shared_preferences_web","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_web-0.1.2+7\\\\","dependencies":[]},{"name":"url_launcher_web","path":"C:\\\\Users\\\\magic_sk\\\\AppData\\\\Roaming\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher_web-0.1.1+2\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity","dependencies":[]},{"name":"flutter_keyboard_visibility","dependencies":[]},{"name":"flutter_webview_plugin","dependencies":[]},{"name":"geolocator","dependencies":["google_api_availability","location_permissions"]},{"name":"google_api_availability","dependencies":[]},{"name":"location_permissions","dependencies":[]},{"name":"path_provider","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_macos"]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2020-08-23 21:12:56.561755","version":"1.21.0-10.0.pre.161"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/connectivity-2.0.2/","dependencies":[]},{"name":"flutter_keyboard_visibility","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/flutter_keyboard_visibility-4.0.2/","dependencies":[]},{"name":"flutter_webview_plugin","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/flutter_webview_plugin-0.3.11/","dependencies":[]},{"name":"geolocator","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/geolocator-6.1.13/","dependencies":[]},{"name":"path_provider","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.24/","dependencies":[]},{"name":"permission_handler","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/permission_handler-5.0.1+1/","dependencies":[]},{"name":"shared_preferences","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]},{"name":"url_launcher","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.7.10/","dependencies":[]},{"name":"webview_flutter","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/webview_flutter-1.0.7/","dependencies":[]}],"android":[{"name":"connectivity","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/connectivity-2.0.2/","dependencies":[]},{"name":"flutter_keyboard_visibility","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/flutter_keyboard_visibility-4.0.2/","dependencies":[]},{"name":"flutter_webview_plugin","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/flutter_webview_plugin-0.3.11/","dependencies":[]},{"name":"geolocator","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/geolocator-6.1.13/","dependencies":[]},{"name":"path_provider","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.24/","dependencies":[]},{"name":"permission_handler","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/permission_handler-5.0.1+1/","dependencies":[]},{"name":"shared_preferences","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]},{"name":"url_launcher","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.7.10/","dependencies":[]},{"name":"webview_flutter","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/webview_flutter-1.0.7/","dependencies":[]}],"macos":[{"name":"connectivity_macos","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/connectivity_macos-0.1.0+7/","dependencies":[]},{"name":"path_provider_macos","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+6/","dependencies":[]},{"name":"shared_preferences_macos","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+10/","dependencies":[]},{"name":"url_launcher_macos","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/url_launcher_macos-0.0.1+5/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+4/","dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/url_launcher_linux-0.0.1+4/","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.4+3/","dependencies":[]},{"name":"shared_preferences_windows","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-0.0.1+3/","dependencies":["path_provider_windows"]},{"name":"url_launcher_windows","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/url_launcher_windows-0.0.1+3/","dependencies":[]}],"web":[{"name":"connectivity_for_web","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/connectivity_for_web-0.3.1+4/","dependencies":[]},{"name":"flutter_keyboard_visibility_web","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/flutter_keyboard_visibility_web-1.0.1/","dependencies":[]},{"name":"shared_preferences_web","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]},{"name":"url_launcher_web","path":"/home/magic_sk/.pub-cache/hosted/pub.dartlang.org/url_launcher_web-0.1.5+1/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity","dependencies":["connectivity_macos","connectivity_for_web"]},{"name":"connectivity_for_web","dependencies":[]},{"name":"connectivity_macos","dependencies":[]},{"name":"flutter_keyboard_visibility","dependencies":["flutter_keyboard_visibility_web"]},{"name":"flutter_keyboard_visibility_web","dependencies":[]},{"name":"flutter_webview_plugin","dependencies":[]},{"name":"geolocator","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux","path_provider_windows"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_linux","url_launcher_macos","url_launcher_windows"]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2021-03-03 20:21:37.924507","version":"1.25.0-8.3.pre"}

ios/Flutter/flutter_export_environment.sh

@@ -1,14 +1,12 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=C:\Users\magic_sk\Development\flutter"
-export "FLUTTER_APPLICATION_PATH=C:\Users\magic_sk\Development\mhd_virtual_table"
-export "FLUTTER_TARGET=lib\main.dart"
+export "FLUTTER_ROOT=/opt/flutter"
+export "FLUTTER_APPLICATION_PATH=/home/magic_sk/Development/flutter/mhd_virtual_table"
+export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
-export "SYMROOT=${SOURCE_ROOT}/../build\ios"
-export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
-export "FLUTTER_FRAMEWORK_DIR=C:\Users\magic_sk\Development\flutter\bin\cache\artifacts\engine\ios"
-export "FLUTTER_BUILD_NAME=1.3.1"
-export "FLUTTER_BUILD_NUMBER=1.3.1"
+export "SYMROOT=${SOURCE_ROOT}/../build/ios"
+export "FLUTTER_BUILD_NAME=1.4.0"
+export "FLUTTER_BUILD_NUMBER=1.4.0"
 export "DART_OBFUSCATION=false"
 export "TRACK_WIDGET_CREATION=false"
 export "TREE_SHAKE_ICONS=false"

lib/NearMe.dart

@@ -38,7 +38,7 @@ class _NearMeState extends State<NearMePage> {
     SharedPreferences prefs = await SharedPreferences.getInstance();
     setState(() {
       tableTheme = prefs.getString('tableTheme');
-      _gotPermission = prefs.getBool('_gotPermission');
+      _gotPermission = (prefs.getBool('_gotPermission') ?? false);
       print(_gotPermission);
     });
     return _gotPermission;
@@ -56,20 +56,13 @@ class _NearMeState extends State<NearMePage> {
   }
 
   _checkLocationStatus() async {
-    await PermissionHandler().checkServiceStatus(PermissionGroup.location).then((status) {
-      if (status == ServiceStatus.enabled) {
-        _locationStatus = true;
-      } else {
-        _locationStatus = false;
-      }
-    });
-    return _locationStatus;
+    return await Permission.location.isGranted;
   }
 
   Future<List<Stop>> fetchNearStops() async {
     var currentLocation;
     try {
-      currentLocation = await geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.best);
+      currentLocation = await Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.best);
     } catch (e) {
       currentLocation = null;
     }
@@ -205,7 +198,7 @@ class _NearMeState extends State<NearMePage> {
                                 });
                                 var currentLocation;
                                 try {
-                                  currentLocation = await geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.best);
+                                  currentLocation = await Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.best);
                                 } catch (e) {
                                   currentLocation = null;
                                 }