diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java index 77d4f1bd75..c018a06943 100644 --- a/app/src/main/java/eu/faircode/email/AdapterMessage.java +++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java @@ -248,6 +248,7 @@ public class AdapterMessage extends RecyclerView.Adapter position = properties.getPosition(message.id); Log.i("Bind size=" + size + " height=" + height); @@ -4996,6 +4997,7 @@ public class AdapterMessage extends RecyclerView.Adapter 0 ? Integer.parseInt(s.toString()) : 0); + if (timeout == 0) + prefs.edit().remove("message_zoom").apply(); + else + prefs.edit().putInt("message_zoom", timeout).apply(); + } catch (NumberFormatException ex) { + Log.e(ex); + } + } + + @Override + public void afterTextChanged(Editable s) { + // Do nothing + } + }); + swContrast.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { @@ -707,6 +737,9 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer @Override public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { + if ("message_zoom".equals(key)) + return; + if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) setOptions(); } @@ -832,7 +865,12 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer swPreviewItalic.setEnabled(swPreview.isChecked()); spPreviewLines.setSelection(prefs.getInt("preview_lines", 2) - 1); spPreviewLines.setEnabled(swPreview.isChecked()); + swAddresses.setChecked(prefs.getBoolean("addresses", false)); + + int message_zoom = prefs.getInt("message_zoom", 0); + etMessageZoom.setText(message_zoom == 0 ? null : Integer.toString(message_zoom)); + swContrast.setChecked(prefs.getBoolean("contrast", false)); swMonospaced.setChecked(prefs.getBoolean("monospaced", false)); swTextColor.setChecked(prefs.getBoolean("text_color", true)); diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml index 4246ed583c..d310027987 100644 --- a/app/src/main/res/layout/fragment_options_display.xml +++ b/app/src/main/res/layout/fragment_options_display.xml @@ -822,6 +822,30 @@ app:layout_constraintTop_toBottomOf="@id/tvCaptionBody" app:switchPadding="12dp" /> + + + + Expand address details by default Show attachments after the message text Show image thumbnails after the message text + Default message text zoom (%) Use high contrast for message text Use monospaced font for message text by default Use text colors