From 051108dee78b572305f5f927e8e9938553fd8450 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 23 Apr 2023 21:55:03 +0200
Subject: [PATCH] Added block sender remark

---
 app/src/main/res/layout/dialog_junk.xml | 19 +++++++++++++++----
 app/src/main/res/values/strings.xml     |  1 +
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/dialog_junk.xml b/app/src/main/res/layout/dialog_junk.xml
index bd984bf5ef..d6854f8d56 100644
--- a/app/src/main/res/layout/dialog_junk.xml
+++ b/app/src/main/res/layout/dialog_junk.xml
@@ -16,9 +16,9 @@
             android:layout_height="wrap_content"
             android:drawableStart="@drawable/twotone_report_24"
             android:drawablePadding="6dp"
-            app:drawableTint="?attr/colorWarning"
             android:text="@string/title_ask_spam_who"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:drawableTint="?attr/colorWarning"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -29,11 +29,11 @@
             android:layout_marginTop="12dp"
             android:drawableEnd="@drawable/twotone_info_24"
             android:drawablePadding="6dp"
-            app:drawableTint="?attr/colorAccent"
             android:minHeight="45dp"
             android:text="@string/title_junk_hint"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textStyle="italic"
+            app:drawableTint="?attr/colorAccent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvMessage" />
@@ -60,16 +60,27 @@
             app:layout_constraintTop_toBottomOf="@id/cbBlockSender" />
 
         <TextView
-            android:id="@+id/tvBlockDomainHint"
+            android:id="@+id/tvBlockHintRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:text="@string/title_block_sender_hint"
+            android:text="@string/title_block_sender_remark"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textStyle="italic"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/cbBlockDomain" />
 
+        <TextView
+            android:id="@+id/tvBlockDomainHint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:text="@string/title_block_sender_hint"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvBlockHintRemark" />
+
         <ImageButton
             android:id="@+id/ibMore"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5deda68cc5..941c5b054c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -104,6 +104,7 @@
     <string name="title_block">Block %1$s</string>
     <string name="title_block_sender">Block sender</string>
     <string name="title_block_sender_domain">Block domain \'%1$s\'</string>
+    <string name="title_block_sender_remark">Blocking means automatically moving to the spam folder</string>
     <string name="title_block_sender_hint">
         Blocking a sender is a free feature.
         Blocking a sender domain uses filter rules, which is a pro feature.