v1.2

.idea/workspace.xml

@@ -17,16 +17,14 @@
     <list default="true" id="8704a1d9-96ef-4cdc-ac57-c88bc9c0306e" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/checksums/checksums.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/checksums/md5-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/checksums/md5-checksums.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/checksums/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/checksums/sha1-checksums.bin" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/executionHistory/executionHistory.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/executionHistory/executionHistory.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/fileHashes/fileHashes.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/fileHashes/fileHashes.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/file-system.probe" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/android/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/app/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/android/app/debug/app-debug.apk" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/daemon/7.4/registry.bin" beforeDir="false" afterPath="$PROJECT_DIR$/daemon/7.4/registry.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/daemon/7.4/registry.bin.lock" beforeDir="false" afterPath="$PROJECT_DIR$/daemon/7.4/registry.bin.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/ui/pages/home_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/ui/pages/home_page.dart" afterDir="false" />

android/.idea/workspace.xml

@@ -22,10 +22,12 @@
       <change beforePath="$PROJECT_DIR$/.gradle/7.4/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.4/executionHistory/executionHistory.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/7.4/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.4/fileHashes/fileHashes.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/7.4/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.4/fileHashes/fileHashes.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/7.4/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.4/fileHashes/resourceHashesCache.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/debug/app-debug.apk" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/release/app-release.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/app-release.apk" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../daemon/7.4/registry.bin" beforeDir="false" afterPath="$PROJECT_DIR$/../daemon/7.4/registry.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../daemon/7.4/registry.bin.lock" beforeDir="false" afterPath="$PROJECT_DIR$/../daemon/7.4/registry.bin.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../lib/ui/pages/home_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/../lib/ui/pages/home_page.dart" afterDir="false" />
@@ -41,9 +43,18 @@
       <ProjectState />
     </projectState>
   </component>
+  <component name="GenerateSignedApkSettings">
+    <option name="KEY_STORE_PATH" value="C:\Users\MDD HP\Downloads\com.mdd.trendpos.jks" />
+    <option name="KEY_ALIAS" value="dolan-self-service" />
+    <option name="REMEMBER_PASSWORDS" value="true" />
+    <option name="BUILD_TARGET_KEY" value="apk" />
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
   </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="ProjectId" id="2IKtyqelZZSp7IvHoVXCPaWLQWQ" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
@@ -51,11 +62,15 @@
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="ApkExportedModule" value="android.app" />
+    <property name="ExportApk.ApkPath" value="C:\Users\MDD HP\dolan-selfservice-master\android\app" />
+    <property name="ExportApk.BuildVariants" value="debug&#10;release" />
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="RunOnceActivity.cidr.known.project.marker" value="true" />
     <property name="cidr.known.project.marker" value="true" />
     <property name="dart.analysis.tool.window.visible" value="false" />
+    <property name="last_opened_file_path" value="$USER_HOME$/Downloads/com.mdd.trendpos.jks" />
     <property name="show.migrate.to.gradle.popup" value="false" />
   </component>
   <component name="RunManager">

lib/ui/pages/home_page.dart

@@ -114,20 +114,6 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
       _showTap();
       tapDial();
     });
-    // if (timer?.isActive == false) {
-    //   print("timer not active : $idle");
-    //
-    //   timer = Timer.periodic(Duration(seconds: int.parse(idle)), (timer) {
-    //     print("ini pesan waktu idle : $idle");
-    //     if (!isShowingDialog) {
-    //       isShowingDialog = true;
-    //       _showTap();
-    //       tapDial();
-    //     }
-    //   });
-    // } else {
-    //   print("timer not active : $idle");
-    // }
   }
 
   @override
