refactor(location): location logging message (#169)

Signed-off-by: Kapdroid <kapdroid@Kapdroids-MacBook-Pro.local>
Co-authored-by: Kapdroid <kapdroid@Kapdroids-MacBook-Pro.local>

Author: 2 people

lib/src/app/app_error_page.dart

@@ -5,18 +5,20 @@ class AppErrorPage extends StatelessWidget {
   const AppErrorPage(
     this.e, {
     this.onRetryTap,
+    this.hasSettingButton = false,
   });
 
   final dynamic e;
   final VoidCallback? onRetryTap;
+  final bool hasSettingButton;
 
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
       debugShowCheckedModeBanner: false,
-      home: Scaffold(
-        body: Center(
-          child: Column(
+      home: SafeArea(
+        child: BaseScaffold(
+          appBody: Column(
             mainAxisSize: MainAxisSize.min,
             children: [
               getWidget(),
@@ -32,15 +34,18 @@ class AppErrorPage extends StatelessWidget {
     // if (e is LocationException) {
     if (e is LocationException) {
       return LocationErrorWidget(
+        hasSettingButton: hasSettingButton,
         error: e.toString(),
         onRefreshTap: onRetryTap ?? () {},
         pop: false,
       );
     } else {
-      return UnknownErrorWidget(
-        onRetryTap ?? () {},
-        pop: false,
-        message: e?.toString() ?? Constants.errorSomethingWentWrong,
+      return Center(
+        child: UnknownErrorWidget(
+          onRetryTap ?? () {},
+          pop: false,
+          message: e?.toString() ?? Constants.errorSomethingWentWrong,
+        ),
       );
     }
   }

lib/src/config/colors.dart

@@ -21,6 +21,8 @@ class AppColors {
 
   static Color kCustomDarkBlue = Color(0xFF005486);
 
+  static Color kDarkBlue = Color(0xFF072A72);
+
   static Color kOutlinedIconButtonBackgroundColor = Color(0xffFAFAFA);
 
   static Color kOutlinedIconButtonBorderColor = Color(0xffDCDCDC);
@@ -35,4 +37,6 @@ class AppColors {
     },
   );
   static const Color kLightGrey = Color(0xFF666666);
+
+  static const Color kLightBlue = Color(0xFFEDF6FF);
 }

lib/src/constants/constants.dart

@@ -3,13 +3,7 @@ class Constants {
 
   static const String errorSomethingWentWrong = "Oops! Something went wrong.";
 
-  static const String locationNotAvailable =
-      "Location not available!\n\nPlease try following things:\n\n-"
-      " Check location is on"
-      " and is set to High Accuracy\n- Check if location permission"
-      " to the app is enabled\n- Close the App and open Google Maps. "
-      "If location gets available to Maps then reopen this App."
-      " It will detect location.";
+  static const String locationNotAvailable = "Location not available!";
 
   static const String errorInternetError =
       "Internet not available\nPlease check your wifi or mobile data";

lib/src/core/location_info/location_info.dart

@@ -57,7 +57,7 @@ class LocationInfoImpl implements LocationInfo {
     final loc = _deviceLocation.value;
     if (loc == null) {
       throw LocationException(
-        '${Constants.locationNotAvailable}\n$defaultLocationReason',
+        '${Constants.locationNotAvailable}',
       );
     }
     return loc;
@@ -73,7 +73,7 @@ class LocationInfoImpl implements LocationInfo {
       /// This is done because iOS app gets rejected if we ask for location
       /// on splash and if it is disabled, user is asked to turn on the location
       /// to use the app
-      if(!Platform.isIOS){
+      if (!Platform.isIOS) {
         final permissionStatus = await isLocationPermissionGranted();
 
         if (!permissionStatus) {
@@ -88,23 +88,27 @@ class LocationInfoImpl implements LocationInfo {
       }
 
       final permission = await Geolocator.requestPermission();
+
       final geolocationStatus = await Geolocator.isLocationServiceEnabled();
+      if (!geolocationStatus) {
+        throw LocationException('Oops! Location is turned off');
+      }
+      if (!_isPermissionGranted(permission)) {
+        throw LocationException('Please Allow Location Permission');
+      }
 
-      if (_isPermissionGranted(permission) && geolocationStatus) {
-        await _fetchLocation();
-      } else if (!geolocationStatus) {
+      final accuracy = await Geolocator.getLocationAccuracy();
+      if (accuracy == LocationAccuracyStatus.reduced) {
         throw LocationException(
-          'Location setting on your device is off.'
-          ' Please enable to proceed!\n$defaultLocationReason',
-        );
-      } else if (!_isPermissionGranted(permission)) {
-        throw LocationException(
-          'Please enable Location Permission to the App!'
-          '\n$defaultLocationReason',
+          'Please Enable Precise Location',
         );
+      }
+
+      if (_isPermissionGranted(permission) && geolocationStatus) {
+        await _fetchLocation();
       } else {
         throw LocationException(
-          '${Constants.locationNotAvailable}\n$defaultLocationReason',
+          '${Constants.locationNotAvailable}',
         );
       }
     } else {
@@ -184,7 +188,7 @@ class LocationInfoImpl implements LocationInfo {
       //prefsHelper.lastLocation = jsonEncode(_deviceLocation.value.toJson());
     } else {
       throw LocationException(
-        '${Constants.locationNotAvailable}\n$defaultLocationReason',
+        '${Constants.locationNotAvailable}',
       );
     }
   }
@@ -224,7 +228,7 @@ class LocationInfoImpl implements LocationInfo {
       });
       if (position == null) {
         throw LocationException(
-          '${Constants.locationNotAvailable}\n$defaultLocationReason',
+          '${Constants.locationNotAvailable}',
         );
       } else {
         await _onLocationFetch(position);
@@ -248,7 +252,7 @@ class LocationInfoImpl implements LocationInfo {
     location = await _getLocation();
     if (location == null) {
       throw LocationException(
-        '${Constants.locationNotAvailable}\n$defaultLocationReason',
+        '${Constants.locationNotAvailable}',
       );
     }
     await _onLocationFetch(location);
@@ -258,7 +262,7 @@ class LocationInfoImpl implements LocationInfo {
     final isTimerActive = locationCheckTimer?.isActive ?? false;
     if (!isTimerActive) {
       locationCheckTimer =
-          Timer.periodic(const Duration(seconds: 4), (t) async {
+          Timer.periodic(const Duration(seconds: 1), (t) async {
         final _checkPermission = await isLocationPermissionGranted();
         final geolocationStatus = await isLocationEnabled();
         if (!_checkPermission || !geolocationStatus) {
@@ -269,10 +273,16 @@ class LocationInfoImpl implements LocationInfo {
                 builder: (_) => AppErrorPage(
                   LocationException(
                     '${Constants.locationNotAvailable}'
-                    '\n$defaultLocationReason',
+                        '',
                   ),
                   onRetryTap: () async {
-                    await initLocation();
+                    final _checkPermission = await isLocationPermissionGranted();
+                    final geolocationStatus = await isLocationEnabled();
+                    if(_checkPermission && geolocationStatus) {
+                      navKey!.currentState?.pop();
+                      _startLocationServiceCheckTimer();
+                      await initLocation();
+                    }
                   },
                 ),
               ),
@@ -313,7 +323,7 @@ class LocationInfoImpl implements LocationInfo {
       /// TODO(@singhtaranjeet): Do not throw only LocationException on every exception
       /// Use different exception for different cases
       throw LocationException(
-        '${Constants.locationNotAvailable}\n$defaultLocationReason',
+        '${Constants.locationNotAvailable}',
       );
     }
   }