Update 1509

android/app/build.gradle

@@ -53,9 +53,9 @@ android {
 
     signingConfigs {
         release {
-            storeFile file('D:/employee_self_service/ttwenty.jks')
+            storeFile file('D:/employee_self_service/ess_keystore.jks')
             storePassword '123123'
-            keyAlias 'ttwenty'
+            keyAlias 'ess_keystore'
             keyPassword '123123'
         }
     }

android/app/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.example.hris_selfservice_mobile">
 
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

android/app/src/main/res/IconKitchen-Output/android/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@mipmap/ic_launcher_background"/>
-  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
-</adaptive-icon>

android/app/src/main/res/IconKitchen-Output/ios/Contents.json

@@ -1,134 +0,0 @@
-{
-  "images": [
-    {
-      "filename": "AppIcon@2x.png",
-      "idiom": "iphone",
-      "scale": "2x",
-      "size": "60x60"
-    },
-    {
-      "filename": "AppIcon@3x.png",
-      "idiom": "iphone",
-      "scale": "3x",
-      "size": "60x60"
-    },
-    {
-      "filename": "AppIcon~ipad.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "76x76"
-    },
-    {
-      "filename": "AppIcon@2x~ipad.png",
-      "idiom": "ipad",
-      "scale": "2x",
-      "size": "76x76"
-    },
-    {
-      "filename": "AppIcon-83.5@2x~ipad.png",
-      "idiom": "ipad",
-      "scale": "2x",
-      "size": "83.5x83.5"
-    },
-    {
-      "filename": "AppIcon-40@2x.png",
-      "idiom": "iphone",
-      "scale": "2x",
-      "size": "40x40"
-    },
-    {
-      "filename": "AppIcon-40@3x.png",
-      "idiom": "iphone",
-      "scale": "3x",
-      "size": "40x40"
-    },
-    {
-      "filename": "AppIcon-40~ipad.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "40x40"
-    },
-    {
-      "filename": "AppIcon-40@2x~ipad.png",
-      "idiom": "ipad",
-      "scale": "2x",
-      "size": "40x40"
-    },
-    {
-      "filename": "AppIcon-20@2x.png",
-      "idiom": "iphone",
-      "scale": "2x",
-      "size": "20x20"
-    },
-    {
-      "filename": "AppIcon-20@3x.png",
-      "idiom": "iphone",
-      "scale": "3x",
-      "size": "20x20"
-    },
-    {
-      "filename": "AppIcon-20~ipad.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "20x20"
-    },
-    {
-      "filename": "AppIcon-20@2x~ipad.png",
-      "idiom": "ipad",
-      "scale": "2x",
-      "size": "20x20"
-    },
-    {
-      "filename": "AppIcon-29.png",
-      "idiom": "iphone",
-      "scale": "1x",
-      "size": "29x29"
-    },
-    {
-      "filename": "AppIcon-29@2x.png",
-      "idiom": "iphone",
-      "scale": "2x",
-      "size": "29x29"
-    },
-    {
-      "filename": "AppIcon-29@3x.png",
-      "idiom": "iphone",
-      "scale": "3x",
-      "size": "29x29"
-    },
-    {
-      "filename": "AppIcon-29~ipad.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "29x29"
-    },
-    {
-      "filename": "AppIcon-29@2x~ipad.png",
-      "idiom": "ipad",
-      "scale": "2x",
-      "size": "29x29"
-    },
-    {
-      "filename": "AppIcon-60@2x~car.png",
-      "idiom": "car",
-      "scale": "2x",
-      "size": "60x60"
-    },
-    {
-      "filename": "AppIcon-60@3x~car.png",
-      "idiom": "car",
-      "scale": "3x",
-      "size": "60x60"
-    },
-    {
-      "filename": "AppIcon~ios-marketing.png",
-      "idiom": "ios-marketing",
-      "scale": "1x",
-      "size": "1024x1024"
-    }
-  ],
-  "info": {
-    "author": "iconkitchen",
-    "version": 1
-  }
-}

android/app/src/main/res/IconKitchen-Output/web/README.txt

@@ -1,18 +0,0 @@
-Add this to your HTML <head>:
-
-    <link rel="icon" href="/favicon.ico" sizes="any">
-    <link rel="apple-touch-icon" href="/apple-touch-icon.png">
-
-Add this to your app's manifest.json:
-
-    ...
-    {
-      "icons": [
-        { "src": "/favicon.ico", "type": "image/x-icon", "sizes": "16x16 32x32" },
-        { "src": "/icon-192.png", "type": "image/png", "sizes": "192x192" },
-        { "src": "/icon-512.png", "type": "image/png", "sizes": "512x512" },
-        { "src": "/icon-192-maskable.png", "type": "image/png", "sizes": "192x192", "purpose": "maskable" },
-        { "src": "/icon-512-maskable.png", "type": "image/png", "sizes": "512x512", "purpose": "maskable" }
-      ]
-    }
-    ...

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()

lib/Screens/Home/home_screen.dart

@@ -4,6 +4,7 @@ import 'dart:typed_data';
 
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:double_back_to_close/double_back_to_close.dart';
+import 'package:employee_selfservice_mobile/Screens/NotificationCenter/NotificationCenter.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
@@ -100,7 +101,7 @@ class _HomeView extends State<HomeView> {
             fontSize: 15.0,
             fontWeight: FontWeight.w600));
 
