mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-23 22:51:02 +00:00
Code Issues Releases Wiki Activity

Added bocklist warning

Browse source
This commit is contained in:
M66B 2022-10-31 08:18:44 +01:00
parent 302036137b
commit de49fac89e
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/res/layout/fragment_options_synchronize.xml
View file

@ -420,12 +420,12 @@
android:layout_height="wrap_content"
android:drawableStart="@drawable/twotone_warning_24"
android:drawablePadding="6dp"
app:drawableTint="?attr/colorWarning"
android:gravity="center"
android:text="@string/title_advanced_advanced"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="?attr/colorWarning"
android:textStyle="bold"
app:drawableTint="?attr/colorWarning"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -807,12 +807,12 @@
android:layout_height="wrap_content"
android:drawableStart="@drawable/twotone_flag_24"
android:drawablePadding="6dp"
app:drawableTint="?attr/colorWarning"
android:gravity="center"
android:text="@string/title_advanced_caption_checks"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="?attr/colorWarning"
android:textStyle="bold"
app:drawableTint="?attr/colorWarning"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -1009,6 +1009,20 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swUseBlocklistPop" />
<TextView
android:id="@+id/tvBlocklistWarning"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginEnd="48dp"
android:text="@string/title_advanced_blocklist_warning"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?attr/colorWarning"
android:textStyle="italic|bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvUseBlocklistPopHint" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvBlocklist"
android:layout_width="0dp"
@ -1018,7 +1032,7 @@
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvUseBlocklistPopHint" />
app:layout_constraintTop_toBottomOf="@id/tvBlocklistWarning" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -414,6 +414,7 @@
<string name="title_advanced_use_blocklist">Move messages from domains on a block list to the spam folder</string>
<string name="title_advanced_use_blocklist_pop3">Skip messages from domains on a block list (POP3 only)</string>
<string name="title_advanced_tune_keep_alive">Automatically tune the keep-alive interval</string>
<string name="title_advanced_blocklist_warning">Block lists are not perfect and can block non-spam messages!</string>
<string name="title_advanced_keyboard">Show keyboard by default</string>
<string name="title_advanced_keyboard_no_fullscreen">Prevent fullscreen keyboard</string>