Update 2909

android/app/build.gradle

@@ -53,7 +53,7 @@ android {
 
     signingConfigs {
         release {
-            storeFile file('D:/employee_self_service/ess_keystore.jks')
+            storeFile file('D:/Android Studio Projects/ess/ess_keystore.jks')
             storePassword '123123'
             keyAlias 'ess_keystore'
             keyPassword '123123'

android/app/src/main/AndroidManifest.xml

@@ -2,11 +2,10 @@
     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" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+   <!-- <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application

lib/Screens/Home/home_screen.dart

@@ -25,7 +25,6 @@ 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;
 String name = "",
     statusDetail = "",
@@ -34,6 +33,7 @@ String name = "",
     email = "",
     address = "",
     position = "";
+var _imageToShow;
 
 
 class HomeView extends StatefulWidget {
@@ -46,12 +46,14 @@ class _HomeView extends State<HomeView> {
   bool isDeviceConnected = false;
   bool isAlertSet = false;
 
+  //var _imageToShow;
+
   @override
   initState() {
     getConnectivity();
     getDetail();
     _imageToShow = AssetImage('assets/images/ic_administrator.png');
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
       getProfileImage();
     });
     super.initState();
@@ -62,7 +64,7 @@ class _HomeView extends State<HomeView> {
             (ConnectivityResult result) async {
           isDeviceConnected = await InternetConnectionChecker().hasConnection;
           if (!isDeviceConnected && isAlertSet == false) {
-            showDialogBox();
+            showConnectivityDialogBox();
             setState(() => isAlertSet = true);
           }
         },
@@ -117,9 +119,7 @@ class _HomeView extends State<HomeView> {
           } else if (photo != "false") {
             Uint8List decodedBytes = Base64Decoder().convert(photo);
             setState(() {
-              _imageToShow = Image
-                  .memory(decodedBytes, gaplessPlayback: true)
-                  .image;
+              _imageToShow = Image.memory(decodedBytes, gaplessPlayback: true).image;
             });
           }
         } else if (status == "failed") {
@@ -227,7 +227,7 @@ class _HomeView extends State<HomeView> {
     );
   }
 
-  showDialogBox() =>
+  showConnectivityDialogBox() =>
       showCupertinoDialog<String>(
         context: context,
         builder: (BuildContext context) =>
@@ -254,7 +254,7 @@ class _HomeView extends State<HomeView> {
                     isDeviceConnected =
                     await InternetConnectionChecker().hasConnection;
                     if (!isDeviceConnected && isAlertSet == false) {
-                      showDialogBox();
+                      showConnectivityDialogBox();
                       setState(() => isAlertSet = true);
                     }
                   },
@@ -333,15 +333,13 @@ class _HomeScreenState extends State<HomeScreen> {
           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);
             //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") {
@@ -608,7 +606,7 @@ class _HomeScreenState extends State<HomeScreen> {
                                             AjukanCutiScreen()));
                               },
                             ),
-                            InkWell(
+                            /*InkWell(
                               child: Container(
                                 width: size.width,
                                 height: size.height,
@@ -643,7 +641,7 @@ class _HomeScreenState extends State<HomeScreen> {
                                         builder: (context) =>
                                             SuratTugas_Screen()));
                               },
-                            ),
+                            ),*/
                             InkWell(
                               child: Container(
                                 width: size.width,

lib/Screens/Login/post_result_model.dart → lib/Screens/Login/login_post.dart

@@ -41,7 +41,7 @@ class LoginPostResult {
   }*/
 
   static Future<String> connectToAPI(String email, String password, String notif_token,
-      String version, String device, String imei) async {
+      String version, String device) async {
     String URL = baseURL + "/api/v1/login";
     print(URL);
 
@@ -53,7 +53,7 @@ class LoginPostResult {
           "notif_token": notif_token,
           "version": version,
           "device": platform(),
-          "imei": imei
+          "imei": "imei"
         }
       ]
     }), headers: {

lib/Screens/Login/login_screen.dart

@@ -8,7 +8,7 @@ import 'package:fluttertoast/fluttertoast.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:employee_selfservice_mobile/Screens/ForgotPassword/forgotPassword_screen.dart';
 import 'package:employee_selfservice_mobile/Screens/Login/background.dart';
-import 'package:employee_selfservice_mobile/Screens/Login/post_result_model.dart';
+import 'package:employee_selfservice_mobile/Screens/Login/login_post.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';
@@ -159,13 +159,13 @@ class _LoginScreenState extends State<LoginScreen> {
                                 ),
                               ),
                               onTap: () async {
-                                String imei;
+                                /*String imei;
                                 try {
                                   imei = await FlutterUdid.udid;
                                 } on PlatformException {
                                   imei = 'Failed to get UDID.';
                                 }
-                                logDev.log(imei, name: "IMEI");
+                                logDev.log(imei, name: "IMEI");*/
                                 if (!validateForm(context)) {
                                   return;
                                 } else {
@@ -179,8 +179,7 @@ class _LoginScreenState extends State<LoginScreen> {
                                           passwordController.text.toString(),
                                           notif_token!,
                                           version,
-                                          platform(),
-                                          imei)
+                                          platform(),)
                                       .then((valueResult) async {
                                     Map<String, dynamic> object = json.decode(valueResult);
                                     if (object.containsKey("result").toString() == "true") {

lib/Screens/Menu/Absensi/absensi_screen.dart

@@ -983,4 +983,4 @@ alertDialogEnableLocaionServices(BuildContext context) {
       return alert;
     },
   );
-}
+}

lib/Screens/Splash/splash_screen.dart

@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:fluttertoast/fluttertoast.dart';
@@ -8,6 +10,7 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:employee_selfservice_mobile/Screens/Login/login_screen.dart';
 import 'package:employee_selfservice_mobile/Screens/Splash/loginstatus_post.dart';
 import 'package:employee_selfservice_mobile/constants.dart';
+import 'package:internet_connection_checker/internet_connection_checker.dart';
 import 'package:lottie/lottie.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../Home/home_screen.dart';
@@ -23,12 +26,28 @@ class Splash extends StatefulWidget {
 }
 
 class _SplashState extends State<Splash> {
+  late StreamSubscription subscription;
+  bool isDeviceConnected = false;
+  bool isAlertSet = false;
+
   @override
   void initState() {
-    super.initState();
+    //getConnectivity();
     Timer(Duration(seconds: 10), () => loginStatus(context));
+    super.initState();
   }
 
+  /*getConnectivity() =>
+      subscription = Connectivity().onConnectivityChanged.listen(
+            (ConnectivityResult result) async {
+          isDeviceConnected = await InternetConnectionChecker().hasConnection;
+          if (!isDeviceConnected && isAlertSet == false) {
+            showConnectivityDialogBox();
+            setState(() => isAlertSet = true);
+          }
+        },
+      );*/
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -40,6 +59,43 @@ class _SplashState extends State<Splash> {
           ],
         ));
   }
+
+  /*showConnectivityDialogBox() =>
+      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) {
+                      showConnectivityDialogBox();
+                      setState(() => isAlertSet = true);
+                    }
+                  },
+                  child: const Text('Retry'),
+                ),
+              ],
+            ),
+      );*/
 }
 
 class SplashScreen extends StatelessWidget {
@@ -47,6 +103,8 @@ class SplashScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    var size = MediaQuery.of(context).size;
+
     return Scaffold(
         body: Container(
       width: double.infinity,
@@ -73,10 +131,11 @@ class SplashScreen extends StatelessWidget {
                 color: Colors.white
               ),*/
               child: SizedBox(
-                width: 250,
-                height: 250,
-                child: LottieBuilder.asset('assets/animation/animation_4.json',
-                    repeat: true),
+                width: size.width * 0.55,
+                //height: 250,
+                child: /*Image.asset('assets/animation/iconapp2.gif')*/
+                LottieBuilder.asset('assets/animation/animation_4.json',
+                    repeat: true, ),
               ),
             ),
             Text(appName,
@@ -184,8 +243,8 @@ Future<void> loginStatus(BuildContext context) async {
               child: Text(action),
               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)) {
@@ -217,13 +276,13 @@ Future<void> loginStatus(BuildContext context) async {
       }
     } else {
       alertDialogFailedResponse(context);
-      /*Fluttertoast.showToast(
+      Fluttertoast.showToast(
           msg: "Server Response Error",
           toastLength: Toast.LENGTH_SHORT,
           gravity: ToastGravity.CENTER,
           timeInSecForIosWeb: 1,
           textColor: Colors.white,
-          fontSize: 16.0);*/
+          fontSize: 16.0);
     }
   });
 }
