From 7b95323a0ed99b677ab508198e8b1c77e273bdbf Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 29 Nov 2017 08:55:56 -0500 Subject: [PATCH] Group observables for modifying contact selection --- .../QKSMS/presentation/compose/ComposeViewModel.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 9d4735dc..e8b0e3dc 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 @@ -99,13 +99,11 @@ class ComposeViewModel(threadId: Long) : QkViewModel( .observeOn(AndroidSchedulers.mainThread()) .subscribe { contacts -> newState { it.copy(contacts = contacts) } } - intents += view.chipDeletedIntent.subscribe { contact -> - contactsReducer.onNext { contacts -> contacts.filterNot { it == contact } } - } - intents += view.chipSelectedIntent.subscribe { contact -> - contactsReducer.onNext { contacts -> contacts.toMutableList().apply { add(contact) } } - } + intents += Observable.merge( + view.chipDeletedIntent.map { contact -> { contacts: List -> contacts.filterNot { it == contact } } }, + view.chipSelectedIntent.map { contact -> { contacts: List -> contacts.toMutableList().apply { add(contact) } } }) + .subscribe { reducer -> contactsReducer.onNext { reducer(it) } } intents += view.textChangedIntent.subscribe { text -> newState { it.copy(draft = text.toString(), canSend = text.isNotEmpty()) }