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