From 00f2ec73d5eeb2bf65aa3813be3ef1e2aa3d8097 Mon Sep 17 00:00:00 2001 From: areumwoo Date: Mon, 2 Mar 2026 15:22:47 +0900 Subject: [PATCH 1/2] =?UTF-8?q?LifeTimeView=20Count/Hour=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../raman/ui/screens/engineer/HourItemView.kt | 4 +- .../raman/ui/screens/engineer/LifeTimeView.kt | 49 ++++++++++++------- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/HourItemView.kt b/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/HourItemView.kt index 7e2d3c1..81c8dd3 100644 --- a/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/HourItemView.kt +++ b/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" ) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/LifeTimeView.kt b/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/LifeTimeView.kt index 86133b5..86b7272 100644 --- a/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/LifeTimeView.kt +++ b/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( - 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) - } - ) + 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 + ) + } if (i < lifeTimeTypes.size -1) { HorizontalDivider( @@ -108,4 +121,4 @@ fun LifeTimeView( @Composable fun PreviewLifeTimeView() { LifeTimeView() -} \ No newline at end of file +} From 2099f4d17806e8acac0ad4df42d4d0c8fab46b5e Mon Sep 17 00:00:00 2001 From: StevenBuzzi Date: Tue, 3 Mar 2026 14:44:09 +0900 Subject: [PATCH 2/2] 1. Modified the range of applied item 2. Adjust padding @ Life Time, Temp --- .../laseroptek/raman/ui/screens/engineer/LifeTimeView.kt | 8 ++++---- .../raman/ui/screens/engineer/TemperatureView.kt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/LifeTimeView.kt b/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/LifeTimeView.kt index 86b7272..e45ab1d 100644 --- a/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/LifeTimeView.kt +++ b/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/LifeTimeView.kt @@ -32,11 +32,11 @@ fun LifeTimeView( ) { Column(modifier = Modifier //.noRippleClickable(onClick = onClick) - .size(388.px.dp, 276.px.dp) + .size(388.px.dp, 258.px.dp) .clip(RoundedCornerShape(12.px.dp)) .border(width = 1.px.dp, color = Color(209, 209, 209), shape = RoundedCornerShape(10.px.dp)) .background(Color.White) - .padding(16.px.dp), + .padding(3.px.dp, 16.px.dp), verticalArrangement = Arrangement.SpaceEvenly, horizontalAlignment = Alignment.CenterHorizontally ) { @@ -55,7 +55,7 @@ fun LifeTimeView( ), ) - Spacer(modifier = Modifier.height(10.px.dp)) + Spacer(modifier = Modifier.height(2.px.dp)) // Temp 0..7 for (i in 0..lifeTimeTypes.size -1) { @@ -84,7 +84,7 @@ fun LifeTimeView( onClick.invoke(i) } - if (i <= 4) { + if (i <= 5) { CountItemView( modifier = modifier, title = title, diff --git a/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/TemperatureView.kt b/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/TemperatureView.kt index a47bb5c..08db578 100644 --- a/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/TemperatureView.kt +++ b/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/TemperatureView.kt @@ -42,7 +42,7 @@ fun TemperatureView( .clip(RoundedCornerShape(12.px.dp)) .border(width = 1.px.dp, color = Color(209, 209, 209), shape = RoundedCornerShape(10.px.dp)) .background(Color.White) - .padding(16.px.dp), + .padding(3.px.dp, 16.px.dp), verticalArrangement = Arrangement.SpaceEvenly, horizontalAlignment = Alignment.CenterHorizontally ) {