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

Remove NodeChip long-click (#3220)

Browse source
This commit is contained in:
Phil Oliver 2025-09-29 10:31:55 -04:00 • committed by GitHub
parent 98ef72d240
commit 48a27ba022
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 248 additions and 588 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/google/java/com/geeksville/mesh/ui/map/MapView.kt
View file

@ -406,14 +406,7 @@ fun MapView(
val alpha = (index.toFloat() / (sortedPositions.size.toFloat() - 1))
val color = Color(focusedNode!!.colors.second).copy(alpha = alpha)
if (index == sortedPositions.lastIndex) {
MarkerComposable(state = markerState, zIndex = 1f) {
NodeChip(
node = focusedNode,
isThisNode = false,
isConnected = false,
onAction = {},
)
}
MarkerComposable(state = markerState, zIndex = 1f) { NodeChip(node = focusedNode) }
} else {
MarkerInfoWindowComposable(
state = markerState,

2
app/src/google/java/com/geeksville/mesh/ui/map/components/ClusterItemsListDialog.kt
View file

@ -59,7 +59,7 @@ fun ClusterItemsListDialog(
@Composable
private fun ClusterDialogListItem(item: NodeClusterItem, onClick: () -> Unit, modifier: Modifier = Modifier) {
ListItem(
leadingContent = { NodeChip(node = item.node, enabled = false, isThisNode = false, isConnected = false) {} },
leadingContent = { NodeChip(node = item.node) },
headlineContent = { Text(item.nodeTitle) },
supportingContent = {
if (item.nodeSnippet.isNotBlank()) {

4
app/src/google/java/com/geeksville/mesh/ui/map/components/NodeClusterMarkers.kt
View file

@ -63,8 +63,6 @@ fun NodeClusterMarkers(
navigateToNodeDetails(item.node.num)
false
},
clusterItemContent = { clusterItem ->
NodeChip(node = clusterItem.node, enabled = false, isThisNode = false, isConnected = false) {}
},
clusterItemContent = { clusterItem -> NodeChip(node = clusterItem.node) },
)
}

4
app/src/google/java/com/geeksville/mesh/ui/node/NodeMap.kt
View file

@ -44,19 +44,17 @@ fun NodeMapScreen(
val positions = state.positionLogs
val destNum = state.node?.num
val ourNodeInfo by uiViewModel.ourNodeInfo.collectAsStateWithLifecycle()
val isConnected by uiViewModel.isConnectedStateFlow.collectAsStateWithLifecycle()
Scaffold(
topBar = {
MainAppBar(
title = state.node?.user?.longName ?: "",
ourNode = ourNodeInfo,
isConnected = isConnected,
showNodeChip = false,
canNavigateUp = true,
onNavigateUp = navController::navigateUp,
actions = {},
onAction = {},
onClickChip = {},
)
},
) { paddingValues ->