First

android/app/build.gradle

@@ -1,14 +1,15 @@
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
+    localPropertiesFile.withReader('UTF-8') {
+        reader -> localProperties.load(reader)
     }
 }
 
 def flutterRoot = localProperties.getProperty('flutter.sdk')
 if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+    //throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+    throw FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
@@ -39,7 +40,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.urp.hris"
+        applicationId "com.icp.canvassing"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
         //minSdkVersion flutter.minSdkVersion
@@ -53,7 +54,7 @@ android {
 
     signingConfigs {
         release {
-            storeFile file('D:/Android Studio Projects/ess/ess_keystore.jks')
+            //storeFile file('D:/Android Studio Projects/ess/ess_keystore.jks')
             storePassword '123123'
             keyAlias 'ess_keystore'
             keyPassword '123123'

android/app/google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "11716618948",
+    "project_id": "canvas-56baa",
+    "storage_bucket": "canvas-56baa.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:11716618948:android:e8a6512d2d905094937791",
+        "android_client_info": {
+          "package_name": "com.icp.canvassing"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAsylxl5a2treqN-GI1lqcx6Ode6-hl8hk"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.hris_selfservice_mobile">
+    package="com.icp.canvassing">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

android/app/src/main/AndroidManifest.xml

@@ -1,16 +1,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.example.hris_selfservice_mobile">
+    package="com.icp.canvassing">
 
     <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.FOREGROUND_SERVICE" />
 
     <application
         android:icon="@mipmap/ic_launcher"
-        android:label="Employee Self Service"
+        android:label="Canvasing App"
         android:usesCleartextTraffic="true"
         tools:targetApi="m">
 
@@ -55,6 +54,4 @@
             android:name="com.google.firebase.messaging.default_notification_channel_id"
             android:value="high_importance_channel" />
     </application>
-</manifest>
-
-
+</manifest>

android/app/src/main/java/com/example/hris_selfservice_mobile/MainActivity.java → android/app/src/main/java/com/icp/canvassing/MainActivity.java

@@ -1,6 +1,6 @@
-package com.example.hris_selfservice_mobile;
+package com.icp.canvassing;
 
 import io.flutter.embedding.android.FlutterActivity;
 
 public class MainActivity extends FlutterActivity {
-}
+}

android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.hris_selfservice_mobile">
+    package="com.urp.hris">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

android/gradle.properties

@@ -2,3 +2,8 @@ org.gradle.jvmargs=-Xmx1536M
 
 android.useAndroidX=true
 android.enableJetifier=true
+
+#MYAPP_RELEASE_STORE_FILE=D:\\Android Studio Projects\\ess\\ess_keystore.jks
+#MYAPP_RELEASE_KEY_ALIAS=ess_keystore
+#MYAPP_RELEASE_STORE_PASSWORD=123123
+#MYAPP_RELEASE_KEY_PASSWORD=123123

ios/Runner.xcodeproj/project.pbxproj

@@ -294,7 +294,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.hrisSelfserviceMobile;
+				PRODUCT_BUNDLE_IDENTIFIER = com.urp.hris;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -422,7 +422,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.hrisSelfserviceMobile;
+				PRODUCT_BUNDLE_IDENTIFIER = com.urp.hris;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -444,7 +444,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.hrisSelfserviceMobile;
+				PRODUCT_BUNDLE_IDENTIFIER = com.urp.hris;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

ios/Runner/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>hris_selfservice_mobile</string>
+	<string>employee self service</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>HRIS Self Service</string>
+	<string>Employee Self Service</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

ios/firebase_app_id_file.json

@@ -1,7 +1,7 @@
 {
   "file_generated_by": "FlutterFire CLI",
   "purpose": "FirebaseAppID & ProjectID for this Firebase app in this directory",
-  "GOOGLE_APP_ID": "1:372840384875:ios:729b20a1d7ac16b0fd642e",
-  "FIREBASE_PROJECT_ID": "gsi---employee-self-service",
-  "GCM_SENDER_ID": "372840384875"
+  "GOOGLE_APP_ID": "1:11716618948:ios:2cfdbccbd58e6267937791",
+  "FIREBASE_PROJECT_ID": "canvas-56baa",
+  "GCM_SENDER_ID": "11716618948"
 }

lib/Screens/Home/home_screen.dart

@@ -4,7 +4,6 @@ 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';
@@ -14,8 +13,6 @@ import 'package:employee_selfservice_mobile/Screens/Menu/About/about_screen.dart
 import 'package:employee_selfservice_mobile/Screens/Menu/Absensi/absensi_screen.dart';
 import 'package:employee_selfservice_mobile/Screens/Menu/AjukanCuti/ajukancuti_screen.dart';
 import 'package:employee_selfservice_mobile/Screens/Menu/Reimburse/reimburse_screen.dart';
-import 'package:employee_selfservice_mobile/Screens/Menu/SlipGaji/slipgaji_screen.dart';
-import 'package:employee_selfservice_mobile/Screens/Menu/SuratTugas/surattugas_screen.dart';
 import 'package:employee_selfservice_mobile/Screens/Settings/settings_screen.dart';
 import 'package:lottie/lottie.dart';
 import 'package:progress_dialog_null_safe/progress_dialog_null_safe.dart';
@@ -51,10 +48,11 @@ class _HomeView extends State<HomeView> {
   @override
   initState() {
     getConnectivity();
-    getDetail();
-    _imageToShow = AssetImage('assets/images/ic_administrator.png');
+    /*getDetail();*/
+    _imageToShow = AssetImage('assets/images/ic_pp_2.png');
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      getProfileImage();
+      //getProfileImage();
+      _imageToShow = AssetImage('assets/icons/ic_pp_2.png');
     });
     super.initState();
   }
@@ -77,7 +75,7 @@ class _HomeView extends State<HomeView> {
   }
 
   //Get Profile image
-  getProfileImage() async {
+  /*getProfileImage() async {
     final SharedPreferences prefs = await SharedPreferences.getInstance();
     final session = prefs.getString('session');
 
@@ -144,7 +142,7 @@ class _HomeView extends State<HomeView> {
       await loading.hide();
     });
     return _imageToShow;
-  }
+  }*/
 
   //GetDetail
   getDetail() async {
@@ -275,7 +273,6 @@ class BottomNavBar extends StatefulWidget {
 class _BottomNavBarState extends State<BottomNavBar> {
   List<Widget> _widgetOptions = <Widget>[
     HomeScreen(),
-    NotificationCenter_Screen(),
     SettingsScreen(),
   ];
 
@@ -320,7 +317,7 @@ class HomeScreen extends StatefulWidget {
 
 class _HomeScreenState extends State<HomeScreen> {
   //Get Profile image
-  getProfileImage() async {
+  /*getProfileImage() async {
     final SharedPreferences prefs = await SharedPreferences.getInstance();
     final session = prefs.getString('session');
 
@@ -363,7 +360,7 @@ class _HomeScreenState extends State<HomeScreen> {
       }
     });
     return _imageToShow;
-  }
+  }*/
 
   @override
   Widget build(BuildContext context) {
@@ -382,7 +379,7 @@ class _HomeScreenState extends State<HomeScreen> {
         getProfileImage();
       },*/
       onFocusGained: () {
-        getProfileImage();
+        _imageToShow = AssetImage('assets/icons/ic_pp_2.png');
       },
 /*      onForegroundLost: (){
         getProfileImage();
@@ -411,30 +408,13 @@ class _HomeScreenState extends State<HomeScreen> {
                     padding: EdgeInsets.all(20),
                     child: Column(
                       children: <Widget>[
-                        /* Align(
-                          alignment: Alignment.topRight,
-                          child: InkWell(
-                            child: Container(
-                                alignment: Alignment.center,
-                                height: 40,
-                                width: 40,
-                                child: Image.asset('assets/images/ic_settings.png')),
-                            onTap: () {
-                              Navigator.push(
-                                  context,
-                                  MaterialPageRoute(
-                                      builder: (context) => SettingsScreen()));
-                            },
-                          ),
-                        ),*/
                         Container(
                           child: Stack(
                             alignment: Alignment.topLeft,
                             children: [
                               Container(
                                 margin: EdgeInsets.only(
-                                    top: (((size.width - 20) * 0.33) * 0.5) +
-                                        40),
+                                    top: (((size.width - 20) * 0.33) * 0.5) + 40),
                                 child: Card(
                                   elevation: 15,
                                   child: Container(
@@ -446,13 +426,10 @@ class _HomeScreenState extends State<HomeScreen> {
                                           borderRadius:
                                           BorderRadius.all(
                                               Radius.circular(10))),
-                                      child: Column(
-                                        mainAxisAlignment: MainAxisAlignment
-                                            .end,
-                                        crossAxisAlignment: CrossAxisAlignment
-                                            .center,
+                                      child: Column(mainAxisAlignment: MainAxisAlignment.end,
+                                        crossAxisAlignment: CrossAxisAlignment.center,
                                         children: <Widget>[
-                                          Text(name,
+                                          Text("Ginro",
                                             maxLines: 2,
                                             overflow: TextOverflow.ellipsis,
                                             textAlign: TextAlign.center,
@@ -461,7 +438,7 @@ class _HomeScreenState extends State<HomeScreen> {
                                                 color: Colors.black,
                                                 fontWeight: FontWeight.bold),
                                           ),
-                                          Text(position,
+                                          Text("General Manager",
                                             textAlign: TextAlign.center,
                                             style: GoogleFonts.inter(
                                                 fontSize: size.width * 0.035,
@@ -515,16 +492,19 @@ class _HomeScreenState extends State<HomeScreen> {
                                           Container(
                                             width: size.width * 0.18,
                                             child: Image.asset(
-                                                "assets/icons/menu/ic_absensi.png",
+                                                "assets/icons/menu/ic_absensi_3.png",
                                                 fit: BoxFit.contain)
                                           ),
-                                          Text(
-                                            'Attendance',
-                                            textAlign: TextAlign.center,
-                                            style: GoogleFonts.acme(
-                                                fontSize: size.width * 0.045,
-                                                color: Colors.black),
-                                          ),
+                                          Container(
+                                            margin: EdgeInsets.only(top: 5),
+                                            child: Text(
+                                              'Canvasing',
+                                              textAlign: TextAlign.center,
+                                              style: GoogleFonts.acme(
+                                                  fontSize: size.width * 0.045,
+                                                  color: Colors.black),
+                                            ),
+                                          )
                                         ],
                                       ),
                                     )
@@ -550,51 +530,19 @@ class _HomeScreenState extends State<HomeScreen> {
                                     Container(
                                       width: size.width * 0.18,
                                       child: Image.asset(
-                                        "assets/icons/menu/ic_slipgaji_2.png",
+                                        "assets/icons/menu/ic_cuti_4.png",
                                         fit: BoxFit.contain),
                                     ),
-                                    Text(
-                                      'Pay Slip',
-                                      textAlign: TextAlign.center,
-                                      style: GoogleFonts.acme(
-                                          fontSize: size.width * 0.045,
-                                          color: Colors.black),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                              onTap: () {
-                                Navigator.push(
-                                    context,
-                                    MaterialPageRoute(
-                                        builder: (context) =>
-                                            SlipGajiScreen()));
-                              },
-                            ),
-                            InkWell(
-                              child: Container(
-                                width: size.width,
-                                height: size.height,
-                                decoration: BoxDecoration(
-                                    color: Color(0xFFD0D0D0),
-                                    borderRadius: BorderRadius.circular(5)),
-                                child: Column(
-                                  crossAxisAlignment: CrossAxisAlignment.center,
-                                  mainAxisAlignment: MainAxisAlignment.center,
-                                  children: <Widget>[
                                     Container(
-                                      width: size.width * 0.18,
-                                      child: Image.asset(
-                                        "assets/icons/menu/ic_cuti_2.png",
-                                        fit: BoxFit.contain),
-                                    ),
-                                    Text(
-                                      'Leaves',
-                                      textAlign: TextAlign.center,
-                                      style: GoogleFonts.acme(
-                                          fontSize: size.width * 0.045,
-                                          color: Colors.black),
-                                    ),
+                                      margin: EdgeInsets.only(top: 5),
+                                      child: Text(
+                                        'Leaves',
+                                        textAlign: TextAlign.center,
+                                        style: GoogleFonts.acme(
+                                            fontSize: size.width * 0.045,
+                                            color: Colors.black),
+                                      ),
+                                    )
                                   ],
                                 ),
                               ),
@@ -606,7 +554,7 @@ class _HomeScreenState extends State<HomeScreen> {
                                             AjukanCutiScreen()));
                               },
                             ),
-                            /*InkWell(
+                            InkWell(
                               child: Container(
                                 width: size.width,
                                 height: size.height,
@@ -620,53 +568,20 @@ class _HomeScreenState extends State<HomeScreen> {
                                     Container(
                                       width: size.width * 0.18,
                                       child: Image.asset(
-                                        "assets/icons/menu/ic_surattugas_2.png",
+                                        "assets/icons/menu/ic_reimburse_4.png",
                                         fit: BoxFit.contain,
                                       ),
                                     ),
-                                    Text(
-                                      'Assignment Letter',
-                                      textAlign: TextAlign.center,
-                                      style: GoogleFonts.acme(
-                                          fontSize: size.width * 0.045,
-                                          color: Colors.black),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                              onTap: () {
-                                Navigator.push(
-                                    context,
-                                    MaterialPageRoute(
-                                        builder: (context) =>
-                                            SuratTugas_Screen()));
-                              },
-                            ),*/
-                            InkWell(
-                              child: Container(
-                                width: size.width,
-                                height: size.height,
-                                decoration: BoxDecoration(
-                                    color: Color(0xFFD0D0D0),
-                                    borderRadius: BorderRadius.circular(5)),
-                                child: Column(
-                                  crossAxisAlignment: CrossAxisAlignment.center,
-                                  mainAxisAlignment: MainAxisAlignment.center,
-                                  children: <Widget>[
                                     Container(
-                                      width: size.width * 0.18,
-                                      child: Image.asset(
-                                        "assets/icons/menu/ic_reimburse.png",
-                                        fit: BoxFit.contain,
+                                      margin: EdgeInsets.only(top: 5),
+                                      child: Text(
+                                        'Reimburse',
+                                        textAlign: TextAlign.center,
+                                        style: GoogleFonts.acme(
+                                            fontSize: size.width * 0.045,
+                                            color: Colors.black),
                                       ),
-                                    ),
-                                    Text(
-                                      'Reimburse',
-                                      textAlign: TextAlign.center,
-                                      style: GoogleFonts.acme(
-                                          fontSize: size.width * 0.045,
-                                          color: Colors.black),
-                                    ),
+                                    )
                                   ],
                                 ),
                               ),
@@ -692,91 +607,20 @@ class _HomeScreenState extends State<HomeScreen> {
                                     Container(
                                       width: size.width * 0.18,
                                       child: Image.asset(
-                                        "assets/icons/menu/ic_about_3.png",
+                                        "assets/icons/menu/ic_about_9.png",
                                         fit: BoxFit.contain,
                                       ),
                                     ),
-                                    Text(
-                                      'About',
-                                      textAlign: TextAlign.center,
-                                      style: GoogleFonts.acme(
-                                          fontSize: size.width * 0.045,
-                                          color: Colors.black),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                              onTap: () {
-                                Navigator.push(
-                                    context,
-                                    MaterialPageRoute(
-                                        builder: (context) => AboutScreen()));
-                              },
-                            ),
-                            /*InkWell(
-                              child: Container(
-                                decoration: BoxDecoration(
-                                    color: Color(0xFFD0D0D0),
-                                    borderRadius: BorderRadius.circular(5)),
-                                child: Column(
-                                  crossAxisAlignment: CrossAxisAlignment.center,
-                                  mainAxisAlignment: MainAxisAlignment.center,
-                                  children: <Widget>[
-                                    Container(
-                                      width: 70,
-                                      height: 70,
-                                      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),
-                                      ),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                              onTap: () {
-                                Navigator.push(
-                                    context,
-                                    MaterialPageRoute(
-                                        builder: (context) => ReimburseScreen()));
-                              },
-                            ),
-                            InkWell(
-                              child: Container(
-                                decoration: BoxDecoration(
-                                    color: Color(0xFFD0D0D0),
-                                    borderRadius: BorderRadius.circular(5)),
-                                child: Column(
-                                  crossAxisAlignment: CrossAxisAlignment.center,
-                                  mainAxisAlignment: MainAxisAlignment.center,
-                                  children: <Widget>[
-                                    Container(
-                                      width: 70,
-                                      height: 70,
-                                      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),
+                                      margin: EdgeInsets.only(top: 5),
                                       child: Text(
                                         'About',
                                         textAlign: TextAlign.center,
                                         style: GoogleFonts.acme(
-                                            fontSize: 18, color: Colors.black),
+                                            fontSize: size.width * 0.045,
+                                            color: Colors.black),
                                       ),
-                                    ),
+                                    )
                                   ],
                                 ),
                               ),
@@ -786,7 +630,7 @@ class _HomeScreenState extends State<HomeScreen> {
                                     MaterialPageRoute(
                                         builder: (context) => AboutScreen()));
                               },
-                            ),*/
+                            ),
                           ],
                         )
                       ],

lib/Screens/Login/login_screen.dart

@@ -3,19 +3,18 @@ import 'dart:convert';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_udid/flutter_udid.dart';
 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/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';
 import '../Home/home_screen.dart';
 import 'inputWidget.dart';
 import 'dart:developer' as logDev;
-//import 'package:plain_notification_token/plain_notification_token.dart';
+
+import 'login_post.dart';
+
 
 class LoginView extends StatefulWidget {
   @override
@@ -44,7 +43,7 @@ class LoginScreen extends StatefulWidget {
 }
 
 class _LoginScreenState extends State<LoginScreen> {
-  late LoginPostResult loginPostResult;
+  //late LoginPostResult loginPostResult;
   String version = "1.0.0";
   String notif_token = "";
 
@@ -77,12 +76,12 @@ class _LoginScreenState extends State<LoginScreen> {
 
     return SingleChildScrollView(
       reverse: true,
-        padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
-        child: Column(
+      padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
+      child: Column(
         children: <Widget>[
           Padding(
             padding:
-                EdgeInsets.only(top: MediaQuery.of(context).size.height / 2.45),
+            EdgeInsets.only(top: MediaQuery.of(context).size.height / 2.45),
           ),
           Column(
             children: <Widget>[
@@ -113,8 +112,7 @@ class _LoginScreenState extends State<LoginScreen> {
                     alignment: Alignment.bottomRight,
                     children: <Widget>[
                       InputWidgetEmail(20.0, 20.0),
-                      Padding(
-                        padding: EdgeInsets.only(right: 50),
+                      Padding(padding: EdgeInsets.only(right: 50),
                       ),
                     ],
                   ),
@@ -140,8 +138,8 @@ class _LoginScreenState extends State<LoginScreen> {
                           children: <Widget>[
                             Expanded(
                                 child: Padding(
-                              padding: EdgeInsets.only(top: 0),
-                            )),
+                                  padding: EdgeInsets.only(top: 0),
+                                )),
                             InkWell(
                               child: Container(
                                 padding: EdgeInsets.all(10),
@@ -159,77 +157,19 @@ class _LoginScreenState extends State<LoginScreen> {
                                 ),
                               ),
                               onTap: () async {
-                                /*String imei;
-                                try {
-                                  imei = await FlutterUdid.udid;
-                                } on PlatformException {
-                                  imei = 'Failed to get UDID.';
-                                }
-                                logDev.log(imei, name: "IMEI");*/
                                 if (!validateForm(context)) {
                                   return;
                                 } else {
-                                  await loading.show();
-
-                                  final notif_token = await FirebaseMessaging.instance.getToken();
-                                  logDev.log(notif_token.toString(), name: "NOTIFICATION TOKEN");
-
-                                  LoginPostResult.connectToAPI(
-                                          emailController.text.toString(),
-                                          passwordController.text.toString(),
-                                          notif_token!,
-                                          version,
-                                          platform(),)
-                                      .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") {
-                                        Fluttertoast.showToast(
-                                            msg: "Login Success",
-                                            toastLength: Toast.LENGTH_SHORT,
-                                            gravity: ToastGravity.CENTER,
-                                            timeInSecForIosWeb: 1,
-                                            textColor: Colors.white,
-                                            fontSize: 16.0);
-
-                                        var prefs = await SharedPreferences.getInstance();
-                                        await prefs.setString('version', version);
-                                        await prefs.setString('device', object['result']['device'].toString());
-                                        await prefs.setString('session', object['result']['hash'].toString());
-                                        await prefs.setString('name', object['result']['name'].toString());
-                                        await prefs.setString('notif_token', notif_token);
-
-                                        emailController.clear();
-                                        passwordController.clear();
-
-                                        await loading.hide();
-                                        Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) => HomeView()));
-                                      } else if (status == "failed") {
-                                        String message = object['result']['message'].toString();
-                                        Fluttertoast.showToast(
-                                            msg: message,
-                                            toastLength: Toast.LENGTH_SHORT,
-                                            gravity: ToastGravity.CENTER,
-                                            timeInSecForIosWeb: 1,
-                                            textColor: Colors.white,
-                                            fontSize: 16.0);
-                                        await loading.hide();
-                                      }
-                                    } else {
-                                      await loading.hide();
-                                      alertDialogFailedResponse(context);
-                                    }
-                                  });
+                                  Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) => HomeView()));
                                 }
                               },
                             )
                           ],
                         ),
                       ),
-                      /*Padding(
+                      Padding(
                           padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom)
-                      )*/
+                      )
                     ],
                   ),
                 ],
@@ -239,7 +179,7 @@ class _LoginScreenState extends State<LoginScreen> {
               ),
               InkWell(
                   child:
-                      roundedRectButton("Forgot Password?", Gradients1, false),
+                  roundedRectButton("Forgot Password?", Gradients1, false),
                   onTap: () {
                     Navigator.push(
                         context,
@@ -254,8 +194,7 @@ class _LoginScreenState extends State<LoginScreen> {
   }
 }
 
-Widget roundedRectButton(
-    String title, List<Color> gradient, bool isEndIconVisible) {
+Widget roundedRectButton(String title, List<Color> gradient, bool isEndIconVisible) {
   return Builder(builder: (BuildContext mContext) {
     return Align(
       alignment: Alignment.centerLeft,
@@ -352,7 +291,7 @@ alertDialogFailedResponse(BuildContext context){
     onPressed: () {
       Navigator.of(context, rootNavigator: true).pop();
       Navigator.pushReplacement(context, MaterialPageRoute(
-          builder: (context) => SplashScreen()));
+          builder: (context) => LoginScreen()));
     },
   );
 

lib/Screens/Splash/background.dart

@@ -0,0 +1,178 @@
+import 'package:flutter/material.dart';
+
+class Background extends StatelessWidget {
+  const Background({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      resizeToAvoidBottomInset: false,
+      backgroundColor: Colors.white,
+      body: Column(
+        children: <Widget>[
+          new Stack(
+            alignment: Alignment.bottomCenter,
+            children: <Widget>[
+              WavyHeader()
+            ],
+          ),
+          Expanded(
+            child: Container(),
+          ),
+          Stack(
+            alignment: Alignment.bottomLeft,
+            children: <Widget>[
+              WavyFooter(),
+              CirclePink(),
+              CircleYellow(),
+            ],
+          )
+        ],
+      ),
+    );
+  }
+}
+
+const List<Color> orangeGradients = [
+  /*Color(0xFFFF9844),
+  Color(0xFFFE8853),
+  Color(0xFFFD7267),*/
+  Color(0xFFD21404),
+  Color(0xFFFD7267)
+];
+
+const List<Color> aquaGradients = [
+  Color(0xFF8EF7DA),
+  Color(0xFF5AEAF1),
+  Colors.blueAccent,
+];
+
+class WavyHeader extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return ClipPath(
+      clipper: TopWaveClipper(),
+      child: Container(
+        decoration: BoxDecoration(
+          gradient: LinearGradient(
+              colors: orangeGradients,
+              begin: Alignment.topLeft,
+              end: Alignment.center),
+        ),
+        height: MediaQuery.of(context).size.height / 2.5,
+      ),
+    );
+  }
+}
+
+class WavyFooter extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return ClipPath(
+      clipper: FooterWaveClipper(),
+      child: Container(
+        decoration: BoxDecoration(
+          gradient: LinearGradient(
+              colors: aquaGradients,
+              begin: Alignment.center,
+              end: Alignment.bottomRight),
+        ),
+        height: MediaQuery.of(context).size.height / 3,
+      ),
+    );
+  }
+}
+
+class CirclePink extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Transform.translate(
+      offset: Offset(-70.0, 90.0),
+      child: Material(
+        color: Color(0xFFFF9844),
+        child: Padding(padding: EdgeInsets.all(120)),
+        shape: CircleBorder(side: BorderSide(color: Colors.white, width: 15.0)),
+      ),
+    );
+  }
+}
+
+class CircleYellow extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Transform.translate(
+      offset: Offset(0.0, 210.0),
+      child: Material(
+        color: Colors.yellow,
+        child: Padding(padding: EdgeInsets.all(140)),
+        shape: CircleBorder(side: BorderSide(color: Colors.white, width: 15.0)),
+      ),
+    );
+  }
+}
+
+class TopWaveClipper extends CustomClipper<Path> {
+  @override
+  Path getClip(Size size) {
+    // This is where we decide what part of our image is going to be visible.
+    var path = Path();
+    path.lineTo(0.0, size.height);
+
+    var firstControlPoint = new Offset(size.width / 7, size.height - 30);
+    var firstEndPoint = new Offset(size.width / 6, size.height / 1.5);
+
+    path.quadraticBezierTo(firstControlPoint.dx, firstControlPoint.dy,
+        firstEndPoint.dx, firstEndPoint.dy);
+
+    var secondControlPoint = Offset(size.width / 5, size.height / 4);
+    var secondEndPoint = Offset(size.width / 1.5, size.height / 5);
+    path.quadraticBezierTo(secondControlPoint.dx, secondControlPoint.dy,
+        secondEndPoint.dx, secondEndPoint.dy);
+
+    var thirdControlPoint =
+        Offset(size.width - (size.width / 9), size.height / 6);
+    var thirdEndPoint = Offset(size.width, 0.0);
+    path.quadraticBezierTo(thirdControlPoint.dx, thirdControlPoint.dy,
+        thirdEndPoint.dx, thirdEndPoint.dy);
+
+    ///move from bottom right to top
+    path.lineTo(size.width, 0.0);
+
+    ///finally close the path by reaching start point from top right corner
+    path.close();
+    return path;
+  }
+
+  @override
+  bool shouldReclip(CustomClipper<Path> oldClipper) => false;
+}
+
+class FooterWaveClipper extends CustomClipper<Path> {
+  @override
+  Path getClip(Size size) {
+    var path = Path();
+    path.moveTo(size.width, 0.0);
+    path.lineTo(size.width, size.height);
+    path.lineTo(0.0, size.height);
+    path.lineTo(0.0, size.height - 60);
+    var secondControlPoint = Offset(size.width - (size.width / 6), size.height);
+    var secondEndPoint = Offset(size.width, 0.0);
+    path.quadraticBezierTo(secondControlPoint.dx, secondControlPoint.dy,
+        secondEndPoint.dx, secondEndPoint.dy);
+
+    return path;
+  }
+
+  @override
+  bool shouldReclip(CustomClipper<Path> oldClipper) => false;
+}
+
+class YellowCircleClipper extends CustomClipper<Rect> {
+  @override
+  Rect getClip(Size size) {
+    throw UnimplementedError();
+  }
+
+  @override
+  bool shouldReclip(CustomClipper<Rect> oldClipper) => false;
+}

lib/Screens/Splash/loginstatus_post.dart

@@ -0,0 +1,40 @@
+import 'dart:convert';
+import 'dart:core';
+import 'package:http/http.dart' as http;
+import 'package:employee_selfservice_mobile/constants.dart';
+import 'dart:developer' as logDev;
+
+class LoginStatus_Post {
+  late String version;
+  late String device;
+  late String session;
+  late String 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 {
+    String URL = baseURL + "/api/v1/login_status";
+    print(URL);
+
+    var sendData = await http.post(Uri.parse(URL),
+        body: jsonEncode({
+          "data": [
+            {
+              "version": version,
+              "device": device,
+              "session": session,
+              "notif_token": notif_token
+            }
+          ]
+        }),
+        headers: {"Content-Type": "application/json", "Api-key": apiKey});
+
+
+    logDev.log(sendData.body, name: "Login Status");
+    return sendData.body;
+  }
+}

lib/Screens/Splash/splash_screen.dart

@@ -0,0 +1,338 @@
+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';
+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';
+import '../Splash/background.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'dart:developer' as logDev;
+
+class Splash extends StatefulWidget {
+  const Splash({Key? key}) : super(key: key);
+
+  @override
+  _SplashState createState() => _SplashState();
+}
+
+class _SplashState extends State<Splash> {
+  late StreamSubscription subscription;
+  bool isDeviceConnected = false;
+  bool isAlertSet = false;
+
+  @override
+  void initState() {
+    //getConnectivity();
+    //Timer(Duration(seconds: 10), () => loginStatus(context));
+    Timer(Duration(seconds: 10), () => Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) => LoginView())));
+    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(
+        resizeToAvoidBottomInset: false,
+        body: Stack(
+          children: <Widget>[
+            Background(),
+            SplashScreen(),
+          ],
+        ));
+  }
+
+/*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 {
+  const SplashScreen({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    var size = MediaQuery.of(context).size;
+
+    return Scaffold(
+        body: Container(
+          width: double.infinity,
+          height: double.infinity,
+          decoration: BoxDecoration(
+              gradient: LinearGradient(
+                  begin: Alignment.topRight,
+                  end: Alignment.bottomRight,
+                  colors: [
+                    Color(0xFF4858A7),
+                    Color(0xFF4858A7),
+                    Color(0xFF6474C6),
+                    //Color(0xFF8C99DD),
+                    //Color(0xFFFFFFFF)
+                  ])),
+          child: Center(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                Container(
+                  /*decoration: BoxDecoration(
+                shape: BoxShape.circle,
+                color: Colors.white
+              ),*/
+                  child: SizedBox(
+                      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,
+                style: GoogleFonts.carterOne(fontSize: 25, color: Colors.white))*/
+              ],
+            ),
+          ),
+        ));
+  }
+}
+
+Future<void> loginStatus(BuildContext context) async {
+  final SharedPreferences prefs = await SharedPreferences.getInstance();
+  String? version = prefs.getString('version');
+  String? device = prefs.getString('device');
+  String? session = prefs.getString('session');
+  String? notif_token = prefs.getString('notif_token');
+
+  if (session == null) {
+    version = "1.0.0";
+    session = "";
+    notif_token = "";
+
+    if (Platform.isAndroid){
+      device = "android";
+    } else if (Platform.isIOS){
+      device = "ios";
+    }
+
+  }
+
+  //logDev.log(session, name: "SESSIONNYA");
+
+  LoginStatus_Post.connectToAPI(version!, device!, session, notif_token!).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") {
+        Fluttertoast.showToast(
+            msg: "You are already logged in",
+            toastLength: Toast.LENGTH_SHORT,
+            gravity: ToastGravity.CENTER,
+            timeInSecForIosWeb: 1,
+            textColor: Colors.white,
+            fontSize: 16.0);
+        Navigator.pushReplacement(
+            context, MaterialPageRoute(builder: (context) => HomeView()));
+      } else if (status == "failed") {
+        String message = object['result']['message'].toString();
+        if (message == "Not Logged In") {
+          Fluttertoast.showToast(
+              msg: message,
+              toastLength: Toast.LENGTH_SHORT,
+              gravity: ToastGravity.CENTER,
+              timeInSecForIosWeb: 1,
+              textColor: Colors.white,
+              fontSize: 16.0);
+          Navigator.pushReplacement(
+              context, MaterialPageRoute(builder: (context) => LoginView()));
+        } else {
+          String title = object['result']['title'].toString();
+          String action = object['result']['action'].toString();
+          String block = object['result']['block'].toString();
+          if (block == "false") {
+            Widget okButton = TextButton(
+              child: Text(action),
+              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";
+                }
+              },
+            );
+
+            Widget noButton = TextButton(
+              child: Text("Later"),
+              onPressed: () {
+                if (session == ""){
+                  Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) => LoginView()));
+                } else {
+                  Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) => HomeView()));
+                }
+              },
+            );
+
+            // set up the AlertDialog
+            AlertDialog alert = AlertDialog(
+              title: Text(appName),
+              content: Text(title + "\n" + message),
+              actions: [noButton, okButton],
+
+            );
+
+            // show the dialog
+            showDialog(
+              context: context,
+              barrierDismissible: false,
+              builder: (BuildContext context) {
+                return alert;
+              },
+            );
+          } else if (block == "true") {
+            Widget okButton = TextButton(
+              child: Text(action),
+              onPressed: () async {
+                if (action == "update") {
+                  _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');
+                }
+              },
+            );
+
+            // set up the AlertDialog
+            AlertDialog alert = AlertDialog(
+              title: Text(appName),
+              content: Text(title + "\n" + message),
+              actions: [okButton],
+            );
+
+            // show the dialog
+            showDialog(
+              context: context,
+              barrierDismissible: false,
+              builder: (BuildContext context) {
+                return alert;
+              },
+            );
+          }
+        }
+      }
+    } else {
+      alertDialogFailedResponse(context);
+      Fluttertoast.showToast(
+          msg: "Server Response Error",
+          toastLength: Toast.LENGTH_SHORT,
+          gravity: ToastGravity.CENTER,
+          timeInSecForIosWeb: 1,
+          textColor: Colors.white,
+          fontSize: 16.0);
+    }
+  });
+}
+
+_launchURL(Uri url) async {
+  if (await canLaunchUrl(url)) {
+    await launchUrl(url);
+  } else {
+    throw 'Could not launch $url';
+  }
+}
+
+alertDialogFailedResponse(BuildContext context){
+  Widget okButton = TextButton(
+    child: Text("Refresh"),
+    onPressed: () {
+      Navigator.of(context, rootNavigator: true).pop();
+      Navigator.pushReplacement(context, MaterialPageRoute(
+          builder: (context) => SplashScreen()));
+    },
+  );
+
+  Widget noButton = TextButton(
+    child: Text("Back"),
+    onPressed: () {
+      Navigator.of(context, rootNavigator: true).pop();
+      Navigator.pop(context);
+
+    },
+  );
+
+  // set up the AlertDialog
+  AlertDialog alert = AlertDialog(
+    title: Text(appName),
+    content: Text("Server Response Error"),
+    actions: [
+      noButton,
+      okButton,
+    ],
+  );
+
+  // show the dialog
+  showDialog(
+    context: context,
+    barrierDismissible: false,
+    builder: (BuildContext context) {
+      return alert;
+    },
+  );
+}
+
+

