From faaa1b432dbd1048b94ae515d419e3e39f37aead Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 22 May 2019 16:29:18 +0200
Subject: [PATCH] Show folder type

---
 .../java/eu/faircode/email/AdapterFolder.java |  3 +
 .../java/eu/faircode/email/EntityFolder.java  |  2 +
 .../res/layout/fragment_legend_folders.xml    | 68 ++++++++++++-------
 app/src/main/res/layout/item_folder.xml       | 15 +++-
 app/src/main/res/values/strings.xml           |  4 +-
 5 files changed, 66 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index e7415ebb27..902e054fee 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -100,6 +100,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         private TextView tvName;
         private TextView tvMessages;
         private ImageView ivMessages;
+        private ImageView ivType;
         private ImageView ivUnified;
         private TextView tvType;
         private TextView tvAfter;
@@ -129,6 +130,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             tvName = itemView.findViewById(R.id.tvName);
             tvMessages = itemView.findViewById(R.id.tvMessages);
             ivMessages = itemView.findViewById(R.id.ivMessages);
+            ivType = itemView.findViewById(R.id.ivType);
             ivUnified = itemView.findViewById(R.id.ivUnified);
             tvType = itemView.findViewById(R.id.tvType);
             tvAfter = itemView.findViewById(R.id.tvAfter);
@@ -264,6 +266,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             ivMessages.setImageResource(folder.download || EntityFolder.OUTBOX.equals(folder.type)
                     ? R.drawable.baseline_mail_24 : R.drawable.baseline_mail_outline_24);
 
+            ivType.setImageResource(EntityFolder.getIcon(folder.type));
             ivUnified.setVisibility(account > 0 && folder.unified ? View.VISIBLE : View.GONE);
 
             if (account < 0)
diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java
index 351082308c..4f1a71e818 100644
--- a/app/src/main/java/eu/faircode/email/EntityFolder.java
+++ b/app/src/main/java/eu/faircode/email/EntityFolder.java
@@ -205,6 +205,8 @@ public class EntityFolder extends EntityOrder implements Serializable {
             return R.drawable.baseline_inbox_24;
         if (EntityFolder.DRAFTS.equals(type))
             return R.drawable.baseline_drafts_24;
+        if (EntityFolder.SENT.equals(type))
+            return R.drawable.baseline_send_24;
         if (EntityFolder.ARCHIVE.equals(type))
             return R.drawable.baseline_archive_24;
         if (EntityFolder.TRASH.equals(type))
diff --git a/app/src/main/res/layout/fragment_legend_folders.xml b/app/src/main/res/layout/fragment_legend_folders.xml
index 797eed0e4f..272250b81d 100644
--- a/app/src/main/res/layout/fragment_legend_folders.xml
+++ b/app/src/main/res/layout/fragment_legend_folders.xml
@@ -18,7 +18,7 @@
             android:layout_height="wrap_content">
 
             <ImageView
-                android:id="@+id/ivUnified"
+                android:id="@+id/ivType"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/title_legend_unified"
@@ -34,10 +34,10 @@
                 android:gravity="center_vertical"
                 android:text="@string/title_legend_unified"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                app:layout_constraintBottom_toBottomOf="@id/ivUnified"
+                app:layout_constraintBottom_toBottomOf="@id/ivType"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/ivUnified"
-                app:layout_constraintTop_toTopOf="@id/ivUnified" />
+                app:layout_constraintStart_toEndOf="@id/ivType"
+                app:layout_constraintTop_toTopOf="@id/ivType" />
 
             <ImageView
                 android:id="@+id/ivInbox"
@@ -47,7 +47,7 @@
                 android:padding="12dp"
                 android:src="@drawable/baseline_inbox_24"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/ivUnified" />
+                app:layout_constraintTop_toBottomOf="@id/ivType" />
 
             <TextView
                 android:id="@+id/tvInbox"
@@ -62,48 +62,70 @@
                 app:layout_constraintTop_toTopOf="@id/ivInbox" />
 
             <ImageView
-                android:id="@+id/ivArchive"
+                android:id="@+id/ivDrafts"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/title_legend_archive"
+                android:contentDescription="@string/title_legend_drafts"
                 android:padding="12dp"
-                android:src="@drawable/baseline_archive_24"
+                android:src="@drawable/baseline_drafts_24"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/ivInbox" />
 
             <TextView
-                android:id="@+id/tvArchive"
+                android:id="@+id/tvDrafts"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:gravity="center_vertical"
-                android:text="@string/title_legend_archive"
+                android:text="@string/title_legend_drafts"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                app:layout_constraintBottom_toBottomOf="@id/ivArchive"
+                app:layout_constraintBottom_toBottomOf="@id/ivDrafts"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/ivArchive"
-                app:layout_constraintTop_toTopOf="@id/ivArchive" />
+                app:layout_constraintStart_toEndOf="@id/ivDrafts"
+                app:layout_constraintTop_toTopOf="@id/ivDrafts" />
 
             <ImageView
-                android:id="@+id/ivDrafts"
+                android:id="@+id/ivSent"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/title_legend_drafts"
+                android:contentDescription="@string/title_legend_sent"
                 android:padding="12dp"
-                android:src="@drawable/baseline_drafts_24"
+                android:src="@drawable/baseline_send_24"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/ivArchive" />
+                app:layout_constraintTop_toBottomOf="@id/ivDrafts" />
 
             <TextView
-                android:id="@+id/tvDrafts"
+                android:id="@+id/tvSent"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:gravity="center_vertical"
-                android:text="@string/title_legend_drafts"
+                android:text="@string/title_legend_sent"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                app:layout_constraintBottom_toBottomOf="@id/ivDrafts"
+                app:layout_constraintBottom_toBottomOf="@id/ivSent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/ivDrafts"
-                app:layout_constraintTop_toTopOf="@id/ivDrafts" />
+                app:layout_constraintStart_toEndOf="@id/ivSent"
+                app:layout_constraintTop_toTopOf="@id/ivSent" />
+
+            <ImageView
+                android:id="@+id/ivArchive"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/title_legend_archive"
+                android:padding="12dp"
+                android:src="@drawable/baseline_archive_24"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/ivSent" />
+
+            <TextView
+                android:id="@+id/tvArchive"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:gravity="center_vertical"
+                android:text="@string/title_legend_archive"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                app:layout_constraintBottom_toBottomOf="@id/ivArchive"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/ivArchive"
+                app:layout_constraintTop_toTopOf="@id/ivArchive" />
 
             <ImageView
                 android:id="@+id/ivTrash"
@@ -113,7 +135,7 @@
                 android:padding="12dp"
                 android:src="@drawable/baseline_delete_24"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/ivDrafts" />
+                app:layout_constraintTop_toBottomOf="@id/ivArchive" />
 
             <TextView
                 android:id="@+id/tvTrash"
diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_folder.xml
index 617e0caf07..2fe2e2ebfa 100644
--- a/app/src/main/res/layout/item_folder.xml
+++ b/app/src/main/res/layout/item_folder.xml
@@ -61,15 +61,26 @@
             app:layout_constraintStart_toEndOf="@+id/vwLevel"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <ImageView
+            android:id="@+id/ivType"
+            android:layout_width="30dp"
+            android:layout_height="24dp"
+            android:contentDescription="@string/title_legend_folder_tye"
+            android:paddingEnd="6dp"
+            android:src="@drawable/baseline_inbox_24"
+            app:layout_constraintBottom_toBottomOf="@+id/tvType"
+            app:layout_constraintStart_toEndOf="@id/ivExpander"
+            app:layout_constraintTop_toTopOf="@+id/tvType" />
+
         <ImageView
             android:id="@+id/ivUnified"
             android:layout_width="30dp"
             android:layout_height="24dp"
-            android:contentDescription="@string/title_legend_unified"
+            android:contentDescription="@string/title_unified_folder"
             android:paddingEnd="6dp"
             android:src="@drawable/baseline_folder_special_24"
             app:layout_constraintBottom_toBottomOf="@+id/tvType"
-            app:layout_constraintStart_toEndOf="@id/ivExpander"
+            app:layout_constraintStart_toEndOf="@id/ivType"
             app:layout_constraintTop_toTopOf="@+id/tvType" />
 
         <ImageView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a21b9d5038..a777a31419 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -595,8 +595,9 @@
 
     <string name="title_legend_unified">Unified inbox / primary account</string>
     <string name="title_legend_inbox">Inbox</string>
-    <string name="title_legend_archive">Archive</string>
     <string name="title_legend_drafts">Drafts</string>
+    <string name="title_legend_sent">Sent</string>
+    <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
     <string name="title_legend_junk">Spam</string>
     <string name="title_legend_primary">Primary</string>
@@ -656,6 +657,7 @@
     <string name="title_legend_save">Save</string>
     <string name="title_legend_delete">Delete</string>
     <string name="title_legend_count">Count</string>
+    <string name="title_legend_folder_tye">Folders type</string>
 
     <string name="title_hint_folder_actions">Long press for options</string>
     <string name="title_hint_folder_sync">To limit battery and network usage not all folders and not all messages will be synchronized by default</string>