From 8a024c50722e8d3df2622042b96dde90c0321691 Mon Sep 17 00:00:00 2001 From: wjdrjs00 Date: Thu, 18 Sep 2025 19:19:52 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Refactor:=20=EC=A4=91=EB=B3=B5=20=EB=84=A4?= =?UTF-8?q?=EB=B9=84=EA=B2=8C=EC=9D=B4=EC=85=98=20=EB=B0=A9=EC=A7=80?= =?UTF-8?q?=EB=A5=BC=20=EC=9C=84=ED=95=9C=20=EB=A1=9C=EC=A7=81=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../navigation/home/HomeBottomNavigationBar.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeBottomNavigationBar.kt b/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeBottomNavigationBar.kt index 7c480e6c..06d42da1 100644 --- a/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeBottomNavigationBar.kt +++ b/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeBottomNavigationBar.kt @@ -30,6 +30,7 @@ fun HomeBottomNavigationBar( navController: NavController, ) { val navBackStackEntry by navController.currentBackStackEntryAsState() + val currentRoute = navBackStackEntry?.destination?.route Column { HorizontalDivider( @@ -52,11 +53,15 @@ fun HomeBottomNavigationBar( icon = homeRoute.icon, title = homeRoute.title, onClick = { - navController.navigate(homeRoute.route) { - popUpTo(0) { inclusive = true } + if (currentRoute != homeRoute.route) { + navController.navigate(homeRoute.route) { + popUpTo(0) { inclusive = true } + launchSingleTop = true + restoreState = true + } } }, - selected = navBackStackEntry?.destination?.route == homeRoute.route, + selected = currentRoute == homeRoute.route, ) } } From 79c5ad27262d47e38e30223fe66b4b5772717f9c Mon Sep 17 00:00:00 2001 From: wjdrjs00 Date: Thu, 18 Sep 2025 19:46:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Refactor:=20=EB=84=A4=EB=B9=84=EA=B2=8C?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=98=B5=EC=85=98=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bitnagil/navigation/home/HomeBottomNavigationBar.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeBottomNavigationBar.kt b/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeBottomNavigationBar.kt index 06d42da1..b7ace86d 100644 --- a/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeBottomNavigationBar.kt +++ b/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeBottomNavigationBar.kt @@ -56,8 +56,6 @@ fun HomeBottomNavigationBar( if (currentRoute != homeRoute.route) { navController.navigate(homeRoute.route) { popUpTo(0) { inclusive = true } - launchSingleTop = true - restoreState = true } } },