From 097b47ce62567e20c98332fca2ecc865c1371735 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 25 Aug 2018 06:28:15 +0000
Subject: [PATCH] Better error display

---
 .../eu/faircode/email/FragmentMessage.java    | 14 +++++++------
 app/src/main/res/layout/fragment_message.xml  | 20 +++++++++++++++++--
 app/src/main/res/layout/item_message.xml      |  4 ++--
 app/src/main/res/values/colors.xml            |  2 ++
 app/src/main/res/values/styles.xml            |  3 +++
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java
index 0649eecb..1849999f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessage.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java
@@ -105,6 +105,7 @@ public class FragmentMessage extends FragmentEx {
     private Group grpHeader;
     private Group grpAddresses;
     private Group grpAttachments;
+    private Group grpError;
     private Group grpMessage;
 
     private TupleMessageEx message = null;
@@ -148,6 +149,7 @@ public class FragmentMessage extends FragmentEx {
         grpHeader = view.findViewById(R.id.grpHeader);
         grpAddresses = view.findViewById(R.id.grpAddresses);
         grpAttachments = view.findViewById(R.id.grpAttachments);
+        grpError = view.findViewById(R.id.grpError);
         grpMessage = view.findViewById(R.id.grpMessage);
 
         setHasOptionsMenu(true);
@@ -219,11 +221,11 @@ public class FragmentMessage extends FragmentEx {
                 tvCount.setVisibility(View.GONE);
                 grpAddresses.setVisibility(View.GONE);
                 grpAttachments.setVisibility(View.GONE);
-                tvError.setVisibility(View.GONE);
+                grpError.setVisibility(View.GONE);
 
                 tvCount.setTag(tvCount.getVisibility());
                 tvCc.setTag(grpAddresses.getVisibility());
-                tvError.setTag(tvError.getVisibility());
+                tvError.setTag(grpError.getVisibility());
             }
         });
 
@@ -243,7 +245,7 @@ public class FragmentMessage extends FragmentEx {
                     tvCount.setVisibility((int) tvCount.getTag());
                     grpAddresses.setVisibility((int) tvCc.getTag());
                     grpAttachments.setVisibility(adapter != null && adapter.getItemCount() > 0 ? View.VISIBLE : View.GONE);
-                    tvError.setVisibility((int) tvError.getTag());
+                    grpError.setVisibility((int) tvError.getTag());
 
                     return true;
                 }
@@ -284,7 +286,7 @@ public class FragmentMessage extends FragmentEx {
         pbBody.setVisibility(View.GONE);
         bottom_navigation.setVisibility(View.GONE);
         tvCount.setVisibility(View.GONE);
-        tvError.setVisibility(View.GONE);
+        grpError.setVisibility(View.GONE);
         fab.setVisibility(View.GONE);
         pbWait.setVisibility(View.VISIBLE);
 
@@ -474,10 +476,10 @@ public class FragmentMessage extends FragmentEx {
                 if (free) {
                     tvCount.setVisibility((int) tvCount.getTag());
                     grpAddresses.setVisibility((int) tvCc.getTag());
-                    tvError.setVisibility((int) tvError.getTag());
+                    grpError.setVisibility((int) tvError.getTag());
                 } else {
                     tvCount.setVisibility(!free && message.count > 1 ? View.VISIBLE : View.GONE);
-                    tvError.setVisibility(free || message.error == null ? View.GONE : View.VISIBLE);
+                    grpError.setVisibility(free || message.error == null ? View.GONE : View.VISIBLE);
                 }
 
                 // Observe attachments
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index c305030c..cba22235 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -203,19 +203,29 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
 
+    <View
+        android:id="@+id/vSeparatorError"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="3dp"
+        android:background="?attr/colorSeparator"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
+
     <TextView
         android:id="@+id/tvError"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
         android:layout_marginStart="6dp"
+        android:layout_marginTop="3dp"
         android:freezesText="true"
         android:text="error"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textStyle="bold"
+        android:textColor="?attr/colorWarning"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
+        app:layout_constraintTop_toBottomOf="@id/vSeparatorError" />
 
     <View
         android:id="@+id/vSeparatorBody"
@@ -330,6 +340,12 @@
         android:layout_height="0dp"
         app:constraint_referenced_ids="vSeparatorAttachments,rvAttachment" />
 
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/grpError"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:constraint_referenced_ids="vSeparatorError,tvError" />
+
     <androidx.constraintlayout.widget.Group
         android:id="@+id/grpMessage"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 3f08f7d4..35e86fc5 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -93,9 +93,9 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
         android:layout_marginStart="6dp"
-        android:text="error\ndebug info\noperation 1\n operation 2"
+        android:text="error"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textStyle="bold"
+        android:textColor="?attr/colorWarning"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvSubject" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 66d7cd0b..bcc4455b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,6 +10,7 @@
     <color name="lightColorUnread">#000</color>
     <color name="lightColorItemSelected">#ccc</color>
     <color name="lightColorSeparator">#aaa</color>
+    <color name="lightColorWarning">#ffff0000</color>
     <color name="lightColorDrawerScrim">#99000000</color>
     <color name="lightColorDrawerText">#111</color>
     <color name="lightColorDrawerBackground">#eee</color>
@@ -17,6 +18,7 @@
     <color name="darkColorUnread">#fff</color>
     <color name="darkColorItemSelected">#555</color>
     <color name="darkColorSeparator">#666</color>
+    <color name="darkColorWarning">#ffffb300</color>
     <color name="darkColorDrawerScrim">#997f7f7f</color>
     <color name="darkColorDrawerText">#fff</color>
     <color name="darkColorDrawerBackground">#222</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bb80ef77..dcbeb2a2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,7 @@
 <resources>
     <attr name="colorUnread" format="reference" />
     <attr name="colorSeparator" format="reference" />
+    <attr name="colorWarning" format="reference" />
     <attr name="colorDrawerScrim" format="reference" />
     <attr name="colorDrawerText" format="reference" />
     <attr name="colorDrawerBackground" format="reference" />
@@ -15,6 +16,7 @@
 
         <item name="colorUnread">@color/lightColorUnread</item>
         <item name="colorSeparator">@color/lightColorSeparator</item>
+        <item name="colorWarning">@color/lightColorWarning</item>
         <item name="colorDrawerScrim">@color/lightColorDrawerScrim</item>
         <item name="colorDrawerText">@color/lightColorDrawerText</item>
         <item name="colorDrawerBackground">@color/lightColorDrawerBackground</item>
@@ -31,6 +33,7 @@
 
         <item name="colorUnread">@color/darkColorUnread</item>
         <item name="colorSeparator">@color/darkColorSeparator</item>
+        <item name="colorWarning">@color/darkColorWarning</item>
         <item name="colorDrawerScrim">@color/darkColorDrawerScrim</item>
         <item name="colorDrawerText">@color/darkColorDrawerText</item>
         <item name="colorDrawerBackground">@color/darkColorDrawerBackground</item>