Align list retrying behavior

Author: LaurentTreguier

app/src/legacy/kotlin/app/fyreplace/fyreplace/legacy/ui/fragments/FeedFragment.kt

@@ -52,7 +52,7 @@ class FeedFragment :
             when {
                 !canAutoRefresh -> return@launchCollect
                 lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED) -> refreshListing()
-                else -> reset()
+                else -> resetListing()
             }
         }
     }
@@ -101,10 +101,10 @@ class FeedFragment :
     }
 
     override fun onPostVoted(view: View, position: Int, spread: Boolean) {
+        view.provideHapticFeedback(positive = spread)
         launch {
             vm.vote(position, spread)
             adapter.remove(position)
-            view.provideHapticFeedback(positive = spread)
         }
     }
 
@@ -134,9 +134,14 @@ class FeedFragment :
 
     private fun stopListing() = vm.stopListing()
 
+    private fun resetListing() {
+        adapter.removeAll()
+        vm.reset()
+    }
+
     private fun refreshListing() {
         stopListing()
-        reset()
+        resetListing()
         startListing()
     }
 
@@ -145,9 +150,4 @@ class FeedFragment :
         retryCount++
         startListing()
     }
-
-    private fun reset() {
-        adapter.removeAll()
-        vm.reset()
-    }
 }

app/src/legacy/kotlin/app/fyreplace/fyreplace/legacy/ui/fragments/ItemListFragment.kt

@@ -83,7 +83,6 @@ abstract class ItemListFragment<Item, Items, VH : ItemHolder> :
 
     override fun onStart() {
         super.onStart()
-        retryCount = 0
         startListing()
     }
 
@@ -141,17 +140,18 @@ abstract class ItemListFragment<Item, Items, VH : ItemHolder> :
 
     private fun retryListing() {
         stopListing()
+        retryCount++
         startListing()
     }
 
     private fun startListing() {
         launch {
             vm.startListing().launchCollect(retry = if (retryCount < 3) ::retryListing else null) {
                 bd.swipe.isRefreshing = false
+                retryCount = 0
                 adapter.addAll(it)
             }
 
-            retryCount++
             val manualCount = max(vm.manuallyAddedCount, 0)
 
             if (adapter.itemCount - manualCount <= 0) {

app/src/legacy/kotlin/app/fyreplace/fyreplace/legacy/ui/fragments/ItemRandomAccessListFragment.kt

@@ -74,7 +74,6 @@ abstract class ItemRandomAccessListFragment<Item, Items, VH : ItemHolder> :
 
     override fun onStart() {
         super.onStart()
-        retryCount = 0
         launch { startFetchingData() }
     }
 
@@ -112,18 +111,18 @@ abstract class ItemRandomAccessListFragment<Item, Items, VH : ItemHolder> :
     open suspend fun startFetchingData() {
         vm.startListing()
             .launchCollect(retry = if (retryCount < 3) ::retryListing else null) { (position, items) ->
+                retryCount = 0
                 onFetchedItems(position, items)
             }
 
-        retryCount++
-
         if (adapter.totalSize == 0) {
             vm.fetchAround(0)
         }
     }
 
     private fun retryListing() {
         vm.stopListing()
+        retryCount++
         launch { startFetchingData() }
     }
 }