Done horizontal

Author: hoc081098

app/src/main/java/com/hoc/pagination_mvi/ui/main/HorizontalAdapter.kt

@@ -14,7 +14,6 @@ import com.hoc.pagination_mvi.ui.main.MainContract.Item.HorizontalList.Horizonta
 import com.hoc.pagination_mvi.ui.main.MainContract.PlaceholderState
 import com.hoc.pagination_mvi.ui.main.MainContract.PostVS
 import com.jakewharton.rxbinding3.view.clicks
-import com.jakewharton.rxbinding3.view.detaches
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.addTo
 import io.reactivex.rxkotlin.subscribeBy
@@ -48,14 +47,14 @@ class HorizontalAdapter(
 ) :
   ListAdapter<HorizontalItem, HorizontalAdapter.VH>(HorizontalItemItemCallback) {
 
-  private val retryS = PublishSubject.create<Unit>()
-  val retryObservable get() = retryS.asObservable()
+  private val retryNextPageS = PublishSubject.create<Unit>()
+  val retryNextPageObservable get() = retryNextPageS.asObservable()
 
   override fun onCreateViewHolder(parent: ViewGroup, @LayoutRes viewType: Int): VH {
     val itemView = LayoutInflater.from(parent.context).inflate(viewType, parent, false)
     return when (viewType) {
       R.layout.recycler_item_horizontal_post -> PostVH(itemView)
-      R.layout.recycler_item_horizontal_placeholder -> PlaceholderVH(itemView, parent)
+      R.layout.recycler_item_horizontal_placeholder -> PlaceholderVH(itemView)
       else -> error("Unknown viewType=$viewType")
     }
   }
@@ -94,15 +93,14 @@ class HorizontalAdapter(
     }
   }
 
