From f7e1d1be0cdf4d7dadd9eee0cf13b62add2f4d91 Mon Sep 17 00:00:00 2001 From: Patryk Michalik Date: Sat, 30 Oct 2021 16:38:21 +0200 Subject: [PATCH] Accent Color sheet: Indent divider in Dynamic section --- .../components/colorpreference/ColorPreference.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorPreference.kt index b4ac0958b6..a1939902b6 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorPreference.kt @@ -11,7 +11,9 @@ import androidx.compose.material.RadioButton import androidx.compose.material3.Button import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.key +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource @@ -19,7 +21,10 @@ import androidx.compose.ui.unit.dp import app.lawnchair.preferences.PreferenceAdapter import app.lawnchair.theme.color.ColorOption import app.lawnchair.ui.AlertBottomSheetContent -import app.lawnchair.ui.preferences.components.* +import app.lawnchair.ui.preferences.components.BottomSheet +import app.lawnchair.ui.preferences.components.Chip +import app.lawnchair.ui.preferences.components.PreferenceTemplate +import app.lawnchair.ui.preferences.components.rememberBottomSheetState import app.lawnchair.ui.theme.lightenColor import com.android.launcher3.R import com.google.accompanist.pager.ExperimentalPagerApi @@ -131,13 +136,15 @@ private fun PresetsList( .fillMaxHeight(), contentAlignment = Alignment.TopStart ) { - DividerColumn(modifier = Modifier.padding(top = 16.dp)) { - dynamicEntries.map { entry -> + Column(modifier = Modifier.padding(top = 16.dp)) { + dynamicEntries.mapIndexed { index, entry -> key(entry) { PreferenceTemplate( title = { Text(text = entry.label()) }, verticalPadding = 12.dp, modifier = Modifier.clickable { adapter.onChange(entry.value) }, + showDivider = index > 0, + dividerIndent = 40.dp, startWidget = { RadioButton( selected = entry.value == adapter.state.value,