fixed permission handling & improved loading screens

zamirszn · Sep 1, 2022 · 39a6487 · 39a6487
1 parent ab2554f
commit 39a6487
Show file tree

Hide file tree

Showing 15 changed files with 376 additions and 223 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -39,7 +39,7 @@ class GeemApp extends StatelessWidget {
           fontFamily: "PulpDisplay",
           scrollbarTheme: ScrollbarThemeData(
             thickness: MaterialStateProperty.all(7),
-            thumbColor: MaterialStateProperty.all(appColor),
+            thumbColor: MaterialStateProperty.all(Colors.white),
           ),
           primaryColor: geemBlue,
         ),

diff --git a/lib/network/internet_connectivity.dart b/lib/network/internet_connectivity.dart
@@ -2,6 +2,16 @@ import 'package:flutter/material.dart';
 import 'package:geem/util/colors.dart';
 import 'package:overlay_support/overlay_support.dart';
 
+ // checkInternetStream() {
+  //   checkInternetSubscription =
+  //       InternetConnectionChecker().onStatusChange.listen((internetStatus) {
+  //     final hasInterent_ = internetStatus == InternetConnectionStatus.connected;
+  //     hasInternet = hasInterent_;
+
+  //     // hasInternet ? getForecastByLocation() : () {} //can set state here
+  //   });
+  // }
+
 // checkInternet() async {
 //   hasInterent = await InternetConnectionChecker().hasConnection;
 

diff --git a/lib/network/location.dart b/lib/network/location.dart
@@ -2,25 +2,43 @@ import 'package:location/location.dart';
 
 var userLocation = Location();
 // enable user's location service
-Future enableUserLocation() async {
+Future<bool> enableUserLocation() async {
+  bool hasLocation = false;
   var locationServiceIsEnabled = await userLocation.serviceEnabled();
-  if (!locationServiceIsEnabled) {
+
+  if (locationServiceIsEnabled == true) {
+    hasLocation = true;
+  } else if (locationServiceIsEnabled == false) {
     locationServiceIsEnabled = await userLocation.requestService();
-    if (!locationServiceIsEnabled) {
-      return;
+    if (locationServiceIsEnabled != true) {
+      hasLocation = false;
+    } else if (locationServiceIsEnabled == true) {
+      hasLocation = true;
     }
   }
+
+  return hasLocation;
 }
 
-Future getUserLocationPermission() async {
+Future<bool> getUserLocationPermission() async {
   // get users location permission
+  bool hasLocationPermission = false;
+
   var locationPermissionGranted = await userLocation.hasPermission();
-  if (locationPermissionGranted == PermissionStatus.denied) {
+  if (locationPermissionGranted == PermissionStatus.granted) {
+    hasLocationPermission = true;
+
+  } else if (locationPermissionGranted == PermissionStatus.denied) {
     locationPermissionGranted = await userLocation.requestPermission();
     if (locationPermissionGranted != PermissionStatus.granted) {
-      return;
+      hasLocationPermission = false;
+
+    }
+    else if (locationPermissionGranted == PermissionStatus.granted){
+      hasLocationPermission = true;
     }
   }
+  return hasLocationPermission;
 }
 
 Future<LocationData> getUserLocation() async {

diff --git a/lib/ui/screens/error_screen.dart b/lib/ui/screens/error_screen.dart
@@ -0,0 +1,60 @@
+import 'package:flutter/material.dart';
+import 'package:lottie/lottie.dart';
+
+class ErrorScreen extends StatelessWidget {
+  const ErrorScreen({
+    Key? key,
+    required this.deviceScreen,
+    required this.onPressed,
+  }) : super(key: key);
+
+  final Size deviceScreen;
+  final Function onPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        color: Colors.white,
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            Center(
+              child: Lottie.asset(
+                animate: true,
+                "lottie/cloud_attention.json",
+                width: deviceScreen.width / 2,
+              ),
+            ),
+            SizedBox(
+              width: deviceScreen.width / 1.2,
+              child: const Text(
+                "Please make sure you have location & internet service enabled",
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  fontSize: 20,
+                ),
+              ),
+            ),
+            TextButton.icon(
+                icon: const Icon(
+                  Icons.refresh_outlined,
+                  color: Colors.black,
+                ),
+                onPressed: () {
+                  onPressed();
+                },
+                label: const Text(
+                  "Retry",
+                  style: TextStyle(
+                    fontSize: 15,
+                    color: Colors.black,
+                  ),
+                )),
+          ],
+        ),
+      ),
+    );
+  }
+}