-  private inner class PlaceholderVH(itemView: View, parent: ViewGroup) : VH(itemView) {
+  private inner class PlaceholderVH(itemView: View) : VH(itemView) {
     private val progressBar = itemView.progress_bar!!
     private val textError = itemView.text_error!!
     private val buttonRetry = itemView.button_retry!!
 
     init {
       buttonRetry
         .clicks()
-        .takeUntil(parent.detaches())
         .filter {
           val position = adapterPosition
           if (position == RecyclerView.NO_POSITION) {
@@ -111,7 +109,7 @@ class HorizontalAdapter(
             (getItem(position) as? HorizontalItem.Placeholder)?.state is PlaceholderState.Error
           }
         }
-        .subscribeBy { retryS.onNext(Unit) }
+        .subscribeBy { retryNextPageS.onNext(Unit) }
         .addTo(compositeDisposable)
     }
 

app/src/main/java/com/hoc/pagination_mvi/ui/main/MainAdapter.kt

@@ -58,6 +58,9 @@ class MainAdapter(private val compositeDisposable: CompositeDisposable) :
   private val loadNextPageHorizontalS = PublishSubject.create<Unit>()
   val loadNextPageHorizontalObservable get() = loadNextPageHorizontalS.asObservable()
 
+  private val retryNextPageHorizontalS = PublishSubject.create<Unit>()
+  val retryNextPageHorizontalObservable get() = retryNextPageHorizontalS.asObservable()
+
   private val retryHorizontalS = PublishSubject.create<Unit>()
   val retryHorizontalObservable get() = retryHorizontalS.asObservable()
 
@@ -186,8 +189,22 @@ class MainAdapter(private val compositeDisposable: CompositeDisposable) :
       }
 
       adapter
-        .retryObservable
-        .subscribe(retryHorizontalS::onNext)
+        .retryNextPageObservable
+        .subscribe(retryNextPageHorizontalS::onNext)
+        .addTo(compositeDisposable)
+
+      buttonRetry
+        .clicks()
+        .takeUntil(parent.detaches())
+        .filter {
+          val position = adapterPosition
+          if (position == RecyclerView.NO_POSITION) {
+            false
+          } else {
+            (getItem(position) as? Item.HorizontalList)?.shouldRetry() == true
+          }
+        }
+        .subscribeBy { retryHorizontalS.onNext(Unit) }
         .addTo(compositeDisposable)
 
       recycler

app/src/main/java/com/hoc/pagination_mvi/ui/main/MainContract.kt

@@ -40,7 +40,7 @@ interface MainContract {
       return horizontalList.postItems.size
     }
 
-    fun shouldRetryHorizontal(): Boolean {
+    fun shouldRetryNextPageHorizontal(): Boolean {
       val horizontalList =
         items.singleOrNull { it is Item.HorizontalList } as? Item.HorizontalList ?: return false
       return !horizontalList.isLoading &&
@@ -50,6 +50,12 @@ interface MainContract {
             ?.state is PlaceholderState.Error
     }
 
+    fun shouldRetryHorizontal(): Boolean {
+      val horizontalList =
+        items.singleOrNull { it is Item.HorizontalList } as? Item.HorizontalList ?: return false
+      return horizontalList.shouldRetry()
+    }
+
     companion object Factory {
       @JvmStatic
       fun initial() = ViewState(
@@ -75,6 +81,10 @@ interface MainContract {
       val postItems: List<HorizontalItem.Post>
     ) : Item(R.layout.recycler_item_horizontal_list) {
 
+      fun shouldRetry(): Boolean {
+        return !isLoading && error !== null && items.isEmpty()
+      }
+
       sealed class HorizontalItem(@LayoutRes val viewType: Int) {
         data class Post(val post: PostVS) : HorizontalItem(R.layout.recycler_item_horizontal_post)
 
@@ -144,6 +154,8 @@ interface MainContract {
     object LoadNextPageHorizontal : ViewIntent()
 
     object RetryLoadPageHorizontal : ViewIntent()
+
+    object RetryHorizontal : ViewIntent()
   }
 
   sealed class PartialStateChange {

app/src/main/java/com/hoc/pagination_mvi/ui/main/MainFragment.kt

@@ -144,10 +144,14 @@ class MainFragment : Fragment() {
         adapter
           .loadNextPageHorizontalObservable
           .map { ViewIntent.LoadNextPageHorizontal },
+        adapter
+          .retryNextPageHorizontalObservable
+          .throttleFirst(500, TimeUnit.MILLISECONDS)
+          .map { ViewIntent.RetryLoadPageHorizontal },
         adapter
           .retryHorizontalObservable
           .throttleFirst(500, TimeUnit.MILLISECONDS)
-          .map { ViewIntent.RetryLoadPageHorizontal }
+          .map { ViewIntent.RetryHorizontal }
       )
     ).addTo(compositeDisposable)
   }

app/src/main/java/com/hoc/pagination_mvi/ui/main/MainVM.kt

@@ -85,11 +85,19 @@ class MainVM @Inject constructor(
     ObservableTransformer<ViewIntent.RetryLoadPageHorizontal, PartialStateChange> { intents ->
       intents
         .withLatestFrom(stateObservable)
-        .filter { (_, vs) -> vs.shouldRetryHorizontal() }
+        .filter { (_, vs) -> vs.shouldRetryNextPageHorizontal() }
         .map { (_, vs) -> vs.getHorizontalListCount() }
         .exhaustMap { interactor.postNextPageChanges(start = it, limit = POST_PAGE_SIZE) }
     }
 
+  private val retryHorizontalProcessor =
+    ObservableTransformer<ViewIntent.RetryHorizontal, PartialStateChange> { intents ->
+      intents
+        .withLatestFrom(stateObservable)
+        .filter { (_, vs) -> vs.shouldRetryHorizontal() }
+        .exhaustMap { interactor.postFirstPageChanges(limit = POST_PAGE_SIZE) }
+    }
+
   private val toPartialStateChange =
     ObservableTransformer<ViewIntent, PartialStateChange> { intents ->
       intents
@@ -103,7 +111,8 @@ class MainVM @Inject constructor(
             ),
             shared.ofType<ViewIntent.RetryLoadPageHorizontal>().compose(
               retryLoadPageHorizontalProcessor
-            )
+            ),
+            shared.ofType<ViewIntent.RetryHorizontal>().compose(retryHorizontalProcessor)
           )
         }
         .compose(sendSingleEvent)