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

Careful

This commit is contained in:
M66B 2024-06-12 12:33:39 +02:00
parent a3024bc3ea
commit 3a2b7386ea
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -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);

7
app/src/main/res/layout/dialog_show_full.xml
View File

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

7
app/src/main/res/layout/dialog_show_images.xml
View File

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