mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added block sender remark

This commit is contained in:
M66B 2023-04-23 21:55:03 +02:00
parent d52411afdb
commit 051108dee7
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/res/layout/dialog_junk.xml
View File

@ -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"

1
app/src/main/res/values/strings.xml
View File

@ -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.