From a5bf2f1a636df5674526acdf4da8a590a545c127 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 16 Mar 2023 22:39:30 +0100 Subject: [PATCH 1/2] use tinting to change menu icon coloring Signed-off-by: Andy Scherzinger --- .../android/common/ui/theme/utils/AndroidViewThemeUtils.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidViewThemeUtils.kt b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidViewThemeUtils.kt index 3fd251f4..6533fb13 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidViewThemeUtils.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidViewThemeUtils.kt @@ -144,10 +144,7 @@ class AndroidViewThemeUtils @Inject constructor(schemes: MaterialSchemes, privat } private fun colorMenuItemIcon(@ColorInt color: Int, item: MenuItem) { - val normalDrawable = item.icon - val wrapDrawable = DrawableCompat.wrap(normalDrawable) - DrawableCompat.setTint(wrapDrawable, color) - item.icon = wrapDrawable + item.icon.setTint(color) } private fun colorMenuItemText(@ColorInt color: Int, item: MenuItem) { From dd051840b956cca220452f9eee893fbde29a8223 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 16 Mar 2023 22:43:10 +0100 Subject: [PATCH 2/2] trailing toolbar icons are tinted with onSurfaceVariant color Signed-off-by: Andy Scherzinger --- .../android/common/ui/theme/utils/AndroidViewThemeUtils.kt | 2 +- .../android/common/ui/theme/utils/MaterialViewThemeUtils.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidViewThemeUtils.kt b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidViewThemeUtils.kt index 6533fb13..5205b2cc 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidViewThemeUtils.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/AndroidViewThemeUtils.kt @@ -133,7 +133,7 @@ class AndroidViewThemeUtils @Inject constructor(schemes: MaterialSchemes, privat fun colorToolbarMenuIcon(context: Context, item: MenuItem) { withScheme(context) { scheme -> - colorMenuItemIcon(scheme.onSurface, item) + colorMenuItemIcon(scheme.onSurfaceVariant, item) } } diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/MaterialViewThemeUtils.kt b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/MaterialViewThemeUtils.kt index 96a63924..f12ae0a7 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/MaterialViewThemeUtils.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/MaterialViewThemeUtils.kt @@ -57,7 +57,7 @@ class MaterialViewThemeUtils @Inject constructor(schemes: MaterialSchemes, priva ViewThemeUtilsBase(schemes) { fun colorToolbarOverflowIcon(toolbar: MaterialToolbar) { withScheme(toolbar) { scheme -> - toolbar.overflowIcon?.setColorFilter(scheme.onSurface, PorterDuff.Mode.SRC_ATOP) + toolbar.overflowIcon?.setColorFilter(scheme.onSurfaceVariant, PorterDuff.Mode.SRC_ATOP) } }