LifeTimeView Count/Hour 분리

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

@@ -31,7 +31,7 @@ fun HourItemView(
     modifier: Modifier = Modifier,
     hour: Int = 0,
     onClick: () -> Unit = {},
-    title:String = ""
+    title: String = ""
 ) {
     Row(modifier = modifier,
         horizontalArrangement = Arrangement.SpaceBetween,
@@ -129,4 +129,4 @@ fun PreviewHourItemView() {
             title = "Hour Item View"
         )
     }
-}
+}

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 hour = when (i) {
+            val value = when (i) {
                 0 -> lifeTime.lamp
                 1 -> lifeTime.hp5x5
                 2 -> lifeTime.hp7x7
@@ -70,22 +70,35 @@ fun LifeTimeView(
                 7 -> lifeTime.water
                 else -> 0
             }
-            HourItemView(
+            val modifier = Modifier
-                modifier = Modifier
+                .fillMaxSize()
-                    .fillMaxSize()
+                .weight(1f)
-                    .weight(1f)
+                .padding(
-                    .padding(
+                    start = 20.px.dp,
-                        start = 20.px.dp,
+                    end = 20.px.dp,
-                        end = 20.px.dp,
+                    //bottom = 10.px.dp
-                        //bottom = 10.px.dp
+                )
-                    ),
+            val title = lifeTimeTypes[i]
-                title = lifeTimeTypes[i],
+            val onItemClick = {
-                hour = hour,
+                Timber.d("onClick > Temp $i ($title)")
-                onClick = {
+                onClick.invoke(i)
-                    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(
@@ -108,4 +121,4 @@ fun LifeTimeView(
 @Composable
 fun PreviewLifeTimeView() {
     LifeTimeView()
-}
+}

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

@@ -35,7 +35,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import com.laseroptek.raman.const.LaserParameter
-import com.laseroptek.raman.const.LASER_STATUS
 import com.laseroptek.raman.const.LaserStatusType
 import com.laseroptek.raman.const.MAX_LASER_COUNT
 import com.laseroptek.raman.const.PresetButtonType
@@ -93,18 +92,10 @@ fun HomeScreen(
 
     val presetList by mainViewModel.presetList.collectAsState()
 
-    LaunchedEffect(lampCount, lifeTime.lamp, laserStatus.laserStatus) {
+    LaunchedEffect(Unit) {
         Timber.d("LaunchedEffect - HomeScreen")
         focusManager.clearFocus(force = true) // Hide the keyboard
 
-        // Ensure the system returns to StandBy when lamp thresholds are exceeded
-        val lampLifetimeLimit = lifeTime.lamp
-        val reachedLifetimeLimit = lampLifetimeLimit > 0 && lampCount >= lampLifetimeLimit
-        if (reachedLifetimeLimit && laserStatus.laserStatus != LASER_STATUS.STAND_BY) {
-            Timber.d("HomeScreen load - forcing StandBy state due to lamp count limit")
-            mainViewModel.txLaserStatusEntry(LASER_STATUS.STAND_BY)
-        }
-
         Timber.d("Attempted to hide keyboard on EngineerScreen launch")
     }
 
@@ -491,18 +482,6 @@ fun HomeScreen(
                             return@StandByButton
                         }
 
-                        val lampLifetimeLimit = lifeTime.lamp
-                        if (lampLifetimeLimit > 0 && lampCount >= lampLifetimeLimit) {
-                            Toast.makeText(
-                                context,
-                                "Lamp lifetime limit reached",
-                                Toast.LENGTH_SHORT
-                            ).show()
-                            return@StandByButton
-                        }
-
-
-
                         val hpCount = mainViewModel.getHPCount()
                         if (hpCount < 1) {
                             Toast.makeText(