Merge pull request #52 from YAPP-Github/BOOK-124-fix/#43

easyhooon · web-flow · commit ef551793e0f3 · 2025-07-17T13:19:17.000+09:00
fix: 바텀 네비게이션이 보이지 않는 화면으로 이동할 때, 화면이 들썩거리는 문제 해결
diff --git a/core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/ReedFullScreen.kt b/core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/ReedFullScreen.kt
@@ -0,0 +1,32 @@
+package com.ninecraft.booket.core.ui.component
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+
+/**
+ * systemBarsPadding() 이 자동으로 적용되는 전체 화면 컨테이너
+ * Scaffold 밖에 있는 화면에서 사용
+ *
+ * @param backgroundColor 화면 배경 색상
+ */
+@Composable
+fun ReedFullScreen(
+    modifier: Modifier = Modifier,
+    backgroundColor: Color = Color.White,
+    content: @Composable ColumnScope.() -> Unit,
+) {
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .background(backgroundColor)
+            .systemBarsPadding(),
+    ) {
+        content()
+    }
+}
diff --git a/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginPresenter.kt b/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginPresenter.kt
@@ -52,7 +52,7 @@ class LoginPresenter @AssistedInject constructor(
                             isLoading = true
                             repository.login(event.accessToken)
                                 .onSuccess {
-                                    navigator.goTo(TermsAgreementScreen)
+                                    navigator.resetRoot(TermsAgreementScreen)
                                 }.onFailure { exception ->
                                     exception.message?.let { Logger.e(it) }
                                     sideEffect = exception.message?.let {
diff --git a/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginScreen.kt b/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginScreen.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
@@ -41,7 +42,8 @@ internal fun Login(
     Column(
         modifier = modifier
             .fillMaxSize()
-            .background(White),
+            .background(White)
+            .systemBarsPadding(),
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
     ) {
diff --git a/feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementPresenter.kt b/feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementPresenter.kt
@@ -6,7 +6,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import com.ninecraft.booket.screens.HomeScreen
+import com.ninecraft.booket.screens.BottomNavigationScreen
 import com.ninecraft.booket.screens.TermsAgreementScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.retained.rememberRetained
@@ -55,7 +55,7 @@ class TermsAgreementPresenter @AssistedInject constructor(
                 }
 
                 is TermsAgreementUiEvent.OnStartButtonClick -> {
-                    navigator.resetRoot(HomeScreen)
+                    navigator.resetRoot(BottomNavigationScreen)
                 }
             }
         }
diff --git a/feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementScreen.kt b/feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementScreen.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
@@ -47,7 +48,8 @@ internal fun TermsAgreement(
     Column(
         modifier = modifier
             .fillMaxSize()
-            .background(White),
+            .background(White)
+            .systemBarsPadding(),
     ) {
         ReedBackTopAppBar(
             onBackClick = {
diff --git a/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/MainActivity.kt b/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/MainActivity.kt
@@ -6,20 +6,17 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.Modifier
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import com.ninecraft.booket.core.designsystem.component.ReedScaffold
+import com.ninecraft.booket.core.designsystem.theme.ReedTheme
 import com.ninecraft.booket.core.designsystem.theme.White
-import com.ninecraft.booket.feature.main.component.MainBottomBar
 import com.ninecraft.booket.screens.LoginScreen
 import com.slack.circuit.backstack.rememberSaveableBackStack
 import com.slack.circuit.foundation.Circuit
 import com.slack.circuit.foundation.CircuitCompositionLocals
 import com.slack.circuit.foundation.NavigableCircuitContent
 import com.slack.circuit.foundation.rememberCircuitNavigator
-import com.slack.circuit.overlay.ContentWithOverlays
 import dagger.hilt.android.AndroidEntryPoint
 import tech.thdev.compose.exteions.system.ui.controller.rememberSystemUiController
 import javax.inject.Inject
@@ -36,8 +33,6 @@ class MainActivity : ComponentActivity() {
 
         setContent {
             val systemUiController = rememberSystemUiController()
-            val backStack = rememberSaveableBackStack(root = LoginScreen)
-            val navigator = rememberCircuitNavigator(backStack)
             val isDarkTheme = isSystemInDarkTheme()
 
             DisposableEffect(systemUiController) {
@@ -50,25 +45,16 @@ class MainActivity : ComponentActivity() {
                 onDispose {}
             }
 
-            CircuitCompositionLocals(circuit) {
-                ReedScaffold(
-                    modifier = Modifier.fillMaxSize(),
-                    bottomBar = {
-                        MainBottomBar(
-                            navigator = navigator,
-                            backStack = backStack,
-                        )
-                    },
-                ) { innerPadding ->
-                    ContentWithOverlays {
-                        NavigableCircuitContent(
-                            navigator = navigator,
-                            backStack = backStack,
-                            modifier = Modifier
-                                .fillMaxSize()
-                                .padding(innerPadding),
-                        )
-                    }
+            ReedTheme {
+                val backStack = rememberSaveableBackStack(root = LoginScreen)
+                val navigator = rememberCircuitNavigator(backStack)
+
+                CircuitCompositionLocals(circuit) {
+                    NavigableCircuitContent(
+                        navigator = navigator,
+                        backStack = backStack,
+                        modifier = Modifier.fillMaxSize(),
+                    )
                 }
             }
         }
diff --git a/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/bottomnavigation/BottomNavigation.kt b/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/bottomnavigation/BottomNavigation.kt
@@ -0,0 +1,42 @@
+package com.ninecraft.booket.feature.main.bottomnavigation
+
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.ninecraft.booket.core.designsystem.component.ReedScaffold
+import com.ninecraft.booket.feature.main.component.MainBottomBar
+import com.ninecraft.booket.feature.main.component.MainTab
+import com.ninecraft.booket.screens.BottomNavigationScreen
+import com.slack.circuit.codegen.annotations.CircuitInject
+import com.slack.circuit.foundation.NavigableCircuitContent
+import dagger.hilt.android.components.ActivityRetainedComponent
+import kotlinx.collections.immutable.toImmutableList
+
+@CircuitInject(BottomNavigationScreen::class, ActivityRetainedComponent::class)
+@Composable
+fun BottomNavigation(
+    state: BottomNavigationUiState,
+    modifier: Modifier = Modifier,
+) {
+    ReedScaffold(
+        modifier = modifier.fillMaxSize(),
+        bottomBar = {
+            MainBottomBar(
+                tabs = MainTab.entries.toImmutableList(),
+                currentTab = state.currentTab,
+                onTabSelected = { tab ->
+                    state.eventSink(BottomNavigationUiEvent.OnTabSelected(tab))
+                },
+            )
+        },
+    ) { innerPadding ->
+        NavigableCircuitContent(
+            navigator = state.navigator,
+            backStack = state.backStack,
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(innerPadding),
+        )
+    }
+}
diff --git a/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/bottomnavigation/BottomNavigationPresenter.kt b/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/bottomnavigation/BottomNavigationPresenter.kt
@@ -0,0 +1,56 @@
+package com.ninecraft.booket.feature.main.bottomnavigation
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import com.ninecraft.booket.feature.main.component.getCurrentTab
+import com.ninecraft.booket.screens.BottomNavigationScreen
+import com.ninecraft.booket.screens.HomeScreen
+import com.slack.circuit.backstack.rememberSaveableBackStack
+import com.slack.circuit.codegen.annotations.CircuitInject
+import com.slack.circuit.foundation.rememberCircuitNavigator
+import com.slack.circuit.runtime.Navigator
+import com.slack.circuit.runtime.presenter.Presenter
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import dagger.hilt.android.components.ActivityRetainedComponent
+
+class BottomNavigationPresenter @AssistedInject constructor(
+    @Assisted private val rootNavigator: Navigator,
+) : Presenter<BottomNavigationUiState> {
+
+    @Composable
+    override fun present(): BottomNavigationUiState {
+        val childBackStack = rememberSaveableBackStack(root = HomeScreen)
+        val childNavigator = rememberCircuitNavigator(childBackStack)
+        val delegateNavigator = remember(childNavigator, rootNavigator) {
+            DelegateNavigator(childNavigator, rootNavigator)
+        }
+        val currentTab = getCurrentTab(childBackStack)
+
+        fun handleEvent(event: BottomNavigationUiEvent) {
+            when (event) {
+                is BottomNavigationUiEvent.OnTabSelected -> {
+                    childNavigator.resetRoot(
+                        newRoot = event.tab.screen,
+                        saveState = true,
+                        restoreState = true,
+                    )
+                }
+            }
+        }
+
+        return BottomNavigationUiState(
+            backStack = childBackStack,
+            navigator = delegateNavigator,
+            currentTab = currentTab,
+            eventSink = ::handleEvent,
+        )
+    }
+
+    @CircuitInject(BottomNavigationScreen::class, ActivityRetainedComponent::class)
+    @AssistedFactory
+    fun interface Factory {
+        fun create(rootNavigator: Navigator): BottomNavigationPresenter
+    }
+}
diff --git a/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/bottomnavigation/BottomNavigationUiState.kt b/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/bottomnavigation/BottomNavigationUiState.kt
@@ -0,0 +1,17 @@
+package com.ninecraft.booket.feature.main.bottomnavigation
+
+import com.ninecraft.booket.feature.main.component.MainTab
+import com.slack.circuit.backstack.SaveableBackStack
+import com.slack.circuit.runtime.CircuitUiState
+import com.slack.circuit.runtime.Navigator
+
+data class BottomNavigationUiState(
+    val backStack: SaveableBackStack,
+    val navigator: Navigator,
+    val currentTab: MainTab?,
+    val eventSink: (BottomNavigationUiEvent) -> Unit,
+) : CircuitUiState
+
+sealed interface BottomNavigationUiEvent {
+    data class OnTabSelected(val tab: MainTab) : BottomNavigationUiEvent
+}
diff --git a/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/bottomnavigation/DelegateNavigator.kt b/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/bottomnavigation/DelegateNavigator.kt
@@ -0,0 +1,48 @@
+package com.ninecraft.booket.feature.main.bottomnavigation
+
+import com.ninecraft.booket.feature.main.component.MainTab
+import com.slack.circuit.runtime.Navigator
+import com.slack.circuit.runtime.screen.PopResult
+import com.slack.circuit.runtime.screen.Screen
+import kotlinx.collections.immutable.ImmutableList
+
+class DelegateNavigator(
+    private val childNavigator: Navigator,
+    private val rootNavigator: Navigator,
+) : Navigator {
+    private fun isMainTabScreen(screen: Screen): Boolean {
+        return MainTab.entries.any { it.screen::class == screen::class }
+    }
+
+    override fun goTo(screen: Screen): Boolean {
+        return if (isMainTabScreen(screen)) {
+            childNavigator.goTo(screen)
+        } else {
+            rootNavigator.goTo(screen)
+        }
+    }
+
+    override fun pop(result: PopResult?): Screen? {
+        return childNavigator.pop(result)
+    }
+
+    override fun peek(): Screen? {
+        return childNavigator.peek()
+    }
+
+    override fun resetRoot(
+        newRoot: Screen,
+        saveState: Boolean,
+        restoreState: Boolean,
+    ): ImmutableList<Screen> {
+        return if (isMainTabScreen(newRoot)) {
+            childNavigator.resetRoot(newRoot, saveState, restoreState)
+        } else {
+            rootNavigator.resetRoot(newRoot, saveState, restoreState)
+        }
+    }
+
+    override fun peekBackStack(): ImmutableList<Screen> {
+        return childNavigator.peekBackStack()
+    }
+}
diff --git a/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/component/MainBottomBar.kt b/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/component/MainBottomBar.kt
diff --git a/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/component/MainTab.kt b/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/component/MainTab.kt
diff --git a/feature/settings/src/main/kotlin/com/ninecraft/booket/feature/settings/SettingsScreen.kt b/feature/settings/src/main/kotlin/com/ninecraft/booket/feature/settings/SettingsScreen.kt
diff --git a/feature/settings/src/main/kotlin/com/ninecraft/booket/feature/settings/osslicenses/OssLicensesScreen.kt b/feature/settings/src/main/kotlin/com/ninecraft/booket/feature/settings/osslicenses/OssLicensesScreen.kt
diff --git a/screens/src/main/kotlin/com/ninecraft/booket/screens/Screens.kt b/screens/src/main/kotlin/com/ninecraft/booket/screens/Screens.kt

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import androidx.compose.runtime.getValue`
`6`	`6`	`import androidx.compose.runtime.mutableStateOf`
`7`	`7`	`import androidx.compose.runtime.remember`
`8`	`8`	`import androidx.compose.runtime.setValue`
`9`		`-import com.ninecraft.booket.screens.HomeScreen`
	`9`	`+import com.ninecraft.booket.screens.BottomNavigationScreen`
`10`	`10`	`import com.ninecraft.booket.screens.TermsAgreementScreen`
`11`	`11`	`import com.slack.circuit.codegen.annotations.CircuitInject`
`12`	`12`	`import com.slack.circuit.retained.rememberRetained`
`@@ -55,7 +55,7 @@ class TermsAgreementPresenter @AssistedInject constructor(`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`is TermsAgreementUiEvent.OnStartButtonClick -> {`
`58`		`- navigator.resetRoot(HomeScreen)`
	`58`	`+ navigator.resetRoot(BottomNavigationScreen)`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`