From 9f76ae2a26502704ad2014dd4d6277b31ba25eaa Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 14 Jun 2019 19:47:48 +0200
Subject: [PATCH] Reset color using image button

---
 app/src/main/java/eu/faircode/email/FragmentAccount.java  | 4 ++--
 app/src/main/java/eu/faircode/email/FragmentIdentity.java | 4 ++--
 app/src/main/java/eu/faircode/email/FragmentRule.java     | 3 ++-
 app/src/main/res/layout/fragment_account.xml              | 3 ++-
 app/src/main/res/layout/fragment_identity.xml             | 3 ++-
 app/src/main/res/layout/fragment_rule.xml                 | 3 ++-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 185fd0215b..486eb2ae28 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -52,7 +52,7 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
-import android.widget.ImageView;
+import android.widget.ImageButton;
 import android.widget.RadioGroup;
 import android.widget.ScrollView;
 import android.widget.Spinner;
@@ -110,7 +110,7 @@ public class FragmentAccount extends FragmentBase {
     private EditText etName;
     private Button btnColor;
     private View vwColor;
-    private ImageView ibColorDefault;
+    private ImageButton ibColorDefault;
 
     private Button btnAdvanced;
     private CheckBox cbSynchronize;
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 6d49c3f271..a63c3f09da 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -42,7 +42,7 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
-import android.widget.ImageView;
+import android.widget.ImageButton;
 import android.widget.RadioGroup;
 import android.widget.ScrollView;
 import android.widget.Spinner;
@@ -83,7 +83,7 @@ public class FragmentIdentity extends FragmentBase {
     private EditText etDisplay;
     private Button btnColor;
     private View vwColor;
-    private ImageView ibColorDefault;
+    private ImageButton ibColorDefault;
     private EditText etSignature;
     private Button btnHtml;
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index 735cd1211a..fb0c1152de 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -39,6 +39,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.NumberPicker;
 import android.widget.ScrollView;
@@ -99,7 +100,7 @@ public class FragmentRule extends FragmentBase {
 
     private Button btnColor;
     private View vwColor;
-    private ImageView ibColorDefault;
+    private ImageButton ibColorDefault;
 
     private Spinner spTarget;
     private CheckBox cbMoveSeen;
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index c2bfe24512..30b3ee1074 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -336,11 +336,12 @@
                 app:layout_constraintStart_toEndOf="@id/btnColor"
                 app:layout_constraintTop_toTopOf="@id/btnColor" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/ibColorDefault"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="12dp"
+                android:background="@null"
                 android:contentDescription="@string/title_legend_default_color"
                 android:src="@drawable/baseline_delete_24"
                 app:layout_constraintBottom_toBottomOf="@id/btnColor"
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index 52d1a48d74..8810334304 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -129,11 +129,12 @@
                 app:layout_constraintStart_toEndOf="@id/btnColor"
                 app:layout_constraintTop_toTopOf="@id/btnColor" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/ibColorDefault"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="12dp"
+                android:background="@null"
                 android:contentDescription="@string/title_legend_default_color"
                 android:src="@drawable/baseline_delete_24"
                 app:layout_constraintBottom_toBottomOf="@id/btnColor"
diff --git a/app/src/main/res/layout/fragment_rule.xml b/app/src/main/res/layout/fragment_rule.xml
index 798522a9ca..84d54f01c7 100644
--- a/app/src/main/res/layout/fragment_rule.xml
+++ b/app/src/main/res/layout/fragment_rule.xml
@@ -409,11 +409,12 @@
                 app:layout_constraintStart_toEndOf="@id/btnColor"
                 app:layout_constraintTop_toTopOf="@id/btnColor" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/ibColorDefault"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="12dp"
+                android:background="@null"
                 android:contentDescription="@string/title_legend_default_color"
                 android:src="@drawable/baseline_delete_24"
                 app:layout_constraintBottom_toBottomOf="@id/btnColor"