From de1fe186a92801cb077ee0602d5c36c9904e9a4d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 21 Oct 2019 11:54:39 +0200
Subject: [PATCH] Show low priority

---
 .../eu/faircode/email/AdapterMessage.java     | 15 ++--
 .../res/drawable/baseline_low_priority_24.xml | 10 +++
 .../res/layout/fragment_legend_messages.xml   | 73 ++++++++++++-------
 .../res/layout/include_message_compact.xml    | 39 ++++++----
 .../res/layout/include_message_normal.xml     | 39 ++++++----
 app/src/main/res/values/strings.xml           |  1 +
 6 files changed, 119 insertions(+), 58 deletions(-)
 create mode 100644 app/src/main/res/drawable/baseline_low_priority_24.xml

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 9b2dd804c9..675c55bdba 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -260,8 +260,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private ImageButton ibExpander;
         private ImageView ibFlagged;
         private ImageView ivAvatar;
-        private ImageView ivPriority;
         private ImageView ibAuth;
+        private ImageView ivPriorityHigh;
+        private ImageView ivPriorityLow;
         private TextView tvFrom;
         private TextView tvSize;
         private TextView tvTime;
@@ -377,8 +378,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibExpander = itemView.findViewById(R.id.ibExpander);
             ibFlagged = itemView.findViewById(R.id.ibFlagged);
             ivAvatar = itemView.findViewById(R.id.ivAvatar);
-            ivPriority = itemView.findViewById(R.id.ivPriority);
             ibAuth = itemView.findViewById(R.id.ibAuth);
+            ivPriorityHigh = itemView.findViewById(R.id.ivPriorityHigh);
+            ivPriorityLow = itemView.findViewById(R.id.ivPriorityLow);
             tvFrom = itemView.findViewById(subject_top ? R.id.tvSubject : R.id.tvFrom);
             tvSize = itemView.findViewById(R.id.tvSize);
             tvTime = itemView.findViewById(R.id.tvTime);
@@ -639,8 +641,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibExpander.setVisibility(View.GONE);
             ibFlagged.setVisibility(View.GONE);
             ivAvatar.setVisibility(View.GONE);
-            ivPriority.setVisibility(View.GONE);
             ibAuth.setVisibility(View.GONE);
+            ivPriorityHigh.setVisibility(View.GONE);
+            ivPriorityLow.setVisibility(View.GONE);
             tvFrom.setText(null);
             tvSize.setText(null);
             tvTime.setText(null);
@@ -704,8 +707,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 boolean dim = (message.duplicate || EntityFolder.TRASH.equals(message.folderType));
                 ibFlagged.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
                 ivAvatar.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
-                ivPriority.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
                 ibAuth.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
+                ivPriorityHigh.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
+                ivPriorityLow.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
                 tvFrom.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
                 tvSize.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
                 tvTime.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
@@ -767,8 +771,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ivAvatar.setVisibility(avatars ? View.INVISIBLE : View.GONE);
 
             // Line 1
-            ivPriority.setVisibility(EntityMessage.PRIORITIY_HIGH.equals(message.priority) ? View.VISIBLE : View.GONE);
             ibAuth.setVisibility(authentication && !authenticated ? View.VISIBLE : View.GONE);
+            ivPriorityHigh.setVisibility(EntityMessage.PRIORITIY_HIGH.equals(message.priority) ? View.VISIBLE : View.GONE);
+            ivPriorityLow.setVisibility(EntityMessage.PRIORITIY_LOW.equals(message.priority) ? View.VISIBLE : View.GONE);
             tvFrom.setText(MessageHelper.formatAddresses(addresses, name_email, false));
             tvFrom.setPaintFlags(tvFrom.getPaintFlags() & ~Paint.UNDERLINE_TEXT_FLAG);
             tvSize.setText(message.totalSize == null ? null : Helper.humanReadableByteCount(message.totalSize, true));
diff --git a/app/src/main/res/drawable/baseline_low_priority_24.xml b/app/src/main/res/drawable/baseline_low_priority_24.xml
new file mode 100644
index 0000000000..6fe8823b36
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_low_priority_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M14,5h8v2h-8zM14,10.5h8v2h-8zM14,16h8v2h-8zM2,11.5C2,15.08 4.92,18 8.5,18L9,18v2l3,-3 -3,-3v2h-0.5C6.02,16 4,13.98 4,11.5S6.02,7 8.5,7L12,7L12,5L8.5,5C4.92,5 2,7.92 2,11.5z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_legend_messages.xml b/app/src/main/res/layout/fragment_legend_messages.xml
index 74fba5b877..4742321d6d 100644
--- a/app/src/main/res/layout/fragment_legend_messages.xml
+++ b/app/src/main/res/layout/fragment_legend_messages.xml
@@ -78,29 +78,6 @@
             app:layout_constraintStart_toEndOf="@id/ivDraft"
             app:layout_constraintTop_toTopOf="@id/ivDraft" />
 
