From eb45bfc805be20b6e18ef0c3881ae107a48e0317 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 5 Jul 2020 09:47:09 +0200
Subject: [PATCH] Added junk hint

---
 .../eu/faircode/email/AdapterMessage.java     | 15 ++++++-----
 app/src/main/res/layout/dialog_junk.xml       | 26 +++++++++++++++++--
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index d02101022f..1e4154067e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -6049,11 +6049,20 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             View view = LayoutInflater.from(getContext()).inflate(R.layout.dialog_junk, null);
             final TextView tvMessage = view.findViewById(R.id.tvMessage);
+            final ImageButton ibInfo = view.findViewById(R.id.ibInfo);
             final CheckBox cbBlockSender = view.findViewById(R.id.cbBlockSender);
             final CheckBox cbBlockDomain = view.findViewById(R.id.cbBlockDomain);
             final Button btnEditRules = view.findViewById(R.id.btnEditRules);
 
             tvMessage.setText(getString(R.string.title_ask_spam_who, from));
+
+            ibInfo.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Helper.viewFAQ(getContext(), 92);
+                }
+            });
+
             cbBlockSender.setEnabled(ActivityBilling.isPro(getContext()));
             cbBlockDomain.setEnabled(false);
 
@@ -6087,12 +6096,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         }
                     })
                     .setNegativeButton(android.R.string.cancel, null)
-                    .setNeutralButton(R.string.title_info, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            Helper.viewFAQ(getContext(), 92);
-                        }
-                    })
                     .create();
         }
     }
diff --git a/app/src/main/res/layout/dialog_junk.xml b/app/src/main/res/layout/dialog_junk.xml
index 669033fb4e..1027e9f4cc 100644
--- a/app/src/main/res/layout/dialog_junk.xml
+++ b/app/src/main/res/layout/dialog_junk.xml
@@ -20,6 +20,28 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvJunkHint"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_junk_hint"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
+            app:layout_constraintEnd_toStartOf="@+id/ibInfo"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvMessage" />
+
+        <ImageButton
+            android:id="@+id/ibInfo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/title_info"
+            android:tooltipText="@string/title_info"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/tvJunkHint"
+            app:srcCompat="@drawable/baseline_info_24" />
+
         <CheckBox
             android:id="@+id/cbBlockSender"
             android:layout_width="wrap_content"
@@ -28,7 +50,7 @@
             android:text="@string/title_block_sender"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvMessage" />
+            app:layout_constraintTop_toBottomOf="@id/tvJunkHint" />
 
         <CheckBox
             android:id="@+id/cbBlockDomain"
@@ -47,7 +69,7 @@
             android:layout_marginTop="12dp"
             android:text="@string/title_block_sender_hint"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textStyle="italic"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/cbBlockDomain" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fd32f4e63a..86c47a39e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -84,6 +84,7 @@
         <item quantity="other">Treat %1$d messages as spam?</item>
     </plurals>
     <string name="title_ask_spam_who">Treat message from %1$s as spam?</string>
+    <string name="title_junk_hint">Your email provider is responsible for filtering spam. An email app does not have all data to do this reliably.</string>
 
     <string name="title_block">Block %1$s</string>
     <string name="title_block_sender">Block sender</string>