diff --git a/app/src/main/kotlin/cn/super12138/todo/logic/model/ContrastLevel.kt b/app/src/main/kotlin/cn/super12138/todo/logic/model/ContrastLevel.kt index 0ca7b3b..09fd77d 100644 --- a/app/src/main/kotlin/cn/super12138/todo/logic/model/ContrastLevel.kt +++ b/app/src/main/kotlin/cn/super12138/todo/logic/model/ContrastLevel.kt @@ -15,8 +15,8 @@ enum class ContrastLevel(val value: Float) { VeryLow -> R.string.contrast_very_low Low -> R.string.contrast_low Default -> R.string.contrast_default - Medium -> R.string.contrast_medium - High -> R.string.contrast_high + Medium -> R.string.contrast_high + High -> R.string.contrast_very_high } return context.getString(resId) } 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 e95d428..670a387 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 @@ -1,17 +1,18 @@ package cn.super12138.todo.ui.pages.settings.components.contrast -import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.foundation.layout.sizeIn -import androidx.compose.foundation.layout.wrapContentWidth +import androidx.compose.foundation.layout.Arrangement +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.Label -import androidx.compose.material3.PlainTooltip +import androidx.compose.material3.LocalTextStyle +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Slider -import androidx.compose.material3.SliderDefaults import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.getValue -import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext @@ -40,7 +41,6 @@ fun ContrastPicker( Constants.PREF_CONTRAST_LEVEL, Constants.PREF_CONTRAST_LEVEL_DEFAULT ) - val interactionSource = remember { MutableInteractionSource() } Slider( modifier = Modifier.semantics { @@ -53,23 +53,19 @@ fun ContrastPicker( }, valueRange = -1f..1f, steps = 3, - interactionSource = interactionSource, - thumb = { - Label( - label = { - PlainTooltip( - modifier = Modifier - .sizeIn(45.dp, 25.dp) - .wrapContentWidth() - ) { - Text(ContrastLevel.fromFloat(contrastState).getDisplayName(context)) - } - }, - interactionSource = interactionSource - ) { - SliderDefaults.Thumb(interactionSource) - } - } ) + Spacer(Modifier.size(5.dp)) + CompositionLocalProvider(LocalTextStyle provides MaterialTheme.typography.bodyMedium) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween + ) { + Text(stringResource(R.string.contrast_very_low)) + Text(stringResource(R.string.contrast_low)) + Text(stringResource(R.string.contrast_default)) + Text(stringResource(R.string.contrast_high)) + Text(stringResource(R.string.contrast_very_high)) + } + } } } \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 28d2cbf..002a7be 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -68,11 +68,11 @@ 深色模式 对比度 调整应用的颜色对比度 - 非常低 + 极低 默认 - + 极高 更改颜色对比度 界面 待办列表、排序方式 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4b8eb74..3454b95 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -72,8 +72,8 @@ Very Low Low Default - Medium High + Very High Change the contrast level Interface To-Do List, sorting method