Implement subscription on components and apply new RCK to examples.

Author: skyfe79

app/src/main/java/com/github/skyfe79/android/library/app/examples/counter/CounterActivity.kt

@@ -24,14 +24,5 @@ class CounterActivity: AppCompatActivity() {
         layout.setContentView(this)
 
         layout.countTextView.text = "${viewModel.count.value}"
-
-        viewModel
-            .count
-            .asObservable()
-            .subscribe {
-                layout.countTextView.text = "$it"
-            }
-            .disposedBy(disposeBag)
-
     }
 }

app/src/main/java/com/github/skyfe79/android/library/app/examples/counter/CounterLayout.kt

@@ -4,13 +4,17 @@ import android.view.Gravity
 import android.view.View
 import android.widget.Button
 import android.widget.LinearLayout
+import android.widget.ProgressBar
 import android.widget.TextView
+import com.github.skyfe79.android.library.app.examples.counter.action.AsyncIncreaseAction
 import com.github.skyfe79.android.library.app.examples.counter.action.DecreaseAction
 import com.github.skyfe79.android.library.app.examples.counter.action.IncreaseAction
 import com.github.skyfe79.android.reactcomponentkit.component.LayoutComponent
 import com.github.skyfe79.android.reactcomponentkit.dispatcher.dispatch
 import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.redux.Async
 import com.github.skyfe79.android.reactcomponentkit.redux.State
+import com.github.skyfe79.android.reactcomponentkit.subscriber.subscribeState
 import org.jetbrains.anko.*
 import org.jetbrains.anko.sdk27.coroutines.onClick
 
