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
+1 -1
View File
@@ -41,7 +41,7 @@ dependencies {
compile 'com.android.support:design:26.1.0' compile 'com.android.support:design:26.1.0'
compile 'com.bugsnag:bugsnag-android:3.9.0' compile 'com.bugsnag:bugsnag-android:3.9.0'
compile "com.google.dagger:dagger:2.11" compile "com.google.dagger:dagger:2.11"
compile 'com.jakewharton.rxbinding2:rxbinding:2.0.0' compile 'com.jakewharton.rxbinding2:rxbinding-kotlin:2.0.0'
compile 'com.jakewharton.timber:timber:4.5.1' compile 'com.jakewharton.timber:timber:4.5.1'
compile 'com.karumi:dexter:4.1.0' compile 'com.karumi:dexter:4.1.0'
compile 'io.reactivex.rxjava2:rxandroid:2.0.1' compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
@@ -1,11 +1,17 @@
package com.moez.QKSMS.presentation.base package com.moez.QKSMS.presentation.base
import android.os.Bundle
import android.support.v7.app.AppCompatActivity import android.support.v7.app.AppCompatActivity
import android.view.MenuItem import android.view.MenuItem
import kotlinx.android.synthetic.main.toolbar.* import kotlinx.android.synthetic.main.toolbar.*
abstract class QkActivity : AppCompatActivity() { abstract class QkActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
onNewIntent(intent)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when(item.itemId) { return when(item.itemId) {
android.R.id.home -> { android.R.id.home -> {
@@ -4,14 +4,9 @@ import android.arch.lifecycle.MutableLiveData
import android.arch.lifecycle.ViewModel import android.arch.lifecycle.ViewModel
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
abstract class QkViewModel<View : QkView<State>, State>(initialState: State) : ViewModel() { abstract class QkViewModel<in View : QkView<State>, State>(initialState: State) : ViewModel() {
val state = MutableLiveData<State>() val state = MutableLiveData<State>()
var view: View? = null
set(value) {
field = value
bindIntents()
}
private val stateReducer: PublishSubject<(State) -> State> = PublishSubject.create() private val stateReducer: PublishSubject<(State) -> State> = PublishSubject.create()
@@ -21,7 +16,11 @@ abstract class QkViewModel<View : QkView<State>, State>(initialState: State) : V
.subscribe { newState -> state.value = newState } .subscribe { newState -> state.value = newState }
} }
fun bindIntents() {} fun setView(view: View) {
bindIntents(view)
}
open fun bindIntents(view: View) {}
protected fun newState(reducer: (State) -> State) { protected fun newState(reducer: (State) -> State) {
stateReducer.onNext(reducer) stateReducer.onNext(reducer)
@@ -7,7 +7,7 @@ import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.ActionBarDrawerToggle import android.support.v7.app.ActionBarDrawerToggle
import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.LinearLayoutManager
import com.jakewharton.rxbinding2.view.RxView import com.jakewharton.rxbinding2.view.clicks
import com.karumi.dexter.Dexter import com.karumi.dexter.Dexter
import com.karumi.dexter.MultiplePermissionsReport import com.karumi.dexter.MultiplePermissionsReport
import com.karumi.dexter.PermissionToken import com.karumi.dexter.PermissionToken
@@ -29,28 +29,30 @@ class ConversationsActivity : QkActivity(), ConversationsView {
private lateinit var viewModel: ConversationsViewModel private lateinit var viewModel: ConversationsViewModel
override val composeIntent by lazy { compose.clicks() }
override val archivedIntent by lazy { archived.clicks() }
override val scheduledIntent by lazy { scheduled.clicks() }
override val blockedIntent by lazy { blocked.clicks() }
override val settingsIntent by lazy { settings.clicks() }
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
setContentView(R.layout.conversation_list_activity) setContentView(R.layout.conversation_list_activity)
ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0).syncState() ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0).syncState()
onNewIntent(intent)
requestPermissions() requestPermissions()
viewModel = ViewModelProviders.of(this)[ConversationsViewModel::class.java] viewModel = ViewModelProviders.of(this)[ConversationsViewModel::class.java]
viewModel.state.observe(this, Observer { it?.let { render(it) } }) viewModel.state.observe(this, Observer { it?.let { render(it) } })
viewModel.view = this viewModel.setView(this)
conversationList.layoutManager = LinearLayoutManager(this) conversationList.layoutManager = LinearLayoutManager(this)
swipeRefresh.setOnRefreshListener { viewModel.onRefresh() } // Don't allow clicks to pass through the drawer layout
RxView.clicks(compose).subscribe { } drawer.clicks().subscribe()
RxView.clicks(drawer).subscribe { }
RxView.clicks(archived).subscribe { } // Refresh support for debugging purposes
RxView.clicks(scheduled).subscribe { } swipeRefresh.setOnRefreshListener { viewModel.onRefresh() } // TODO remove
RxView.clicks(blocked).subscribe { }
RxView.clicks(settings).subscribe { }
} }
override fun onNewIntent(intent: Intent?) { override fun onNewIntent(intent: Intent?) {
@@ -1,5 +1,14 @@
package com.moez.QKSMS.presentation.conversations package com.moez.QKSMS.presentation.conversations
import com.moez.QKSMS.presentation.base.QkView import com.moez.QKSMS.presentation.base.QkView
import io.reactivex.Observable
interface ConversationsView : QkView<ConversationsState> interface ConversationsView : QkView<ConversationsState> {
val composeIntent: Observable<Unit>
val archivedIntent: Observable<Unit>
val scheduledIntent: Observable<Unit>
val blockedIntent: Observable<Unit>
val settingsIntent: Observable<Unit>
}
@@ -26,6 +26,16 @@ class ConversationsViewModel : QkViewModel<ConversationsView, ConversationsState
markAllSeen.execute(Unit) markAllSeen.execute(Unit)
} }
override fun bindIntents(view: ConversationsView) {
super.bindIntents(view)
view.composeIntent.subscribe()
view.archivedIntent.subscribe()
view.scheduledIntent.subscribe()
view.blockedIntent.subscribe()
view.settingsIntent.subscribe()
}
fun onRefresh() { fun onRefresh() {
newState { it.copy(refreshing = true) } newState { it.copy(refreshing = true) }
syncConversations.execute(Unit, { syncConversations.execute(Unit, {
@@ -5,8 +5,8 @@ import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView import android.support.v7.widget.RecyclerView
import com.jakewharton.rxbinding2.view.RxView import com.jakewharton.rxbinding2.view.clicks
import com.jakewharton.rxbinding2.widget.RxTextView import com.jakewharton.rxbinding2.widget.textChanges
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.util.ThemeManager import com.moez.QKSMS.common.util.ThemeManager
@@ -22,8 +22,12 @@ class MessagesActivity : QkActivity(), MessagesView {
@Inject lateinit var themeManager: ThemeManager @Inject lateinit var themeManager: ThemeManager
private lateinit var viewModel: MessagesViewModel
private lateinit var layoutManager: LinearLayoutManager 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?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@@ -33,17 +37,13 @@ class MessagesActivity : QkActivity(), MessagesView {
viewModel = ViewModelProviders.of(this, Navigator.ViewModelFactory(intent))[MessagesViewModel::class.java] viewModel = ViewModelProviders.of(this, Navigator.ViewModelFactory(intent))[MessagesViewModel::class.java]
viewModel.state.observe(this, Observer { it?.let { render(it) } }) viewModel.state.observe(this, Observer { it?.let { render(it) } })
viewModel.view = this viewModel.setView(this)
attach.setTint(themeManager.color) attach.setTint(themeManager.color)
layoutManager = LinearLayoutManager(this) layoutManager = LinearLayoutManager(this)
layoutManager.stackFromEnd = true layoutManager.stackFromEnd = true
messageList.layoutManager = layoutManager 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) { override fun render(state: MessagesState) {
@@ -1,5 +1,12 @@
package com.moez.QKSMS.presentation.messages package com.moez.QKSMS.presentation.messages
import com.moez.QKSMS.presentation.base.QkView 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) { override fun bindIntents(view: MessagesView) {
conversation.takeIf { conversation -> conversation.isValid }?.let { conversation -> super.bindIntents(view)
sendMessage.execute(SendMessage.Params(threadId, conversation.contacts[0].address, body))
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) } newState { it.copy(draft = "", canSend = false) }
} }
} }
@@ -44,10 +51,6 @@ class MessagesViewModel(val threadId: Long) : QkViewModel<MessagesView, Messages
markRead.execute(threadId) markRead.execute(threadId)
} }
fun textChanged(text: String) {
newState { it.copy(draft = text, canSend = text.isNotEmpty()) }
}
override fun onCleared() { override fun onCleared() {
super.onCleared() super.onCleared()
sendMessage.dispose() sendMessage.dispose()