From 2c9ce9da7d4d669ef24e93a6c77ea1bb92a20e02 Mon Sep 17 00:00:00 2001 From: michaelbel Date: Mon, 2 Sep 2024 23:04:56 +0300 Subject: [PATCH] Update project --- .../ui/compose/page/PageContent.android.kt | 30 ++++++++++++++----- .../movies/ui/compose/page/PageContent.ios.kt | 18 ++++++++--- .../ui/compose/page/PageContent.desktop.kt | 18 ++++++++--- 3 files changed, 51 insertions(+), 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 index 04ba580a5..751dafb14 100644 --- 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 index fb28c5132..808290179 100644 --- 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,6 +9,7 @@ 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 @@ -16,6 +17,7 @@ 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,7 +152,9 @@ private fun PageContentGrid( pagingItems.apply { when { isPagingLoading -> { - item { + item( + span = { GridItemSpan(maxLineSpan) } + ) { PagingLoadingBox( modifier = Modifier.fillMaxWidth().height(80.dp) @@ -158,7 +162,9 @@ private fun PageContentGrid( } } isPagingFailure -> { - item { + item( + span = { GridItemSpan(maxLineSpan) } + ) { PagingFailureBox( modifier = Modifier .fillMaxWidth() @@ -200,7 +206,9 @@ private fun PageContentStaggeredGrid( pagingItems.apply { when { isPagingLoading -> { - item { + item( + span = StaggeredGridItemSpan.FullLine + ) { PagingLoadingBox( modifier = Modifier.fillMaxWidth().height(80.dp) @@ -208,7 +216,9 @@ private fun PageContentStaggeredGrid( } } 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 index 1171bed11..a8b575eff 100644 --- 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,6 +9,7 @@ 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 @@ -16,6 +17,7 @@ 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,7 +151,9 @@ private fun PageContentGrid( pagingItems.apply { when { isPagingLoading -> { - item { + item( + span = { GridItemSpan(maxLineSpan) } + ) { PagingLoadingBox( modifier = Modifier.fillMaxWidth().height(80.dp) @@ -157,7 +161,9 @@ private fun PageContentGrid( } } isPagingFailure -> { - item { + item( + span = { GridItemSpan(maxLineSpan) } + ) { PagingFailureBox( modifier = Modifier .fillMaxWidth() @@ -199,7 +205,9 @@ private fun PageContentStaggeredGrid( pagingItems.apply { when { isPagingLoading -> { - item { + item( + span = StaggeredGridItemSpan.FullLine + ) { PagingLoadingBox( modifier = Modifier.fillMaxWidth().height(80.dp) @@ -207,7 +215,9 @@ private fun PageContentStaggeredGrid( } } isPagingFailure -> { - item { + item( + span = StaggeredGridItemSpan.FullLine + ) { PagingFailureBox( modifier = Modifier .fillMaxWidth()