From 02575a917b737d2a9ee82c753edca894a8c85176 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 7 Jun 2023 02:05:14 +0530 Subject: [PATCH] fix(android): check for previous back stack entry --- .../main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt index c135de94..71b640c9 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt @@ -138,7 +138,10 @@ fun LobstersApp( topBar = { ClawAppBar( navigationIcon = { - if (navItems.none { it.route == currentDestination }) { + if ( + navController.previousBackStackEntry != null && + navItems.none { it.route == currentDestination } + ) { IconButton( onClick = { if (!navController.popBackStack()) context.getActivity()?.finish() } ) {