forked from upstream-mirrors/quik
Use BehaviourSubject instead of LiveData
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
package com.moez.QKSMS.presentation.base
|
package com.moez.QKSMS.presentation.base
|
||||||
|
|
||||||
import android.arch.lifecycle.Observer
|
|
||||||
import android.arch.lifecycle.ViewModelProviders
|
import android.arch.lifecycle.ViewModelProviders
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.support.v7.app.AppCompatActivity
|
import android.support.v7.app.AppCompatActivity
|
||||||
@@ -19,8 +18,6 @@ abstract class QkActivity<VM : QkViewModel<*, State>, State> : AppCompatActivity
|
|||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
onNewIntent(intent)
|
onNewIntent(intent)
|
||||||
|
|
||||||
viewModel.state.observe(this, Observer { it?.let { render(it) } })
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||||
|
|||||||
@@ -1,37 +1,27 @@
|
|||||||
package com.moez.QKSMS.presentation.base
|
package com.moez.QKSMS.presentation.base
|
||||||
|
|
||||||
import android.arch.lifecycle.MutableLiveData
|
|
||||||
import android.arch.lifecycle.ViewModel
|
import android.arch.lifecycle.ViewModel
|
||||||
import android.support.annotation.CallSuper
|
import android.support.annotation.CallSuper
|
||||||
import io.reactivex.disposables.CompositeDisposable
|
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() {
|
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()
|
protected val intents = CompositeDisposable()
|
||||||
|
|
||||||
init {
|
|
||||||
stateReducer
|
|
||||||
.scan(initialState, { previousState, reducer -> reducer(previousState) })
|
|
||||||
.subscribe { newState -> state.value = newState }
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setView(view: View) {
|
|
||||||
bindIntents(view)
|
|
||||||
}
|
|
||||||
|
|
||||||
@CallSuper
|
@CallSuper
|
||||||
open fun bindIntents(view: View) {
|
open fun bindView(view: View) {
|
||||||
intents.clear()
|
intents.clear()
|
||||||
|
|
||||||
|
intents += state.subscribe { view.render(it) }
|
||||||
}
|
}
|
||||||
|
|
||||||
protected fun newState(reducer: (State) -> State) {
|
protected fun newState(reducer: (State) -> State) {
|
||||||
stateReducer.onNext(reducer)
|
state.value?.let { state.onNext(reducer(it)) }
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onCleared() {
|
override fun onCleared() {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ class ComposeActivity : QkActivity<ComposeViewModel, ComposeState>(), ComposeVie
|
|||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
setContentView(R.layout.compose_activity)
|
setContentView(R.layout.compose_activity)
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||||
viewModel.setView(this)
|
viewModel.bindView(this)
|
||||||
|
|
||||||
chips.layoutManager = FlexboxLayoutManager(this)
|
chips.layoutManager = FlexboxLayoutManager(this)
|
||||||
contacts.layoutManager = LinearLayoutManager(this)
|
contacts.layoutManager = LinearLayoutManager(this)
|
||||||
|
|||||||
@@ -40,8 +40,8 @@ class ComposeViewModel : QkViewModel<ComposeView, ComposeState>(ComposeState())
|
|||||||
newState { it.copy(contacts = contactsFlowable, selectedContacts = selectedContacts) }
|
newState { it.copy(contacts = contactsFlowable, selectedContacts = selectedContacts) }
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun bindIntents(view: ComposeView) {
|
override fun bindView(view: ComposeView) {
|
||||||
super.bindIntents(view)
|
super.bindView(view)
|
||||||
|
|
||||||
intents += view.queryChangedIntent
|
intents += view.queryChangedIntent
|
||||||
.toFlowable(BackpressureStrategy.LATEST)
|
.toFlowable(BackpressureStrategy.LATEST)
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ class MainActivity : QkActivity<MainViewModel, MainState>(), MainView {
|
|||||||
setContentView(R.layout.main_activity)
|
setContentView(R.layout.main_activity)
|
||||||
ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0).syncState()
|
ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0).syncState()
|
||||||
requestPermissions()
|
requestPermissions()
|
||||||
viewModel.setView(this)
|
viewModel.bindView(this)
|
||||||
|
|
||||||
conversationList.layoutManager = LinearLayoutManager(this)
|
conversationList.layoutManager = LinearLayoutManager(this)
|
||||||
|
|
||||||
|
|||||||
@@ -35,8 +35,8 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
|||||||
markAllSeen.execute(Unit)
|
markAllSeen.execute(Unit)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun bindIntents(view: MainView) {
|
override fun bindView(view: MainView) {
|
||||||
super.bindIntents(view)
|
super.bindView(view)
|
||||||
|
|
||||||
intents += view.composeIntent.subscribe {
|
intents += view.composeIntent.subscribe {
|
||||||
navigator.showCompose()
|
navigator.showCompose()
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ class MessagesActivity : QkActivity<MessagesViewModel, MessagesState>(), Message
|
|||||||
AppComponentManager.appComponent.inject(this)
|
AppComponentManager.appComponent.inject(this)
|
||||||
setContentView(R.layout.message_list_activity)
|
setContentView(R.layout.message_list_activity)
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||||
viewModel.setView(this)
|
viewModel.bindView(this)
|
||||||
|
|
||||||
layoutManager = LinearLayoutManager(this)
|
layoutManager = LinearLayoutManager(this)
|
||||||
layoutManager.stackFromEnd = true
|
layoutManager.stackFromEnd = true
|
||||||
|
|||||||
@@ -47,8 +47,8 @@ class MessagesViewModel(val threadId: Long) : QkViewModel<MessagesView, Messages
|
|||||||
dataChanged()
|
dataChanged()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun bindIntents(view: MessagesView) {
|
override fun bindView(view: MessagesView) {
|
||||||
super.bindIntents(view)
|
super.bindView(view)
|
||||||
|
|
||||||
intents += view.textChangedIntent.subscribe { text ->
|
intents += view.textChangedIntent.subscribe { text ->
|
||||||
newState { it.copy(draft = text.toString(), canSend = text.isNotEmpty()) }
|
newState { it.copy(draft = text.toString(), canSend = text.isNotEmpty()) }
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class SettingsActivity : QkActivity<SettingsViewModel, SettingsState>(), Setting
|
|||||||
progressDialog.setCanceledOnTouchOutside(false)
|
progressDialog.setCanceledOnTouchOutside(false)
|
||||||
|
|
||||||
fragment = fragmentManager.findFragmentById(fragmentFrame.id) as? SettingsFragment ?: SettingsFragment()
|
fragment = fragmentManager.findFragmentById(fragmentFrame.id) as? SettingsFragment ?: SettingsFragment()
|
||||||
viewModel.setView(this)
|
viewModel.bindView(this)
|
||||||
|
|
||||||
fragmentManager.beginTransaction()
|
fragmentManager.beginTransaction()
|
||||||
.replace(fragmentFrame.id, fragment)
|
.replace(fragmentFrame.id, fragment)
|
||||||
|
|||||||
@@ -21,8 +21,8 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
|||||||
disposables += fullSync
|
disposables += fullSync
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun bindIntents(view: SettingsView) {
|
override fun bindView(view: SettingsView) {
|
||||||
super.bindIntents(view)
|
super.bindView(view)
|
||||||
|
|
||||||
intents += view.preferenceClickIntent.subscribe {
|
intents += view.preferenceClickIntent.subscribe {
|
||||||
Timber.v("Preference click: ${it.key}")
|
Timber.v("Preference click: ${it.key}")
|
||||||
|
|||||||
Reference in New Issue
Block a user