Replace `if` condition with AnimatedVisibility component

pull/684/head
Maximillian Leonov 2 years ago committed by Maximillian Leonov
parent 6d87dc6888
commit 6c18b25d5d

@ -18,8 +18,10 @@ package com.google.samples.apps.nowinandroid.feature.settings
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
@ -149,7 +151,7 @@ fun SettingsDialog(
} }
@Composable @Composable
private fun SettingsPanel( private fun ColumnScope.SettingsPanel(
settings: UserEditableSettings, settings: UserEditableSettings,
supportDynamicColor: Boolean, supportDynamicColor: Boolean,
onChangeThemeBrand: (themeBrand: ThemeBrand) -> Unit, onChangeThemeBrand: (themeBrand: ThemeBrand) -> Unit,
@ -169,19 +171,21 @@ private fun SettingsPanel(
onClick = { onChangeThemeBrand(ANDROID) }, onClick = { onChangeThemeBrand(ANDROID) },
) )
} }
if (settings.brand == DEFAULT && supportDynamicColor) { AnimatedVisibility(visible = settings.brand == DEFAULT && supportDynamicColor) {
SettingsDialogSectionTitle(text = stringResource(R.string.dynamic_color_preference)) Column {
Column(Modifier.selectableGroup()) { SettingsDialogSectionTitle(text = stringResource(R.string.dynamic_color_preference))
SettingsDialogThemeChooserRow( Column(Modifier.selectableGroup()) {
text = stringResource(string.dynamic_color_yes), SettingsDialogThemeChooserRow(
selected = settings.useDynamicColor, text = stringResource(string.dynamic_color_yes),
onClick = { onChangeDynamicColorPreference(true) }, selected = settings.useDynamicColor,
) onClick = { onChangeDynamicColorPreference(true) },
SettingsDialogThemeChooserRow( )
text = stringResource(string.dynamic_color_no), SettingsDialogThemeChooserRow(
selected = !settings.useDynamicColor, text = stringResource(string.dynamic_color_no),
onClick = { onChangeDynamicColorPreference(false) }, selected = !settings.useDynamicColor,
) onClick = { onChangeDynamicColorPreference(false) },
)
}
} }
} }
SettingsDialogSectionTitle(text = stringResource(R.string.dark_mode_preference)) SettingsDialogSectionTitle(text = stringResource(R.string.dark_mode_preference))

Loading…
Cancel
Save