From 5aa128b156c9b4bd651a11a8d1c625e307feed23 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 22 Sep 2021 21:14:37 +0200
Subject: [PATCH] Unified folder colors

---
 CHANGELOG.md                                                | 1 +
 app/src/main/assets/CHANGELOG.md                            | 1 +
 app/src/main/java/eu/faircode/email/AdapterNavUnified.java  | 5 +++++
 app/src/main/java/eu/faircode/email/DaoFolder.java          | 1 +
 app/src/main/java/eu/faircode/email/TupleFolderUnified.java | 6 +++++-
 metadata/en-US/changelogs/1731.txt                          | 1 +
 6 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e92627371..137dc11dbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Next version
 
 * Added theme option for default light original message view
+* Unified color based on account folder colors
 
 ### 1.1731
 
diff --git a/app/src/main/assets/CHANGELOG.md b/app/src/main/assets/CHANGELOG.md
index 3e92627371..137dc11dbe 100644
--- a/app/src/main/assets/CHANGELOG.md
+++ b/app/src/main/assets/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Next version
 
 * Added theme option for default light original message view
+* Unified color based on account folder colors
 
 ### 1.1731
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavUnified.java b/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
index 5bb073f6b8..03cf34b341 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
@@ -98,6 +98,11 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
             } else
                 ivItem.setImageResource(EntityFolder.getIcon(folder.type));
 
+            if (folder.color != null && folder.colorCount == 1)
+                ivItem.setColorFilter(folder.color);
+            else
+                ivItem.clearColorFilter();
+
             long count;
             if (EntityFolder.DRAFTS.equals(folder.type) ||
                     EntityFolder.OUTBOX.equals(folder.type))
diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index e8e71e5936..435df4f51a 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -176,6 +176,7 @@ public interface DaoFolder {
             ", COUNT(message.id) AS messages" +
             ", SUM(CASE WHEN NOT message.ui_seen THEN 1 ELSE 0 END) AS unseen" +
             ", CASE WHEN folder.account IS NULL THEN folder.sync_state ELSE NULL END AS sync_state" +
+            ", folder.color, COUNT (DISTINCT folder.color) AS colorCount" +
             " FROM folder" +
             " LEFT JOIN account ON account.id = folder.account" +
             " LEFT JOIN message ON message.folder = folder.id AND NOT message.ui_hide" +
diff --git a/app/src/main/java/eu/faircode/email/TupleFolderUnified.java b/app/src/main/java/eu/faircode/email/TupleFolderUnified.java
index c645bf7ba9..9154c28d90 100644
--- a/app/src/main/java/eu/faircode/email/TupleFolderUnified.java
+++ b/app/src/main/java/eu/faircode/email/TupleFolderUnified.java
@@ -26,6 +26,8 @@ public class TupleFolderUnified {
     public int messages;
     public int unseen;
     public String sync_state;
+    public Integer color;
+    public int colorCount;
 
     @Override
     public boolean equals(Object obj) {
@@ -34,7 +36,9 @@ public class TupleFolderUnified {
             return (Objects.equals(this.type, other.type) &&
                     this.messages == other.messages &&
                     this.unseen == other.unseen &&
-                    Objects.equals(this.sync_state, other.sync_state));
+                    Objects.equals(this.sync_state, other.sync_state) &&
+                    Objects.equals(this.color, other.color) &&
+                    this.colorCount == other.colorCount);
         } else
             return false;
     }
diff --git a/metadata/en-US/changelogs/1731.txt b/metadata/en-US/changelogs/1731.txt
index 3e92627371..137dc11dbe 100644
--- a/metadata/en-US/changelogs/1731.txt
+++ b/metadata/en-US/changelogs/1731.txt
@@ -7,6 +7,7 @@
 ### Next version
 
 * Added theme option for default light original message view
+* Unified color based on account folder colors
 
 ### 1.1731