From 77fbe3b50f38ecd2255e1adca9e4940c3a05205f Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 29 Nov 2017 09:31:35 -0500 Subject: [PATCH] Improve readability for recipient changing observable --- .../QKSMS/presentation/compose/ComposeViewModel.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 e8b0e3dc..c4c11d5f 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,11 +99,14 @@ class ComposeViewModel(threadId: Long) : QkViewModel( .observeOn(AndroidSchedulers.mainThread()) .subscribe { contacts -> newState { it.copy(contacts = contacts) } } - 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) } } + view.chipDeletedIntent.doOnNext { contact -> + contactsReducer.onNext { contacts -> contacts.filterNot { it == contact } } + }, + view.chipSelectedIntent.doOnNext { contact -> + contactsReducer.onNext { contacts -> contacts.toMutableList().apply { add(contact) } } + }) + .subscribe() intents += view.textChangedIntent.subscribe { text -> newState { it.copy(draft = text.toString(), canSend = text.isNotEmpty()) }