Gradient 슬라이더 계산 로직 수정

app/src/main/java/com/laseroptek/raman/ui/screens/engineer/LifeTimeView.kt

@@ -59,7 +59,7 @@ fun LifeTimeView(
 
         // Temp 0..7
         for (i in 0..lifeTimeTypes.size -1) {
-            val value = when (i) {
+            val hour = when (i) {
                 0 -> lifeTime.lamp
                 1 -> lifeTime.hp5x5
                 2 -> lifeTime.hp7x7
@@ -70,35 +70,22 @@ fun LifeTimeView(
                 7 -> lifeTime.water
                 else -> 0
             }
-            val modifier = Modifier
+            HourItemView(
+                modifier = Modifier
                     .fillMaxSize()
                     .weight(1f)
                     .padding(
                         start = 20.px.dp,
                         end = 20.px.dp,
                         //bottom = 10.px.dp
-                )
+                    ),
-            val title = lifeTimeTypes[i]
+                title = lifeTimeTypes[i],
-            val onItemClick = {
+                hour = hour,
-                Timber.d("onClick > Temp $i ($title)")
+                onClick = {
+                    Timber.d("onClick > Temp $i (${lifeTimeTypes[i]})")
                     onClick.invoke(i)
                 }
-
-            if (i <= 4) {
-                CountItemView(
-                    modifier = modifier,
-                    title = title,
-                    count = value,
-                    onClick = onItemClick
             )
-            } else {
-                HourItemView(
-                    modifier = modifier,
-                    title = title,
-                    hour = value,
-                    onClick = onItemClick
-                )
-            }
 
             if (i < lifeTimeTypes.size -1) {
                 HorizontalDivider(

app/src/main/java/com/laseroptek/raman/ui/screens/home/dcd/DcdSettingPopup.kt

@@ -334,7 +334,7 @@ fun DcdSettingPopup(
                         modifier = Modifier
                             .fillMaxHeight()
                             .size(40.px.dp, 210.px.dp),
-                        chargeRate = gasChargeRate.toInt()
+                        chargeRate = gasChargeRate
                     )
 
                     // Icon

app/src/main/java/com/laseroptek/raman/ui/screens/home/dcd/GradientSlider.kt

@@ -28,14 +28,26 @@ import com.laseroptek.raman.ui.screens.main.MainViewModel
 import com.laseroptek.raman.utils.DefaultDispatcherProvider
 import com.laseroptek.raman.utils.ext.px
 import timber.log.Timber
+import kotlin.math.abs
+import kotlin.math.ceil
 
 
 @Composable
 fun GradientSlider(
     modifier: Modifier = Modifier,
-    chargeRate: Int = 0, // Value from (0 .. 100)
+    chargeRate: Float = 0f,
 ) {
-    val chargeIndex = ((chargeRate.coerceIn(0, 100) + 4) / 5).toInt()   // 0..19
+    val normalizedRate = chargeRate.coerceIn(0f, 100f)
+    val bucket = normalizedRate / 5f
+    val remainder = normalizedRate % 5f
+    val isExactMultiple = abs(remainder) < 0.0001f
+
+    val chargeIndex = when {
+        normalizedRate == 0f -> -1
+        isExactMultiple -> (bucket - 1f).toInt().coerceAtLeast(-1)
+        else -> (ceil(bucket.toDouble()).toInt() - 1)
+    }.coerceIn(-1, 19)
+
     Timber.d("chargeRate: $chargeRate, chargeIndex: $chargeIndex")
 
     Box(
@@ -103,6 +115,6 @@ fun GradientSliderPreview(
         //mainViewModel = mainViewModel
         modifier = Modifier
             .size(40.px.dp, 210.px.dp),
-        chargeRate =  20
+        chargeRate = 20f
     )
 }