Version 3.1.1

- improved pagination helper
kroegerama · Jul 19, 2020 · afa1089 · afa1089
1 parent 7377723
commit afa1089
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 21 deletions.
diff --git a/buildSrc/src/main/kotlin/ProjectInfo.kt b/buildSrc/src/main/kotlin/ProjectInfo.kt
@@ -1,5 +1,5 @@
 object P {
-    const val projectVersion = "3.1.0"
+    const val projectVersion = "3.1.1"
 
     const val projectGroupId = "com.kroegerama.android-kaiteki"
 

diff --git a/retrofit/src/main/java/com/kroegerama/kaiteki/retrofit/Listing.kt b/retrofit/src/main/java/com/kroegerama/kaiteki/retrofit/Listing.kt
@@ -17,7 +17,12 @@ class Listing<T>(
     fun cancel() = cancelFun.invoke()
 }
 
-fun <T> LiveData<Listing<T>>.result() = switchMap { it.result }
-fun <T> LiveData<Listing<T>>.isRunning() = switchMap { it.state }.map { it.isRunning }
-fun LiveData<Listing<*>>.update() = value?.update()
-fun LiveData<Listing<*>>.cancel() = value?.cancel()
+fun <T> LiveData<out Listing<T>>.result() = switchMap { it.result }
+fun <T> LiveData<out Listing<T>>.isRunning() = switchMap { it.state }.map { it.isRunning }
+fun LiveData<out Listing<*>>.update() {
+    value?.update()
+}
+
+fun LiveData<out Listing<*>>.cancel() {
+    value?.cancel()
+}
diff --git a/retrofit/src/main/java/com/kroegerama/kaiteki/retrofit/PageKeyedPagination.kt b/retrofit/src/main/java/com/kroegerama/kaiteki/retrofit/PageKeyedPagination.kt
@@ -66,23 +66,23 @@ class RetrofitPageKeyedDataSource<T>(
         val page = pageProvider.firstPage
         val size = params.requestedLoadSize
         makeLoadRequest(true, page, size) { data ->
-            callback.onResult(data, pageProvider.getPreviousPage(page), pageProvider.getNextPage(page))
+            callback.onResult(data, pageProvider.getPreviousPage(page, data.size, size), pageProvider.getNextPage(page, data.size, size))
         }
     }
 
     override fun loadAfter(params: LoadParams<Int>, callback: LoadCallback<Int, T>) {
         val page = params.key
         val size = params.requestedLoadSize
         makeLoadRequest(false, page, size) { data ->
-            callback.onResult(data, pageProvider.getNextPage(page))
+            callback.onResult(data, pageProvider.getNextPage(page, data.size, size))
         }
     }
 
     override fun loadBefore(params: LoadParams<Int>, callback: LoadCallback<Int, T>) {
         val page = params.key
         val size = params.requestedLoadSize
         makeLoadRequest(false, page, size) { data ->
-            callback.onResult(data, pageProvider.getPreviousPage(page))
+            callback.onResult(data, pageProvider.getPreviousPage(page, data.size, size))
         }
     }
 

diff --git a/retrofit/src/main/java/com/kroegerama/kaiteki/retrofit/PaginationHelper.kt b/retrofit/src/main/java/com/kroegerama/kaiteki/retrofit/PaginationHelper.kt
@@ -10,14 +10,17 @@ internal typealias RetryFun = () -> Unit
 
 interface PageProvider {
     val firstPage: Int
-    fun getNextPage(currentPage: Int): Int?
-    fun getPreviousPage(currentPage: Int): Int?
+    fun getNextPage(currentPage: Int, currentSize: Int, requestedSize: Int): Int?
+    fun getPreviousPage(currentPage: Int, currentSize: Int, requestedSize: Int): Int?
 }
 
 object DefaultPageProvider : PageProvider {
     override val firstPage = 0
-    override fun getNextPage(currentPage: Int) = currentPage + 1
-    override fun getPreviousPage(currentPage: Int): Int? = null
+
+    override fun getNextPage(currentPage: Int, currentSize: Int, requestedSize: Int) =
+        if (currentSize < requestedSize) null else currentPage + 1
+
+    override fun getPreviousPage(currentPage: Int, currentSize: Int, requestedSize: Int): Int? = null
 }
 
 val DefaultPageConfig by lazy { PagedList.Config.Builder().setPageSize(10).setPrefetchDistance(20).build() }
@@ -45,12 +48,23 @@ class PagedListing<T>(
     }
 }
 
-fun <T> LiveData<PagedListing<T>>.pagedList() = switchMap { it.pagedList }
-fun <T> LiveData<PagedListing<T>>.initialRunning() = switchMap { it.initialState }.map { it.isRunning }
-fun <T> LiveData<PagedListing<T>>.loadRunning() = switchMap { it.loadState }.map { it.isRunning }
-fun <T> LiveData<PagedListing<T>>.initialResult() = switchMap { it.initialResponse }
-fun <T> LiveData<PagedListing<T>>.loadResult() = switchMap { it.loadResponse }
-fun LiveData<PagedListing<*>>.refresh() = value?.refresh()
-fun LiveData<PagedListing<*>>.retryInitial() = value?.retryInitial()
-fun LiveData<PagedListing<*>>.retryLoad() = value?.retryLoad()
-fun LiveData<PagedListing<*>>.cancel() = value?.cancel()
+fun <T> LiveData<out PagedListing<T>>.pagedList() = switchMap { it.pagedList }
+fun <T> LiveData<out PagedListing<T>>.initialRunning() = switchMap { it.initialState }.map { it.isRunning }
+fun <T> LiveData<out PagedListing<T>>.loadRunning() = switchMap { it.loadState }.map { it.isRunning }
+fun <T> LiveData<out PagedListing<T>>.initialResult() = switchMap { it.initialResponse }
+fun <T> LiveData<out PagedListing<T>>.loadResult() = switchMap { it.loadResponse }
+fun LiveData<out PagedListing<*>>.refresh() {
+    value?.refresh()
+}
+
+fun LiveData<out PagedListing<*>>.retryInitial() {
+    value?.retryInitial()
+}
+
+fun LiveData<out PagedListing<*>>.retryLoad() {
+    value?.retryLoad()
+}
+
+fun LiveData<out PagedListing<*>>.cancel() {
+    value?.cancel()
+}