edited loading spinner

ninest · Apr 10, 2020 · 7b3465b · 7b3465b
1 parent 24490ca
commit 7b3465b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/lib/components/core/loading/circular_spinner.dart b/lib/components/core/loading/circular_spinner.dart
@@ -8,7 +8,12 @@ class CircularSpinner extends StatelessWidget {
     return Column(
       children: [
         Spacing(height: Values.marginBelowTitle),
-        CircularProgressIndicator(),
+        Text(
+          "Loading ...",
+          style: Theme.of(context).textTheme.title.copyWith(
+                fontSize: Values.em * 1.5,
+              ),
+        ),
         Spacing(height: Values.marginBelowTitle),
       ],
     );

diff --git a/lib/routes/permission.dart b/lib/routes/permission.dart
@@ -34,7 +34,7 @@ class _RequestPermissionButton extends StatelessWidget {
       text: "Grant permission",
       onTap: () async {
         var status = await LocationPermsProvider.requestPerm();
-        // print("STATUS: $status");
+
         if (status == PermissionStatus.granted) {
           print("Location permission given");
           final HomeRebuilderProvider homeRebuilderProvider =

diff --git a/lib/services/location.dart b/lib/services/location.dart
@@ -1,10 +1,17 @@
 import 'package:geolocator/geolocator.dart';
+import 'package:nextbussg/providers/location_perms.dart';
 
 class LocationServices {
   static Future<Position> getLocation() async {
-    Position position =
-        await Geolocator().getCurrentPosition(desiredAccuracy: LocationAccuracy.high);
-    return position;
+    try {
+      Position position =
+          await Geolocator().getCurrentPosition(desiredAccuracy: LocationAccuracy.lowest);
+      return position;
+    } catch (e) {
+      // request location
+      await LocationPermsProvider.requestPerm();
+      return LocationServices.getLocation();
+    }
   }
 
   static Future<double> distanceBetween(Position point1, Position point2) => Geolocator()

diff --git a/lib/utils/route.dart b/lib/utils/route.dart
@@ -19,7 +19,7 @@ class Routing {
   static void openReplacementRoute(BuildContext context, Widget page) {
     Navigator.of(context).pushReplacement(
       MaterialPageRoute(
-        maintainState: false,
+        maintainState: true,
         builder: (BuildContext context) => ScrollConfiguration(
           child: page,
           behavior: BounceScrollBehavior(),