Use View to expose Intents instead of performing logic inside of Activity

This commit is contained in:
Moez Bhatti
2017-10-31 11:50:11 -07:00
parent eee5b45dd5
commit f2088d73c1
9 changed files with 72 additions and 36 deletions
@@ -5,8 +5,8 @@ import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import com.jakewharton.rxbinding2.view.RxView
import com.jakewharton.rxbinding2.widget.RxTextView
import com.jakewharton.rxbinding2.view.clicks
import com.jakewharton.rxbinding2.widget.textChanges
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.util.ThemeManager
@@ -22,8 +22,12 @@ class MessagesActivity : QkActivity(), MessagesView {
@Inject lateinit var themeManager: ThemeManager
private lateinit var viewModel: MessagesViewModel
private lateinit var layoutManager: LinearLayoutManager
private lateinit var viewModel: MessagesViewModel
override val textChangedIntent by lazy { message.textChanges() }
override val attachIntent by lazy { attach.clicks() }
override val sendIntent by lazy { send.clicks() }
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -33,17 +37,13 @@ class MessagesActivity : QkActivity(), MessagesView {
viewModel = ViewModelProviders.of(this, Navigator.ViewModelFactory(intent))[MessagesViewModel::class.java]
viewModel.state.observe(this, Observer { it?.let { render(it) } })
viewModel.view = this
viewModel.setView(this)
attach.setTint(themeManager.color)
layoutManager = LinearLayoutManager(this)
layoutManager.stackFromEnd = true
messageList.layoutManager = layoutManager
RxTextView.textChanges(message).subscribe { text -> viewModel.textChanged(text.toString()) }
RxView.clicks(attach).subscribe { }
RxView.clicks(send).subscribe { viewModel.sendMessage(message.text.toString()) }
}
override fun render(state: MessagesState) {
@@ -1,5 +1,12 @@
package com.moez.QKSMS.presentation.messages
import com.moez.QKSMS.presentation.base.QkView
import io.reactivex.Observable
interface MessagesView : QkView<MessagesState>
interface MessagesView : QkView<MessagesState> {
val textChangedIntent: Observable<CharSequence>
val attachIntent: Observable<Unit>
val sendIntent: Observable<Unit>
}
@@ -33,9 +33,16 @@ class MessagesViewModel(val threadId: Long) : QkViewModel<MessagesView, Messages
}
}
fun sendMessage(body: String) {
conversation.takeIf { conversation -> conversation.isValid }?.let { conversation ->
sendMessage.execute(SendMessage.Params(threadId, conversation.contacts[0].address, body))
override fun bindIntents(view: MessagesView) {
super.bindIntents(view)
view.textChangedIntent.subscribe { text ->
newState { it.copy(draft = text.toString(), canSend = text.isNotEmpty()) }
}
view.sendIntent.subscribe {
val previousState = state.value!!
sendMessage.execute(SendMessage.Params(threadId, conversation.contacts[0].address, previousState.draft))
newState { it.copy(draft = "", canSend = false) }
}
}
@@ -44,10 +51,6 @@ class MessagesViewModel(val threadId: Long) : QkViewModel<MessagesView, Messages
markRead.execute(threadId)
}
fun textChanged(text: String) {
newState { it.copy(draft = text, canSend = text.isNotEmpty()) }
}
override fun onCleared() {
super.onCleared()
sendMessage.dispose()