From 20dc28ab384b4b3668c8093a1255301863c944e0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 1 Oct 2023 19:43:45 +0200
Subject: [PATCH] Replaced arrow icons

---
 .../main/java/eu/faircode/email/FragmentMessages.java  | 10 +++++-----
 app/src/main/res/drawable/importance.xml               |  4 ++--
 ...seline_arrow_upward_24.xml => twotone_north_24.xml} |  2 +-
 ...line_arrow_downward_24.xml => twotone_south_24.xml} |  2 +-
 app/src/main/res/layout/dialog_ask_move.xml            |  2 +-
 app/src/main/res/layout/dialog_buttons.xml             |  2 +-
 app/src/main/res/layout/dialog_quick_actions.xml       |  4 ++--
 app/src/main/res/layout/fragment_legend_messages.xml   |  4 ++--
 app/src/main/res/layout/fragment_messages.xml          |  4 ++--
 app/src/main/res/menu/popup_message_more.xml           |  6 +++---
 10 files changed, 20 insertions(+), 20 deletions(-)
 rename app/src/main/res/drawable/{baseline_arrow_upward_24.xml => twotone_north_24.xml} (76%)
 rename app/src/main/res/drawable/{baseline_arrow_downward_24.xml => twotone_south_24.xml} (75%)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index ccb325c164..aee7c9d48d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1348,9 +1348,9 @@ public class FragmentMessages extends FragmentBase
         if (prefs.getBoolean("updown", false)) {
             boolean reversed = prefs.getBoolean("reversed", false);
             bottom_navigation.getMenu().findItem(R.id.action_prev)
-                    .setIcon(reversed ? R.drawable.baseline_arrow_upward_24 : R.drawable.baseline_arrow_downward_24);
+                    .setIcon(reversed ? R.drawable.twotone_north_24 : R.drawable.twotone_south_24);
             bottom_navigation.getMenu().findItem(R.id.action_next)
-                    .setIcon(reversed ? R.drawable.baseline_arrow_downward_24 : R.drawable.baseline_arrow_upward_24);
+                    .setIcon(reversed ? R.drawable.twotone_south_24 : R.drawable.twotone_north_24);
         }
 
         bottom_navigation.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
@@ -4073,15 +4073,15 @@ public class FragmentMessages extends FragmentBase
 
                 SubMenu importance = popupMenu.getMenu()
                         .addSubMenu(Menu.NONE, Menu.NONE, order++, R.string.title_set_importance)
-                        .setIcon(R.drawable.baseline_arrow_upward_24);
+                        .setIcon(R.drawable.twotone_north_24);
                 importance.add(Menu.NONE, R.string.title_importance_high, 1, R.string.title_importance_high)
-                        .setIcon(R.drawable.baseline_arrow_upward_24)
+                        .setIcon(R.drawable.twotone_north_24)
                         .setEnabled(!EntityMessage.PRIORITIY_HIGH.equals(result.importance));
                 importance.add(Menu.NONE, R.string.title_importance_normal, 2, R.string.title_importance_normal)
                         .setIcon(R.drawable.twotone_horizontal_rule_24)
                         .setEnabled(!EntityMessage.PRIORITIY_NORMAL.equals(result.importance));
                 importance.add(Menu.NONE, R.string.title_importance_low, 3, R.string.title_importance_low)
-                        .setIcon(R.drawable.baseline_arrow_downward_24)
+                        .setIcon(R.drawable.twotone_south_24)
                         .setEnabled(!EntityMessage.PRIORITIY_LOW.equals(result.importance));
 
                 if (ids.length < MAX_SEND_RAW)
diff --git a/app/src/main/res/drawable/importance.xml b/app/src/main/res/drawable/importance.xml
index acd99edf4b..29d37bece1 100644
--- a/app/src/main/res/drawable/importance.xml
+++ b/app/src/main/res/drawable/importance.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:drawable="@drawable/baseline_arrow_downward_24"
+        android:drawable="@drawable/twotone_south_24"
         android:maxLevel="0" />
     <item
         android:drawable="@drawable/twotone_horizontal_rule_24"
         android:maxLevel="1" />
     <item
-        android:drawable="@drawable/baseline_arrow_upward_24"
+        android:drawable="@drawable/twotone_north_24"
         android:maxLevel="2" />
 </level-list>
diff --git a/app/src/main/res/drawable/baseline_arrow_upward_24.xml b/app/src/main/res/drawable/twotone_north_24.xml
similarity index 76%
rename from app/src/main/res/drawable/baseline_arrow_upward_24.xml
rename to app/src/main/res/drawable/twotone_north_24.xml
index 07b7a8366c..129add2d54 100644
--- a/app/src/main/res/drawable/baseline_arrow_upward_24.xml
+++ b/app/src/main/res/drawable/twotone_north_24.xml
@@ -6,5 +6,5 @@
     android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
-      android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/>
+      android:pathData="M5,9l1.41,1.41L11,5.83V22H13V5.83l4.59,4.59L19,9l-7,-7L5,9z"/>
 </vector>
