From b417e28fd152236fcef3c8f2558746be01d28631 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 21 May 2024 19:01:05 +0200 Subject: [PATCH] Removed open pane (by default) setting --- .../main/java/eu/faircode/email/ActivityView.java | 5 ++--- .../eu/faircode/email/FragmentOptionsDisplay.java | 14 +------------- .../main/res/layout/fragment_options_display.xml | 15 +-------------- app/src/main/res/values/strings.xml | 1 - 4 files changed, 4 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index 245bbbdbea..af145359f4 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -249,7 +249,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB " landscape cols=" + landscape + " min=" + landscape_min_size); boolean duo = Helper.isSurfaceDuo(); boolean close_pane = prefs.getBoolean("close_pane", !duo); - boolean open_pane = (!close_pane && prefs.getBoolean("open_pane", false)); boolean nav_categories = prefs.getBoolean("nav_categories", false); // 1=small, 2=normal, 3=large, 4=xlarge @@ -711,8 +710,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB // Initialize if (content_pane != null) { - content_separator.setVisibility(duo || open_pane ? View.INVISIBLE : View.GONE); - content_pane.setVisibility(duo || open_pane ? View.INVISIBLE : View.GONE); + content_separator.setVisibility(close_pane ? View.GONE : View.INVISIBLE); + content_pane.setVisibility(close_pane ? View.GONE : View.INVISIBLE); } FragmentManager fm = getSupportFragmentManager(); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java index 68b3dacd26..4d8e164d2b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java @@ -89,7 +89,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer private SwitchCompat swLandscape; private Spinner spLandscapeMinSize; private SwitchCompat swClosePane; - private SwitchCompat swOpenPane; private TextView tvColumnWidth; private SeekBar sbColumnWidth; private SwitchCompat swHideToolbar; @@ -213,7 +212,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer "theme", "startup", "date", "date_week", "date_fixed", "date_bold", "date_time", "group_category", "cards", "beige", "tabular_card_bg", "shadow_unread", "shadow_border", "shadow_highlight", "dividers", "tabular_unread_bg", - "portrait2", "portrait2c", "landscape", "close_pane", "open_pane", "column_width", + "portrait2", "portrait2c", "landscape", "close_pane", "column_width", "hide_toolbar", "edge_to_edge", "nav_options", "nav_categories", "nav_last_sync", "nav_count", "nav_unseen_drafts", "nav_count_pinned", "show_unexposed", "threading", "threading_unread", "indentation", "seekbar", "actionbar", "actionbar_swap", "actionbar_color", "highlight_unread", "highlight_color", "color_stripe", "color_stripe_wide", @@ -268,7 +267,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer swLandscape = view.findViewById(R.id.swLandscape); spLandscapeMinSize = view.findViewById(R.id.spLandscapeMinSize); swClosePane = view.findViewById(R.id.swClosePane); - swOpenPane = view.findViewById(R.id.swOpenPane); tvColumnWidth = view.findViewById(R.id.tvColumnWidth); sbColumnWidth = view.findViewById(R.id.sbColumnWidth); swHideToolbar = view.findViewById(R.id.swHideToolbar); @@ -607,14 +605,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { prefs.edit().putBoolean("close_pane", checked).apply(); - swOpenPane.setEnabled(!checked); - } - }); - - swOpenPane.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { - prefs.edit().putBoolean("open_pane", checked).apply(); } }); @@ -1568,8 +1558,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer swLandscape.setChecked(prefs.getBoolean("landscape", true)); spLandscapeMinSize.setSelection(prefs.getInt("landscape_min_size", 0)); swClosePane.setChecked(prefs.getBoolean("close_pane", !Helper.isSurfaceDuo())); - swOpenPane.setChecked(prefs.getBoolean("open_pane", false)); - swOpenPane.setEnabled(!swClosePane.isChecked()); int column_width = prefs.getInt("column_width", 67); tvColumnWidth.setText(getString(R.string.title_advanced_column_width, NF.format(column_width))); diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml index ee1b399882..7751a42bda 100644 --- a/app/src/main/res/layout/fragment_options_display.xml +++ b/app/src/main/res/layout/fragment_options_display.xml @@ -518,19 +518,6 @@ app:layout_constraintTop_toBottomOf="@id/tvLandscapeSplitMinHint" app:switchPadding="12dp" /> - - + app:layout_constraintTop_toBottomOf="@id/swClosePane" /> Use two columns Minimum screen size for splitting the screen Collapse row or column when closing a conversation - Start with two rows or two columns Message column width / row height: %1$s %% Hide top toolbar when scrolling messages Edge-to-edge (experimental)