Skip to content

fix: stabilize traceroute map node identity & fix log metric alignment #6270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamesarich merged 2 commits into from
Jul 15, 2026
Merged

fix: stabilize traceroute map node identity & fix log metric alignment #6270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5eea521
🐛 fix: stabilize traceroute map node identity and fix log metric alig…
jamesarich Jul 14, 2026
b06bed5
🐛 fix: include all NodeChip inputs in traceroute marker keys
jamesarich Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions androidApp/src/google/kotlin/org/meshtastic/app/map/MapView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,8 +1262,24 @@ private fun TracerouteMapContent(
)
}
displayNodes.forEach { node ->
val markerState = rememberUpdatedMarkerState(position = node.position.toLatLng())
MarkerComposable(state = markerState, zIndex = 4f) { NodeChip(node = node) }
// Key by the stable node num so each marker's composition state (and MarkerComposable's cached
// icon bitmap) stays bound to its node. Without this, reordering displayNodes between reloads
// reuses marker slots positionally and swaps node labels/positions (#6197). The remaining keys
// are every NodeChip input (short name, colors, ignored strike-through) so the rendered chip
// bitmap refreshes when node metadata changes.
key(node.num) {
val markerState = rememberUpdatedMarkerState(position = node.position.toLatLng())
MarkerComposable(
node.num,
node.user.short_name,
node.colors,
node.isIgnored,
state = markerState,
zIndex = 4f,
) {
NodeChip(node = node)
}
}
Comment thread
jamesarich marked this conversation as resolved.
}
}

Expand Down
7 changes: 5 additions & 2 deletions feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/TracerouteLog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
Expand Down Expand Up @@ -267,10 +268,12 @@ private fun TracerouteCardContent(time: String, summaryText: String, icon: Image
private fun TracerouteCardMetrics(point: TraceroutePoint) {
if (point.forwardHops == null && point.returnHops == null && point.roundTripSeconds == null) return
Spacer(modifier = Modifier.height(4.dp))
Row(
// FlowRow so the three metric labels wrap onto additional lines when they don't fit the card width
// (e.g. long translated strings), rather than the last item being crushed and wrapped per character (#5743).
FlowRow(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(12.dp),
verticalAlignment = Alignment.CenterVertically,
verticalArrangement = Arrangement.spacedBy(4.dp),
) {
point.forwardHops?.let { hops ->
Row(verticalAlignment = Alignment.CenterVertically) {
Expand Down