Update 13/2 16.30

lib/Screens/ForgotPassword/forgotPassword_screen.dart

@@ -145,7 +145,8 @@ class ForgotPasswordScreen extends StatelessWidget {
                                       // set up the AlertDialog
                                       AlertDialog alert = AlertDialog(
                                         title: Text("Employee Self Service"),
-                                        content: Text(message),
+                                        //content: Text(message),
+                                        content: Text("Link for reset password has been sent to your email address"),
                                         actions: [
                                           okButton,
                                         ],
@@ -158,15 +159,37 @@ class ForgotPasswordScreen extends StatelessWidget {
                                         },
                                       );
                                     } else if (status == "failed") {
-                                      String message = object['result']['message'].toString();
-                                      Fluttertoast.showToast(
+                                      await loading.hide();
+                                      Widget okButton = TextButton(
+                                        child: Text("Back"),
+                                        onPressed: () {
+                                          Navigator.of(context, rootNavigator: true).pop();
+                                        },
+                                      );
+
+                                      // set up the AlertDialog
+                                      AlertDialog alert = AlertDialog(
+                                        title: Text("Employee Self Service"),
+                                        //content: Text(message),
+                                        content: Text("Your email has not been registered"),
+                                        actions: [
+                                          okButton,
+                                        ],
+                                      );
+                                      // show the dialog
+                                      showDialog(
+                                        context: context,
+                                        builder: (BuildContext context) {
+                                          return alert;
+                                        },
+                                      );
+                                      /*Fluttertoast.showToast(
                                           msg: message,
                                           toastLength: Toast.LENGTH_SHORT,
                                           gravity: ToastGravity.CENTER,
                                           timeInSecForIosWeb: 1,
                                           textColor: Colors.white,
-                                          fontSize: 16.0);
-                                      await loading.hide();
+                                          fontSize: 16.0);*/
                                     }
                                   } else {
                                     Fluttertoast.showToast(

lib/Screens/Home/home_screen.dart

@@ -34,7 +34,13 @@ class HomeView extends StatefulWidget {
   @override
   _HomeView createState() => _HomeView();
 }
-/*WidgetsBinding.instance.addPostFrameCallback((_) async {
+
+class _HomeView extends State<HomeView> {
+  @override
+  initState() {
+    getDetail();
+    _imageToShow = AssetImage('assets/images/ic_administrator.png');
+    /*WidgetsBinding.instance.addPostFrameCallback((_) async {
       ProgressDialog loading = ProgressDialog(context);
       loading = ProgressDialog(context,
           type: ProgressDialogType.normal,
@@ -59,12 +65,6 @@ class HomeView extends StatefulWidget {
       loading.show();
       _imageToShow = getProfileImage();
     });*/
-
-class _HomeView extends State<HomeView> {
-  @override
-  initState() {
-    getDetail();
-    _imageToShow = AssetImage('assets/images/ic_administrator.png');
     super.initState();
   }
 
@@ -73,7 +73,7 @@ class _HomeView extends State<HomeView> {
     final SharedPreferences prefs = await SharedPreferences.getInstance();
     final session = prefs.getString('session');
 
-    ProgressDialog loading = ProgressDialog(context);
+    /*ProgressDialog loading = ProgressDialog(context);
     loading = ProgressDialog(context,
         type: ProgressDialogType.normal,
         isDismissible: false,
@@ -93,7 +93,7 @@ class _HomeView extends State<HomeView> {
         messageTextStyle: TextStyle(
             color: Colors.black,
             fontSize: 15.0,
-            fontWeight: FontWeight.w600));
+            fontWeight: FontWeight.w600));*/
 
     GetProfileImage_Post.connectToAPI(session!).then((valueResult) async {
       Map<String, dynamic> object = json.decode(valueResult);
@@ -115,7 +115,7 @@ class _HomeView extends State<HomeView> {
                   .image;
             });
           }
-          loading.hide();
+          //loading.hide();
         } else if (status == "failed") {
           String message = object['result']['message'].toString();
           Fluttertoast.showToast(
@@ -126,7 +126,7 @@ class _HomeView extends State<HomeView> {
               textColor: Colors.white,
               fontSize: 16.0);
         }
-        loading.hide();
+        //loading.hide();
       } else {
         Fluttertoast.showToast(
             msg: "Server Response Error",
@@ -135,7 +135,7 @@ class _HomeView extends State<HomeView> {
             timeInSecForIosWeb: 1,
             textColor: Colors.white,
             fontSize: 16.0);
-        loading.hide();
+        //loading.hide();
       }
     });
     return _imageToShow;
@@ -220,7 +220,7 @@ class _HomeScreenState extends State<HomeScreen> {
     final SharedPreferences prefs = await SharedPreferences.getInstance();
     final session = prefs.getString('session');
 
-    ProgressDialog loading = ProgressDialog(context);
+    /*ProgressDialog loading = ProgressDialog(context);
     loading = ProgressDialog(context,
         type: ProgressDialogType.normal,
         isDismissible: false,
@@ -242,7 +242,7 @@ class _HomeScreenState extends State<HomeScreen> {
             fontSize: 15.0,
             fontWeight: FontWeight.w600));
 
-    loading.show();
+    loading.show();*/
     GetProfileImage_Post.connectToAPI(session!).then((valueResult) async {
       Map<String, dynamic> object = json.decode(valueResult);
       if (object.containsKey("result").toString() == "true") {
@@ -273,7 +273,7 @@ class _HomeScreenState extends State<HomeScreen> {
               textColor: Colors.white,
               fontSize: 16.0);
         }
-        loading.hide();
+        //loading.hide();
       } else {
         Fluttertoast.showToast(
             msg: "Server Response Error",
@@ -282,7 +282,7 @@ class _HomeScreenState extends State<HomeScreen> {
             timeInSecForIosWeb: 1,
             textColor: Colors.white,
             fontSize: 16.0);
-        loading.hide();
+        //loading.hide();
       }
     });
     return _imageToShow;
@@ -292,7 +292,7 @@ class _HomeScreenState extends State<HomeScreen> {
   Widget build(BuildContext context) {
     var size = MediaQuery.of(context).size;
 
-    ProgressDialog loading = ProgressDialog(context);
+    /*ProgressDialog loading = ProgressDialog(context);
     loading = ProgressDialog(context,
     type: ProgressDialogType.normal,
     isDismissible: false,
@@ -312,7 +312,7 @@ class _HomeScreenState extends State<HomeScreen> {
     messageTextStyle: TextStyle(
     color: Colors.black,
     fontSize: 15.0,
-    fontWeight: FontWeight.w600));
+    fontWeight: FontWeight.w600));*/
 
     return FocusDetector(
       /*onVisibilityGained: (){
@@ -329,7 +329,7 @@ class _HomeScreenState extends State<HomeScreen> {
       },*/
       onFocusGained: (){
         getProfileImage();
-        loading.hide();
+        //loading.hide();
       },
 /*      onForegroundLost: (){
         getProfileImage();

lib/Screens/Login/background.dart

@@ -46,6 +46,7 @@ class Background extends StatelessWidget {
 }
 
 const List<Color> orangeGradients = [
+  Color(0xFF4858A7),
   Color(0xFF4858A7),
   Color(0xFF6474C6),
 ];

lib/Screens/Menu/Absensi/RequestHttp/checkIn_post.dart

@@ -8,10 +8,11 @@ import 'package:shared_preferences/shared_preferences.dart';
 
 class CheckIn_Post {
   late String session;
+  late String coordinate;
 
   CheckIn_Post({required this.session});
 
-  static Future<String> connectToAPI() async {
+  static Future<String> connectToAPI(String coordinate) async {
     String URL = baseURL + "/api/v1/check_in";
 
     final SharedPreferences prefs = await SharedPreferences.getInstance();
@@ -20,7 +21,8 @@ class CheckIn_Post {
     var sendData = await http.post(Uri.parse(URL), body: jsonEncode({
       "data": [
         {
-          "session": session
+          "session" : session,
+          "coordinate" : coordinate
         }
       ]
     }), headers: {
@@ -28,7 +30,7 @@ class CheckIn_Post {
       "Api-key": apiKey
     });
 
-    //developer.log(sendData.body, name: "Get Check In Result");
+    developer.log(sendData.body, name: "Get Check In Result");
     return sendData.body;
   }
 }

lib/Screens/Menu/Absensi/RequestHttp/checkOut_post.dart

@@ -8,10 +8,11 @@ import 'package:shared_preferences/shared_preferences.dart';
 
 class CheckOut_Post {
   late String session;
+  late String coordinate;
 
   CheckOut_Post({required this.session});
 
-  static Future<String> connectToAPI() async {
+  static Future<String> connectToAPI(String coordinate) async {
     String URL = baseURL + "/api/v1/check_out";
 
     final SharedPreferences prefs = await SharedPreferences.getInstance();
@@ -20,7 +21,8 @@ class CheckOut_Post {
     var sendData = await http.post(Uri.parse(URL), body: jsonEncode({
       "data": [
         {
-          "session": session
+          "session": session,
+          "coordinate" : coordinate
         }
       ]
     }), headers: {

lib/Screens/Menu/Absensi/absensi_history_screen.dart

@@ -93,8 +93,6 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
               double hours = double.parse(worked_hours);
 
               if (check_in != "false"){
-                //Get Day
-                String dayDate = DateFormat('EEEE').format(DateTime.parse(check_in));
                 String date = DateFormat('dd').format(DateTime.parse(check_in));
                 String month = DateFormat('MMM').format(DateTime.parse(check_in));
 
@@ -104,7 +102,6 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                 String showCheckInTime = checkInTimeLocal.substring(11, 19);
                 //logDev.log(showCheckInTime.substring(0,5), name: "SHOW CHECK IN TIME");
 
-                dayDate_List.add(dayDate.substring(0,3));
                 date_List.add(date);
                 month_List.add(month);
                 showCheckIn_List.add(showCheckInTime.substring(0,5));
@@ -117,8 +114,18 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                 String checkOutTimeLocal = checkOutTime.toLocal().toString();
                 String showCheckOutTime = checkOutTimeLocal.substring(11, 19);
                 //logDev.log(showCheckOutTime, name: "SHOW CHECK OUT TIME");
-
                 showCheckOut_List.add(showCheckOutTime.substring(0,5));
+
+                if (check_in.substring(0, 10) == check_out.substring(0,10)){
+                  //Get Day Check In
+                  String dayDate = DateFormat('EEEE').format(DateTime.parse(check_in));
+                  dayDate_List.add(dayDate.substring(0,3));
+                } else if (check_in.substring(0, 10) != check_out.substring(0,10)){
+                  //Get Day Check In & Check Out
+                  String dayDateIn = DateFormat('EEEE').format(DateTime.parse(check_in));
+                  String dayDateOut = DateFormat('EEEE').format(DateTime.parse(check_in));
+                  dayDate_List.add(dayDateIn.substring(0,3) + "\t" + dayDateOut.substring(0,3));
+                }
               }
               if (check_in == "false"){
                 String show_check_in = "-";
@@ -129,6 +136,9 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                 //String workingHours = "-";
                 //workingHours_List.add(workingHours);
                 showCheckOut_List.add(show_check_out);
+
+                String dayDate = DateFormat('EEEE').format(DateTime.parse(check_in));
+                dayDate_List.add(dayDate.substring(0,3));
               }
               if (check_in != "false" && check_out != "false"){
                 DateFormat format = DateFormat("HH:mm");

lib/Screens/Menu/Absensi/absensi_screen.dart

@@ -8,12 +8,14 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:hris_selfservice_mobile/Screens/Menu/Absensi/RequestHttp/checkIn_post.dart';
 import 'package:hris_selfservice_mobile/Screens/Menu/Absensi/RequestHttp/checkStatus_post.dart';
 import 'package:hris_selfservice_mobile/Screens/Menu/Absensi/absensi_history_screen.dart';
+import 'package:intl/intl.dart';
 import 'package:latlong2/latlong.dart' as latlong;
 import 'dart:developer' as logDev;
 
 import 'package:progress_dialog_null_safe/progress_dialog_null_safe.dart';
 
 import 'RequestHttp/checkOut_post.dart';
+import 'RequestHttp/historyAbsensi_post.dart';
 
 class AbsensiScreen extends StatefulWidget {
   const AbsensiScreen({Key? key}) : super(key: key);
@@ -30,10 +32,15 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
   latlong.LatLng point = latlong.LatLng(-6.183580253674716, 106.93103973792664);
   late Position position;
 
+  late String showCheckIn_List;
+  late String showCheckOut_List;
+
   MapController _mapController = MapController();
 
   @override
   void initState() {
+    showCheckIn_List = "";
+    showCheckOut_List = "";
     WidgetsBinding.instance.addPostFrameCallback((_) {
       determinePosition();
     });
@@ -102,18 +109,23 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
         if (object.containsKey("result").toString() == "true") {
           String result = object['result'].toString();
           logDev.log(result, name: "Status Absensi Result");
-          if (result.contains("belum")) {
+          if (result.contains("not_checked_in")) {
             setState(() {
               visibleCheckIn = !visibleCheckIn;
               visibleCheckOut = visibleCheckOut;
             });
             loading.hide();
-          } else if (result.contains("sudah")) {
+          } else if (result.contains("checked_in")) {
             setState(() {
               visibleCheckIn = visibleCheckIn;
               visibleCheckOut = !visibleCheckOut;
             });
             loading.hide();
+          } else {
+            setState(() {
+              alertDialogFailedResponse(context);
+            });
+            loading.hide();
           }
         } else {
           setState(() {
@@ -123,6 +135,54 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
         }
       });
 
+      //History
+      HistoryAbsensi_Post.connectToAPI().then((valueResult) async {
+        Map<String, dynamic> object = jsonDecode(valueResult);
+        if (object.containsKey("result").toString() == "true") {
+          String result = object['result'].toString();
+          if (result.contains("failed")) {
+            loading.hide();
+            alertDialogFailedRetrievedData(context);
+          } else {
+            List <dynamic> historyAbsensi = object['result'];
+            loading.hide();
+            setState(() {
+              String check_in = historyAbsensi[0]['check_in'].toString();
+              String check_out = historyAbsensi[0]['check_out'].toString();
+              logDev.log(historyAbsensi[0]['check_in'].toString(), name: "CHECK IN TIME");
+
+              if (check_in != "false") {
+                //Convert UTC to Local Time - Check In Time
+                DateTime checkInTime = DateFormat("yyyy-MM-dd HH:mm:ss").parse(
+                    check_in, true);
+                String checkInTimeLocal = checkInTime.toLocal().toString();
+                String showCheckInTime = checkInTimeLocal.substring(11, 19);
+                //logDev.log(showCheckInTime.substring(0,5), name: "SHOW CHECK IN TIME");
+                showCheckIn_List = showCheckInTime.substring(0, 5);
+              } else if (check_in == "false") {
+                String show_check_in = "-";
+                showCheckIn_List = show_check_in;
+              }
+
+              if (check_out != "false") {
+                //Convert UTC to Local Time - Check Out Time
+                DateTime checkOutTime = DateFormat("yyyy-MM-dd HH:mm:ss").parse(
+                    check_out, true);
+                String checkOutTimeLocal = checkOutTime.toLocal().toString();
+                String showCheckOutTime = checkOutTimeLocal.substring(11, 19);
+                //logDev.log(showCheckOutTime, name: "SHOW CHECK OUT TIME");
+                showCheckOut_List = showCheckOutTime.substring(0, 5);
+              } else if (check_out == "false") {
+                String show_check_out = "-";
+                showCheckOut_List = show_check_out;
+              }
+            });
+          }
+        } else {
+          alertDialogFailedRetrievedData(context);
+        }
+      });
+
       //loading.hide();
     }
   }
@@ -160,35 +220,32 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
 
     if (permission == LocationPermission.deniedForever) {
       loading.hide();
-      //return Future.error('Location permissions are permanently denied, we cannot request permissions.');
       return alertDialogPermissionDeniedForever(context);
     } else if (permission == LocationPermission.denied) {
       permission = await Geolocator.requestPermission();
       if (permission != LocationPermission.whileInUse && permission != LocationPermission.always) {
         loading.hide();
-        //return Future.error('Location permissions are denied (actual value: $permission).');
         return alertDialogPermissionDenied(context);
       }
     }
 
     position = await Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.high);
-    logDev.log(position.toString(), name: "Position GEOLOCATOR");
     if (position.isMocked) {
       loading.hide();
       setState(() {
         alertDialogFakeGPSDetected(context);
       });
     } else {
+      loading.hide();
       setState((){
         point = latlong.LatLng(position.latitude, position.longitude);
-        logDev.log(point.toString(), name: "POINT GEOLOCATOR");
+        logDev.log(point.toString(), name: "UPDATE POINT GEOLOCATOR");
         _mapController.move(point, 18);
       });
-      loading.hide();
     }
   }
 
-  goCheckIn() {
+  goCheckIn() async {
     ProgressDialog loading = ProgressDialog(context);
     loading = ProgressDialog(context,
         type: ProgressDialogType.normal, isDismissible: false, showLogs: true);
@@ -208,7 +265,22 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
             color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
 
     loading.show();
-    CheckIn_Post.connectToAPI().then((valueResult) async {
+    position = await Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.high);
+    if (position.isMocked) {
+      loading.hide();
+      setState(() {
+        alertDialogFakeGPSDetected(context);
+      });
+    } else {
+      loading.hide();
+      setState((){
+        point = latlong.LatLng(position.latitude, position.longitude);
+        _mapController.move(point, 18);
+      });
+    }
+    String coordinate = point.latitude.toString()+", "+ point.longitude.toString();
+
+    CheckIn_Post.connectToAPI(coordinate).then((valueResult) async {
       Map<String, dynamic> object = json.decode(valueResult);
       if (object.containsKey("result").toString() == "true") {
         String result = object['result'].toString();
@@ -238,7 +310,7 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
     });
   }
 
-  goCheckOut() {
+  goCheckOut() async {
     ProgressDialog loading = ProgressDialog(context);
     loading = ProgressDialog(context,
         type: ProgressDialogType.normal, isDismissible: false, showLogs: true);
@@ -258,7 +330,23 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
             color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
 
     loading.show();
-    CheckOut_Post.connectToAPI().then((valueResult) async {
+
+    position = await Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.high);
+    if (position.isMocked) {
+      loading.hide();
+      setState(() {
+        alertDialogFakeGPSDetected(context);
+      });
+    } else {
+      loading.hide();
+      setState((){
+        point = latlong.LatLng(position.latitude, position.longitude);
+        _mapController.move(point, 18);
+      });
+    }
+    String coordinate = point.latitude.toString()+", "+ point.longitude.toString();
+
+    CheckOut_Post.connectToAPI(coordinate).then((valueResult) async {
       Map<String, dynamic> object = json.decode(valueResult);
       if (object.containsKey("result").toString() == "true") {
         String result = object['result'].toString();
@@ -359,7 +447,7 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
                 children: <Widget>[
                   Container(
                     child: Text(
-                      "Attendance Today",
+                      "Last Attendance",
                       style: GoogleFonts.patrickHand(
                           fontSize: 21, color: Colors.white),
                     ),
@@ -394,7 +482,7 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
                                     Text('Check In',
                                         style: GoogleFonts.fredokaOne(
                                             fontSize: 19)),
-                                    Text('07.15',
+                                    Text(showCheckIn_List,
                                         style: GoogleFonts.barlowSemiCondensed(
                                             fontSize: 19)),
                                   ],
@@ -406,7 +494,7 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
                                     Text('Check Out',
                                         style: GoogleFonts.fredokaOne(
                                             fontSize: 19)),
-                                    Text('16.45',
+                                    Text(showCheckOut_List,
                                         style: GoogleFonts.barlowSemiCondensed(
                                             fontSize: 19)),
                                   ],
@@ -869,7 +957,7 @@ alertDialogPermissionDeniedForever(BuildContext context) {
   AlertDialog alert = AlertDialog(
     title: Text("Employee Self Service"),
     content: Text(
-        "Location permissions are permanently denied, we cannot request permissions.\nPlease configure it in your device settings."),
+        "Location permissions are permanently denied, we cannot request permissions. Please configure it in your device settings."),
     actions: [noButton],
   );
 

lib/Screens/Menu/SlipGaji/slipgaji_screen.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:hris_selfservice_mobile/Screens/Menu/SlipGaji/RequestHttp/detailSlipGaji_post.dart';
+import 'package:hris_selfservice_mobile/Screens/Menu/SlipGaji/RequestHttp/downloadSlipGaji_post.dart';
 import 'package:hris_selfservice_mobile/Screens/Menu/SlipGaji/RequestHttp/historySlipGaji_post.dart';
 import 'package:hris_selfservice_mobile/Screens/Menu/SlipGaji/background.dart';
 import 'package:progress_dialog_null_safe/progress_dialog_null_safe.dart';
@@ -132,7 +133,6 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
               String bulanTahun = bulanStr + " " + tahun;
               dateTo_List.add(bulanTahun);
               batchID_List.add(batchID);
-
             }
             dateTo_List.removeAt(0);
             batchID_List.removeAt(0);
@@ -145,13 +145,13 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
       } else {
         setState((){
           alertDialogFailedResponse(context);
-          Fluttertoast.showToast(
+         /* Fluttertoast.showToast(
               msg: "Server Response Error",
               toastLength: Toast.LENGTH_SHORT,
               gravity: ToastGravity.CENTER,
               timeInSecForIosWeb: 1,
               textColor: Colors.white,
-              fontSize: 16.0);
+              fontSize: 16.0);*/
         });
         loading.hide();
       }
@@ -390,7 +390,9 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
                       child: Container(
                         alignment: Alignment.centerRight,
                         child: ElevatedButton(
-                          onPressed: () {},
+                          onPressed: () {
+                            DownloadSlipGaji_Post.connectToAPI(batch_id).then((value) => null)
+                          },
                           style: ElevatedButton.styleFrom(),
                           child: Text('Download Slip Gaji'),
                         ),

lib/Screens/Splash/splash_screen.dart

@@ -54,9 +54,10 @@ class SplashScreen extends StatelessWidget {
               begin: Alignment.topRight,
               end: Alignment.bottomRight,
               colors: [
+                Color(0xFF4858A7),
                 Color(0xFF4858A7),
                 Color(0xFF6474C6),
-                Color(0xFF8C99DD),
+                //Color(0xFF8C99DD),
                 //Color(0xFFFFFFFF)
           ])),
       child: Center(

pubspec.lock

@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "3ff770dfff04a67b0863dff205a0936784de1b87a5e99b11c693fc10e66a9ce3"
+      sha256: "6215ac7d00ed98300b72f45ed2b38c2ca841f9f4e6965fab33cbd591e45e4473"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.12"
+    version: "1.0.13"
   animated_splash_screen:
     dependency: "direct main"
     description:
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: "139d809800a412ebb26a3892da228b2d0ba36f0ef5d9a82166e5e52ec8d61611"
+      sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   async:
     dependency: "direct main"
     description:
@@ -101,18 +101,18 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: "745ebcccb1ef73768386154428a55250bc8d44059c19fd27aecda2a6dc013a22"
+      sha256: "8875e8ed511a49f030e313656154e4bbbcef18d68dfd32eb853fac10bce48e96"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
       name: connectivity_plus_platform_interface
-      sha256: b8795b9238bf83b64375f63492034cb3d8e222af4d9ce59dda085edf038fa06f
+      sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.3"
+    version: "1.2.4"
   convert:
     dependency: transitive
     description:
@@ -125,10 +125,10 @@ packages:
     dependency: transitive
     description:
       name: cross_file
-      sha256: f71079978789bc2fe78d79227f1f8cfe195b31bbd8db2399b0d15a4b96fb843b
+      sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3+2"
+    version: "0.3.3+4"
   crypto:
     dependency: transitive
     description:
@@ -165,10 +165,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "7ff671ed0a6356fa8f2e1ae7d3558d3fb7b6a41e24455e4f8df75b811fb8e4ab"
+      sha256: "1d6e5a61674ba3a68fb048a7c7b4ff4bebfed8d7379dbe8f2b718231be9a7c95"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "8.1.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -229,50 +229,50 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: c129209ba55f3d4272c89fb4a4994c15bea77fb6de63a82d45fb6bc5c94e4355
+      sha256: be13e431c0c950f0fc66bdb67b41b8059121d7e7d8bbbc21fb59164892d561f8
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.5.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
       name: firebase_core_platform_interface
-      sha256: "5fab93f5b354648efa62e7cc829c90efb68c8796eecf87e0888cae2d5f3accd4"
+      sha256: "5615b30c36f55b2777d0533771deda7e5730e769e5d3cb7fda79e9bed86cfa55"
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.2"
+    version: "4.5.3"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: "18b35ce111b0a4266abf723c825bcf9d4e2519d13638cc7f06f2a8dd960c75bc"
+      sha256: "4b3a41410f3313bb95fd560aa5eb761b6ad65c185de772c72231e8b4aeed6d18"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   firebase_messaging:
     dependency: "direct main"
     description:
       name: firebase_messaging
-      sha256: dc010a6436333029fba858415fe65887c3fe44d8f6e6ea162bb8d3dd764fbcb6
+      sha256: dbccddc62fef6f3745ba83062bfd1fbf2eb6a931db4c73d03f85c5772dfdec7f
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.1"
+    version: "14.2.2"
   firebase_messaging_platform_interface:
     dependency: transitive
     description:
       name: firebase_messaging_platform_interface
-      sha256: abda2d766486096eb1c568c7b20aef46180596c8b0708190b929133ff03e0a8d
+      sha256: "564a47ea76db9cd2d17e7d95790428ad3de9d0075795d14c4c901ba0bf518e1a"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.10"
+    version: "4.2.11"
   firebase_messaging_web:
     dependency: transitive
     description:
       name: firebase_messaging_web
-      sha256: "7a0ce957bd2210e8636325152234728874dad039f1c7271ba1be5c752fdc5888"
+      sha256: "76291494583a003d4ce0d613c41cb87c58fab25773317daa66a245f537e1c3f7"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.11"
+    version: "3.2.12"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -282,10 +282,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_image
-      sha256: fa47ea2392de894efd41026b20c166af085d03077ddb8ac6dd73eb4c23bb97ca
+      sha256: "3161bf96fef90ec6d46a43879001d8a4c07aaa9d0aa2bd8ee85311f3b517e25f"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.4"
+    version: "4.1.5"
   flutter_launcher_icons:
     dependency: "direct main"
     description:
@@ -330,10 +330,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_map_marker_cluster
-      sha256: a272a9f79ec4964272646a5ecad26108040ac2f489e58f1a28d67069b341c3f0
+      sha256: "793e68ccdb323f0e5059eecf3f8777892a9365186ab57c07ebe82e10ad7737ef"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   flutter_map_marker_popup:
     dependency: transitive
     description:
@@ -396,10 +396,10 @@ packages:
     dependency: "direct main"
     description:
       name: fluttertoast
-      sha256: "7cc92eabe01e3f1babe1571c5560b135dfc762a34e41e9056881e2196b178ec1"
+      sha256: "774fa28b07f3a82c93596bc137be33189fec578ed3447a93a5a11c93435de394"
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.2"
+    version: "8.1.3"
   focus_detector:
     dependency: "direct main"
     description:
@@ -548,10 +548,10 @@ packages:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: b1cbfec0f5aef427a18eb573f5445af8c9c568626bf3388553e40c263d3f7368
+      sha256: "385f12ee9c7288575572c7873a332016ec45ebd092e1c2f6bd421b4a9ad21f1d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.5+5"
+    version: "0.8.5+6"
   image_picker_for_web:
     dependency: transitive
     description:
@@ -564,10 +564,10 @@ packages:
     dependency: transitive
     description:
       name: image_picker_ios
-      sha256: "39c013200046d14c58b71dc4fa3d00e425fc9c699d589136cd3ca018727c0493"
+      sha256: "8ffb14b43713d7c43fb21299cc18181cc5b39bd3ea1cc427a085c6400fe5aa52"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.6+6"
+    version: "0.8.6+7"
   image_picker_platform_interface:
     dependency: transitive
     description:
@@ -764,10 +764,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379
+      sha256: "2e32f1640f07caef0d3cb993680f181c79e54a3827b997d5ee221490d131fbd9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
+    version: "2.1.8"
   path_provider_platform_interface:
     dependency: transitive
     description:
@@ -892,10 +892,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "1ffa239043ab8baf881ec3094a3c767af9d10399b2839020b9e4d44c0bb23951"
+      sha256: "2b55c18636a4edc529fa5cd44c03d3f3100c00513f518c5127c951978efcccd0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -1025,10 +1025,10 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "698fa0b4392effdc73e9e184403b627362eb5fbf904483ac9defbb1c2191d809"
+      sha256: e8f2efc804810c0f2f5b485f49e7942179f56eabcfe81dce3387fec4bb55876b
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.8"
+    version: "6.1.9"
   url_launcher_android:
     dependency: transitive
     description:
@@ -1041,10 +1041,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: bb328b24d3bccc20bdf1024a0990ac4f869d57663660de9c936fb8c043edefe3
+      sha256: "0a5af0aefdd8cf820dd739886efb1637f1f24489900204f50984634c07a54815"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.18"
+    version: "6.1.0"
   url_launcher_linux:
     dependency: transitive
     description:

pubspec.yaml

@@ -47,8 +47,6 @@ dependencies:
   intl: ^0.17.0
   dio: ^4.0.6
   get_it: ^7.2.0
-  firebase_messaging: ^14.1.3
-  flutter_local_notifications: ^13.0.0
   shared_preferences: ^2.0.15
   # device_information: ^0.0.4
   device_imei: ^0.0.2
@@ -80,11 +78,13 @@ dependencies:
   flutter_map_marker_cluster: ^1.0.1
   flutter_polyline_points: ^1.0.0
   provider: ^6.0.5
-  connectivity_plus: ^3.0.2
+  connectivity_plus: ^3.0.3
   internet_connection_checker: ^1.0.0+1
   #plain_notification_token: ^0.0.4
   focus_detector: ^2.0.1
   firebase_core: ^2.4.1
+  flutter_local_notifications: ^13.0.0
+  firebase_messaging: ^14.1.3
 
 dev_dependencies:
   flutter_test: