From ca70a6be93b195f69c1fde2f20fedb9d923a3618 Mon Sep 17 00:00:00 2001 From: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com> Date: Mon, 12 May 2025 15:33:38 +0800 Subject: [PATCH] Fix text wrapping on slider and single-select preferences --- .../ui/preferences/components/controls/SliderPreference.kt | 6 +++++- .../ui/preferences/components/search/WebSearchProvider.kt | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/controls/SliderPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/controls/SliderPreference.kt index 3d0c524d8c..c2eb1249be 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/controls/SliderPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/controls/SliderPreference.kt @@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.material3.LocalContentColor +import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Slider import androidx.compose.material3.Text @@ -98,10 +99,13 @@ fun SliderPreference( ) { Text( text = label, - color = MaterialTheme.colorScheme.onSurface, + modifier = Modifier + .weight(1f) + .padding(end = 8.dp), ) CompositionLocalProvider( LocalContentColor provides MaterialTheme.colorScheme.onSurface, + LocalTextStyle provides MaterialTheme.typography.bodyLarge, ) { val value = snapSliderValue(valueRange.start, sliderValue, step) Text( diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/search/WebSearchProvider.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/search/WebSearchProvider.kt index 174fe6bfcc..3241512729 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/search/WebSearchProvider.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/search/WebSearchProvider.kt @@ -1,10 +1,12 @@ package app.lawnchair.ui.preferences.components.search +import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -79,6 +81,7 @@ fun ListPreferenceChips( horizontalArrangement = Arrangement.spacedBy(space = 8.dp), modifier = Modifier .fillMaxWidth() + .horizontalScroll(rememberScrollState()) .padding(top = 8.dp), ) { entries.forEach { item ->