diff --git a/app/src/main/java/com/m57/hermescontrol/data/config/ServerStoreMigration.kt b/app/src/main/java/com/m57/hermescontrol/data/config/ServerStoreMigration.kt index 2961cbc1..712baa96 100644 --- a/app/src/main/java/com/m57/hermescontrol/data/config/ServerStoreMigration.kt +++ b/app/src/main/java/com/m57/hermescontrol/data/config/ServerStoreMigration.kt @@ -55,7 +55,7 @@ class ServerStoreMigration( runCatching { ThemePreference.valueOf(themePrefString!!) } .getOrDefault(ThemePreference.SYSTEM) - val useDynamicColors = prefs.getBoolean("use_dynamic_colors", true) + val useDynamicColors = prefs.getBoolean("use_dynamic_colors", false) val themePresetString = prefs.getString("theme_preset", ThemePreset.DEFAULT.name) val themePreset = diff --git a/app/src/main/java/com/m57/hermescontrol/data/config/ServerStoreState.kt b/app/src/main/java/com/m57/hermescontrol/data/config/ServerStoreState.kt index daa7a714..2139218c 100644 --- a/app/src/main/java/com/m57/hermescontrol/data/config/ServerStoreState.kt +++ b/app/src/main/java/com/m57/hermescontrol/data/config/ServerStoreState.kt @@ -13,7 +13,7 @@ data class ServerStoreState( val baseUrl: String? = null, val autoReconnect: Boolean = true, val themePreference: ThemePreference = ThemePreference.SYSTEM, - val useDynamicColors: Boolean = true, + val useDynamicColors: Boolean = false, val themePreset: ThemePreset = ThemePreset.DEFAULT, val connectionProfiles: List = emptyList(), val selectedProfileId: String? = null, diff --git a/app/src/main/java/com/m57/hermescontrol/data/local/AuthManager.kt b/app/src/main/java/com/m57/hermescontrol/data/local/AuthManager.kt index a671101c..ac2e6d77 100644 --- a/app/src/main/java/com/m57/hermescontrol/data/local/AuthManager.kt +++ b/app/src/main/java/com/m57/hermescontrol/data/local/AuthManager.kt @@ -68,7 +68,7 @@ object AuthManager { private val _themePreferenceFlow = MutableStateFlow(ThemePreference.SYSTEM) val themePreferenceFlow: StateFlow = _themePreferenceFlow.asStateFlow() - private val _useDynamicColorsFlow = MutableStateFlow(true) + private val _useDynamicColorsFlow = MutableStateFlow(false) val useDynamicColorsFlow: StateFlow = _useDynamicColorsFlow.asStateFlow() private val _themePresetFlow = MutableStateFlow(ThemePreset.DEFAULT) diff --git a/app/src/main/java/com/m57/hermescontrol/theme/THEMES.md b/app/src/main/java/com/m57/hermescontrol/theme/THEMES.md index a19be635..73f63da2 100644 --- a/app/src/main/java/com/m57/hermescontrol/theme/THEMES.md +++ b/app/src/main/java/com/m57/hermescontrol/theme/THEMES.md @@ -95,8 +95,8 @@ private fun themeFor(preset: ThemePreset): ThemePalette = when (preset) { } ``` -Dynamic (Material You) color on API 31+ overrides the preset scheme when -`useDynamicColors = true`. Semantic status colors are always resolved from the +Dynamic (Material You) color on API 31+ can optionally override the preset scheme when +`useDynamicColors = true` (defaults to `false`). Semantic status colors are always resolved from the active preset via `LocalHermesStatusColors`. ## Adding a new theme diff --git a/app/src/main/java/com/m57/hermescontrol/theme/Theme.kt b/app/src/main/java/com/m57/hermescontrol/theme/Theme.kt index 5767ec7e..f9ce67ff 100644 --- a/app/src/main/java/com/m57/hermescontrol/theme/Theme.kt +++ b/app/src/main/java/com/m57/hermescontrol/theme/Theme.kt @@ -74,7 +74,7 @@ internal fun resolveStatusColors( @Composable fun HermesControlTheme( themePreference: ThemePreference = LocalThemePreference.current, - useDynamicColors: Boolean = true, + useDynamicColors: Boolean = false, themePreset: ThemePreset = ThemePreset.DEFAULT, chatFontScale: Float = LocalChatFontScale.current, content: @Composable () -> Unit, diff --git a/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsViewModel.kt b/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsViewModel.kt index 7d542fd0..20dd7f6b 100644 --- a/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsViewModel.kt +++ b/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsViewModel.kt @@ -29,7 +29,7 @@ data class SettingsUiState( val token: String = "", val autoReconnect: Boolean = true, val themePreference: ThemePreference = ThemePreference.SYSTEM, - val useDynamicColors: Boolean = true, + val useDynamicColors: Boolean = false, val themePreset: ThemePreset = ThemePreset.DEFAULT, val isTesting: Boolean = false, val testResult: String? = null,