removed location perm for now due to slow speed

ninest · Apr 10, 2020 · 24490ca · 24490ca
1 parent 74f5cf3
commit 24490ca
Show file tree

Hide file tree

Showing 14 changed files with 101 additions and 238 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -12,7 +12,7 @@ PODS:
     - Flutter
   - path_provider_macos (0.0.1):
     - Flutter
-  - permission_handler (4.4.0):
+  - "permission_handler (5.0.0+hotfix.3)":
     - Flutter
   - quick_actions (0.0.1):
     - Flutter
@@ -71,7 +71,7 @@ SPEC CHECKSUMS:
   location_permissions: 360d12ecd1c94a4cab68585f508be1d5ad944c8b
   path_provider: fb74bd0465e96b594bb3b5088ee4a4e7bb1f2a9d
   path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
-  permission_handler: f615215121f43c1640d2b8500d4ad749512828a8
+  permission_handler: 4a985b5448897c27fdeadde84f7452520c0e6c58
   quick_actions: 5eaa421abc932a71d9804fb86186d173020da63d
   url_launcher: a1c0cc845906122c4784c542523d8cacbded5626
   url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313

diff --git a/lib/components/core/loading/finding_location.dart b/lib/components/core/loading/finding_location.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:nextbussg/components/core/space.dart';
 import 'package:nextbussg/styles/values.dart';
 
 class FindingLocation extends StatelessWidget {

diff --git a/lib/components/core/location_access_button.dart b/lib/components/core/location_access_button.dart
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,6 +1,6 @@
 import 'package:nextbussg/providers/favorites.dart';
 import 'package:nextbussg/providers/home_rebuilder.dart';
-import 'package:nextbussg/providers/locationPerms.dart';
+import 'package:nextbussg/providers/location_perms.dart';
 import 'package:nextbussg/providers/search.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
@@ -27,8 +27,8 @@ class MyApp extends StatelessWidget {
       providers: [
         ChangeNotifierProvider<FavoritesProvider>(create: (_) => FavoritesProvider()),
         ChangeNotifierProvider<SearchProvider>(create: (_) => SearchProvider()),
-        ChangeNotifierProvider<LocationPermissionsProvider>(
-            create: (_) => LocationPermissionsProvider()),
+        ChangeNotifierProvider<LocationPermsProvider>(
+            create: (_) => LocationPermsProvider()),
         ChangeNotifierProvider<HomeRebuilderProvider>(create: (_) => HomeRebuilderProvider()),
       ],
       child: RouteApp(),

diff --git a/lib/providers/locationPerms.dart b/lib/providers/locationPerms.dart
diff --git a/lib/providers/location_perms.dart b/lib/providers/location_perms.dart
@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+class LocationPermsProvider extends ChangeNotifier {
+  static getPermStatus() async {
+    print("Checking permission status ...");
+    var status = await Permission.locationWhenInUse.status;
+    if (status.isGranted) {
+      print("Location granted");
+      return true;
+    } else {
+      print("Location denied or unknown");
+      return false;
+    }
+  }
+
+  static requestPerm() async {
+    Map<Permission, PermissionStatus> statuses = await [
+      Permission.locationWhenInUse,
+    ].request();
+    return statuses[Permission.locationWhenInUse];
+  }
+}
diff --git a/lib/providers/search.dart b/lib/providers/search.dart
@@ -1,7 +1,7 @@
 import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/material.dart';
 import 'package:nextbussg/models/bus_stop.dart';
-import 'package:nextbussg/providers/locationPerms.dart';
+import 'package:nextbussg/providers/location_perms.dart';
 import 'package:nextbussg/services/bus.dart';
 import 'package:nextbussg/utils/strings.dart';
 
@@ -13,7 +13,9 @@ class SearchProvider extends ChangeNotifier {
   bool getNoStopsFoundValue() => _noStopsFound;
 
   getNearestBusStopSearchResults() async {
-    bool canGetPermission = await LocationPermissionsProvider().getBoolPermissionStatus;
+    // bool canGetPermission = await LocationPermissionsProvider().getBoolPermissionStatus;
+    // TODO: fix
+    bool canGetPermission = false;
     if (canGetPermission) {
       _searchResults = await BusService.getNearestStops();
       notifyListeners();

diff --git a/lib/routes/home.dart b/lib/routes/home.dart
@@ -1,23 +1,32 @@
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:nextbussg/components/core/loading/finding_location.dart';
+import 'package:nextbussg/utils/extensions.dart';
 import 'package:nextbussg/components/core/page_template.dart';
 import 'package:nextbussg/components/core/space.dart';
 import 'package:nextbussg/components/home/bus_stop_list.dart';
 import 'package:nextbussg/components/home/favorites/favorites_list.dart';
 import 'package:nextbussg/providers/favorites.dart';
+import 'package:nextbussg/providers/home_rebuilder.dart';
+import 'package:nextbussg/providers/location_perms.dart';
+import 'package:nextbussg/routes/permission.dart';
 import 'package:nextbussg/utils/strings.dart';
+import 'package:provider/provider.dart';
 
 class HomePage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return FutureBuilder(
       future: getHomeWidgets(context),
       builder: (context, snapshot) {
-        if (snapshot.hasData)
-          return PageTemplate(children: snapshot.data);
-        else
-          return FindingLocation();
+        return PageTemplate(
+          children: [
+            if (snapshot.hasData)
+              ...snapshot.data
+            else
+              Center(child: Text("Loading no data...")).sliverToBoxAdapter()
+          ],
+        ).scaffold();
       },
     );
   }

diff --git a/lib/routes/oldhome.dart b/lib/routes/oldhome.dart
diff --git a/lib/routes/permission.dart b/lib/routes/permission.dart
@@ -0,0 +1,49 @@
+import 'package:flutter/material.dart';
+import 'package:nextbussg/components/core/buttons/button.dart';
+import 'package:nextbussg/components/core/page_template.dart';
+import 'package:nextbussg/components/core/space.dart';
+import 'package:nextbussg/providers/home_rebuilder.dart';
+import 'package:nextbussg/providers/location_perms.dart';
+import 'package:nextbussg/styles/values.dart';
+import 'package:nextbussg/utils/extensions.dart';
+import 'package:nextbussg/components/core/title_text.dart';
+import 'package:permission_handler/permission_handler.dart';
+import 'package:provider/provider.dart';
+
+class PermissionRoute extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return PageTemplate(
+      children: <Widget>[
+        Column(
+          children: <Widget>[
+            TitleText(title: "Please grant location permissions ..."),
+            Spacing(height: Values.marginBelowTitle),
+            _RequestPermissionButton()
+          ],
+        ).sliverToBoxAdapter(),
+      ],
+    ).scaffold();
+  }
+}
+
+class _RequestPermissionButton extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Button(
+      text: "Grant permission",
+      onTap: () async {
+        var status = await LocationPermsProvider.requestPerm();
+        // print("STATUS: $status");
+        if (status == PermissionStatus.granted) {
+          print("Location permission given");
+          final HomeRebuilderProvider homeRebuilderProvider =
+              Provider.of<HomeRebuilderProvider>(context, listen: false);
+          homeRebuilderProvider.rebuild();
+        } else {
+          print("Location permission NOT GIVEN");
+        }
+      },
+    );
+  }
+}