Dark mode bug fixed

CCExtractor · Jun 2, 2024 · 4fb01e1 · 4fb01e1
1 parent dff6c57
commit 4fb01e1
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 41 deletions.
diff --git a/lib/app/modules/about/views/about_view.dart b/lib/app/modules/about/views/about_view.dart
@@ -24,7 +24,7 @@ class AboutView extends GetView<AboutController> {
       backgroundColor: AppSettings.isDarkMode
           ? TaskWarriorColors.kprimaryBackgroundColor
           : TaskWarriorColors.white,
-      body: AboutPageBody(),
+      body: const AboutPageBody(),
     );
   }
 }
diff --git a/lib/app/modules/home/controllers/home_controller.dart b/lib/app/modules/home/controllers/home_controller.dart
@@ -52,6 +52,7 @@ class HomeController extends GetxController {
     serverCertExists = RxBool(storage.guiPemFiles.serverCertExists());
     _profileSet();
     loadDelayTask();
+    initDarkMode();
   }
 
   void _profileSet() {
@@ -294,11 +295,11 @@ class HomeController extends GetxController {
         ScaffoldMessenger.of(context).showSnackBar(SnackBar(
             content: Text(
               '${header['code']}: ${header['status']}',
-              style:  TextStyle(
-                  color: AppSettings.isDarkMode
-                      ? TaskWarriorColors.kprimaryTextColor
-                      : TaskWarriorColors.kLightPrimaryTextColor,
-                  ),
+              style: TextStyle(
+                color: AppSettings.isDarkMode
+                    ? TaskWarriorColors.kprimaryTextColor
+                    : TaskWarriorColors.kLightPrimaryTextColor,
+              ),
             ),
             backgroundColor: AppSettings.isDarkMode
                 ? TaskWarriorColors.ksecondaryBackgroundColor
@@ -465,4 +466,11 @@ class HomeController extends GetxController {
     final SharedPreferences prefs = await SharedPreferences.getInstance();
     useDelayTask.value = prefs.getBool('delaytask') ?? false;
   }
+
+  RxBool isDarkModeOn = false.obs;
+
+  void initDarkMode() {
+    isDarkModeOn.value = AppSettings.isDarkMode;
+    print("called and value is" + isDarkModeOn.value.toString());
+  }
 }
diff --git a/lib/app/modules/home/views/add_task_bottom_sheet.dart b/lib/app/modules/home/views/add_task_bottom_sheet.dart
@@ -400,7 +400,7 @@ class AddTaskBottomSheet extends StatelessWidget {
               task = task.rebuild((t) => t..tags.replace(homeController.tags));
             }
             Get.find<HomeController>().mergeTask(task);
-            print(task);
+            // print(task);
 
             // StorageWidget.of(context).mergeTask(task);
             homeController.namecontroller.text = '';

diff --git a/lib/app/modules/home/views/home_view.dart b/lib/app/modules/home/views/home_view.dart
@@ -8,8 +8,10 @@ import 'package:taskwarrior/app/modules/home/views/home_page_app_bar.dart';
 import 'package:taskwarrior/app/modules/home/views/home_page_body.dart';
 import 'package:taskwarrior/app/modules/home/views/home_page_floating_action_button.dart';
 import 'package:taskwarrior/app/modules/home/views/nav_drawer.dart';
+import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
 import 'package:taskwarrior/app/utils/taskserver/taskserver.dart';
 import 'package:taskwarrior/app/utils/home_path/home_path.dart' as rc;
+import 'package:taskwarrior/app/utils/theme/app_settings.dart';
 
 import '../controllers/home_controller.dart';
 
@@ -41,26 +43,28 @@ class HomeView extends GetView<HomeController> {
     // var pendingTags = controller.pendingTags;
 
     return isHomeWidgetTaskTapped == false
-        ? Scaffold(
-            appBar: HomePageAppBar(
-              server: server,
-              credentials: credentials,
-              controller: controller,
-            ),
-            // drawer: Obx(
-            //   () => NavDrawer(controller: controller, notifyParent: refresh),
-            // ),
-            drawer: NavDrawer(homeController: controller),
-            body: HomePageBody(controller: controller),
-            endDrawer: Obx(
-              () => FilterDrawer(
-                filters: controller.getFilters(),
-                homeController: controller,
+        ? Obx(
+            () => Scaffold(
+              appBar: HomePageAppBar(
+                server: server,
+                credentials: credentials,
+                controller: controller,
+              ),
+              backgroundColor: controller.isDarkModeOn.value
+                  ? TaskWarriorColors.kprimaryBackgroundColor
+                  : TaskWarriorColors.kLightPrimaryBackgroundColor,
+              drawer: NavDrawer(homeController: controller),
+              body: HomePageBody(controller: controller),
+              endDrawer: Obx(
+                () => FilterDrawer(
+                  filters: controller.getFilters(),
+                  homeController: controller,
+                ),
               ),
+              floatingActionButton:
+                  HomePageFloatingActionButton(controller: controller),
+              resizeToAvoidBottomInset: false,
             ),
-            floatingActionButton:
-                HomePageFloatingActionButton(controller: controller),
-            resizeToAvoidBottomInset: false,
           )
         : const DetailRouteView();
   }

diff --git a/lib/app/modules/home/views/nav_drawer.dart b/lib/app/modules/home/views/nav_drawer.dart
@@ -57,7 +57,7 @@ class NavDrawer extends StatelessWidget {
                         AppSettings.isDarkMode = newMode;
                         await SelectedTheme.saveMode(AppSettings.isDarkMode);
                         Get.back();
-                        homeController.update();
+                        homeController.initDarkMode();
                       },
                       child: Icon(
                         AppSettings.isDarkMode

diff --git a/lib/app/modules/home/views/tasks_builder.dart b/lib/app/modules/home/views/tasks_builder.dart
@@ -102,7 +102,7 @@ class TasksBuilder extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    print(taskData);
+    // print(taskData);
     var storageWidget = Get.find<HomeController>();
     return Scaffold(
         floatingActionButtonLocation:

diff --git a/lib/app/utils/theme/app_settings.dart b/lib/app/utils/theme/app_settings.dart
@@ -1,17 +1,27 @@
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:flutter/material.dart';
 
 class SelectedTheme {
   static SharedPreferences? _preferences;
 
-  static Future init() async =>
-      _preferences = await SharedPreferences.getInstance();
+  static Future init() async {
+    _preferences = await SharedPreferences.getInstance();
+  }
 
-  static Future saveMode(bool mode) async =>
-      await _preferences?.setBool('_isDark', mode);
+  static Future saveMode(bool mode) async {
+    await _preferences?.setBool('_isDark', mode);
+  }
 
-  static bool? getMode() => _preferences?.getBool('_isDark');
+  static bool? getMode() {
+    return _preferences?.getBool('_isDark');
+  }
 }
 
 class AppSettings {
-  static bool isDarkMode = SelectedTheme.getMode() ?? true;
-}
+  static bool isDarkMode = true; 
+
+  static Future init() async {
+    await SelectedTheme.init();
+    isDarkMode = SelectedTheme.getMode() ?? true;
+  }
+}
diff --git a/lib/main.dart b/lib/main.dart
@@ -2,23 +2,18 @@ import 'package:flutter/material.dart';
 
 import 'package:get/get.dart';
 import 'package:taskwarrior/app/themes/themes.dart';
+import 'package:taskwarrior/app/utils/theme/app_settings.dart';
 
 import 'app/routes/app_pages.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  // await Permission.notification.isDenied.then((value) {
-  //   if (value) {
-  //     Permission.notification.request();
-  //   }
-  // });
+  await AppSettings.init();
   runApp(
     GetMaterialApp(
       title: "Application",
       initialRoute: AppPages.INITIAL,
       getPages: AppPages.routes,
-      theme: lightTheme,
-      darkTheme: darkTheme,
     ),
   );
 }