forked from upstream-mirrors/quik
Don't show contacts that have already been selected
This commit is contained in:
@@ -15,7 +15,6 @@ import com.moez.QKSMS.domain.interactor.DeleteMessage
|
|||||||
import com.moez.QKSMS.domain.interactor.MarkRead
|
import com.moez.QKSMS.domain.interactor.MarkRead
|
||||||
import com.moez.QKSMS.domain.interactor.SendMessage
|
import com.moez.QKSMS.domain.interactor.SendMessage
|
||||||
import com.moez.QKSMS.presentation.base.QkViewModel
|
import com.moez.QKSMS.presentation.base.QkViewModel
|
||||||
import io.reactivex.BackpressureStrategy
|
|
||||||
import io.reactivex.Observable
|
import io.reactivex.Observable
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||||
import io.reactivex.rxkotlin.Observables
|
import io.reactivex.rxkotlin.Observables
|
||||||
@@ -35,12 +34,10 @@ class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(
|
|||||||
@Inject lateinit var markRead: MarkRead
|
@Inject lateinit var markRead: MarkRead
|
||||||
@Inject lateinit var deleteMessage: DeleteMessage
|
@Inject lateinit var deleteMessage: DeleteMessage
|
||||||
|
|
||||||
|
private val contacts: List<Contact> by lazy { contactsRepo.getContacts() }
|
||||||
private val contactsReducer: Subject<(List<Contact>) -> List<Contact>> = PublishSubject.create()
|
private val contactsReducer: Subject<(List<Contact>) -> List<Contact>> = PublishSubject.create()
|
||||||
|
|
||||||
private val contacts: List<Contact>
|
|
||||||
|
|
||||||
private val conversation: Observable<Conversation>
|
|
||||||
private val selectedContacts: Observable<List<Contact>>
|
private val selectedContacts: Observable<List<Contact>>
|
||||||
|
private val conversation: Observable<Conversation>
|
||||||
|
|
||||||
init {
|
init {
|
||||||
AppComponentManager.appComponent.inject(this)
|
AppComponentManager.appComponent.inject(this)
|
||||||
@@ -78,8 +75,6 @@ class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(
|
|||||||
messages
|
messages
|
||||||
})
|
})
|
||||||
.subscribe()
|
.subscribe()
|
||||||
|
|
||||||
contacts = contactsRepo.getContacts()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun bindView(view: ComposeView) {
|
override fun bindView(view: ComposeView) {
|
||||||
@@ -92,14 +87,14 @@ class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(
|
|||||||
.distinctUntilChanged()
|
.distinctUntilChanged()
|
||||||
.subscribe { contactsVisible -> newState { it.copy(contactsVisible = contactsVisible && it.editingMode) } }
|
.subscribe { contactsVisible -> newState { it.copy(contactsVisible = contactsVisible && it.editingMode) } }
|
||||||
|
|
||||||
intents += view.queryChangedIntent
|
intents += Observables
|
||||||
.toFlowable(BackpressureStrategy.LATEST)
|
.combineLatest(view.queryChangedIntent, selectedContacts, { query, selectedContacts ->
|
||||||
.map { query -> query.toString() }
|
contacts
|
||||||
.map { query ->
|
.filterNot { contact -> selectedContacts.contains(contact) }
|
||||||
contacts.filter { contact ->
|
.filter { contact ->
|
||||||
contact.name.contains(query, true) || PhoneNumberUtils.compare(contact.address, query)
|
contact.name.contains(query, true) || PhoneNumberUtils.compare(contact.address, query.toString())
|
||||||
}
|
}
|
||||||
}
|
})
|
||||||
.subscribeOn(Schedulers.computation())
|
.subscribeOn(Schedulers.computation())
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
.subscribe { contacts -> newState { it.copy(contacts = contacts) } }
|
.subscribe { contacts -> newState { it.copy(contacts = contacts) } }
|
||||||
|
|||||||
Reference in New Issue
Block a user