Merge branch 'development_haroon' into 'master'

Updates & fixes

See merge request mirza.shafique/mohem_flutter_app!86

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

ios/Runner/Info.plist

@@ -22,16 +22,36 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>sms</string>
+		<string>tel</string>
+		<string>mailto</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>This app requires camera access to capture &amp; upload pictures.</string>
+	<key>NSFaceIDUsageDescription</key>
+	<string>This app requires Face ID to allow biometric authentication for app login.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>This app requires photo library access to select image as document &amp; upload it.</string>
+		<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+    	<string>This App requires access to your location to mark your attendance.</string>
+    	<key>NSLocationAlwaysUsageDescription</key>
+    	<string>This App requires access to your location to mark your attendance.</string>
+    	<key>NSLocationWhenInUseUsageDescription</key>
+    	<string>This App requires access to your location to mark your attendance.</string>
+    	<key>NFCReaderUsageDescription</key>
+        <string>This App requires access to NFC to mark your attendance.</string>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>remote-notification</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
-    <key>NSCameraUsageDescription</key>
-    <string>This app requires camera access to capture &amp; upload pictures.</string>
-    <key>NSPhotoLibraryUsageDescription</key>
-    <string>This app requires photo library access to select image as document &amp; upload it.</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
@@ -45,13 +65,11 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>LSApplicationQueriesSchemes</key>
-    <array>
-      <string>sms</string>
-      <string>tel</string>
-      <string>mailto</string>
-    </array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>com.apple.developer.nfc.readersession.felica.systemcodes</key>
+    	<array>
+    		<string>0000</string>
+    	</array>
 </dict>
 </plist>

lib/classes/app_permissions.dart

@@ -1,7 +1,12 @@
+import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
+import 'package:mohem_flutter_app/widgets/dialogs/confirm_dialog.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:geolocator/geolocator.dart';
 import 'package:permission_handler/permission_handler.dart';
 
