From c5a489bb61b670687492772ac02e058e46d1b324 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 8 Dec 2018 09:42:22 +0100
Subject: [PATCH] Moved attachments up, small layout improvements

---
 .../eu/faircode/email/AdapterMessage.java     | 61 ++++++++++---------
 .../main/res/layout/item_message_compact.xml  | 60 +++++++++---------
 .../main/res/layout/item_message_normal.xml   | 60 +++++++++---------
 3 files changed, 91 insertions(+), 90 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index fbdc391e9c..317444a346 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -172,6 +172,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private TextView tvHeaders;
         private ProgressBar pbHeaders;
 
+        private RecyclerView rvAttachment;
+
         private BottomNavigationView bnvActions;
 
         private View vSeparatorBody;
@@ -180,14 +182,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private TextView tvBody;
         private ProgressBar pbBody;
 
-        private RecyclerView rvAttachment;
-        private AdapterAttachment adapter;
-
         private Group grpAddress;
         private Group grpHeaders;
         private Group grpAttachments;
         private Group grpExpanded;
 
+        private AdapterAttachment adapter;
         private LiveData<List<EntityAttachment>> liveAttachments = null;
         private Observer<List<EntityAttachment>> observerAttachments = null;
 
@@ -227,14 +227,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvHeaders = itemView.findViewById(R.id.tvHeaders);
             pbHeaders = itemView.findViewById(R.id.pbHeaders);
 
-            bnvActions = itemView.findViewById(R.id.bnvActions);
-
-            vSeparatorBody = itemView.findViewById(R.id.vSeparatorBody);
-            btnHtml = itemView.findViewById(R.id.btnHtml);
-            btnImages = itemView.findViewById(R.id.btnImages);
-            tvBody = itemView.findViewById(R.id.tvBody);
-            pbBody = itemView.findViewById(R.id.pbBody);
-
             rvAttachment = itemView.findViewById(R.id.rvAttachment);
             rvAttachment.setHasFixedSize(false);
             LinearLayoutManager llm = new LinearLayoutManager(context);
@@ -244,6 +236,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             adapter = new AdapterAttachment(context, owner, true);
             rvAttachment.setAdapter(adapter);
 
+            bnvActions = itemView.findViewById(R.id.bnvActions);
+
+            vSeparatorBody = itemView.findViewById(R.id.vSeparatorBody);
+            btnHtml = itemView.findViewById(R.id.btnHtml);
+            btnImages = itemView.findViewById(R.id.btnImages);
+            tvBody = itemView.findViewById(R.id.tvBody);
+            pbBody = itemView.findViewById(R.id.pbBody);
+
             grpAddress = itemView.findViewById(R.id.grpAddress);
             grpHeaders = itemView.findViewById(R.id.grpHeaders);
             grpAttachments = itemView.findViewById(R.id.grpAttachments);
@@ -481,6 +481,26 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     bodyTask.load(context, owner, args);
                 }
 
+                // Observe attachments
+                observerAttachments = new Observer<List<EntityAttachment>>() {
+                    @Override
+                    public void onChanged(@Nullable List<EntityAttachment> attachments) {
+                        if (attachments == null)
+                            attachments = new ArrayList<>();
+
+                        adapter.set(attachments);
+
+                        if (message.content) {
+                            Bundle args = new Bundle();
+                            args.putSerializable("message", message);
+                            bodyTask.load(context, owner, args);
+                        }
+                    }
+                };
+                liveAttachments = db.attachment().liveAttachments(message.id);
+                liveAttachments.observe(owner, observerAttachments);
+
+                // Setup action
                 Bundle sargs = new Bundle();
                 sargs.putLong("account", message.account);
 
@@ -532,25 +552,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         Helper.unexpectedError(context, owner, ex);
                     }
                 }.load(context, owner, sargs);
-
-                // Observe attachments
-                observerAttachments = new Observer<List<EntityAttachment>>() {
-                    @Override
-                    public void onChanged(@Nullable List<EntityAttachment> attachments) {
-                        if (attachments == null)
-                            attachments = new ArrayList<>();
-
-                        adapter.set(attachments);
-
-                        if (message.content) {
-                            Bundle args = new Bundle();
-                            args.putSerializable("message", message);
-                            bodyTask.load(context, owner, args);
-                        }
-                    }
-                };
-                liveAttachments = db.attachment().liveAttachments(message.id);
-                liveAttachments.observe(owner, observerAttachments);
             }
 
             itemView.setActivated(selectionTracker != null && selectionTracker.isSelected(message.id));
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index 1f04bc11e6..3d67140da4 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -473,6 +473,7 @@
             android:layout_marginTop="3dp"
             android:layout_marginEnd="6dp"
             android:fontFamily="monospace"
