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

Revert "Removed limitation" 

This reverts commit 92a49dfbcc.
This commit is contained in:
M66B 2021-12-03 18:25:33 +01:00
parent 92a49dfbcc
commit 0b723b39c8
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2612,7 +2612,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean overview_mode = prefs.getBoolean("overview_mode", false);
boolean override_width = prefs.getBoolean("override_width", false);
HtmlHelper.setViewport(document, overview_mode);
if (override_width)
if (!overview_mode && override_width)
HtmlHelper.overrideWidth(document);
if (inline || show_images)
HtmlHelper.embedInlineImages(context, message.id, document, show_images);

2
app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
View File

@ -900,6 +900,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("overview_mode", checked).apply();
swOverrideWidth.setEnabled(!checked);
}
});
@ -1223,6 +1224,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
swOverviewMode.setChecked(prefs.getBoolean("overview_mode", false));
swOverrideWidth.setChecked(prefs.getBoolean("override_width", false));
swOverrideWidth.setEnabled(!swOverviewMode.isChecked());
swContrast.setChecked(prefs.getBoolean("contrast", false));
swMonospaced.setChecked(prefs.getBoolean("monospaced", false));

2
app/src/main/res/layout/fragment_options_display.xml
View File

@ -1352,6 +1352,7 @@
android:id="@+id/swOverrideWidth"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_override_width"
app:layout_constraintEnd_toEndOf="parent"
@ -1363,6 +1364,7 @@
android:id="@+id/tvOverrideWidthHint"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginEnd="48dp"
android:text="@string/title_advanced_override_width_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"