feat:Release Version 0.0.3

Author: 邹铭杰

README.md

@@ -220,7 +220,7 @@ fun CustomRefreshingContent() {
 ```
 
 # Download
-The Current Release Version is 0.0.2. For future release, please refer to the release session of the github repository.
+The Current Release Version is 0.0.3. For future release, please refer to the release session of the github repository.
 ``` kotlin
 repositories {
     mavenCentral()

core-paginglist/src/main/java/com/kevinnzou/compose/core/paginglist/widget/ItemPaging.kt

@@ -1,8 +1,9 @@
 package com.kevinnzou.compose.core.paginglist.widget
 
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.*
+import androidx.compose.foundation.lazy.grid.GridItemSpan
+import androidx.compose.foundation.lazy.grid.LazyGridItemScope
+import androidx.compose.foundation.lazy.grid.LazyGridScope
 import androidx.compose.runtime.Composable
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
@@ -38,4 +39,35 @@ fun <T : Any> LazyListScope.itemPaging(
             }
 
     }
+}
+
+fun <T : Any> LazyGridScope.itemPaging(
+    pagingData: LazyPagingItems<T>,
+    span: Int,
+    loadingContent: @Composable (() -> Unit)? = { DefaultLoadingContent() },
+    noMoreContent: @Composable (() -> Unit)? = { DefaultNoMoreContent() },
+    errorContent: @Composable ((retry: (() -> Unit)?) -> Unit)? = { retry ->
+        DefaultErrorContent(
+            retry
+        )
+    },
+) {
+    when (pagingData.loadState.append) {
+        is LoadState.Loading -> loadingContent?.let { item(span = { GridItemSpan(span) }) { loadingContent() } }
+        is LoadState.Error -> errorContent?.let { item(span = { GridItemSpan(span) }) { errorContent { pagingData.retry() } } }
+        is LoadState.NotLoading ->
+            if (pagingData.loadState.append.endOfPaginationReached && noMoreContent != null) {
+                item(span = { GridItemSpan(span) }) { noMoreContent() }
+            }
+
+    }
+}
+
+fun <T : Any> LazyGridScope.itemsIndexed(
+    items: LazyPagingItems<T>,
+    itemContent: @Composable LazyGridItemScope.(index: Int, value: T?) -> Unit
+) {
+    items(items.itemCount) { index ->
+        itemContent(index, items[index])
+    }
 }

gradle.properties

@@ -25,7 +25,7 @@ android.disableAutomaticComponentCreation=true
 
 GROUP_ID=io.github.kevinnzou
 ARTIFACT_ID=compose-paginglist
-VERSION_NAME=0.0.2
+VERSION_NAME=0.0.3
 
 
 POM_DESCRIPTION=Pull To Refresh layout for Jetpack Compose

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ androidDesugarJdkLibs = "1.1.5"
 androidGradlePlugin = "7.2.1"
 androidxActivity = "1.4.0"
 androidxAppCompat = "1.4.2"
-androidxCompose = "1.1.1"
+androidxCompose = "1.2.0"
 androidxComposeMaterial3 = "1.0.0-alpha13"
 androidxCore = "1.8.0"
 androidxCustomView = "1.0.0-beta02"
@@ -34,7 +34,7 @@ hiltCompose = "1.0.0"
 hiltLifecycleViewModel = "1.0.0-alpha01"
 jacoco = "0.8.7"
 junit4 = "4.13.2"
-kotlin = "1.6.10"
+kotlin = "1.7.0"
 kotlinxCoroutines = "1.6.2"
 kotlinxDatetime = "0.3.3"
 kotlinxSerializationJson = "1.3.3"

sample/src/main/java/com/example/compose_paginglist/MainActivity.kt

@@ -51,6 +51,9 @@ class MainActivity : ComponentActivity() {
                             composable("EmptyPagingList") {
                                 EmptyPagingListScreen()
                             }
+                            composable("PagingGrid") {
+                                PagingGridScreen()
+                            }
                         }
                     }
                 }

sample/src/main/java/com/example/compose_paginglist/MainScreen.kt

@@ -1,7 +1,10 @@
 package com.example.compose_paginglist
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.LinearProgressIndicator
@@ -24,6 +27,7 @@ import com.example.compose_paginglist.ui.theme.ComposepagingListTheme
 import com.kevinnzou.compose.core.paginglist.easylist.PagingLazyColumn
 import com.kevinnzou.compose.core.paginglist.widget.PagingListContainer
 import com.kevinnzou.compose.core.paginglist.widget.itemPaging
+import com.kevinnzou.compose.core.paginglist.widget.itemsIndexed
 
 /**
  * Created By Kevin Zou On 2022/7/5
@@ -36,7 +40,8 @@ fun MainScreen(navController: NavController? = null) {
             "RawPagingList",
             "CustomLoadMore",
             "ErrorPagingList",
-            "EmptyPagingList"
+            "EmptyPagingList",
+            "PagingGrid"
         )
     Column(
         Modifier.fillMaxSize(),
@@ -156,6 +161,35 @@ fun EmptyPagingListScreen(viewModel: MainViewModel = hiltViewModel()) {
     }
 }
 
+@Composable
+fun PagingGridScreen(viewModel: MainViewModel = hiltViewModel()) {
+    val pagerData = viewModel.pager.collectAsLazyPagingItems()
+    PagingListContainer(pagingData = pagerData) {
+        LazyVerticalGrid(
+            columns = GridCells.Fixed(2),
+            verticalArrangement = Arrangement.spacedBy(10.dp),
+            horizontalArrangement = Arrangement.spacedBy(10.dp),
+            contentPadding = PaddingValues(10.dp)
+        ) {
+            itemsIndexed(pagerData) { index, value ->
+                Box(
+                    Modifier
+                        .background(if (index.rem(2) == 0) Color.Yellow else Color.Magenta)
+                        .height(128.dp),
+                    contentAlignment = Alignment.Center
+                ) {
+                    Text(text = value.toString())
+                }
+            }
+            if (pagerData.itemCount.rem(2) != 0) {
+                item { Spacer(Modifier.background(Color.White)) }
+            }
+            itemPaging(pagerData, 2)
+        }
+    }
+}
+
+
 @Preview(showBackground = true)
 @Composable
 fun DefaultPreview() {