From 6dd31d4e1be3256cc145c9587d56388c0a0365c6 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 22 Sep 2018 08:35:54 +0000
Subject: [PATCH] Changed some icons

---
 .../main/java/eu/faircode/email/AdapterAttachment.java |  2 +-
 app/src/main/java/eu/faircode/email/AdapterFolder.java |  2 +-
 .../main/java/eu/faircode/email/FragmentMessages.java  |  4 ++--
 .../main/res/drawable/baseline_cloud_download_24.xml   | 10 ++++++++++
 app/src/main/res/layout/fragment_legend.xml            |  4 ++--
 app/src/main/res/layout/item_attachment.xml            |  2 +-
 6 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/drawable/baseline_cloud_download_24.xml

diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index 110d3caacf..41259b4dae 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -106,7 +106,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
                 ivStatus.setVisibility(View.VISIBLE);
             } else {
                 if (attachment.progress == null) {
-                    ivStatus.setImageResource(R.drawable.baseline_get_app_24);
+                    ivStatus.setImageResource(R.drawable.baseline_cloud_download_24);
                     ivStatus.setVisibility(View.VISIBLE);
                 } else
                     ivStatus.setVisibility(View.GONE);
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 9c8fd459a0..696e71716a 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -108,7 +108,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             else if ("syncing".equals(folder.state))
                 ivState.setImageResource(R.drawable.baseline_compare_arrows_24);
             else if ("downloading".equals(folder.state))
-                ivState.setImageResource(R.drawable.baseline_get_app_24);
+                ivState.setImageResource(R.drawable.baseline_cloud_download_24);
             else
                 ivState.setImageResource(R.drawable.baseline_cloud_off_24);
             ivState.setVisibility(folder.synchronize || folder.state != null ? View.VISIBLE : View.INVISIBLE);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 15b4292369..317b6cebe8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -205,7 +205,7 @@ public class FragmentMessages extends FragmentEx {
 
                 if (dX > margin) {
                     // Right swipe
-                    Drawable d = getResources().getDrawable(inbox ? R.drawable.baseline_inbox_24 : R.drawable.baseline_archive_24, getContext().getTheme());
+                    Drawable d = getResources().getDrawable(inbox ? R.drawable.baseline_move_to_inbox_24 : R.drawable.baseline_archive_24, getContext().getTheme());
                     int padding = (itemView.getHeight() - d.getIntrinsicHeight());
                     d.setBounds(
                             itemView.getLeft() + margin,
@@ -215,7 +215,7 @@ public class FragmentMessages extends FragmentEx {
                     d.draw(canvas);
                 } else if (dX < -margin) {
                     // Left swipe
-                    Drawable d = getResources().getDrawable(inbox ? R.drawable.baseline_inbox_24 : R.drawable.baseline_delete_24, getContext().getTheme());
+                    Drawable d = getResources().getDrawable(inbox ? R.drawable.baseline_move_to_inbox_24 : R.drawable.baseline_delete_24, getContext().getTheme());
                     int padding = (itemView.getHeight() - d.getIntrinsicHeight());
                     d.setBounds(
                             itemView.getLeft() + itemView.getWidth() - d.getIntrinsicWidth() - margin,
diff --git a/app/src/main/res/drawable/baseline_cloud_download_24.xml b/app/src/main/res/drawable/baseline_cloud_download_24.xml
new file mode 100644
index 0000000000..f3c3263e40
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_cloud_download_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="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_legend.xml b/app/src/main/res/layout/fragment_legend.xml
index 10636d3745..47934ac9db 100644
--- a/app/src/main/res/layout/fragment_legend.xml
+++ b/app/src/main/res/layout/fragment_legend.xml
@@ -13,7 +13,7 @@
             android:id="@+id/ivInbox"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:src="@drawable/baseline_inbox_24"
+            android:src="@drawable/baseline_move_to_inbox_24"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -313,7 +313,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginTop="12dp"
-            android:src="@drawable/baseline_get_app_24"
+            android:src="@drawable/baseline_cloud_download_24"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSynchronizing" />
 
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index 7fd85b7612..8fcb64976f 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -54,7 +54,7 @@
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_marginStart="6dp"
-        android:src="@drawable/baseline_get_app_24"
+        android:src="@drawable/baseline_cloud_download_24"
         app:layout_constraintEnd_toStartOf="@+id/ivSave"
         app:layout_constraintStart_toEndOf="@id/tvSize"
         app:layout_constraintTop_toTopOf="parent" />