Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 21:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix navigator to ensure we don't end up with a weird backstack.

Browse Source
This commit is contained in:
Alex Hart
2025-09-12 11:04:48 -03:00
committed by Greyson Parrelli
parent bf3135b2d0
commit 53a6b0c719
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
View File

@@ -347,13 +347,17 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
val mutableInteractionSource = remember { MutableInteractionSource() }
LaunchedEffect(mainNavigationDetailLocation) {
println("Detail Location Changed pane:${wrappedNavigator.currentDestination?.pane}")
if (paneExpansionState.currentAnchor == listOnlyAnchor && wrappedNavigator.currentDestination?.pane == ThreePaneScaffoldRole.Primary) {
println("Animate detail")
paneExpansionState.animateTo(detailOnlyAnchor)
}
}
LaunchedEffect(mainNavigationState.currentListLocation) {
println("List Location Changed pane:${wrappedNavigator.currentDestination?.pane}")
if (paneExpansionState.currentAnchor == detailOnlyAnchor && wrappedNavigator.currentDestination?.pane == ThreePaneScaffoldRole.Secondary) {
println("Animate list")
paneExpansionState.animateTo(listOnlyAnchor)
}
}

25
app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationViewModel.kt
View File

@@ -144,7 +144,20 @@ class MainNavigationViewModel(
}
navigatorScope?.launch {
navigator?.navigateTo(focusedPane)
val currentPane: ThreePaneScaffoldRole = navigator?.currentDestination?.pane ?: return@launch
if (currentPane == focusedPane) {
return@launch
}
if (currentPane == ThreePaneScaffoldRole.Secondary) {
navigator?.navigateTo(focusedPane)
} else {
navigator?.navigateBack()
if (navigator?.currentDestination == null) {
navigator?.navigateTo(ThreePaneScaffoldRole.Secondary)
}
}
}
}
@@ -169,7 +182,15 @@ class MainNavigationViewModel(
}
navigatorScope?.launch {
navigator?.navigateTo(ThreePaneScaffoldRole.Secondary)
val currentPane = navigator?.currentDestination?.pane ?: return@launch
if (currentPane == ThreePaneScaffoldRole.Secondary) {
return@launch
} else {
navigator?.navigateBack()
if (navigator?.currentDestination == null) {
navigator?.navigateTo(ThreePaneScaffoldRole.Secondary)
}
}
}
}