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 new file mode 100644 index 00000000..74e3d9d5 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/filter/ContactFilter.kt @@ -0,0 +1,13 @@ +package com.moez.QKSMS.common.util.filter + +import com.moez.QKSMS.data.model.Contact +import javax.inject.Inject + +class ContactFilter @Inject constructor(private val phoneNumberFilter: PhoneNumberFilter) : Filter() { + + override fun filter(item: Contact, query: String): Boolean { + return item.name.contains(query, true) || // Name + item.numbers.map { it.address }.any { address -> phoneNumberFilter.filter(address, query) } // Number + } + +} \ No newline at end of file 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 new file mode 100644 index 00000000..7f179341 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/filter/ConversationFilter.kt @@ -0,0 +1,12 @@ +package com.moez.QKSMS.common.util.filter + +import com.moez.QKSMS.data.model.Conversation +import javax.inject.Inject + +class ConversationFilter @Inject constructor(private val recipientFilter: RecipientFilter) : Filter() { + + override fun filter(item: Conversation, query: String): Boolean { + return item.recipients.any { recipient -> recipientFilter.filter(recipient, query) } + } + +} \ No newline at end of file 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 new file mode 100644 index 00000000..ba5eec46 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/filter/Filter.kt @@ -0,0 +1,7 @@ +package com.moez.QKSMS.common.util.filter + +abstract class Filter { + + abstract fun filter(item: T, query: String): 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 new file mode 100644 index 00000000..43002fbd --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/filter/PhoneNumberFilter.kt @@ -0,0 +1,13 @@ +package com.moez.QKSMS.common.util.filter + +import android.telephony.PhoneNumberUtils +import javax.inject.Inject + +class PhoneNumberFilter @Inject constructor() : Filter() { + + override fun filter(item: String, query: String): Boolean { + return query.all { PhoneNumberUtils.isReallyDialable(it) } && + PhoneNumberUtils.stripSeparators(item).contains(PhoneNumberUtils.stripSeparators(query)) + } + +} \ 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 new file mode 100644 index 00000000..d8416ac5 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/filter/RecipientFilter.kt @@ -0,0 +1,17 @@ +package com.moez.QKSMS.common.util.filter + +import com.moez.QKSMS.data.model.Recipient +import javax.inject.Inject + +class RecipientFilter @Inject constructor( + private val contactFilter: ContactFilter, + private val phoneNumberFilter: PhoneNumberFilter) + : Filter() { + + override fun filter(item: Recipient, query: String) = when { + item.contact?.let { contactFilter.filter(it, query) } == true -> true + phoneNumberFilter.filter(item.address, query) -> true + else -> false + } + +} \ No newline at end of file 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 453986d9..aa16752f 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 @@ -3,6 +3,7 @@ package com.moez.QKSMS.presentation.main import android.content.Context import android.provider.Telephony import com.moez.QKSMS.common.di.appComponent +import com.moez.QKSMS.common.util.filter.ConversationFilter import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.domain.interactor.DeleteConversation import com.moez.QKSMS.domain.interactor.MarkAllSeen @@ -10,13 +11,17 @@ import com.moez.QKSMS.domain.interactor.MarkArchived import com.moez.QKSMS.domain.interactor.PartialSync import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.common.base.QkViewModel +import io.reactivex.BackpressureStrategy +import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign +import java.util.concurrent.TimeUnit import javax.inject.Inject class MainViewModel : QkViewModel(MainState()) { @Inject lateinit var context: Context @Inject lateinit var navigator: Navigator + @Inject lateinit var conversationFilter: ConversationFilter @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var markAllSeen: MarkAllSeen @Inject lateinit var deleteConversation: DeleteConversation @@ -45,22 +50,18 @@ class MainViewModel : QkViewModel(MainState()) { override fun bindView(view: MainView) { super.bindView(view) - intents += view.queryChangedIntent.subscribe { query -> - val filteredConversations = conversations.map { list -> - list.filter { inboxItem -> - inboxItem.conversation.recipients.forEach { recipient -> - when { - recipient.contact?.name?.contains(query, true) == true -> return@filter true - recipient.address.contains(query, true) == true -> return@filter true - } + intents += view.queryChangedIntent + .skip(1) + .toFlowable(BackpressureStrategy.LATEST) + .debounce(200, TimeUnit.MILLISECONDS) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe { query -> + val filteredConversations = conversations.map { list -> + list.filter { conversationFilter.filter(it.conversation, query.toString()) } } - false + newState { it.copy(page = Inbox(filteredConversations)) } } - } - - newState { it.copy(page = Inbox(filteredConversations)) } - } intents += view.composeIntent.subscribe { navigator.showCompose()