From 42512f7f530f1de037c447b50b049453d01ea7fa Mon Sep 17 00:00:00 2001 From: nyaga Date: Tue, 10 Sep 2024 04:21:07 +0900 Subject: [PATCH 1/3] fix NavRailTabs --- .../io/github/droidkaigi/confsched/main/MainScreen.kt | 6 +++++- .../droidkaigi/confsched/main/section/GlassLikeNavRail.kt | 4 +++- 2 files changed, 8 insertions(+), 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 index 2ff1cf812..0ef5d1126 100644 --- 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/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt b/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt index 838f90be2..2224122cc 100644 --- a/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt +++ b/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.selection.selectableGroup @@ -74,7 +75,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( From 167c1ccc0f18e945b52b7c5c8ac00767e240ef36 Mon Sep 17 00:00:00 2001 From: nyagasan Date: Tue, 10 Sep 2024 22:24:52 +0900 Subject: [PATCH 2/3] Fixed detekt's issue --- .../kotlin/io/github/droidkaigi/confsched/main/MainScreen.kt | 2 +- .../droidkaigi/confsched/main/section/GlassLikeNavRail.kt | 2 -- 2 files changed, 1 insertion(+), 3 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 index 0ef5d1126..b74670b81 100644 --- 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 @@ -228,7 +228,7 @@ fun MainScreen( Row( modifier = modifier.fillMaxSize(), verticalAlignment = Alignment.CenterVertically, - ) { + ) { AnimatedVisibility(visible = navigationType == NavigationRail) { GlassLikeNavRail( hazeState = hazeState, diff --git a/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt b/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt index 2224122cc..be95dfe2e 100644 --- a/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt +++ b/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt @@ -13,8 +13,6 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.heightIn -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.selection.selectableGroup import androidx.compose.foundation.shape.CircleShape From 39f0595d7bcc61adb5585a6a15eb5b8430764303 Mon Sep 17 00:00:00 2001 From: nyagasan Date: Wed, 11 Sep 2024 01:20:55 +0900 Subject: [PATCH 3/3] Fixed detekt's issue --- .../github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt b/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt index be95dfe2e..b7907cff7 100644 --- a/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt +++ b/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.selection.selectableGroup import androidx.compose.foundation.shape.CircleShape