Fixed Flutter 3.7 material changes

Fixed initialization

lib/habits/habit.dart

@@ -148,7 +148,7 @@ class HabitState extends State<Habit> {
             textAlign: TextAlign.center,
             style: const TextStyle(color: Colors.white),
           ),
-          backgroundColor: Theme.of(context).toggleableActiveColor,
+          backgroundColor: Theme.of(context).colorScheme.primary,
           behavior: SnackBarBehavior.floating,
         ),
       );

lib/habits/habits_manager.dart

@@ -17,16 +17,14 @@ class HabitsManager extends ChangeNotifier {
       GlobalKey<ScaffoldMessengerState>();
 
   late List<Habit> allHabits = [];
-  bool dataLoaded = false;
+  bool _isInitialized = false;
 
   Habit? deletedHabit;
   Queue<Habit> toDelete = Queue();
 
-  HabitsManager() {
-    initModel();
-  }
-
   void initialize() async {
+    await initModel();
+    await Future.delayed(const Duration(seconds: 5));
     notifyListeners();
   }
 
@@ -37,7 +35,7 @@ class HabitsManager extends ChangeNotifier {
   initModel() async {
     await _haboModel.initDatabase();
     allHabits = await _haboModel.getAllHabits();
-    dataLoaded = true;
+    _isInitialized = true;
     notifyListeners();
   }
 
@@ -118,6 +116,10 @@ class HabitsManager extends ChangeNotifier {
     return allHabits;
   }
 
+  bool get isInitialized {
+    return _isInitialized;
+  }
+
   reorderList(oldIndex, newIndex) {
     if (newIndex > oldIndex) {
       newIndex -= 1;
@@ -199,8 +201,7 @@ class HabitsManager extends ChangeNotifier {
     notifyListeners();
   }
 
-  String getNameOfHabit(int id)
-  {
+  String getNameOfHabit(int id) {
     Habit? hab = findHabitById(id);
     return (hab != null) ? hab.habitData.title : "";
   }

lib/main.dart

@@ -38,6 +38,7 @@ class _HaboState extends State<Habo> {
     _appRouter = AppRouter(
       appStateManager: _appStateManager,
       settingsManager: _settingsManager,
+      habitsManager: _habitManager,
     );
     super.initState();
   }

lib/model/settings_data.dart

@@ -52,8 +52,8 @@ class SettingsData {
         'soundEffects': soundEffects,
         'showMonthName': showMonthName,
         'seenOnboarding': seenOnboarding,
-        'checkColor': checkColor.hashCode,
-        'failColor': failColor.hashCode,
-        'skipColor': skipColor.hashCode,
+        'checkColor': checkColor.value,
+        'failColor': failColor.value,
+        'skipColor': skipColor.value,
       };
 }

lib/navigation/app_router.dart

@@ -1,12 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:habo/habits/edit_habit_screen.dart';
+import 'package:habo/habits/habits_manager.dart';
+import 'package:habo/habits/habits_screen.dart';
 import 'package:habo/navigation/app_state_manager.dart';
 import 'package:habo/navigation/routes.dart';
 import 'package:habo/onboarding/onboarding_screen.dart';
 import 'package:habo/settings/settings_manager.dart';
 import 'package:habo/settings/settings_screen.dart';
 import 'package:habo/splash_screen.dart';
-import 'package:habo/habits/habits_screen.dart';
 import 'package:habo/statistics/statistics_screen.dart';
 
 class AppRouter extends RouterDelegate
@@ -16,18 +17,24 @@ class AppRouter extends RouterDelegate
 
   final AppStateManager appStateManager;
   final SettingsManager settingsManager;
+  final HabitsManager habitsManager;
 
-  AppRouter({required this.appStateManager, required this.settingsManager})
+  AppRouter(
+      {required this.appStateManager,
+      required this.settingsManager,
+      required this.habitsManager})
       : navigatorKey = GlobalKey<NavigatorState>() {
     appStateManager.addListener(notifyListeners);
     settingsManager.addListener(notifyListeners);
+    habitsManager.addListener(notifyListeners);
     settingsManager.getSeenOnboarding;
   }
 
   @override
   void dispose() {
     appStateManager.removeListener(notifyListeners);
     settingsManager.removeListener(notifyListeners);
+    habitsManager.removeListener(notifyListeners);
     super.dispose();
   }
 
@@ -37,19 +44,23 @@ class AppRouter extends RouterDelegate
       key: navigatorKey,
       onPopPage: _handlePopPage,
       pages: [
-        if (!appStateManager.isInitialized) SplashScreen.page(),
-        if (appStateManager.isInitialized) HabitsScreen.page(),
+        if (allInitialized()) HabitsScreen.page(),
         if (appStateManager.getStatistics) StatisticsScreen.page(),
         if (appStateManager.getSettings) SettingsScreen.page(),
         if (appStateManager.getOnboarding || !settingsManager.getSeenOnboarding)
           OnboardingScreen.page(),
-        if (appStateManager.getCreateHabit)  EditHabitScreen.page(null),
+        if (appStateManager.getCreateHabit) EditHabitScreen.page(null),
         if (appStateManager.getEditHabit != null)
           EditHabitScreen.page(appStateManager.getEditHabit!),
+        if (!allInitialized()) SplashScreen.page(),
       ],
     );
   }
 
+  bool allInitialized() {
+    return settingsManager.isInitialized && habitsManager.isInitialized;
+  }
+
   bool _handlePopPage(Route<dynamic> route, result) {
     if (!route.didPop(result)) {
       return false;

lib/navigation/app_state_manager.dart

@@ -1,33 +1,19 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:habo/model/habit_data.dart';
 
 class AppStateManager extends ChangeNotifier {
-  bool _initialized = false;
   bool _statistics = false;
   bool _settings = false;
   bool _onboarding = false;
   bool _createHabit = false;
   HabitData? _editHabit;
 
-  bool get isInitialized => _initialized;
   bool get getStatistics => _statistics;
   bool get getSettings => _settings;
   bool get getOnboarding => _onboarding;
   bool get getCreateHabit => _createHabit;
   HabitData? get getEditHabit => _editHabit;
 
-  void initializeApp() {
-    Timer(
-      const Duration(milliseconds: 2000),
-      () {
-        _initialized = true;
-        notifyListeners();
-      },
-    );
-  }
-
   void goStatistics(bool state) {
     _statistics = state;
     notifyListeners();

lib/settings/color_icon.dart

@@ -60,7 +60,7 @@ class _ColorIconState extends State<ColorIcon> {
                               onColorChanged: (Color color) {
                                 setState(
                                   () {
-                                    tempColor = color;
+                                    tempColor = color.withOpacity(1.0);
                                   },
                                 );
                               },

lib/settings/settings_manager.dart

@@ -12,13 +12,14 @@ import 'package:shared_preferences/shared_preferences.dart';
 class SettingsManager extends ChangeNotifier {
   final Future<SharedPreferences> _prefs = SharedPreferences.getInstance();
   SettingsData _settingsData = SettingsData();
+  bool _isInitialized = false;
 
   final _checkPlayer = AudioPlayer();
   final _clickPlayer = AudioPlayer();
 
   void initialize() async {
-    loadData();
-
+    await loadData();
+    _isInitialized = true;
     notifyListeners();
     _checkPlayer.setAsset('assets/sounds/check.wav');
     _clickPlayer.setAsset('assets/sounds/click.wav');
@@ -58,7 +59,7 @@ class SettingsManager extends ChangeNotifier {
     prefs.setString('habo_settings', jsonEncode(_settingsData));
   }
 
-  void loadData() async {
+  Future<void> loadData() async {
     final SharedPreferences prefs = await _prefs;
     String? json = prefs.getString('habo_settings');
     if (json != null) {
@@ -134,6 +135,10 @@ class SettingsManager extends ChangeNotifier {
     return _settingsData.skipColor;
   }
 
+  bool get isInitialized {
+    return _isInitialized;
+  }
+
   set setTheme(String value) {
     _settingsData.theme = Themes.values[_settingsData.themeList.indexOf(value)];
     saveData();