Update project

michaelbel · Sep 2, 2024 · 2c9ce9d · 2c9ce9d
1 parent 8be00a4
commit 2c9ce9d
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 15 deletions.
diff --git a/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageContent.android.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageContent.android.kt
@@ -9,11 +9,13 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyGridState
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState
 import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
 import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
+import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -108,7 +110,9 @@ private fun PageContentColumn(
                 isPagingLoading -> {
                     item {
                         PagingLoadingBox(
-                            modifier = Modifier.fillMaxWidth().height(80.dp)
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .height(80.dp)
                         )
                     }
                 }
@@ -161,15 +165,21 @@ private fun PageContentGrid(
         pagingItems.apply {
             when {
                 isPagingLoading -> {
-                    item {
+                    item(
+                        span = { GridItemSpan(maxLineSpan) }
+                    ) {
                         PagingLoadingBox(
-                            modifier = Modifier.fillMaxWidth().height(80.dp)
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .height(80.dp)
 
                         )
                     }
                 }
                 isPagingFailure -> {
-                    item {
+                    item(
+                        span = { GridItemSpan(maxLineSpan) }
+                    ) {
                         PagingFailureBox(
                             modifier = Modifier
                                 .fillMaxWidth()
@@ -216,15 +226,21 @@ private fun PageContentStaggeredGrid(
         pagingItems.apply {
             when {
                 isPagingLoading -> {
-                    item {
+                    item(
+                        span = StaggeredGridItemSpan.FullLine
+                    ) {
                         PagingLoadingBox(
-                            modifier = Modifier.fillMaxWidth().height(80.dp)
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .height(80.dp)
 
                         )
                     }
                 }
                 isPagingFailure -> {
-                    item {
+                    item(
+                        span = StaggeredGridItemSpan.FullLine
+                    ) {
                         PagingFailureBox(
                             modifier = Modifier
                                 .fillMaxWidth()

diff --git a/core/ui/src/iosMain/kotlin/org/michaelbel/movies/ui/compose/page/PageContent.ios.kt b/core/ui/src/iosMain/kotlin/org/michaelbel/movies/ui/compose/page/PageContent.ios.kt
@@ -9,13 +9,15 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyGridState
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState
 import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
 import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
+import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan
 import androidx.compose.foundation.lazy.staggeredgrid.items
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -150,15 +152,19 @@ private fun PageContentGrid(
         pagingItems.apply {
             when {
                 isPagingLoading -> {
-                    item {
+                    item(
+                        span = { GridItemSpan(maxLineSpan) }
+                    ) {
                         PagingLoadingBox(
                             modifier = Modifier.fillMaxWidth().height(80.dp)
 
                         )
                     }
                 }
                 isPagingFailure -> {
-                    item {
+                    item(
+                        span = { GridItemSpan(maxLineSpan) }
+                    ) {
                         PagingFailureBox(
                             modifier = Modifier
                                 .fillMaxWidth()
@@ -200,15 +206,19 @@ private fun PageContentStaggeredGrid(
         pagingItems.apply {
             when {
                 isPagingLoading -> {
-                    item {
+                    item(
+                        span = StaggeredGridItemSpan.FullLine
+                    ) {
                         PagingLoadingBox(
                             modifier = Modifier.fillMaxWidth().height(80.dp)
 
                         )
                     }
                 }
                 isPagingFailure -> {
-                    item {
+                    item(
+                        span = StaggeredGridItemSpan.FullLine
+                    ) {
                         PagingFailureBox(
                             modifier = Modifier
                                 .fillMaxWidth()

diff --git a/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/compose/page/PageContent.desktop.kt b/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/compose/page/PageContent.desktop.kt
@@ -9,13 +9,15 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyGridState
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState
 import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
 import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
+import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan
 import androidx.compose.foundation.lazy.staggeredgrid.items
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -149,15 +151,19 @@ private fun PageContentGrid(
         pagingItems.apply {
             when {
                 isPagingLoading -> {
-                    item {
+                    item(
+                        span = { GridItemSpan(maxLineSpan) }
+                    ) {
                         PagingLoadingBox(
                             modifier = Modifier.fillMaxWidth().height(80.dp)
 
                         )
                     }
                 }
                 isPagingFailure -> {
-                    item {
+                    item(
+                        span = { GridItemSpan(maxLineSpan) }
+                    ) {
                         PagingFailureBox(
                             modifier = Modifier
                                 .fillMaxWidth()
@@ -199,15 +205,19 @@ private fun PageContentStaggeredGrid(
         pagingItems.apply {
             when {
                 isPagingLoading -> {
-                    item {
+                    item(
+                        span = StaggeredGridItemSpan.FullLine
+                    ) {
                         PagingLoadingBox(
                             modifier = Modifier.fillMaxWidth().height(80.dp)
 
                         )
                     }
                 }
                 isPagingFailure -> {
-                    item {
+                    item(
+                        span = StaggeredGridItemSpan.FullLine
+                    ) {
                         PagingFailureBox(
                             modifier = Modifier
                                 .fillMaxWidth()