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

feat: Always Display voltage (#3362)

Browse source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
James Rich 2025-10-06 16:31:43 -05:00 • committed by GitHub
parent c98e74d804
commit 6a71891790
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/geeksville/mesh/ui/connections/components/CurrentlyConnectedInfo.kt
View file

@ -62,7 +62,7 @@ fun CurrentlyConnectedInfo(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
) {
MaterialBatteryInfo(level = node.batteryLevel)
MaterialBatteryInfo(level = node.batteryLevel, voltage = node.voltage)
if (bluetoothRssi != null) {
MaterialBluetoothSignalInfo(rssi = bluetoothRssi)
}

6
core/ui/src/main/kotlin/org/meshtastic/core/ui/component/MaterialBatteryInfo.kt
View file

@ -117,14 +117,16 @@ fun MaterialBatteryInfo(modifier: Modifier = Modifier, level: Int?, voltage: Flo
color = MaterialTheme.colorScheme.onSurface,
style = MaterialTheme.typography.labelMedium,
)
voltage?.let {
}
voltage
?.takeIf { it > 0 }
?.let {
Text(
text = "%.2fV".format(it),
color = MaterialTheme.colorScheme.onSurface,
style = MaterialTheme.typography.labelMedium,
)
}
}
}
}