Merge pull request #1269 from AllanWang/enhancement/coroutine-auth

Enhancement/coroutine

1 files changed, 14 insertions, 6 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/contracts/FrostContentContract.kt b/app/src/main/kotlin/com/pitchedapps/frost/contracts/FrostContentContract.kt
index 50c2fe77..8a6e57af 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/contracts/FrostContentContract.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/contracts/FrostContentContract.kt
@@ -18,8 +18,9 @@ package com.pitchedapps.frost.contracts
 
 import android.view.View
 import com.pitchedapps.frost.facebook.FbItem
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.PublishSubject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.channels.BroadcastChannel
 
 /**
  * Created by Allan Wang on 20/12/17.
@@ -29,7 +30,7 @@ import io.reactivex.subjects.PublishSubject
  * Contract for the underlying parent,
  * binds to activities & fragments
  */
-interface FrostContentContainer {
+interface FrostContentContainer : CoroutineScope {
 
     val baseUrl: String
 
@@ -45,24 +46,28 @@ interface FrostContentContainer {
  * Contract for components shared among
  * all content providers
  */
+@UseExperimental(ExperimentalCoroutinesApi::class)
 interface FrostContentParent : DynamicUiContract {
 
+    val scope: CoroutineScope
+
     val core: FrostContentCore
 
     /**
      * Observable to get data on whether view is refreshing or not
      */
-    val refreshObservable: PublishSubject<Boolean>
+    val refreshChannel: BroadcastChannel<Boolean>
 
     /**
      * Observable to get data on refresh progress, with range [0, 100]
      */
-    val progressObservable: PublishSubject<Int>
+    val progressChannel: BroadcastChannel<Int>
 
     /**
      * Observable to get new title data (unique values only)
      */
-    val titleObservable: BehaviorSubject<String>
+    // todo note that this should be like a behavior subject vs publish subject
+    val titleChannel: BroadcastChannel<String>
 
     var baseUrl: String
 
@@ -106,6 +111,9 @@ interface FrostContentParent : DynamicUiContract {
  */
 interface FrostContentCore : DynamicUiContract {
 
+    val scope: CoroutineScope
+        get() = parent.scope
+
     /**
      * Reference to parent
      * Bound through calling [FrostContentParent.bind]