Update 2402 13:43

android/app/src/main/AndroidManifest.xml

@@ -33,6 +33,10 @@
             <meta-data
                 android:name="io.flutter.embedding.android.NormalTheme"
                 android:resource="@style/NormalTheme" />
+            <intent-filter>
+                <action android:name="FLUTTER_NOTIFICATION_CLICK"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

lib/Screens/CheckInternetConnection/CheckInternetConnection.dart

@@ -1,100 +0,0 @@
-import 'dart:async';
-import 'dart:developer' as developer;
-
-import 'package:connectivity_plus/connectivity_plus.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:google_fonts/google_fonts.dart';
-import 'package:lottie/lottie.dart';
-
-class MyHomePage extends StatefulWidget {
-  @override
-  State<MyHomePage> createState() => _MyHomePageState();
-}
-
-class _MyHomePageState extends State<MyHomePage> {
-  ConnectivityResult _connectionStatus = ConnectivityResult.none;
-  final Connectivity _connectivity = Connectivity();
-  late StreamSubscription<ConnectivityResult> _connectivitySubscription;
-
-  @override
-  void initState() {
-    super.initState();
-    initConnectivity();
-
-    _connectivitySubscription = _connectivity.onConnectivityChanged.listen(_updateConnectionStatus);
-  }
-
-  @override
-  void dispose() {
-    _connectivitySubscription.cancel();
-    super.dispose();
-  }
-
-  // Platform messages are asynchronous, so we initialize in an async method.
-  Future<void> initConnectivity() async {
-    late ConnectivityResult result;
-    // Platform messages may fail, so we use a try/catch PlatformException.
-    try {
-      result = await _connectivity.checkConnectivity();
-    } on PlatformException catch (e) {
-      developer.log('Couldn\'t check connectivity status', error: e);
-      return;
-    }
-
-    // If the widget was removed from the tree while the asynchronous platform
-    // message was in flight, we want to discard the reply rather than calling
-    // setState to update our non-existent appearance.
-    if (!mounted) {
-      return Future.value(null);
-    }
-
-    return _updateConnectionStatus(result);
-  }
-
-  Future<void> _updateConnectionStatus(ConnectivityResult result) async {
-    setState(() {
-      _connectionStatus = result;
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      child: Column(
-        children: [
-          SizedBox(
-            width: 250,
-            height: 250,
-            child: LottieBuilder.asset(
-                'assets/animation/animation_no_internet.json',
-                repeat: true),
-          ),
-          Text(
-            "No Internet Connection",
-            style: GoogleFonts.josefinSans(fontSize: 18),
-          ),
-          Padding(
-            padding: EdgeInsets.all(15),
-            child: Text(
-              'You Are Not Connected to The Internet. Please check your Wifi or Mobile Data!',
-              style: GoogleFonts.zillaSlab(fontSize: 16),
-            ),
-          ),
-          ElevatedButton(
-              onPressed: (){
-
-              },
-              child: Text("Retry",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                      color: Colors.white,
-                      fontSize: 17,
-                      fontWeight: FontWeight.w500)
-              )
-          )
-        ],
-      ),
-    );
-  }
-}

lib/Screens/CheckInternetConnection/ConnectivityProvider.dart

@@ -1,21 +0,0 @@
-import 'package:flutter/material.dart';
-
-class ConnectivityProvider with ChangeNotifier{
-  /*Connectivity
-  ConnectivityProvider _connectivityProvider = new ConnectivityProvider();
-
-  late bool _isOnline;
-  bool get isOnline => _isOnline;
-
-  startMonitoring() async {
-
-  }
-
-  Future<void> initConnectivity() async {
-    try {
-      var connectivityResult = await (Connectivity().checkConnectivity());
-    } catch {
-
-    }
-  }*/
-}

lib/Screens/CheckInternetConnection/NoInternetConnection.dart

