From 37b3b3602db313093641f4e131fd9d206dd5104d Mon Sep 17 00:00:00 2001 From: BAN Date: Tue, 10 Sep 2024 02:32:48 +0900 Subject: [PATCH] extract Box from LazyColumn --- .../droidkaigi/confsched/staff/StaffScreen.kt | 48 +++++++++---------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt b/feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt index 3dd33b110..ec2209126 100644 --- a/feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt +++ b/feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt @@ -123,22 +123,22 @@ fun StaffScreen( } }, ) { padding -> - LazyColumn( - modifier = Modifier - .fillMaxSize() - .padding(top = padding.calculateTopPadding()) - .let { - if (scrollBehavior != null) { - it.nestedScroll(scrollBehavior.nestedScrollConnection) - } else { - it - } - } - .testTag(StaffScreenLazyColumnTestTag), - contentPadding = PaddingValues(bottom = 40.dp + padding.calculateBottomPadding()), - ) { - when (uiState) { - is StaffUiState.Exists -> { + when (uiState) { + is StaffUiState.Exists -> { + LazyColumn( + modifier = Modifier + .fillMaxSize() + .padding(top = padding.calculateTopPadding()) + .let { + if (scrollBehavior != null) { + it.nestedScroll(scrollBehavior.nestedScrollConnection) + } else { + it + } + } + .testTag(StaffScreenLazyColumnTestTag), + contentPadding = PaddingValues(bottom = 40.dp + padding.calculateBottomPadding()), + ) { items(uiState.staff) { staff -> StaffItem( staff = staff, @@ -149,15 +149,13 @@ fun StaffScreen( ) } } - is StaffUiState.Loading -> { - item { - Box( - contentAlignment = Alignment.Center, - modifier = Modifier.padding(padding).fillMaxSize(), - ) { - CircularProgressIndicator() - } - } + } + is StaffUiState.Loading -> { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.padding(padding).fillMaxSize(), + ) { + CircularProgressIndicator() } } }