From 8ed336f9d762df16b13f2668939a89a61f58e188 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 1 Oct 2020 12:07:28 +0200
Subject: [PATCH] Use cancel icon for closing account/folder

---
 .../java/eu/faircode/email/AdapterAccount.java    |  2 +-
 .../java/eu/faircode/email/AdapterFolder.java     |  2 +-
 app/src/main/res/drawable/twotone_cancel_24.xml   | 15 +++++++++++++++
 .../layout/fragment_legend_synchronization.xml    |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/twotone_cancel_24.xml

diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index 47f4149121..41055278d1 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -177,7 +177,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                 ivState.setImageResource(R.drawable.twotone_cloud_queue_24);
                 ivState.setContentDescription(context.getString(R.string.title_legend_connecting));
             } else if ("closing".equals(account.state)) {
-                ivState.setImageResource(R.drawable.twotone_close_24);
+                ivState.setImageResource(R.drawable.twotone_cancel_24);
                 ivState.setContentDescription(context.getString(R.string.title_legend_closing));
             } else {
                 ivState.setImageResource(R.drawable.twotone_cloud_off_24);
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index d54777b770..c7acd5602f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -233,7 +233,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                         ivState.setImageResource(R.drawable.twotone_cloud_queue_24);
                         ivState.setContentDescription(context.getString(R.string.title_legend_connecting));
                     } else if ("closing".equals(folder.state)) {
-                        ivState.setImageResource(R.drawable.twotone_close_24);
+                        ivState.setImageResource(R.drawable.twotone_cancel_24);
                         ivState.setContentDescription(context.getString(R.string.title_legend_closing));
                     } else if (folder.state == null) {
                         ivState.setImageResource(R.drawable.twotone_cloud_off_24);
diff --git a/app/src/main/res/drawable/twotone_cancel_24.xml b/app/src/main/res/drawable/twotone_cancel_24.xml
new file mode 100644
index 0000000000..64473041cd
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_cancel_24.xml
@@ -0,0 +1,15 @@
+<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="M12,4c-4.41,0 -8,3.59 -8,8s3.59,8 8,8 8,-3.59 8,-8 -3.59,-8 -8,-8zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"
+      android:strokeAlpha="0.3"
+      android:fillAlpha="0.3"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM15.59,7L12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12 17,8.41z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_legend_synchronization.xml b/app/src/main/res/layout/fragment_legend_synchronization.xml
index 906773f26b..8381d55bf6 100644
--- a/app/src/main/res/layout/fragment_legend_synchronization.xml
+++ b/app/src/main/res/layout/fragment_legend_synchronization.xml
@@ -306,7 +306,7 @@
             android:padding="12dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivDownloading"
-            app:srcCompat="@drawable/twotone_close_24" />
+            app:srcCompat="@drawable/twotone_cancel_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvClosing"