refactor: Reworked Settings & Updated Dependencies (#455)

* refactor: update settings repository

* feat: add theme configuration bloc

Adds a new bloc for managing theme configuration.
Also updates settings repository to return settings.

* feat: update dependencies and fvm config

Updates fvm config to use stable flutter version.
Updates dependencies for firebase, http, drift, sentry.
Removes theme configuration bloc.

* refactor: move locale to general config

Moves the locale setting to a separate GeneralConfiguration model
for better organization. Updates related code to reflect this change.

* chore: update dependencies and flutter version

* refactor: make material context stateless

* style: format

* fix: dcm issues

* refactor(ui_library): remove low_level folder

Moves popup-related widgets out of the low_level folder.
This simplifies the directory structure.

Author: hawkkiller

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.32.0"
+  "flutter": "stable"
 }

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
       - name: 🐦 Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.32.0
+          flutter-version: 3.35.3
           channel: stable
           cache: true
 

.vscode/settings.json

@@ -3,7 +3,7 @@
     "drift"
   ],
   "dart.lineLength": 100,
-  "dart.flutterSdkPath": ".fvm/versions/3.32.0",
+  "dart.flutterSdkPath": ".fvm/versions/stable",
   "cmake.ignoreCMakeListsMissing": true,
   "makefile.configureOnOpen": false
 }

analysis_options.yaml

@@ -5,11 +5,11 @@ formatter:
   trailing_commas: preserve
 
 analyzer:
-  exclude: 
+  exclude:
     - "lib/src/core/localization/generated/**"
     - "**/*.*.dart"
     - "**/generated/**"
 
 dart_code_metrics:
   extends:
-    - package:sizzle_lints/dcm.yaml
+    - package:sizzle_lints/dcm.yaml

app/lib/src/bloc/app_bloc_observer.dart

