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 e6f6ca8..13b9e0e 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 @@ -5,6 +5,7 @@ import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth @@ -13,15 +14,19 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import com.laseroptek.raman.const.temperatureTypes import com.laseroptek.raman.data.model.serial.Temperature +import com.laseroptek.raman.ui.theme.RobotoTypography import com.laseroptek.raman.utils.ext.px import timber.log.Timber @@ -58,6 +63,32 @@ fun TemperatureView( Spacer(modifier = Modifier.height(10.px.dp)) + Row( + modifier = Modifier + .fillMaxWidth() + .padding(start = 20.px.dp, end = 20.px.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Spacer(modifier = Modifier.weight(1.5f)) + Text( + modifier = Modifier.weight(1f), + text = "Read", + style = RobotoTypography.labelMedium, + fontSize = 12.px.sp, + color = Color.Black, + textAlign = TextAlign.End + ) + Text( + modifier = Modifier.weight(1f), + text = "Write", + style = RobotoTypography.labelMedium, + fontSize = 12.px.sp, + color = Color.Black, + textAlign = TextAlign.End + ) + Spacer(modifier = Modifier.weight(1f)) + } + // Tempearture for (i in 0..temperatureTypes.size -1) { val count1Value = when (i) { @@ -116,4 +147,4 @@ fun TemperatureView( @Composable fun PreviewSerialNumber() { TemperatureView() -} \ No newline at end of file +} diff --git a/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/TwoCountItemView.kt b/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/TwoCountItemView.kt index 612009c..16de10f 100644 --- a/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/TwoCountItemView.kt +++ b/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/TwoCountItemView.kt @@ -75,25 +75,6 @@ fun TwoCountItemView( ) } - Column( - modifier = Modifier - .fillMaxWidth() - .weight(1f) - .height(30.px.dp), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.Start - ) { - Text( - modifier = Modifier.fillMaxWidth(), - text = "Read", - style = RobotoTypography.bodyMedium, - fontWeight = FontWeight.Normal, - fontSize = 12.px.sp, - color = Color.Black, - textAlign = TextAlign.End - ) - } - Column( modifier = Modifier .fillMaxWidth() @@ -113,25 +94,6 @@ fun TwoCountItemView( ) } - Column( - modifier = Modifier - .fillMaxWidth() - .weight(1f) - .height(30.px.dp), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.Start - ) { - Text( - modifier = Modifier.fillMaxWidth(), - text = "Write", - style = RobotoTypography.bodyMedium, - fontWeight = FontWeight.Normal, - fontSize = 12.px.sp, - color = Color.Black, - textAlign = TextAlign.End - ) - } - Column( modifier = Modifier //.noRippleClickable(onClick = onDeviceOpTimeClick)