diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index 51f86552..82b41d43 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt @@ -13,6 +13,7 @@ import android.support.v7.widget.helper.ItemTouchHelper import android.view.Gravity import com.jakewharton.rxbinding2.support.v4.widget.drawerOpen import com.jakewharton.rxbinding2.view.clicks +import com.jakewharton.rxbinding2.widget.textChanges import com.karumi.dexter.Dexter import com.karumi.dexter.MultiplePermissionsReport import com.karumi.dexter.PermissionToken @@ -41,6 +42,7 @@ class MainActivity : QkActivity(), MainView { @Inject lateinit var itemTouchCallback: ConversationItemTouchCallback override val viewModelClass = MainViewModel::class + override val queryChangedIntent by lazy { toolbarSearch.textChanges() } override val composeIntent by lazy { compose.clicks() } override val drawerOpenIntent by lazy { drawerLayout.drawerOpen(Gravity.START) } override val inboxIntent by lazy { inbox.clicks() } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt index 68d089f2..dcb429df 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt @@ -6,6 +6,7 @@ import io.reactivex.subjects.Subject interface MainView : QkView { + val queryChangedIntent: Observable val composeIntent: Observable val drawerOpenIntent: Observable val inboxIntent: Observable 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 524e2e0e..453986d9 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 @@ -23,6 +23,8 @@ class MainViewModel : QkViewModel(MainState()) { @Inject lateinit var markArchived: MarkArchived @Inject lateinit var partialSync: PartialSync + private val conversations by lazy { messageRepo.getConversations() } + init { appComponent.inject(this) @@ -43,6 +45,23 @@ 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 + } + } + + false + } + } + + newState { it.copy(page = Inbox(filteredConversations)) } + } + intents += view.composeIntent.subscribe { navigator.showCompose() newState { it.copy(drawerOpen = false) } @@ -53,7 +72,7 @@ class MainViewModel : QkViewModel(MainState()) { } intents += view.inboxIntent.subscribe { - newState { it.copy(page = Inbox(messageRepo.getConversations()), drawerOpen = false) } + newState { it.copy(page = Inbox(conversations), drawerOpen = false) } } intents += view.archivedIntent.subscribe { diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index 1187f666..3233d1d4 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -3,7 +3,7 @@ QKSMS Settings - Search conversations… + Search inbox… Type a name or number Call