From 2c42019ab5dc2d573aa144e23ac272cebbd8696b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 5 Jan 2019 14:24:04 +0000
Subject: [PATCH] Show solid mail icon when downloading messages, small
 improvements

---
 .../java/eu/faircode/email/AdapterFolder.java     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index c741b2612d..1c11e46085 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -58,6 +58,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
     private long account;
     private boolean debug;
     private int dp12;
+    private int colorUnread;
+    private int textColorSecondary;
 
     private List<TupleFolderEx> all = new ArrayList<>();
     private List<TupleFolderEx> filtered = new ArrayList<>();
@@ -70,6 +72,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         private ImageView ivNotify;
         private TextView tvName;
         private TextView tvMessages;
+        private ImageView ivMessages;
         private ImageView ivUnified;
         private TextView tvType;
         private TextView tvAfter;
@@ -92,6 +95,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             ivNotify = itemView.findViewById(R.id.ivNotify);
             tvName = itemView.findViewById(R.id.tvName);
             tvMessages = itemView.findViewById(R.id.tvMessages);
+            ivMessages = itemView.findViewById(R.id.ivMessages);
             ivUnified = itemView.findViewById(R.id.ivUnified);
             tvType = itemView.findViewById(R.id.tvType);
             tvAfter = itemView.findViewById(R.id.tvAfter);
@@ -156,9 +160,11 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             else
                 tvName.setText(name);
             tvName.setTypeface(null, folder.unseen > 0 ? Typeface.BOLD : Typeface.NORMAL);
-            tvName.setTextColor(Helper.resolveColor(context, folder.unseen > 0 ? R.attr.colorUnread : android.R.attr.textColorSecondary));
+            tvName.setTextColor(folder.unseen > 0 ? colorUnread : textColorSecondary);
 
             tvMessages.setText(String.format("%d/%d", folder.content, folder.messages));
+            ivMessages.setImageResource(folder.download && !EntityFolder.OUTBOX.equals(folder.type)
+                    ? R.drawable.baseline_mail_24 : R.drawable.baseline_mail_outline_24);
 
             ivUnified.setVisibility(account > 0 && folder.unified ? View.VISIBLE : View.INVISIBLE);
 
@@ -183,9 +189,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                 ivSync.setImageResource(folder.synchronize ? R.drawable.baseline_sync_24 : R.drawable.baseline_sync_disabled_24);
             }
             ivSync.setImageTintList(ColorStateList.valueOf(
-                    Helper.resolveColor(context, folder.synchronize && folder.initialize && !EntityFolder.OUTBOX.equals(folder.type)
-                            ? R.attr.colorUnread : android.R.attr.textColorSecondary
-                    )));
+                    folder.synchronize && folder.initialize && !EntityFolder.OUTBOX.equals(folder.type)
+                            ? colorUnread : textColorSecondary));
 
             tvKeywords.setText(TextUtils.join(" ", folder.keywords));
             tvKeywords.setVisibility(debug && folder.keywords.length > 0 ? View.VISIBLE : View.GONE);
@@ -379,6 +384,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         this.debug = prefs.getBoolean("debug", false);
 
         this.dp12 = Helper.dp2pixels(context, 12);
+        this.colorUnread = Helper.resolveColor(context, R.attr.colorUnread);
+        this.textColorSecondary = Helper.resolveColor(context, android.R.attr.textColorSecondary);
 
         setHasStableIds(true);
     }