Merge pull request #1027 from nyagasan/nyagasan/fix/foldable-navrail

Change NavRail position to center on large screen
DroidKaigi · Sep 11, 2024 · 39ac19d · 39ac19d
2 parents bbaf201 + 39f0595
commit 39ac19d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/MainScreen.kt b/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/MainScreen.kt
@@ -25,6 +25,7 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
@@ -224,7 +225,10 @@ fun MainScreen(
 
     val scaffoldPadding = remember { mutableStateOf(PaddingValues(0.dp)) }
 
-    Row(modifier = modifier.fillMaxSize()) {
+    Row(
+        modifier = modifier.fillMaxSize(),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
         AnimatedVisibility(visible = navigationType == NavigationRail) {
             GlassLikeNavRail(
                 hazeState = hazeState,

diff --git a/...ain/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt b/...ain/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt
@@ -74,7 +74,8 @@ fun GlassLikeNavRail(
     modifier: Modifier = Modifier,
 ) {
     Box(
-        modifier = modifier.size(width = 64.dp, height = 320.dp)
+        modifier = modifier
+            .size(width = 64.dp, height = 420.dp)
             .run {
                 if (isBlurSupported()) {
                     hazeChild(state = hazeState, shape = CircleShape).border(