mirror of
https://github.com/meshtastic/Meshtastic-Android.git
synced 2026-02-07 06:12:56 -05:00
Refactor: Navigate to NodeDetail with singleTop (#2223)
This commit is contained in:
@@ -271,11 +271,17 @@ fun MainScreen(
|
||||
}
|
||||
} else if (action is NodeMenuAction) {
|
||||
when (action) {
|
||||
is NodeMenuAction.MoreDetails -> navController.navigate(
|
||||
NodesRoutes.NodeDetail(
|
||||
action.node.num
|
||||
is NodeMenuAction.MoreDetails -> {
|
||||
navController.navigate(
|
||||
NodesRoutes.NodeDetail(
|
||||
action.node.num
|
||||
),
|
||||
{
|
||||
launchSingleTop = true
|
||||
restoreState = true
|
||||
}
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
is NodeMenuAction.Share -> sharedContact = action.node
|
||||
else -> {}
|
||||
@@ -458,12 +464,14 @@ private fun TopBarActions(
|
||||
val ourNode by viewModel.ourNodeInfo.collectAsStateWithLifecycle()
|
||||
val isConnected by viewModel.isConnected.collectAsStateWithLifecycle(false)
|
||||
AnimatedVisibility(ourNode != null) {
|
||||
NodeChip(
|
||||
node = ourNode!!,
|
||||
isThisNode = true,
|
||||
isConnected = isConnected,
|
||||
onAction = onAction
|
||||
)
|
||||
ourNode?.let {
|
||||
NodeChip(
|
||||
node = it,
|
||||
isThisNode = true,
|
||||
isConnected = isConnected,
|
||||
onAction = onAction
|
||||
)
|
||||
}
|
||||
}
|
||||
when {
|
||||
currentDestination == null || isTopLevelRoute ->
|
||||
|
||||
Reference in New Issue
Block a user