From 7d54b785217d9c6d6401d663d31618bcdb6df337 Mon Sep 17 00:00:00 2001 From: Dude so hot Date: Sun, 17 Nov 2024 17:43:46 +0800 Subject: [PATCH] ColorFilterSetting use RollingNumber --- .../hippo/ehviewer/ui/reader/ColorFilterSetting.kt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ColorFilterSetting.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ColorFilterSetting.kt index 0a635baa0..b80fe8333 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ColorFilterSetting.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ColorFilterSetting.kt @@ -3,7 +3,6 @@ package com.hippo.ehviewer.ui.reader import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.navigationBarsPadding -import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons @@ -18,7 +17,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringArrayResource import androidx.compose.ui.res.stringResource -import androidx.compose.ui.unit.dp import androidx.core.graphics.alpha import androidx.core.graphics.blue import androidx.core.graphics.green @@ -26,6 +24,7 @@ import androidx.core.graphics.red import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings import com.hippo.ehviewer.asMutableState +import com.hippo.ehviewer.ui.main.RollingNumber @Composable fun ColorFilterSetting() = Column(modifier = Modifier.verticalScroll(rememberScrollState()).navigationBarsPadding()) { @@ -38,7 +37,7 @@ fun ColorFilterSetting() = Column(modifier = Modifier.verticalScroll(rememberScr val brightness = Settings.customBrightnessValue.asMutableState() SliderChoice( startSlot = { Icon(imageVector = Icons.Default.Brightness5, contentDescription = null) }, - endSlot = { Text(modifier = Modifier.width(24.dp), text = "${brightness.value}") }, + endSlot = { RollingNumber(number = brightness.value, length = 3) }, range = -75..100, field = brightness, ) @@ -62,25 +61,25 @@ fun ColorFilterSetting() = Column(modifier = Modifier.verticalScroll(rememberScr Column { SliderChoice( startSlot = { Text(text = "R") }, - endSlot = { Text(modifier = Modifier.width(24.dp), text = "$r") }, + endSlot = { RollingNumber(number = r, length = 3) }, range = 0..255, field = rf, ) SliderChoice( startSlot = { Text(text = "G") }, - endSlot = { Text(modifier = Modifier.width(24.dp), text = "$g") }, + endSlot = { RollingNumber(number = g, length = 3) }, range = 0..255, field = gf, ) SliderChoice( startSlot = { Text(text = "B") }, - endSlot = { Text(modifier = Modifier.width(24.dp), text = "$b") }, + endSlot = { RollingNumber(number = b, length = 3) }, range = 0..255, field = bf, ) SliderChoice( startSlot = { Text(text = "A") }, - endSlot = { Text(modifier = Modifier.width(24.dp), text = "$a") }, + endSlot = { RollingNumber(number = a, length = 3) }, range = 0..255, field = af, )