diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt index 4be4843c..e209ca14 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt @@ -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, 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 { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt index 22bcd54c..1df0aa2c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt @@ -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, State>(initialState: State) : ViewModel() { - val state = MutableLiveData() + protected val state: BehaviorSubject = 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() { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt index c1dd2b17..5a45a7ae 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -23,7 +23,7 @@ class ComposeActivity : QkActivity(), 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) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt index f576a6a2..47d8cb89 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt @@ -40,8 +40,8 @@ class ComposeViewModel : QkViewModel(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) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index 953dbe2a..382fb924 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt @@ -51,7 +51,7 @@ class MainActivity : QkActivity(), MainView { setContentView(R.layout.main_activity) ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0).syncState() requestPermissions() - viewModel.setView(this) + viewModel.bindView(this) conversationList.layoutManager = LinearLayoutManager(this) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt index 0e886d3b..c0ec0488 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt @@ -35,8 +35,8 @@ class MainViewModel : QkViewModel(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() diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt index 3636afce..3d0ffbac 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt @@ -38,7 +38,7 @@ class MessagesActivity : QkActivity(), 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 diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt index 5c9c599f..4fceef34 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt @@ -47,8 +47,8 @@ class MessagesViewModel(val threadId: Long) : QkViewModel newState { it.copy(draft = text.toString(), canSend = text.isNotEmpty()) } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt index d959f16a..bcdf4f69 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt @@ -27,7 +27,7 @@ class SettingsActivity : QkActivity(), Setting progressDialog.setCanceledOnTouchOutside(false) fragment = fragmentManager.findFragmentById(fragmentFrame.id) as? SettingsFragment ?: SettingsFragment() - viewModel.setView(this) + viewModel.bindView(this) fragmentManager.beginTransaction() .replace(fragmentFrame.id, fragment) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt index e0fe586c..e2f777c3 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt @@ -21,8 +21,8 @@ class SettingsViewModel : QkViewModel(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}")