From 34dfd7019101488cf7711dcca8031a1b6edf9bdb Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 6 Dec 2017 02:07:11 -0500 Subject: [PATCH] Complete Toolbar icon tinting --- .../QKSMS/presentation/base/QkActivity.kt | 10 +++------- .../presentation/compose/ComposeActivity.kt | 20 +++++++++---------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt index e1093091..f9cbf04d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt @@ -26,7 +26,6 @@ abstract class QkActivity> : AppCompatActivity() { } protected val menu: Subject = BehaviorSubject.create() - protected var disposables = CompositeDisposable() override fun onCreate(savedInstanceState: Bundle?) { @@ -50,12 +49,9 @@ abstract class QkActivity> : AppCompatActivity() { }).subscribe() disposables += colors.textTertiary - .subscribe { color -> - toolbar?.navigationIcon?.run { - setTint(color) - toolbar.navigationIcon = this - } - } + .doOnNext { color -> toolbar?.overflowIcon = toolbar?.overflowIcon?.apply { setTint(color) } } + .doOnNext { color -> toolbar?.navigationIcon = toolbar?.navigationIcon?.apply { setTint(color) } } + .subscribe() disposables += colors.background .doOnNext { color -> window.statusBarColor = color } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt index 68b67490..fd4cdd1c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -109,19 +109,17 @@ class ComposeActivity : QkActivity(), ComposeView { contacts.setVisible(state.contactsVisible) composeBar.setVisible(!state.contactsVisible) - menu.take(1).subscribe { menu -> - menu.findItem(R.id.call)?.run { - isVisible = !state.editingMode - } + toolbar.menu.findItem(R.id.call)?.run { + isVisible = !state.editingMode + } - menu.findItem(R.id.archive)?.run { - isVisible = !state.editingMode - setTitle(if (state.archived) R.string.menu_unarchive else R.string.menu_archive) - } + toolbar.menu.findItem(R.id.archive)?.run { + isVisible = !state.editingMode + setTitle(if (state.archived) R.string.menu_unarchive else R.string.menu_archive) + } - menu.findItem(R.id.delete)?.run { - isVisible = !state.editingMode - } + toolbar.menu.findItem(R.id.delete)?.run { + isVisible = !state.editingMode } if (chipsAdapter.data.isEmpty() && state.selectedContacts.isNotEmpty()) {