From 1773f7ed358ad14cda559b80689cfdeeb601fe90 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 15 Dec 2017 17:40:08 -0500 Subject: [PATCH] Use new filters to filter contacts in ComposeView --- .../com/moez/QKSMS/common/util/filter/ContactFilter.kt | 2 +- .../moez/QKSMS/common/util/filter/ConversationFilter.kt | 2 +- .../java/com/moez/QKSMS/common/util/filter/Filter.kt | 2 +- .../moez/QKSMS/common/util/filter/PhoneNumberFilter.kt | 4 ++-- .../com/moez/QKSMS/common/util/filter/RecipientFilter.kt | 2 +- .../moez/QKSMS/presentation/compose/ComposeViewModel.kt | 9 ++++----- .../com/moez/QKSMS/presentation/main/MainViewModel.kt | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/ContactFilter.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/filter/ContactFilter.kt index 74e3d9d5..b4082190 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/ContactFilter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/filter/ContactFilter.kt @@ -5,7 +5,7 @@ import javax.inject.Inject class ContactFilter @Inject constructor(private val phoneNumberFilter: PhoneNumberFilter) : Filter() { - 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 } diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/ConversationFilter.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/filter/ConversationFilter.kt index 7f179341..0df079f8 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/ConversationFilter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/filter/ConversationFilter.kt @@ -5,7 +5,7 @@ import javax.inject.Inject class ConversationFilter @Inject constructor(private val recipientFilter: RecipientFilter) : Filter() { - 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) } } diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/Filter.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/filter/Filter.kt index ba5eec46..5d1ca082 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/Filter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/filter/Filter.kt @@ -2,6 +2,6 @@ package com.moez.QKSMS.common.util.filter abstract class Filter { - abstract fun filter(item: T, query: String): Boolean + abstract fun filter(item: T, query: CharSequence): Boolean } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/PhoneNumberFilter.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/filter/PhoneNumberFilter.kt index 43002fbd..955f5b96 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/PhoneNumberFilter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/filter/PhoneNumberFilter.kt @@ -5,9 +5,9 @@ import javax.inject.Inject class PhoneNumberFilter @Inject constructor() : Filter() { - 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())) } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/RecipientFilter.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/filter/RecipientFilter.kt index d8416ac5..280f30e3 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/RecipientFilter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/filter/RecipientFilter.kt @@ -8,7 +8,7 @@ class RecipientFilter @Inject constructor( private val phoneNumberFilter: PhoneNumberFilter) : Filter() { - 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 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 23f2ccc5..1be2a125 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 @@ -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(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( .scan(listOf(), { previousState, reducer -> reducer(previousState) }) .doOnNext { contacts -> newState { it.copy(selectedContacts = contacts) } } - val initialConversation: Observable = when(threadId) { + val initialConversation: Observable = when (threadId) { 0L -> Observable.empty() else -> messageRepo.getConversationAsync(threadId).asObservable() } @@ -115,9 +116,7 @@ class ComposeViewModel(threadId: Long) : QkViewModel( .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()) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt index aa16752f..792f300b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt @@ -57,7 +57,7 @@ class MainViewModel : QkViewModel(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)) }