Skip to content

Commit 7adbb3b

Browse files
committed
[BOOK-124] chore: merge 이후 부활한 ContentWithOverlays 블럭 제거
1 parent 9b34ce2 commit 7adbb3b

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/MainActivity.kt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import com.slack.circuit.foundation.Circuit
1717
import com.slack.circuit.foundation.CircuitCompositionLocals
1818
import com.slack.circuit.foundation.NavigableCircuitContent
1919
import com.slack.circuit.foundation.rememberCircuitNavigator
20-
import com.slack.circuit.overlay.ContentWithOverlays
2120
import dagger.hilt.android.AndroidEntryPoint
2221
import tech.thdev.compose.exteions.system.ui.controller.rememberSystemUiController
2322
import javax.inject.Inject
@@ -51,13 +50,11 @@ class MainActivity : ComponentActivity() {
5150
val navigator = rememberCircuitNavigator(backStack)
5251

5352
CircuitCompositionLocals(circuit) {
54-
ContentWithOverlays {
55-
NavigableCircuitContent(
56-
navigator = navigator,
57-
backStack = backStack,
58-
modifier = Modifier.fillMaxSize(),
59-
)
60-
}
53+
NavigableCircuitContent(
54+
navigator = navigator,
55+
backStack = backStack,
56+
modifier = Modifier.fillMaxSize(),
57+
)
6158
}
6259
}
6360
}

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import com.ninecraft.booket.feature.main.component.MainTab
1010
import com.ninecraft.booket.screens.BottomNavigationScreen
1111
import com.slack.circuit.codegen.annotations.CircuitInject
1212
import com.slack.circuit.foundation.NavigableCircuitContent
13-
import com.slack.circuit.overlay.ContentWithOverlays
1413
import dagger.hilt.android.components.ActivityRetainedComponent
1514
import kotlinx.collections.immutable.toImmutableList
1615

@@ -32,14 +31,12 @@ fun BottomNavigation(
3231
)
3332
},
3433
) { innerPadding ->
35-
ContentWithOverlays {
36-
NavigableCircuitContent(
37-
navigator = state.childNavigator,
38-
backStack = state.childBackStack,
39-
modifier = Modifier
40-
.fillMaxSize()
41-
.padding(innerPadding),
42-
)
43-
}
34+
NavigableCircuitContent(
35+
navigator = state.childNavigator,
36+
backStack = state.childBackStack,
37+
modifier = Modifier
38+
.fillMaxSize()
39+
.padding(innerPadding),
40+
)
4441
}
4542
}

0 commit comments

Comments
 (0)