steven/raman
1
1
Fork 0
Code Issues 20 Pull Requests 1 Actions Packages Releases Wiki Activity

LifeTimeView Count/Hour 분리 #39

Merged
steven merged 2 commits from feature/ISSUE-38 into develop 2026-03-03 06:23:36 +00:00
Conversation 0 Commits 2 Files Changed 3 +5 -5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2099f4d178 - Show all commits

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

@@ -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,

2
app/src/main/java/com/laseroptek/raman/ui/screens/engineer/TemperatureView.kt
View File

@@ -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
) {