diff --git a/shared/app/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/app/PocketLeagueApp.kt b/shared/app/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/app/PocketLeagueApp.kt index 97de31d7..a53d03a1 100644 --- a/shared/app/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/app/PocketLeagueApp.kt +++ b/shared/app/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/app/PocketLeagueApp.kt @@ -1,6 +1,7 @@ package com.adammcneilly.pocketleague.shared.app import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.navigation.compose.NavHost @@ -25,18 +26,20 @@ fun PocketLeagueApp( }, ) { PocketLeagueTheme { - val navController = rememberNavController() + Scaffold { + val navController = rememberNavController() - NavHost( - navController = navController, - startDestination = "feed", - modifier = modifier, - ) { - composable("feed") { - FeedScreen( - modifier = Modifier - .fillMaxSize(), - ) + NavHost( + navController = navController, + startDestination = "feed", + modifier = modifier, + ) { + composable("feed") { + FeedScreen( + modifier = Modifier + .fillMaxSize(), + ) + } } } } diff --git a/shared/app/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/app/ui/theme/Theme.kt b/shared/app/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/app/ui/theme/Theme.kt index eeebc6c0..4671afc2 100644 --- a/shared/app/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/app/ui/theme/Theme.kt +++ b/shared/app/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/app/ui/theme/Theme.kt @@ -68,6 +68,13 @@ private val DarkColorScheme = darkColorScheme( outlineVariant = md_theme_dark_outline, ) +val PocketLeagueSizes = Sizes( + screenPadding = 16.dp, + listItemSpacing = 16.dp, + cardPadding = 16.dp, + textSpacing = 4.dp, +) + /** * Creates our custom [MaterialTheme] for the pocket league application. */ @@ -76,21 +83,14 @@ fun PocketLeagueTheme( useDarkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit, ) { - val colorScheme = if (!useDarkTheme) { - LightColorScheme - } else { + val colorScheme = if (useDarkTheme) { DarkColorScheme + } else { + LightColorScheme } - val sizes = Sizes( - screenPadding = 16.dp, - listItemSpacing = 16.dp, - cardPadding = 16.dp, - textSpacing = 4.dp, - ) - CompositionLocalProvider( - LocalPocketLeagueSizes provides sizes, + LocalPocketLeagueSizes provides PocketLeagueSizes, ) { MaterialTheme( colorScheme = colorScheme,