lib/constants.dart

@@ -8,7 +8,8 @@ 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";
+//String baseURL = "https://urp.myapps.id";
+String baseURL = "http://209.97.161.28:8069";
 //String apiKey = "admin";
 //String apiKey = "G514p1k3y";
 String apiKey = "4pik3y";

lib/firebase_options.dart

@@ -0,0 +1,81 @@
+// File generated by FlutterFire CLI.
+// ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members
+import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
+import 'package:flutter/foundation.dart'
+    show defaultTargetPlatform, kIsWeb, TargetPlatform;
+
+/// Default [FirebaseOptions] for use with your Firebase apps.
+///
+/// Example:
+/// ```dart
+/// import 'firebase_options.dart';
+/// // ...
+/// await Firebase.initializeApp(
+///   options: DefaultFirebaseOptions.currentPlatform,
+/// );
+/// ```
+class DefaultFirebaseOptions {
+  static FirebaseOptions get currentPlatform {
+    if (kIsWeb) {
+      return web;
+    }
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+        return android;
+      case TargetPlatform.iOS:
+        return ios;
+      case TargetPlatform.macOS:
+        return macos;
+      case TargetPlatform.windows:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for windows - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      case TargetPlatform.linux:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for linux - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      default:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions are not supported for this platform.',
+        );
+    }
+  }
+
+  static const FirebaseOptions web = FirebaseOptions(
+    apiKey: 'AIzaSyBNRdnOpCYHm70Qc0Jo4sEH8lEpqhfVm2I',
+    appId: '1:11716618948:web:19cebf44e0d875f0937791',
+    messagingSenderId: '11716618948',
+    projectId: 'canvas-56baa',
+    authDomain: 'canvas-56baa.firebaseapp.com',
+    storageBucket: 'canvas-56baa.appspot.com',
+    measurementId: 'G-F5J2T5S5VC',
+  );
+
+  static const FirebaseOptions android = FirebaseOptions(
+    apiKey: 'AIzaSyAsylxl5a2treqN-GI1lqcx6Ode6-hl8hk',
+    appId: '1:11716618948:android:e8a6512d2d905094937791',
+    messagingSenderId: '11716618948',
+    projectId: 'canvas-56baa',
+    storageBucket: 'canvas-56baa.appspot.com',
+  );
+
+  static const FirebaseOptions ios = FirebaseOptions(
+    apiKey: 'AIzaSyBqWHTEHPlp6FFcTGQXkwuMsOcEopWG3F8',
+    appId: '1:11716618948:ios:2cfdbccbd58e6267937791',
+    messagingSenderId: '11716618948',
+    projectId: 'canvas-56baa',
+    storageBucket: 'canvas-56baa.appspot.com',
+    iosBundleId: 'com.urp.hris',
+  );
+
+  static const FirebaseOptions macos = FirebaseOptions(
+    apiKey: 'AIzaSyBqWHTEHPlp6FFcTGQXkwuMsOcEopWG3F8',
+    appId: '1:11716618948:ios:2cfdbccbd58e6267937791',
+    messagingSenderId: '11716618948',
+    projectId: 'canvas-56baa',
+    storageBucket: 'canvas-56baa.appspot.com',
+    iosBundleId: 'com.urp.hris',
+  );
+}