+            android:minHeight="24dp"
             android:text="Headers"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textIsSelectable="true"
@@ -487,10 +488,33 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:indeterminate="true"
-            app:layout_constraintBottom_toTopOf="@+id/bnvActions"
+            app:layout_constraintBottom_toBottomOf="@id/tvHeaders"
             app:layout_constraintEnd_toEndOf="@id/tvHeaders"
             app:layout_constraintStart_toStartOf="@id/tvHeaders"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorHeaders" />
+            app:layout_constraintTop_toTopOf="@id/tvHeaders" />
+
+        <View
+            android:id="@+id/vSeparatorAttachments"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginTop="3dp"
+            android:background="?attr/colorSeparator"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvHeaders" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvAttachment"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="6dp"
+            android:scrollbarStyle="outsideOverlay"
+            android:scrollbars="vertical"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/bnvActions"
@@ -503,7 +527,7 @@
             app:labelVisibilityMode="labeled"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvHeaders"
+            app:layout_constraintTop_toBottomOf="@id/rvAttachment"
             app:menu="@menu/action_message" />
 
         <View
@@ -571,34 +595,10 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:indeterminate="true"
-            app:layout_constraintBottom_toTopOf="@+id/vSeparatorAttachments"
+            app:layout_constraintBottom_toBottomOf="@id/tvBody"
             app:layout_constraintEnd_toEndOf="@id/tvBody"
             app:layout_constraintStart_toStartOf="@id/tvBody"
-            app:layout_constraintTop_toBottomOf="@id/bnvActions" />
-
-        <View
-            android:id="@+id/vSeparatorAttachments"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="3dp"
-            android:background="?attr/colorSeparator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvBody" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rvAttachment"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="3dp"
-            android:layout_marginEnd="6dp"
-            android:scrollbarStyle="outsideOverlay"
-            android:scrollbars="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments"
-            app:layout_goneMarginBottom="3dp" />
+            app:layout_constraintTop_toTopOf="@id/tvBody" />
 
         <View
             android:id="@+id/vSeparator"
@@ -606,7 +606,7 @@
             android:layout_height="1dp"
             android:background="?attr/colorSeparator"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
+            app:layout_constraintTop_toBottomOf="@id/tvBody" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpAddress"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 078cf7d49d..0b0c160ee4 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -469,6 +469,7 @@
             android:layout_marginTop="3dp"
             android:layout_marginEnd="6dp"
             android:fontFamily="monospace"
+            android:minHeight="24dp"
             android:text="Headers"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textIsSelectable="true"
@@ -483,10 +484,33 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:indeterminate="true"
-            app:layout_constraintBottom_toTopOf="@+id/bnvActions"
+            app:layout_constraintBottom_toBottomOf="@id/tvHeaders"
             app:layout_constraintEnd_toEndOf="@id/tvHeaders"
             app:layout_constraintStart_toStartOf="@id/tvHeaders"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorHeaders" />
+            app:layout_constraintTop_toTopOf="@id/tvHeaders" />
+
+        <View
+            android:id="@+id/vSeparatorAttachments"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginTop="3dp"
+            android:background="?attr/colorSeparator"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvHeaders" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvAttachment"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="6dp"
+            android:scrollbarStyle="outsideOverlay"
+            android:scrollbars="vertical"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/bnvActions"
@@ -499,7 +523,7 @@
             app:labelVisibilityMode="labeled"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvHeaders"
+            app:layout_constraintTop_toBottomOf="@id/rvAttachment"
             app:menu="@menu/action_message" />
 
         <View
@@ -567,34 +591,10 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:indeterminate="true"
-            app:layout_constraintBottom_toTopOf="@+id/vSeparatorAttachments"
+            app:layout_constraintBottom_toBottomOf="@id/tvBody"
             app:layout_constraintEnd_toEndOf="@id/tvBody"
             app:layout_constraintStart_toStartOf="@id/tvBody"
-            app:layout_constraintTop_toBottomOf="@id/bnvActions" />
-
-        <View
-            android:id="@+id/vSeparatorAttachments"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="3dp"
-            android:background="?attr/colorSeparator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvBody" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rvAttachment"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="3dp"
-            android:layout_marginEnd="6dp"
-            android:scrollbarStyle="outsideOverlay"
-            android:scrollbars="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments"
-            app:layout_goneMarginBottom="3dp" />
+            app:layout_constraintTop_toTopOf="@id/tvBody" />
 
         <View
             android:id="@+id/vSeparator"
@@ -602,7 +602,7 @@
             android:layout_height="1dp"
             android:background="?attr/colorSeparator"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
+            app:layout_constraintTop_toBottomOf="@id/tvBody" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpAddress"