Switch remaining primary observables

4 files changed, 38 insertions, 60 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt
index 2c46edbc..c5880840 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt
@@ -39,12 +39,13 @@ import com.pitchedapps.frost.utils.Prefs
 import com.pitchedapps.frost.utils.REQUEST_REFRESH
 import com.pitchedapps.frost.utils.REQUEST_TEXT_ZOOM
 import com.pitchedapps.frost.utils.frostEvent
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.channels.ReceiveChannel
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
 import kotlin.coroutines.CoroutineContext
 
 /**
@@ -87,7 +88,7 @@ abstract class BaseFragment : Fragment(), CoroutineScope, FragmentContract, Dyna
     override var valid: Boolean
         get() = arguments!!.getBoolean(ARG_VALID, true)
         set(value) {
-            if (value || this is WebFragment) return
+            if (!isActive || value || this is WebFragment) return
             arguments!!.putBoolean(ARG_VALID, value)
             L.e { "Invalidating position $position" }
             frostEvent(
@@ -98,7 +99,7 @@ abstract class BaseFragment : Fragment(), CoroutineScope, FragmentContract, Dyna
         }
 
     override var firstLoad: Boolean = true
-    private var activityDisposable: Disposable? = null
+    private var activityReceiver: ReceiveChannel<Int>? = null
     private var onCreateRunnable: ((FragmentContract) -> Unit)? = null
 
     override var content: FrostContentParent? = null
@@ -154,29 +155,34 @@ abstract class BaseFragment : Fragment(), CoroutineScope, FragmentContract, Dyna
         (context as? MainActivityContract)?.setTitle(title)
     }
 
-    override fun attachMainObservable(contract: MainActivityContract): Disposable =
-        contract.fragmentSubject.observeOn(AndroidSchedulers.mainThread()).subscribe {
-            when (it) {
-                REQUEST_REFRESH -> {
-                    core?.apply {
-                        clearHistory()
-                        firstLoad = true
-                        firstLoadRequest()
+    override fun attachMainObservable(contract: MainActivityContract): ReceiveChannel<Int> {
+        val receiver = contract.fragmentChannel.openSubscription()
+        launch {
+            for (flag in receiver) {
+                when (flag) {
+                    REQUEST_REFRESH -> {
+                        core?.apply {
+                            clearHistory()
+                            firstLoad = true
+                            firstLoadRequest()
+                        }
+                    }
+                    position -> {
+                        contract.setTitle(baseEnum.titleId)
+                        updateFab(contract)
+                        core?.active = true
+                    }
+                    -(position + 1) -> {
+                        core?.active = false
+                    }
+                    REQUEST_TEXT_ZOOM -> {
+                        reloadTextSize()
                     }
-                }
-                position -> {
-                    contract.setTitle(baseEnum.titleId)
-                    updateFab(contract)
-                    core?.active = true
-                }
-                -(position + 1) -> {
-                    core?.active = false
-                }
-                REQUEST_TEXT_ZOOM -> {
-                    reloadTextSize()
                 }
             }
         }
+        return receiver
+    }
 
     override fun updateFab(contract: MainFabContract) {
         contract.hideFab() // default
@@ -195,14 +201,14 @@ abstract class BaseFragment : Fragment(), CoroutineScope, FragmentContract, Dyna
     }
 
     override fun detachMainObservable() {
-        activityDisposable?.dispose()
+        activityReceiver?.cancel()
     }
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
         detachMainObservable()
         if (context is MainActivityContract)
-            activityDisposable = attachMainObservable(context)
+            activityReceiver = attachMainObservable(context)
     }
 
     override fun onDetach() {
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentContract.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentContract.kt
index eaef17e5..10c612c5 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentContract.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentContract.kt
@@ -22,7 +22,7 @@ import com.pitchedapps.frost.contracts.FrostContentParent
 import com.pitchedapps.frost.contracts.MainActivityContract
 import com.pitchedapps.frost.contracts.MainFabContract
 import com.pitchedapps.frost.views.FrostRecyclerView
-import io.reactivex.disposables.Disposable
+import kotlinx.coroutines.channels.ReceiveChannel
 
 /**
  * Created by Allan Wang on 2017-11-07.
@@ -34,8 +34,9 @@ interface FragmentContract : FrostContentContainer {
 
     /**
      * Defines whether the fragment is valid in the viewpager
-     * Or if it needs to be recreated
-     * May be called from any thread to toggle status
+     * or if it needs to be recreated
+     * May be called from any thread to toggle status.
+     * Note that calls beyond the fragment lifecycle will be ignored
      */
     var valid: Boolean
 
@@ -75,9 +76,10 @@ interface FragmentContract : FrostContentContainer {
 
     /**
      * Call whenever a fragment is attached so that it may listen
-     * to activity emissions
+     * to activity emissions.
+     * Returns a means of closing the listener, which can be called from [detachMainObservable]
      */
-    fun attachMainObservable(contract: MainActivityContract): Disposable
+    fun attachMainObservable(contract: MainActivityContract): ReceiveChannel<Int>
 
     /**
      * Call when fragment is detached so that any existing
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt
index ddb9fde6..c03ac0e2 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt
@@ -21,7 +21,6 @@ import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.IItem
 import com.mikepenz.fastadapter.adapters.ItemAdapter
 import com.mikepenz.fastadapter.adapters.ModelAdapter
-import com.mikepenz.fastadapter_extensions.items.ProgressItem
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.facebook.parsers.FrostParser
@@ -142,31 +141,3 @@ abstract class FrostParserFragment<T : Any, Item : IItem<*, *>> : RecyclerFragme
         return@withContext items
     }
 }
-
-//abstract class PagedRecyclerFragment<T : Any, Item : IItem<*, *>> : RecyclerFragment<T, Item>() {
-//
-//    var allowPagedLoading = true
-//
-//    val footerAdapter = ItemAdapter<FrostProgress>()
-//
-//    val footerScrollListener = object : EndlessRecyclerOnScrollListener(footerAdapter) {
-//        override fun onLoadMore(currentPage: Int) {
-//            TODO("not implemented")
-//
-//        }
-//
-//    }
-//
-//    override fun getAdapter() = fastAdapter(adapter, footerAdapter)
-//
-//    override fun bindImpl(recyclerView: FrostRecyclerView) {
-//        recyclerView.addOnScrollListener(footerScrollListener)
-//    }
-//
-//    override fun reload(progress: (Int) -> Unit, callback: (Boolean) -> Unit) {
-//        footerScrollListener.
-//        super.reload(progress, callback)
-//    }
-//}
-
-class FrostProgress : ProgressItem()
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragments.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragments.kt
index 45cf2290..f7ed9937 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragments.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragments.kt
@@ -37,7 +37,6 @@ import com.pitchedapps.frost.iitems.NotificationIItem
 import com.pitchedapps.frost.utils.frostJsoup
 import com.pitchedapps.frost.views.FrostRecyclerView
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 /**