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

refactor(ui)!: update NodeItem display with new components (#3273)

Browse source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
James Rich 2025-10-01 14:31:08 -05:00 • committed by GitHub
parent a3009c9c84
commit 0847598d38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 536 additions and 306 deletions
Download patch file Download diff file Expand all files Collapse all files

18
core/database/src/main/kotlin/org/meshtastic/core/database/model/Node.kt
View file

@ -119,7 +119,7 @@ data class Node(
fun gpsString(): String = GPSFormat.toDec(latitude, longitude)
private fun EnvironmentMetrics.getDisplayString(isFahrenheit: Boolean): String {
private fun EnvironmentMetrics.getDisplayStrings(isFahrenheit: Boolean): List<String> {
val temp =
if (temperature != 0f) {
if (isFahrenheit) {
@ -152,15 +152,23 @@ data class Node(
val current = if (current != 0f) "%.1fmA".format(current) else null
val iaq = if (iaq != 0) "IAQ: $iaq" else null
return listOfNotNull(temp, humidity, soilTemperatureStr, soilMoisture, voltage, current, iaq).joinToString(" ")
return listOfNotNull(
paxcounter.getDisplayString(),
temp,
humidity,
soilTemperatureStr,
soilMoisture,
voltage,
current,
iaq,
)
}
private fun PaxcountProtos.Paxcount.getDisplayString() =
"PAX: ${ble + wifi} (B:$ble/W:$wifi)".takeIf { ble != 0 || wifi != 0 }
fun getTelemetryString(isFahrenheit: Boolean = false): String =
listOfNotNull(paxcounter.getDisplayString(), environmentMetrics.getDisplayString(isFahrenheit))
.joinToString(" ")
fun getTelemetryStrings(isFahrenheit: Boolean = false): List<String> =
environmentMetrics.getDisplayStrings(isFahrenheit)
}
fun ConfigProtos.Config.DeviceConfig.Role?.isUnmessageableRole(): Boolean = this in