From 458b2f2fe17eff1e7ba8d576d39a985a96d4433a Mon Sep 17 00:00:00 2001 From: Dane Evans Date: Sat, 27 Dec 2025 23:37:48 +1100 Subject: [PATCH] fix unstaged file for altitude on compass (#4074) --- .../node/component/CompassBottomSheet.kt | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/CompassBottomSheet.kt b/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/CompassBottomSheet.kt index cadf61a7b..ecf650789 100644 --- a/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/CompassBottomSheet.kt +++ b/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/CompassBottomSheet.kt @@ -68,6 +68,7 @@ import org.meshtastic.core.strings.compass_no_magnetometer import org.meshtastic.core.strings.compass_title import org.meshtastic.core.strings.compass_uncertainty import org.meshtastic.core.strings.compass_uncertainty_unknown +import org.meshtastic.core.strings.elevation_suffix import org.meshtastic.core.strings.exchange_position import org.meshtastic.core.strings.last_position_update import org.meshtastic.core.ui.theme.AppTheme @@ -121,14 +122,27 @@ fun CompassSheetContent( ?: stringResource(Res.string.compass_bearing_na), style = MaterialTheme.typography.bodyLarge, ) - Text( - text = - uiState.errorRadiusText?.let { radius -> - val angle = uiState.angularErrorDeg?.let { "%.0f°".format(it) } ?: "?" - stringResource(Res.string.compass_uncertainty, radius, angle) - } ?: stringResource(Res.string.compass_uncertainty_unknown), - style = MaterialTheme.typography.bodyMedium, - ) + Row( + horizontalArrangement = Arrangement.spacedBy(8.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = + uiState.errorRadiusText?.let { radius -> + val angle = uiState.angularErrorDeg?.let { "%.0f°".format(it) } ?: "?" + stringResource(Res.string.compass_uncertainty, radius, angle) + } ?: stringResource(Res.string.compass_uncertainty_unknown), + style = MaterialTheme.typography.bodyMedium, + ) + uiState.targetAltitude?.let { altitude -> + ElevationInfo( + altitude = altitude, + system = uiState.displayUnits, + suffix = stringResource(Res.string.elevation_suffix), + contentColor = MaterialTheme.colorScheme.onSurface, + ) + } + } } }