Fix Navigation Bar in landscape mode.

pull/1837/head
Rivan 3 years ago
parent cd84100864
commit 6e3192a72a

@ -37,6 +37,7 @@ import androidx.compose.material3.NavigationRailItem
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
import androidx.compose.material3.windowsizeclass.WindowSizeClass import androidx.compose.material3.windowsizeclass.WindowSizeClass
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -75,11 +76,13 @@ fun NiaApp(windowSizeClass: WindowSizeClass) {
containerColor = Color.Transparent, containerColor = Color.Transparent,
contentColor = MaterialTheme.colorScheme.onBackground, contentColor = MaterialTheme.colorScheme.onBackground,
bottomBar = { bottomBar = {
if (windowSizeClass.widthSizeClass == WindowWidthSizeClass.Compact || windowSizeClass.heightSizeClass == WindowHeightSizeClass.Compact) {
NiaBottomBar( NiaBottomBar(
onNavigateToTopLevelDestination = niaTopLevelNavigation::navigateTo, onNavigateToTopLevelDestination = niaTopLevelNavigation::navigateTo,
currentDestination = currentDestination currentDestination = currentDestination
) )
} }
}
) { padding -> ) { padding ->
Row( Row(
Modifier Modifier
@ -90,6 +93,14 @@ fun NiaApp(windowSizeClass: WindowSizeClass) {
) )
) )
) { ) {
if (windowSizeClass.widthSizeClass != WindowWidthSizeClass.Compact && windowSizeClass.heightSizeClass != WindowHeightSizeClass.Compact) {
NiaNavRail(
onNavigateToTopLevelDestination = niaTopLevelNavigation::navigateTo,
currentDestination = currentDestination,
modifier = Modifier.safeDrawingPadding()
)
}
NiaNavHost( NiaNavHost(
windowSizeClass = windowSizeClass, windowSizeClass = windowSizeClass,
navController = navController, navController = navController,

Loading…
Cancel
Save