Merge pull request #243 from kisa002/fix/prevent-multiple-click

[Bug] 버튼 연타 시 중복 호출 이슈 수정
droidknights · Sep 4, 2023 · 7ad3e27 · 7ad3e27
2 parents e37a531 + 7d98e2b
commit 7ad3e27
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/...ignsystem/src/main/java/com/droidknights/app2023/core/designsystem/component/TopAppBar.kt b/...ignsystem/src/main/java/com/droidknights/app2023/core/designsystem/component/TopAppBar.kt
@@ -20,6 +20,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -55,6 +56,7 @@ fun KnightsTopAppBar(
             modifier = Modifier
                 .fillMaxWidth()
                 .background(containerColor)
+                .pointerInput(Unit) { /* no-op */ }
                 .then(modifier)
         ) {
             if (navigationType == TopAppBarNavigationType.Back) {

diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainNavigator.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainNavigator.kt
@@ -10,6 +10,7 @@ import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navOptions
 import com.droidknights.app2023.feature.bookmark.navigation.navigateBookmark
 import com.droidknights.app2023.feature.contributor.navigation.navigateContributor
+import com.droidknights.app2023.feature.home.navigation.HomeRoute
 import com.droidknights.app2023.feature.home.navigation.navigateHome
 import com.droidknights.app2023.feature.session.navigation.navigateSession
 import com.droidknights.app2023.feature.session.navigation.navigateSessionDetail
@@ -61,6 +62,15 @@ internal class MainNavigator(
         navController.popBackStack()
     }
 
+    fun popBackStackIfNotHome() {
+        if (!isSameCurrentDestination(HomeRoute.route)) {
+            popBackStack()
+        }
+    }
+
+    private fun isSameCurrentDestination(route: String) =
+        navController.currentDestination?.route == route
+
     @Composable
     fun shouldShowBottomBar(): Boolean {
         val currentRoute = currentDestination?.route ?: return false

diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt
@@ -95,12 +95,12 @@ internal fun MainScreen(
                     )
 
                     contributorNavGraph(
-                        onBackClick = { navigator.popBackStack() },
+                        onBackClick = navigator::popBackStackIfNotHome,
                         onShowErrorSnackBar = onShowErrorSnackBar
                     )
 
                     sessionNavGraph(
-                        onBackClick = { navigator.popBackStack() },
+                        onBackClick = navigator::popBackStackIfNotHome,
                         onSessionClick = { navigator.navigateSessionDetail(it.id) },
                         onShowErrorSnackBar = onShowErrorSnackBar
                     )