From b0567b6cca817bb1db173833a42e1b360ecdef95 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sat, 11 Oct 2025 14:30:48 +0200 Subject: [PATCH] Adjust unit converter help screen --- .../UnitConverterHelpSettingsScreen.kt | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterHelpSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterHelpSettingsScreen.kt index 234859c35..8a28592cd 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterHelpSettingsScreen.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterHelpSettingsScreen.kt @@ -1,11 +1,14 @@ package de.mm20.launcher2.ui.settings.unitconverter import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -31,9 +34,11 @@ fun UnitConverterHelpSettingsScreen() { val availableConverters by viewModel.availableConverters.collectAsState(emptyList()) val availableUnits by viewModel.availableUnits.collectAsState(emptyList()) - PreferenceScreen(title = stringResource(R.string.preference_search_unitconverter), - helpUrl = "https://kvaesitso.mm20.de/docs/user-guide/search/unit-converter") { - + PreferenceScreen( + title = stringResource(R.string.preference_search_unitconverter), + verticalArrangement = Arrangement.spacedBy(2.dp), + helpUrl = "https://kvaesitso.mm20.de/docs/user-guide/search/unit-converter" + ) { for (i in availableConverters.indices) { stickyHeader { DimensionHeader(availableConverters[i].dimension) @@ -44,13 +49,13 @@ fun UnitConverterHelpSettingsScreen() { title = unit.formatName(LocalContext.current, 1.0), controls = { Box( - modifier = Modifier.size(36.dp) + modifier = Modifier.padding(horizontal = 4.dp).widthIn(min = 36.dp).height(36.dp) .background(MaterialTheme.colorScheme.secondaryContainer, MaterialTheme.shapes.extraSmall), contentAlignment = Alignment.Center, ) { Text(unit.symbol, style = MaterialTheme.typography.labelSmall) } - } + }, ) } } @@ -60,19 +65,20 @@ fun UnitConverterHelpSettingsScreen() { @Composable private fun DimensionHeader(dimension: Dimension) { Row( - modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainer).fillMaxWidth().padding(top = 16.dp, bottom = 16.dp) + modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainer).fillMaxWidth() + .padding(start = 8.dp, top = 16.dp, end = 16.dp, bottom = 16.dp) ) { Icon( getDimensionIcon(dimension), null, - modifier = Modifier.padding(horizontal = 24.dp), - tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(end = 8.dp), + tint = MaterialTheme.colorScheme.secondary, ) Text( stringResource(dimension.resource), style = MaterialTheme.typography.titleSmall, modifier = Modifier.weight(1f), - color = MaterialTheme.colorScheme.onSurfaceVariant, + color = MaterialTheme.colorScheme.secondary, ) } }