forked from upstream-mirrors/quik
Allow filtering conversations by phone number of involved party
This commit is contained in:
@@ -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<Contact>() {
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<Conversation>() {
|
||||
|
||||
override fun filter(item: Conversation, query: String): Boolean {
|
||||
return item.recipients.any { recipient -> recipientFilter.filter(recipient, query) }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.moez.QKSMS.common.util.filter
|
||||
|
||||
abstract class Filter<in T> {
|
||||
|
||||
abstract fun filter(item: T, query: String): Boolean
|
||||
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package com.moez.QKSMS.common.util.filter
|
||||
|
||||
import android.telephony.PhoneNumberUtils
|
||||
import javax.inject.Inject
|
||||
|
||||
class PhoneNumberFilter @Inject constructor() : Filter<String>() {
|
||||
|
||||
override fun filter(item: String, query: String): Boolean {
|
||||
return query.all { PhoneNumberUtils.isReallyDialable(it) } &&
|
||||
PhoneNumberUtils.stripSeparators(item).contains(PhoneNumberUtils.stripSeparators(query))
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<Recipient>() {
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<MainView, MainState>(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<MainView, MainState>(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()
|
||||
|
||||
Reference in New Issue
Block a user