Remove unnecessary receiver type enforcement (#145)

AniTrend · Apr 8, 2023 · 65247cf · 65247cf
1 parent 12f6cc7
commit 65247cf
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 96 deletions.
diff --git a/extension/src/main/kotlin/co/anitrend/arch/extension/ext/LifecycleExt.kt b/extension/src/main/kotlin/co/anitrend/arch/extension/ext/LifecycleExt.kt
diff --git a/gradle/release.properties b/gradle/release.properties
@@ -1,2 +1,2 @@
-version=1.6.0
-code=1000600000
+version=1.6.1
+code=1000600001
diff --git a/ui/src/main/kotlin/co/anitrend/arch/ui/fragment/list/SupportFragmentList.kt b/ui/src/main/kotlin/co/anitrend/arch/ui/fragment/list/SupportFragmentList.kt
@@ -24,14 +24,14 @@ import androidx.annotation.IntegerRes
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.paging.PagedList
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import co.anitrend.arch.domain.entities.LoadState
 import co.anitrend.arch.extension.ext.attachComponent
 import co.anitrend.arch.extension.ext.detachComponent
-import co.anitrend.arch.extension.ext.repeatOn
 import co.anitrend.arch.recycler.SupportRecyclerView
 import co.anitrend.arch.recycler.adapter.SupportListAdapter
 import co.anitrend.arch.recycler.adapter.contract.ISupportAdapter
@@ -88,17 +88,19 @@ abstract class SupportFragmentList<M> : SupportFragment(), ISupportFragmentList<
     }
 
     protected open fun ISupportAdapter<*>.registerFlowListener() {
-        lifecycleScope.repeatOn(Lifecycle.State.RESUMED) {
-            clickableFlow
-                .debounce(16)
-                .filterIsInstance<ClickableItem.State>()
-                .onEach {
-                    if (it.state !is LoadState.Loading) {
-                        viewModelState()?.retry()
-                    } else {
-                        Timber.d("retry -> state is loading? current state: ${it.state}")
-                    }
-                }.collect()
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                clickableFlow
+                    .debounce(16)
+                    .filterIsInstance<ClickableItem.State>()
+                    .onEach {
+                        if (it.state !is LoadState.Loading) {
+                            viewModelState()?.retry()
+                        } else {
+                            Timber.d("retry -> state is loading? current state: ${it.state}")
+                        }
+                    }.collect()
+            }
         }
     }
 
@@ -154,22 +156,26 @@ abstract class SupportFragmentList<M> : SupportFragment(), ISupportFragmentList<
     override fun initializeComponents(savedInstanceState: Bundle?) {
         attachComponent(supportViewAdapter)
         attachComponent(listPresenter)
-        lifecycleScope.repeatOn(Lifecycle.State.RESUMED) {
-            listPresenter.stateLayout.interactionFlow
-                .debounce(16)
-                .filterIsInstance<ClickableItem.State>()
-                .onEach {
-                    if (it.state !is LoadState.Loading) {
-                        viewModelState()?.retry()
-                    } else {
-                        Timber.d("state is loading? current state: ${it.state}")
-                    }
-                }.collect()
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                listPresenter.stateLayout.interactionFlow
+                    .debounce(16)
+                    .filterIsInstance<ClickableItem.State>()
+                    .onEach {
+                        if (it.state !is LoadState.Loading) {
+                            viewModelState()?.retry()
+                        } else {
+                            Timber.d("state is loading? current state: ${it.state}")
+                        }
+                    }.collect()
+            }
         }
 
-        lifecycleScope.repeatOn(Lifecycle.State.RESUMED) {
-            if (supportViewAdapter.isEmpty()) {
-                onFetchDataInitialize()
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                if (supportViewAdapter.isEmpty()) {
+                    onFetchDataInitialize()
+                }
             }
         }
     }