프리셋 저장 버튼/로드 버튼 크기 조정

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 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
-                .fillMaxSize()
-                .weight(1f)
-                .padding(
-                    start = 20.px.dp,
-                    end = 20.px.dp,
-                    //bottom = 10.px.dp
-                )
-            val title = lifeTimeTypes[i]
-            val onItemClick = {
-                Timber.d("onClick > Temp $i ($title)")
-                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
-                )
-            }
+            HourItemView(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .weight(1f)
+                    .padding(
+                        start = 20.px.dp,
+                        end = 20.px.dp,
+                        //bottom = 10.px.dp
+                    ),
+                title = lifeTimeTypes[i],
+                hour = hour,
+                onClick = {
+                    Timber.d("onClick > Temp $i (${lifeTimeTypes[i]})")
+                    onClick.invoke(i)
+                }
+            )
 
             if (i < lifeTimeTypes.size -1) {
                 HorizontalDivider(
@@ -121,4 +108,4 @@ fun LifeTimeView(
 @Composable
 fun PreviewLifeTimeView() {
     LifeTimeView()
-}
+}

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

@@ -108,15 +108,15 @@ fun PresetIconButton(
         Image(
             painter = painterResource(id =
                 if (type == PresetButtonType.SAVE) {
-                    R.drawable.ic_preset_save
+                    R.drawable.ic_preset_save2
                 } else {
                     R.drawable.ic_preset_load
                 }
             ),
             contentDescription = "",
             modifier = Modifier
-                .size(20.px.dp),
-            contentScale = ContentScale.Crop
+                .size(30.px.dp),
+            contentScale = ContentScale.Fit
         )
     }
 }

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

@@ -552,12 +552,12 @@ fun PresetLoadPopup(
                     horizontalArrangement = Arrangement.Center,
                     verticalAlignment = Alignment.CenterVertically
                 ) {
-                    Spacer(Modifier.weight(1f))
-
                     if (isEditMode) {
                         ////////////////////////////////////////////////////
                         // Edit Mode
 
+                        Spacer(modifier = Modifier.width(10.px.dp))
+
                         // Preset Delete (Delete confirm popup)
                         Box(
                             modifier = Modifier
@@ -578,7 +578,7 @@ fun PresetLoadPopup(
                             )
                         }
 
-                        Spacer(Modifier.width(10.px.dp))
+                        Spacer(Modifier.weight(1f))
 
                         // Preset Cancel (Reload selected item from mainViewModel)
                         Box(
@@ -729,7 +729,11 @@ fun PresetLoadPopup(
                                 contentScale = ContentScale.Crop
                             )
                         }
+
+                        Spacer(modifier = Modifier.width(10.px.dp))
                     } else {
+                        Spacer(Modifier.weight(1f))
+
                         ////////////////////////////////////////////////////
                         // Select Mode - hide Keyboard
                         focusManager.clearFocus(force = true) // Hide the keyboard
@@ -790,6 +794,8 @@ fun PresetLoadPopup(
                                 contentScale = ContentScale.Crop
                             )
                         }
+
+                        Spacer(modifier = Modifier.width(10.px.dp))
                     }
                 }