From 1b42a99482f3fdea8470545ebf80c13d7c192749 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 22 Aug 2021 20:45:33 +0200
Subject: [PATCH] Consistent usage of save icon

---
 app/src/main/res/drawable/twotone_save_24.xml     | 15 ---------------
 app/src/main/res/layout/activity_widget.xml       |  2 +-
 app/src/main/res/layout/activity_widget_sync.xml  |  2 +-
 .../main/res/layout/activity_widget_unified.xml   |  2 +-
 app/src/main/res/layout/fragment_account.xml      |  2 +-
 app/src/main/res/layout/fragment_folder.xml       |  2 +-
 app/src/main/res/layout/fragment_identity.xml     |  2 +-
 app/src/main/res/layout/fragment_pop.xml          |  2 +-
 app/src/main/res/layout/fragment_quick_setup.xml  |  2 +-
 .../res/layout/include_message_attachments.xml    |  2 +-
 app/src/main/res/layout/item_attachment.xml       |  2 +-
 app/src/main/res/layout/item_attachment_eml.xml   |  2 +-
 app/src/main/res/layout/item_keyword.xml          |  2 +-
 app/src/main/res/menu/menu_compose.xml            |  2 +-
 app/src/main/res/menu/popup_message_more.xml      |  2 +-
 15 files changed, 14 insertions(+), 29 deletions(-)
 delete mode 100755 app/src/main/res/drawable/twotone_save_24.xml

diff --git a/app/src/main/res/drawable/twotone_save_24.xml b/app/src/main/res/drawable/twotone_save_24.xml
deleted file mode 100755
index 8130c6d2b7..0000000000
--- a/app/src/main/res/drawable/twotone_save_24.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5,5v14h14L19,7.83L16.17,5L5,5zM12,18c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,10L6,10L6,6h9v4z"
-      android:strokeAlpha="0.3"
-      android:fillAlpha="0.3"/>
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM19,19L5,19L5,5h11.17L19,7.83L19,19zM12,12c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3zM6,6h9v4L6,10z"/>
-</vector>
diff --git a/app/src/main/res/layout/activity_widget.xml b/app/src/main/res/layout/activity_widget.xml
index 94833beff5..1cc46e05c2 100644
--- a/app/src/main/res/layout/activity_widget.xml
+++ b/app/src/main/res/layout/activity_widget.xml
@@ -102,7 +102,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:drawableEnd="@drawable/twotone_save_24"
+            android:drawableEnd="@drawable/twotone_save_alt_24"
             android:drawablePadding="6dp"
             android:text="@string/title_save"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_widget_sync.xml b/app/src/main/res/layout/activity_widget_sync.xml
index 833046c3d1..fcc17ed536 100644
--- a/app/src/main/res/layout/activity_widget_sync.xml
+++ b/app/src/main/res/layout/activity_widget_sync.xml
@@ -38,7 +38,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:drawableEnd="@drawable/twotone_save_24"
+            android:drawableEnd="@drawable/twotone_save_alt_24"
             android:drawablePadding="6dp"
             android:text="@string/title_save"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_widget_unified.xml b/app/src/main/res/layout/activity_widget_unified.xml
index cbb4135ee0..ecf3d6b831 100644
--- a/app/src/main/res/layout/activity_widget_unified.xml
+++ b/app/src/main/res/layout/activity_widget_unified.xml
@@ -126,7 +126,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_save_24"
+            android:drawableEnd="@drawable/twotone_save_alt_24"
             android:drawablePadding="6dp"
             android:text="@string/title_save"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 2d337d15cf..9e6ffaddcb 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -878,7 +878,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_save_24"
+            android:drawableEnd="@drawable/twotone_save_alt_24"
             android:drawablePadding="6dp"
             android:tag="disable"
             android:text="@string/title_save"
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 560b8fb7f8..cfe8be3682 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -362,7 +362,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_save_24"
+            android:drawableEnd="@drawable/twotone_save_alt_24"
             android:drawablePadding="6dp"
             android:tag="disable"
             android:text="@string/title_save"
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index 7e114221c2..72ae8fac31 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -835,7 +835,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_save_24"
+            android:drawableEnd="@drawable/twotone_save_alt_24"
             android:drawablePadding="6dp"
             android:tag="disable"
             android:text="@string/title_save"