@@ -12,38 +12,35 @@ class AppBlocObserver extends BlocObserver {
 
   @override
   void onTransition(Bloc<Object?, Object?> bloc, Transition<Object?, Object?> transition) {
-    final logMessage =
-        StringBuffer()
-          ..writeln('Bloc: ${bloc.runtimeType}')
-          ..writeln('Event: ${transition.event.runtimeType}')
-          ..writeln(
-            'Transition: ${transition.currentState.runtimeType} => '
-            '${transition.nextState.runtimeType}',
-          )
-          ..write('New State: ${transition.nextState?.toString().limit(100)}');
+    final logMessage = StringBuffer()
+      ..writeln('Bloc: ${bloc.runtimeType}')
+      ..writeln('Event: ${transition.event.runtimeType}')
+      ..writeln(
+        'Transition: ${transition.currentState.runtimeType} => '
+        '${transition.nextState.runtimeType}',
+      )
+      ..write('New State: ${transition.nextState?.toString().limit(100)}');
 
     logger.info(logMessage.toString());
     super.onTransition(bloc, transition);
   }
 
   @override
   void onEvent(Bloc<Object?, Object?> bloc, Object? event) {
-    final logMessage =
-        StringBuffer()
-          ..writeln('Bloc: ${bloc.runtimeType}')
-          ..writeln('Event: ${event.runtimeType}')
-          ..write('Details: ${event?.toString().limit(200)}');
+    final logMessage = StringBuffer()
+      ..writeln('Bloc: ${bloc.runtimeType}')
+      ..writeln('Event: ${event.runtimeType}')
+      ..write('Details: ${event?.toString().limit(200)}');
 
     logger.info(logMessage.toString());
     super.onEvent(bloc, event);
   }
 
   @override
   void onError(BlocBase<Object?> bloc, Object error, StackTrace stackTrace) {
-    final logMessage =
-        StringBuffer()
-          ..writeln('Bloc: ${bloc.runtimeType}')
-          ..writeln(error.toString());
+    final logMessage = StringBuffer()
+      ..writeln('Bloc: ${bloc.runtimeType}')
+      ..writeln(error.toString());
 
     logger.error(logMessage.toString(), error: error, stackTrace: stackTrace);
     super.onError(bloc, error, stackTrace);

app/lib/src/widget/material_context.dart

@@ -13,29 +13,32 @@ class MaterialContext extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final settings = SettingsScope.settingsOf(context);
-    final themeMode = settings.themeConfiguration?.themeMode ?? ThemeModeVO.system;
-    final seedColor = settings.themeConfiguration?.seedColor ?? Colors.blue;
+    return SettingsBuilder(
+      builder: (context, settings) {
+        final themeMode = settings.theme.themeMode;
+        final seedColor = settings.theme.seedColor;
+        final locale = settings.general.locale;
 
-    final materialThemeMode = switch (themeMode) {
-      ThemeModeVO.system => ThemeMode.system,
-      ThemeModeVO.light => ThemeMode.light,
-      ThemeModeVO.dark => ThemeMode.dark,
-    };
+        final materialThemeMode = switch (themeMode) {
+          ThemeModeVO.system => ThemeMode.system,
+          ThemeModeVO.light => ThemeMode.light,
+          ThemeModeVO.dark => ThemeMode.dark,
+        };
 
-    final darkTheme = ThemeData(colorSchemeSeed: seedColor, brightness: Brightness.dark);
-    final lightTheme = ThemeData(colorSchemeSeed: seedColor, brightness: Brightness.light);
-
-    return MaterialApp(
-      theme: lightTheme,
-      darkTheme: darkTheme,
-      themeMode: materialThemeMode,
-      locale: settings.locale,
-      home: const HomeScreen(),
-      builder: (context, child) {
-        return KeyedSubtree(
-          key: _globalKey,
-          child: MediaQueryRootOverride(child: child!),
+        final darkTheme = ThemeData(colorSchemeSeed: seedColor, brightness: Brightness.dark);
+        final lightTheme = ThemeData(colorSchemeSeed: seedColor, brightness: Brightness.light);
+        return MaterialApp(
+          theme: lightTheme,
+          darkTheme: darkTheme,
+          themeMode: materialThemeMode,
+          locale: locale,
+          home: const HomeScreen(),
+          builder: (context, child) {
+            return KeyedSubtree(
+              key: _globalKey,
+              child: MediaQueryRootOverride(child: child!),
+            );
+          },
         );
       },
     );

app/pubspec.yaml

@@ -5,8 +5,8 @@ version: 0.0.1+1
 resolution: workspace
 
 environment:
-  sdk: ">=3.8.0 <4.0.0"
-  flutter: ">=3.32.0 <4.0.0"
+  sdk: ">=3.9.2 <4.0.0"
+  flutter: ">=3.35.3 <4.0.0"
 
 dependencies:
   # Flutter SDK
@@ -23,7 +23,7 @@ dependencies:
 
   # Utils
   clock: 1.1.2
-  package_info_plus: 8.3.0
+  package_info_plus: ^9.0.0
 
   # Core
   rest_client:

core/analytics/lib/src/firebase_analytics_reporter.dart

@@ -22,10 +22,9 @@ final class FirebaseAnalyticsReporter implements AnalyticsReporter {
 
     await analytics.logEvent(
       name: event.name,
-      parameters:
-          event.parameters.isEmpty
-              ? null
-              : {for (final parameter in event.parameters) parameter.name: parameter.value},
+      parameters: event.parameters.isEmpty
+          ? null
+          : {for (final parameter in event.parameters) parameter.name: parameter.value},
     );
   }
 }

core/analytics/pubspec.yaml

@@ -4,8 +4,8 @@ version: 1.0.0
 publish_to: none
 
 environment:
-  sdk: ">=3.8.0 <4.0.0"
-  flutter: ">=3.32.0 <4.0.0"
+  sdk: ">=3.9.2 <4.0.0"
+  flutter: ">=3.35.3 <4.0.0"
 
 resolution: workspace
 
@@ -16,7 +16,7 @@ dependencies:
   collection: 1.19.1
 
   # Firebase
-  firebase_analytics: ^11.5.0
+  firebase_analytics: ^12.0.2
 
   # Local Packages
   logger:
@@ -26,7 +26,7 @@ dev_dependencies:
   # Testing
   flutter_test:
     sdk: flutter
-  mockito: 5.4.6
+  mockito: ^5.5.1
   build_runner: ^2.5.3
 
 flutter:

core/common/lib/common.dart

@@ -1,4 +1,5 @@
 export 'src/extensions/inherited_extension.dart';
 export 'src/extensions/string_extension.dart';
+export 'src/mutex/mutext.dart';
 export 'src/persisted_column/persisted_column.dart';
 export 'src/persisted_column/shared_preferences_column.dart';