diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt index 9a601c97..05519b80 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -70,8 +70,8 @@ class ComposeActivity : QkActivity(), 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 diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt index 5f013b12..771580e4 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt @@ -7,6 +7,7 @@ import io.realm.RealmResults data class ComposeState( val editingMode: Boolean = false, val contacts: List = ArrayList(), + val contactsVisible: Boolean = false, val selectedContacts: List = ArrayList(), val title: String = "", val messages: RealmResults? = null, diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt index 70d055ff..e913f3cd 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt @@ -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( private val contacts: List private val conversation: Observable + private val selectedContacts: Observable> 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(), { 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( 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() } diff --git a/qksms/src/main/res/layout/compose_activity.xml b/qksms/src/main/res/layout/compose_activity.xml index 4ff8b5d2..29b3e1e7 100644 --- a/qksms/src/main/res/layout/compose_activity.xml +++ b/qksms/src/main/res/layout/compose_activity.xml @@ -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"