Skip to content

Commit 3904adc

Browse files
committed
Update NavigationSuiteScaffold to align NavRail's icon to the center
1 parent b082609 commit 3904adc

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/AppWithNavigationSuiteScaffold.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package com.google.jetstream.presentation.app.withNavigationSuiteScaffold
1919
import androidx.compose.animation.AnimatedVisibility
2020
import androidx.compose.animation.slideInVertically
2121
import androidx.compose.animation.slideOutVertically
22+
import androidx.compose.foundation.layout.Arrangement
2223
import androidx.compose.foundation.layout.fillMaxSize
2324
import androidx.compose.foundation.layout.padding
2425
import androidx.compose.material3.Scaffold
@@ -82,20 +83,21 @@ fun AppWithNavigationSuiteScaffold(
8283
NavigationSuiteScaffold(
8384
modifier = modifier.fillMaxSize(),
8485
state = navigationSuiteScaffoldState,
85-
navigationSuiteItems = {
86-
navigationSuiteItems(appState.selectedScreen, screensInGlobalNavigation) {
86+
navigationItems = {
87+
AdaptiveAppNavigationItems(appState.selectedScreen, screensInGlobalNavigation) {
8788
if (it != appState.selectedScreen) {
8889
navController.navigate(it())
8990
}
9091
}
9192
if (xrSession != null) {
92-
toggleFullSpaceMode(
93+
ToggleFullSpaceModeItems(
9394
xrSession = xrSession,
9495
isSpatialUiEnabled = isSpatialUiEnabled,
9596
spatialConfiguration = spatialConfiguration
9697
)
9798
}
98-
}
99+
},
100+
navigationItemVerticalArrangement = Arrangement.Center
99101
) {
100102
Scaffold(
101103
modifier = Modifier.fillMaxSize(),

AdaptiveJetStream/jetstream/src/main/java/com/google/jetstream/presentation/app/withNavigationSuiteScaffold/navigationSuiteItems.kt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ import androidx.compose.foundation.layout.size
2020
import androidx.compose.material3.Icon
2121
import androidx.compose.material3.MaterialTheme
2222
import androidx.compose.material3.Text
23-
import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScope
23+
import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteItem
24+
import androidx.compose.runtime.Composable
2425
import androidx.compose.ui.Modifier
2526
import androidx.compose.ui.graphics.vector.ImageVector
2627
import androidx.compose.ui.res.stringResource
@@ -31,13 +32,14 @@ import androidx.xr.runtime.Session
3132
import com.google.jetstream.R
3233
import com.google.jetstream.presentation.screens.Screens
3334

34-
fun NavigationSuiteScope.navigationSuiteItems(
35+
@Composable
36+
fun AdaptiveAppNavigationItems(
3537
currentScreen: Screens,
3638
screens: List<Screens>,
3739
onSelectScreen: (Screens) -> Unit,
3840
) {
3941
screens.forEach { screen ->
40-
item(
42+
NavigationSuiteItem(
4143
selected = screen == currentScreen,
4244
onClick = {
4345
onSelectScreen(screen)
@@ -55,7 +57,8 @@ fun NavigationSuiteScope.navigationSuiteItems(
5557
}
5658
}
5759

58-
fun NavigationSuiteScope.toggleFullSpaceMode(
60+
@Composable
61+
fun ToggleFullSpaceModeItems(
5962
xrSession: Session?,
6063
spatialConfiguration: SpatialConfiguration,
6164
isSpatialUiEnabled: Boolean,
@@ -73,7 +76,7 @@ fun NavigationSuiteScope.toggleFullSpaceMode(
7376
R.string.full_space_mode
7477
}
7578

76-
item(
79+
NavigationSuiteItem(
7780
selected = false,
7881
onClick = {
7982
if (isSpatialUiEnabled) {

0 commit comments

Comments
 (0)