From 0ab36ff513cc1c9efe8fc687afd1af058b7951d6 Mon Sep 17 00:00:00 2001
From: Distopico Vegan <distopico@riseup.net>
Date: Sat, 10 Nov 2018 00:31:43 -0500
Subject: [PATCH] chore: no hide size to keep the view structure

---
 .gitlab-ci.yml                                        |  2 +-
 .../main/java/org/dystopia/email/AdapterMessage.java  | 11 +++++------
 app/src/main/res/layout/item_message_compact.xml      |  2 +-
 app/src/main/res/layout/item_message_normal.xml       |  2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92ff60f2..bd3d1715 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -99,4 +99,4 @@ release:
   script:
     - npm install -g semantic-release @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/changelog @semantic-release/gitlab 
     - git checkout $CI_COMMIT_SHA
-    - semantic-release -p @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/changelog @semantic-release/gitlab --debug
+    - semantic-release -p @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/changelog @semantic-release/gitlab
diff --git a/app/src/main/java/org/dystopia/email/AdapterMessage.java b/app/src/main/java/org/dystopia/email/AdapterMessage.java
index 4f241985..b2c3dad2 100644
--- a/app/src/main/java/org/dystopia/email/AdapterMessage.java
+++ b/app/src/main/java/org/dystopia/email/AdapterMessage.java
@@ -319,14 +319,13 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
 
             tvSize.setText(message.size == null ? null : Helper.humanReadableByteCount(message.size, true));
             tvSize.setAlpha(message.content ? 1.0f : 0.5f);
-            tvSize.setVisibility(message.size == null ? View.GONE : View.VISIBLE);
 
             ivAttachments.setVisibility(message.attachments > 0 ? View.VISIBLE : View.GONE);
             tvSubject.setText(message.subject);
 
             tvFolder.setVisibility(View.GONE);
             tvAccount.setVisibility(View.GONE);
-            
+
             if (viewType == ViewType.UNIFIED || viewType == ViewType.FOLDER) {
                 tvAccount.setText(message.accountName);
                 tvAccount.setVisibility(View.VISIBLE);
@@ -382,7 +381,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
 
             grpExpanded.setVisibility(viewType == ViewType.THREAD && show_expanded ? View.VISIBLE : View.GONE);
             ivAddContact.setVisibility(viewType == ViewType.THREAD && show_expanded && contacts && message.from != null ? View.VISIBLE : View.GONE);
-            
+
             grpDetails.setVisibility(show_details && show_expanded ? View.VISIBLE : View.GONE);
 
             pbHeaders.setVisibility(View.GONE);
@@ -1052,7 +1051,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                 notifyDataSetChanged();
             }
         }
-        
+
         private void onShowHeaders(ActionData data) {
             boolean show_headers = !properties.showHeaders(data.message.id);
             properties.setHeaders(data.message.id, show_headers);
@@ -1461,7 +1460,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
         void setExpanded(long id, boolean expand);
 
         void setDetails(long id, boolean show);
-        
+
         void setHeaders(long id, boolean show);
 
         void setImages(long id, boolean show);
@@ -1469,7 +1468,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
         boolean isExpanded(long id);
 
         boolean showDetails(long id);
-        
+
         boolean showHeaders(long id);
 
         boolean showImages(long id);
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index ffc99275..15fa98e4 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -191,7 +191,7 @@
             android:textIsSelectable="true"
             app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
             app:layout_constraintStart_toEndOf="@id/paddingStart"
-            app:layout_constraintTop_toBottomOf="@id/tvCount" />
+            app:layout_constraintTop_toBottomOf="@id/tvSize" />
 
         <View
             android:id="@+id/paddingEnd"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index e556b121..639039f6 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -189,7 +189,7 @@
             android:textIsSelectable="true"
             app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
             app:layout_constraintStart_toEndOf="@id/paddingStart"
-            app:layout_constraintTop_toBottomOf="@id/tvCount" />
+            app:layout_constraintTop_toBottomOf="@+id/tvSize" />
 
         <View
             android:id="@+id/paddingEnd"