-    loading.show();
+    await loading.show();
 
     GetProfileImage_Post.connectToAPI(session!).then((valueResult) async {
       Map<String, dynamic> object = json.decode(valueResult);
@@ -111,7 +112,7 @@ class _HomeView extends State<HomeView> {
           String photo = object['result']['photo'].toString();
           if (photo == "false") {
             setState(() {
-              _imageToShow = AssetImage('assets/images/ic_administrator.png');
+              _imageToShow = AssetImage('assets/icons/ic_pp_2.png');
             });
           } else if (photo != "false") {
             Uint8List decodedBytes = Base64Decoder().convert(photo);
@@ -121,7 +122,6 @@ class _HomeView extends State<HomeView> {
                   .image;
             });
           }
-          await loading.hide();
         } else if (status == "failed") {
           String message = object['result']['message'].toString();
           Fluttertoast.showToast(
@@ -132,7 +132,6 @@ class _HomeView extends State<HomeView> {
               textColor: Colors.white,
               fontSize: 16.0);
         }
-        await loading.hide();
       } else {
         Fluttertoast.showToast(
             msg: "Server Response Error",
@@ -141,8 +140,8 @@ class _HomeView extends State<HomeView> {
             timeInSecForIosWeb: 1,
             textColor: Colors.white,
             fontSize: 16.0);
-        await loading.hide();
       }
+      await loading.hide();
     });
     return _imageToShow;
   }
@@ -171,8 +170,12 @@ class _HomeView extends State<HomeView> {
           position = object['result']['position'].toString();
 
           var prefs = await SharedPreferences.getInstance();
-          await prefs.setString('position', position);
-
+          if (position == "false") {
+            position = "-";
+            await prefs.setString('position', position);
+          } else {
+            await prefs.setString('position', position);
+          }
         }
       } else {
         Fluttertoast.showToast(
@@ -187,6 +190,7 @@ class _HomeView extends State<HomeView> {
   }
 
   int _selectedIndex = 0;
+
   void _onItemTapped(int index) {
     setState(() {
       _selectedIndex = index;
@@ -223,39 +227,42 @@ 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),
+  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'),
+                ),
+              ],
             ),
-          ],
-        ),
-        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 BottomNavBar extends StatefulWidget {
@@ -268,43 +275,44 @@ class BottomNavBar extends StatefulWidget {
 class _BottomNavBarState extends State<BottomNavBar> {
   List<Widget> _widgetOptions = <Widget>[
     HomeScreen(),
-    ReimburseScreen(),
+    NotificationCenter_Screen(),
     SettingsScreen(),
   ];
 
   int _selectedIndex = 0;
+
   void _onItemTapped(int index) {
     setState(() {
       _selectedIndex = index;
     });
   }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       body: _widgetOptions.elementAt(_selectedIndex),
       bottomNavigationBar: BottomNavigationBar(
-            items: const <BottomNavigationBarItem>[
-              BottomNavigationBarItem(
-                icon: Icon(Icons.home),
-                label: 'Home',
-              ),
-              BottomNavigationBarItem(
-                icon: Icon(Icons.notifications),
-                label: 'Notification',
-              ),BottomNavigationBarItem(
-                icon: Icon(Icons.person),
-                label: 'Profile',
-              ),
-            ],
-            currentIndex: _selectedIndex,
-            selectedItemColor: Colors.white,
-            backgroundColor: Color(0xFF5666b7),
-            onTap: _onItemTapped),
-      );
+          items: const <BottomNavigationBarItem>[
+            BottomNavigationBarItem(
+              icon: Icon(Icons.home),
+              label: 'Home',
+            ),
+            BottomNavigationBarItem(
+              icon: Icon(Icons.notifications),
+              label: 'Notification',
+            ), BottomNavigationBarItem(
+              icon: Icon(Icons.person),
+              label: 'Profile',
+            ),
+          ],
+          currentIndex: _selectedIndex,
+          selectedItemColor: Colors.white,
+          backgroundColor: Color(0xFF5666b7),
+          onTap: _onItemTapped),
+    );
   }
 }
 
