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(Main): Simplify top-level destination check (#2458)

Browse source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
James Rich 2025-07-20 09:13:48 -05:00 • committed by GitHub
parent 206f23131b
commit 7a8e73542e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
app/src/main/java/com/geeksville/mesh/ui/Main.kt
View file

@ -111,7 +111,13 @@ enum class TopLevelDestination(@StringRes val label: Int, val icon: ImageVector,
;
companion object {
fun NavDestination.isTopLevel(): Boolean = entries.any { hasRoute(it.route::class) }
fun NavDestination.isTopLevel(): Boolean = listOf<Route>(
NodesRoutes.Nodes,
ContactsRoutes.Contacts,
MapRoutes.Map,
ChannelsRoutes.Channels,
ConnectionsRoutes.Connections,
).any { this.hasRoute(it::class) }
fun fromNavDestination(destination: NavDestination?): TopLevelDestination? = entries
.find { dest -> destination?.hierarchy?.any { it.hasRoute(dest.route::class) } == true }
@ -378,7 +384,6 @@ private fun MainAppBar(
val backStackEntry by navController.currentBackStackEntryAsState()
val currentDestination = backStackEntry?.destination
val canNavigateBack = navController.previousBackStackEntry != null
val isTopLevelRoute = currentDestination?.isTopLevel() == true
val navigateUp: () -> Unit = navController::navigateUp
if (currentDestination?.hasRoute<ContactsRoutes.Messages>() == true) {
return
@ -389,7 +394,7 @@ private fun MainAppBar(
TopAppBar(
title = {
val title = when {
currentDestination == null || isTopLevelRoute -> stringResource(id = R.string.app_name)
currentDestination == null || currentDestination.isTopLevel() -> stringResource(id = R.string.app_name)
currentDestination.hasRoute<Route.DebugPanel>() -> stringResource(id = R.string.debug_panel)
@ -420,7 +425,7 @@ private fun MainAppBar(
}
},
modifier = modifier,
navigationIcon = if (canNavigateBack && !isTopLevelRoute) {
navigationIcon = if (canNavigateBack && currentDestination?.isTopLevel() == false) {
{
IconButton(onClick = navigateUp) {
Icon(
@ -447,7 +452,6 @@ private fun MainAppBar(
viewModel = viewModel,
currentDestination = currentDestination,
isManaged = isManaged,
isTopLevelRoute = isTopLevelRoute,
onAction = onAction
)
},
@ -459,7 +463,6 @@ private fun TopBarActions(
viewModel: UIViewModel = hiltViewModel(),
currentDestination: NavDestination?,
isManaged: Boolean,
isTopLevelRoute: Boolean,
onAction: (Any?) -> Unit
) {
val ourNode by viewModel.ourNodeInfo.collectAsStateWithLifecycle()
@ -474,17 +477,19 @@ private fun TopBarActions(
)
}
}
when {
currentDestination == null || isTopLevelRoute ->
MainMenuActions(isManaged, onAction)
currentDestination?.let {
when {
it.isTopLevel() ->
MainMenuActions(isManaged, onAction)
currentDestination.hasRoute<Route.DebugPanel>() ->
DebugMenuActions()
currentDestination.hasRoute<Route.DebugPanel>() ->
DebugMenuActions()
currentDestination.hasRoute<RadioConfigRoutes.RadioConfig>() ->
RadioConfigMenuActions(viewModel = viewModel)
currentDestination.hasRoute<RadioConfigRoutes.RadioConfig>() ->
RadioConfigMenuActions(viewModel = viewModel)
else -> {}
else -> {}
}
}
}