diff --git a/composeApp/src/commonMain/composeResources/values-es/strings.xml b/composeApp/src/commonMain/composeResources/values-es/strings.xml index b52d5056..8cbc7328 100644 --- a/composeApp/src/commonMain/composeResources/values-es/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-es/strings.xml @@ -757,8 +757,8 @@ Esmeralda Océano Rosa - Violeta - Blanco + Amatista + Glaciar Siguiente episodio Buscando fuente… Reproduciendo vía %1$s en %2$d… diff --git a/composeApp/src/commonMain/composeResources/values-fr/strings.xml b/composeApp/src/commonMain/composeResources/values-fr/strings.xml index 15301839..c0586854 100644 --- a/composeApp/src/commonMain/composeResources/values-fr/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-fr/strings.xml @@ -790,8 +790,8 @@ Émeraude Océan Rose - Violet - Blanc + Améthyste + Glacier Épisode suivant Recherche de la source… Lecture via %1$s dans %2$d… diff --git a/composeApp/src/commonMain/composeResources/values/strings.xml b/composeApp/src/commonMain/composeResources/values/strings.xml index f235570b..aa38e645 100644 --- a/composeApp/src/commonMain/composeResources/values/strings.xml +++ b/composeApp/src/commonMain/composeResources/values/strings.xml @@ -830,8 +830,8 @@ Emerald Ocean Rose - Violet - White + Amethyst + Glacier Next Episode Finding source… Playing via %1$s in %2$d… diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/AppTheme.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/AppTheme.kt index 081f1756..555a10b0 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/AppTheme.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/AppTheme.kt @@ -13,20 +13,20 @@ import org.jetbrains.compose.resources.StringResource enum class AppTheme { CRIMSON, OCEAN, - VIOLET, + AMETHYST, EMERALD, AMBER, ROSE, - WHITE, + GLACIER, } val AppTheme.labelRes: StringResource get() = when (this) { AppTheme.CRIMSON -> Res.string.theme_crimson AppTheme.OCEAN -> Res.string.theme_ocean - AppTheme.VIOLET -> Res.string.theme_violet + AppTheme.AMETHYST -> Res.string.theme_violet AppTheme.EMERALD -> Res.string.theme_emerald AppTheme.AMBER -> Res.string.theme_amber AppTheme.ROSE -> Res.string.theme_rose - AppTheme.WHITE -> Res.string.theme_white + AppTheme.GLACIER -> Res.string.theme_white } diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioTheme.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioTheme.kt index 38c88914..7825d2cf 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioTheme.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioTheme.kt @@ -25,7 +25,7 @@ import nuvio.composeapp.generated.resources.jetbrains_sans_regular import nuvio.composeapp.generated.resources.jetbrains_sans_semibold import org.jetbrains.compose.resources.Font -val LocalAppTheme = staticCompositionLocalOf { AppTheme.WHITE } +val LocalAppTheme = staticCompositionLocalOf { AppTheme.GLACIER } val MaterialTheme.appTheme: AppTheme @Composable @@ -207,7 +207,7 @@ private val NuvioRippleConfiguration = RippleConfiguration( @Composable fun NuvioTheme( darkTheme: Boolean = isSystemInDarkTheme(), - appTheme: AppTheme = AppTheme.WHITE, + appTheme: AppTheme = AppTheme.GLACIER, amoled: Boolean = false, content: @Composable () -> Unit, ) { diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/ThemeColors.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/ThemeColors.kt index 5ee217bf..cc1555dc 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/ThemeColors.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/ThemeColors.kt @@ -36,7 +36,7 @@ object ThemeColors { backgroundCard = Color(0xFF1A1F24), ) - val Violet = ThemeColorPalette( + val Amethyst = ThemeColorPalette( secondary = Color(0xFF8E24AA), secondaryVariant = Color(0xFF6A1B9A), focusRing = Color(0xFFAB47BC), @@ -76,7 +76,7 @@ object ThemeColors { backgroundCard = Color(0xFF241A1F), ) - val White = ThemeColorPalette( + val Glacier = ThemeColorPalette( secondary = Color(0xFFF5F5F5), secondaryVariant = Color(0xFFE0E0E0), onSecondary = Color(0xFF111111), @@ -91,10 +91,10 @@ object ThemeColors { fun getColorPalette(theme: AppTheme): ThemeColorPalette = when (theme) { AppTheme.CRIMSON -> Crimson AppTheme.OCEAN -> Ocean - AppTheme.VIOLET -> Violet + AppTheme.AMETHYST -> Amethyst AppTheme.EMERALD -> Emerald AppTheme.AMBER -> Amber AppTheme.ROSE -> Rose - AppTheme.WHITE -> White + AppTheme.GLACIER -> Glacier } } diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/AppearanceSettingsPage.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/AppearanceSettingsPage.kt index bc312982..f9c54f80 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/AppearanceSettingsPage.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/AppearanceSettingsPage.kt @@ -86,7 +86,7 @@ internal fun LazyListScope.appearanceSettingsContent( isTablet = isTablet, ) { SettingsGroup(isTablet = isTablet) { - val themes = listOf(AppTheme.WHITE) + AppTheme.entries.filterNot { it == AppTheme.WHITE } + val themes = listOf(AppTheme.GLACIER) + AppTheme.entries.filterNot { it == AppTheme.GLACIER } FlowRow( modifier = Modifier .fillMaxWidth() diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/ThemeSettingsRepository.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/ThemeSettingsRepository.kt index 2f1221dd..be2db2cb 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/ThemeSettingsRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/ThemeSettingsRepository.kt @@ -7,7 +7,7 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow object ThemeSettingsRepository { - private val _selectedTheme = MutableStateFlow(AppTheme.WHITE) + private val _selectedTheme = MutableStateFlow(AppTheme.GLACIER) val selectedTheme: StateFlow = _selectedTheme.asStateFlow() private val _amoledEnabled = MutableStateFlow(false) @@ -32,10 +32,10 @@ object ThemeSettingsRepository { fun clearLocalState() { hasLoaded = false - _selectedTheme.value = AppTheme.WHITE + _selectedTheme.value = AppTheme.GLACIER _amoledEnabled.value = false _liquidGlassNativeTabBarEnabled.value = false - NativeTabBridge.publishAccentColor(AppTheme.WHITE.nativeTabAccentHex()) + NativeTabBridge.publishAccentColor(AppTheme.GLACIER.nativeTabAccentHex()) NativeTabBridge.publishLiquidGlassEnabled(false) _selectedAppLanguage.value = AppLanguage.ENGLISH } @@ -45,12 +45,16 @@ object ThemeSettingsRepository { val stored = ThemeSettingsStorage.loadSelectedTheme() val theme = if (stored != null) { try { - AppTheme.valueOf(stored) + when (stored) { + "VIOLET" -> AppTheme.AMETHYST + "WHITE" -> AppTheme.GLACIER + else -> AppTheme.valueOf(stored) + } } catch (_: IllegalArgumentException) { - AppTheme.WHITE + AppTheme.GLACIER } } else { - AppTheme.WHITE + AppTheme.GLACIER } _selectedTheme.value = theme NativeTabBridge.publishAccentColor(theme.nativeTabAccentHex()) @@ -98,9 +102,9 @@ object ThemeSettingsRepository { private fun AppTheme.nativeTabAccentHex(): String = when (this) { AppTheme.CRIMSON -> "#E53935" AppTheme.OCEAN -> "#1E88E5" - AppTheme.VIOLET -> "#8E24AA" + AppTheme.AMETHYST -> "#8E24AA" AppTheme.EMERALD -> "#43A047" AppTheme.AMBER -> "#FB8C00" AppTheme.ROSE -> "#D81B60" - AppTheme.WHITE -> "#F5F5F5" + AppTheme.GLACIER -> "#F5F5F5" }