From 67dcddc2b95673650b43577fc5b44901b21a16d5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 8 Dec 2020 08:12:20 +0100
Subject: [PATCH] Select folder colors

---
 app/src/main/java/eu/faircode/email/AdapterFolder.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 7115a21e08..e37d30f613 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -98,6 +98,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
     private int textColorPrimary;
     private int textColorSecondary;
     private int colorUnread;
+    private int colorControlNormal;
 
     private List<Long> disabledIds = new ArrayList<>();
     private List<TupleFolderEx> all = new ArrayList<>();
@@ -304,8 +305,10 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             if (folder.selectable)
                 ivType.setImageResource(EntityFolder.getIcon(folder.type));
 
-            if (listener != null)
+            if (listener != null) {
                 ivType.setVisibility(folder.selectable ? View.VISIBLE : View.GONE);
+                ivType.setImageTintList(ColorStateList.valueOf(folder.color == null ? colorControlNormal : folder.color));
+            }
 
             if (listener == null && folder.selectable) {
                 if (account < 0 && !primary)
@@ -930,6 +933,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         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);
 
         setHasStableIds(true);