From f2088d73c19f49938a7d11c4ebaac54739a269a4 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 31 Oct 2017 11:50:11 -0700 Subject: [PATCH] Use View to expose Intents instead of performing logic inside of Activity --- qksms/build.gradle | 2 +- .../QKSMS/presentation/base/QkActivity.kt | 6 +++++ .../QKSMS/presentation/base/QkViewModel.kt | 13 +++++----- .../conversations/ConversationsActivity.kt | 24 ++++++++++--------- .../conversations/ConversationsView.kt | 11 ++++++++- .../conversations/ConversationsViewModel.kt | 10 ++++++++ .../presentation/messages/MessagesActivity.kt | 16 ++++++------- .../presentation/messages/MessagesView.kt | 9 ++++++- .../messages/MessagesViewModel.kt | 17 +++++++------ 9 files changed, 72 insertions(+), 36 deletions(-) diff --git a/qksms/build.gradle b/qksms/build.gradle index ccc6a86a..006ebef2 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -41,7 +41,7 @@ dependencies { compile 'com.android.support:design:26.1.0' compile 'com.bugsnag:bugsnag-android:3.9.0' 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.karumi:dexter:4.1.0' compile 'io.reactivex.rxjava2:rxandroid:2.0.1' 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 29827a12..a8f6cf99 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,11 +1,17 @@ package com.moez.QKSMS.presentation.base +import android.os.Bundle import android.support.v7.app.AppCompatActivity import android.view.MenuItem import kotlinx.android.synthetic.main.toolbar.* abstract class QkActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + onNewIntent(intent) + } + override fun onOptionsItemSelected(item: MenuItem): Boolean { return when(item.itemId) { android.R.id.home -> { 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 fdf9fe69..7381519a 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 @@ -4,14 +4,9 @@ import android.arch.lifecycle.MutableLiveData import android.arch.lifecycle.ViewModel import io.reactivex.subjects.PublishSubject -abstract class QkViewModel, State>(initialState: State) : ViewModel() { +abstract class QkViewModel, State>(initialState: State) : ViewModel() { val state = MutableLiveData() - var view: View? = null - set(value) { - field = value - bindIntents() - } private val stateReducer: PublishSubject<(State) -> State> = PublishSubject.create() @@ -21,7 +16,11 @@ abstract class QkViewModel, State>(initialState: State) : V .subscribe { newState -> state.value = newState } } - fun bindIntents() {} + fun setView(view: View) { + bindIntents(view) + } + + open fun bindIntents(view: View) {} protected fun newState(reducer: (State) -> State) { stateReducer.onNext(reducer) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt index 30709e3b..fc942653 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt @@ -7,7 +7,7 @@ import android.content.Intent import android.os.Bundle import android.support.v7.app.ActionBarDrawerToggle 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.MultiplePermissionsReport import com.karumi.dexter.PermissionToken @@ -29,28 +29,30 @@ class ConversationsActivity : QkActivity(), ConversationsView { 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?) { super.onCreate(savedInstanceState) AppComponentManager.appComponent.inject(this) setContentView(R.layout.conversation_list_activity) ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0).syncState() - - onNewIntent(intent) requestPermissions() viewModel = ViewModelProviders.of(this)[ConversationsViewModel::class.java] viewModel.state.observe(this, Observer { it?.let { render(it) } }) - viewModel.view = this + viewModel.setView(this) conversationList.layoutManager = LinearLayoutManager(this) - swipeRefresh.setOnRefreshListener { viewModel.onRefresh() } - RxView.clicks(compose).subscribe { } - RxView.clicks(drawer).subscribe { } - RxView.clicks(archived).subscribe { } - RxView.clicks(scheduled).subscribe { } - RxView.clicks(blocked).subscribe { } - RxView.clicks(settings).subscribe { } + // Don't allow clicks to pass through the drawer layout + drawer.clicks().subscribe() + + // Refresh support for debugging purposes + swipeRefresh.setOnRefreshListener { viewModel.onRefresh() } // TODO remove } override fun onNewIntent(intent: Intent?) { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsView.kt index 0f0d9885..25a76096 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsView.kt @@ -1,5 +1,14 @@ package com.moez.QKSMS.presentation.conversations import com.moez.QKSMS.presentation.base.QkView +import io.reactivex.Observable -interface ConversationsView : QkView \ No newline at end of file +interface ConversationsView : QkView { + + val composeIntent: Observable + val archivedIntent: Observable + val scheduledIntent: Observable + val blockedIntent: Observable + val settingsIntent: Observable + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt index 2d7684db..2dd09ae4 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt @@ -26,6 +26,16 @@ class ConversationsViewModel : QkViewModel viewModel.textChanged(text.toString()) } - RxView.clicks(attach).subscribe { } - RxView.clicks(send).subscribe { viewModel.sendMessage(message.text.toString()) } } override fun render(state: MessagesState) { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesView.kt index 97e9a957..115fe449 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesView.kt @@ -1,5 +1,12 @@ package com.moez.QKSMS.presentation.messages import com.moez.QKSMS.presentation.base.QkView +import io.reactivex.Observable -interface MessagesView : QkView \ No newline at end of file +interface MessagesView : QkView { + + val textChangedIntent: Observable + val attachIntent: Observable + val sendIntent: Observable + +} \ No newline at end of file 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 4522e9f5..20355838 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 @@ -33,9 +33,16 @@ class MessagesViewModel(val threadId: Long) : QkViewModel 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