chore(#20) : fix issue with set-child-page

JordyHers-org · Jun 28, 2023 · 96f6807 · 96f6807
1 parent ef77f88
commit 96f6807
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 71 deletions.
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "pub"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,8 @@
+# Firebase related
+lib/firebase_options_dev.dart
+lib/firebase_options.dart
+*.json
+
 # Miscellaneous
 *.class
 *.lock
@@ -125,3 +130,5 @@ app.*.map.json
 !.idea/codeStyles/
 !.idea/dictionaries/
 !.idea/runConfigurations/
+
+
diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml
diff --git a/lib/app/pages/set_child_page.dart b/lib/app/pages/set_child_page.dart
@@ -61,24 +61,28 @@ class _SetChildPageState extends State<SetChildPage> {
         setState(() {
           appState = AppState.complete;
         });
-        await showAlertDialog(
-          context,
-          title: 'No Such file in Database',
-          content: 'ERROR OCCURRED COULD NOT MOVE TO THE NEXT PAGE',
-          defaultActionText: 'OK',
-        );
+        if (mounted) {
+          await showAlertDialog(
+            context,
+            title: 'No Such file in Database',
+            content: 'ERROR OCCURRED COULD NOT MOVE TO THE NEXT PAGE',
+            defaultActionText: 'OK',
+          );
+        }
         JHLogger.$.e('ERROR OCCURRED COULD NOT MOVE TO THE NEXT PAGE');
       }
     } catch (e) {
       setState(() {
         appState = AppState.complete;
       });
-      await showAlertDialog(
-        context,
-        title: 'No Such file in Database',
-        content: 'ERROR OCCURRED COULD NOT MOVE TO THE NEXT PAGE',
-        defaultActionText: 'OK',
-      );
+      if (mounted) {
+        await showAlertDialog(
+          context,
+          title: 'Error ❌',
+          content: e.toString(),
+          defaultActionText: 'OK',
+        );
+      }
       JHLogger.$.e(e.toString());
     }
   }

diff --git a/lib/services/app_usage_local_service.dart b/lib/services/app_usage_local_service.dart
@@ -86,7 +86,7 @@ class AppUsage {
       final start = startDate.millisecondsSinceEpoch;
       final interval = <String, int>{'start': start, 'end': end};
       final usage = await _methodChannel.invokeMethod('getUsage', interval)
-          as Map<String, dynamic>;
+          as Map<dynamic, dynamic>;
       final appInfo = await InstalledApps.getInstalledApps(
         true,
         true,
@@ -100,7 +100,7 @@ class AppUsage {
         if (temp[0] > 0) {
           result.add(
             AppUsageInfo(
-              key,
+              key.toString(),
               temp[0],
               DateTime.fromMillisecondsSinceEpoch(temp[1].round() * 1000),
               DateTime.fromMillisecondsSinceEpoch(temp[2].round() * 1000),

diff --git a/lib/services/database.dart b/lib/services/database.dart
@@ -179,7 +179,6 @@ class FireStoreDatabase implements Database {
         JHLogger.$.e(' NO SUCH FILE ON DATABASE ');
       }
     });
-    JHLogger.$.d(' NO SUCH FILE ON DATABASE ');
     return _child!;
   }
 }
diff --git a/pubspec.lock b/pubspec.lock
@@ -53,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
       url: "https://pub.dev"
     source: hosted
-    version: "2.11.0"
+    version: "2.10.0"
   auto_size_text:
     dependency: "direct main"
     description:
@@ -173,10 +173,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.2.1"
   checked_yaml:
     dependency: transitive
     description:
@@ -229,10 +229,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.17.0"
   convert:
     dependency: transitive
     description:
@@ -873,10 +873,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
+      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.0"
+    version: "0.17.0"
   io:
     dependency: transitive
     description:
@@ -889,10 +889,10 @@ packages:
     dependency: transitive
     description:
       name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.7"
+    version: "0.6.5"
   js_wrapping:
     dependency: transitive
     description:
@@ -953,10 +953,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.15"
+    version: "0.12.13"
   material_color_utilities:
     dependency: transitive
     description:
@@ -969,10 +969,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.8.0"
   mime:
     dependency: transitive
     description:
@@ -1025,10 +1025,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.8.2"
   path_parsing:
     dependency: transitive
     description:
@@ -1382,26 +1382,26 @@ packages:
     dependency: "direct main"
     description:
       name: test
-      sha256: "3dac9aecf2c3991d09b9cdde4f98ded7b30804a88a0d7e4e7e1678e78d6b97f4"
+      sha256: a5fcd2d25eeadbb6589e80198a47d6a464ba3e2049da473943b8af9797900c2d
       url: "https://pub.dev"
     source: hosted
-    version: "1.24.1"
+    version: "1.22.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.4.16"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "5138dbffb77b2289ecb12b81c11ba46036590b72a64a7a90d6ffb880f1a29e93"
+      sha256: "0ef9755ec6d746951ba0aabe62f874b707690b5ede0fecc818b138fcc9b14888"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.4.20"
   timezone:
     dependency: transitive
     description:
@@ -1579,5 +1579,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=3.0.0-0 <3.5.0"
+  dart: ">=2.19.0 <3.0.0"
   flutter: ">=3.7.0-0"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -47,7 +47,7 @@ dependencies:
   flutter_local_notifications: ^14.0.0-dev.2
 
   # Utility Packages:
-  intl: ^0.18.0
+  intl: ^0.17.0
   uuid: ^3.0.6
   app_usage: ^2.0.0
   google_fonts: ^4.0.3