@@ -1,40 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
-import 'package:lottie/lottie.dart';
-
-class NoInternetConnection extends StatefulWidget {
-  const NoInternetConnection({Key? key}) : super(key: key);
-
-  @override
-  State<NoInternetConnection> createState() => _NoInternetConnectionState();
-}
-
-class _NoInternetConnectionState extends State<NoInternetConnection> {
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      child: Column(
-        children: [
-          SizedBox(
-            width: 250,
-            height: 250,
-            child: LottieBuilder.asset(
-                'assets/animation/animation_no_internet.json',
-                repeat: true),
-          ),
-          Text(
-            "No Internet Connection",
-            style: GoogleFonts.josefinSans(fontSize: 18),
-          ),
-          Padding(
-            padding: EdgeInsets.all(15),
-            child: Text(
-              'You Are Not Connected to The Internet. Please check your Wifi or Mobile Data!',
-              style: GoogleFonts.zillaSlab(fontSize: 16),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/Screens/ForgotPassword/forgotPassword_screen.dart

@@ -146,7 +146,7 @@ class ForgotPasswordScreen extends StatelessWidget {
                                       AlertDialog alert = AlertDialog(
                                         title: Text("Employee Self Service"),
                                         //content: Text(message),
-                                        content: Text("Link for reset password has been sent to your email address"),
+                                        content: Text("Link to reset password has been sent to your email address"),
                                         actions: [
                                           okButton,
                                         ],
@@ -154,6 +154,7 @@ class ForgotPasswordScreen extends StatelessWidget {
                                       // show the dialog
                                       showDialog(
                                         context: context,
+                                        barrierDismissible: false,
                                         builder: (BuildContext context) {
                                           return alert;
                                         },
@@ -179,6 +180,7 @@ class ForgotPasswordScreen extends StatelessWidget {
                                       // show the dialog
                                       showDialog(
                                         context: context,
+                                        barrierDismissible: false,
                                         builder: (BuildContext context) {
                                           return alert;
                                         },
@@ -292,6 +294,7 @@ showAlertDialog(BuildContext context) {
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },

lib/Screens/Home/home_screen.dart

@@ -1,7 +1,10 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:double_back_to_close/double_back_to_close.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:focus_detector/focus_detector.dart';
@@ -13,11 +16,13 @@ import 'package:hris_selfservice_mobile/Screens/Menu/Reimburse/reimburse_screen.
 import 'package:hris_selfservice_mobile/Screens/Menu/SlipGaji/slipgaji_screen.dart';
 import 'package:hris_selfservice_mobile/Screens/Menu/SuratTugas/surattugas_screen.dart';
 import 'package:hris_selfservice_mobile/Screens/Settings/settings_screen.dart';
+import 'package:lottie/lottie.dart';
 import 'package:progress_dialog_null_safe/progress_dialog_null_safe.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'dart:developer' as logDev;
 import '../Settings/RequestHttp/getDetail_post.dart';
 import '../Settings/RequestHttp/getProfileImage_post.dart';
+import 'package:internet_connection_checker/internet_connection_checker.dart';
 
 var _imageToShow;
 late String nameShared;
@@ -36,44 +41,44 @@ class HomeView extends StatefulWidget {
 }
 
 class _HomeView extends State<HomeView> {
+  late StreamSubscription subscription;
+  bool isDeviceConnected = false;
+  bool isAlertSet = false;
+
   @override
   initState() {
+    getConnectivity();
     getDetail();
     _imageToShow = AssetImage('assets/images/ic_administrator.png');
-    /*WidgetsBinding.instance.addPostFrameCallback((_) async {
-      ProgressDialog loading = ProgressDialog(context);
-      loading = ProgressDialog(context,
-          type: ProgressDialogType.normal,
-          isDismissible: false,
-          showLogs: true);
-      loading.style(
-          message: 'Please Wait .....',
-          borderRadius: 5,
-          backgroundColor: Colors.white,
-          progressWidget: CircularProgressIndicator(),
-          elevation: 10.0,
-          padding: EdgeInsets.all(10),
-          insetAnimCurve: Curves.easeInOut,
-          progress: 0.0,
-          maxProgress: 100.0,
-          progressTextStyle: TextStyle(
-              color: Colors.black, fontSize: 10.0, fontWeight: FontWeight.w400),
-          messageTextStyle: TextStyle(
-              color: Colors.black,
-              fontSize: 15.0,
-              fontWeight: FontWeight.w600));
-      loading.show();
-      _imageToShow = getProfileImage();
-    });*/
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      getProfileImage();
+    });
     super.initState();
   }
 
+  getConnectivity() =>
+      subscription = Connectivity().onConnectivityChanged.listen(
+            (ConnectivityResult result) async {
+          isDeviceConnected = await InternetConnectionChecker().hasConnection;
+          if (!isDeviceConnected && isAlertSet == false) {
+            showDialogBox();
+            setState(() => isAlertSet = true);
+          }
+        },
+      );
+
+  @override
+  void dispose() {
+    subscription.cancel();
+    super.dispose();
+  }
+
   //Get Profile image
   getProfileImage() async {
     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 +98,9 @@ class _HomeView extends State<HomeView> {
         messageTextStyle: TextStyle(
             color: Colors.black,
             fontSize: 15.0,
-            fontWeight: FontWeight.w600));*/
+            fontWeight: FontWeight.w600));
+
+    loading.show();
 
     GetProfileImage_Post.connectToAPI(session!).then((valueResult) async {
       Map<String, dynamic> object = json.decode(valueResult);
@@ -108,14 +115,13 @@ class _HomeView extends State<HomeView> {
             });
           } else if (photo != "false") {
             Uint8List decodedBytes = Base64Decoder().convert(photo);
-            //logDev.log(decodedBytes.toString(), name: "DECODED BYTES photo");
             setState(() {
               _imageToShow = Image
                   .memory(decodedBytes, gaplessPlayback: true)
                   .image;
             });
           }
-          //loading.hide();
+          loading.hide();
         } else if (status == "failed") {
           String message = object['result']['message'].toString();
           Fluttertoast.showToast(
@@ -126,7 +132,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 +141,7 @@ class _HomeView extends State<HomeView> {
             timeInSecForIosWeb: 1,
             textColor: Colors.white,
             fontSize: 16.0);
-        //loading.hide();
+        loading.hide();
       }
     });
     return _imageToShow;
@@ -143,9 +149,7 @@ class _HomeView extends State<HomeView> {
 
   //GetDetail
   getDetail() async {
-    final SharedPreferences prefs = await SharedPreferences.getInstance();
-    final session = prefs.getString('session');
-    GetDetail_Post.connectToAPI(session!).then((valueResult) async {
+    GetDetail_Post.connectToAPI().then((valueResult) async {
       Map<String, dynamic> object = json.decode(valueResult);
       if (object.containsKey("result").toString() == "true") {
         statusDetail = object['result']['status'].toString();
@@ -207,6 +211,40 @@ class _HomeView extends State<HomeView> {
       ),
     );
   }
+
+  showDialogBox() => showCupertinoDialog<String>(
+    context: context,
+    builder: (BuildContext context) => CupertinoAlertDialog(
+      title: const Text('No Connection'),
+      content: const Text('Please check your internet connectivity'),
+      actions: <Widget>[
+        Column(
+          children: [
+            SizedBox(
+              width: 250,
+              height: 250,
+              child: LottieBuilder.asset(
+                  //'assets/animation/animation_no_internet.json',
+                  'assets/animation/animation_no_internet_3.json',
+                  repeat: true),
+            ),
+          ],
+        ),
+        TextButton(
+          onPressed: () async {
+            Navigator.pop(context, 'Cancel');
+            setState(() => isAlertSet = false);
+            isDeviceConnected = await InternetConnectionChecker().hasConnection;
+            if (!isDeviceConnected && isAlertSet == false) {
+              showDialogBox();
+              setState(() => isAlertSet = true);
+            }
+          },
+          child: const Text('Retry'),
+        ),
+      ],
+    ),
+  );
 }
 
 class HomeScreen extends StatefulWidget {
@@ -220,29 +258,6 @@ class _HomeScreenState extends State<HomeScreen> {
     final SharedPreferences prefs = await SharedPreferences.getInstance();
     final session = prefs.getString('session');
 
-    /*ProgressDialog loading = ProgressDialog(context);
-    loading = ProgressDialog(context,
-        type: ProgressDialogType.normal,
-        isDismissible: false,
-        showLogs: true);
-    loading.style(
-        message: 'Please Wait .....',
-        borderRadius: 5,
-        backgroundColor: Colors.white,
-        progressWidget: CircularProgressIndicator(),
-        elevation: 10.0,
-        padding: EdgeInsets.all(10),
-        insetAnimCurve: Curves.easeInOut,
-        progress: 0.0,
-        maxProgress: 100.0,
-        progressTextStyle: TextStyle(
-            color: Colors.black, fontSize: 10.0, fontWeight: FontWeight.w400),
-        messageTextStyle: TextStyle(
-            color: Colors.black,
-            fontSize: 15.0,
-            fontWeight: FontWeight.w600));
-
-    loading.show();*/
     GetProfileImage_Post.connectToAPI(session!).then((valueResult) async {
       Map<String, dynamic> object = json.decode(valueResult);
       if (object.containsKey("result").toString() == "true") {
@@ -258,9 +273,7 @@ class _HomeScreenState extends State<HomeScreen> {
             Uint8List decodedBytes = Base64Decoder().convert(photo);
             //logDev.log(decodedBytes.toString(), name: "DECODED BYTES photo");
             setState(() {
-              _imageToShow = Image
-                  .memory(decodedBytes, gaplessPlayback: true)
-                  .image;
+              _imageToShow = Image.memory(decodedBytes, gaplessPlayback: true).image;
             });
           }
         } else if (status == "failed") {
@@ -292,52 +305,24 @@ class _HomeScreenState extends State<HomeScreen> {
   Widget build(BuildContext context) {
     var size = MediaQuery.of(context).size;
 
-    /*ProgressDialog loading = ProgressDialog(context);
-    loading = ProgressDialog(context,
-    type: ProgressDialogType.normal,
-    isDismissible: false,
-    showLogs: true);
-    loading.style(
-    message: 'Please Wait .....',
-    borderRadius: 5,
-    backgroundColor: Colors.white,
-    progressWidget: CircularProgressIndicator(),
-    elevation: 10.0,
-    padding: EdgeInsets.all(10),
-    insetAnimCurve: Curves.easeInOut,
-    progress: 0.0,
-    maxProgress: 100.0,
-    progressTextStyle: TextStyle(
-    color: Colors.black, fontSize: 10.0, fontWeight: FontWeight.w400),
-    messageTextStyle: TextStyle(
-    color: Colors.black,
-    fontSize: 15.0,
-    fontWeight: FontWeight.w600));*/
-
     return FocusDetector(
       /*onVisibilityGained: (){
         getProfileImage();
-        loading.hide();
       },
       onVisibilityLost: (){
         getProfileImage();
-        loading.hide();
       },
       onFocusLost: (){
         getProfileImage();
-        loading.hide();
       },*/
       onFocusGained: (){
         getProfileImage();
-        //loading.hide();
       },
 /*      onForegroundLost: (){
         getProfileImage();
-        loading.hide();
       },
       onForegroundGained: (){
         getProfileImage();
-        loading.hide();
       },*/
       child: Scaffold(
           body: SingleChildScrollView(

lib/Screens/Login/login_screen.dart

@@ -18,7 +18,6 @@ import '../Home/home_screen.dart';
 import 'inputWidget.dart';
 import 'dart:developer' as logDev;
 //import 'package:plain_notification_token/plain_notification_token.dart';
-import 'dart:io' show Platform;
 
 class LoginView extends StatefulWidget {
   @override
@@ -51,25 +50,12 @@ class _LoginScreenState extends State<LoginScreen> {
   String version = "1.0.0";
   String notif_token = "";
 
-  String _pushToken = '0819';
-  //IosNotificationSettings? _settings;
   late StreamSubscription onTokenRefreshSubscription;
 
   @override
   void initState() {
-    /*WidgetsBinding.instance.addPostFrameCallback((_) {
-      getNotifToken();
-    });*/
     super.initState();
   }
-  
-  /*getNotifToken () async {
-    await Firebase.initializeApp(
-      options: DefaultFirebaseOptions.currentPlatform,
-    );
-    final notif_token = await FirebaseMessaging.instance.getToken();
-    logDev.log(notif_token.toString(), name: "NOTIFICATION TOKEN");
-  }*/
 
   @override
   Widget build(BuildContext context) {
@@ -201,7 +187,6 @@ class _LoginScreenState extends State<LoginScreen> {
                                           platform(),
                                           imei)
                                       .then((valueResult) async {
-                                    // loginPostResult = valueResult;
                                     Map<String, dynamic> object = json.decode(valueResult);
                                     if (object.containsKey("result").toString() == "true") {
                                       String status = object['result']['status'].toString();
@@ -225,15 +210,9 @@ class _LoginScreenState extends State<LoginScreen> {
                                         passwordController.clear();
 
                                         await loading.hide();
-                                        Navigator.pushReplacement(
-                                            context,
-                                            MaterialPageRoute(
-                                                builder: (context) =>
-                                                    HomeView()));
+                                        Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) => HomeView()));
                                       } else if (status == "failed") {
-                                        String message = object['result']
-                                                ['message']
-                                            .toString();
+                                        String message = object['result']['message'].toString();
                                         Fluttertoast.showToast(
                                             msg: message,
                                             toastLength: Toast.LENGTH_SHORT,
@@ -405,6 +384,7 @@ alertDialogFailedResponse(BuildContext context){
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },

lib/Screens/Menu/Absensi/absensi_history_screen.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:hris_selfservice_mobile/constants.dart';
 import 'package:intl/intl.dart';
 import 'package:progress_dialog_null_safe/progress_dialog_null_safe.dart';
 import 'dart:developer' as logDev;
@@ -25,12 +26,16 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
   late List <String> dayDate_List;
   late List <String> date_List;
   late List <String> month_List;
+
   //late List <String> workingHours_List;
   late List <String> showCheckIn_List;
   late List <String> showCheckOut_List;
 
   int HistoryLength = 0;
 
+  //List Visibility Double Date
+  late List <bool> visibilityDate2;
+
   @override
   initState() {
     super.initState();
@@ -43,10 +48,13 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
     dayDate_List = [""];
     date_List = [""];
     month_List = [""];
+
     //workingHours_List = [""];
     showCheckIn_List = [""];
     showCheckOut_List = [""];
 
+    visibilityDate2 = [false];
+
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       getHistoryData();
     });
@@ -102,9 +110,10 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                 String showCheckInTime = checkInTimeLocal.substring(11, 19);
                 //logDev.log(showCheckInTime.substring(0,5), name: "SHOW CHECK IN TIME");
 
-                date_List.add(date);
-                month_List.add(month);
+                date_List.add(date + "|00");
+                month_List.add(month + "|000");
                 showCheckIn_List.add(showCheckInTime.substring(0,5));
+                //visibilityDate2[i+1] = false;
               }
               if (check_out != "false"){
                 //Convert UTC to Local Time - Check Out Time
@@ -115,18 +124,43 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                 String showCheckOutTime = checkOutTimeLocal.substring(11, 19);
                 //logDev.log(showCheckOutTime, name: "SHOW CHECK OUT TIME");
                 showCheckOut_List.add(showCheckOutTime.substring(0,5));
+                //visibilityDate2[i+1] = true;
 
                 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));
+                  String dayDateIn = DateFormat('EEEE').format(DateTime.parse(check_in));
+                  String dateIn = DateFormat('dd').format(DateTime.parse(check_in));
+                  String monthIn = DateFormat('MMM').format(DateTime.parse(check_in));
+
+                  //dayDate_List.add(dayDate.substring(0,3));
+                  dayDate_List.add(dayDateIn.substring(0,3) + "|000");
+                  date_List[i+1] = dateIn + "|00";
+                  month_List[i+1] = monthIn + "|000";
+                  visibilityDate2[i+1] = false;
+
                 } 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));
+                  String dayDateOut = DateFormat('EEEE').format(DateTime.parse(check_out));
+
+                  String dateIn = DateFormat('dd').format(DateTime.parse(check_in));
+                  String monthIn = DateFormat('MMM').format(DateTime.parse(check_in));
+
+                  String dateOut = DateFormat('dd').format(DateTime.parse(check_out));
+                  String monthOut = DateFormat('MMM').format(DateTime.parse(check_out));
+
+                  logDev.log(dateIn + "\n" + monthIn + "\n" + dateOut + "\n" + monthOut, name: "ABSENSI IN OUT TIDAK SAMA");
+
+                  dayDate_List.add(dayDateIn.substring(0,3) + "|" + dayDateOut.substring(0,3));
+                  date_List[i+1] = dateIn + "|" + dateOut;
+                  month_List[i+1] = monthIn + "|" + monthOut;
+
+                  visibilityDate2[i+1] = true;
+
+                  logDev.log(dayDate_List.toString() + "\n" + date_List.toString() + "\n" + month_List.toString(), name: "LIST ABSENSI IN OUT TIDAK SAMA");
                 }
               }
+
               if (check_in == "false"){
                 String show_check_in = "-";
                 showCheckIn_List.add(show_check_in);
@@ -138,7 +172,7 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                 showCheckOut_List.add(show_check_out);
 
                 String dayDate = DateFormat('EEEE').format(DateTime.parse(check_in));
-                dayDate_List.add(dayDate.substring(0,3));
+                dayDate_List.add(dayDate.substring(0,3) + "|000");
               }
               if (check_in != "false" && check_out != "false"){
                 DateFormat format = DateFormat("HH:mm");
@@ -163,10 +197,13 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
             dayDate_List.removeAt(0);
             date_List.removeAt(0);
             month_List.removeAt(0);
+
             //workingHours_List.removeAt(0);
             showCheckIn_List.removeAt(0);
             showCheckOut_List.removeAt(0);
 
+            visibilityDate2.removeAt(0);
+
             HistoryLength = historyAbsensi.length;
           });
         }
@@ -236,29 +273,68 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                           child: Row(
                             children: [
                               Expanded(
-                                  flex: 2,
+                                  flex: 3,
                                   child:
                                   Container(
+                                    alignment: Alignment.center,
                                     padding: EdgeInsets.all(5),
                                     decoration: BoxDecoration(
                                         border: Border.all(color: Colors.black),
                                         borderRadius: BorderRadius.all(Radius.circular(3)),
                                     ),
                                     child: Column(
+                                      mainAxisAlignment: MainAxisAlignment.center,
                                       children: [
-                                        Text(dayDate_List[i], style: GoogleFonts.fredokaOne(fontSize: 16, color: Colors.blueGrey)),
-                                        Text(date_List[i], style: GoogleFonts.fredokaOne(fontSize: 16, color: Colors.blueGrey)),
-                                        Text(month_List[i], style: GoogleFonts.fredokaOne(fontSize: 16, color: Colors.blueGrey)),
+                                        Row(
+                                          children: [
+                                            Text(dayDate_List[i].substring(0,3), style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey)),
+                                            Visibility(
+                                              visible: visibilityDate2[i],
+                                              child: Text("\t|\t", style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey)),
+                                            ),
+                                            Visibility(
+                                              visible: visibilityDate2[i],
+                                              child: Text(dayDate_List[i].substring(4,7), style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey)),
+                                            )
+                                          ],
+                                        ),
+                                        Row(
+                                          children: [
+                                            Text(date_List[i].substring(0,2), style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey)),
+                                            Visibility(
+                                              visible: visibilityDate2[i],
+                                              child: Text("\t|\t", style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey)),
+                                            ),
+                                            Visibility(
+                                              visible: visibilityDate2[i],
+                                              child: Text(date_List[i].substring(3,5), style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey)),
+                                            ),
+                                          ],
+                                        ),
+                                        Row(
+                                          children: [
+                                            Text(month_List[i].substring(0,3), style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey)),
+                                            Visibility(
+                                              visible: visibilityDate2[i],
+                                              child: Text("\t|\t", style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey)),
+                                            ),
+                                            Visibility(
+                                              visible: visibilityDate2[i],
+                                              child: Text(month_List[i].substring(4,7), style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey)),
+                                            )
+                                          ],
+                                        ),
                                       ],
-                                    ),
+                                    )
+                                    ,
                                   )
                               ),
                               Expanded(
                                 flex: 2,
                                 child: Column(
                                   children: [
-                                    Text("Check In", style: GoogleFonts.fredokaOne(fontSize: 17),),
-                                    Text(showCheckIn_List[i], style: GoogleFonts.barlowSemiCondensed(fontSize: 17),),
+                                    Text("Check In", style: GoogleFonts.fredokaOne(fontSize: 16),textAlign: TextAlign.center),
+                                    Text(showCheckIn_List[i], style: GoogleFonts.barlowSemiCondensed(fontSize: 16),textAlign: TextAlign.center),
                                   ],
                                 ),
                               ),
@@ -266,17 +342,17 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                                 flex: 2,
                                 child: Column(
                                   children: [
-                                    Text("Check Out", style: GoogleFonts.fredokaOne(fontSize: 16),),
-                                    Text(showCheckOut_List[i], style: GoogleFonts.barlowSemiCondensed(fontSize: 17),),
+                                    Text("Check Out", style: GoogleFonts.fredokaOne(fontSize: 16),textAlign: TextAlign.center),
+                                    Text(showCheckOut_List[i], style: GoogleFonts.barlowSemiCondensed(fontSize: 16),textAlign: TextAlign.center),
                                   ],
                                 ),
                               ),
                               Expanded(
-                                flex: 3,
+                                flex: 2,
                                 child: Column(
                                   children: [
-                                    Text("Working Hours", style: GoogleFonts.fredokaOne(fontSize: 16),),
-                                    Text(worked_hours_List[i], style: GoogleFonts.barlowSemiCondensed(fontSize: 17),),
+                                    Text("Working\nHours", style: GoogleFonts.fredokaOne(fontSize: 16), textAlign: TextAlign.center),
+                                    Text(worked_hours_List[i], style: GoogleFonts.barlowSemiCondensed(fontSize: 16),textAlign: TextAlign.center),
                                   ],
                                 ),
                               ),
@@ -319,7 +395,7 @@ alertDialogFailedRetrievedData(BuildContext context) {
 
   // set up the AlertDialog
   AlertDialog alert = AlertDialog(
-    title: Text("Employee Self Service"),
+    title: Text(appName),
     content: Text("Failed to Retrieve Data"),
     actions: [
       noButton,
@@ -330,6 +406,7 @@ alertDialogFailedRetrievedData(BuildContext context) {
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },
@@ -357,7 +434,7 @@ alertDialogFailedResponse(BuildContext context){
 
   // set up the AlertDialog
   AlertDialog alert = AlertDialog(
-    title: Text("Employee Self Service"),
+    title: Text(appName),
     content: Text("Server Response Error"),
     actions: [
       noButton,
@@ -368,6 +445,7 @@ alertDialogFailedResponse(BuildContext context){
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },

lib/Screens/Menu/Absensi/absensi_screen.dart

@@ -723,6 +723,7 @@ alertDialogFailedRetrievedData(BuildContext context) {
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },
@@ -760,6 +761,7 @@ alertDialogFailedResponse(BuildContext context) {
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },
@@ -788,6 +790,7 @@ alertDialogSuccessCheckIn(BuildContext context) {
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },
@@ -816,6 +819,7 @@ alertDialogSuccessCheckOut(BuildContext context) {
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },
@@ -844,6 +848,7 @@ alertDialogFailedCheckIn(BuildContext context) {
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },
@@ -872,6 +877,7 @@ alertDialogFailedCheckOut(BuildContext context) {
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },
@@ -900,6 +906,7 @@ alertDialogFakeGPSDetected(BuildContext context) {
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },
@@ -938,6 +945,7 @@ alertDialogPermissionDenied(BuildContext context) {
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },
@@ -964,6 +972,7 @@ alertDialogPermissionDeniedForever(BuildContext context) {
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },

lib/Screens/Menu/SlipGaji/slipgaji_screen.dart

@@ -2,16 +2,17 @@ import 'dart:convert';
 
 import 'package:flutter/cupertino.dart';
 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:hris_selfservice_mobile/constants.dart';
 import 'package:progress_dialog_null_safe/progress_dialog_null_safe.dart';
 import 'dart:developer' as logDev;
 
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 class SlipGajiScreen extends StatefulWidget {
   const SlipGajiScreen({Key? key}) : super(key: key);
@@ -145,13 +146,6 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
       } else {
         setState((){
           alertDialogFailedResponse(context);
-         /* Fluttertoast.showToast(
-              msg: "Server Response Error",
-              toastLength: Toast.LENGTH_SHORT,
-              gravity: ToastGravity.CENTER,
-              timeInSecForIosWeb: 1,
-              textColor: Colors.white,
-              fontSize: 16.0);*/
         });
         loading.hide();
       }
@@ -179,8 +173,6 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
             color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
     loading.show();
 
-    //logDev.log(batchID_List.toString(), name: "ALL BATCH ID");
-
     final SharedPreferences prefs = await SharedPreferences.getInstance();
       DetailSlipGaji_Post.connectToAPI(batchID_List[indexBatchID]).then((valueResult) async {
         Map<String, dynamic> object = json.decode(valueResult);
@@ -193,33 +185,38 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
               alertDialogFailedRetrievedData(context);
             });
           } else {
-            //List <dynamic> detailSlipGaji = object['result'];
+            List <dynamic> detailSlipGaji = object['result'];
             setState(() {
               position = prefs.getString('position')!;
-              String nomor = object['result']['number'];
-              String tanggalAwal = object['result']['date_from'];
-              String tanggalAkhir = object['result']['date_to'];
-              String namaPegawai = object['result']['employee'];
-              String status = object['result']['status'];
-              String structure =object['result']['structure'];
-              number_List.add(nomor);
-              structure_List.add(structure);
-              period_List.add(tanggalAwal + " to " + tanggalAkhir);
-              namaPegawai_List.add(namaPegawai);
-              status_List.add(status);
-
-              List <dynamic> component = object['result']['component'];
-              logDev.log(component.length.toString(), name: "BANYAK COMPONENT");
-              for (int j = 0; j < component.length; j++){
-                String name = component[j]['name'].toString();
-                String category = component[j]['category'].toString();
-                int total = component[j]['total'];
-
-                name_List.add(name);
-                category_List.add(category);
-                total_List.add(total.toString());
+              logDev.log(position, name: "POSITION");
+              for (int i = 0; i < detailSlipGaji.length; i++){
+                String nomor = detailSlipGaji[i]['number'].toString();
+                logDev.log(nomor, name: "NOMOR/NUMBER");
+                String tanggalAwal = detailSlipGaji[i]['date_from'];
+                String tanggalAkhir = detailSlipGaji[i]['date_to'];
+                String namaPegawai = detailSlipGaji[i]['employee'];
+                String status = detailSlipGaji[i]['status'];
+                String structure =detailSlipGaji[i]['structure'];
+                //number_List.add(nomor);
+                structure_List.add(structure);
+                period_List.add(tanggalAwal + " to " + tanggalAkhir);
+                namaPegawai_List.add(namaPegawai);
+                status_List.add(status);
+
+                List <dynamic> component =detailSlipGaji[i]['component'];
+                logDev.log(component.length.toString(), name: "BANYAK COMPONENT");
+                for (int j = 0; j < component.length; j++){
+                  String name = component[j]['name'].toString();
+                  String category = component[j]['category'].toString();
+                  double total = component[j]['total'];
+
+                  name_List.add(name);
+                  category_List.add(category);
+                  total_List.add(total.toString());
+                }
               }
 
+
               number_List.remove(0);
               structure_List.removeAt(0);
               period_List.removeAt(0);
@@ -391,7 +388,49 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
                         alignment: Alignment.centerRight,
                         child: ElevatedButton(
                           onPressed: () {
-                            DownloadSlipGaji_Post.connectToAPI(batch_id).then((value) => null)
+                            ProgressDialog loading = ProgressDialog(context);
+                            loading = ProgressDialog(context,
+                                type: ProgressDialogType.normal, isDismissible: false, showLogs: true);
+                            loading.style(
+                                message: 'Please Wait .....',
+                                borderRadius: 3,
+                                backgroundColor: Colors.white,
+                                progressWidget: CircularProgressIndicator(),
+                                elevation: 10.0,
+                                padding: EdgeInsets.all(10),
+                                insetAnimCurve: Curves.easeInOut,
+                                progress: 0.0,
+                                maxProgress: 100.0,
+                                progressTextStyle: TextStyle(
+                                    color: Colors.black, fontSize: 10.0, fontWeight: FontWeight.w400),
+                                messageTextStyle: TextStyle(
+                                    color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
+                            loading.show();
+
+                            DownloadSlipGaji_Post.connectToAPI(batchID_List[indexBatchID]).then((valueResult) async {
+                              Map<String, dynamic> object = json.decode(valueResult);
+                              if (object.containsKey("result").toString() == "true"){
+                                String result = object['result'].toString();
+                                if (result.contains("failed")) {
+                                  loading.hide();
+                                  setState(() {
+                                    alertDialogFailedDownloadPayslip(context);
+                                  });
+                                } else if (result.contains("url")){
+                                  loading.hide();
+                                  setState(() {
+                                    //_launchURL(Uri.parse(baseURL + object['result']['url'].toString()));
+                                    Uri url = Uri.parse(Uri.encodeFull(baseURL + object['result']['url'.toString()]));
+                                    launchUrl(url, mode: LaunchMode.externalApplication);
+                                  });
+                                }
+                              } else {
+                                loading.hide();
+                                setState((){
+                                  alertDialogFailedResponse(context);
+                                });
+                              }
+                            });
                           },
                           style: ElevatedButton.styleFrom(),
                           child: Text('Download Slip Gaji'),
@@ -414,6 +453,13 @@ const List<Color> Gradients1 = [
   Color(0xFF03A0FE),
 ];
 
+launchURL(Uri url) async {
+  if (await canLaunchUrl(url)) {
+    await launchUrl(url);
+  } else {
+    throw 'Could not launch $url';
+  }
+}
 
 alertDialogFailedRetrievedData(BuildContext context){
   Widget okButton = TextButton(
@@ -436,7 +482,7 @@ alertDialogFailedRetrievedData(BuildContext context){
 
   // set up the AlertDialog
   AlertDialog alert = AlertDialog(
-    title: Text("Employee Self Service"),
+    title: Text(appName),
     content: Text("Failed to Retrieve Data"),
     actions: [
       noButton,
@@ -447,6 +493,7 @@ alertDialogFailedRetrievedData(BuildContext context){
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },
@@ -474,7 +521,7 @@ alertDialogFailedResponse(BuildContext context){
 
   // set up the AlertDialog
   AlertDialog alert = AlertDialog(
-    title: Text("Employee Self Service"),
+    title: Text(appName),
     content: Text("Server Response Error"),
     actions: [
       noButton,
@@ -485,6 +532,36 @@ alertDialogFailedResponse(BuildContext context){
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
+    builder: (BuildContext context) {
+      return alert;
+    },
+  );
+}
+
+alertDialogFailedDownloadPayslip(BuildContext context){
+  Widget okButton = TextButton(
+    child: Text("Try Again"),
+    onPressed: () {
+      Navigator.of(context, rootNavigator: true).pop();
+      Navigator.pop(context);
+
+    },
+  );
+
+  // set up the AlertDialog
+  AlertDialog alert = AlertDialog(
+    title: Text(appName),
+    content: Text("Failed to Download Payslip"),
+    actions: [
+      okButton,
+    ],
+  );
+
+  // show the dialog
+  showDialog(
+    context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },

lib/Screens/Settings/RequestHttp/changePassword_post.dart

@@ -13,9 +13,12 @@ class ChangePassword_Post {
 
   ChangePassword_Post({required this.password, required this.new_password, required this.session});
 
-  static Future<String> connectToAPI(String password, String new_password, String session) async {
+  static Future<String> connectToAPI(String password, String new_password) async {
     String URL = baseURL + "/api/v1/change_password";
 
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
+    final session = prefs.getString('session');
+
     var sendData = await http.post(Uri.parse(URL), body: jsonEncode({
       "data": [
         {

lib/Screens/Settings/RequestHttp/changeprofileimage_post.dart

@@ -13,7 +13,7 @@ class ChangeProfileImage_Post {
   ChangeProfileImage_Post({required this.session,
     required this.imageBase64});
 
-  static Future<String> connectToAPI(String session, String imageBase64) async {
+  static Future<String> connectToAPI(String imageBase64) async {
     String URL = baseURL + "/api/v1/change_profile";
 
     final SharedPreferences prefs = await SharedPreferences.getInstance();

lib/Screens/Settings/RequestHttp/getDetail_post.dart

@@ -3,7 +3,6 @@ import 'dart:core';
 import 'package:http/http.dart' as http;
 import 'package:hris_selfservice_mobile/constants.dart';
 import 'dart:developer' as developer;
-
 import 'package:shared_preferences/shared_preferences.dart';
 
 class GetDetail_Post {
@@ -11,7 +10,7 @@ class GetDetail_Post {
 
   GetDetail_Post({required this.session});
 
-  static Future<String> connectToAPI(String session) async {
+  static Future<String> connectToAPI() async {
     String URL = baseURL + "/api/v1/get_detail";
 
     final SharedPreferences prefs = await SharedPreferences.getInstance();

lib/Screens/Settings/RequestHttp/logout_post.dart

@@ -11,7 +11,7 @@ class Logout_Post {
 
   Logout_Post({required this.session});
 
-  static Future<String> connectToAPI(String session) async {
+  static Future<String> connectToAPI() async {
     String URL = baseURL + "/api/v1/logout";
 
     final SharedPreferences prefs = await SharedPreferences.getInstance();

lib/Screens/Settings/settings_screen.dart

@@ -104,17 +104,15 @@ class _SettingsScreenState extends State<SettingsScreen> {
         if (status == "success") {
           String photo = object['result']['photo'].toString();
           if (photo == "false") {
-            _imageToShow = AssetImage('assets/images/ic_administrator.png');
-            logDev.log("PHOTO RESULT FALSE", name: "DECODED BYTES");
+            setState(() {
+              _imageToShow = AssetImage('assets/images/ic_administrator.png');
+            });
           } else if (photo != "false") {
             Uint8List decodedBytes = Base64Decoder().convert(photo);
             logDev.log(decodedBytes.toString(), name: "DECODED BYTES photo");
             setState(() {
               _imageToShow = Image.memory(decodedBytes, gaplessPlayback: true).image;
             });
-            //_imageToShow = Image.memory(base64Decode(photo));
-            //logDev.log(_imageToShow.toString(), name: "Image to Show");
-            //_imageToShow = AssetImage('assets/images/collaboration.png');
           }
         } else if (status == "failed") {
           String message = object['result']['message'].toString();
@@ -138,23 +136,20 @@ class _SettingsScreenState extends State<SettingsScreen> {
         loading.hide();
       }
     });
-    //return Image.memory(decodedBytes);
     loading.hide();
     return _imageToShow;
   }
 
   //Get Detail
   getDetail() async {
-    final SharedPreferences prefs = await SharedPreferences.getInstance();
-    final session = prefs.getString('session');
-    GetDetail_Post.connectToAPI(session!).then((valueResult) async {
+    GetDetail_Post.connectToAPI().then((valueResult) async {
       Map<String, dynamic> object = json.decode(valueResult);
       if (object.containsKey("result").toString() == "true") {
         statusDetail = object['result']['status'].toString();
         String message = object['result']['message'].toString();
         if (statusDetail == "failed" || message == "User Not Found") {
           Fluttertoast.showToast(
-              msg: message + ", Please login again!",
+              msg: message + ", Please restart the Application!",
               toastLength: Toast.LENGTH_SHORT,
               gravity: ToastGravity.CENTER,
               timeInSecForIosWeb: 1,
@@ -192,6 +187,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
             timeInSecForIosWeb: 1,
             textColor: Colors.white,
             fontSize: 16.0);
+
       }
     });
   }
@@ -305,47 +301,41 @@ class _SettingsScreenState extends State<SettingsScreen> {
                           ),
                         ),
                         onTap: () async {
-                          final SharedPreferences prefs =
-                              await SharedPreferences.getInstance();
-                          final String? session = prefs.getString('session');
                           final ImagePicker _picker = ImagePicker();
                           final XFile? imagePicked = await _picker.pickImage(
                               source: ImageSource.gallery);
                           if (imagePicked != null) {
                             _imagePath = File(imagePicked.path);
-                            List<int> imageBytes =
-                                _imagePath!.readAsBytesSync();
+                            List<int> imageBytes = _imagePath!.readAsBytesSync();
                             String base64Image = base64Encode(imageBytes);
-                            logDev.log(base64Image, name: "String base64");
+                            //logDev.log(base64Image, name: "String base64");
                             await loading.show();
-                            ChangeProfileImage_Post.connectToAPI(
-                                    session!, base64Image)
-                                .then((valueResult) async {
-                              Map<String, dynamic> object =
-                                  json.decode(valueResult);
+                            ChangeProfileImage_Post.connectToAPI(base64Image).then((valueResult) async {
+                              Map<String, dynamic> object = json.decode(valueResult);
                               if (object.containsKey("result").toString() == "true") {
                                 String status = object['result']['status'].toString();
                                 String message = object['result']['message'].toString();
                                 if (status == "success") {
-                                  _imageToShow =
-                                      FileImage(File(imagePicked.path));
-                                  Fluttertoast.showToast(
+                                  _imageToShow = FileImage(File(imagePicked.path));
+                                 /* Fluttertoast.showToast(
                                       msg: message,
                                       toastLength: Toast.LENGTH_LONG,
                                       gravity: ToastGravity.CENTER,
                                       timeInSecForIosWeb: 1,
                                       textColor: Colors.white,
-                                      fontSize: 16.0);
+                                      fontSize: 16.0);*/
                                   await loading.hide();
+                                  showAlertDialogChangeProfile(context, "Success, " + message, "Ok");
                                 } else if (status == "failed") {
-                                  Fluttertoast.showToast(
+                                 /* Fluttertoast.showToast(
                                       msg: message,
                                       toastLength: Toast.LENGTH_LONG,
                                       gravity: ToastGravity.CENTER,
                                       timeInSecForIosWeb: 1,
                                       textColor: Colors.white,
-                                      fontSize: 16.0);
+                                      fontSize: 16.0);*/
                                   await loading.hide();
+                                  showAlertDialogChangeProfile(context, "Failed, " + message, "Back");
                                 }
                               } else {
                                 Fluttertoast.showToast(
@@ -799,11 +789,7 @@ showAlertDialogSavePassword(BuildContext context) {
               fontWeight: FontWeight.w600));
       await loading.show();
 
-      final SharedPreferences prefs = await SharedPreferences.getInstance();
-      final session = prefs.getString('session');
-      ChangePassword_Post.connectToAPI(passwordController.text.toString(),
-              newPasswordController.text.toString(), session!)
-          .then((valueResult) async {
+      ChangePassword_Post.connectToAPI(passwordController.text.toString(), newPasswordController.text.toString()).then((valueResult) async {
         Map<String, dynamic> object = json.decode(valueResult);
         if (object.containsKey("result").toString() == "true") {
           String status = object['result']['status'].toString();
@@ -821,11 +807,11 @@ showAlertDialogSavePassword(BuildContext context) {
             newPasswordController.clear();
             retypeNewPasswordController.clear();
 
-            final session = await prefs.remove('session');
+            final SharedPreferences prefs = await SharedPreferences.getInstance();
+            await prefs.remove('session');
             await loading.hide();
             Navigator.of(context, rootNavigator: true).pop();
-            Navigator.pushReplacement(
-                context, MaterialPageRoute(builder: (context) => LoginView()));
+            Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) => LoginView()));
           } else if (status == "failed") {
             Fluttertoast.showToast(
                 msg: message,
@@ -868,6 +854,7 @@ showAlertDialogSavePassword(BuildContext context) {
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },
@@ -943,21 +930,16 @@ showAlertDialogLogout(BuildContext context) {
               fontWeight: FontWeight.w600));
       await loading.show();
 
-      final SharedPreferences prefs = await SharedPreferences.getInstance();
-      final session = prefs.getString('session');
-
-      Logout_Post.connectToAPI(session!).then((valueResult) async {
+      Logout_Post.connectToAPI().then((valueResult) async {
         Map<String, dynamic> object = json.decode(valueResult);
         if (object.containsKey("result").toString() == "true") {
           String status = object['result']['status'].toString();
           if (status == "success") {
-            final session = await prefs.remove('session');
+            final SharedPreferences prefs = await SharedPreferences.getInstance();
+            await prefs.remove('session');
             Navigator.of(context, rootNavigator: true).pop();
             await loading.hide();
-            Navigator.pushAndRemoveUntil(
-                context,
-                MaterialPageRoute(builder: (context) => LoginView()),
-                (route) => false);
+            Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (context) => LoginView()), (route) => false);
           } else if (status == "failed") {
             String message = object['result']['message'].toString();
             Fluttertoast.showToast(
@@ -1003,8 +985,37 @@ showAlertDialogLogout(BuildContext context) {
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
+    builder: (BuildContext context) {
+      return alert;
+    },
+  );
+}
+
+//Alert Change Profile
+showAlertDialogChangeProfile(BuildContext context, String message, String buttonMessage) {
+  // set up the button
+  Widget okButton = TextButton(
+    child: Text(buttonMessage),
+    onPressed: () {
+      Navigator.of(context, rootNavigator: true).pop();
+    },
+  );
+
+  // set up the AlertDialog
+  AlertDialog alert = AlertDialog(
+    title: Text("Employee Self Service"),
+    content: Text(message),
+    actions: [okButton],
+  );
+
+  // show the dialog
+  showDialog(
+    context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },
   );
 }
+

lib/Screens/Splash/loginstatus_post.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 import 'dart:core';
 import 'package:http/http.dart' as http;
 import 'package:hris_selfservice_mobile/constants.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'dart:developer' as logDev;
 
 class LoginStatus_Post {
@@ -11,14 +10,13 @@ class LoginStatus_Post {
   late String session;
   late String notif_token;
 
-  LoginStatus_Post(
-      {required this.version,
-      required this.device,
-      required this.session,
-      required this.notif_token});
+  LoginStatus_Post({
+    required this.version,
+    required this.device,
+    required this.session,
+    required this.notif_token});
 
-  static Future<String> connectToAPI(
-      String version, String device, String session, String notif_token) async {
+  static Future<String> connectToAPI(String version, String device, String session, String notif_token) async {
     String URL = baseURL + "/api/v1/login_status";
     print(URL);
 
@@ -38,11 +36,5 @@ class LoginStatus_Post {
 
     logDev.log(sendData.body, name: "Login Status");
     return sendData.body;
-
-
-    // var jsonObject = json.decode(sendData.body);
-    //developer.log(jsonObject.toString(), name: 'Log');
-    // return jsonObject;
-    // return LoginPostResult.createPostResult(jsonObject);
   }
 }

lib/Screens/Splash/splash_screen.dart

@@ -1,11 +1,13 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:hris_selfservice_mobile/Screens/Login/login_screen.dart';
 import 'package:hris_selfservice_mobile/Screens/Splash/loginstatus_post.dart';
+import 'package:hris_selfservice_mobile/constants.dart';
 import 'package:lottie/lottie.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../Home/home_screen.dart';
@@ -77,7 +79,7 @@ class SplashScreen extends StatelessWidget {
                     repeat: true),
               ),
             ),
-            Text('Employee Self Service',
+            Text(appName,
                 style: GoogleFonts.carterOne(fontSize: 25, color: Colors.white))
           ],
         ),
@@ -94,18 +96,22 @@ Future<void> loginStatus(BuildContext context) async {
   String? notif_token = prefs.getString('notif_token');
 
   if (session == null) {
+    version = "1.0.0";
     session = "";
-    version = "";
-    device = "";
     notif_token = "";
+
+    if (Platform.isAndroid){
+      device = "android";
+    } else if (Platform.isIOS){
+      device = "ios";
+    }
+
   }
 
-  logDev.log(session, name: "SESSIONNYA");
+  //logDev.log(session, name: "SESSIONNYA");
 
-  LoginStatus_Post.connectToAPI(version!, device!, session, notif_token!)
-      .then((valueResult) async {
+  LoginStatus_Post.connectToAPI(version!, device!, session, notif_token!).then((valueResult) async {
     Map<String, dynamic> object = json.decode(valueResult);
-    logDev.log(valueResult, name: "LOGIN STATUS!");
     if (object.containsKey("result").toString() == "true") {
       String status = object['result']['status'].toString();
       if (status == "success") {
@@ -137,9 +143,12 @@ Future<void> loginStatus(BuildContext context) async {
           if (block == "false") {
             Widget okButton = TextButton(
               child: Text(action),
-              onPressed: () {
-                _launchURL(Uri.parse("https://play.google.com/store/apps"));
-                SystemChannels.platform.invokeMethod('SystemNavigator.pop');
+              onPressed: () async {
+                Uri url = Uri.parse(Uri.encodeFull("https://play.google.com/store/apps"));
+                //final Uri uri = Uri(scheme: "https", host: "play.google.com");
+                if(!await launchUrl(url, mode: LaunchMode.externalApplication)) {
+                  throw "Can not launch url";
+                }
               },
             );
 
@@ -156,14 +165,16 @@ Future<void> loginStatus(BuildContext context) async {
 
             // set up the AlertDialog
             AlertDialog alert = AlertDialog(
-              title: Text("Employee Self Service"),
+              title: Text(appName),
               content: Text(title + "\n" + message),
               actions: [noButton, okButton],
+
             );
 
             // show the dialog
             showDialog(
               context: context,
+              barrierDismissible: false,
               builder: (BuildContext context) {
                 return alert;
               },
@@ -171,10 +182,15 @@ Future<void> loginStatus(BuildContext context) async {
           } else if (block == "true") {
             Widget okButton = TextButton(
               child: Text(action),
-              onPressed: () {
+              onPressed: () async {
                 if (action == "update") {
-                  _launchURL(Uri.parse("https://play.google.com/store/apps"));
-                  SystemChannels.platform.invokeMethod('SystemNavigator.pop');
+                 /* _launchURL(Uri.parse("https://play.google.com/store/apps"));
+                  SystemChannels.platform.invokeMethod('SystemNavigator.pop');*/
+                  Uri url = Uri.parse(Uri.encodeFull("https://play.google.com/store/apps"));
+                  //final Uri uri = Uri(scheme: "https",  host: "play.google.com");
+                  if(!await launchUrl(url, mode: LaunchMode.externalApplication)) {
+                    throw "Can not launch url";
+                  }
                 } else if (action == "close") {
                   SystemChannels.platform.invokeMethod('SystemNavigator.pop');
                 }
@@ -183,7 +199,7 @@ Future<void> loginStatus(BuildContext context) async {
 
             // set up the AlertDialog
             AlertDialog alert = AlertDialog(
-              title: Text("Employee Self Service"),
+              title: Text(appName),
               content: Text(title + "\n" + message),
               actions: [okButton],
             );
@@ -191,6 +207,7 @@ Future<void> loginStatus(BuildContext context) async {
             // show the dialog
             showDialog(
               context: context,
+              barrierDismissible: false,
               builder: (BuildContext context) {
                 return alert;
               },
@@ -240,7 +257,7 @@ alertDialogFailedResponse(BuildContext context){
 
   // set up the AlertDialog
   AlertDialog alert = AlertDialog(
-    title: Text("Employee Self Service"),
+    title: Text(appName),
     content: Text("Server Response Error"),
     actions: [
       noButton,
@@ -251,6 +268,7 @@ alertDialogFailedResponse(BuildContext context){
   // show the dialog
   showDialog(
     context: context,
+    barrierDismissible: false,
     builder: (BuildContext context) {
       return alert;
     },

lib/constants.dart

@@ -5,7 +5,7 @@ const kPrimaryLightColor = Color(0xFFF1E6FF);
 
 const double defaultPadding = 16.0;
 
-
+String appName = "Employee Self Service";
 //String baseURL = "http://10.209.8.49:8090";
 //String baseURL = "https://bisops.globalservice.co.id";
 String baseURL = "https://urp.myapps.id";

lib/main.dart

@@ -1,20 +1,70 @@
+import 'package:firebase_core/firebase_core.dart';
+import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hris_selfservice_mobile/Screens/Splash/splash_screen.dart';
 //import 'package:hris_selfservice_mobile/Screens/ForgotPassword/forgotPassword_screen.dart';
 import 'constants.dart';
+import 'firebase_options.dart';
+import 'dart:developer' as logDev;
+
+@pragma('vm:entry-point')
+Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
+  // If you're going to use other Firebase services in the background, such as Firestore,
+  // make sure you call `initializeApp` before using other Firebase services.
+  await Firebase.initializeApp();
+
+  print("Handling a background message: ${message.messageId}");
+}
+
+void main() async{
+  WidgetsFlutterBinding.ensureInitialized();
+  await Firebase.initializeApp(
+    options: DefaultFirebaseOptions.currentPlatform,
+  );
+
+  FirebaseMessaging messaging = FirebaseMessaging.instance;
+
+  NotificationSettings settings = await messaging.requestPermission(
+    alert: true,
+    announcement: false,
+    badge: true,
+    carPlay: false,
+    criticalAlert: false,
+    provisional: false,
+    sound: true,
+  );
+
+  print('User granted permission: ${settings.authorizationStatus}');
+
+
+  FirebaseMessaging.onMessage.listen((RemoteMessage remoteMessage) async {
+    Map<String, dynamic> data = remoteMessage.data;
+    logDev.log(data.toString(), name: "NOTIF Messaging");
+
+    String body = data['body'].toString();
+    logDev.log(body, name: "NOTIF Body");
+
+    print('Got a message whilst in the foreground!');
+    print('Message data: ${remoteMessage.data}');
+
+    if (remoteMessage.notification != null) {
+      print('Message also contained a notification: ${remoteMessage.notification}');
+    }
+  });
+
 
-void main() {
   SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
     statusBarColor: Colors.transparent,
   ));
+
+  FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
   runApp(MyApp());
 }
 
 class MyApp extends StatelessWidget {
   const MyApp({super.key});
 
-
   @override
   Widget build(BuildContext context) {
     return MaterialApp(

pubspec.lock

@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "6215ac7d00ed98300b72f45ed2b38c2ca841f9f4e6965fab33cbd591e45e4473"
+      sha256: "64fcb0dbca4386356386c085142fa6e79c00a3326ceaa778a2d25f5d9ba61441"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.13"
+    version: "1.0.16"
   animated_splash_screen:
     dependency: "direct main"
     description:
@@ -181,10 +181,10 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "7d328c4d898a61efc3cd93655a0955858e29a0aa647f0f9e02d59b3bb275e2e8"
+      sha256: "9fdbf71baeb250fc9da847f6cb2052196f62c19906a3657adfc18631a667d316"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "5.0.0"
   double_back_to_close:
     dependency: "direct main"
     description:
@@ -229,10 +229,10 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: be13e431c0c950f0fc66bdb67b41b8059121d7e7d8bbbc21fb59164892d561f8
+      sha256: fe30ac230f12f8836bb97e6e09197340d3c584526825b1746ea362a82e1e43f7
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.7.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
@@ -245,34 +245,34 @@ packages:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: "4b3a41410f3313bb95fd560aa5eb761b6ad65c185de772c72231e8b4aeed6d18"
+      sha256: "291fbcace608aca6c860652e1358ef89752be8cc3ef227f8bbcd1e62775b833a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.2.1"
   firebase_messaging:
     dependency: "direct main"
     description:
       name: firebase_messaging
-      sha256: dbccddc62fef6f3745ba83062bfd1fbf2eb6a931db4c73d03f85c5772dfdec7f
+      sha256: "95f7565b8e992d2188cdd8dc5612330f7c309485fe425d3f9844f18e90741e3e"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.2"
+    version: "14.2.5"
   firebase_messaging_platform_interface:
     dependency: transitive
     description:
       name: firebase_messaging_platform_interface
-      sha256: "564a47ea76db9cd2d17e7d95790428ad3de9d0075795d14c4c901ba0bf518e1a"
+      sha256: c5e79e15d1018cafffea1a6e45249db0d6bc42dbe35178634c77488179880e79
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.11"
+    version: "4.2.14"
   firebase_messaging_web:
     dependency: transitive
     description:
       name: firebase_messaging_web
-      sha256: "76291494583a003d4ce0d613c41cb87c58fab25773317daa66a245f537e1c3f7"
+      sha256: cd0cfcab7a63282049dec95a9955e7a487b5e580162310d12a82a10c0c32c546
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.12"
+    version: "3.2.15"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -306,10 +306,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_local_notifications_linux
-      sha256: "8f6c1611e0c4a88a382691a97bb3c3feb24cc0c0b54152b8b5fb7ffb837f7fbf"
+      sha256: ccb08b93703aeedb58856e5637450bf3ffec899adb66dc325630b68994734b89
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.0+1"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
@@ -346,10 +346,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "60fc7b78455b94e6de2333d2f95196d32cf5c22f4b0b0520a628804cb463503b"
+      sha256: "4bef634684b2c7f3468c77c766c831229af829a0cd2d4ee6c1b99558bd14e5d2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.7"
+    version: "2.0.8"
   flutter_polyline_points:
     dependency: "direct main"
     description:
@@ -370,10 +370,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_svg
-      sha256: "6ff9fa12892ae074092de2fa6a9938fb21dbabfdaa2ff57dc697ff912fc8d4b2"
+      sha256: "97c5b291b4fd34ae4f55d6a4c05841d4d0ed94952e033c5a6529e1b47b4d2a29"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.6"
+    version: "2.0.2"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -396,10 +396,10 @@ packages:
     dependency: "direct main"
     description:
       name: fluttertoast
-      sha256: "774fa28b07f3a82c93596bc137be33189fec578ed3447a93a5a11c93435de394"
+      sha256: "2f9c4d3f4836421f7067a28f8939814597b27614e021da9d63e5d3fb6e212d25"
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.3"
+    version: "8.2.1"
   focus_detector:
     dependency: "direct main"
     description:
@@ -484,10 +484,10 @@ packages:
     dependency: "direct main"
     description:
       name: google_fonts
-      sha256: "8f099045e2f2a30e4d4d0a35f40c6bc941a8f2ca0e10ad9d214ee9edd3f37483"
+      sha256: "927573f2e8a8d65c17931e21918ad0ab0666b1b636537de7c4932bdb487b190f"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "4.0.3"
   http:
     dependency: "direct main"
     description:
@@ -540,42 +540,42 @@ packages:
     dependency: "direct main"
     description:
       name: image_picker
-      sha256: f98d76672d309c8b7030c323b3394669e122d52b307d2bbd8d06bd70f5b2aabe
+      sha256: "22207768556b82d55ec70166824350fee32298732d5efa4d6e756f848f51f66a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.6+1"
+    version: "0.8.6+3"
   image_picker_android:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: "385f12ee9c7288575572c7873a332016ec45ebd092e1c2f6bd421b4a9ad21f1d"
+      sha256: "68d067baf7f6e401b1124ee83dd6967e67847314250fd68012aab34a69beb344"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.5+6"
+    version: "0.8.5+7"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
-      sha256: "7d319fb74955ca46d9bf7011497860e3923bb67feebcf068f489311065863899"
+      sha256: "66fc6e3877bbde82c33d122f3588777c3784ac5bd7d1cdd79213ef7aecb85b34"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.10"
+    version: "2.1.11"
   image_picker_ios:
     dependency: transitive
     description:
       name: image_picker_ios
-      sha256: "8ffb14b43713d7c43fb21299cc18181cc5b39bd3ea1cc427a085c6400fe5aa52"
+      sha256: "39aa70b5f1e5e7c94585b9738632d5fdb764a5655e40cd9e7b95fbd2fc50c519"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.6+7"
+    version: "0.8.6+9"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
-      sha256: "7cef2f28f4f2fef99180f636c3d446b4ccbafd6ba0fad2adc9a80c4040f656b8"
+      sha256: "1991219d9dbc42a99aff77e663af8ca51ced592cd6685c9485e3458302d3d4f8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.2"
+    version: "2.6.3"
   internet_connection_checker:
     dependency: "direct main"
     description:
@@ -588,10 +588,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
       url: "https://pub.dev"
     source: hosted
-    version: "0.17.0"
+    version: "0.18.0"
   js:
     dependency: transitive
     description:
@@ -720,14 +720,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.8.2"
-  path_drawing:
-    dependency: transitive
-    description:
-      name: path_drawing
-      sha256: bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
   path_parsing:
     dependency: transitive
     description:
@@ -740,50 +732,50 @@ packages:
     dependency: transitive
     description:
       name: path_provider
-      sha256: dcea5feb97d8abf90cab9e9030b497fb7c3cbf26b7a1fe9e3ef7dcb0a1ddec95
+      sha256: "04890b994ee89bfa80bf3080bfec40d5a92c5c7a785ebb02c13084a099d2b6f9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.12"
+    version: "2.0.13"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: a776c088d671b27f6e3aa8881d64b87b3e80201c64e8869b811325de7a76c15e
+      sha256: "7623b7d4be0f0f7d9a8b5ee6879fc13e4522d4c875ab86801dee4af32b54b83e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.22"
+    version: "2.0.23"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "62a68e7e1c6c459f9289859e2fae58290c981ce21d1697faf54910fe1faa4c74"
+      sha256: eec003594f19fe2456ea965ae36b3fc967bc5005f508890aafe31fa75e41d972
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: "2e32f1640f07caef0d3cb993680f181c79e54a3827b997d5ee221490d131fbd9"
+      sha256: "525ad5e07622d19447ad740b1ed5070031f7a5437f44355ae915ff56e986429a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.8"
+    version: "2.1.9"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76
+      sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c
+      sha256: "642ddf65fde5404f83267e8459ddb4556316d3ee6d511ed193357e25caa3632d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   petitparser:
     dependency: transitive
     description:
@@ -804,10 +796,10 @@ packages:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
+      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   pointycastle:
     dependency: transitive
     description:
@@ -876,58 +868,58 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "5949029e70abe87f75cfe59d17bf5c397619c4b74a099b10116baeb34786fad9"
+      sha256: ee6257848f822b8481691f20c3e6d2bfee2e9eccb2a3d249907fcfb198c55b41
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.17"
+    version: "2.0.18"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "955e9736a12ba776bdd261cf030232b30eadfcd9c79b32a3250dd4a494e8c8f7"
+      sha256: a51a4f9375097f94df1c6e0a49c0374440d31ab026b59d58a7e7660675879db4
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.15"
+    version: "2.0.16"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "2b55c18636a4edc529fa5cd44c03d3f3100c00513f518c5127c951978efcccd0"
+      sha256: "6b84fdf06b32bb336f972d373cd38b63734f3461ba56ac2ba01b56d052796259"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      sha256: f8ea038aa6da37090093974ebdcf4397010605fd2ff65c37a66f9d28394cb874
+      sha256: d7fb71e6e20cd3dfffcc823a28da3539b392e53ed5fc5c2b90b55fdaa8a7e8fa
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: da9431745ede5ece47bc26d5d73a9d3c6936ef6945c101a5aca46f62e52c1cf3
+      sha256: "824bfd02713e37603b2bdade0842e47d56e7db32b1dcdd1cae533fb88e2913fc"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: a4b5bc37fe1b368bbc81f953197d55e12f49d0296e7e412dfe2d2d77d6929958
+      sha256: "6737b757e49ba93de2a233df229d0b6a87728cea1684da828cbc718b65dcf9d7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.5"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      sha256: "5eaf05ae77658d3521d0e993ede1af962d4b326cd2153d312df716dc250f00c9"
+      sha256: bd014168e8484837c39ef21065b78f305810ceabc1d4f90be6e3b392ce81b46d
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -993,10 +985,10 @@ packages:
     dependency: "direct main"
     description:
       name: transparent_image
-      sha256: e566a616922a781489f4d91cc939b1b3203b6e4a093317805f2f82f0bb0f8dec
+      sha256: e8991d955a2094e197ca24c645efec2faf4285772a4746126ca12875e54ca02f
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   tuple:
     dependency: "direct main"
     description:
@@ -1025,66 +1017,90 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: e8f2efc804810c0f2f5b485f49e7942179f56eabcfe81dce3387fec4bb55876b
+      sha256: "75f2846facd11168d007529d6cd8fcb2b750186bea046af9711f10b907e1587e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.9"
+    version: "6.1.10"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "3e2f6dfd2c7d9cd123296cab8ef66cfc2c1a13f5845f42c7a0f365690a8a7dd1"
+      sha256: "1f4d9ebe86f333c15d318f81dcdc08b01d45da44af74552608455ebdc08d9732"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.23"
+    version: "6.0.24"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "0a5af0aefdd8cf820dd739886efb1637f1f24489900204f50984634c07a54815"
+      sha256: c9cd648d2f7ab56968e049d4e9116f96a85517f1dd806b96a86ea1018a3a82e5
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "6.1.1"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: "318c42cba924e18180c029be69caf0a1a710191b9ec49bb42b5998fdcccee3cc"
+      sha256: e29039160ab3730e42f3d811dc2a6d5f2864b90a70fb765ea60144b03307f682
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "41988b55570df53b3dd2a7fc90c76756a963de6a8c5f8e113330cb35992e2094"
+      sha256: "2dddb3291a57b074dade66b5e07e64401dd2487caefd4e9e2f467138d8c7eb06"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
   url_launcher_platform_interface:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      sha256: "4eae912628763eb48fc214522e58e942fd16ce195407dbf45638239523c759a6"
+      sha256: "6c9ca697a5ae218ce56cece69d46128169a58aa8653c1b01d26fcd4aad8c4370"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "44d79408ce9f07052095ef1f9a693c258d6373dc3944249374e30eff7219ccb0"
+      sha256: "574cfbe2390666003c3a1d129bdc4574aaa6728f0c00a4829a81c316de69dd9b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.14"
+    version: "2.0.15"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: b6217370f8eb1fd85c8890c539f5a639a01ab209a36db82c921ebeacefc7a615
+      sha256: "97c9067950a0d09cbd93e2e3f0383d1403989362b97102fbf446473a48079a4b"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.4"
+  vector_graphics:
+    dependency: transitive
+    description:
+      name: vector_graphics
+      sha256: "254348b40251c995cf8301ac715486c8cfa0a93b7fdc4dbd495a30f04db1fb44"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  vector_graphics_codec:
+    dependency: transitive
+    description:
+      name: vector_graphics_codec
+      sha256: "143c290b762646c696c63be5d976bde7379ea892cb6868ddc5a17cbc56e71411"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  vector_graphics_compiler:
+    dependency: transitive
+    description:
+      name: vector_graphics_compiler
+      sha256: "3190cc26d9ebda686bafb9721bb6a74c6d358700f4fc978a0f2cba6912daff86"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   vector_math:
     dependency: "direct main"
     description:
@@ -1142,5 +1158,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.18.4 <3.0.0"
-  flutter: ">=3.3.0"
+  dart: ">=2.19.0-0 <3.0.0"
+  flutter: ">=3.7.0-0"

pubspec.yaml

@@ -31,12 +31,12 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  google_fonts: ^3.0.1
+  google_fonts: ^4.0.3
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
-  flutter_svg: ^1.1.6
+  flutter_svg: ^2.0.1
   flutter_staggered_grid_view: ^0.6.2
   double_back_to_close: ^2.0.0
   animated_splash_screen: ^1.3.0
@@ -44,8 +44,8 @@ dependencies:
   fluttertoast: ^8.1.1
   #google_maps_flutter: ^2.2.1
   http: ^0.13.5
-  intl: ^0.17.0
-  dio: ^4.0.6
+  intl: ^0.18.0
+  dio: ^5.0.0
   get_it: ^7.2.0
   shared_preferences: ^2.0.15
   # device_information: ^0.0.4
@@ -54,7 +54,6 @@ dependencies:
   flutter_udid: ^2.0.1
   image_picker: ^0.8.6
   image_cropper: ^3.0.1
-  url_launcher: ^6.1.7
   #progress_dialog: ^1.2.4
   progress_dialog_null_safe: ^1.0.4
   #mapbox_gl: ^0.16.0
@@ -73,8 +72,8 @@ dependencies:
   async: ^2.9.0
   flutter_image: ^4.1.4
   vector_math: ^2.1.2
-  meta: ^1.1.0
-  collection: ^1.16.0
+  meta: ^1.8.0
+  collection: ^1.17.0
   flutter_map_marker_cluster: ^1.0.1
   flutter_polyline_points: ^1.0.0
   provider: ^6.0.5
@@ -82,9 +81,11 @@ dependencies:
   internet_connection_checker: ^1.0.0+1
   #plain_notification_token: ^0.0.4
   focus_detector: ^2.0.1
-  firebase_core: ^2.4.1
+  firebase_core: ^2.6.1
   flutter_local_notifications: ^13.0.0
-  firebase_messaging: ^14.1.3
+  firebase_messaging: ^14.2.4
+  url_launcher: ^6.1.9
+
 
 dev_dependencies:
   flutter_test: