Fix checkbox and switch position on long texts on M2 (#146)

Co-authored-by: Niels Kristian Lyshøj Jesnen <niels.kristian.jensen@dencrypt.dk>
alorma · May 9, 2023 · 02ef972 · 02ef972
1 parent 963b4a6
commit 02ef972
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/compose-settings-ui/src/main/kotlin/com/alorma/compose/settings/ui/SettingsCheckbox.kt b/compose-settings-ui/src/main/kotlin/com/alorma/compose/settings/ui/SettingsCheckbox.kt
@@ -1,7 +1,6 @@
 package com.alorma.compose.settings.ui
 
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.selection.toggleable
@@ -59,8 +58,7 @@ fun SettingsCheckbox(
     ) {
       WrapContentColor(enabled = enabled) {
         SettingsTileIcon(icon = icon)
-        SettingsTileTexts(title = title, subtitle = subtitle)
-        Spacer(modifier = Modifier.weight(1f))
+        SettingsTileTexts(modifier = Modifier.weight(1f), title = title, subtitle = subtitle)
         SettingsTileAction {
           Checkbox(
             enabled = enabled,

diff --git a/compose-settings-ui/src/main/kotlin/com/alorma/compose/settings/ui/SettingsSwitch.kt b/compose-settings-ui/src/main/kotlin/com/alorma/compose/settings/ui/SettingsSwitch.kt
@@ -1,7 +1,6 @@
 package com.alorma.compose.settings.ui
 
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.selection.toggleable
@@ -59,8 +58,7 @@ fun SettingsSwitch(
     ) {
       WrapContentColor(enabled = enabled) {
         SettingsTileIcon(icon = icon)
-        SettingsTileTexts(title = title, subtitle = subtitle)
-        Spacer(modifier = Modifier.weight(1f))
+        SettingsTileTexts(modifier = Modifier.weight(1f), title = title, subtitle = subtitle)
         SettingsTileAction {
           Switch(
             checked = storageValue,

diff --git a/...-settings-ui/src/main/kotlin/com/alorma/compose/settings/ui/internal/SettingsTileTexts.kt b/...-settings-ui/src/main/kotlin/com/alorma/compose/settings/ui/internal/SettingsTileTexts.kt
@@ -16,7 +16,7 @@ internal fun RowScope.SettingsTileTexts(
     subtitle: @Composable (() -> Unit)?,
 ) {
     Column(
-        modifier = Modifier,
+        modifier = modifier,
         verticalArrangement = Arrangement.Center,
     ) {
         SettingsTileTitle(title)