From 8fb7b47f1071075b19c894830609d7041577eb63 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 8 Jul 2019 12:37:24 +0200
Subject: [PATCH] Revised attachment layout

---
 .../eu/faircode/email/AdapterAttachment.java  | 23 +++++--
 .../eu/faircode/email/AdapterMessage.java     |  2 +-
 app/src/main/res/layout/item_attachment.xml   | 65 ++++++++++---------
 3 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index 3747e17a4b..02aa9f3438 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -78,7 +78,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
         private ImageView ivStatus;
         private ImageButton ibSave;
         private TextView tvType;
-        private TextView tvDebug;
+        private TextView tvError;
         private ProgressBar progressbar;
 
         ViewHolder(View itemView) {
@@ -91,7 +91,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
             ivStatus = itemView.findViewById(R.id.ivStatus);
             ibSave = itemView.findViewById(R.id.ibSave);
             tvType = itemView.findViewById(R.id.tvType);
-            tvDebug = itemView.findViewById(R.id.tvDebug);
+            tvError = itemView.findViewById(R.id.tvError);
             progressbar = itemView.findViewById(R.id.progressbar);
         }
 
@@ -108,7 +108,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
         }
 
         private void bindTo(EntityAttachment attachment) {
-            view.setAlpha(attachment.isInline() || TextUtils.isEmpty(attachment.name) ? Helper.LOW_LIGHT : 1.0f);
+            view.setAlpha(attachment.isInline() && attachment.isImage() ? Helper.LOW_LIGHT : 1.0f);
 
             ibDelete.setVisibility(readonly ? View.GONE : attachment.isInline() ? View.INVISIBLE : View.VISIBLE);
             tvName.setText(attachment.name);
@@ -135,11 +135,20 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
             progressbar.setVisibility(
                     attachment.progress == null || attachment.available ? View.GONE : View.VISIBLE);
 
-            tvType.setText(attachment.type + " " + attachment.disposition + " " + attachment.cid + "/" + attachment.encryption);
-            tvType.setVisibility(debug || BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
+            StringBuilder sb = new StringBuilder();
+            sb.append(attachment.type);
+            if (attachment.disposition != null)
+                sb.append(' ').append(attachment.disposition);
+            if (debug || BuildConfig.DEBUG) {
+                if (attachment.cid != null)
+                    sb.append(' ').append(attachment.cid);
+                if (attachment.encryption != null)
+                    sb.append(' ').append(attachment.encryption);
+            }
+            tvType.setText(sb.toString());
 
-            tvDebug.setText(attachment.error);
-            tvDebug.setVisibility(attachment.error == null ? View.GONE : View.VISIBLE);
+            tvError.setText(attachment.error);
+            tvError.setVisibility(attachment.error == null ? View.GONE : View.VISIBLE);
         }
 
         @Override
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index bbd013f997..502bd585f0 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1126,7 +1126,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             boolean calendar = false;
             List<EntityAttachment> a = new ArrayList<>();
             for (EntityAttachment attachment : attachments) {
-                boolean inline = (attachment.isInline() || TextUtils.isEmpty(attachment.name));
+                boolean inline = (attachment.isInline() && attachment.isImage());
                 if (inline)
                     has_inline = true;
                 if (Objects.equals(attachment.encryption, EntityAttachment.PGP_MESSAGE))
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index 02f116d071..338f15a40c 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -20,57 +20,46 @@
             android:background="@null"
             android:contentDescription="@string/title_legend_delete"
             android:paddingEnd="12dp"
-            app:srcCompat="@drawable/baseline_delete_24"
             android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="@+id/tvType"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/baseline_delete_24" />
 
         <ImageView
             android:id="@+id/ivAttachments"
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:contentDescription="@string/title_legend_attachment"
-            app:srcCompat="@drawable/baseline_attachment_24"
+            app:layout_constraintBottom_toBottomOf="@+id/tvType"
             app:layout_constraintStart_toEndOf="@id/ibDelete"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/baseline_attachment_24" />
 
         <TextView
             android:id="@+id/tvName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
+            android:layout_marginEnd="6dp"
             android:ellipsize="middle"
             android:singleLine="true"
             android:text="Name"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toBottomOf="@id/ivAttachments"
             app:layout_constraintEnd_toStartOf="@+id/tvSize"
             app:layout_constraintHorizontal_weight="4"
             app:layout_constraintStart_toEndOf="@id/ivAttachments"
-            app:layout_constraintTop_toTopOf="@id/ivAttachments" />
-
-        <TextView
-            android:id="@+id/tvSize"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="10 kB"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toBottomOf="@id/ivAttachments"
-            app:layout_constraintEnd_toStartOf="@+id/ivStatus"
-            app:layout_constraintStart_toEndOf="@id/tvName"
-            app:layout_constraintTop_toTopOf="@id/ivAttachments" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/ivStatus"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginStart="6dp"
             android:contentDescription="@string/title_legend_download_state"
-            app:srcCompat="@drawable/baseline_cloud_download_24"
+            app:layout_constraintBottom_toBottomOf="@+id/tvType"
             app:layout_constraintEnd_toStartOf="@+id/ibSave"
-            app:layout_constraintStart_toEndOf="@id/tvSize"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/baseline_cloud_download_24" />
 
         <ImageButton
             android:id="@+id/ibSave"
@@ -79,10 +68,10 @@
             android:background="@null"
             android:contentDescription="@string/title_legend_save"
             android:paddingStart="12dp"
-            app:srcCompat="@drawable/baseline_save_24"
+            app:layout_constraintBottom_toBottomOf="@+id/tvType"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/ivStatus"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/baseline_save_24" />
 
         <TextView
             android:id="@+id/tvType"
@@ -92,20 +81,34 @@
             android:singleLine="true"
             android:text="text/plain"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="@id/ivStatus"
+            app:layout_constraintEnd_toStartOf="@+id/tvSize"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toStartOf="@id/tvName"
-            app:layout_constraintTop_toBottomOf="@id/ivAttachments" />
+            app:layout_constraintTop_toBottomOf="@id/tvName" />
 
         <TextView
-            android:id="@+id/tvDebug"
+            android:id="@+id/tvSize"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginEnd="6dp"
+            android:text="10 kB"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintBottom_toBottomOf="@id/tvType"
+            app:layout_constraintEnd_toStartOf="@id/ivStatus"
+            app:layout_constraintStart_toEndOf="@id/tvType"
+            app:layout_constraintTop_toTopOf="@id/tvName" />
+
+        <TextView
+            android:id="@+id/tvError"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
-            android:text="debug"
+            android:layout_marginEnd="6dp"
+            android:text="Error"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?attr/colorWarning"
-            app:layout_constraintEnd_toEndOf="@id/ivStatus"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivAttachments"
             app:layout_constraintTop_toBottomOf="@id/tvType" />
 
@@ -117,6 +120,6 @@
             android:progress="50"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvDebug" />
+            app:layout_constraintTop_toBottomOf="@id/tvError" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
\ No newline at end of file