Skip to content

Commit 0ca5d56

Browse files
committed
Move window size logic into SceneDecoratorStrategy, simplify scaffolding layouts
1 parent 1e73285 commit 0ca5d56

3 files changed

Lines changed: 190 additions & 258 deletions

File tree

app/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/navigation/NavHost.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ import org.jetbrains.kotlinconf.ui.theme.KotlinConfDarkColors
6969
import org.jetbrains.kotlinconf.ui.theme.KotlinConfLightColors
7070
import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme
7171
import org.jetbrains.kotlinconf.utils.DateTimeFormatting
72+
import org.jetbrains.kotlinconf.utils.LocalWindowSize
7273
import org.jetbrains.kotlinconf.utils.getStoreUrl
7374
import org.jetbrains.kotlinconf.utils.topInsetPadding
7475
import org.jetbrains.kotlinconf.screens.DeveloperMenuScreen as DeveloperMenuScreenContent
@@ -143,8 +144,14 @@ internal fun NavHost(
143144
val showGoldenKodee by remember { conferenceService.goldenKodeeData.map { it != null } }
144145
.collectAsStateWithLifecycle(false)
145146

146-
val navigationDecorator = remember(navState, navigator, showGoldenKodee) {
147-
NavigationSceneDecoratorStrategy(navState, navigator, showGoldenKodee)
147+
val windowSize = LocalWindowSize.current
148+
val navigationDecorator = remember(navState, navigator, showGoldenKodee, windowSize) {
149+
TopLevelNavStrategy(
150+
navState = navState,
151+
windowSize = windowSize,
152+
showGoldenKodee = showGoldenKodee,
153+
onSelectRoute = { route -> navigator.activate(route) },
154+
)
148155
}
149156

150157
val isGoldenKodee = navState.topLevelRoute is GoldenKodeeScreen

app/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/navigation/NavScaffold.kt

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

0 commit comments

Comments
 (0)