nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/main' into claude/audio-rooms-android-ui-PIpFN

Browse Source
This commit is contained in:
Claude
2026-04-27 19:00:48 +00:00
parent 3e19651d22 09f653950e
commit befa13d797
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/Nav.kt
+6 -1
View File
@@ -24,6 +24,7 @@ import android.annotation.SuppressLint
import androidx.compose.material3.DrawerState import androidx.compose.material3.DrawerState
import androidx.compose.material3.DrawerValue import androidx.compose.material3.DrawerValue
import androidx.compose.runtime.Stable import androidx.compose.runtime.Stable
import androidx.navigation.NavGraph.Companion.findStartDestination
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import com.vitorpamplona.amethyst.ui.navigation.SKIP_SLIDE_ANIMATION_KEY import com.vitorpamplona.amethyst.ui.navigation.SKIP_SLIDE_ANIMATION_KEY
import com.vitorpamplona.amethyst.ui.navigation.routes.Route import com.vitorpamplona.amethyst.ui.navigation.routes.Route
@@ -78,7 +79,11 @@ class Nav(
override fun navBottomBar(route: Route) { override fun navBottomBar(route: Route) {
navigationScope.launch { navigationScope.launch {
controller.navigate(route) { controller.navigate(route) {
popUpTo(route) { // Clear the back stack down to and including the graph's start
// destination so a bottom-nav tap leaves only the new route in
// the stack. Without inclusive=true, Home would remain below
// the new tab and canPop() would wrongly show a back arrow.
popUpTo(controller.graph.findStartDestination().id) {
inclusive = true inclusive = true
} }
launchSingleTop = true launchSingleTop = true