From 5b306f662d1430680547b53e528ac227b09293b6 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 28 Sep 2020 13:28:49 +0200
Subject: [PATCH] Replaced hourglass icon

---
 .../java/eu/faircode/email/AdapterFolder.java |  2 +-
 .../java/eu/faircode/email/AdapterImage.java  |  2 +-
 .../java/eu/faircode/email/ImageHelper.java   |  4 ++--
 .../drawable/twotone_hourglass_empty_24.xml   | 10 ----------
 .../res/drawable/twotone_hourglass_top_24.xml | 20 +++++++++++++++++++
 .../fragment_legend_synchronization.xml       |  2 +-
 6 files changed, 25 insertions(+), 15 deletions(-)
 delete mode 100755 app/src/main/res/drawable/twotone_hourglass_empty_24.xml
 create mode 100644 app/src/main/res/drawable/twotone_hourglass_top_24.xml

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index ada8ae5489..1c599a10f3 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -224,7 +224,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                         ivState.setImageResource(R.drawable.twotone_dns_24);
                         ivState.setContentDescription(context.getString(R.string.title_legend_executing));
                     } else if ("waiting".equals(folder.state)) {
-                        ivState.setImageResource(R.drawable.twotone_hourglass_empty_24);
+                        ivState.setImageResource(R.drawable.twotone_hourglass_top_24);
                         ivState.setContentDescription(context.getString(R.string.title_legend_waiting));
                     } else if ("connected".equals(folder.state)) {
                         ivState.setImageResource(R.drawable.baseline_cloud_24);
diff --git a/app/src/main/java/eu/faircode/email/AdapterImage.java b/app/src/main/java/eu/faircode/email/AdapterImage.java
index 540b379f80..00f3fdb9df 100644
--- a/app/src/main/java/eu/faircode/email/AdapterImage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterImage.java
@@ -87,7 +87,7 @@ public class AdapterImage extends RecyclerView.Adapter<AdapterImage.ViewHolder>
                     ivImage.setImageBitmap(bm);
             } else
                 ivImage.setImageResource(attachment.progress == null
-                        ? R.drawable.twotone_image_24 : R.drawable.twotone_hourglass_empty_24);
+                        ? R.drawable.twotone_image_24 : R.drawable.twotone_hourglass_top_24);
 
             tvCaption.setVisibility(TextUtils.isEmpty(attachment.name) ? View.GONE : View.VISIBLE);
 
diff --git a/app/src/main/java/eu/faircode/email/ImageHelper.java b/app/src/main/java/eu/faircode/email/ImageHelper.java
index b17b4a58d6..3853c46706 100644
--- a/app/src/main/java/eu/faircode/email/ImageHelper.java
+++ b/app/src/main/java/eu/faircode/email/ImageHelper.java
@@ -380,7 +380,7 @@ class ImageHelper {
             if (cached != null || view == null) {
                 if (view == null)
                     if (cached == null) {
-                        Drawable d = res.getDrawable(R.drawable.twotone_hourglass_empty_24, theme);
+                        Drawable d = res.getDrawable(R.drawable.twotone_hourglass_top_24, theme);
                         d.setBounds(0, 0, px, px);
                         return d;
                     } else
@@ -391,7 +391,7 @@ class ImageHelper {
             }
 
             final LevelListDrawable lld = new LevelListDrawable();
-            Drawable wait = res.getDrawable(R.drawable.twotone_hourglass_empty_24, theme);
+            Drawable wait = res.getDrawable(R.drawable.twotone_hourglass_top_24, theme);
             lld.addLevel(1, 1, wait);
             lld.setBounds(0, 0, px, px);
             lld.setLevel(1);
diff --git a/app/src/main/res/drawable/twotone_hourglass_empty_24.xml b/app/src/main/res/drawable/twotone_hourglass_empty_24.xml
deleted file mode 100755
index 8e91c8a54e..0000000000
--- a/app/src/main/res/drawable/twotone_hourglass_empty_24.xml
+++ /dev/null
@@ -1,10 +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="M18,2L6,2v6h0.01L6,8.01 10,12l-4,4 0.01,0.01L6,16.01L6,22h12v-5.99h-0.01L18,16l-4,-4 4,-3.99 -0.01,-0.01L18,8L18,2zM16,16.5L16,20L8,20v-3.5l4,-4 4,4zM16,7.5l-4,4 -4,-4L8,4h8v3.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/twotone_hourglass_top_24.xml b/app/src/main/res/drawable/twotone_hourglass_top_24.xml
new file mode 100644
index 0000000000..84ed077bea
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_hourglass_top_24.xml
@@ -0,0 +1,20 @@
+<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="M8,7.5l4,4l4,-4l0,-3.5l-8,0z"
+      android:strokeAlpha="0.3"
+      android:fillAlpha="0.3"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M8,7.5l4,4l4,-4l0,-3.5l-8,0z"
+      android:strokeAlpha="0.3"
+      android:fillAlpha="0.3"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M18,2H6v6l4,4l-3.99,4.01L6,22h12l-0.01,-5.99L14,12l4,-3.99V2zM16,16.5V20H8v-3.5l4,-4L16,16.5zM16,7.5l-4,4l-4,-4V4h8V7.5z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_legend_synchronization.xml b/app/src/main/res/layout/fragment_legend_synchronization.xml
index 0c34800d15..31413bf81b 100644
--- a/app/src/main/res/layout/fragment_legend_synchronization.xml
+++ b/app/src/main/res/layout/fragment_legend_synchronization.xml
@@ -328,7 +328,7 @@
             android:padding="12dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivClosing"
-            app:srcCompat="@drawable/twotone_hourglass_empty_24" />
+            app:srcCompat="@drawable/twotone_hourglass_top_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvWaiting"