Merge branch 'master' into faiz_cs

lib/app_state/app_state.dart

@@ -88,7 +88,7 @@ class AppState {
 
   String get getHuaweiPushToken => _huaweiPushToken;
 
-  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 4.1, mobileType: Platform.isAndroid ? "android" : "ios");
+  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 4.2, mobileType: Platform.isAndroid ? "android" : "ios");
 
   void setPostParamsInitConfig() {
     isAuthenticated = false;

lib/classes/notifications.dart

@@ -40,7 +40,10 @@ class AppNotifications {
   }
 
   void init(String? firebaseToken) async {
-    hmsApiAvailability = HmsApiAvailability();
+    if (Platform.isAndroid) {
+      hmsApiAvailability = HmsApiAvailability();
+    }
+
     await requestPermissions();
     AppState().setDeviceToken = firebaseToken;
     await Permission.notification.isDenied.then((bool value) {

lib/ui/landing/dashboard_screen.dart

@@ -344,7 +344,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
                                                                   bottomLeft: AppState().isArabic(context) ? Radius.circular(15) : Radius.circular(0),
                                                                 ),
                                                               ),
-                                                              child: SvgPicture.asset(model.isTimeRemainingInSeconds == 0 ? "assets/images/attendance.svg" : "assets/images/attendance.svg"),
+                                                              child: SvgPicture.asset(model.isTimeRemainingInSeconds == 0 ? "assets/images/biometrics.svg" : "assets/images/biometrics.svg"),
                                                             ).onPress(() {
                                                               showMyBottomSheet(
                                                                 context,

lib/ui/login/login_screen.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:easy_localization/src/public_ext.dart';
 import 'package:firebase_core/firebase_core.dart';
+import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
@@ -27,7 +28,8 @@ import 'package:mohem_flutter_app/models/member_login_list_model.dart';
 import 'package:mohem_flutter_app/models/privilege_list_model.dart';
 import 'package:mohem_flutter_app/widgets/button/default_button.dart';
 import 'package:mohem_flutter_app/widgets/input_widget.dart';
-import 'package:safe_device/safe_device.dart';
+
+// import 'package:safe_device/safe_device.dart';
 import 'package:wifi_iot/wifi_iot.dart';
 
 class LoginScreen extends StatefulWidget {
@@ -69,21 +71,21 @@ class _LoginScreenState extends State<LoginScreen> {
     // }
   }
 
-  void checkDeviceSafety() async {
-    try {
-      isJailBroken = await SafeDevice.isJailBroken;
-      isRealDevice = await SafeDevice.isRealDevice;
-      if (Platform.isAndroid) {
-        isOnExternalStorage = await SafeDevice.isOnExternalStorage;
-        isDevelopmentModeEnable = await SafeDevice.isDevelopmentModeEnable;
-      }
-      if (isJailBroken || !isRealDevice || isOnExternalStorage || isDevelopmentModeEnable) {
-        Navigator.pushNamedAndRemoveUntil(context, AppRoutes.unsafeDeviceScreen, (_) => false);
-      }
-    } catch (error) {
-      print(error);
-    }
-  }
+  // void checkDeviceSafety() async {
+  //   try {
+  //     isJailBroken = await SafeDevice.isJailBroken;
+  //     isRealDevice = await SafeDevice.isRealDevice;
+  //     if (Platform.isAndroid) {
+  //       isOnExternalStorage = await SafeDevice.isOnExternalStorage;
+  //       isDevelopmentModeEnable = await SafeDevice.isDevelopmentModeEnable;
+  //     }
+  //     if (isJailBroken || !isRealDevice || isOnExternalStorage || isDevelopmentModeEnable) {
+  //       Navigator.pushNamedAndRemoveUntil(context, AppRoutes.unsafeDeviceScreen, (_) => false);
+  //     }
+  //   } catch (error) {
+  //     print(error);
+  //   }
+  // }
 
   @override
   void dispose() {
@@ -108,6 +110,8 @@ class _LoginScreenState extends State<LoginScreen> {
               firebaseToken = await _firebaseMessaging.getToken();
               AppNotifications().init(firebaseToken);
               checkLoginInfo();
+              FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterError;
+              await FirebaseCrashlytics.instance.setCrashlyticsCollectionEnabled(true);
             }
           });
         } catch (ex) {}
@@ -117,10 +121,14 @@ class _LoginScreenState extends State<LoginScreen> {
         firebaseToken = await _firebaseMessaging.getToken();
         AppNotifications().init(firebaseToken);
         checkLoginInfo();
+        FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterError;
+        await FirebaseCrashlytics.instance.setCrashlyticsCollectionEnabled(true);
       }
     } catch (ex) {
       Utils.hideLoading(context);
       Utils.handleException(ex, context, null);
+      FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterError;
+      await FirebaseCrashlytics.instance.setCrashlyticsCollectionEnabled(true);
     }
   }
 

pubspec.yaml

@@ -98,13 +98,14 @@ dependencies:
 
   video_player: ^2.5.1
   just_audio: ^0.9.30
-  safe_device: ^1.1.2
+#  safe_device: ^1.1.2
   flutter_layout_grid: ^2.0.1
 
   #Huawei Dependencies
   huawei_hmsavailability: ^6.6.0+300
   huawei_location: 6.0.0+302
   huawei_push: ^6.7.0+300
+  firebase_crashlytics: ^2.9.0
 
 
 dependency_overrides: