From 449166e0096e80891a10b29c212e4e278d0cb7e9 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 13 Sep 2019 09:34:00 +0200
Subject: [PATCH] Less intrusive message help

---
 FAQ.md                                        |  4 +++
 .../eu/faircode/email/AdapterMessage.java     | 14 +++++------
 .../res/layout/include_message_compact.xml    | 25 +++++++++----------
 .../res/layout/include_message_normal.xml     | 25 +++++++++----------
 4 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index 2442213c50..c71b08a967 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -2191,6 +2191,10 @@ so you cannot use FairEmail to access ProtonMail.
 <a name="faq130"></a>
 **(130) What does message error ... mean?**
 
+The warning *No server found at ...* means that there was no email server registered at the indicated domain name.
+Replying to the message might not be possible and might result in an error.
+This could indicate a falsified email address and/or spam.
+
 The error *... ParseException ...* means that there is a problem with a received message, likely caused by a bug in the sending software.
 FairEmail will workaround this is in most cases, so this message can mostly be considered as a warning instead of an error.
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b98e02ebc9..5fef0550c9 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -260,7 +260,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private ImageView ivThread;
         private TextView tvPreview;
         private TextView tvError;
-        private Button btnHelp;
+        private ImageButton ibHelp;
         private ContentLoadingProgressBar pbLoading;
 
         private View vsBody;
@@ -370,7 +370,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvCount = itemView.findViewById(R.id.tvCount);
             ivThread = itemView.findViewById(R.id.ivThread);
             tvError = itemView.findViewById(R.id.tvError);
-            btnHelp = itemView.findViewById(R.id.btnHelp);
+            ibHelp = itemView.findViewById(R.id.ibHelp);
             pbLoading = itemView.findViewById(R.id.pbLoading);
 
             if (compact)
@@ -514,7 +514,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibFlagged.setOnClickListener(this);
             if (viewType == ViewType.THREAD)
                 ibFlagged.setOnLongClickListener(this);
-            btnHelp.setOnClickListener(this);
+            ibHelp.setOnClickListener(this);
 
             if (vsBody != null) {
                 ibExpanderAddress.setOnClickListener(this);
@@ -565,7 +565,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibFlagged.setOnClickListener(null);
             if (viewType == ViewType.THREAD)
                 ibFlagged.setOnLongClickListener(null);
-            btnHelp.setOnClickListener(null);
+            ibHelp.setOnClickListener(null);
 
             if (vsBody != null) {
                 ibExpanderAddress.setOnClickListener(null);
@@ -613,7 +613,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ivThread.setVisibility(View.GONE);
             tvPreview.setVisibility(View.GONE);
             tvError.setVisibility(View.GONE);
-            btnHelp.setVisibility(View.GONE);
+            ibHelp.setVisibility(View.GONE);
             pbLoading.setVisibility(View.VISIBLE);
 
             clearExpanded(null);
@@ -808,7 +808,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             } else {
                 tvError.setText(error);
                 tvError.setVisibility(error == null ? View.GONE : View.VISIBLE);
-                btnHelp.setVisibility(error == null ? View.GONE : View.VISIBLE);
+                ibHelp.setVisibility(error == null ? View.GONE : View.VISIBLE);
             }
 
             // Contact info
@@ -1501,7 +1501,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 onShowSnoozed(message);
             else if (view.getId() == R.id.ibFlagged)
                 onToggleFlag(message);
-            else if (view.getId() == R.id.btnHelp)
+            else if (view.getId() == R.id.ibHelp)
                 onHelp(message);
             else if (view.getId() == R.id.ibSearchContact)
                 onSearchContact(message);
diff --git a/app/src/main/res/layout/include_message_compact.xml b/app/src/main/res/layout/include_message_compact.xml
index a4b22a9e98..b4123ca625 100644
--- a/app/src/main/res/layout/include_message_compact.xml
+++ b/app/src/main/res/layout/include_message_compact.xml
@@ -283,27 +283,26 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="6dp"
         android:layout_marginEnd="6dp"
+        android:gravity="center_vertical"
+        android:minHeight="24dp"
         android:text="error"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textColor="?attr/colorWarning"
         android:textIsSelectable="true"
-        app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
+        app:layout_constraintEnd_toStartOf="@+id/btnHelp"
         app:layout_constraintStart_toEndOf="@id/paddingStart"
         app:layout_constraintTop_toBottomOf="@id/tvPreview" />
 
-    <Button
-        android:id="@+id/btnHelp"
-        style="?android:attr/buttonStyleSmall"
+    <ImageButton
+        android:id="@+id/ibHelp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:backgroundTint="?attr/colorAccent"
-        android:minWidth="0dp"
-        android:minHeight="0dp"
-        android:text="@string/title_setup_help"
-        android:textColor="@android:color/black"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvError" />
+        android:layout_marginEnd="6dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:tint="?attr/colorWarning"
+        app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
+        app:layout_constraintTop_toTopOf="@id/tvError"
+        app:srcCompat="@drawable/baseline_info_24" />
 
     <View
         android:id="@+id/paddingEnd"
@@ -321,7 +320,7 @@
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btnHelp" />
+        app:layout_constraintTop_toBottomOf="@id/tvError" />
 
     <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbLoading"
diff --git a/app/src/main/res/layout/include_message_normal.xml b/app/src/main/res/layout/include_message_normal.xml
index 1e95f14b49..95ae7595bd 100644
--- a/app/src/main/res/layout/include_message_normal.xml
+++ b/app/src/main/res/layout/include_message_normal.xml
@@ -278,27 +278,26 @@
         android:layout_marginStart="6dp"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="6dp"
+        android:gravity="center_vertical"
+        android:minHeight="24dp"
         android:text="error"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textColor="?attr/colorWarning"
         android:textIsSelectable="true"
-        app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
+        app:layout_constraintEnd_toStartOf="@+id/ibHelp"
         app:layout_constraintStart_toEndOf="@id/paddingStart"
         app:layout_constraintTop_toBottomOf="@id/tvPreview" />
 
-    <Button
-        android:id="@+id/btnHelp"
-        style="?android:attr/buttonStyleSmall"
+    <ImageButton
+        android:id="@+id/ibHelp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:backgroundTint="?attr/colorAccent"
-        android:minWidth="0dp"
-        android:minHeight="0dp"
-        android:text="@string/title_setup_help"
-        android:textColor="@android:color/black"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvError" />
+        android:layout_marginEnd="6dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:tint="?attr/colorWarning"
+        app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
+        app:layout_constraintTop_toTopOf="@id/tvError"
+        app:srcCompat="@drawable/baseline_info_24" />
 
     <View
         android:id="@+id/paddingEnd"
@@ -314,7 +313,7 @@
         android:layout_height="3dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btnHelp" />
+        app:layout_constraintTop_toBottomOf="@id/tvError" />
 
     <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbLoading"