Skip to content

Commit c1b6fb1

Browse files
committed
Handle display of text and user input types in MeasurementDetailScreen
1 parent e5785de commit c1b6fb1

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

android_app/app/src/main/java/com/health/openscale/ui/screen/overview/MeasurementDetailScreen.kt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -570,14 +570,10 @@ fun MeasurementValueEditRow(
570570
Spacer(modifier = Modifier.width(12.dp))
571571
Column(modifier = Modifier.weight(1f)) {
572572
Text(text = type.getDisplayName(context), style = MaterialTheme.typography.bodyLarge)
573-
val displayText = if (type.inputType == InputFieldType.FLOAT || type.inputType == InputFieldType.INT) {
574-
if (type.unit != UnitType.NONE) {
575-
LocaleUtils.formatValueForDisplay(value, type.unit)
576-
} else {
577-
"" // No unit if UnitType.NONE
578-
}
579-
} else {
580-
"" // No unit for non-numeric types
573+
val displayText = when (type.inputType) {
574+
InputFieldType.FLOAT, InputFieldType.INT -> LocaleUtils.formatValueForDisplay(value, type.unit)
575+
InputFieldType.TEXT, InputFieldType.USER, InputFieldType.DATE, InputFieldType.TIME -> value
576+
else -> ""
581577
}
582578
Text(
583579
text = displayText,

0 commit comments

Comments
 (0)