From c6a03436aaab41e2d12d679633a9ff07273ecb9d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 17 Apr 2020 18:43:47 +0200
Subject: [PATCH] Added bottom archive button

---
 .../java/eu/faircode/email/AdapterMessage.java  |  8 ++++++++
 .../main/res/layout/include_message_body.xml    | 17 ++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index d5440481d7..3eae4e3e90 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -410,6 +410,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private ImageButton ibDownloading;
         private Group grpDownloading;
         private ImageButton ibTrashBottom;
+        private ImageButton ibArchiveBottom;
         private ImageButton ibSeen;
         private Flow flow;
 
@@ -604,6 +605,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibDownloading = vsBody.findViewById(R.id.ibDownloading);
             grpDownloading = vsBody.findViewById(R.id.grpDownloading);
             ibTrashBottom = vsBody.findViewById(R.id.ibTrashBottom);
+            ibArchiveBottom = vsBody.findViewById(R.id.ibArchiveBottom);
             ibSeen = vsBody.findViewById(R.id.ibSeen);
             flow = vsBody.findViewById(R.id.flow);
 
@@ -684,6 +686,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 ibDownloading.setOnClickListener(this);
                 ibTrashBottom.setOnClickListener(this);
+                ibArchiveBottom.setOnClickListener(this);
                 ibSeen.setOnClickListener(this);
 
                 tvBody.setOnTouchListener(this);
@@ -758,6 +761,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 ibDownloading.setOnClickListener(null);
                 ibTrashBottom.setOnClickListener(null);
+                ibArchiveBottom.setOnClickListener(null);
                 ibSeen.setOnClickListener(null);
 
                 tvBody.setOnTouchListener(null);
@@ -1205,6 +1209,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             grpAction.setVisibility(View.GONE);
             clearActions();
             ibTrashBottom.setVisibility(View.GONE);
+            ibArchiveBottom.setVisibility(View.GONE);
             ibSeen.setVisibility(View.GONE);
         }
 
@@ -1501,6 +1506,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             grpAction.setVisibility(View.GONE);
             clearActions();
             ibTrashBottom.setVisibility(View.GONE);
+            ibArchiveBottom.setVisibility(View.GONE);
             ibSeen.setVisibility(View.GONE);
 
             db.attachment().liveAttachments(message.id).observe(cowner, new Observer<List<EntityAttachment>>() {
@@ -1599,6 +1605,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     ibJunk.setVisibility(junk || unjunk ? View.VISIBLE : View.GONE);
 
                     ibTrashBottom.setVisibility(trash && button_archive_trash ? View.VISIBLE : View.GONE);
+                    ibArchiveBottom.setVisibility(archive && button_archive_trash ? View.VISIBLE : View.GONE);
 
                     bindBody(message, scroll);
                 }
@@ -2645,6 +2652,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         onActionMove(message, false);
                         break;
                     case R.id.ibArchive:
+                    case R.id.ibArchiveBottom:
                         onActionArchive(message);
                         break;
                     case R.id.ibTrash:
diff --git a/app/src/main/res/layout/include_message_body.xml b/app/src/main/res/layout/include_message_body.xml
index 28e92e4058..b530add83c 100644
--- a/app/src/main/res/layout/include_message_body.xml
+++ b/app/src/main/res/layout/include_message_body.xml
@@ -116,7 +116,7 @@
         android:id="@+id/ibTrashBottom"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:background="?attr/selectableItemBackground"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_trash"
         android:padding="6dp"
         android:scaleType="fitCenter"
@@ -125,11 +125,26 @@
         app:layout_constraintTop_toBottomOf="@id/wvBody"
         app:srcCompat="@drawable/baseline_delete_24" />
 
+    <ImageButton
+        android:id="@+id/ibArchiveBottom"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_marginStart="3dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/title_archive"
+        android:padding="6dp"
+        android:scaleType="fitCenter"
+        android:tint="?attr/colorSeparator"
+        app:layout_constraintStart_toEndOf="@id/ibTrashBottom"
+        app:layout_constraintTop_toBottomOf="@id/wvBody"
+        app:srcCompat="@drawable/baseline_archive_24" />
+
     <ImageButton
         android:id="@+id/ibSeen"
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/title_seen"
         android:padding="6dp"
         android:scaleType="fitCenter"
         app:layout_constraintEnd_toEndOf="parent"