lib/main.dart

@@ -1,79 +1,19 @@
 import 'dart:ui';
+import 'package:employee_selfservice_mobile/Screens/Login/login_screen.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:employee_selfservice_mobile/NotificationService/local_notification_service.dart';
-import 'package:employee_selfservice_mobile/Screens/Splash/splash_screen.dart';
 import 'Screens/Settings/settings_screen.dart';
+import 'Screens/Splash/splash_screen.dart';
 import 'constants.dart';
 import 'dart:developer' as logDev;
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 
 import 'firebase_options.dart';
 
-const AndroidNotificationChannel channel = AndroidNotificationChannel(
-    'high_importance_channel', // id
-    'High Importance Notifications', // title
-    description: 'This channel is used for important notifications.', // description
-    importance: Importance.high,
-    playSound: true);
-
-final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
-
 void main() async{
   WidgetsFlutterBinding.ensureInitialized();
-  // if (Firebase.apps.length){
-    await Firebase.initializeApp(
-      name: "employee-self-service-8280b", options: DefaultFirebaseOptions.currentPlatform
-    );
-  // }
-
-  //You can automatically catch all errors that are thrown within the Flutter framework by overriding
-  FlutterError.onError = (errorDetails) {
-    FirebaseCrashlytics.instance.recordFlutterFatalError(errorDetails);
-  };
-
-  // Pass all uncaught asynchronous errors that aren't handled by the Flutter framework to Crashlytics
-  PlatformDispatcher.instance.onError = (error, stack) {
-    FirebaseCrashlytics.instance.recordError(error, stack, fatal: true);
-    return true;
-  };
-
-  //Force Crash - Crashlytics
-  //FirebaseCrashlytics.instance.crash();
-
-  //LocalNotificationService.initialize();
-  FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
-
-  await flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>()?.createNotificationChannel(channel);
-
-  LocalNotificationService.initialize();
-
-  FirebaseMessaging.onMessage.listen((RemoteMessage message) async {
-    LocalNotificationService.initialize();
-    Map<String, dynamic> data = message.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: ${message.data}');
-
-    if (message.notification != null) {
-      print('Message also contained a notification: ${message.notification}');
-    }
-
-    logDev.log(message.data.toString(), name: "on message listen - DATANYA APA?");
-    logDev.log(message.notification!.title.toString(), name: "on message listen - ISI NOTIFNYA APA?");
-  });
-
-  await FirebaseMessaging.instance.setForegroundNotificationPresentationOptions(
-    alert: true,
-    badge: true,
-    sound: true,
-  );
 
   runApp(MyApp());
 }
