From aa9be6e077562452a5268fb1ffbebfc1b8b69e59 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 17 Apr 2020 14:17:59 +0200
Subject: [PATCH] Added bottom trash icon

---
 .../main/java/eu/faircode/email/AdapterMessage.java |  9 +++++++++
 app/src/main/res/layout/include_message_body.xml    | 13 +++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 8524db33ec..123a3ce3c0 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -409,6 +409,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private TextView tvNoInternetBody;
         private ImageButton ibDownloading;
         private Group grpDownloading;
+        private ImageButton ibTrashBottom;
         private ImageButton ibSeen;
         private Flow flow;
 
@@ -602,6 +603,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvNoInternetBody = vsBody.findViewById(R.id.tvNoInternetBody);
             ibDownloading = vsBody.findViewById(R.id.ibDownloading);
             grpDownloading = vsBody.findViewById(R.id.grpDownloading);
+            ibTrashBottom = vsBody.findViewById(R.id.ibTrashBottom);
             ibSeen = vsBody.findViewById(R.id.ibSeen);
             flow = vsBody.findViewById(R.id.flow);
 
@@ -681,6 +683,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 ibMore.setOnClickListener(this);
 
                 ibDownloading.setOnClickListener(this);
+                ibTrashBottom.setOnClickListener(this);
                 ibSeen.setOnClickListener(this);
 
                 tvBody.setOnTouchListener(this);
@@ -754,6 +757,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 ibMore.setOnClickListener(null);
 
                 ibDownloading.setOnClickListener(null);
+                ibTrashBottom.setOnClickListener(null);
                 ibSeen.setOnClickListener(null);
 
                 tvBody.setOnTouchListener(null);
@@ -1200,6 +1204,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             pbBody.setVisibility(View.GONE);
             grpAction.setVisibility(View.GONE);
             clearActions();
+            ibTrashBottom.setVisibility(View.GONE);
             ibSeen.setVisibility(View.GONE);
         }
 
@@ -1495,6 +1500,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             pbBody.setVisibility(View.GONE);
             grpAction.setVisibility(View.GONE);
             clearActions();
+            ibTrashBottom.setVisibility(View.GONE);
             ibSeen.setVisibility(View.GONE);
 
             db.attachment().liveAttachments(message.id).observe(cowner, new Observer<List<EntityAttachment>>() {
@@ -1592,6 +1598,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     ibTrash.setVisibility(trash && button_archive_trash ? View.VISIBLE : View.GONE);
                     ibJunk.setVisibility(junk || unjunk ? View.VISIBLE : View.GONE);
 
+                    ibTrashBottom.setVisibility(trash && button_archive_trash ? View.VISIBLE : View.GONE);
+
                     bindBody(message, scroll);
                 }
 
@@ -2640,6 +2648,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         onActionArchive(message);
                         break;
                     case R.id.ibTrash:
+                    case R.id.ibTrashBottom:
                         onActionTrash(message, (Boolean) ibTrash.getTag());
                         break;
                     case R.id.ibJunk:
diff --git a/app/src/main/res/layout/include_message_body.xml b/app/src/main/res/layout/include_message_body.xml
index 5953bcd22a..da9e228146 100644
--- a/app/src/main/res/layout/include_message_body.xml
+++ b/app/src/main/res/layout/include_message_body.xml
@@ -112,6 +112,19 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvBody" />
 
+    <ImageButton
+        android:id="@+id/ibTrashBottom"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:background="?attr/selectableItemBackground"
+        android:contentDescription="@string/title_trash"
+        android:padding="6dp"
+        android:scaleType="fitCenter"
+        android:tint="?attr/colorSeparator"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/wvBody"
+        app:srcCompat="@drawable/baseline_delete_24" />
+
     <ImageButton
         android:id="@+id/ibSeen"
         android:layout_width="36dp"