fix default color

matsumo0922 · Dec 11, 2023 · 9ac4797 · 9ac4797
1 parent a16dfeb
commit 9ac4797
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/...tastore/src/main/java/caios/android/fanbox/core/datastore/PixiViewPreferencesDataStore.kt b/...tastore/src/main/java/caios/android/fanbox/core/datastore/PixiViewPreferencesDataStore.kt
@@ -24,6 +24,7 @@ class PixiViewPreferencesDataStore(
                     else -> ThemeConfig.System
                 },
                 themeColorConfig = when (it.themeColorConfig) {
+                    ThemeColorConfigProto.THEME_COLOR_CONFIG_RED -> ThemeColorConfig.Red
                     ThemeColorConfigProto.THEME_COLOR_CONFIG_BLUE -> ThemeColorConfig.Blue
                     ThemeColorConfigProto.THEME_COLOR_CONFIG_BROWN -> ThemeColorConfig.Brown
                     ThemeColorConfigProto.THEME_COLOR_CONFIG_GREEN -> ThemeColorConfig.Green
@@ -99,8 +100,7 @@ class PixiViewPreferencesDataStore(
                     ThemeColorConfig.Green -> ThemeColorConfigProto.THEME_COLOR_CONFIG_GREEN
                     ThemeColorConfig.Pink -> ThemeColorConfigProto.THEME_COLOR_CONFIG_PINK
                     ThemeColorConfig.Purple -> ThemeColorConfigProto.THEME_COLOR_CONFIG_PURPLE
-                    ThemeColorConfig.Default -> ThemeColorConfigProto.THEME_COLOR_CONFIG_DEFAULT
-                    else -> ThemeColorConfigProto.THEME_COLOR_CONFIG_BLUE
+                    ThemeColorConfig.Red -> ThemeColorConfigProto.THEME_COLOR_CONFIG_RED
                 }
             }
         }

diff --git a/core/datastore/src/main/proto/items/theme_color_config.proto b/core/datastore/src/main/proto/items/theme_color_config.proto
@@ -5,7 +5,7 @@ option java_multiple_files = true;
 
 enum ThemeColorConfigProto {
   THEME_COLOR_CONFIG_UNSPECIFIED = 0;
-  THEME_COLOR_CONFIG_DEFAULT = 1;
+  THEME_COLOR_CONFIG_RED = 1;
   THEME_COLOR_CONFIG_BLUE = 2;
   THEME_COLOR_CONFIG_BROWN = 3;
   THEME_COLOR_CONFIG_GREEN = 4;

diff --git a/core/model/src/main/java/caios/android/fanbox/core/model/ThemeColorConfig.kt b/core/model/src/main/java/caios/android/fanbox/core/model/ThemeColorConfig.kt
@@ -4,5 +4,5 @@ import androidx.compose.runtime.Stable
 
 @Stable
 enum class ThemeColorConfig {
-    Default, Blue, Brown, Green, Pink, Purple
+    Red, Blue, Brown, Green, Pink, Purple
 }
diff --git a/core/model/src/main/java/caios/android/fanbox/core/model/UserData.kt b/core/model/src/main/java/caios/android/fanbox/core/model/UserData.kt
@@ -29,7 +29,7 @@ data class UserData(
             return UserData(
                 pixiViewId = "",
                 themeConfig = ThemeConfig.System,
-                themeColorConfig = ThemeColorConfig.Default,
+                themeColorConfig = ThemeColorConfig.Red,
                 isAgreedPrivacyPolicy = false,
                 isAgreedTermsOfService = false,
                 isAppLock = false,

diff --git a/core/ui/src/main/java/caios/android/fanbox/core/ui/theme/Theme.kt b/core/ui/src/main/java/caios/android/fanbox/core/ui/theme/Theme.kt
@@ -89,7 +89,7 @@ val DarkDefaultColorScheme = darkColorScheme(
 fun PixiViewTheme(
     fanboxCookie: String = "",
     fanboxMetadata: FanboxMetaData = FanboxMetaData.dummy(),
-    themeColorConfig: ThemeColorConfig = ThemeColorConfig.Default,
+    themeColorConfig: ThemeColorConfig = ThemeColorConfig.Red,
     shouldUseDarkTheme: Boolean = isSystemInDarkTheme(),
     enableDynamicTheme: Boolean = false,
     content: @Composable () -> Unit,

diff --git a/...rc/main/java/caios/android/fanbox/feature/setting/theme/items/SettingThemeColorSection.kt b/...rc/main/java/caios/android/fanbox/feature/setting/theme/items/SettingThemeColorSection.kt
@@ -70,12 +70,12 @@ internal fun SettingThemeColorSection(
                 key = { it.name },
             ) {
                 val color = when (it) {
+                    ThemeColorConfig.Red -> if (isDarkMode) DarkDefaultColorScheme else LightDefaultColorScheme
                     ThemeColorConfig.Blue -> if (isDarkMode) DarkBlueColorScheme else LightBlueColorScheme
                     ThemeColorConfig.Brown -> if (isDarkMode) DarkBrownColorScheme else LightBrownColorScheme
                     ThemeColorConfig.Green -> if (isDarkMode) DarkGreenColorScheme else LightGreenColorScheme
                     ThemeColorConfig.Purple -> if (isDarkMode) DarkPurpleColorScheme else LightPurpleColorScheme
                     ThemeColorConfig.Pink -> if (isDarkMode) DarkPinkColorScheme else LightPinckColorScheme
-                    else -> if (isDarkMode) DarkDefaultColorScheme else LightDefaultColorScheme
                 }
 
                 SettingThemeColorItem(