Skip to content

Commit dc81add

Browse files
committed
[BOOK-124] chore: DelegatingNavigator 제거
1 parent 44705f6 commit dc81add

File tree

4 files changed

+4
-68
lines changed

4 files changed

+4
-68
lines changed

feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/screens/BottomNavigation.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fun BottomNavigation(
3434
) { innerPadding ->
3535
ContentWithOverlays {
3636
NavigableCircuitContent(
37-
navigator = state.navigator,
37+
navigator = state.childNavigator,
3838
backStack = state.childBackStack,
3939
modifier = Modifier
4040
.fillMaxSize()

feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/screens/BottomNavigationPresenter.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.ninecraft.booket.feature.main.screens
22

33
import androidx.compose.runtime.Composable
4-
import androidx.compose.runtime.remember
54
import com.ninecraft.booket.feature.main.component.MainTab
65
import com.ninecraft.booket.screens.BottomNavigationScreen
76
import com.ninecraft.booket.screens.HomeScreen
@@ -24,9 +23,6 @@ class BottomNavigationPresenter @AssistedInject constructor(
2423
override fun present(): BottomNavigationUiState {
2524
val childBackStack = rememberSaveableBackStack(root = HomeScreen)
2625
val childNavigator = rememberCircuitNavigator(childBackStack)
27-
val delegatingNavigator = remember(childNavigator, rootNavigator) {
28-
DelegatingNavigator(childNavigator, rootNavigator)
29-
}
3026

3127
val currentTab = getCurrentTab(childBackStack)
3228

@@ -41,14 +37,14 @@ class BottomNavigationPresenter @AssistedInject constructor(
4137
}
4238

4339
is BottomNavigationUiEvent.NavigateToFullScreen -> {
44-
delegatingNavigator.goTo(event.screen)
40+
rootNavigator.goTo(event.screen)
4541
}
4642
}
4743
}
4844

4945
return BottomNavigationUiState(
5046
childBackStack = childBackStack,
51-
navigator = delegatingNavigator,
47+
childNavigator = childNavigator,
5248
currentTab = currentTab,
5349
eventSink = ::handleEvent,
5450
)

feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/screens/BottomNavigationUiState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.slack.circuit.runtime.Navigator
77

88
data class BottomNavigationUiState(
99
val childBackStack: SaveableBackStack,
10-
val navigator: Navigator,
10+
val childNavigator: Navigator,
1111
val currentTab: MainTab?,
1212
val eventSink: (BottomNavigationUiEvent) -> Unit,
1313
) : CircuitUiState

feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/screens/DelegatingNavigator.kt

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)