From ecfc14f044639a1487fe030ad6be541c57ba877f Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 24 May 2024 12:29:25 +0200 Subject: [PATCH] Enable hiding toolbar for new installations --- app/src/main/java/eu/faircode/email/ActivityBase.java | 2 +- app/src/main/java/eu/faircode/email/ApplicationEx.java | 3 +++ .../main/java/eu/faircode/email/FragmentOptionsDisplay.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java index 214e13844e..7e7715aa7d 100644 --- a/app/src/main/java/eu/faircode/email/ActivityBase.java +++ b/app/src/main/java/eu/faircode/email/ActivityBase.java @@ -105,7 +105,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc @Override public void setContentView(View view) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - boolean hide_toolbar = prefs.getBoolean("hide_toolbar", !BuildConfig.PLAY_STORE_RELEASE); + boolean hide_toolbar = prefs.getBoolean("hide_toolbar", true); boolean edge_to_edge = prefs.getBoolean("edge_to_edge", false); LayoutInflater inflater = LayoutInflater.from(this); diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index 23d593ea87..0f923e0f0d 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -864,6 +864,9 @@ public class ApplicationEx extends Application } else if (version < 2180) { if (Helper.isAndroid15()) editor.putInt("last_sdk", 0); + } else if (version < 2187) { + if (!prefs.contains("hide_toolbar")) + editor.putBoolean("hide_toolbar", !BuildConfig.PLAY_STORE_RELEASE); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java index 4d8e164d2b..e7bc53dafb 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java @@ -1563,7 +1563,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer tvColumnWidth.setText(getString(R.string.title_advanced_column_width, NF.format(column_width))); sbColumnWidth.setProgress(column_width); - swHideToolbar.setChecked(prefs.getBoolean("hide_toolbar", !BuildConfig.PLAY_STORE_RELEASE)); + swHideToolbar.setChecked(prefs.getBoolean("hide_toolbar", true)); swEdgeToEdge.setChecked(prefs.getBoolean("edge_to_edge", false)); swNavOptions.setChecked(prefs.getBoolean("nav_options", true)); swNavCategories.setChecked(prefs.getBoolean("nav_categories", false));