-        <ImageView
-            android:id="@+id/ivPriority"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/title_legend_priority"
-            android:padding="12dp"
-            android:tint="@color/colorError"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivDraft"
-            app:srcCompat="@drawable/baseline_priority_high_24" />
-
-        <TextView
-            android:id="@+id/tvPriority"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:gravity="center_vertical"
-            android:text="@string/title_legend_priority"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivPriority"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/ivPriority"
-            app:layout_constraintTop_toTopOf="@id/ivPriority" />
-
         <ImageView
             android:id="@+id/ivAuth"
             android:layout_width="wrap_content"
@@ -109,7 +86,7 @@
             android:padding="12dp"
             android:tint="@color/colorError"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivPriority"
+            app:layout_constraintTop_toBottomOf="@id/ivDraft"
             app:srcCompat="@drawable/baseline_flag_24" />
 
         <TextView
@@ -124,6 +101,52 @@
             app:layout_constraintStart_toEndOf="@id/ivAuth"
             app:layout_constraintTop_toTopOf="@id/ivAuth" />
 
+
+        <ImageView
+            android:id="@+id/ivHighPriority"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/title_legend_priority"
+            android:padding="12dp"
+            android:tint="@color/colorError"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ivAuth"
+            app:srcCompat="@drawable/baseline_priority_high_24" />
+
+        <TextView
+            android:id="@+id/tvHighPriority"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:gravity="center_vertical"
+            android:text="@string/title_legend_priority"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintBottom_toBottomOf="@id/ivHighPriority"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/ivHighPriority"
+            app:layout_constraintTop_toTopOf="@id/ivHighPriority" />
+
+        <ImageView
+            android:id="@+id/ivLowPriority"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/title_legend_priority"
+            android:padding="12dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ivHighPriority"
+            app:srcCompat="@drawable/baseline_low_priority_24" />
+
+        <TextView
+            android:id="@+id/tvLowPriority"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:gravity="center_vertical"
+            android:text="@string/title_legend_priority_low"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintBottom_toBottomOf="@id/ivLowPriority"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/ivLowPriority"
+            app:layout_constraintTop_toTopOf="@id/ivLowPriority" />
+
         <ImageView
             android:id="@+id/ivSnoozed"
             android:layout_width="wrap_content"
@@ -131,7 +154,7 @@
             android:contentDescription="@string/title_legend_snoozed"
             android:padding="12dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivAuth"
+            app:layout_constraintTop_toBottomOf="@id/ivLowPriority"
             app:srcCompat="@drawable/baseline_timelapse_24" />
 
         <TextView
diff --git a/app/src/main/res/layout/include_message_compact.xml b/app/src/main/res/layout/include_message_compact.xml
index 35a4516d8c..852c807355 100644
--- a/app/src/main/res/layout/include_message_compact.xml
+++ b/app/src/main/res/layout/include_message_compact.xml
@@ -56,18 +56,6 @@
         app:layout_constraintTop_toBottomOf="@id/paddingTop"
         app:srcCompat="@drawable/baseline_person_24" />
 
-    <ImageView
-        android:id="@+id/ivPriority"
-        android:layout_width="21dp"
-        android:layout_height="21dp"
-        android:layout_marginStart="6dp"
-        android:contentDescription="@string/title_send_priority"
-        android:tint="@color/colorError"
-        app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
-        app:layout_constraintStart_toEndOf="@id/ivAvatar"
-        app:layout_constraintTop_toTopOf="@+id/tvFrom"
-        app:srcCompat="@drawable/baseline_priority_high_24" />
-
     <ImageButton
         android:id="@+id/ibAuth"
         android:layout_width="21dp"
@@ -77,10 +65,33 @@
         android:contentDescription="@string/title_legend_auth"
         android:tint="@color/colorError"
         app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
