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,

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(