@@ -23,6 +27,12 @@ class CounterLayout(token: Token): LayoutComponent<CounterActivity>(token) {
     lateinit var countTextView: TextView
     private lateinit var increaseButton: Button
     private lateinit var decreaseButton: Button
+    private lateinit var asyncIncreaseButton: Button
+    private lateinit var progress: ProgressBar
+
+    override fun onInit() {
+        subscribeState()
+    }
 
     override fun createView(ui: AnkoContext<CounterActivity>): View = with(ui) {
         val view = relativeLayout {
@@ -34,13 +44,18 @@ class CounterLayout(token: Token): LayoutComponent<CounterActivity>(token) {
                 centerInParent()
             }
 
+            progress = progressBar().lparams {
+                centerInParent()
+            }
+            progress.visibility = View.GONE
+
             linearLayout {
                 orientation = LinearLayout.HORIZONTAL
                 gravity = Gravity.CENTER
 
                 decreaseButton = button("   -   ").lparams(width = 0, weight = 1f)
                 increaseButton = button("   +   ").lparams(width = 0, weight = 1f)
-
+                asyncIncreaseButton = button("async +").lparams(width = 0, weight = 1f)
             }.applyRecursively {
                 when(it) {
                     is Button -> it.textSize = 20f
@@ -54,6 +69,10 @@ class CounterLayout(token: Token): LayoutComponent<CounterActivity>(token) {
         }
 
 
+        asyncIncreaseButton.setOnClickListener {
+            dispatch(AsyncIncreaseAction())
+        }
+
         increaseButton.setOnClickListener {
             dispatch(IncreaseAction())
         }
@@ -68,5 +87,15 @@ class CounterLayout(token: Token): LayoutComponent<CounterActivity>(token) {
     override fun on(state: State) {
         val countState = (state as? CounterState) ?: return
         countTextView.text = "${countState.count}"
+
+        when (state.asyncCount) {
+            is Async.Loading -> {
+                progress.visibility = View.VISIBLE
+                progress.animate()
+            }
+            is Async.Success -> {
+                progress.visibility = View.GONE
+            }
+        }
     }
 }

app/src/main/java/com/github/skyfe79/android/library/app/examples/counter/CounterViewModel.kt

@@ -1,6 +1,7 @@
 package com.github.skyfe79.android.library.app.examples.counter
 
 import android.app.Application
+import com.github.skyfe79.android.library.app.examples.counter.action.AsyncIncreaseAction
 import com.github.skyfe79.android.library.app.examples.counter.action.DecreaseAction
 import com.github.skyfe79.android.library.app.examples.counter.action.IncreaseAction
 import com.github.skyfe79.android.reactcomponentkit.redux.*
@@ -19,12 +20,9 @@ data class CounterState(
 class CounterViewModel(application: Application): RCKViewModel<CounterState>(application) {
 
     val count: Output<Int> = Output(0)
+    val asyncCount: Output<Async<Int>> = Output(Async.Uninitialized)
 
-    fun showLoading() = setState { state ->
-        state.copy(asyncCount = Async.Loading)
-    }
-
-    fun asyncIncrease(state: CounterState, action: IncreaseAction) = asyncReducer(state, action) {
+    fun asyncIncrease(state: CounterState, action: AsyncIncreaseAction) = asyncReducer(state, action) {
         Single.create<CounterState> { emitter ->
             Thread.sleep(1000L)
             withState { state ->
@@ -37,21 +35,30 @@ class CounterViewModel(application: Application): RCKViewModel<CounterState>(app
         initStore { store ->
             store.initialState(CounterState(0))
 
-            store.flow<IncreaseAction>(
+            store.flow<AsyncIncreaseAction>(
+                { _, _ ->
+                    setState {
+                        it.copy(asyncCount = Async.Loading)
+                    }
+                },
                 { state, action ->
-                    state.copy(count = state.count + 3)
+                    state.copy(count = state.count + action.payload)
                 },
                 ::asyncIncrease,
                 asyncFlow { action ->
                     Single.create<CounterState> { emitter ->
-                        Thread.sleep(5000L)
+                        Thread.sleep(2000L)
                         withState { state ->
-                            emitter.onSuccess(state.copy(count = state.count + action.payload))
+                            emitter.onSuccess(state.copy(count = state.count + action.payload, asyncCount = Async.Success(state.count + action.payload)))
                         }
                     }.toObservable()
                 }
             )
 
+            store.flow<IncreaseAction>({ state, action ->
+                state.copy(count = state.count + action.payload)
+            })
+
             store.flow<DecreaseAction>({ state, action ->
                 state.copy(count = state.count - action.payload)
             })
@@ -60,5 +67,6 @@ class CounterViewModel(application: Application): RCKViewModel<CounterState>(app
 
     override fun on(newState: CounterState) {
         count.accept(newState.count)
+        asyncCount.accept(newState.asyncCount)
     }
 }

app/src/main/java/com/github/skyfe79/android/library/app/examples/emojicollection/EmojiCollectionViewModel.kt

@@ -41,7 +41,7 @@ class EmojiCollectionViewModel(application: Application): RCKViewModel<EmojiColl
 
 
             store.flow<ClickEmojiAction>({ state, action ->
-                    state.copy(route = EmojiRoute.AlertEmoji(action.emoji))
+                state.copy(route = EmojiRoute.AlertEmoji(action.emoji))
             })
 
             store.flow<AddEmojiAction>(

app/src/main/java/com/github/skyfe79/android/library/app/examples/emojicollection/actions/Actions.kt

@@ -4,5 +4,4 @@ import com.github.skyfe79.android.reactcomponentkit.redux.Action
 
 data class AddEmojiAction(val emoji: String): Action
 object RemoveEmojiAction: Action
-object ShuffleEmojiAction: Action
-object MakeItemModelsAction: Action
+object ShuffleEmojiAction: Action

app/src/main/java/com/github/skyfe79/android/library/app/examples/emojicollection/afters/Reset.kt

@@ -12,6 +12,7 @@ import com.github.skyfe79.android.reactcomponentkit.dispatcher.dispatch
 import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
 import com.github.skyfe79.android.reactcomponentkit.redux.Action
 import com.github.skyfe79.android.reactcomponentkit.redux.State
+import com.github.skyfe79.android.reactcomponentkit.subscriber.subscribeState
 import kotlinx.android.synthetic.main.activity_main.view.*
 import org.jetbrains.anko.*
 import org.jetbrains.anko.sdk27.coroutines.onClick
@@ -41,10 +42,6 @@ class EmojiViewComponent(token: Token): ViewComponent(token) {
         return rootLayout
     }
 
-    override fun on(state: State) {
-        //ignore
-    }
-
     override fun on(item: ItemModel, position: Int) {
         val emojiProvider = (item as? EmojiProvider) ?: return
         emojiTextView.text = emojiProvider.emoji

app/src/main/java/com/github/skyfe79/android/library/app/examples/emojicollection/components/EmojiViewComponent.kt

@@ -2,28 +2,19 @@ package com.github.skyfe79.android.library.app.examples.emojicollection.reducers
 
 import com.github.skyfe79.android.library.app.examples.emojicollection.EmojiCollectionState
 import com.github.skyfe79.android.library.app.examples.emojicollection.EmojiCollectionViewModel
-import com.github.skyfe79.android.library.app.examples.emojicollection.EmojiRoute
 import com.github.skyfe79.android.library.app.examples.emojicollection.actions.AddEmojiAction
-import com.github.skyfe79.android.library.app.examples.emojicollection.actions.MakeItemModelsAction
 import com.github.skyfe79.android.library.app.examples.emojicollection.actions.RemoveEmojiAction
 import com.github.skyfe79.android.library.app.examples.emojicollection.actions.ShuffleEmojiAction
-import com.github.skyfe79.android.library.app.examples.emojicollection.components.ClickEmojiAction
 import com.github.skyfe79.android.library.app.examples.emojicollection.models.EmojiBoxModel
 import com.github.skyfe79.android.library.app.examples.emojicollection.util.EmojiHelper
-import com.github.skyfe79.android.reactcomponentkit.redux.Action
-import com.github.skyfe79.android.reactcomponentkit.redux.State
-import io.reactivex.Observable
-import io.reactivex.Single
-import io.reactivex.rxkotlin.subscribeBy
 import java.lang.Exception
-import kotlin.random.Random
 
 
 fun EmojiCollectionViewModel.addEmoji(state: EmojiCollectionState, action: AddEmojiAction): EmojiCollectionState {
         val mutableEmojiList = state.emojis.toMutableList()
         val index = if (mutableEmojiList.isEmpty()) 0 else (0 until mutableEmojiList.size).random()
         mutableEmojiList.add(index, EmojiHelper.emoji)
-        return state.copy(emojis = mutableEmojiList)
+        return makeItemModels(state.copy(emojis = mutableEmojiList))
 }
 
 
@@ -32,7 +23,7 @@ fun EmojiCollectionViewModel.removeEmoji(state: EmojiCollectionState, action: Re
         val mutableEmojiList = state.emojis.toMutableList()
         val index = if (mutableEmojiList.isEmpty()) 0 else (0 until mutableEmojiList.size).random()
         mutableEmojiList.removeAt(index)
-        return state.copy(emojis = mutableEmojiList)
+        return makeItemModels(state.copy(emojis = mutableEmojiList))
     } catch (e: Exception) {
         throw  e
     }

app/src/main/java/com/github/skyfe79/android/library/app/examples/emojicollection/reducers/Reducers.kt

@@ -23,14 +23,14 @@ publish {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
-        versionCode 10
-        versionName "1.2.8"
+        targetSdkVersion 29
+        versionCode 11
+        versionName "2.0.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

reactcomponentkit/build.gradle

@@ -13,7 +13,7 @@ internal object RCK {
         this.map[token] = WeakReference(viewModel)
     }
 
-    internal fun <S: State> unregisterViewModel(token: Token) {
+    internal fun unregisterViewModel(token: Token) {
         this.map.remove(token)
     }
 

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/RCK.kt

@@ -1,8 +1,12 @@
 package com.github.skyfe79.android.reactcomponentkit
 
 import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.redux.State
 
+interface StateSubscriber {
+    fun on(state: State) = Unit
+}
 
-interface ReactComponent {
+interface ReactComponent: StateSubscriber {
     var token: Token
 }

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/ReactComponent.kt

@@ -4,10 +4,8 @@ import android.content.Context
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
-import com.github.skyfe79.android.reactcomponentkit.RCK
 import com.github.skyfe79.android.reactcomponentkit.ReactComponent
 import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
-import com.github.skyfe79.android.reactcomponentkit.redux.Action
 import com.github.skyfe79.android.reactcomponentkit.redux.State
 
 internal enum class FragmentComponentState {
@@ -41,9 +39,12 @@ abstract class FragmentComponent: Fragment(), ReactComponent {
                 this@FragmentComponent.token = (it.getParcelable("token") as? Token) ?: Token.empty
             }
         }
+
+        this.onInit()
     }
 
-    abstract fun on(state: State)
+    open fun onInit() = Unit
+    abstract override fun on(state: State)
 }
 
 inline fun <reified T: FragmentComponent> FragmentActivity.fragmentComponent(token: Token): T {

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/component/FragmentComponent.kt

@@ -0,0 +1,21 @@
+package com.github.skyfe79.android.reactcomponentkit.component
+
+import android.app.IntentService
+import com.github.skyfe79.android.reactcomponentkit.ReactComponent
+import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.redux.State
+
+abstract class IntentServiceComponent(token: Token, name: String): IntentService(name), ReactComponent {
+    override var token: Token = token
+
+    init {
+        this.onInit()
+    }
+
+    open fun onInit() = Unit
+
+    /**
+     * It is called when the component is standalone view component.
+     */
+    override fun on(state: State) = Unit
+}

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/component/IntentServiceComponent.kt

@@ -14,7 +14,10 @@ abstract class LayoutComponent<in T> : AnkoComponent<T>, ReactComponent {
 
     constructor(token: Token) {
         this.token = token
+        this.onInit()
     }
 
-    abstract fun on(state: State)
+    open fun onInit() = Unit
+
+    abstract override fun on(state: State)
 }

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/component/LayoutComponent.kt

@@ -0,0 +1,15 @@
+package com.github.skyfe79.android.reactcomponentkit.component
+
+import android.app.Service
+import com.github.skyfe79.android.reactcomponentkit.ReactComponent
+import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+
+abstract class ServiceComponent(token: Token): Service(), ReactComponent {
+    override var token: Token = token
+
+    init {
+        this.onInit()
+    }
+
+    open fun onInit() = Unit
+}