Don't show contacts if at least one is selected and there's no query text

This commit is contained in:
Moez Bhatti
2017-11-29 04:38:24 -05:00
parent a4f8cb1c83
commit aadaff8140
4 changed files with 18 additions and 5 deletions
@@ -70,8 +70,8 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
override fun render(state: ComposeState) {
toolbarTitle.setVisible(!state.editingMode)
chips.setVisible(state.editingMode)
contacts.setVisible(state.editingMode)
composeBar.setVisible(!state.editingMode || state.selectedContacts.isNotEmpty())
contacts.setVisible(state.contactsVisible)
composeBar.setVisible(!state.contactsVisible)
if (chipsAdapter.data !== state.selectedContacts) {
chipsAdapter.data = state.selectedContacts
@@ -7,6 +7,7 @@ import io.realm.RealmResults
data class ComposeState(
val editingMode: Boolean = false,
val contacts: List<Contact> = ArrayList(),
val contactsVisible: Boolean = false,
val selectedContacts: List<Contact> = ArrayList(),
val title: String = "",
val messages: RealmResults<Message>? = null,
@@ -18,6 +18,7 @@ import com.moez.QKSMS.presentation.base.QkViewModel
import io.reactivex.BackpressureStrategy
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.rxkotlin.Observables
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
import io.reactivex.schedulers.Schedulers
@@ -39,15 +40,18 @@ class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(
private val contacts: List<Contact>
private val conversation: Observable<Conversation>
private val selectedContacts: Observable<List<Contact>>
init {
AppComponentManager.appComponent.inject(this)
// Merges two potential conversation sources (threadId from constructor and contact selection) into a single
// stream of conversations
val selectedConversation = contactsReducer
selectedContacts = contactsReducer
.scan(listOf<Contact>(), { previousState, reducer -> reducer(previousState) })
.doOnNext { contacts -> newState { it.copy(selectedContacts = contacts) } }
// Merges two potential conversation sources (threadId from constructor and contact selection) into a single
// stream of conversations
val selectedConversation = selectedContacts
.map { contacts -> contacts.map { it.address } }
.flatMapMaybe { addresses -> messageRepo.getOrCreateConversation(addresses) }
@@ -81,6 +85,13 @@ class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(
override fun bindView(view: ComposeView) {
super.bindView(view)
intents += Observables
.combineLatest(view.queryChangedIntent, selectedContacts, { query, selectedContacts ->
selectedContacts.isEmpty() || query.isNotEmpty()
})
.distinctUntilChanged()
.subscribe { contactsVisible -> newState { it.copy(contactsVisible = contactsVisible && it.editingMode) } }
intents += view.queryChangedIntent
.toFlowable(BackpressureStrategy.LATEST)
.map { query -> query.toString() }
@@ -29,6 +29,7 @@
android:id="@+id/contacts"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:clipChildren="false"
android:clipToPadding="false"
android:paddingBottom="8dp"