Complete Toolbar icon tinting

This commit is contained in:
Moez Bhatti
2017-12-06 02:07:11 -05:00
parent b169a996aa
commit 34dfd70191
2 changed files with 12 additions and 18 deletions
@@ -26,7 +26,6 @@ abstract class QkActivity<VM : QkViewModel<*, *>> : AppCompatActivity() {
}
protected val menu: Subject<Menu> = BehaviorSubject.create()
protected var disposables = CompositeDisposable()
override fun onCreate(savedInstanceState: Bundle?) {
@@ -50,12 +49,9 @@ abstract class QkActivity<VM : QkViewModel<*, *>> : 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 }
@@ -109,19 +109,17 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), 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()) {