From 7f1e3d9626c3f72612e8b79747d566cfa9de6000 Mon Sep 17 00:00:00 2001 From: Super12138 <70494801+Super12138@users.noreply.github.com> Date: Thu, 6 Feb 2025 16:38:53 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../todo/ui/pages/settings/components/RowSettingsItem.kt | 5 +---- .../ui/pages/settings/components/contrast/ContrastPicker.kt | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/RowSettingsItem.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/RowSettingsItem.kt index fef93cf..a4948be 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/RowSettingsItem.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/RowSettingsItem.kt @@ -1,10 +1,8 @@ package cn.super12138.todo.ui.pages.settings.components -import androidx.compose.foundation.background import androidx.compose.foundation.gestures.FlingBehavior import androidx.compose.foundation.gestures.ScrollableDefaults import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Spacer @@ -46,8 +44,7 @@ fun RowSettingsItem( MoreContentSettingsItem( title = title, description = description, - shape = shape, - modifier = modifier + shape = shape ) { LazyRow( modifier = Modifier.fillMaxWidth(), diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/contrast/ContrastPicker.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/contrast/ContrastPicker.kt index 670a387..4d0047f 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/contrast/ContrastPicker.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/contrast/ContrastPicker.kt @@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.size -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Slider @@ -26,7 +25,6 @@ import cn.super12138.todo.logic.model.ContrastLevel import cn.super12138.todo.ui.pages.settings.components.MoreContentSettingsItem import cn.super12138.todo.ui.pages.settings.state.rememberPrefFloatState -@OptIn(ExperimentalMaterial3Api::class) @Composable fun ContrastPicker( onContrastChange: (ContrastLevel) -> Unit, @@ -54,7 +52,9 @@ fun ContrastPicker( valueRange = -1f..1f, steps = 3, ) + Spacer(Modifier.size(5.dp)) + CompositionLocalProvider(LocalTextStyle provides MaterialTheme.typography.bodyMedium) { Row( modifier = Modifier.fillMaxWidth(),