@@ -86,78 +26,9 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyAppState extends State<MyApp> {
-  void initState(){
+  /*void initState(){
     super.initState();
-
-    // 1. This method call when app in terminated state and you get a notification
-    // when you click on notification app open from terminated state and you can get notification data in this method
-    FirebaseMessaging.instance.getInitialMessage().then((message) {
-        print("FirebaseMessaging.instance.getInitialMessage");
-        if (message != null) {
-          logDev.log("New Notification", name: "NEW NOTIF");
-          // if (message.data['_id'] != null) {
-          //   Navigator.of(context).push(
-          //     MaterialPageRoute(
-          //       builder: (context) => DemoScreen(
-          //         id: message.data['_id'],
-          //       ),
-          //     ),
-          //   );
-          // }
-        }
-      },
-    );
-
-    // 2. This method only call when App in forground it mean app must be opened
-    FirebaseMessaging.onMessage.listen((RemoteMessage message) {
-      RemoteNotification? notification = message.notification!;
-      //AndroidNotification? android = message.notification?.android;
-      if (notification != null) {
-        flutterLocalNotificationsPlugin.show(
-            notification.hashCode,
-            notification.title,
-            notification.body,
-            NotificationDetails(
-              android: AndroidNotificationDetails(
-                channel.id,
-                channel.name,
-                channelDescription: channel.description,
-                color: Colors.blue,
-                playSound: true,
-                icon: '@mipmap/ic_launcher',
-              ),
-            ));
-      }
-      logDev.log(message.data.toString(), name: "onMessage listen - DATANYA APA?");
-      logDev.log(message.notification!.title.toString(), name: "onMessage listen - ISI NOTIFNYA APA?");
-    });
-
-    // 3. This method only call when App in background and not terminated(not closed)
-    FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message)  {
-      print('A new onMessageOpenedApp event was published!');
-      RemoteNotification? notification = message.notification;
-      //AndroidNotification? android = message.notification?.android;
-      if (notification != null) {
-        showDialog(
-            context: context,
-            builder: (_) {
-              return Scaffold(
-                body: Builder(builder: (context) => Center(
-                  child: ElevatedButton(
-                    onPressed: () {
-                      Navigator.push(context, MaterialPageRoute(
-                          builder: (context) => SettingsScreen()));
-                    },
-                    child: Text("Click"),
-                  ),
-                )),
-              );
-            });
-      }
-      logDev.log(message.data.toString(), name: "Opened APP - DATANYA APA?");
-      logDev.log(message.notification!.title.toString(), name: "Opened APP - ISI NOTIFNYA APA?");
-    });
-  }
+  }*/
 
   @override
   Widget build(BuildContext context) {
@@ -173,10 +44,3 @@ 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);
-}*/

macos/Runner.xcodeproj/project.pbxproj

@@ -54,7 +54,7 @@
 /* Begin PBXFileReference section */
 		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
 		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
-		33CC10ED2044A3C60003C045 /* hris_selfservice_mobile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hris_selfservice_mobile.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		33CC10ED2044A3C60003C045 /* employee_self_service.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "employee_self_service.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
 		33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -105,7 +105,7 @@
 		33CC10EE2044A3C60003C045 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				33CC10ED2044A3C60003C045 /* hris_selfservice_mobile.app */,
+				33CC10ED2044A3C60003C045 /* employee_self_service.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -172,7 +172,7 @@
 			);
 			name = Runner;
 			productName = Runner;
-			productReference = 33CC10ED2044A3C60003C045 /* hris_selfservice_mobile.app */;
+			productReference = 33CC10ED2044A3C60003C045 /* employee_self_service.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */

macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-               BuildableName = "hris_selfservice_mobile.app"
+               BuildableName = "employee_self_service.app"
                BlueprintName = "Runner"
                ReferencedContainer = "container:Runner.xcodeproj">
             </BuildableReference>
@@ -31,7 +31,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "hris_selfservice_mobile.app"
+            BuildableName = "employee_self_service.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -54,7 +54,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "hris_selfservice_mobile.app"
+            BuildableName = "employee_self_service_mobile.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -71,7 +71,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "hris_selfservice_mobile.app"
+            BuildableName = "employee_self_service.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>

macos/Runner/Configs/AppInfo.xcconfig

@@ -5,10 +5,10 @@
 // 'flutter create' template.
 
 // The application's name. By default this is also the title of the Flutter window.
-PRODUCT_NAME = hris_selfservice_mobile
+PRODUCT_NAME = employee_self_service
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.example.hrisSelfserviceMobile
+PRODUCT_BUNDLE_IDENTIFIER = com.urp.hris
 
 // The copyright displayed in application information
 PRODUCT_COPYRIGHT = Copyright © 2022 com.example. All rights reserved.

macos/Runner/GoogleService-Info.plist

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CLIENT_ID</key>
+	<string>476641837995-stu3jdmp8vk9ovgps0l5fuhamj8v0kms.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.476641837995-stu3jdmp8vk9ovgps0l5fuhamj8v0kms</string>
+	<key>API_KEY</key>
+	<string>AIzaSyDtzT93pKa1UvHhlNlkmt_Kpvfjq_QVO5g</string>
+	<key>GCM_SENDER_ID</key>
+	<string>476641837995</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.urp.ess</string>
+	<key>PROJECT_ID</key>
+	<string>employee-self-service-8280b</string>
+	<key>STORAGE_BUCKET</key>
+	<string>employee-self-service-8280b.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:476641837995:ios:6f6cfeb3604f74d10e08ee</string>
+</dict>
+</plist>

macos/firebase_app_id_file.json

@@ -0,0 +1,7 @@
+{
+  "file_generated_by": "FlutterFire CLI",
+  "purpose": "FirebaseAppID & ProjectID for this Firebase app in this directory",
+  "GOOGLE_APP_ID": "1:11716618948:ios:2cfdbccbd58e6267937791",
+  "FIREBASE_PROJECT_ID": "canvas-56baa",
+  "GCM_SENDER_ID": "11716618948"
+}

pubspec.lock

@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "1a5e13736d59235ce0139621b4bbe29bc89839e202409081bc667eb3cd20674c"
+      sha256: d84d98f1992976775f83083523a34c5d22fea191eec3abb2bd09537fb623c2e0
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.5"
+    version: "1.3.7"
   animated_splash_screen:
     dependency: "direct main"
     description:
@@ -37,18 +37,18 @@ packages:
     dependency: "direct main"
     description:
       name: app_settings
-      sha256: "67ca58aba6ec311d89597c2716d2e37da54b8c7cef28b7749e6551c57f88c1f4"
+      sha256: "09bc7fe0313a507087bec1a3baf555f0576e816a760cbb31813a88890a09d9e5"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "5.1.1"
   archive:
     dependency: transitive
     description:
       name: archive
-      sha256: e0902a06f0e00414e4e3438a084580161279f137aeb862274710f29ec10cf01e
+      sha256: "7e0d52067d05f2e0324268097ba723b71cb41ac8a6a2b24d1edf9c536b987b03"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.9"
+    version: "3.4.6"
   args:
     dependency: transitive
     description:
@@ -197,10 +197,10 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: ce75a1b40947fea0a0e16ce73337122a86762e38b982e1ccb909daa3b9bc4197
+      sha256: "417e2a6f9d83ab396ec38ff4ea5da6c254da71e4db765ad737a42af6930140b7"
       url: "https://pub.dev"
     source: hosted
-    version: "5.3.2"
+    version: "5.3.3"
   double_back_to_close:
     dependency: "direct main"
     description:
@@ -253,10 +253,10 @@ packages:
     dependency: transitive
     description:
       name: file_selector_macos
-      sha256: "182c3f8350cee659f7b115e956047ee3dc672a96665883a545e81581b9a82c72"
+      sha256: b15c3da8bd4908b9918111fa486903f5808e388b8d1c559949f584725a6594d6
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3+2"
+    version: "0.9.3+3"
   file_selector_platform_interface:
     dependency: transitive
     description:
@@ -277,10 +277,10 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: c78132175edda4bc532a71e01a32964e4b4fcf53de7853a422d96dac3725f389
+      sha256: "95580fa07c8ca3072a2bb1fecd792616a33f8683477d25b7d29d3a6a399e6ece"
       url: "https://pub.dev"
     source: hosted
-    version: "2.15.1"
+    version: "2.17.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
@@ -293,50 +293,50 @@ packages:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: "4cf4d2161530332ddc3c562f19823fb897ff37a9a774090d28df99f47370e973"
+      sha256: e8c408923cd3a25bd342c576a114f2126769cd1a57106a4edeaa67ea4a84e962
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.0"
+    version: "2.8.0"
   firebase_crashlytics:
     dependency: "direct main"
     description:
       name: firebase_crashlytics
-      sha256: fd9e1a1cb7cce3f9dd2358d8363d235f25f056981e23a333db1e57eca693913f
+      sha256: "833cf891d10e5e819a2034048ff7e8882bcc0b51055c0e17f5fe3f3c3c177a9d"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.5"
+    version: "3.3.7"
   firebase_crashlytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_crashlytics_platform_interface
-      sha256: "0d19ef23cf7a917a357d2eb1807338ec536ec3232e729ebd769f5bb2aba9e085"
+      sha256: dfdf1172f35fc0b0132bc5ec815aed52c07643ee56732e6807ca7dc12f7fce86
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.5"
+    version: "3.6.7"
   firebase_messaging:
     dependency: "direct main"
     description:
       name: firebase_messaging
-      sha256: "6c1a2a047d6f165b7c5f947467ac5138731a2af82c7af1c12d691dbb834f6b73"
+      sha256: "67f9d7c87457e71ad78ee81e332f232b8a24f7d5e338f8c958fa7d6e9e0e3636"
       url: "https://pub.dev"
     source: hosted
-    version: "14.6.7"
+    version: "14.6.9"
   firebase_messaging_platform_interface:
     dependency: transitive
     description:
       name: firebase_messaging_platform_interface
-      sha256: bcba58d28f8cda607a323240c6d314c2c62b62ebfbb0f2d704ebefef07b52b5f
+      sha256: "8c7ced3201886ad7ba37f344c1468ccfc08abb3023922e0e5a016eaf38abb96c"
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.6"
+    version: "4.5.8"
   firebase_messaging_web:
     dependency: transitive
     description:
       name: firebase_messaging_web
-      sha256: "962d09ec9dfa486cbbc218258ad41e8ec7997a2eba46919049496e1cafd960c5"
+      sha256: b601322bdb44e2fefe4cc7b85ef0dbb7a2479d4a7653a51340821cf8d60696b5
       url: "https://pub.dev"
     source: hosted
-    version: "3.5.6"
+    version: "3.5.8"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -378,10 +378,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: "3002092e5b8ce2f86c3361422e52e6db6776c23ee21e0b2f71b892bf4259ef04"
+      sha256: "501ed9d54f1c8c0535b7991bade36f9e7e3b45a2346401f03775c1ec7a3c06ae"
       url: "https://pub.dev"
     source: hosted
-    version: "15.1.1"
+    version: "15.1.2"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
@@ -500,10 +500,10 @@ packages:
     dependency: "direct main"
     description:
       name: geocoding
-      sha256: b34c0501bbbaf3190b85bef3078b27cf66c28a8915c6d3af50d67f356aa7da31
+      sha256: e1dc0ac56666d9ed1d5a9ae5543ce9eb5986db6209cc7600103487d09192059c
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   geocoding_android:
     dependency: transitive
     description:
@@ -532,50 +532,50 @@ packages:
     dependency: "direct main"
     description:
       name: geolocator
-      sha256: "9f1c9a70dd25fc9d9574ff17ba714cf3bc7894258efd7d1ce0debfafe2f8e1d8"
+      sha256: e946395fc608842bb2f6c914807e9183f86f3cb787f6b8f832753e5251036f02
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.1"
+    version: "10.1.0"
   geolocator_android:
     dependency: transitive
     description:
       name: geolocator_android
-      sha256: "55c4a81ea15b664a2fdbfd39ba37f2e9c31e1b57237bbeb8deeeaea9979bc97c"
+      sha256: "93906636752ea4d4e778afa981fdfe7409f545b3147046300df194330044d349"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.3"
+    version: "4.3.1"
   geolocator_apple:
     dependency: transitive
     description:
       name: geolocator_apple
-      sha256: "36527c555f4c425f7d8fa8c7c07d67b78e3ff7590d40448051959e1860c1cfb4"
+      sha256: ab90ae811c42ec2f6021e01eca71df00dee6ff1e69d2c2dafd4daeb0b793f73d
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.7"
+    version: "2.3.2"
   geolocator_platform_interface:
     dependency: transitive
     description:
       name: geolocator_platform_interface
-      sha256: b2a0c09d2cfe8ad6a8cc44fada5c1092c49286e8c30922914dfe2b23799a682f
+      sha256: b7aca62aa05d7e610c396a53a1936ff87fce2f735d76e93fde9269c341c46a25
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.8"
+    version: "4.1.1"
   geolocator_web:
     dependency: transitive
     description:
       name: geolocator_web
-      sha256: f68a122da48fcfff68bbc9846bb0b74ef651afe84a1b1f6ec20939de4d6860e1
+      sha256: "59083f7e0871b78299918d92bf930a14377f711d2d1156c558cd5ebae6c20d58"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.6"
+    version: "2.2.0"
   geolocator_windows:
     dependency: transitive
     description:
       name: geolocator_windows
-      sha256: "463045515b08bd83f73e014359c4ad063b902eb3899952cfb784497ae6c6583b"
+      sha256: "8725beaa00db2b52f53d9811584cb4488240b250b04a09763e80945017f65c9c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.2.1"
   get_it:
     dependency: "direct main"
     description:
@@ -612,10 +612,10 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf
+      sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.17"
+    version: "4.1.3"
   image_cropper:
     dependency: "direct main"
     description:
@@ -652,10 +652,10 @@ packages:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: "47da2161c2e9f8f8a9cbbd89d466d174333fbdd769aeed848912e0b16d9cb369"
+      sha256: "0c7b83bbe2980c8a8e36e974f055e11e51675784e13a4762889feed0f3937ff2"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.8"
+    version: "0.8.8+1"
   image_picker_for_web:
     dependency: transitive
     description:
@@ -924,10 +924,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
+      sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.3"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -980,10 +980,10 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: b7f41bad7e521d205998772545de63ff4e6c97714775902c199353f8bf1511ac
+      sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.2"
   shared_preferences_android:
     dependency: transitive
     description:
@@ -1077,6 +1077,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  syncfusion_flutter_calendar:
+    dependency: "direct main"
+    description:
+      name: syncfusion_flutter_calendar
+      sha256: "0ef40e5dd10b94b9bb2808c217a10d24061b87e9106b9b35ecd8d489bb4f4b23"
+      url: "https://pub.dev"
+    source: hosted
+    version: "23.1.41"
+  syncfusion_flutter_core:
+    dependency: transitive
+    description:
+      name: syncfusion_flutter_core
+      sha256: a8e3d3ea369566bb45f454331c5863939632b6068d15b558fa384811f1f5aa51
+      url: "https://pub.dev"
+    source: hosted
+    version: "23.1.41"
+  syncfusion_flutter_datepicker:
+    dependency: transitive
+    description:
+      name: syncfusion_flutter_datepicker
+      sha256: "0faff9098c24299429743e895e6365aed4849884c19b7ce110aaee21db7afacf"
+      url: "https://pub.dev"
+    source: hosted
+    version: "23.1.41"
   term_glyph:
     dependency: transitive
     description:
@@ -1257,18 +1281,18 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "9e82a402b7f3d518fb9c02d0e9ae45952df31b9bf34d77baf19da2de03fc2aaa"
+      sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.7"
+    version: "5.0.9"
   win32_registry:
     dependency: transitive
     description:
       name: win32_registry
-      sha256: e4506d60b7244251bc59df15656a3093501c37fb5af02105a944d73eb95be4c9
+      sha256: "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   wkt_parser:
     dependency: transitive
     description:

pubspec.yaml

@@ -92,8 +92,9 @@ dependencies:
   flutter_animate: ^4.2.0+1
   animations: ^2.0.8
   firebase_crashlytics: ^3.3.5
-  app_settings: ^5.0.0
+  app_settings: ^5.1.1
   flutter_gif: ^0.0.4
+  syncfusion_flutter_calendar: ^23.1.41
 
 dev_dependencies:
   flutter_test:

upload_certificate.pem

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDxzCCAq+gAwIBAgIIY/18pRsCdGswDQYJKoZIhvcNAQELBQAwgZAxCzAJBgNV
+BAYTAklEMRQwEgYDVQQIEwtES0kgSmFrYXJ0YTEQMA4GA1UEBxMHSmFrYXJ0YTEi
+MCAGA1UEChMZSW5jdWJ1cyBDeWJlcmluZG8gUGVyc2FkYTEWMBQGA1UECxMNSVQg
+RGVwYXJ0bWVudDEdMBsGA1UEAxMURGllbmkgQW5pbmR5YXNhcmF0aGkwIBcNMjMx
+MDA0MDYyMzA5WhgPMjA1MTAyMTkwNjIzMDlaMIGQMQswCQYDVQQGEwJJRDEUMBIG
+A1UECBMLREtJIEpha2FydGExEDAOBgNVBAcTB0pha2FydGExIjAgBgNVBAoTGUlu
+Y3VidXMgQ3liZXJpbmRvIFBlcnNhZGExFjAUBgNVBAsTDUlUIERlcGFydG1lbnQx
+HTAbBgNVBAMTFERpZW5pIEFuaW5keWFzYXJhdGhpMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEApqBnnHa1rWaU/QZtTWEu5JocuY8H4ERSfgeXlqSaFoDV
+N+EoHaTakKWE7nqswVT3cTJdPDoEVZxGP6DVqOrWfd+EbUH9uNKqtRVVq/Yc7d3F
+4Ix3C4t/YdACb7QrP/oDape5rQf9KguRyzxGcbgY0P0A771Uq3jgaPbSXSazokyk
+nbPgykF+iEwsdfSiqKK5jdIenXD92OjCIqdJR16yJbyV6nzXKSQf/+mVzqhg+fbJ
+8QJik84+PL2rx6UvN5TxoFMDLtPNEjlQxS0aIXePgpUbM0KpADvmro7u69h2Mbry
+qObqRcyL2JiCiHzZ+tbt5FpN3hPyBTtLdh9dBW1bXQIDAQABoyEwHzAdBgNVHQ4E
+FgQU9qrCju0iqTjjMvjc3MlfvYpKOi4wDQYJKoZIhvcNAQELBQADggEBABdt3Sqa
+zbsuUNFr3k4ikNyBRVhXymLW4vy0zwd40TBQUpn8G8SRlwsIIl1p2HEVQogFBGfG
+L7oDXNsSsnuKn5Y2XknnZeFatMTsOm12wW2dejlcVPKIQCPkxVz/+cu6qi9eZr+g
+FGV4bT/sfUKHyqLzrvFvwP/7+cYxMdlup0NgYZpBqdB3XektRBNNSLOmlE9FpyNq
+kuiKQcidN+jYbeOhN96kh9BvE0xRcDz/cLh8uSA/aIE7bT1XwjJ1nqtjmtBMGd/v
+INdFQTaLGp7m9KScMNA/WUkRxdeU/RZcVnDgUjRzeiOWbPLnkUdVc2wWXPb/7QW7
+u7fvIlJXknLqCn0=
+-----END CERTIFICATE-----