@@ -467,7 +453,7 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
                   title: 'Kartu tidak sama ! tempelkan kartu sebelumnya',
                   desc: "Cards are not the same! please put the previous card ${countMax}",
                   btnOkOnPress: () async {
-                    if (countMax == 1) {
+                    if (countMax < 3) {
                       var isTap = await StartService.getCard();
                       _getInfoBeforeTopup(isTap);
                     }else{
@@ -477,12 +463,13 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
                           animType: AnimType.rightSlide,
                           headerAnimationLoop: true,
                           title: 'Transaksi anda gagal ! dikarenakan tidak menempelkan kartu sebelumnya',
-                          desc: "Make sure your number matches !",
+                          desc: "Your transaction failed ! because didn't attach the previous card!",
                           btnOkOnPress: () async{
                             String companyName = PreferencesHelper.getString('outletname');
                             String companyPhone = PreferencesHelper.getString('companyphone');
                             String companyAddress = PreferencesHelper.getString('companyaddress');
                             String denoms = amountController!.text.replaceAll(",", "");
+                            Navigator.pop(context);
                             infoM = await StartService.print(
                                 info,
                                 companyName.split("-")[0],
@@ -503,6 +490,13 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
                   btnOkIcon: Icons.cancel,
                   btnOkColor: Colors.red)
               .show();
+          Future.delayed(Duration(seconds: int.parse(idle)), () {
+            Navigator.pop(context);
+            timer?.cancel();
+            isShowingDialog = true;
+            _showTap();
+            tapDial();
+          });
         }
       }
     });
@@ -864,7 +858,7 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
     );
   }
 
-  Future<void> phone4CharValidation(String subPhone, String info, idle) async {
+  Future<void> phone4CharValidation(String subPhone, String info) async {
     showDialog(
         context: context,
         builder: (context) {
@@ -884,15 +878,7 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
                           onTap: () {
                             Navigator.pop(context);
                             if (timer != null) timer?.cancel();
-
-                            timer =
-                                Timer.periodic(Duration(seconds: 5), (timer) {
-                              if (!isShowingDialog) {
-                                isShowingDialog = true;
-                                _showTap();
-                                tapDial();
-                              }
-                            });
+                            tapIdle();
                           },
                           child: Icon(
                             Icons.arrow_back,
@@ -1092,20 +1078,12 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
                             onTap: () {
                               Navigator.pop(context);
                               if (timer != null) timer?.cancel();
-
-                              timer =
-                                  Timer.periodic(Duration(seconds: 5), (timer) {
-                                if (!isShowingDialog) {
-                                  isShowingDialog = true;
-                                  _showTap();
-                                  tapDial();
-                                }
-                              });
+                              tapIdle();
                             },
                             child: Icon(
                               Icons.arrow_back,
                               size: 32,
-                              color: Colors.white10,
+                              color: lightBackgroundColor,
                             ),
                           ),
                         ),
@@ -1855,7 +1833,7 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
                     buildcardInfo(),
                     buildwalletCard(),
                     buildServices(context),
-                    buildFloat(),
+                    // buildFloat(),
                   ],
                 ),
               ],
@@ -1865,21 +1843,21 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
         onWillPop: onWillPop);
   }
 
-  Widget buildFloat() {
-    return Center(
-      child: Container(
-        child: Align(
-          alignment: Alignment.bottomRight,
-          child: Container(
-            height: 100,
-            width: 100,
-            color: Colors.greenAccent,
-            child: Text("Box I"),
-          ),
-        ),
-      ),
-    );
-  }
+  // Widget buildFloat() {
+  //   return Center(
+  //     child: Container(
+  //       child: Align(
+  //         alignment: Alignment.bottomRight,
+  //         child: Container(
+  //           height: 100,
+  //           width: 100,
+  //           color: Colors.greenAccent,
+  //           child: Text(idle),
+  //         ),
+  //       ),
+  //     ),
+  //   );
+  // }
 
   //SECTION cardinfo
   Widget buildcardInfo() {
@@ -2168,7 +2146,7 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
                           fullPhone.length - 4, fullPhone.length);
                       // Navigator.pop(context);
                       // _topUp(outletName, info);
-                      phone4CharValidation(subPhone, infoCard, idle);
+                      phone4CharValidation(subPhone, infoCard);
                     } else {
                       AwesomeDialog(
                               context: context,
@@ -2202,6 +2180,12 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
                     subtitle: 'balance',
                   ),
                 ),
+                // Container(
+                //   height: 100,
+                //   width: 100,
+                //   color: Colors.greenAccent,
+                //   child: Text("${seconds.idle}"),
+                // ),
               ],
             ),
           )