From e78c7aba853d5a500cdb017b29dafb5deba68023 Mon Sep 17 00:00:00 2001 From: KotlinGeekDev Date: Fri, 20 Jan 2023 22:31:19 +0100 Subject: [PATCH] Fix navigation. --- .../amethyst/ui/navigation/AppBottomBar.kt | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt index c1a7470e1..342b7510f 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt @@ -47,10 +47,24 @@ fun AppBottomBar(navController: NavHostController) { selected = currentRoute == item.route, onClick = { if (currentRoute != item.route) { - navController.navigate(item.route) + navController.navigate(item.route){ + navController.graph.startDestinationRoute?.let { start -> + popUpTo(start) + restoreState = true + } + launchSingleTop = true + restoreState = true + } } else { // TODO: Make it scrool to the top - navController.navigate(item.route) + navController.navigate(item.route){ + navController.graph.startDestinationRoute?.let { start -> + popUpTo(start) + restoreState = true + } + launchSingleTop = true + restoreState = true + } } } )