Merge pull request #90 from nextcloud/bugfix/noid/toolbarTrailingIcon…

…Tinting Fix toolbar trailing icon tinting
nextcloud · Mar 17, 2023 · efa217f · efa217f
2 parents 8fd9345 + dd05184
commit efa217f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 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
@@ -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)
         }
     }
 
@@ -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) {

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
@@ -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)
         }
     }