mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2025-12-24 00:07:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: back button respects navigation history in detail screens (#3956)

Browse Source
This commit is contained in:
Mac DeCourcy
2025-12-10 09:11:48 -08:00
committed by GitHub
parent ea26d09bc0
commit 6e280417b5
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/geeksville/mesh/ui/contact/AdaptiveContactsScreen.kt
View File

@@ -41,6 +41,7 @@ import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.navigation.NavDestination.Companion.hasRoute
import androidx.navigation.NavHostController
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.launch
@@ -69,7 +70,17 @@ fun AdaptiveContactsScreen(
val backNavigationBehavior = BackNavigationBehavior.PopUntilScaffoldValueChange
BackHandler(enabled = navigator.currentDestination?.pane == ListDetailPaneScaffoldRole.Detail) {
scope.launch { navigator.navigateBack(backNavigationBehavior) }
// Check if we navigated here from another screen (e.g., from Nodes or Map)
val previousEntry = navController.previousBackStackEntry
val isFromDifferentGraph = previousEntry?.destination?.hasRoute<ContactsRoutes.ContactsGraph>() == false
if (isFromDifferentGraph) {
// Navigate back via NavController to return to the previous screen
navController.navigateUp()
} else {
// Close the detail pane within the adaptive scaffold
scope.launch { navigator.navigateBack(backNavigationBehavior) }
}
}
LaunchedEffect(initialContactKey) {

14
app/src/main/java/com/geeksville/mesh/ui/node/AdaptiveNodeListScreen.kt
View File

@@ -42,10 +42,12 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.unit.dp
import androidx.navigation.NavDestination.Companion.hasRoute
import androidx.navigation.NavHostController
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.launch
import org.jetbrains.compose.resources.stringResource
import org.meshtastic.core.navigation.NodesRoutes
import org.meshtastic.core.strings.Res
import org.meshtastic.core.strings.nodes
import org.meshtastic.core.ui.component.ScrollToTopEvent
@@ -68,7 +70,17 @@ fun AdaptiveNodeListScreen(
val backNavigationBehavior = BackNavigationBehavior.PopUntilScaffoldValueChange
BackHandler(enabled = navigator.currentDestination?.pane == ListDetailPaneScaffoldRole.Detail) {
scope.launch { navigator.navigateBack(backNavigationBehavior) }
// Check if we navigated here from another screen (e.g., from Messages or Map)
val previousEntry = navController.previousBackStackEntry
val isFromDifferentGraph = previousEntry?.destination?.hasRoute<NodesRoutes.NodesGraph>() == false
if (isFromDifferentGraph) {
// Navigate back via NavController to return to the previous screen
navController.navigateUp()
} else {
// Close the detail pane within the adaptive scaffold
scope.launch { navigator.navigateBack(backNavigationBehavior) }
}
}
LaunchedEffect(initialNodeId) {

2
core/proto/src/main/proto

Submodule core/proto/src/main/proto updated: 4095e59890...52fa252f1e