meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix/2207 node details respects units (#2374)

Browse source
This commit is contained in:
DaneEvans 2025-07-07 23:57:34 +10:00 • committed by GitHub
parent 43503cd0ce
commit a832ed50c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/ui/node/NodeDetail.kt
View file

@ -145,6 +145,7 @@ import com.geeksville.mesh.util.formatAgo
import com.geeksville.mesh.util.formatUptime
import com.geeksville.mesh.util.thenIf
import com.geeksville.mesh.util.toDistanceString
import com.geeksville.mesh.util.toSmallDistanceString
import com.geeksville.mesh.util.toSpeedString
import kotlinx.coroutines.delay
import kotlin.time.Duration.Companion.milliseconds
@ -294,7 +295,7 @@ private fun NodeDetailList(
if (node.hasEnvironmentMetrics) {
PreferenceCategory(stringResource(R.string.environment))
EnvironmentMetrics(node, metricsState.isFahrenheit)
EnvironmentMetrics(node, metricsState.isFahrenheit, metricsState.displayUnits)
Spacer(modifier = Modifier.height(8.dp))
}
@ -732,6 +733,7 @@ private fun InfoCard(
private fun EnvironmentMetrics(
node: Node,
isFahrenheit: Boolean = false,
displayUnits: DisplayUnits,
) = with(node.environmentMetrics) {
FlowRow(
modifier = Modifier.fillMaxWidth(),
@ -799,7 +801,7 @@ private fun EnvironmentMetrics(
InfoCard(
icon = Icons.Default.Height,
text = stringResource(R.string.distance),
value = "%.0f mm".format(distance)
value = distance.toSmallDistanceString(displayUnits)
)
}
if (hasLux()) {
@ -815,7 +817,7 @@ private fun EnvironmentMetrics(
InfoCard(
icon = Icons.Outlined.Navigation,
text = stringResource(R.string.wind),
value = windSpeed.toSpeedString(),
value = windSpeed.toSpeedString(displayUnits),
rotateIcon = normalizedBearing.toFloat(),
)
}