Use BehaviourSubject instead of LiveData

This commit is contained in:
Moez Bhatti
2017-11-28 02:20:24 -05:00
parent a364a3fb6d
commit 67e8ba893c
10 changed files with 20 additions and 33 deletions
@@ -1,6 +1,5 @@
package com.moez.QKSMS.presentation.base
import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
@@ -19,8 +18,6 @@ abstract class QkActivity<VM : QkViewModel<*, State>, State> : AppCompatActivity
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
onNewIntent(intent)
viewModel.state.observe(this, Observer { it?.let { render(it) } })
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -1,37 +1,27 @@
package com.moez.QKSMS.presentation.base
import android.arch.lifecycle.MutableLiveData
import android.arch.lifecycle.ViewModel
import android.support.annotation.CallSuper
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.subjects.PublishSubject
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.subjects.BehaviorSubject
abstract class QkViewModel<in View : QkView<State>, State>(initialState: State) : ViewModel() {
val state = MutableLiveData<State>()
protected val state: BehaviorSubject<State> = BehaviorSubject.createDefault(initialState)
private val stateReducer: PublishSubject<(State) -> State> = PublishSubject.create()
protected val disposables = CompositeDisposable()
protected val disposables = CompositeDisposable()
protected val intents = CompositeDisposable()
init {
stateReducer
.scan(initialState, { previousState, reducer -> reducer(previousState) })
.subscribe { newState -> state.value = newState }
}
fun setView(view: View) {
bindIntents(view)
}
@CallSuper
open fun bindIntents(view: View) {
open fun bindView(view: View) {
intents.clear()
intents += state.subscribe { view.render(it) }
}
protected fun newState(reducer: (State) -> State) {
stateReducer.onNext(reducer)
state.value?.let { state.onNext(reducer(it)) }
}
override fun onCleared() {
@@ -23,7 +23,7 @@ class ComposeActivity : QkActivity<ComposeViewModel, ComposeState>(), ComposeVie
super.onCreate(savedInstanceState)
setContentView(R.layout.compose_activity)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
viewModel.setView(this)
viewModel.bindView(this)
chips.layoutManager = FlexboxLayoutManager(this)
contacts.layoutManager = LinearLayoutManager(this)
@@ -40,8 +40,8 @@ class ComposeViewModel : QkViewModel<ComposeView, ComposeState>(ComposeState())
newState { it.copy(contacts = contactsFlowable, selectedContacts = selectedContacts) }
}
override fun bindIntents(view: ComposeView) {
super.bindIntents(view)
override fun bindView(view: ComposeView) {
super.bindView(view)
intents += view.queryChangedIntent
.toFlowable(BackpressureStrategy.LATEST)
@@ -51,7 +51,7 @@ class MainActivity : QkActivity<MainViewModel, MainState>(), MainView {
setContentView(R.layout.main_activity)
ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0).syncState()
requestPermissions()
viewModel.setView(this)
viewModel.bindView(this)
conversationList.layoutManager = LinearLayoutManager(this)
@@ -35,8 +35,8 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
markAllSeen.execute(Unit)
}
override fun bindIntents(view: MainView) {
super.bindIntents(view)
override fun bindView(view: MainView) {
super.bindView(view)
intents += view.composeIntent.subscribe {
navigator.showCompose()
@@ -38,7 +38,7 @@ class MessagesActivity : QkActivity<MessagesViewModel, MessagesState>(), Message
AppComponentManager.appComponent.inject(this)
setContentView(R.layout.message_list_activity)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
viewModel.setView(this)
viewModel.bindView(this)
layoutManager = LinearLayoutManager(this)
layoutManager.stackFromEnd = true
@@ -47,8 +47,8 @@ class MessagesViewModel(val threadId: Long) : QkViewModel<MessagesView, Messages
dataChanged()
}
override fun bindIntents(view: MessagesView) {
super.bindIntents(view)
override fun bindView(view: MessagesView) {
super.bindView(view)
intents += view.textChangedIntent.subscribe { text ->
newState { it.copy(draft = text.toString(), canSend = text.isNotEmpty()) }
@@ -27,7 +27,7 @@ class SettingsActivity : QkActivity<SettingsViewModel, SettingsState>(), Setting
progressDialog.setCanceledOnTouchOutside(false)
fragment = fragmentManager.findFragmentById(fragmentFrame.id) as? SettingsFragment ?: SettingsFragment()
viewModel.setView(this)
viewModel.bindView(this)
fragmentManager.beginTransaction()
.replace(fragmentFrame.id, fragment)
@@ -21,8 +21,8 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
disposables += fullSync
}
override fun bindIntents(view: SettingsView) {
super.bindIntents(view)
override fun bindView(view: SettingsView) {
super.bindView(view)
intents += view.preferenceClickIntent.subscribe {
Timber.v("Preference click: ${it.key}")