Add dart format to precommit, end node status task if offline nodes = 0 or notificationsEnabled false, add notifications tab to registered screen

zaelgohary · zaelgohary · commit 1e313fa8acf9 · 2025-05-05T21:47:25.000+03:00
diff --git a/app/lib/jrouter.dart b/app/lib/jrouter.dart
@@ -87,7 +87,7 @@ class JRouter {
             view: await Council().widget(),
           ),
           app: Dao()),
-                AppInfo(
+      AppInfo(
           route: Route(
             path: '/notifications',
             name: 'Notifications',
diff --git a/app/lib/main.dart b/app/lib/main.dart
@@ -71,7 +71,7 @@ Future<void> main() async {
     ),
     (String taskId) async {
       logger.i('[BackgroundFetch] Task: $taskId');
-      await checkNodeStatus();
+      await checkNodeStatus(taskId);
       BackgroundFetch.finish(taskId);
     },
     (String taskId) async {
diff --git a/app/lib/screens/main_screen.dart b/app/lib/screens/main_screen.dart
@@ -211,7 +211,6 @@ class _AppState extends State<MainScreen> {
                     currentPin: null,
                   )));
     }
-    // await Navigator.push(context, MaterialPageRoute(builder: (context) => UnregisteredScreen()));
     await Navigator.of(context).pushReplacement(PageRouteBuilder(
         transitionDuration: const Duration(seconds: 1),
         pageBuilder: (_, __, ___) => HomeScreen(
diff --git a/app/lib/screens/notifications_screen.dart b/app/lib/screens/notifications_screen.dart
@@ -9,9 +9,10 @@ class NotificationsScreen extends StatefulWidget {
 }
 
 class _NotificationsScreenState extends State<NotificationsScreen> {
-  bool _notificationsEnabled = true;
+  bool _nodeStatusNotificationEnabled = true;
 
-  static const String _notificationsEnabledKey = 'notificationsEnabled';
+  static const String _nodeStatusNotificationEnabledKey =
+      'nodeStatusNotificationEnabled';
 
   @override
   void initState() {
@@ -22,13 +23,14 @@ class _NotificationsScreenState extends State<NotificationsScreen> {
   void _loadNotificationPreference() async {
     final prefs = await SharedPreferences.getInstance();
     setState(() {
-      _notificationsEnabled = prefs.getBool(_notificationsEnabledKey) ?? true;
+      _nodeStatusNotificationEnabled =
+          prefs.getBool(_nodeStatusNotificationEnabledKey) ?? true;
     });
   }
 
-  void _saveNotificationPreference(bool newValue) async {
+  void _setNodeStatusNotification(bool newValue) async {
     final prefs = await SharedPreferences.getInstance();
-    await prefs.setBool(_notificationsEnabledKey, newValue);
+    await prefs.setBool(_nodeStatusNotificationEnabledKey, newValue);
   }
 
   @override
@@ -37,23 +39,16 @@ class _NotificationsScreenState extends State<NotificationsScreen> {
       padding: const EdgeInsets.symmetric(vertical: 16.0),
       child: Column(
         mainAxisAlignment: MainAxisAlignment.start,
-        crossAxisAlignment:
-            CrossAxisAlignment.stretch,
+        crossAxisAlignment: CrossAxisAlignment.stretch,
         children: <Widget>[
           SwitchListTile(
-            title: const Text('Enable Push Notifications'),
-            value: _notificationsEnabled,
+            title: const Text('Enable node status notifications'),
+            value: _nodeStatusNotificationEnabled,
             onChanged: (bool newValue) {
               setState(() {
-                _notificationsEnabled = newValue;
+                _nodeStatusNotificationEnabled = newValue;
               });
-              _saveNotificationPreference(newValue);
-
-              if (newValue) {
-                print('Notifications enabled. Implement subscription logic.');
-              } else {
-                 print('Notifications disabled. Implement unsubscription logic.');
-              }
+              _setNodeStatusNotification(newValue);
             },
             secondary: const Icon(Icons.notifications),
           ),
diff --git a/app/lib/screens/registered_screen.dart b/app/lib/screens/registered_screen.dart
@@ -4,24 +4,20 @@ import 'package:threebotlogin/widgets/home_card.dart';
 import 'package:threebotlogin/widgets/home_logo.dart';
 
 class RegisteredScreen extends StatefulWidget {
-  static final RegisteredScreen _singleton = RegisteredScreen._internal();
+  static final RegisteredScreen _singleton = const RegisteredScreen._internal();
 
   factory RegisteredScreen() {
     return _singleton;
   }
 
-  RegisteredScreen._internal() {
-    //init
-  }
+  const RegisteredScreen._internal();
 
   @override
   State<RegisteredScreen> createState() => _RegisteredScreenState();
 }
 
 class _RegisteredScreenState extends State<RegisteredScreen>
     with WidgetsBindingObserver {
-  // We will treat this error as a singleton
-
   bool showSettings = false;
   bool showPreference = false;
 
@@ -31,6 +27,7 @@ class _RegisteredScreenState extends State<RegisteredScreen>
         body: SingleChildScrollView(
       child: Column(
         mainAxisAlignment: MainAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.stretch,
         children: <Widget>[
           SizedBox(
             height: MediaQuery.of(context).size.height * 0.3,
@@ -51,12 +48,12 @@ class _RegisteredScreenState extends State<RegisteredScreen>
               ],
             ),
           ),
-          Container(
-            padding: const EdgeInsets.only(left: 10, right: 10, top: 50),
-            height: MediaQuery.of(context).size.height * 0.6,
-            width: MediaQuery.of(context).size.width,
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 10),
             child: Column(
               mainAxisAlignment: MainAxisAlignment.start,
+              crossAxisAlignment: CrossAxisAlignment.center,
+              mainAxisSize: MainAxisSize.min,
               children: [
                 SizedBox(
                   width: MediaQuery.of(context).size.width / 1.2,
@@ -76,7 +73,7 @@ class _RegisteredScreenState extends State<RegisteredScreen>
                         ]),
                   ),
                 ),
-                const Spacer(),
+                const SizedBox(height: 45),
                 const Row(
                   crossAxisAlignment: CrossAxisAlignment.center,
                   mainAxisAlignment: MainAxisAlignment.center,
@@ -111,10 +108,26 @@ class _RegisteredScreenState extends State<RegisteredScreen>
                         name: 'Settings', icon: Icons.settings, pageNumber: 6),
                   ],
                 ),
-                const SizedBox(height: 40),
                 const Row(
-                  children: [Spacer(), CrispChatbot(), SizedBox(width: 20)],
-                )
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    HomeCardWidget(
+                      name: 'Notification Settings',
+                      icon: Icons.notifications,
+                      pageNumber: 8,
+                      fullWidth: true,
+                    ),
+                  ],
+                ),
+                const SizedBox(height: 70),
+                const Align(
+                  alignment: Alignment.bottomRight,
+                  child: Padding(
+                    padding: EdgeInsets.only(right: 20.0),
+                    child: CrispChatbot(),
+                  ),
+                ),
               ],
             ),
           )
diff --git a/app/lib/services/background_service.dart b/app/lib/services/background_service.dart
@@ -1,6 +1,11 @@
 import 'package:background_fetch/background_fetch.dart';
 import 'package:threebotlogin/services/nodes_check_service.dart';
 import 'notification_service.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:threebotlogin/helpers/logger.dart';
+
+const String _nodeStatusNotificationEnabledKey =
+    'nodeStatusNotificationEnabled';
 
 void backgroundFetchHeadlessTask(HeadlessTask task) async {
   final String taskId = task.taskId;
@@ -10,14 +15,28 @@ void backgroundFetchHeadlessTask(HeadlessTask task) async {
     BackgroundFetch.finish(taskId);
     return;
   }
-  await checkNodeStatus();
+  final prefs = await SharedPreferences.getInstance();
+  final bool notificationsEnabled =
+      prefs.getBool(_nodeStatusNotificationEnabledKey) ?? true;
 
-  BackgroundFetch.finish(taskId);
+  logger.i(
+      'Background Fetch Headless Task: $taskId, Notifications Enabled: $notificationsEnabled');
+
+  if (!notificationsEnabled) {
+    logger.i(
+        '[BackgroundFetch] Node status notifications are disabled. Finishing task: $taskId');
+    BackgroundFetch.finish(taskId);
+    return;
+  }
+  await checkNodeStatus(taskId);
 }
 
-Future<void> checkNodeStatus() async {
+Future<void> checkNodeStatus(String taskId) async {
   final offlineNodes = await NodeCheckService.pingNodesInBackground();
-  if (offlineNodes.isEmpty) return;
+  if (offlineNodes.isEmpty) {
+    BackgroundFetch.finish(taskId);
+    return;
+  }
 
   final now = DateTime.now().millisecondsSinceEpoch;
   final sevenDaysAgoTimestamp =
@@ -33,7 +52,10 @@ Future<void> checkNodeStatus() async {
     return downtime.inMinutes % checkInterval.inMinutes < 15;
   }).toList();
 
-  if (nodesToNotify.isEmpty) return;
+  if (nodesToNotify.isEmpty) {
+    BackgroundFetch.finish(taskId);
+    return;
+  }
 
   const groupKey = 'offline_nodes';
   final StringBuffer bodyBuffer = StringBuffer();
@@ -54,6 +76,7 @@ Future<void> checkNodeStatus() async {
     body: bodyBuffer.toString().trim(),
     groupKey: groupKey,
   );
+  BackgroundFetch.finish(taskId);
 }
 
 Duration _getCheckInterval(Duration downtime) {
diff --git a/app/lib/widgets/home_card.dart b/app/lib/widgets/home_card.dart
@@ -35,7 +35,7 @@ class HomeCardWidget extends StatelessWidget {
             Container(
               padding: const EdgeInsets.all(10),
               height: size / 7,
-              width: fullWidth ? size * 2 / 2.5 + 2 * margin : size / 2.5,
+              width: fullWidth ? size * 0.8 : size / 2.5,
               child: Row(
                 crossAxisAlignment: CrossAxisAlignment.center,
                 mainAxisAlignment: MainAxisAlignment.center,
@@ -45,11 +45,16 @@ class HomeCardWidget extends StatelessWidget {
                     color: Theme.of(context).colorScheme.onPrimaryContainer,
                   ),
                   const SizedBox(width: 7),
-                  Text(
-                    name,
-                    style: Theme.of(context).textTheme.titleMedium!.copyWith(
-                        color: Theme.of(context).colorScheme.onPrimaryContainer,
-                        fontWeight: FontWeight.bold),
+                  Flexible(
+                    child: Text(
+                      name,
+                      style: Theme.of(context).textTheme.titleMedium!.copyWith(
+                          color:
+                              Theme.of(context).colorScheme.onPrimaryContainer,
+                          fontWeight: FontWeight.bold),
+                      overflow: TextOverflow.ellipsis,
+                      maxLines: 1,
+                    ),
                   )
                 ],
               ),
diff --git a/git_hooks/pre-commit b/git_hooks/pre-commit
@@ -13,17 +13,18 @@ fi
 STAGED_DART_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep '\.dart$')
 
 if [ -n "$STAGED_DART_FILES" ]; then 
+  echo "Formatting staged Dart files..."
+  echo "$STAGED_DART_FILES" | xargs -n1 dart format
+  
   echo "Analyzing staged Dart files..."
   dart analyze --fatal-infos $STAGED_DART_FILES
   ANALYZE_EXIT_CODE=$?
 
-  if [ $ANALYZE_EXIT_CODE -eq 0 ]; then
-    exit 0
+  if [ $ANALYZE_EXIT_CODE -ne 0 ]; then
+    echo "Applying fixes..."
+    echo "$STAGED_DART_FILES" | xargs -n1 dart fix --apply
   fi
 
-  echo "Applying fixes..."
-  echo "$STAGED_DART_FILES" | xargs -n1 dart fix --apply
-
   echo "Re-adding fixed Dart files to the commit..."
   echo "$STAGED_DART_FILES" | xargs git add 
 fi

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,6 @@ class _AppState extends State<MainScreen> {`
`211`	`211`	`currentPin: null,`
`212`	`212`	`)));`
`213`	`213`	`}`
`214`		`- // await Navigator.push(context, MaterialPageRoute(builder: (context) => UnregisteredScreen()));`
`215`	`214`	`await Navigator.of(context).pushReplacement(PageRouteBuilder(`
`216`	`215`	`transitionDuration: const Duration(seconds: 1),`
`217`	`216`	`pageBuilder: (_, __, ___) => HomeScreen(`