From 90c68a979b2d84b4a317573de8cd35a5c2a49f3e Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 9 Nov 2021 11:11:13 +0100 Subject: [PATCH] Lighten filter icon if needed --- .../main/java/eu/faircode/email/FragmentMessages.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 1c1e0454d9..5ad3fd612a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -4444,13 +4444,16 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. boolean filter_active = (filter_seen || filter_unflagged || filter_unknown || (language_detection && !TextUtils.isEmpty(filter_language))); + int filterColor = Helper.resolveColor(context, R.attr.colorAccent); + float filterLighten = 0.7f - (float) ColorUtils.calculateLuminance(filterColor); + if (filterLighten > 0) + filterColor = ColorUtils.blendARGB(filterColor, Color.WHITE, filterLighten); MenuItem menuFilter = menu.findItem(R.id.menu_filter); menuFilter.setShowAsAction(folder && filter_active ? MenuItem.SHOW_AS_ACTION_ALWAYS : MenuItem.SHOW_AS_ACTION_NEVER); - MenuItemCompat.setIconTintList(menuFilter, - folder && filter_active ? - ColorStateList.valueOf(Helper.resolveColor(context, R.attr.colorAccent)) : null); + MenuItemCompat.setIconTintList(menuFilter, folder && filter_active + ? ColorStateList.valueOf(filterColor) : null); menuFilter.setIcon(folder && filter_active ? R.drawable.twotone_filter_alt_24 : R.drawable.twotone_filter_list_24); MenuItem menuSearch = menu.findItem(R.id.menu_search);