From a43ce9671962ba7c9f7831f13898e116e98d0f9f Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 31 Oct 2017 01:05:52 -0700 Subject: [PATCH] Create QkViewModel, remove need for PartialState objects --- .../QKSMS/presentation/base/QkViewModel.kt | 23 +++++++++++++++ .../ConversationListViewModel.kt | 21 +++++--------- .../ConversationListViewState.kt | 20 +------------ .../messages/MessageListViewModel.kt | 20 ++++--------- .../messages/MessageListViewState.kt | 29 ++----------------- 5 files changed, 39 insertions(+), 74 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt 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 new file mode 100644 index 00000000..e2330f3b --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt @@ -0,0 +1,23 @@ +package com.moez.QKSMS.presentation.base + +import android.arch.lifecycle.MutableLiveData +import android.arch.lifecycle.ViewModel +import io.reactivex.subjects.PublishSubject + +abstract class QkViewModel(initialState: State) : ViewModel() { + + val state = MutableLiveData() + + private val stateReducer: PublishSubject<(State) -> State> = PublishSubject.create() + + init { + stateReducer + .scan(initialState, { previousState, reducer -> reducer(previousState) }) + .subscribe { newState -> state.value = newState } + } + + protected fun newState(reducer: (State) -> State) { + stateReducer.onNext(reducer) + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt index d2a66f97..36e2aaa3 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt @@ -1,43 +1,36 @@ package com.moez.QKSMS.presentation.conversations -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.domain.interactor.MarkAllSeen import com.moez.QKSMS.domain.interactor.SyncConversations -import io.reactivex.subjects.PublishSubject +import com.moez.QKSMS.presentation.base.QkViewModel import io.realm.RealmResults import javax.inject.Inject -class ConversationListViewModel : ViewModel() { +class ConversationListViewModel : QkViewModel(ConversationListViewState()) { @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var syncConversations: SyncConversations @Inject lateinit var markAllSeen: MarkAllSeen - val state: MutableLiveData = MutableLiveData() - - private val partialStates: PublishSubject = PublishSubject.create() private val conversations: RealmResults init { AppComponentManager.appComponent.inject(this) - partialStates - .scan(ConversationListViewState(), { previous, changes -> changes.reduce(previous) }) - .subscribe { newState -> state.value = newState } - conversations = messageRepo.getConversationMessagesAsync() - partialStates.onNext(PartialState.ConversationsLoaded(conversations)) + newState { it.copy(conversations = conversations) } markAllSeen.execute(Unit) } fun onRefresh() { - partialStates.onNext(PartialState.Refreshing(true)) - syncConversations.execute(Unit, { partialStates.onNext(PartialState.Refreshing(false)) }) + newState { it.copy(refreshing = true) } + syncConversations.execute(Unit, { + newState { it.copy(refreshing = false) } + }) } override fun onCleared() { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewState.kt index 6a3c3806..e6605af5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewState.kt @@ -6,22 +6,4 @@ import io.realm.OrderedRealmCollection data class ConversationListViewState( val conversations: OrderedRealmCollection? = null, val refreshing: Boolean = false -) - -sealed class PartialState { - - abstract fun reduce(previousState: ConversationListViewState): ConversationListViewState - - data class ConversationsLoaded(val conversations: OrderedRealmCollection) : PartialState() { - override fun reduce(previousState: ConversationListViewState): ConversationListViewState { - return previousState.copy(conversations = conversations) - } - } - - data class Refreshing(val refreshing: Boolean) : PartialState (){ - override fun reduce(previousState: ConversationListViewState): ConversationListViewState { - return previousState.copy(refreshing = refreshing) - } - } - -} \ No newline at end of file +) \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt index 7877d67f..6d8dbb4e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt @@ -1,37 +1,29 @@ package com.moez.QKSMS.presentation.messages -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.domain.interactor.MarkRead import com.moez.QKSMS.domain.interactor.SendMessage -import io.reactivex.subjects.PublishSubject +import com.moez.QKSMS.presentation.base.QkViewModel import javax.inject.Inject -class MessageListViewModel : ViewModel() { +class MessageListViewModel : QkViewModel(MessageListViewState()) { @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var sendMessage: SendMessage @Inject lateinit var markRead: MarkRead - val state: MutableLiveData = MutableLiveData() var threadId: Long = 0 set(value) { field = value newThreadId() } - private val partialStates: PublishSubject = PublishSubject.create() private var conversation: Conversation? = null init { AppComponentManager.appComponent.inject(this) - - partialStates - .scan(MessageListViewState(), { previous, changes -> changes.reduce(previous) }) - .subscribe { newState -> state.value = newState } } private fun newThreadId() { @@ -43,9 +35,9 @@ class MessageListViewModel : ViewModel() { true -> { val title = conversation.getTitle() val messages = messageRepo.getMessages(threadId) - partialStates.onNext(PartialState.ConversationLoaded(title, messages)) + newState { it.copy(title = title, messages = messages) } } - false -> partialStates.onNext(PartialState.ConversationError(true)) + false -> newState { it.copy(hasError = true) } } } } @@ -53,7 +45,7 @@ class MessageListViewModel : ViewModel() { fun sendMessage(body: String) { conversation?.takeIf { conversation -> conversation.isValid }?.let { conversation -> sendMessage.execute(SendMessage.Params(threadId, conversation.contacts[0].address, body)) - partialStates.onNext(PartialState.TextChanged("")) + newState { it.copy(draft = "", canSend = false) } } } @@ -62,7 +54,7 @@ class MessageListViewModel : ViewModel() { } fun textChanged(text: String) { - partialStates.onNext(PartialState.TextChanged(text)) + newState { it.copy(draft = text, canSend = text.isNotEmpty()) } } override fun onCleared() { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewState.kt index 781ae5c3..8914f134 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewState.kt @@ -7,31 +7,6 @@ data class MessageListViewState( val title: String = "", val messages: RealmResults? = null, val draft: String = "", + val canSend: Boolean = false, val hasError: Boolean = false -) { - val canSend: Boolean get() = draft.isNotBlank() -} - -sealed class PartialState { - - abstract fun reduce(previousState: MessageListViewState): MessageListViewState - - data class ConversationLoaded(private val title: String, private val messages: RealmResults) : PartialState() { - override fun reduce(previousState: MessageListViewState): MessageListViewState { - return previousState.copy(title = title, messages = messages) - } - } - - data class ConversationError(private val hasError: Boolean) : PartialState() { - override fun reduce(previousState: MessageListViewState): MessageListViewState { - return previousState.copy(hasError = hasError) - } - } - - data class TextChanged(private val text: String) : PartialState() { - override fun reduce(previousState: MessageListViewState): MessageListViewState { - return previousState.copy(draft = text) - } - } - -} \ No newline at end of file +) \ No newline at end of file