From f852088d010df406c8ccb07b6fa9013550a118cf Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 8 Oct 2019 18:05:23 +0200
Subject: [PATCH] Layout fix

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 5 ++++-
 app/src/main/res/layout/include_message_navigation.xml  | 6 ++++++
 2 files changed, 10 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 db12a5bdc4..716727ec2f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -317,6 +317,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private TextView tvNoInternetAttachments;
 
         private BottomNavigationView bnvActions;
+        private Group grpActions;
 
         private ImageButton ibFull;
         private ImageButton ibImages;
@@ -475,6 +476,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 lparam.height = dp36;
                 bnvActions.setLayoutParams(lparam);
             }
+            grpActions = vsBody.findViewById(R.id.grpActions);
 
             ibFull = vsBody.findViewById(R.id.ibFull);
             ibImages = vsBody.findViewById(R.id.ibImages);
@@ -961,6 +963,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvNoInternetAttachments.setVisibility(View.GONE);
 
             bnvActions.setVisibility(View.GONE);
+            grpActions.setVisibility(View.GONE);
 
             ibFull.setVisibility(View.GONE);
             ibImages.setVisibility(View.GONE);
@@ -1039,7 +1042,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 tvNoInternetHeaders.setVisibility(View.GONE);
             }
 
-            bnvActions.setVisibility(View.VISIBLE);
+            grpActions.setVisibility(View.VISIBLE);
             for (int i = 0; i < bnvActions.getMenu().size(); i++)
                 bnvActions.getMenu().getItem(i).setVisible(false);
 
diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index 6623c8addc..f241964ae7 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -100,4 +100,10 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorBottom"
         app:srcCompat="@drawable/baseline_fullscreen_24" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/grpActions"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:constraint_referenced_ids="vSeparatorTop,bnvActions,vSeparatorBottom" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file