diff --git a/app/src/main/res/layout/fragment_pop.xml b/app/src/main/res/layout/fragment_pop.xml
index b47f87b96c..a4eab460ba 100644
--- a/app/src/main/res/layout/fragment_pop.xml
+++ b/app/src/main/res/layout/fragment_pop.xml
@@ -487,7 +487,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_save_24"
+            android:drawableEnd="@drawable/twotone_save_alt_24"
             android:drawablePadding="6dp"
             android:tag="disable"
             android:text="@string/title_save"
diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index 2da7df944d..43efe357c9 100644
--- a/app/src/main/res/layout/fragment_quick_setup.xml
+++ b/app/src/main/res/layout/fragment_quick_setup.xml
@@ -336,7 +336,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_save_24"
+            android:drawableEnd="@drawable/twotone_save_alt_24"
             android:drawablePadding="6dp"
             android:tag="disable"
             android:text="@string/title_save"
diff --git a/app/src/main/res/layout/include_message_attachments.xml b/app/src/main/res/layout/include_message_attachments.xml
index 475ba6471c..fa4318a8c1 100644
--- a/app/src/main/res/layout/include_message_attachments.xml
+++ b/app/src/main/res/layout/include_message_attachments.xml
@@ -49,7 +49,7 @@
         android:tooltipText="@string/title_save_all"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments"
-        app:srcCompat="@drawable/twotone_save_24" />
+        app:srcCompat="@drawable/twotone_save_alt_24" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/barrier_internet"
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index 22c1972a2d..0170d561fb 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -81,7 +81,7 @@
             app:layout_constraintBottom_toBottomOf="@+id/tvType"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/twotone_save_24" />
+            app:srcCompat="@drawable/twotone_save_alt_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvType"
diff --git a/app/src/main/res/layout/item_attachment_eml.xml b/app/src/main/res/layout/item_attachment_eml.xml
index a7028e0e55..a4e9a0b30e 100644
--- a/app/src/main/res/layout/item_attachment_eml.xml
+++ b/app/src/main/res/layout/item_attachment_eml.xml
@@ -81,6 +81,6 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/twotone_save_24" />
+            app:srcCompat="@drawable/twotone_save_alt_24" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_keyword.xml b/app/src/main/res/layout/item_keyword.xml
index c97680e57b..ddf5790735 100644
--- a/app/src/main/res/layout/item_keyword.xml
+++ b/app/src/main/res/layout/item_keyword.xml
@@ -62,7 +62,7 @@
             app:layout_constraintBottom_toBottomOf="@+id/btnColor"
             app:layout_constraintStart_toEndOf="@id/etKeyword"
             app:layout_constraintTop_toTopOf="@+id/btnColor"
-            app:srcCompat="@drawable/twotone_save_24" />
+            app:srcCompat="@drawable/twotone_save_alt_24" />
 
         <eu.faircode.email.ViewButtonColor
             android:id="@+id/btnColor"
diff --git a/app/src/main/res/menu/menu_compose.xml b/app/src/main/res/menu/menu_compose.xml
index 94dc82ee29..291c89060a 100644
--- a/app/src/main/res/menu/menu_compose.xml
+++ b/app/src/main/res/menu/menu_compose.xml
@@ -24,7 +24,7 @@
             android:id="@+id/menu_save_drafts"
             android:checkable="true"
             android:checked="true"
-            android:icon="@drawable/twotone_save_24"
+            android:icon="@drawable/twotone_save_alt_24"
             android:title="@string/title_save_drafts"
             app:showAsAction="never" />
 
diff --git a/app/src/main/res/menu/popup_message_more.xml b/app/src/main/res/menu/popup_message_more.xml
index 2ada436a8b..a49eddec2f 100644
--- a/app/src/main/res/menu/popup_message_more.xml
+++ b/app/src/main/res/menu/popup_message_more.xml
@@ -119,7 +119,7 @@
         <item
             android:id="@+id/menu_raw_save"
             android:enabled="false"
-            android:icon="@drawable/twotone_save_24"
+            android:icon="@drawable/twotone_save_alt_24"
             android:title="@string/title_raw_save" />
 
         <item