From daf921c702e53fe39373adc2e5d259d6ab62c8f4 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Tue, 5 Sep 2023 15:40:22 +0300 Subject: [PATCH] Fix dynamic theme option visibility on old devices --- .../feature/settings/themes/ThemesScreen.kt | 84 ++++++++++--------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/themes/ThemesScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/themes/ThemesScreen.kt index 50b6636e..cc887eb5 100644 --- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/themes/ThemesScreen.kt +++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/themes/ThemesScreen.kt @@ -225,6 +225,8 @@ private fun ThemesScreen( } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) { + item { Header(stringResource(R.string.color_scheme)) } + item { UnittoListItem( leadingContent = { @@ -239,50 +241,50 @@ private fun ThemesScreen( onSwitchChange = onDynamicThemeChange ) } - } - item { - AnimatedVisibility( - visible = !isDynamicThemeEnabled, - enter = expandVertically() + fadeIn(), - exit = shrinkVertically() + fadeOut(), - ) { - ListItem( - headlineContent = { Text(stringResource(R.string.selected_color)) }, - supportingContent = { - ColorSelector( - modifier = Modifier.padding(top = 12.dp), - selected = selectedColor, - onItemClick = onColorChange, - colorSchemes = colorSchemes, - defaultColor = Color(0xFF186c31) - ) - }, - modifier = Modifier.padding(start = 40.dp) - ) + item { + AnimatedVisibility( + visible = !isDynamicThemeEnabled, + enter = expandVertically() + fadeIn(), + exit = shrinkVertically() + fadeOut(), + ) { + ListItem( + headlineContent = { Text(stringResource(R.string.selected_color)) }, + supportingContent = { + ColorSelector( + modifier = Modifier.padding(top = 12.dp), + selected = selectedColor, + onItemClick = onColorChange, + colorSchemes = colorSchemes, + defaultColor = Color(0xFF186c31) + ) + }, + modifier = Modifier.padding(start = 40.dp) + ) + } } - } - item { - AnimatedVisibility( - visible = (!isDynamicThemeEnabled) and (selectedColor != Color.Unspecified), - enter = expandVertically() + fadeIn(), - exit = shrinkVertically() + fadeOut(), - ) { - ListItem( - headlineContent = { Text(stringResource(R.string.monet_mode)) }, - supportingContent = { - MonetModeSelector( - modifier = Modifier.padding(top = 12.dp), - selected = monetMode, - onItemClick = onMonetModeChange, - monetModes = remember { MonetMode.values().toList() }, - customColor = selectedColor, - themingMode = currentThemingMode, - ) - }, - modifier = Modifier.padding(start = 40.dp) - ) + item { + AnimatedVisibility( + visible = (!isDynamicThemeEnabled) and (selectedColor != Color.Unspecified), + enter = expandVertically() + fadeIn(), + exit = shrinkVertically() + fadeOut(), + ) { + ListItem( + headlineContent = { Text(stringResource(R.string.monet_mode)) }, + supportingContent = { + MonetModeSelector( + modifier = Modifier.padding(top = 12.dp), + selected = monetMode, + onItemClick = onMonetModeChange, + monetModes = remember { MonetMode.values().toList() }, + customColor = selectedColor, + themingMode = currentThemingMode, + ) + }, + modifier = Modifier.padding(start = 40.dp) + ) + } } } }