From 140bd2b1d6a097a7ad5cdd30b10f0b7579bcecd0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 23 Jul 2021 09:38:16 +0200
Subject: [PATCH] Added color to nav menu items

---
 .../java/eu/faircode/email/ActivitySetup.java |  3 +-
 .../eu/faircode/email/AdapterNavMenu.java     | 12 ++++---
 .../java/eu/faircode/email/NavMenuItem.java   | 33 +++++++++++++++++++
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 5059b54911..4de751806d 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -189,13 +189,14 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
 
         final List<NavMenuItem> menus = new ArrayList<>();
 
+        int colorWarning = Helper.resolveColor(this, R.attr.colorWarning);
         menus.add(new NavMenuItem(R.drawable.twotone_close_24, R.string.title_setup_close, new Runnable() {
             @Override
             public void run() {
                 drawerLayout.closeDrawer(drawerContainer, false);
                 onBackPressed();
             }
-        }).setSeparated());
+        }).setColor(colorWarning).setSeparated());
 
         menus.add(new NavMenuItem(R.drawable.twotone_archive_24, R.string.title_setup_export, new Runnable() {
             @Override
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavMenu.java b/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
index 0fbc3b89ad..ae5b8441db 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
@@ -21,6 +21,7 @@ package eu.faircode.email;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.ColorStateList;
 import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -46,6 +47,7 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
     private LayoutInflater inflater;
 
     private int colorUnread;
+    private int colorControlNormal;
     private int textColorSecondary;
 
     private List<NavMenuItem> items = new ArrayList<>();
@@ -84,13 +86,16 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
         private void bindTo(NavMenuItem menu) {
             ivItem.setImageResource(menu.getIcon());
 
+            Integer color = menu.getColor();
+            ivItem.setImageTintList(ColorStateList.valueOf(color == null ? colorControlNormal : color));
+
             if (menu.getCount() == null)
                 tvItem.setText(menu.getTitle());
             else
                 tvItem.setText(context.getString(R.string.title_name_count,
                         context.getString(menu.getTitle()), NF.format(menu.getCount())));
 
-            tvItem.setTextColor(menu.getCount() == null ? textColorSecondary : colorUnread);
+            tvItem.setTextColor(menu.getCount() == null ? (color == null ? textColorSecondary : color) : colorUnread);
             tvItem.setTypeface(menu.getCount() == null ? Typeface.DEFAULT : Typeface.DEFAULT_BOLD);
 
             tvItemExtra.setText(menu.getSubtitle());
@@ -130,6 +135,7 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
         boolean highlight_unread = prefs.getBoolean("highlight_unread", true);
         int colorHighlight = prefs.getInt("highlight_color", Helper.resolveColor(context, R.attr.colorUnreadHighlight));
         this.colorUnread = (highlight_unread ? colorHighlight : Helper.resolveColor(context, R.attr.colorUnread));
+        this.colorControlNormal = Helper.resolveColor(context, R.attr.colorControlNormal);
         this.textColorSecondary = Helper.resolveColor(context, android.R.attr.textColorSecondary);
 
         setHasStableIds(true);
@@ -200,9 +206,7 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
         public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
             NavMenuItem m1 = prev.get(oldItemPosition);
             NavMenuItem m2 = next.get(newItemPosition);
-            return m1.getIcon() == m2.getIcon() &&
-                    m1.getTitle() == m2.getTitle() &&
-                    Objects.equals(m1.getCount(), m2.getCount());
+            return m1.equals(m2);
         }
     }
 
diff --git a/app/src/main/java/eu/faircode/email/NavMenuItem.java b/app/src/main/java/eu/faircode/email/NavMenuItem.java
index 0ea9db9488..73999c6710 100644
--- a/app/src/main/java/eu/faircode/email/NavMenuItem.java
+++ b/app/src/main/java/eu/faircode/email/NavMenuItem.java
@@ -19,8 +19,11 @@ package eu.faircode.email;
     Copyright 2018-2021 by Marcel Bokhorst (M66B)
 */
 
+import java.util.Objects;
+
 public class NavMenuItem {
     private int icon;
+    private Integer color;
     private int title;
     private String subtitle = null;
     private Integer count = null;
@@ -43,6 +46,11 @@ public class NavMenuItem {
         this.longClick = longClick;
     }
 
+    NavMenuItem setColor(Integer color) {
+        this.color = color;
+        return this;
+    }
+
     NavMenuItem setSubtitle(String subtitle) {
         this.subtitle = subtitle;
         return this;
@@ -72,6 +80,10 @@ public class NavMenuItem {
         return this.icon;
     }
 
+    Integer getColor() {
+        return this.color;
+    }
+
     int getTitle() {
         return this.title;
     }
@@ -114,4 +126,25 @@ public class NavMenuItem {
             return false;
         }
     }
+
+    @Override
+    public boolean equals(Object object) {
+        if (object instanceof NavMenuItem) {
+            NavMenuItem other = (NavMenuItem) object;
+            return (this.icon == other.icon &&
+                    Objects.equals(this.color, other.color) &&
+                    this.title == other.title &&
+                    Objects.equals(this.subtitle, other.subtitle) &&
+                    Objects.equals(this.count, other.count) &&
+                    this.external == other.external &&
+                    this.warning == other.warning &&
+                    this.separated == other.separated);
+        } else
+            return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(icon, color, title, subtitle, count, external, warning, separated);
+    }
 }