-class AppPermissions{
+class AppPermissions {
-  static void location(Function(bool) completion) {
+  static void location(Function(bool) completion, BuildContext context) {
     Permission.location.isGranted.then((isGranted){
       if(!isGranted){
         Permission.location.request().then((granted){
@@ -10,21 +15,34 @@ class AppPermissions{
       }
       completion(isGranted);
     });
-
   }
 
-  static void checkAll(Function(bool) completion){
+  static void showErrorLocationDialog(bool isPermissionError, BuildContext context) {
-    [
+    showDialog(
-      Permission.location
+      context: context,
-    ].request().then((value){
+      builder: (cxt) => ConfirmDialog(
+        message: "Please provide location permission",
+        onTap: () {
+          if (isPermissionError) {
+            Geolocator.openAppSettings();
+          } else {
+            Geolocator.openLocationSettings();
+          }
+          Navigator.pop(context);
+          // createVacationRule(list);
+        },
+      ),
+    );
+  }
 
+  static void checkAll(Function(bool) completion) {
+    [Permission.location].request().then((value) {
       bool allGranted = false;
       value.values.forEach((element) {
         allGranted = allGranted && element == PermissionStatus.granted;
       });
 
       completion(allGranted);
-
     });
   }
-}
+}

lib/classes/consts.dart

@@ -1,7 +1,7 @@
 class ApiConsts {
   //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
-  static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
+  // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
-  // static String baseUrl = "https://hmgwebservices.com"; // Live server
+  static String baseUrl = "https://hmgwebservices.com"; // Live server
   static String baseUrlServices = baseUrl + "/Services/"; // server
   // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
   static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/";

lib/ui/attendance/monthly_attendance_screen.dart

@@ -16,7 +16,7 @@ import 'package:mohem_flutter_app/models/get_schedule_shifts_details_list_model.
 import 'package:mohem_flutter_app/models/get_time_card_summary_list_model.dart';
 import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
 import 'package:mohem_flutter_app/widgets/circular_step_progress_bar.dart';
-import 'package:month_picker_dialog/month_picker_dialog.dart';
+import 'package:month_picker_dialog_2/month_picker_dialog_2.dart';
 import 'package:pie_chart/pie_chart.dart';
 import 'package:syncfusion_flutter_calendar/calendar.dart';
 

lib/ui/landing/dashboard_screen.dart

@@ -59,7 +59,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
 
   @override
   Widget build(BuildContext context) {
-    List<String> namesD = ["Nostalgia Perfume Perfume", "Al Nafoura", "AlJadi", "Nostalgia Perfume"];
     GlobalKey<ScaffoldState> _key = GlobalKey(); //
     return Scaffold(
       key: _scaffoldState,
@@ -71,15 +70,17 @@ class _DashboardScreenState extends State<DashboardScreen> {
                 return Row(
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                     Image.memory(
+                    Image.memory(
                       Utils.getPostBytes(
                         AppState().memberInformationList!.eMPLOYEEIMAGE ?? "",
                       ),
-                       errorBuilder: (BuildContext context, error, stackTrace) {
+                      errorBuilder: (BuildContext context, error, stackTrace) {
                         return SvgPicture.asset(
-                               "assets/images/user.svg", height: 34, width: 34,
+                          "assets/images/user.svg",
-                               );
+                          height: 34,
-                       },
+                          width: 34,
+                        );
+                      },
                       width: 34,
                       height: 34,
                       fit: BoxFit.cover,

lib/ui/landing/widget/app_drawer.dart

@@ -136,8 +136,8 @@ class _AppDrawerState extends State<AppDrawer> {
     AppState().isAuthenticated = false;
     AppState().isLogged = false;
     AppState().setPostParamsInitConfig();
-    SharedPreferences prefs = await SharedPreferences.getInstance();
+    // SharedPreferences prefs = await SharedPreferences.getInstance();
-    await prefs.clear();
+    // await prefs.clear();
-    Navigator.pushNamedAndRemoveUntil(context, AppRoutes.login, (Route<dynamic> route) => false, arguments: false);
+    Navigator.pushNamedAndRemoveUntil(context, AppRoutes.login, (Route<dynamic> route) => false, arguments: null);
   }
 }

lib/ui/login/login_screen.dart

@@ -50,7 +50,7 @@ class _LoginScreenState extends State<LoginScreen> {
   @override
   void initState() {
     super.initState();
-    // checkFirebaseToken();
+     // checkFirebaseToken();
   }
 
   @override
@@ -130,8 +130,8 @@ class _LoginScreenState extends State<LoginScreen> {
     if (isAppOpenBySystem == null) {
       isAppOpenBySystem = (ModalRoute.of(context)!.settings.arguments ?? true) as bool;
       print('isAppOpenBySystem:$isAppOpenBySystem');
-      username.text = "15153";
+      // username.text = "15153";
-      password.text = "Abcd@12345";
+      // password.text = "Abcd@12345";
       if (isAppOpenBySystem!) checkFirebaseToken();
     }
 

lib/ui/login/verify_last_login_screen.dart

@@ -60,10 +60,10 @@ class _VerifyLastLoginScreenState extends State<VerifyLastLoginScreen> {
     return Scaffold(
       appBar: AppBar(
         backgroundColor: Colors.transparent,
-        leading: IconButton(
+        // leading: IconButton(
-          icon: const Icon(Icons.arrow_back_ios, color: MyColors.darkIconColor),
+        //   icon: const Icon(Icons.arrow_back_ios, color: MyColors.darkIconColor),
-          onPressed: () => Navigator.pop(context),
+        //   onPressed: () => Navigator.pop(context),
-        ),
+        // ),
         actions: [Center(child: "Employee Digital ID".toText12(color: MyColors.textMixColor, isUnderLine: true).onPress(() {})), 21.width],
       ),
       body: Column(
@@ -211,7 +211,7 @@ class _VerifyLastLoginScreenState extends State<VerifyLastLoginScreen> {
         const IOSAuthMessages(cancelButton: 'cancel', goToSettingsButton: 'settings', goToSettingsDescription: 'Please set up your Touch ID.', lockOut: 'Please reenable your Touch ID');
     bool authenticated = false;
     try {
-      authenticated = await auth.authenticate(localizedReason: 'Scan your fingerprint to authenticate', useErrorDialogs: true, stickyAuth: true, iOSAuthStrings: iosStrings);
+      authenticated = await auth.authenticate(localizedReason: 'Scan your fingerprint to authenticate', useErrorDialogs: true, stickyAuth: true, biometricOnly: true, iOSAuthStrings: iosStrings);
     } on PlatformException catch (e) {
       print(e);
       Utils.hideLoading(context);
@@ -238,12 +238,13 @@ class _VerifyLastLoginScreenState extends State<VerifyLastLoginScreen> {
                     return;
                   } else {
                     if (mobileLoginInfoListModel!.loginType == 2 || mobileLoginInfoListModel!.loginType == 3) {
-                      bool authenticateWithFaceAndTouchID = await loginWithFaceIDAndBiometrics();
+                      // bool authenticateWithFaceAndTouchID = await loginWithFaceIDAndBiometrics();
-                      if (!authenticateWithFaceAndTouchID) {
+                      // if (!authenticateWithFaceAndTouchID) {
-                        return;
+                      //   return;
-                      } else {
+                      // } else {
-                        performApiCall(_title, _icon, _flag, isDirectLogin: true);
+                      //   performApiCall(_title, _icon, _flag, isDirectLogin: true);
-                      }
+                      // }
+                      performApiCall(_title, _icon, _flag, isDirectLogin: true);
                     } else {
                       isNeedVerifyWithFaceIDAndBiometrics = true;
                       selectedFlag = _flag;

lib/ui/login/verify_login_screen.dart

@@ -517,7 +517,7 @@ class _VerifyLoginScreenState extends State<VerifyLoginScreen> {
         const IOSAuthMessages(cancelButton: 'cancel', goToSettingsButton: 'settings', goToSettingsDescription: 'Please set up your Touch ID.', lockOut: 'Please reenable your Touch ID');
     bool authenticated = false;
     try {
-      authenticated = await auth.authenticate(localizedReason: 'Scan your fingerprint to authenticate', useErrorDialogs: true, stickyAuth: true, iOSAuthStrings: iosStrings);
+      authenticated = await auth.authenticate(localizedReason: 'Scan your fingerprint to authenticate', useErrorDialogs: true, stickyAuth: true, biometricOnly: true, iOSAuthStrings: iosStrings);
     } on PlatformException catch (e) {
       print(e);
       Utils.hideLoading(context);

lib/ui/my_team/view_attendance.dart

@@ -15,7 +15,7 @@ import 'package:mohem_flutter_app/models/get_time_card_summary_list_model.dart';
 import 'package:mohem_flutter_app/models/my_team/get_employee_subordinates_list.dart';
 import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
 import 'package:mohem_flutter_app/widgets/circular_step_progress_bar.dart';
-import 'package:month_picker_dialog/month_picker_dialog.dart';
+import 'package:month_picker_dialog_2/month_picker_dialog_2.dart';
 import 'package:pie_chart/pie_chart.dart';
 import 'package:syncfusion_flutter_calendar/calendar.dart';
 

lib/ui/work_list/sheets/delegate_sheet.dart

@@ -200,7 +200,7 @@ class _DelegateSheetState extends State<DelegateSheet> {
                           ),
                         ),
                         if (isNeedEnableTextField)
-                          FlatButton(
+                          TextButton(
                             onPressed: () {
                               fetchUserByInput();
                             },

lib/widgets/location/Location.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:math';
 import 'dart:ui';
 
+import 'package:mohem_flutter_app/classes/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:geolocator/geolocator.dart';
@@ -45,7 +46,7 @@ class Location {
     });
   }
 
-  static void getCurrentLocation(Function(LatLng?) callback) {
+  static void getCurrentLocation(Function(LatLng?) callback, BuildContext context) {
     void done(Position position) {
       //AppStorage.sp.saveLocation(position);
 
@@ -64,8 +65,10 @@ class Location {
             done(value);
           }
         });
+      } else {
+        // AppPermissions
       }
-    });
+    }, context);
   }
 
   // static LatLng locationAwayFrom(
@@ -137,11 +140,11 @@ class _Map {
     });
   }
 
-  void goToCurrentLocation({Completer<GoogleMapController>? mapController, double? direction = 0.0, bool? animation}) {
+  // void goToCurrentLocation({Completer<GoogleMapController>? mapController, double? direction = 0.0, bool? animation}) {
-    Location.getCurrentLocation((location) {
+  //   Location.getCurrentLocation((location) {
-      moveTo(location!, zoom: 17, mapController: mapController!, animation: animation, direction: direction!);
+  //     moveTo(location!, zoom: 17, mapController: mapController!, animation: animation, direction: direction!);
-    });
+  //   });
-  }
+  // }
 
   var routes = Map<String, DirectionsRoute>();
 

lib/widgets/mark_attendance_widget.dart

@@ -90,7 +90,7 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
                 if (isNfcLocationEnabled) {
                   Location.getCurrentLocation((LatLng? latlng) {
                     performNfcAttendance(widget.model, lat: latlng?.latitude.toString() ?? "", lng: latlng?.longitude.toString() ?? "");
-                  });
+                  }, context);
                 } else {
                   performNfcAttendance(widget.model);
                 }
@@ -100,7 +100,7 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
                   if (isWifiLocationEnabled) {
                     Location.getCurrentLocation((LatLng? latlng) {
                       performWifiAttendance(widget.model, lat: latlng?.latitude.toString() ?? "", lng: latlng?.longitude.toString() ?? "");
-                    });
+                    }, context);
                   } else {
                     performWifiAttendance(widget.model);
                   }
@@ -111,7 +111,7 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
                   if (isQrLocationEnabled) {
                     Location.getCurrentLocation((LatLng? latlng) {
                       performQrCodeAttendance(widget.model, lat: latlng?.latitude.toString() ?? "", lng: latlng?.longitude.toString() ?? "");
-                    });
+                    }, context);
                   } else {
                     performQrCodeAttendance(widget.model);
                   }
@@ -158,16 +158,19 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
     bool isConnected =
         await WiFiForIoTPlugin.connect(AppState().getMohemmWifiSSID ?? "", password: AppState().getMohemmWifiPassword ?? "", joinOnce: true, security: NetworkSecurity.WPA, withInternet: false);
     if (isConnected) {
+      Utils.showLoading(context);
       await WiFiForIoTPlugin.forceWifiUsage(true);
 
-      Utils.showLoading(context);
+      await Future.delayed(Duration(seconds: 1));
+
       try {
         GenericResponseModel? g = await DashboardApiClient().markAttendance(pointType: 3, nfcValue: "", isGpsRequired: isWifiLocationEnabled, lat: lat, long: lng);
         bool status = await model.fetchAttendanceTracking(context);
         Utils.hideLoading(context);
-        await closeWifiRequest();
+        // await closeWifiRequest();
       } catch (ex) {
-        await closeWifiRequest();
+        print("performWifiAttendance: "+ex.toString());
+        // await closeWifiRequest();
         Utils.hideLoading(context);
         Utils.handleException(ex, context, (msg) {
           Utils.confirmDialog(context, msg);
@@ -179,7 +182,8 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
   }
 
   Future<bool> closeWifiRequest() async {
-    await WiFiForIoTPlugin.forceWifiUsage(false);
+    // await WiFiForIoTPlugin.forceWifiUsage(false);
+    // Future.delayed(Duration(seconds: 2));
     return await WiFiForIoTPlugin.disconnect();
   }
 

lib/widgets/nfc/nfc_reader_sheet.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:nfc_manager/nfc_manager.dart';
@@ -41,9 +42,13 @@ class _NfcLayoutState extends State<NfcLayout> {
 
     NfcManager.instance.startSession(onDiscovered: (NfcTag tag) async {
       print(tag.data);
-      var f = MifareUltralight(tag: tag, identifier: tag.data["nfca"]["identifier"], type: 2, maxTransceiveLength: 252, timeout: 22);
+      var f;
+      if (Platform.isAndroid) {
+        f = MifareUltralight(tag: tag, identifier: tag.data["nfca"]["identifier"], type: 2, maxTransceiveLength: 252, timeout: 22);
+      } else {
+        f = MifareUltralight(tag: tag, identifier: tag.data["mifare"]["identifier"], type: 2, maxTransceiveLength: 252, timeout: 22);
+      }
       String identifier = f.identifier.map((e) => e.toRadixString(16).padLeft(2, '0')).join('');
-      // print(identifier); // => 0428fcf2255e81
       nfcId = identifier;
 
       setState(() {
@@ -54,8 +59,16 @@ class _NfcLayoutState extends State<NfcLayout> {
       Future.delayed(const Duration(seconds: 1), () {
         NfcManager.instance.stopSession();
         Navigator.pop(context);
+        // if (Platform.isAndroid) {
+        //   Navigator.pop(context);
+        // } else {
+        //   Navigator.pop(context);
+        //   Navigator.pop(context);
+        // }
         widget.onNcfScan(nfcId);
       });
+    }).catchError((err) {
+      print(err);
     });
   }
 
@@ -107,12 +120,12 @@ class _NfcLayoutState extends State<NfcLayout> {
             shape: RoundedRectangleBorder(
               borderRadius: BorderRadius.circular(6),
             ),
-            child: RaisedButton(
+            child: TextButton(
               onPressed: () {
                 NfcManager.instance.stopSession();
                 Navigator.pop(context);
               },
-              elevation: 0,
+              // elevation: 0,
               child: Text("CANCEL"),
             ),
           ),
@@ -166,14 +179,14 @@ class _NfcLayoutState extends State<NfcLayout> {
             shape: RoundedRectangleBorder(
               borderRadius: BorderRadius.circular(6),
             ),
-            child: RaisedButton(
+            child: TextButton(
               // onPressed: () {
               //   _stream?.cancel();
               //   widget.onNcfScan(nfcId);
               //   Navigator.pop(context);
               // },
               onPressed: null,
-              elevation: 0,
+              // elevation: 0,
               child: Text("DONE"),
             ),
           ),

pubspec.yaml

@@ -1,4 +1,5 @@
 name: mohem_flutter_app
+
 description: A new Flutter application.
 
 # The following line prevents the package from being accidentally published to
@@ -60,11 +61,11 @@ dependencies:
   google_maps_flutter: ^2.0.2
   google_maps_utils: ^1.4.0+1
   google_directions_api: ^0.9.0
-  geolocator: any
+  geolocator: ^9.0.2
   #  flutter_compass: ^0.6.1
   google_maps_flutter_web: ^0.3.2
   month_year_picker: ^0.2.0+1
-  month_picker_dialog: ^0.4.0
+  month_picker_dialog_2: 0.5.5
   open_file: ^3.2.1
   wifi_iot: ^0.3.16
   flutter_html: ^2.2.1