Merge pull request #1023 from GGBBB2000/fix-loading-spinner-position

Fix the position of the loading spinner in StaffScreen
DroidKaigi · Sep 9, 2024 · 2daf030 · 2daf030
2 parents 4ede1a4 + 37b3b36
commit 2daf030
Showing 1 changed file with 23 additions and 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
@@ -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()
                 }
             }
         }