-        app:layout_constraintStart_toEndOf="@id/ivPriority"
+        app:layout_constraintStart_toEndOf="@id/ivAvatar"
         app:layout_constraintTop_toTopOf="@+id/tvFrom"
         app:srcCompat="@drawable/baseline_flag_24" />
 
+    <ImageView
+        android:id="@+id/ivPriorityHigh"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_priority"
+        android:tint="@color/colorError"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
+        app:layout_constraintStart_toEndOf="@id/ibAuth"
+        app:layout_constraintTop_toTopOf="@+id/tvFrom"
+        app:srcCompat="@drawable/baseline_priority_high_24" />
+
+    <ImageView
+        android:id="@+id/ivPriorityLow"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_priority_low"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
+        app:layout_constraintStart_toEndOf="@id/ivPriorityHigh"
+        app:layout_constraintTop_toTopOf="@+id/tvFrom"
+        app:srcCompat="@drawable/baseline_low_priority_24" />
+
     <TextView
         android:id="@+id/tvFrom"
         android:layout_width="0dp"
@@ -94,7 +105,7 @@
         android:text="From"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         app:layout_constraintEnd_toStartOf="@+id/tvSize"
-        app:layout_constraintStart_toEndOf="@id/ibAuth"
+        app:layout_constraintStart_toEndOf="@id/ivPriorityLow"
         app:layout_constraintTop_toBottomOf="@id/paddingTop" />
 
     <TextView
diff --git a/app/src/main/res/layout/include_message_normal.xml b/app/src/main/res/layout/include_message_normal.xml
index c6eaebfa0f..6ce73bd7d9 100644
--- a/app/src/main/res/layout/include_message_normal.xml
+++ b/app/src/main/res/layout/include_message_normal.xml
@@ -55,18 +55,6 @@
         app:layout_constraintTop_toBottomOf="@id/paddingTop"
         app:srcCompat="@drawable/baseline_person_24" />
 
-    <ImageView
-        android:id="@+id/ivPriority"
-        android:layout_width="21dp"
-        android:layout_height="21dp"
-        android:layout_marginStart="6dp"
-        android:contentDescription="@string/title_send_priority"
-        android:tint="@color/colorError"
-        app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
-        app:layout_constraintStart_toEndOf="@id/ivAvatar"
-        app:layout_constraintTop_toTopOf="@+id/tvFrom"
-        app:srcCompat="@drawable/baseline_priority_high_24" />
-
     <ImageButton
         android:id="@+id/ibAuth"
         android:layout_width="21dp"
@@ -76,10 +64,33 @@
         android:contentDescription="@string/title_legend_auth"
         android:tint="@color/colorError"
         app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
-        app:layout_constraintStart_toEndOf="@id/ivPriority"
+        app:layout_constraintStart_toEndOf="@id/ivAvatar"
         app:layout_constraintTop_toTopOf="@+id/tvFrom"
         app:srcCompat="@drawable/baseline_flag_24" />
 
+    <ImageView
+        android:id="@+id/ivPriorityHigh"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_priority"
+        android:tint="@color/colorError"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
+        app:layout_constraintStart_toEndOf="@id/ibAuth"
+        app:layout_constraintTop_toTopOf="@+id/tvFrom"
+        app:srcCompat="@drawable/baseline_priority_high_24" />
+
+    <ImageView
+        android:id="@+id/ivPriorityLow"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/title_legend_priority_low"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
+        app:layout_constraintStart_toEndOf="@id/ivPriorityHigh"
+        app:layout_constraintTop_toTopOf="@+id/tvFrom"
+        app:srcCompat="@drawable/baseline_low_priority_24" />
+
     <TextView
         android:id="@+id/tvFrom"
         android:layout_width="0dp"
@@ -91,7 +102,7 @@
         android:text="From"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintEnd_toStartOf="@+id/tvSize"
-        app:layout_constraintStart_toEndOf="@id/ibAuth"
+        app:layout_constraintStart_toEndOf="@id/ivPriorityLow"
         app:layout_constraintTop_toBottomOf="@id/paddingTop" />
 
     <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index faeda946c1..186b2b7aaf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -796,6 +796,7 @@
     <string name="title_legend_zoom">Change text size</string>
     <string name="title_legend_draft">Has draft</string>
     <string name="title_legend_priority">Has high priority</string>
+    <string name="title_legend_priority_low">Has low priority</string>
     <string name="title_legend_auth">Authentication failed</string>
     <string name="title_legend_snoozed">Is snoozed</string>
     <string name="title_legend_browsed">Is browsed or searched</string>