From 5583455e13e1fd5e8d47c895cb2ee6e52cc9df64 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 1 Sep 2019 18:42:07 +0200
Subject: [PATCH] Compose image buttons

---
 .../eu/faircode/email/FragmentCompose.java    | 29 +++++++++----------
 app/src/main/res/layout/fragment_compose.xml  | 12 +++++---
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index d4f701ec5a..e34d342e60 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -87,7 +87,6 @@ import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.FilterQueryProvider;
 import android.widget.ImageButton;
-import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.MultiAutoCompleteTextView;
 import android.widget.Spinner;
@@ -161,13 +160,13 @@ public class FragmentCompose extends FragmentBase {
     private EditText etExtra;
     private TextView tvDomain;
     private MultiAutoCompleteTextView etTo;
-    private ImageView ivToAdd;
+    private ImageButton ibToAdd;
     private MultiAutoCompleteTextView etCc;
-    private ImageView ivCcAdd;
+    private ImageButton ibCcAdd;
     private MultiAutoCompleteTextView etBcc;
-    private ImageView ivBccAdd;
+    private ImageButton ibBccAdd;
     private EditText etSubject;
-    private ImageView ivCcBcc;
+    private ImageButton ibCcBcc;
     private RecyclerView rvAttachment;
     private TextView tvNoInternetAttachments;
     private EditTextCompose etBody;
@@ -254,13 +253,13 @@ public class FragmentCompose extends FragmentBase {
         etExtra = view.findViewById(R.id.etExtra);
         tvDomain = view.findViewById(R.id.tvDomain);
         etTo = view.findViewById(R.id.etTo);
-        ivToAdd = view.findViewById(R.id.ivToAdd);
+        ibToAdd = view.findViewById(R.id.ivToAdd);
         etCc = view.findViewById(R.id.etCc);
-        ivCcAdd = view.findViewById(R.id.ivCcAdd);
+        ibCcAdd = view.findViewById(R.id.ivCcAdd);
         etBcc = view.findViewById(R.id.etBcc);
-        ivBccAdd = view.findViewById(R.id.ivBccAdd);
+        ibBccAdd = view.findViewById(R.id.ivBccAdd);
         etSubject = view.findViewById(R.id.etSubject);
-        ivCcBcc = view.findViewById(R.id.ivCcBcc);
+        ibCcBcc = view.findViewById(R.id.ivCcBcc);
         rvAttachment = view.findViewById(R.id.rvAttachment);
         tvNoInternetAttachments = view.findViewById(R.id.tvNoInternetAttachments);
         etBody = view.findViewById(R.id.etBody);
@@ -299,7 +298,7 @@ public class FragmentCompose extends FragmentBase {
         etSubject.setMaxLines(Integer.MAX_VALUE);
         etSubject.setHorizontallyScrolling(false);
 
-        ivCcBcc.setOnClickListener(new View.OnClickListener() {
+        ibCcBcc.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 onMenuAddresses();
@@ -332,9 +331,9 @@ public class FragmentCompose extends FragmentBase {
             }
         };
 
-        ivToAdd.setOnClickListener(onPick);
-        ivCcAdd.setOnClickListener(onPick);
-        ivBccAdd.setOnClickListener(onPick);
+        ibToAdd.setOnClickListener(onPick);
+        ibCcAdd.setOnClickListener(onPick);
+        ibBccAdd.setOnClickListener(onPick);
 
         setZoom();
 
@@ -437,7 +436,7 @@ public class FragmentCompose extends FragmentBase {
         grpHeader.setVisibility(View.GONE);
         grpExtra.setVisibility(View.GONE);
         grpAddresses.setVisibility(View.GONE);
-        ivCcBcc.setVisibility(View.GONE);
+        ibCcBcc.setVisibility(View.GONE);
         grpAttachments.setVisibility(View.GONE);
         tvNoInternet.setVisibility(View.GONE);
         grpBody.setVisibility(View.GONE);
@@ -2339,7 +2338,7 @@ public class FragmentCompose extends FragmentBase {
 
             grpHeader.setVisibility(View.VISIBLE);
             grpAddresses.setVisibility("reply_all".equals(action) ? View.VISIBLE : View.GONE);
-            ivCcBcc.setVisibility(View.VISIBLE);
+            ibCcBcc.setVisibility(View.VISIBLE);
 
             bottom_navigation.getMenu().findItem(R.id.action_undo).setVisible(draft.revision != null && draft.revision > 1);
             bottom_navigation.getMenu().findItem(R.id.action_redo).setVisible(draft.revision != null && !draft.revision.equals(draft.revisions));
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index 35c4db7319..6863fc08e7 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -64,12 +64,13 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/etExtra" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/ivToAdd"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_marginStart="6dp"
                 android:layout_marginEnd="6dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/title_legend_pick"
                 app:layout_constraintBottom_toBottomOf="@id/etTo"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -90,12 +91,13 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/etTo" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/ivCcAdd"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_marginStart="6dp"
                 android:layout_marginEnd="6dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/title_legend_pick"
                 app:layout_constraintBottom_toBottomOf="@id/etCc"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -116,12 +118,13 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/etCc" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/ivBccAdd"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_marginStart="6dp"
                 android:layout_marginEnd="6dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/title_legend_pick"
                 app:layout_constraintBottom_toBottomOf="@id/etBcc"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -142,12 +145,13 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/etBcc" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/ivCcBcc"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_marginStart="6dp"
                 android:layout_marginEnd="6dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/title_show_addresses"
                 app:layout_constraintBottom_toBottomOf="@id/etSubject"
                 app:layout_constraintEnd_toEndOf="parent"