From 313481500aa50e30ac896d2d08af6942e4903c4e Mon Sep 17 00:00:00 2001
From: Stanisalv <rationalegoismforwork@gmail.com>
Date: Wed, 26 Aug 2020 20:21:04 +0300
Subject: [PATCH 1/2] return lost commit

---
 .../touchin/roboswag/pagination/PaginationView.kt  | 14 +++++++-------
 .../ru/touchin/roboswag/pagination/Paginator.kt    | 14 +++++++++++---
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pagination/src/main/java/ru/touchin/roboswag/pagination/PaginationView.kt b/pagination/src/main/java/ru/touchin/roboswag/pagination/PaginationView.kt
index b206ce4..e31018f 100644
--- a/pagination/src/main/java/ru/touchin/roboswag/pagination/PaginationView.kt
+++ b/pagination/src/main/java/ru/touchin/roboswag/pagination/PaginationView.kt
@@ -48,25 +48,25 @@ class PaginationView @JvmOverloads constructor(
 
             when (state) {
                 is Paginator.State.Empty -> {
-                    adapter.update(emptyList(), false)
+                    adapter.update(emptyList(), PaginationAdapter.UpdateState.Common)
                 }
                 is Paginator.State.EmptyProgress -> {
-                    adapter.update(emptyList(), false)
+                    adapter.update(emptyList(), PaginationAdapter.UpdateState.Common)
                 }
                 is Paginator.State.EmptyError -> {
-                    adapter.update(emptyList(), false)
+                    adapter.update(emptyList(), PaginationAdapter.UpdateState.Common)
                 }
                 is Paginator.State.Data<*> -> {
-                    adapter.update(state.data as List<Any>, false)
+                    adapter.update(state.data as List<Any>, PaginationAdapter.UpdateState.Common)
                 }
                 is Paginator.State.Refresh<*> -> {
-                    adapter.update(state.data as List<Any>, false)
+                    adapter.update(state.data as List<Any>, PaginationAdapter.UpdateState.Common)
                 }
                 is Paginator.State.NewPageProgress<*> -> {
-                    adapter.update(state.data as List<Any>, true)
+                    adapter.update(state.data as List<Any>, PaginationAdapter.UpdateState.Progress)
                 }
                 is Paginator.State.FullData<*> -> {
-                    adapter.update(state.data as List<Any>, false)
+                    adapter.update(state.data as List<Any>, PaginationAdapter.UpdateState.Common)
                 }
             }
         }
diff --git a/pagination/src/main/java/ru/touchin/roboswag/pagination/Paginator.kt b/pagination/src/main/java/ru/touchin/roboswag/pagination/Paginator.kt
index a20340e..164cad6 100644
--- a/pagination/src/main/java/ru/touchin/roboswag/pagination/Paginator.kt
+++ b/pagination/src/main/java/ru/touchin/roboswag/pagination/Paginator.kt
@@ -30,7 +30,7 @@ class Paginator<Item>(
         object Empty : State()
         object EmptyProgress : State()
         data class EmptyError(val error: Throwable) : State()
-        data class Data<T>(val pageCount: Int = 0, val data: List<T>) : State()
+        data class Data<T>(val pageCount: Int = 0, val data: List<T>, val error: Throwable? = null) : State()
         data class Refresh<T>(val pageCount: Int, val data: List<T>) : State()
         data class NewPageProgress<T>(val pageCount: Int, val data: List<T>) : State()
         data class FullData<T>(val pageCount: Int, val data: List<T>) : State()
@@ -108,7 +108,11 @@ class Paginator<Item>(
                             State.Data(currentState.pageCount, currentState.data)
                         }
                         is ErrorHandleMod.ErrorItem -> {
-                            State.Data(currentState.pageCount, currentState.data + ErrorItem)
+                            State.Data(
+                                    pageCount = currentState.pageCount,
+                                    data = currentState.data,
+                                    error = change.error
+                            )
                         }
                     }
                 }
@@ -119,7 +123,11 @@ class Paginator<Item>(
                             State.Data(currentState.pageCount, currentState.data)
                         }
                         is ErrorHandleMod.ErrorItem -> {
-                            State.Data(currentState.pageCount, currentState.data + ErrorItem)
+                            State.Data(
+                                    pageCount = currentState.pageCount,
+                                    data = currentState.data,
+                                    error = change.error
+                            )
                         }
                     }
                 }

From 784fd3d8f3d47a40594a597b9825e763611ba735 Mon Sep 17 00:00:00 2001
From: Stanisalv <rationalegoismforwork@gmail.com>
Date: Thu, 27 Aug 2020 09:57:58 +0300
Subject: [PATCH 2/2] fix when block in PaginationView

fix when block in PaginationView
---
 .../java/ru/touchin/roboswag/pagination/PaginationView.kt | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pagination/src/main/java/ru/touchin/roboswag/pagination/PaginationView.kt b/pagination/src/main/java/ru/touchin/roboswag/pagination/PaginationView.kt
index e31018f..d6d686a 100644
--- a/pagination/src/main/java/ru/touchin/roboswag/pagination/PaginationView.kt
+++ b/pagination/src/main/java/ru/touchin/roboswag/pagination/PaginationView.kt
@@ -47,13 +47,7 @@ class PaginationView @JvmOverloads constructor(
             adapter.fullData = state === Paginator.State.Empty || state is Paginator.State.FullData<*>
 
             when (state) {
-                is Paginator.State.Empty -> {
-                    adapter.update(emptyList(), PaginationAdapter.UpdateState.Common)
-                }
-                is Paginator.State.EmptyProgress -> {
-                    adapter.update(emptyList(), PaginationAdapter.UpdateState.Common)
-                }
-                is Paginator.State.EmptyError -> {
+                is Paginator.State.EmptyError, Paginator.State.Empty, Paginator.State.EmptyProgress  -> {
                     adapter.update(emptyList(), PaginationAdapter.UpdateState.Common)
                 }
                 is Paginator.State.Data<*> -> {