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: connections ui and unmessageable logic (#2016)

Browse source
This commit is contained in:
James Rich 2025-06-04 06:53:22 -05:00 • committed by GitHub
parent b7f5ba78b7
commit 3216559035
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 39 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,19 +63,19 @@ fun NodeChip(
),
label = {
Text(
modifier = Modifier.Companion
modifier = Modifier
.fillMaxWidth(),
text = node.user.shortName.ifEmpty { "???" },
fontSize = MaterialTheme.typography.labelLarge.fontSize,
textDecoration = TextDecoration.Companion.LineThrough.takeIf { isIgnored },
textAlign = TextAlign.Companion.Center,
textDecoration = TextDecoration.LineThrough.takeIf { isIgnored },
textAlign = TextAlign.Center,
)
},
onClick = {},
interactionSource = inputChipInteractionSource,
)
Box(
modifier = Modifier.Companion
modifier = Modifier
.matchParentSize()
.combinedClickable(
onClick = { onAction(NodeMenuAction.MoreDetails(node)) },

7
app/src/main/java/com/geeksville/mesh/ui/node/components/NodeItem.kt
View file

@ -49,7 +49,6 @@ import com.geeksville.mesh.ConfigProtos.Config.DeviceConfig
import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig
import com.geeksville.mesh.MeshProtos
import com.geeksville.mesh.R
import com.geeksville.mesh.model.DeviceVersion
import com.geeksville.mesh.model.Node
import com.geeksville.mesh.model.isUnmessageableRole
import com.geeksville.mesh.ui.common.components.BatteryInfo
@ -101,11 +100,7 @@ fun NodeItem(
val unmessageable = remember(thatNode) {
when {
thatNode.user.hasIsUnmessagable() -> thatNode.user.isUnmessagable
thatNode.user.role.isUnmessageableRole() ->
thatNode.metadata?.firmwareVersion?.let {
DeviceVersion(it) < DeviceVersion("2.6.8")
} ?: true
else -> false
else -> thatNode.user.role.isUnmessageableRole()
}
}