diff --git a/app/src/main/res/drawable/baseline_arrow_downward_24.xml b/app/src/main/res/drawable/twotone_south_24.xml
similarity index 75%
rename from app/src/main/res/drawable/baseline_arrow_downward_24.xml
rename to app/src/main/res/drawable/twotone_south_24.xml
index 8f9be44a70..901daf4a85 100644
--- a/app/src/main/res/drawable/baseline_arrow_downward_24.xml
+++ b/app/src/main/res/drawable/twotone_south_24.xml
@@ -6,5 +6,5 @@
     android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
-      android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"/>
+      android:pathData="M19,15l-1.41,-1.41L13,18.17V2H11v16.17l-4.59,-4.59L5,15l7,7L19,15z"/>
 </vector>
diff --git a/app/src/main/res/layout/dialog_ask_move.xml b/app/src/main/res/layout/dialog_ask_move.xml
index 9893ca8050..3165e2d510 100644
--- a/app/src/main/res/layout/dialog_ask_move.xml
+++ b/app/src/main/res/layout/dialog_ask_move.xml
@@ -47,7 +47,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSourceFolders"
-            app:srcCompat="@drawable/baseline_arrow_downward_24"
+            app:srcCompat="@drawable/twotone_south_24"
             app:tint="?android:attr/textColorSecondary" />
 
         <TextView
diff --git a/app/src/main/res/layout/dialog_buttons.xml b/app/src/main/res/layout/dialog_buttons.xml
index 2378c8b2c5..c0e6b43a4c 100644
--- a/app/src/main/res/layout/dialog_buttons.xml
+++ b/app/src/main/res/layout/dialog_buttons.xml
@@ -153,7 +153,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/baseline_arrow_upward_24"
+            android:drawableEnd="@drawable/twotone_north_24"
             android:drawablePadding="6dp"
             android:text="@string/title_set_importance"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
diff --git a/app/src/main/res/layout/dialog_quick_actions.xml b/app/src/main/res/layout/dialog_quick_actions.xml
index c5bf1565a0..5480bace31 100644
--- a/app/src/main/res/layout/dialog_quick_actions.xml
+++ b/app/src/main/res/layout/dialog_quick_actions.xml
@@ -114,7 +114,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/baseline_arrow_downward_24"
+            android:drawableEnd="@drawable/twotone_south_24"
             android:drawablePadding="6dp"
             android:text="@string/title_quick_actions_low"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
@@ -140,7 +140,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/baseline_arrow_upward_24"
+            android:drawableEnd="@drawable/twotone_north_24"
             android:drawablePadding="6dp"
             android:text="@string/title_quick_actions_high"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
diff --git a/app/src/main/res/layout/fragment_legend_messages.xml b/app/src/main/res/layout/fragment_legend_messages.xml
index 10ae98cbdb..04fdd72260 100644
--- a/app/src/main/res/layout/fragment_legend_messages.xml
+++ b/app/src/main/res/layout/fragment_legend_messages.xml
@@ -258,7 +258,7 @@
             app:layout_constraintBottom_toBottomOf="@+id/tvHighImportance"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvHighImportance"
-            app:srcCompat="@drawable/baseline_arrow_upward_24" />
+            app:srcCompat="@drawable/twotone_north_24" />
 
         <TextView
             android:id="@+id/tvHighImportance"
@@ -281,7 +281,7 @@
             app:layout_constraintBottom_toBottomOf="@+id/tvLowImportance"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvLowImportance"
-            app:srcCompat="@drawable/baseline_arrow_downward_24" />
+            app:srcCompat="@drawable/twotone_south_24" />
 
         <TextView
             android:id="@+id/tvLowImportance"
diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index a2b97ce4c7..3b07876bbb 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -684,7 +684,7 @@
                 android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@id/ibBatchFlagColor"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/baseline_arrow_downward_24"
+                app:srcCompat="@drawable/twotone_south_24"
                 app:tint="@color/action_foreground" />
 
             <ImageButton
@@ -714,7 +714,7 @@
                 android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/ibNormalImportance"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/baseline_arrow_upward_24"
+                app:srcCompat="@drawable/twotone_north_24"
                 app:tint="@color/action_foreground" />
 
             <ImageButton
diff --git a/app/src/main/res/menu/popup_message_more.xml b/app/src/main/res/menu/popup_message_more.xml
index dbd28ba875..0c83cc45ec 100644
--- a/app/src/main/res/menu/popup_message_more.xml
+++ b/app/src/main/res/menu/popup_message_more.xml
@@ -26,12 +26,12 @@
 
         <item
             android:id="@+id/menu_set_importance"
-            android:icon="@drawable/baseline_arrow_upward_24"
+            android:icon="@drawable/twotone_north_24"
             android:title="@string/title_set_importance">
             <menu>
                 <item
                     android:id="@+id/menu_set_importance_high"
-                    android:icon="@drawable/baseline_arrow_upward_24"
+                    android:icon="@drawable/twotone_north_24"
                     android:title="@string/title_importance_high" />
                 <item
                     android:id="@+id/menu_set_importance_normal"
@@ -39,7 +39,7 @@
                     android:title="@string/title_importance_normal" />
                 <item
                     android:id="@+id/menu_set_importance_low"
-                    android:icon="@drawable/baseline_arrow_downward_24"
+                    android:icon="@drawable/twotone_south_24"
                     android:title="@string/title_importance_low" />
             </menu>
         </item>