merge improvements

lib/api/api_client.dart

@@ -5,6 +5,7 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart';
 import 'package:http/io_client.dart';
+import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/exceptions/api_exception.dart';
 
 import '../main.dart';
@@ -81,6 +82,9 @@ class ApiClient {
       logger.i("res: " + response.body);
     }
     var jsonData = jsonDecode(response.body);
+    if (jsonData["IsAuthenticated"] != null) {
+      AppState().setIsAuthenticated = jsonData["IsAuthenticated"];
+    }
     if (jsonData["ErrorMessage"] == null) {
       return factoryConstructor(jsonData);
     } else {
@@ -237,4 +241,4 @@ class ApiClient {
   }
 
   Future<Response> _post(url, {Map<String, String>? headers, body, Encoding? encoding}) => _withClient((client) => client.post(url, headers: headers, body: body, encoding: encoding));
- }
+}

lib/app_state/app_state.dart

@@ -12,6 +12,10 @@ class AppState {
 
   factory AppState() => _instance;
 
+  bool isAuthenticated = false;
+
+  set setIsAuthenticated(v) => isAuthenticated = v;
+
   bool isLogged = false;
 
   set setLogged(v) => isLogged = v;

lib/classes/utils.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
+import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
 
 // import 'package:fluttertoast/fluttertoast.dart';
@@ -83,12 +84,12 @@ class Utils {
     if (onErrorMessage != null) {
       onErrorMessage(errorMessage);
     } else {
-      if (errorMessage.contains("User session is not valid")) {
+      if (!AppState().isAuthenticated) {
         showDialog(
           context: cxt,
           builder: (cxt) => ConfirmDialog(
             message: errorMessage,
-            onTap: (){
+            onTap: () {
               Navigator.pushNamedAndRemoveUntil(cxt, AppRoutes.login, (Route<dynamic> route) => false);
             },
           ),

lib/provider/dashboard_provider_model.dart

@@ -71,8 +71,8 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
     return ((hour * 60 * 60) + (mints * 60) + seconds);
   }
 
-  update() {
-    fetchAttendanceTracking();
+  update(context) {
+    fetchAttendanceTracking(context);
     // isAttendanceTrackingLoading = !isAttendanceTrackingLoading;
     // isWorkListLoading = !isWorkListLoading;
     // attendanceTracking?.pSwipeIn = "a";

lib/ui/landing/dashboard_screen.dart

@@ -96,7 +96,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                   ],
                 ),
               ).onPress(() {
-                data.update();
+                data.update(context);
               })
             ],
           ).paddingOnly(left: 21, right: 21, top: 48, bottom: 7),

lib/ui/landing/today_attendance_screen.dart

@@ -42,7 +42,7 @@ class _TodayAttendanceScreenState extends State<TodayAttendanceScreen> {
     data = Provider.of<DashboardProviderModel>(context, listen: false);
   }
 
-  checkAttendanceAvailablity() async {
+  void checkAttendanceAvailablity() async {
     bool isAvailable = await NfcManager.instance.isAvailable();
     setState(() {
       AppState().privilegeListModel!.forEach((element) {
@@ -84,7 +84,7 @@ class _TodayAttendanceScreenState extends State<TodayAttendanceScreen> {
         actions: [
           IconButton(
             onPressed: () {
-              data.fetchAttendanceTracking();
+              data.fetchAttendanceTracking(context);
             },
             icon: Icon(
               Icons.ac_unit,
@@ -192,8 +192,7 @@ class _TodayAttendanceScreenState extends State<TodayAttendanceScreen> {
                                         attendanceMethod("NFC", "assets/images/nfc.svg", isNfcEnabled, () {
                                           if (isNfcLocationEnabled) {
                                             Location.getCurrentLocation((LatLng? latlng) {
-                                              print(latlng!.longitude.toString());
-                                              performNfcAttendance(model, lat: latlng.latitude.toString() ?? "", lng: latlng.longitude.toString() ?? "");
+                                              performNfcAttendance(model, lat: latlng?.latitude.toString() ?? "", lng: latlng?.longitude.toString() ?? "");
                                             });
                                           } else {
                                             performNfcAttendance(model);
@@ -246,12 +245,12 @@ class _TodayAttendanceScreenState extends State<TodayAttendanceScreen> {
       Utils.showLoading(context);
       try {
         GenericResponseModel? g = await DashboardApiClient().markAttendance(pointType: 2, nfcValue: nfcId ?? "", isGpsRequired: isNfcLocationEnabled, lat: lat, long: lng);
-        bool status = await model.fetchAttendanceTracking();
+        bool status = await model.fetchAttendanceTracking(context);
         Utils.hideLoading(context);
       } catch (ex) {
         print(ex);
         Utils.hideLoading(context);
-        Utils.handleException(ex, (msg) {
+        Utils.handleException(ex, context, (msg) {
           Utils.confirmDialog(context, msg);
         });
       }

lib/ui/login/login_screen.dart

@@ -75,18 +75,16 @@ class _LoginScreenState extends State<LoginScreen> {
       Utils.showLoading(context);
       firebaseToken = await _firebaseMessaging.getToken();
       loginInfo = await LoginApiClient().getMobileLoginInfoNEW(firebaseToken ?? "", Platform.isAndroid ? "android" : "ios");
-      loginInfo!.deviceToken = firebaseToken;
       if (loginInfo == null) {
         Utils.hideLoading(context);
-        print("Device token not found");
         return;
       } else {
+        loginInfo!.deviceToken = firebaseToken;
         await checkPrefs();
         Utils.hideLoading(context);
         performLogin();
       }
     } catch (ex) {
-      print(ex);
       Utils.hideLoading(context);
       Utils.handleException(ex, context, null);
     }

lib/ui/work_list/missing_swipe/fragments/info_fragments.dart

@@ -165,13 +165,13 @@ class InfoFragment extends StatelessWidget {
                 ItemDetailView(LocaleKeys.operatingUnit.tr(), itemCreationHeader[index].oPERATINGUNIT?.toString() ?? ""),
                 ItemDetailView(LocaleKeys.category.tr(), itemCreationHeader[index].cATEGORY?.toString() ?? ""),
                 ItemDetailView(LocaleKeys.requester.tr(), itemCreationHeader[index].rEQUESTER?.toString() ?? ""),
-                ItemDetailView(LocaleKeys.analyzedBy.tr(), itemCreationHeader[index].aNALYZEDBY.toString() ?? ""),
+                ItemDetailView(LocaleKeys.analyzedBy.tr(), itemCreationHeader[index].aNALYZEDBY?.toString() ?? ""),
                 ItemDetailView(LocaleKeys.approvedDate.tr(), itemCreationHeader[index].aPPROVEDDATE?.toString() ?? ""),
                 ItemDetailView(LocaleKeys.itemType.tr(), itemCreationHeader[index].iTEMTYPE?.toString() ?? ""),
                 ItemDetailView(LocaleKeys.relatedTo.tr(), itemCreationHeader[index].rELATEDTO?.toString() ?? ""),
                 ItemDetailView(LocaleKeys.requestDate.tr(), DateUtil.formatDateToDate(DateUtil.convertStringToDate(itemCreationHeader[index].rEQUESTDATE.toString()), false) ?? ""),
                 ItemDetailView(LocaleKeys.analyzedDate.tr(), itemCreationHeader[index].aNALYZEDDATE?.toString() ?? ""),
-                ItemDetailView(LocaleKeys.urgent.tr(), itemCreationHeader[index].uRGENTFLAGDISP.toString() ?? ""),
+                ItemDetailView(LocaleKeys.urgent.tr(), itemCreationHeader[index].uRGENTFLAGDISP?.toString() ?? ""),
               ],
             ).objectContainerView(),
         separatorBuilder: (cxt, index) => 18.height,