-
 class HomeScreen extends StatefulWidget {
   @override
   State<HomeScreen> createState() => _HomeScreenState();
@@ -331,7 +339,9 @@ 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") {
@@ -359,7 +369,9 @@ class _HomeScreenState extends State<HomeScreen> {
 
   @override
   Widget build(BuildContext context) {
-    var size = MediaQuery.of(context).size;
+    var size = MediaQuery
+        .of(context)
+        .size;
 
     return FocusDetector(
       /*onVisibilityGained: (){
@@ -371,7 +383,7 @@ class _HomeScreenState extends State<HomeScreen> {
       onFocusLost: (){
         getProfileImage();
       },*/
-      onFocusGained: (){
+      onFocusGained: () {
         getProfileImage();
       },
 /*      onForegroundLost: (){
@@ -401,7 +413,7 @@ class _HomeScreenState extends State<HomeScreen> {
                     padding: EdgeInsets.all(20),
                     child: Column(
                       children: <Widget>[
-                       /* Align(
+                        /* Align(
                           alignment: Alignment.topRight,
                           child: InkWell(
                             child: Container(
@@ -418,11 +430,13 @@ class _HomeScreenState extends State<HomeScreen> {
                           ),
                         ),*/
                         Container(
-                          child:  Stack(
+                          child: Stack(
                             alignment: Alignment.topLeft,
                             children: [
                               Container(
-                                margin: EdgeInsets.only(top: (((size.width - 20) * 0.33) * 0.5) + 40),
+                                margin: EdgeInsets.only(
+                                    top: (((size.width - 20) * 0.33) * 0.5) +
+                                        40),
                                 child: Card(
                                   elevation: 15,
                                   child: Container(
@@ -432,24 +446,28 @@ class _HomeScreenState extends State<HomeScreen> {
                                       decoration: BoxDecoration(
                                           color: Colors.white,
                                           borderRadius:
-                                          BorderRadius.all(Radius.circular(10))),
+                                          BorderRadius.all(
+                                              Radius.circular(10))),
                                       child: Column(
-                                        mainAxisAlignment: MainAxisAlignment.end,
-                                        crossAxisAlignment: CrossAxisAlignment.center,
+                                        mainAxisAlignment: MainAxisAlignment
+                                            .end,
+                                        crossAxisAlignment: CrossAxisAlignment
+                                            .center,
                                         children: <Widget>[
                                           Text(name,
                                             maxLines: 2,
                                             overflow: TextOverflow.ellipsis,
                                             textAlign: TextAlign.center,
                                             style: GoogleFonts.inter(
-                                                fontSize: 18,
+                                                fontSize: size.width * 0.045,
                                                 color: Colors.black,
                                                 fontWeight: FontWeight.bold),
                                           ),
                                           Text(position,
                                             textAlign: TextAlign.center,
                                             style: GoogleFonts.inter(
-                                                fontSize: 17, color: Colors.black),
+                                                fontSize: size.width * 0.035,
+                                                color: Colors.black),
                                           ),
                                         ],
                                       )),
@@ -482,46 +500,48 @@ class _HomeScreenState extends State<HomeScreen> {
                           crossAxisSpacing: 15,
                           mainAxisSpacing: 15,
                           crossAxisCount: 2,
+                          childAspectRatio: 1.0,
                           children: <Widget>[
                             InkWell(
                                 child: Container(
-                                  decoration: BoxDecoration(
-                                      color: Color(0xFFD0D0D0),
-                                      borderRadius: BorderRadius.circular(5)),
-                                  child: Column(
-                                    crossAxisAlignment: CrossAxisAlignment.center,
-                                    mainAxisAlignment: MainAxisAlignment.center,
-                                    children: <Widget>[
-                                      Container(
-                                        width: 75,
-                                        height: 75,
-                                        child: Image.asset(
-                                          "assets/icons/menu/ic_absensi.png",
-                                          fit: BoxFit.fill,
-                                          alignment: Alignment.center,
-                                        ),
-                                      ),
-                                      Container(
-                                        margin: EdgeInsets.only(top: 10),
-                                        padding: EdgeInsets.all(5),
-                                        child: Text(
-                                          'Attendance',
-                                          textAlign: TextAlign.center,
-                                          style: GoogleFonts.acme(
-                                              fontSize: 18, color: Colors.black),
-                                        ),
+                                    width: size.width,
+                                    height: size.height,
+                                    decoration: BoxDecoration(
+                                        color: Color(0xFFD0D0D0),
+                                        borderRadius: BorderRadius.circular(5)),
+                                    child: Center(
+                                      child: Column(
+                                        crossAxisAlignment: CrossAxisAlignment.center,
+                                        mainAxisAlignment: MainAxisAlignment.center,
+                                        children: <Widget>[
+                                          Container(
+                                            width: size.width * 0.18,
+                                            child: Image.asset(
+                                                "assets/icons/menu/ic_absensi.png",
+                                                fit: BoxFit.contain)
+                                          ),
+                                          Text(
+                                            'Attendance',
+                                            textAlign: TextAlign.center,
+                                            style: GoogleFonts.acme(
+                                                fontSize: size.width * 0.045,
+                                                color: Colors.black),
+                                          ),
+                                        ],
                                       ),
-                                    ],
-                                  ),
+                                    )
                                 ),
                                 onTap: () {
                                   Navigator.push(
                                       context,
                                       MaterialPageRoute(
-                                          builder: (context) => AbsensiScreen()));
+                                          builder: (context) =>
+                                              AbsensiScreen()));
                                 }),
                             InkWell(
                               child: Container(
+                                width: size.width,
+                                height: size.height,
                                 decoration: BoxDecoration(
                                     color: Color(0xFFD0D0D0),
                                     borderRadius: BorderRadius.circular(5)),
@@ -530,22 +550,17 @@ class _HomeScreenState extends State<HomeScreen> {
                                   mainAxisAlignment: MainAxisAlignment.center,
                                   children: <Widget>[
                                     Container(
-                                      width: 75,
-                                      height: 75,
+                                      width: size.width * 0.18,
                                       child: Image.asset(
-                                          "assets/icons/menu/ic_slipgaji_2.png",
-                                          fit: BoxFit.fill,
-                                          alignment: Alignment.center),
+                                        "assets/icons/menu/ic_slipgaji_2.png",
+                                        fit: BoxFit.contain),
                                     ),
-                                    Container(
-                                      margin: EdgeInsets.only(top: 10),
-                                      padding: EdgeInsets.all(5),
-                                      child: Text(
-                                        'Pay Slip',
-                                        textAlign: TextAlign.center,
-                                        style: GoogleFonts.acme(
-                                            fontSize: 18, color: Colors.black),
-                                      ),
+                                    Text(
+                                      'Pay Slip',
+                                      textAlign: TextAlign.center,
+                                      style: GoogleFonts.acme(
+                                          fontSize: size.width * 0.045,
+                                          color: Colors.black),
                                     ),
                                   ],
                                 ),
@@ -554,11 +569,14 @@ class _HomeScreenState extends State<HomeScreen> {
                                 Navigator.push(
                                     context,
                                     MaterialPageRoute(
-                                        builder: (context) => SlipGajiScreen()));
+                                        builder: (context) =>
+                                            SlipGajiScreen()));
                               },
                             ),
                             InkWell(
                               child: Container(
+                                width: size.width,
+                                height: size.height,
                                 decoration: BoxDecoration(
                                     color: Color(0xFFD0D0D0),
                                     borderRadius: BorderRadius.circular(5)),
@@ -567,22 +585,17 @@ class _HomeScreenState extends State<HomeScreen> {
                                   mainAxisAlignment: MainAxisAlignment.center,
                                   children: <Widget>[
                                     Container(
-                                      width: 70,
-                                      height: 70,
+                                      width: size.width * 0.18,
                                       child: Image.asset(
-                                          "assets/icons/menu/ic_cuti_2.png",
-                                          fit: BoxFit.fill,
-                                          alignment: Alignment.center),
+                                        "assets/icons/menu/ic_cuti_2.png",
+                                        fit: BoxFit.contain),
                                     ),
-                                    Container(
-                                      margin: EdgeInsets.only(top: 10),
-                                      padding: EdgeInsets.all(5),
-                                      child: Text(
-                                        'Leaves',
-                                        textAlign: TextAlign.center,
-                                        style: GoogleFonts.acme(
-                                            fontSize: 18, color: Colors.black),
-                                      ),
+                                    Text(
+                                      'Leaves',
+                                      textAlign: TextAlign.center,
+                                      style: GoogleFonts.acme(
+                                          fontSize: size.width * 0.045,
+                                          color: Colors.black),
                                     ),
                                   ],
                                 ),
@@ -591,11 +604,14 @@ class _HomeScreenState extends State<HomeScreen> {
                                 Navigator.push(
                                     context,
                                     MaterialPageRoute(
-                                        builder: (context) => AjukanCutiScreen()));
+                                        builder: (context) =>
+                                            AjukanCutiScreen()));
                               },
                             ),
                             InkWell(
                               child: Container(
+                                width: size.width,
+                                height: size.height,
                                 decoration: BoxDecoration(
                                     color: Color(0xFFD0D0D0),
                                     borderRadius: BorderRadius.circular(5)),
@@ -604,23 +620,18 @@ class _HomeScreenState extends State<HomeScreen> {
                                   mainAxisAlignment: MainAxisAlignment.center,
                                   children: <Widget>[
                                     Container(
-                                      width: 70,
-                                      height: 70,
+                                      width: size.width * 0.18,
                                       child: Image.asset(
                                         "assets/icons/menu/ic_surattugas_2.png",
-                                        fit: BoxFit.fill,
-                                        alignment: Alignment.center,
+                                        fit: BoxFit.contain,
                                       ),
                                     ),
-                                    Container(
-                                      margin: EdgeInsets.only(top: 10),
-                                      padding: EdgeInsets.all(5),
-                                      child: Text(
-                                        'Assignment Letter',
-                                        textAlign: TextAlign.center,
-                                        style: GoogleFonts.acme(
-                                            fontSize: 18, color: Colors.black),
-                                      ),
+                                    Text(
+                                      'Assignment Letter',
+                                      textAlign: TextAlign.center,
+                                      style: GoogleFonts.acme(
+                                          fontSize: size.width * 0.045,
+                                          color: Colors.black),
                                     ),
                                   ],
                                 ),
@@ -629,11 +640,14 @@ class _HomeScreenState extends State<HomeScreen> {
                                 Navigator.push(
                                     context,
                                     MaterialPageRoute(
-                                        builder: (context) => SuratTugas_Screen()));
+                                        builder: (context) =>
+                                            SuratTugas_Screen()));
                               },
                             ),
                             InkWell(
                               child: Container(
+                                width: size.width,
+                                height: size.height,
                                 decoration: BoxDecoration(
                                     color: Color(0xFFD0D0D0),
                                     borderRadius: BorderRadius.circular(5)),
@@ -642,23 +656,19 @@ class _HomeScreenState extends State<HomeScreen> {
                                   mainAxisAlignment: MainAxisAlignment.center,
                                   children: <Widget>[
                                     Container(
-                                      width: 70,
-                                      height: 70,
+                                      width: size.width * 0.18,
                                       child: Image.asset(
-                                          "assets/icons/menu/ic_reimburse.png",
-                                          fit: BoxFit.fill,
-                                          alignment: Alignment.center),
-                                    ),
-                                    Container(
-                                      margin: EdgeInsets.only(top: 10),
-                                      padding: EdgeInsets.all(5),
-                                      child: Text(
-                                        'Reimburse',
-                                        textAlign: TextAlign.center,
-                                        style: GoogleFonts.acme(
-                                            fontSize: 18, color: Colors.black),
+                                        "assets/icons/menu/ic_reimburse.png",
+                                        fit: BoxFit.contain,
                                       ),
                                     ),
+                                    Text(
+                                      'Reimburse',
+                                      textAlign: TextAlign.center,
+                                      style: GoogleFonts.acme(
+                                          fontSize: size.width * 0.045,
+                                          color: Colors.black),
+                                    ),
                                   ],
                                 ),
                               ),
@@ -666,11 +676,14 @@ class _HomeScreenState extends State<HomeScreen> {
                                 Navigator.push(
                                     context,
                                     MaterialPageRoute(
-                                        builder: (context) => ReimburseScreen()));
+                                        builder: (context) =>
+                                            ReimburseScreen()));
                               },
                             ),
                             InkWell(
                               child: Container(
+                                width: size.width,
+                                height: size.height,
                                 decoration: BoxDecoration(
                                     color: Color(0xFFD0D0D0),
                                     borderRadius: BorderRadius.circular(5)),
@@ -679,23 +692,19 @@ class _HomeScreenState extends State<HomeScreen> {
                                   mainAxisAlignment: MainAxisAlignment.center,
                                   children: <Widget>[
                                     Container(
-                                      width: 70,
-                                      height: 70,
+                                      width: size.width * 0.18,
                                       child: Image.asset(
-                                          "assets/icons/menu/ic_about_3.png",
-                                          fit: BoxFit.fill,
-                                          alignment: Alignment.center),
-                                    ),
-                                    Container(
-                                      margin: EdgeInsets.only(top: 10),
-                                      padding: EdgeInsets.all(5),
-                                      child: Text(
-                                        'About',
-                                        textAlign: TextAlign.center,
-                                        style: GoogleFonts.acme(
-                                            fontSize: 18, color: Colors.black),
+                                        "assets/icons/menu/ic_about_3.png",
+                                        fit: BoxFit.contain,
                                       ),
                                     ),
+                                    Text(
+                                      'About',
+                                      textAlign: TextAlign.center,
+                                      style: GoogleFonts.acme(
+                                          fontSize: size.width * 0.045,
+                                          color: Colors.black),
+                                    ),
                                   ],
                                 ),
                               ),

lib/Screens/Login/login_screen.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:convert';
-import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -13,7 +12,6 @@ import 'package:employee_selfservice_mobile/Screens/Login/post_result_model.dart
 import 'package:employee_selfservice_mobile/Screens/Splash/splash_screen.dart';
 import 'package:progress_dialog_null_safe/progress_dialog_null_safe.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import '../../firebase_options.dart';
 import '../Home/home_screen.dart';
 import 'inputWidget.dart';
 import 'dart:developer' as logDev;
@@ -173,9 +171,6 @@ class _LoginScreenState extends State<LoginScreen> {
                                 } else {
                                   await loading.show();
 
-                                  await Firebase.initializeApp(
-                                    options: DefaultFirebaseOptions.currentPlatform,
-                                  );
                                   final notif_token = await FirebaseMessaging.instance.getToken();
                                   logDev.log(notif_token.toString(), name: "NOTIFICATION TOKEN");
 

lib/Screens/Menu/Absensi/absensi_history_screen.dart

@@ -228,7 +228,6 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
         await loading.hide();
       }
     });
-    //await loading.hide();
   }
 
   @override
@@ -305,18 +304,18 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                                     children: [
                                       Column(
                                         children: [
-                                          Text(dayDate_List[i], style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center,),
-                                          Text(date_List[i], style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
-                                          Text(month_List[i], style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
+                                          Text(dayDate_List[i], style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center,),
+                                          Text(date_List[i], style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
+                                          Text(month_List[i], style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
                                         ],
                                       ),
                                       Visibility(
                                         visible: visibilityDate2[i],
                                         child: Column(
                                           children: [
-                                            Text("\t|\t", style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center,),
-                                            Text("\t|\t", style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
-                                            Text("\t|\t", style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
+                                            Text("\t|\t", style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center,),
+                                            Text("\t|\t", style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
+                                            Text("\t|\t", style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
                                           ],
                                         ),
                                       ),
@@ -324,9 +323,9 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                                         visible: visibilityDate2[i],
                                         child: Column(
                                           children: [
-                                            Text(dayDate_list_2[i], style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center,),
-                                            Text(date_list_2[i], style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
-                                            Text(month_list_2[i], style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
+                                            Text(dayDate_list_2[i], style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center,),
+                                            Text(date_list_2[i], style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
+                                            Text(month_list_2[i], style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
                                           ],
                                         ),
                                       ),
@@ -336,9 +335,9 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                                           mainAxisAlignment: MainAxisAlignment.center,
                                           crossAxisAlignment: CrossAxisAlignment.center,
                                           children: [
-                                            Text(dayDate_List[i], style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.right,),
-                                            Text(date_List[i], style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.right),
-                                            Text(month_List[i], style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.right),
+                                            Text(dayDate_List[i], style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.right,),
+                                            Text(date_List[i], style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.right),
+                                            Text(month_List[i], style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.right),
                                           ],
                                           )
                                       ),
@@ -348,9 +347,9 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                                             visible: visibilityDate2[i],
                                             child: Column(
                                               children: [
-                                                Text("|", style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center,),
-                                                Text("|", style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
-                                                Text("|", style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
+                                                Text("|", style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center,),
+                                                Text("|", style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
+                                                Text("|", style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.center),
                                               ],
                                             ),
                                           )
@@ -361,9 +360,9 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                                             visible: visibilityDate2[i],
                                             child: Column(
                                               children: [
-                                                Text(dayDate_list_2[i], style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.left,),
-                                                Text(date_list_2[i], style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.left),
-                                                Text(month_list_2[i], style: GoogleFonts.fredokaOne(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.left),
+                                                Text(dayDate_list_2[i], style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.left,),
+                                                Text(date_list_2[i], style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.left),
+                                                Text(month_list_2[i], style: GoogleFonts.fredoka(fontSize: 15, color: Colors.blueGrey), textAlign: TextAlign.left),
                                               ],
                                             ),
                                           ))*/
@@ -375,7 +374,7 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                                 flex: 2,
                                 child: Column(
                                   children: [
-                                    Text("Check In", style: GoogleFonts.fredokaOne(fontSize: 16),textAlign: TextAlign.center),
+                                    Text("Check In", style: GoogleFonts.fredoka(fontSize: 16),textAlign: TextAlign.center),
                                     Text(showCheckIn_List[i], style: GoogleFonts.barlowSemiCondensed(fontSize: 16),textAlign: TextAlign.center),
                                   ],
                                 ),
@@ -384,7 +383,7 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                                 flex: 2,
                                 child: Column(
                                   children: [
-                                    Text("Check Out", style: GoogleFonts.fredokaOne(fontSize: 16),textAlign: TextAlign.center),
+                                    Text("Check Out", style: GoogleFonts.fredoka(fontSize: 16),textAlign: TextAlign.center),
                                     Text(showCheckOut_List[i], style: GoogleFonts.barlowSemiCondensed(fontSize: 16),textAlign: TextAlign.center),
                                   ],
                                 ),
@@ -393,7 +392,7 @@ class _HistoryAbsensi extends State<HistoryAbsensi> {
                                 flex: 2,
                                 child: Column(
                                   children: [
-                                    Text("Working\nHours", style: GoogleFonts.fredokaOne(fontSize: 16), textAlign: TextAlign.center),
+                                    Text("Working\nHours", style: GoogleFonts.fredoka(fontSize: 16), textAlign: TextAlign.center),
                                     Text(worked_hours_List[i], style: GoogleFonts.barlowSemiCondensed(fontSize: 16),textAlign: TextAlign.center),
                                   ],
                                 ),

lib/Screens/Menu/Absensi/absensi_screen.dart

@@ -75,7 +75,7 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
         messageTextStyle: TextStyle(
             color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
 
-    loading.show();
+    await loading.show();
 
     bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
     logDev.log(serviceEnabled.toString(), name: "ON/OFF LOCATION SERVICE");
@@ -143,6 +143,7 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
           });
           await loading.hide();
         }
+        await loading.hide();
       });
 
       //History
@@ -218,7 +219,6 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
     bool serviceEnabled;
     LocationPermission permission;
 
-    //loading.show();
     serviceEnabled = await Geolocator.isLocationServiceEnabled();
     if (!serviceEnabled) {
       await loading.hide();
@@ -273,7 +273,7 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
         messageTextStyle: TextStyle(
             color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
 
-    loading.show();
+    await loading.show();
     position = await Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.high);
     if (position.isMocked) {
       await loading.hide();
@@ -338,7 +338,7 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
         messageTextStyle: TextStyle(
             color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
 
-    loading.show();
+    await loading.show();
 
     position = await Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.high);
     if (position.isMocked) {
@@ -527,7 +527,7 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
                                   child: Column(
                                     children: [
                                       Text('Check In',
-                                          style: GoogleFonts.fredokaOne(
+                                          style: GoogleFonts.fredoka(
                                               fontSize: 19)),
                                       Text(showCheckIn_List,
                                           style: GoogleFonts.barlowSemiCondensed(
@@ -539,7 +539,7 @@ class _AbsensiScreenState extends State<AbsensiScreen> {
                                   child: Column(
                                     children: [
                                       Text('Check Out',
-                                          style: GoogleFonts.fredokaOne(
+                                          style: GoogleFonts.fredoka(
                                               fontSize: 19)),
                                       Text(showCheckOut_List,
                                           style: GoogleFonts.barlowSemiCondensed(
@@ -947,7 +947,7 @@ alertDialogEnableLocaionServices(BuildContext context) {
   Widget okButton = TextButton(
     child: Text("Open Settings"),
     onPressed: () {
-      AppSettings.openLocationSettings();
+      //AppSettings.openLocationSettings();
       Navigator.of(context, rootNavigator: true).pop();
       loading.hide();
      /* Navigator.pushReplacement(

lib/Screens/Menu/AjukanCuti/ajukancuti_screen.dart

@@ -61,7 +61,7 @@ class _AjukanCutiScreenState extends State<AjukanCutiScreen> {
     super.initState();
   }
 
-  getJenisCuti () {
+  getJenisCuti () async {
     ProgressDialog loading = ProgressDialog(context);
     loading = ProgressDialog(context,
         type: ProgressDialogType.normal, isDismissible: false, showLogs: true);
@@ -80,7 +80,7 @@ class _AjukanCutiScreenState extends State<AjukanCutiScreen> {
         messageTextStyle: TextStyle(
             color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
 
-    loading.show();
+    await loading.show();
     JenisCuti_Post.connectToAPI().then((valueResult) async {
       Map<String, dynamic> object = json.decode(valueResult);
       if (object.containsKey("result").toString() == "true"){
@@ -522,7 +522,7 @@ class _AjukanCutiScreenState extends State<AjukanCutiScreen> {
                                             fontSize: 17,
                                             fontWeight: FontWeight.w500)),
                                   ),
-                                  onTap: () {
+                                  onTap: () async {
                                     ProgressDialog loading = ProgressDialog(context);
                                     loading = ProgressDialog(context,
                                         type: ProgressDialogType.normal, isDismissible: false, showLogs: true);
@@ -546,7 +546,7 @@ class _AjukanCutiScreenState extends State<AjukanCutiScreen> {
                                     if (!validateFormCuti(context)){
                                       return;
                                     } else if (validateFormCuti(context)){
-                                      loading.show();
+                                      await loading.show();
                                       PengajuanCuti_Post.connectToAPI(idCuti, formattedDateFrom,
                                           formattedDateTo, deskripsiTeksController.text.toString(), fileAttach)
                                           .then((valueResult) async {

lib/Screens/Menu/AjukanCuti/history_cuti.dart

@@ -73,7 +73,7 @@ class _HistoryCutiState extends State<HistoryCuti> {
         messageTextStyle: TextStyle(
             color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
 
-    loading.show();
+    await loading.show();
     HistoryCuti_Post.connectToAPI().then((valueResult) async {
       Map<String, dynamic> object = jsonDecode(valueResult);
       if (object.containsKey("result").toString() == "true") {
@@ -140,7 +140,6 @@ class _HistoryCutiState extends State<HistoryCuti> {
 
             HistoryLength = historyCuti.length;
           });
-          await loading.hide();
         }
       } else {
         Fluttertoast.showToast(
@@ -151,8 +150,8 @@ class _HistoryCutiState extends State<HistoryCuti> {
             textColor: Colors.white,
             fontSize: 16.0);
       }
+      await loading.hide();
     });
-    await loading.hide();
   }
 
   @override

lib/Screens/Menu/Reimburse/reimburse_screen.dart

@@ -55,7 +55,7 @@ class _ReimburseScreen extends State<ReimburseScreen> {
     super.initState();
   }
 
-  getKategoriReimburse () {
+  getKategoriReimburse () async {
     ProgressDialog loading = ProgressDialog(context);
     loading = ProgressDialog(context,
         type: ProgressDialogType.normal, isDismissible: false, showLogs: true);
@@ -74,7 +74,7 @@ class _ReimburseScreen extends State<ReimburseScreen> {
         messageTextStyle: TextStyle(
             color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
 
-    loading.show();
+    await loading.show();
     CategoryReimburse_Post.connectToAPI().then((valueResult) async {
       Map<String, dynamic> object = json.decode(valueResult);
       if (object.containsKey("result").toString() == "true"){
@@ -579,7 +579,7 @@ class _ReimburseScreen extends State<ReimburseScreen> {
                                                 fontSize: 17,
                                                 fontWeight: FontWeight.w500)),
                                       ),
-                                      onTap: () {
+                                      onTap: () async {
                                         ProgressDialog loading = ProgressDialog(context);
                                         loading = ProgressDialog(context,
                                             type: ProgressDialogType.normal, isDismissible: false, showLogs: true);
@@ -601,7 +601,7 @@ class _ReimburseScreen extends State<ReimburseScreen> {
                                         if (!validateFormReimburse(context)){
                                           return;
                                         } else if (validateFormReimburse(context)){
-                                          loading.show();
+                                          await loading.show();
                                           PengajuanReimburse_Post.connectToAPI(namaProdukTeksController.text.toString(), idReimburse,
                                               formattedDateFrom, totalHargaTeksController.text.toString(), valuePayment,
                                               deskripsiTeksController.text.toString(), fileAttach).then((valueResult) async {

lib/Screens/Menu/SlipGaji/slipgaji_screen.dart

@@ -85,7 +85,7 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
             color: Colors.black, fontSize: 10.0, fontWeight: FontWeight.w400),
         messageTextStyle: TextStyle(
             color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
-    loading.show();
+    await loading.show();
     HistorySlipGaji_Post.connectToAPI().then((valueResult) async {
       Map<String, dynamic> object = json.decode(valueResult);
       if (object.containsKey("result").toString() == "true"){
@@ -172,7 +172,7 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
             color: Colors.black, fontSize: 10.0, fontWeight: FontWeight.w400),
         messageTextStyle: TextStyle(
             color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
-    loading.show();
+    await loading.show();
 
     final SharedPreferences prefs = await SharedPreferences.getInstance();
       DetailSlipGaji_Post.connectToAPI(batchID_List[indexBatchID]).then((valueResult) async {
@@ -392,7 +392,7 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
                       child: Container(
                         alignment: Alignment.centerRight,
                         child: ElevatedButton(
-                          onPressed: () {
+                          onPressed: () async {
                             ProgressDialog loading = ProgressDialog(context);
                             loading = ProgressDialog(context,
                                 type: ProgressDialogType.normal, isDismissible: false, showLogs: true);
@@ -410,7 +410,7 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
                                     color: Colors.black, fontSize: 10.0, fontWeight: FontWeight.w400),
                                 messageTextStyle: TextStyle(
                                     color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
-                            loading.show();
+                            await loading.show();
 
                             DownloadSlipGaji_Post.connectToAPI(batchID_List[indexBatchID]).then((valueResult) async {
                               Map<String, dynamic> object = json.decode(valueResult);

lib/Screens/Menu/SuratTugas/deklarasi_st.dart

@@ -279,12 +279,12 @@ class _DeklarasiST_Screen_State extends State<DeklarasiST_Screen> {
                                             messageTextStyle: TextStyle(
                                                 color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
 
-                                        //loading.show();
+                                        //await loading.show();
 
                                         /*if (!validateFormCuti(context)){
                                                 return;
                                               } else if (validateFormCuti(context)){
-                                                loading.show();
+                                                await loading.show();
                                                 PengajuanCuti_Post.connectToAPI(idCuti, formattedDateFrom,
                                                     formattedDateTo, deskripsiTeksController.text.toString(), fileAttach)
                                                     .then((valueResult) async {
@@ -297,7 +297,7 @@ class _DeklarasiST_Screen_State extends State<DeklarasiST_Screen> {
                                               String to = object['result']['to'].toString();
                                               String deskripsi = object['result']['deskripsi'].toString();
                                               String attachment = object['result']['attachment'].toString();*//*
-                                                    loading.hide();
+                                                    await loading.hide();
                                                     deskripsiTeksController.clear();
                                                     Widget okButton = TextButton(
                                                       child: Text("OK"),
@@ -332,7 +332,7 @@ class _DeklarasiST_Screen_State extends State<DeklarasiST_Screen> {
                                                   } else if (object.containsKey("error").toString() == "true") {
                                                     String errorMessage = object['error']['data']['message']
                                                         .toString();
-                                                    loading.hide();
+                                                    await loading.hide();
                                                     Widget okButton = TextButton(
                                                       child: Text("OK"),
                                                       onPressed: () {

lib/Screens/Menu/SuratTugas/history_st.dart

@@ -89,7 +89,7 @@ class _HistoryST extends State<HistoryST> {
         messageTextStyle: TextStyle(
             color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
 
-    loading.show();
+    await loading.show();
     HistoryST_Post.connectToAPI().then((valueResult) async {
       Map<String, dynamic> object = jsonDecode(valueResult);
       if (object.containsKey("result").toString() == "true") {
@@ -99,7 +99,7 @@ class _HistoryST extends State<HistoryST> {
           alertDialogFailedRetrievedData(context);
         } else {
           List <dynamic> historyST = object['result'];
-          setState(() {
+          setState(() async {
             for (int i = 0; i < historyST.length; i++){
               String id = historyST[i]['id'].toString();
               String number = historyST[i]['number'].toString();
@@ -205,7 +205,7 @@ class _HistoryST extends State<HistoryST> {
             ticketTo_List.removeAt(0);
             ticketDate_List.removeAt(0);
             ticketPrice_List.removeAt(0);
-            loading.hide();
+            await loading.hide();
           });
         }
       } else {

lib/Screens/Menu/SuratTugas/pengajuan_extendTanggalKembali.dart

@@ -829,7 +829,7 @@ class _PengajuanExtendTanggalKembali_Screen extends State<PengajuanExtendTanggal
                                                       fontSize: 17,
                                                       fontWeight: FontWeight.w500)),
                                             ),
-                                            onTap: () {
+                                            onTap: () async {
                                               ProgressDialog loading = ProgressDialog(context);
                                               loading = ProgressDialog(context,
                                                   type: ProgressDialogType.normal, isDismissible: false, showLogs: true);
@@ -851,7 +851,7 @@ class _PengajuanExtendTanggalKembali_Screen extends State<PengajuanExtendTanggal
                                               if (!validateFormPengajuanST(context)){
                                                 return;
                                               } else if (validateFormPengajuanST(context)){
-                                                loading.show();
+                                                await loading.show();
                                                 PengajuanST_Post.connectToAPI(
                                                     formattedDateST, uangMukaTeksController.text.toString(), keperluanTeksController.text.toString(),
                                                     formattedDateDeparture, formattedDateReturn, tujuanTeksController.text.toString(), kendaraan,

lib/Screens/Menu/SuratTugas/pengajuan_st.dart

@@ -774,7 +774,7 @@ class _PengajuanST_Screen_State extends State<PengajuanST_Screen> {
                                             fontSize: 17,
                                             fontWeight: FontWeight.w500)),
                                   ),
-                                  onTap: () {
+                                  onTap: () async {
                                     ProgressDialog loading =
                                     ProgressDialog(context);
                                     loading = ProgressDialog(context,
@@ -806,7 +806,7 @@ class _PengajuanST_Screen_State extends State<PengajuanST_Screen> {
                                       return;
                                     } else if (validateFormPengajuanST(
                                         context)) {
-                                      loading.show();
+                                      await loading.show();
                                       PengajuanST_Post.connectToAPI(
                                           formattedDateST,
                                           uangMukaTeksController.text