@@ -274,3 +333,5 @@ alertDialogFailedResponse(BuildContext context){
     },
   );
 }
+
+

lib/main.dart

@@ -1,5 +1,4 @@
 import 'dart:ui';
-
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
@@ -13,11 +12,6 @@ import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 
 import 'firebase_options.dart';
 
-Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
-  logDev.log(message.data.toString(), name: "BACKGROUND HANDLER - DATANYA APA?");
-  logDev.log(message.notification!.title.toString(), name: "BACKGROUND HANDLER - ISI NOTIFNYA APA?");
-}
-
 const AndroidNotificationChannel channel = AndroidNotificationChannel(
     'high_importance_channel', // id
     'High Importance Notifications', // title
@@ -179,6 +173,10 @@ class _MyAppState extends State<MyApp> {
   }
 }
 
+Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
+  logDev.log(message.data.toString(), name: "BACKGROUND HANDLER - DATANYA APA?");
+  logDev.log(message.notification!.title.toString(), name: "BACKGROUND HANDLER - ISI NOTIFNYA APA?");
+}
 /*void sendLogMessage(String message) {
   FirebaseCrashlytics.instance.log(message);
 }*/

pubspec.lock

@@ -350,6 +350,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.2.0+1"
+  flutter_gif:
+    dependency: "direct main"
+    description:
+      name: flutter_gif
+      sha256: b13d7e484e40685e9236ffbaddf012c2448a2e2c1ac48bed345184dd7bc87f88
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.4"
   flutter_image:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -17,7 +17,9 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.0+1
+
+version: 1.0.1+1
+#NOTES : 1.0.1+1  =>>>> 1 + 1 =>>>> version name + version code
 
 environment:
   sdk: '>=2.18.4 <3.0.0'
@@ -91,6 +93,7 @@ dependencies:
   animations: ^2.0.8
   firebase_crashlytics: ^3.3.5
   app_settings: ^5.0.0
+  flutter_gif: ^0.0.4
 
 dev_dependencies:
   flutter_test: