Use new filters to filter contacts in ComposeView

This commit is contained in:
Moez Bhatti
2017-12-15 17:40:08 -05:00
parent 59679545f3
commit 1773f7ed35
7 changed files with 11 additions and 12 deletions
@@ -5,7 +5,7 @@ import javax.inject.Inject
class ContactFilter @Inject constructor(private val phoneNumberFilter: PhoneNumberFilter) : Filter<Contact>() {
override fun filter(item: Contact, query: String): Boolean {
override fun filter(item: Contact, query: CharSequence): Boolean {
return item.name.contains(query, true) || // Name
item.numbers.map { it.address }.any { address -> phoneNumberFilter.filter(address, query) } // Number
}
@@ -5,7 +5,7 @@ import javax.inject.Inject
class ConversationFilter @Inject constructor(private val recipientFilter: RecipientFilter) : Filter<Conversation>() {
override fun filter(item: Conversation, query: String): Boolean {
override fun filter(item: Conversation, query: CharSequence): Boolean {
return item.recipients.any { recipient -> recipientFilter.filter(recipient, query) }
}
@@ -2,6 +2,6 @@ package com.moez.QKSMS.common.util.filter
abstract class Filter<in T> {
abstract fun filter(item: T, query: String): Boolean
abstract fun filter(item: T, query: CharSequence): Boolean
}
@@ -5,9 +5,9 @@ import javax.inject.Inject
class PhoneNumberFilter @Inject constructor() : Filter<String>() {
override fun filter(item: String, query: String): Boolean {
override fun filter(item: String, query: CharSequence): Boolean {
return query.all { PhoneNumberUtils.isReallyDialable(it) } &&
PhoneNumberUtils.stripSeparators(item).contains(PhoneNumberUtils.stripSeparators(query))
PhoneNumberUtils.stripSeparators(item).contains(PhoneNumberUtils.stripSeparators(query.toString()))
}
}
@@ -8,7 +8,7 @@ class RecipientFilter @Inject constructor(
private val phoneNumberFilter: PhoneNumberFilter)
: Filter<Recipient>() {
override fun filter(item: Recipient, query: String) = when {
override fun filter(item: Recipient, query: CharSequence) = when {
item.contact?.let { contactFilter.filter(it, query) } == true -> true
phoneNumberFilter.filter(item.address, query) -> true
else -> false
@@ -1,12 +1,12 @@
package com.moez.QKSMS.presentation.compose
import android.content.Context
import android.telephony.PhoneNumberUtils
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.common.util.ClipboardUtils
import com.moez.QKSMS.common.util.extensions.asObservable
import com.moez.QKSMS.common.util.extensions.makeToast
import com.moez.QKSMS.common.util.filter.ContactFilter
import com.moez.QKSMS.data.model.Contact
import com.moez.QKSMS.data.model.Conversation
import com.moez.QKSMS.data.repository.ContactRepository
@@ -27,6 +27,7 @@ import javax.inject.Inject
class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(ComposeState(editingMode = threadId == 0L)) {
@Inject lateinit var context: Context
@Inject lateinit var contactFilter: ContactFilter
@Inject lateinit var contactsRepo: ContactRepository
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var navigator: Navigator
@@ -49,7 +50,7 @@ class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(
.scan(listOf<Contact>(), { previousState, reducer -> reducer(previousState) })
.doOnNext { contacts -> newState { it.copy(selectedContacts = contacts) } }
val initialConversation: Observable<Conversation> = when(threadId) {
val initialConversation: Observable<Conversation> = when (threadId) {
0L -> Observable.empty()
else -> messageRepo.getConversationAsync(threadId).asObservable()
}
@@ -115,9 +116,7 @@ class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(
.combineLatest(view.queryChangedIntent, selectedContacts, { query, selectedContacts ->
contacts
.filterNot { contact -> selectedContacts.contains(contact) }
.filter { contact ->
contact.name.contains(query, true) || PhoneNumberUtils.compare(contact.numbers.firstOrNull()?.address, query.toString())
}
.filter { contact -> contactFilter.filter(contact, query) }
})
.subscribeOn(Schedulers.computation())
.observeOn(AndroidSchedulers.mainThread())
@@ -57,7 +57,7 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
.observeOn(AndroidSchedulers.mainThread())
.subscribe { query ->
val filteredConversations = conversations.map { list ->
list.filter { conversationFilter.filter(it.conversation, query.toString()) }
list.filter { conversationFilter.filter(it.conversation, query) }
}
newState { it.copy(page = Inbox(filteredConversations)) }