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: Nest NodeDetailScreen and related routes in a NodeDetailGraph (#2018)

Browse source
This commit is contained in:
James Rich 2025-06-04 09:33:23 -05:00 • committed by GitHub
parent 0645096e28
commit 858fb9dd4c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 43 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

75
app/src/main/java/com/geeksville/mesh/navigation/NodesGraph.kt
View file

@ -50,8 +50,12 @@ import kotlinx.serialization.Serializable
sealed class NodesRoutes {
@Serializable
data object Nodes : Route
@Serializable
data object NodesGraph : Graph
@Serializable
data object NodeDetailGraph : Graph
}
fun NavGraphBuilder.nodesGraph(
@ -72,50 +76,57 @@ fun NavGraphBuilder.nodesGraph(
},
)
}
nodeDetailRoutes(navController, uiViewModel)
nodeDetailGraph(navController, uiViewModel)
}
}
fun NavGraphBuilder.nodeDetailRoutes(
fun NavGraphBuilder.nodeDetailGraph(
navController: NavHostController,
uiViewModel: UIViewModel,
) {
composable<Route.NodeDetail> {
NodeDetailScreen(
uiViewModel = uiViewModel,
navigateToMessages = {
navController.navigate(Route.Messages(it))
},
onNavigate = {
navController.navigate(it)
},
viewModel = hiltViewModel(),
)
}
NodeDetailRoute.entries.forEach { nodeDetailRoute ->
composable(nodeDetailRoute.route::class) { backStackEntry ->
navigation<NodesRoutes.NodeDetailGraph>(
startDestination = Route.NodeDetail()
) {
composable<Route.NodeDetail> { backStackEntry ->
val parentEntry = remember(backStackEntry) {
navController.getBackStackEntry<NodesRoutes.NodesGraph>()
navController.getBackStackEntry<NodesRoutes.NodeDetailGraph>()
}
when (nodeDetailRoute) {
NodeDetailRoute.DEVICE -> DeviceMetricsScreen(hiltViewModel(parentEntry))
NodeDetailRoute.NODE_MAP -> NodeMapScreen(hiltViewModel(parentEntry))
NodeDetailRoute.POSITION_LOG -> PositionLogScreen(hiltViewModel(parentEntry))
NodeDetailRoute.ENVIRONMENT -> EnvironmentMetricsScreen(
hiltViewModel(
parentEntry
NodeDetailScreen(
uiViewModel = uiViewModel,
navigateToMessages = {
navController.navigate(Route.Messages(it))
},
onNavigate = {
navController.navigate(it)
},
viewModel = hiltViewModel(parentEntry),
)
}
NodeDetailRoute.entries.forEach { nodeDetailRoute ->
composable(nodeDetailRoute.route::class) { backStackEntry ->
val parentEntry = remember(backStackEntry) {
navController.getBackStackEntry<NodesRoutes.NodeDetailGraph>()
}
when (nodeDetailRoute) {
NodeDetailRoute.DEVICE -> DeviceMetricsScreen(hiltViewModel(parentEntry))
NodeDetailRoute.NODE_MAP -> NodeMapScreen(hiltViewModel(parentEntry))
NodeDetailRoute.POSITION_LOG -> PositionLogScreen(hiltViewModel(parentEntry))
NodeDetailRoute.ENVIRONMENT -> EnvironmentMetricsScreen(
hiltViewModel(
parentEntry
)
)
)
NodeDetailRoute.SIGNAL -> SignalMetricsScreen(hiltViewModel(parentEntry))
NodeDetailRoute.TRACEROUTE -> TracerouteLogScreen(
viewModel = hiltViewModel(
parentEntry
NodeDetailRoute.SIGNAL -> SignalMetricsScreen(hiltViewModel(parentEntry))
NodeDetailRoute.TRACEROUTE -> TracerouteLogScreen(
viewModel = hiltViewModel(
parentEntry
)
)
)
NodeDetailRoute.POWER -> PowerMetricsScreen(hiltViewModel(parentEntry))
NodeDetailRoute.HOST -> HostMetricsLogScreen(hiltViewModel(parentEntry))
NodeDetailRoute.POWER -> PowerMetricsScreen(hiltViewModel(parentEntry))
NodeDetailRoute.HOST -> HostMetricsLogScreen(hiltViewModel(parentEntry))
}
}
}
}