From a0c50495eb3a63e46593219cabf9ca0ea4bde683 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 24 Feb 2018 16:12:09 -0500 Subject: [PATCH] Fix icon and tint for conversation info --- .../java/presentation/common/base/QkThemedActivity.kt | 9 +++++++-- ...utline_black_24dp.xml => ic_more_vert_black_24dp.xml} | 2 +- qksms/src/main/res/menu/compose.xml | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) rename qksms/src/main/res/drawable/{ic_info_outline_black_24dp.xml => ic_more_vert_black_24dp.xml} (82%) diff --git a/qksms/src/main/java/presentation/common/base/QkThemedActivity.kt b/qksms/src/main/java/presentation/common/base/QkThemedActivity.kt index 74d2c2de..8562568c 100644 --- a/qksms/src/main/java/presentation/common/base/QkThemedActivity.kt +++ b/qksms/src/main/java/presentation/common/base/QkThemedActivity.kt @@ -21,6 +21,7 @@ package presentation.common.base import android.annotation.SuppressLint import android.arch.lifecycle.Lifecycle import android.os.Bundle +import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.util.Colors @@ -58,12 +59,16 @@ abstract class QkThemedActivity> : QkActivity() { super.onPostCreate(savedInstanceState) // Update the colours of the menu items - Observables.combineLatest(menu, colors.theme, { menu, color -> + Observables.combineLatest(menu, colors.theme, colors.textTertiary, { menu, theme, textTertiary -> (0 until menu.size()) .map { position -> menu.getItem(position) } .forEach { menuItem -> menuItem?.icon?.run { - setTint(color) + setTint(when(menuItem.itemId) { + R.id.info -> textTertiary + else -> theme + }) + menuItem.icon = this } } diff --git a/qksms/src/main/res/drawable/ic_info_outline_black_24dp.xml b/qksms/src/main/res/drawable/ic_more_vert_black_24dp.xml similarity index 82% rename from qksms/src/main/res/drawable/ic_info_outline_black_24dp.xml rename to qksms/src/main/res/drawable/ic_more_vert_black_24dp.xml index d535bec8..f0b30a85 100644 --- a/qksms/src/main/res/drawable/ic_info_outline_black_24dp.xml +++ b/qksms/src/main/res/drawable/ic_more_vert_black_24dp.xml @@ -23,5 +23,5 @@ android:viewportHeight="24.0"> + android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/> diff --git a/qksms/src/main/res/menu/compose.xml b/qksms/src/main/res/menu/compose.xml index 288c1865..f13a81c1 100644 --- a/qksms/src/main/res/menu/compose.xml +++ b/qksms/src/main/res/menu/compose.xml @@ -29,7 +29,7 @@