Update settings logic

Author: hawkkiller

app/lib/src/widget/material_context.dart

@@ -15,8 +15,8 @@ class MaterialContext extends StatelessWidget {
   Widget build(BuildContext context) {
     return SettingsBuilder(
       builder: (context, settings) {
-        final themeMode = settings.theme.themeMode;
-        final seedColor = settings.theme.seedColor;
+        final themeMode = settings.general.themeMode;
+        final seedColor = settings.general.seedColor;
         final locale = settings.general.locale;
 
         final materialThemeMode = switch (themeMode) {

core/common/lib/common.dart

@@ -3,3 +3,4 @@ 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';
+export 'src/utils/jsonmap_codec.dart';

core/common/lib/src/utils/jsonmap_codec.dart

@@ -0,0 +1,37 @@
+import 'dart:convert';
+
+/// {@template json_map_codec}
+/// A codec for converting between a [T] and a [Map<String, Object?>].
+/// {@endtemplate}
+abstract class JsonMapCodec<T> extends Codec<T, Map<String, Object?>> {
+  /// {@macro json_map_codec}
+  const JsonMapCodec();
+
+  ({T? decoded, Object? error, StackTrace? stackTrace}) tryDecode(Map<String, Object?> input) {
+    try {
+      return (decoded: $decode(input), error: null, stackTrace: null);
+    } catch (e, stackTrace) {
+      return (decoded: null, error: e, stackTrace: stackTrace);
+    }
+  }
+
+  T $decode(Map<String, Object?> input);
+  Map<String, Object?> $encode(T input);
+
+  @override
+  Converter<Map<String, Object?>, T> get decoder =>
+      _FuncConverter<Map<String, Object?>, T>($decode);
+
+  @override
+  Converter<T, Map<String, Object?>> get encoder =>
+      _FuncConverter<T, Map<String, Object?>>($encode);
+}
+
+class _FuncConverter<S, T> extends Converter<S, T> {
+  const _FuncConverter(this._onConvert);
+
+  final T Function(S) _onConvert;
+
+  @override
+  T convert(S input) => _onConvert(input);
+}

feature/home/lib/src/presentation/widget/home_screen.dart

@@ -9,12 +9,10 @@ class HomeScreen extends StatefulWidget {
 }
 
 class _HomeScreenState extends State<HomeScreen> {
-  Widget _buildColorItem(int index, Color? seedColor) {
-    final itemColor = Colors.accents[index];
-
+  Widget _buildColorItem(Color color, bool isSelected) {
     return _ColorItem(
-      color: itemColor,
-      seedColor: seedColor,
+      color: color,
+      isSelected: isSelected,
       onTap: _onSeedColorChanged,
     );
   }
@@ -23,7 +21,7 @@ class _HomeScreenState extends State<HomeScreen> {
     SettingsScope.of(context).settingsBloc.add(
       SettingsEventUpdate(
         onUpdate: (settings) => settings.copyWith(
-          theme: settings.theme.copyWith(seedColor: color),
+          general: settings.general.copyWith(seedColor: color),
         ),
       ),
     );
@@ -53,7 +51,12 @@ class _HomeScreenState extends State<HomeScreen> {
                   itemCount: Colors.accents.length,
                   scrollDirection: Axis.horizontal,
                   itemBuilder: (context, index) {
-                    return _buildColorItem(index, data.theme.seedColor);
+                    final color = Colors.accents[index];
+
+                    return _buildColorItem(
+                      color,
+                      data.general.seedColor.toARGB32() == color.toARGB32(),
+                    );
                   },
                 );
               },
@@ -67,10 +70,10 @@ class _HomeScreenState extends State<HomeScreen> {
 }
 
 class _ColorItem extends StatelessWidget {
-  const _ColorItem({required this.color, required this.seedColor, required this.onTap});
+  const _ColorItem({required this.color, required this.isSelected, required this.onTap});
 
   final ValueChanged<Color> onTap;
-  final Color? seedColor;
+  final bool isSelected;
   final Color color;
 
   @override
@@ -84,7 +87,7 @@ class _ColorItem extends StatelessWidget {
           decoration: BoxDecoration(
             border: Border.all(
               width: 2,
-              color: seedColor?.toARGB32() == color.toARGB32() ? Colors.black : Colors.transparent,
+              color: isSelected ? Colors.black : Colors.transparent,
             ),
             borderRadius: BorderRadius.circular(16),
             color: color,

feature/settings/lib/settings.dart

@@ -1,5 +1,5 @@
+export 'src/domain/model/general.dart';
 export 'src/domain/model/settings.dart';
-export 'src/domain/model/theme_configuration.dart';
 export 'src/domain/repositories/settings_repository.dart';
 export 'src/injection.dart';
 export 'src/presentation/bloc/settings_bloc.dart';

feature/settings/lib/src/data/mappers/general_configuration_codec.dart

@@ -0,0 +1,50 @@
+// TODO(Michael): update sizzle_lints to remove this lint
+// ignore_for_file: prefer-prefixed-global-constants
+
+import 'dart:ui' show Color;
+
+import 'package:common/common.dart';
+import 'package:settings/settings.dart';
+
+const generalSettingsCodec = GeneralSettingsCodec();
+
+class GeneralSettingsCodec extends JsonMapCodec<GeneralSettings> {
+  const GeneralSettingsCodec();
+
+  @override
+  GeneralSettings $decode(Map<String, Object?> input) {
+    final themeMode = input['themeMode'] as String?;
+    final seedColor = input['seedColor'] as Map<String, Object?>?;
+
+    const defaults = GeneralSettings();
+
+    Color? seedColorValue;
+
+    if (seedColor case {
+      'r': final r as double,
+      'g': final g as double,
+      'b': final b as double,
+      'a': final a as double,
+    }) {
+      seedColorValue = Color.from(alpha: a, red: r, green: g, blue: b);
+    }
+
+    return GeneralSettings(
+      themeMode: themeMode != null ? ThemeModeVO.values.byName(themeMode) : defaults.themeMode,
+      seedColor: seedColorValue ?? defaults.seedColor,
+    );
+  }
+
+  @override
+  Map<String, Object?> $encode(GeneralSettings input) {
+    return {
+      'themeMode': input.themeMode.name,
+      'seedColor': {
+        'r': input.seedColor.r,
+        'g': input.seedColor.g,
+        'b': input.seedColor.b,
+        'a': input.seedColor.a,
+      },
+    };
+  }
+}

feature/settings/lib/src/data/mappers/general_settings_codec.dart

@@ -1,54 +1,25 @@
-import 'dart:convert';
-
+import 'package:common/common.dart';
 import 'package:settings/settings.dart';
-import 'package:settings/src/data/mappers/general_configuration_codec.dart';
-import 'package:settings/src/data/mappers/theme_configuration_codec.dart';
-import 'package:settings/src/domain/model/general_configuration.dart';
+import 'package:settings/src/data/mappers/general_settings_codec.dart';
 
-class SettingsCodec extends Codec<Settings, Map<String, Object?>> {
+class SettingsCodec extends JsonMapCodec<Settings> {
   const SettingsCodec();
 
   @override
-  Converter<Map<String, Object?>, Settings> get decoder => const _SettingsDecoder();
-
-  @override
-  Converter<Settings, Map<String, Object?>> get encoder => const _SettingsEncoder();
-}
-
-class _SettingsEncoder extends Converter<Settings, Map<String, Object?>> {
-  const _SettingsEncoder();
-
-  @override
-  Map<String, Object?> convert(Settings input) {
-    return {
-      'general': generalConfigurationCodec.encode(input.general),
-      'theme': themeConfigurationCodec.encode(input.theme),
-    };
-  }
-}
-
-class _SettingsDecoder extends Converter<Map<String, Object?>, Settings> {
-  const _SettingsDecoder();
-
-  @override
-  Settings convert(Map<String, Object?> input) {
+  Settings $decode(Map<String, Object?> input) {
     final generalMap = input['general'] as Map<String, Object?>?;
-    final themeMap = input['themeConfiguration'] as Map<String, Object?>?;
 
-    ThemeConfiguration? theme;
-    GeneralConfiguration? general;
-
-    if (themeMap != null) {
-      theme = themeConfigurationCodec.decode(themeMap);
-    }
+    GeneralSettings? general;
 
     if (generalMap != null) {
-      general = generalConfigurationCodec.decode(generalMap);
+      general = generalSettingsCodec.decode(generalMap);
     }
 
-    return Settings(
-      general: general ?? const GeneralConfiguration(),
-      theme: theme ?? const ThemeConfiguration(),
-    );
+    return Settings(general: general ?? const GeneralSettings());
   }
+
+  @override
+  Map<String, Object?> $encode(Settings input) => {
+    'general': generalSettingsCodec.encode(input.general),
+  };
 }

feature/settings/lib/src/data/mappers/settings_codec.dart

@@ -0,0 +1,36 @@
+import 'dart:ui' show Color, Locale;
+
+/// Possible theme modes for the application.
+enum ThemeModeVO { light, dark, system }
+
+/// Class that holds values used for constructing a theme for the app.
+final class GeneralSettings {
+  const GeneralSettings({
+    this.locale = const Locale('en'),
+    this.themeMode = ThemeModeVO.system,
+    this.seedColor = const Color(0xFF6200EE),
+  });
+
+  final ThemeModeVO themeMode;
+  final Color seedColor;
+  final Locale locale;
+
+  GeneralSettings copyWith({ThemeModeVO? themeMode, Color? seedColor, Locale? locale}) {
+    return GeneralSettings(
+      themeMode: themeMode ?? this.themeMode,
+      seedColor: seedColor ?? this.seedColor,
+      locale: locale ?? this.locale,
+    );
+  }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is GeneralSettings &&
+          seedColor == other.seedColor &&
+          themeMode == other.themeMode &&
+          locale == other.locale;
+
+  @override
+  int get hashCode => Object.hash(seedColor, themeMode, locale);
+}