Fix dynamic color issues

chen08209 · Oct 27, 2024 · 51e888e · 51e888e
1 parent c7a9159
commit 51e888e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/lib/models/config.dart b/lib/models/config.dart
@@ -146,7 +146,7 @@ const defaultThemeProps = ThemeProps();
 @freezed
 class ThemeProps with _$ThemeProps {
   const factory ThemeProps({
-    @Default(0xFF795548) int? primaryColor,
+    int? primaryColor,
     @Default(ThemeMode.system) ThemeMode themeMode,
     @Default(false) bool prueBlack,
     @Default(FontFamily.system) FontFamily fontFamily,
@@ -158,14 +158,20 @@ class ThemeProps with _$ThemeProps {
   factory ThemeProps.realFromJson(Map<String, Object?>? json) {
     if (json == null) {
       return Platform.isWindows
-          ? defaultThemeProps.copyWith(fontFamily: FontFamily.miSans)
+          ? defaultThemeProps.copyWith(
+              fontFamily: FontFamily.miSans,
+              primaryColor: defaultPrimaryColor.value,
+            )
           : defaultThemeProps;
     }
     try {
       return ThemeProps.fromJson(json);
     } catch (_) {
       return Platform.isWindows
-          ? defaultThemeProps.copyWith(fontFamily: FontFamily.miSans)
+          ? defaultThemeProps.copyWith(
+              fontFamily: FontFamily.miSans,
+              primaryColor: defaultPrimaryColor.value,
+            )
           : defaultThemeProps;
     }
   }

diff --git a/lib/models/generated/config.freezed.dart b/lib/models/generated/config.freezed.dart
@@ -1667,7 +1667,7 @@ class __$$ThemePropsImplCopyWithImpl<$Res>
 @JsonSerializable()
 class _$ThemePropsImpl implements _ThemeProps {
   const _$ThemePropsImpl(
-      {this.primaryColor = 0xFF795548,
+      {this.primaryColor,
       this.themeMode = ThemeMode.system,
       this.prueBlack = false,
       this.fontFamily = FontFamily.system});
@@ -1676,7 +1676,6 @@ class _$ThemePropsImpl implements _ThemeProps {
       _$$ThemePropsImplFromJson(json);
 
   @override
-  @JsonKey()
   final int? primaryColor;
   @override
   @JsonKey()

diff --git a/lib/models/generated/config.g.dart b/lib/models/generated/config.g.dart