From f3f640e0fa3269fc21d1011bca65d9ec0209b4cf Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 14 Jul 2023 15:26:04 +0200 Subject: [PATCH] Removed override width --- .../eu/faircode/email/AdapterMessage.java | 12 --------- .../java/eu/faircode/email/ApplicationEx.java | 5 ++++ .../eu/faircode/email/FragmentOptions.java | 2 +- .../email/FragmentOptionsDisplay.java | 12 +-------- .../res/layout/fragment_options_display.xml | 25 +------------------ app/src/main/res/values/strings.xml | 2 -- 6 files changed, 8 insertions(+), 50 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java index ee8f9cad70..20b4ae3646 100644 --- a/app/src/main/java/eu/faircode/email/AdapterMessage.java +++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java @@ -3127,10 +3127,7 @@ public class AdapterMessage extends RecyclerView.Adapter= Build.VERSION_CODES.O && !BuildConfig.DEBUG) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java index d4532a6dd9..ba4b04ba85 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptions.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java @@ -145,7 +145,7 @@ public class FragmentOptions extends FragmentBase { "font_size_sender", "sender_ellipsize", "subject_top", "subject_italic", "highlight_subject", "font_size_subject", "subject_ellipsize", "keywords_header", "labels_header", "flags", "flags_background", "preview", "preview_italic", "preview_lines", "align_header", - "message_zoom", "overview_mode", "override_width", "addresses", "button_extra", "attachments_alt", "thumbnails", + "message_zoom", "overview_mode", "addresses", "button_extra", "attachments_alt", "thumbnails", "contrast", "hyphenation", "display_font", "monospaced_pre", "list_count", "bundled_fonts", "parse_classes", "background_color", "text_color", "text_size", "text_font", "text_align", "text_titles", "text_separators", diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java index e97ebd1457..d3a9f62081 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java @@ -164,7 +164,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer private TextView tvMessageZoom; private SeekBar sbMessageZoom; private SwitchCompat swOverviewMode; - private SwitchCompat swOverrideWidth; private SwitchCompat swContrast; private SwitchCompat swHyphenation; @@ -214,7 +213,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer "keywords_header", "labels_header", "flags", "flags_background", "preview", "preview_italic", "preview_lines", "align_header", "addresses", "hide_attachments", - "message_zoom", "overview_mode", "override_width", + "message_zoom", "overview_mode", "hyphenation", "display_font", "contrast", "monospaced_pre", "text_separators", "collapse_quotes", "image_placeholders", "inline_images", "button_extra", @@ -333,7 +332,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer tvMessageZoom = view.findViewById(R.id.tvMessageZoom); sbMessageZoom = view.findViewById(R.id.sbMessageZoom); swOverviewMode = view.findViewById(R.id.swOverviewMode); - swOverrideWidth = view.findViewById(R.id.swOverrideWidth); swContrast = view.findViewById(R.id.swContrast); swHyphenation = view.findViewById(R.id.swHyphenation); tvHyphenationHint = view.findViewById(R.id.tvHyphenationHint); @@ -1185,13 +1183,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer } }); - swOverrideWidth.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { - prefs.edit().putBoolean("override_width", checked).apply(); - } - }); - swContrast.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { @@ -1589,7 +1580,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer sbMessageZoom.setProgress(message_zoom - 50); swOverviewMode.setChecked(prefs.getBoolean("overview_mode", false)); - swOverrideWidth.setChecked(prefs.getBoolean("override_width", false)); swContrast.setChecked(prefs.getBoolean("contrast", false)); swHyphenation.setChecked(prefs.getBoolean("hyphenation", false)); diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml index d0e31fbaeb..5c48d895f1 100644 --- a/app/src/main/res/layout/fragment_options_display.xml +++ b/app/src/main/res/layout/fragment_options_display.xml @@ -1755,29 +1755,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/swOverviewMode" /> - - - - Show image thumbnails after the message text Default message text zoom: %1$s %% Zoom original messages to fit the screen - Disable fixed widths in original messages Use automatic hyphenation Use high contrast for message text Use monospaced font for message text by default @@ -985,7 +984,6 @@ Maximum %s characters in total Scrolling can be slow due to a bug in some Android versions when the number of lines is more than one This can result in very small fonts - This can make messages narrower, but also look strange Plain text only messages will be considered as preformatted This applies to reformatted messages only Inline images are images included in the message