From 3a2b7386eaef6c0a1e62d603d04dba93833e9c54 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 12 Jun 2024 12:33:39 +0200
Subject: [PATCH] Careful

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 8 ++++++++
 app/src/main/res/layout/dialog_show_full.xml            | 7 +++++--
 app/src/main/res/layout/dialog_show_images.xml          | 7 +++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 9a410d77d2..5a7f2083f1 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5658,6 +5658,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             View dview = LayoutInflater.from(context).inflate(
                     full ? R.layout.dialog_show_full : R.layout.dialog_show_images, null);
+            TextView tvMessage = dview.findViewById(R.id.tvMessage);
             CheckBox cbAlwaysImages = dview.findViewById(R.id.cbAlwaysImages); // Full only
             CheckBox cbNotAgainSender = dview.findViewById(R.id.cbNotAgainSender);
             CheckBox cbNotAgainDomain = dview.findViewById(R.id.cbNotAgainDomain);
@@ -5665,6 +5666,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             CheckBox cbNeverAgain = dview.findViewById(R.id.cbNeverAgain);
             TextView tvNeverAgainHint = dview.findViewById(R.id.tvNeverAgainHint);
 
+            tvMessage.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Helper.viewFAQ(v.getContext(), 35);
+                }
+            });
+
             if (junk) {
                 if (full)
                     cbAlwaysImages.setVisibility(View.GONE);
diff --git a/app/src/main/res/layout/dialog_show_full.xml b/app/src/main/res/layout/dialog_show_full.xml
index 202499e8eb..55edd904e3 100644
--- a/app/src/main/res/layout/dialog_show_full.xml
+++ b/app/src/main/res/layout/dialog_show_full.xml
@@ -14,6 +14,9 @@
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableEnd="@drawable/twotone_info_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?attr/colorWarning"
             android:text="@string/title_ask_show_html"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?android:attr/textColorPrimary"
@@ -24,7 +27,7 @@
             android:id="@+id/tvDark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="24dp"
             android:text="@string/title_ask_show_html_remark"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textStyle="italic"
@@ -36,7 +39,7 @@
             android:id="@+id/cbAlwaysImages"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="24dp"
             android:text="@string/title_ask_show_html_images"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_show_images.xml b/app/src/main/res/layout/dialog_show_images.xml
index 8fee36349f..c7d9868d69 100644
--- a/app/src/main/res/layout/dialog_show_images.xml
+++ b/app/src/main/res/layout/dialog_show_images.xml
@@ -14,6 +14,9 @@
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableEnd="@drawable/twotone_info_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?attr/colorWarning"
             android:text="@string/title_ask_show_image"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?android:attr/textColorPrimary"
@@ -35,7 +38,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="24dp"
             android:background="?android:attr/selectableItemBackground"
             android:drawableEnd="@drawable/twotone_info_24"
             android:drawablePadding="6dp"
@@ -51,7 +54,7 @@
             android:id="@+id/cbNotAgainSender"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="24dp"
             android:text="@string/title_no_ask_for_again"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"