From abd4112b8fb46468ee8d9dc1be803d3880507c8f Mon Sep 17 00:00:00 2001 From: sspanak Date: Sun, 1 Jun 2025 12:41:42 +0300 Subject: [PATCH] the language popup will now be shown by default when there are 3 or more enabled languages --- .../screens/languages/QuickSwitchLanguagePreference.java | 6 ++++-- .../sspanak/tt9/preferences/settings/SettingsUI.java | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/QuickSwitchLanguagePreference.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/QuickSwitchLanguagePreference.java index f72e1720..423f8fc4 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/QuickSwitchLanguagePreference.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/QuickSwitchLanguagePreference.java @@ -32,10 +32,12 @@ public class QuickSwitchLanguagePreference extends SwitchPreferenceCompat { } private void init(Context context) { - setDefaultValue(true); + SettingsStore settings = new SettingsStore(context); + + setDefaultValue(settings.getQuickSwitchLanguage()); setKey("pref_quick_switch_language"); setTitle(R.string.pref_quick_switch_language); setSummary(R.string.pref_quick_switch_language_summary); - setVisible(!new SettingsStore(context).isMainLayoutStealth()); + setVisible(!settings.isMainLayoutStealth()); } } diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsUI.java b/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsUI.java index 742a09ac..62f679ae 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsUI.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsUI.java @@ -24,6 +24,7 @@ public class SettingsUI extends SettingsTyping { public final static int MIN_WIDTH_PERCENT = 50; private int DEFAULT_WIDTH_LANDSCAPE = 0; + private Boolean DEFAULT_QUICK_SWITCH_LANGUAGE = null; SettingsUI(Context context) { @@ -88,7 +89,11 @@ public class SettingsUI extends SettingsTyping { } public boolean getQuickSwitchLanguage() { - return prefs.getBoolean("pref_quick_switch_language", true); + if (DEFAULT_QUICK_SWITCH_LANGUAGE == null) { + DEFAULT_QUICK_SWITCH_LANGUAGE = !isMainLayoutStealth() && getEnabledLanguagesIdsAsStrings().size() <= 2; + } + + return prefs.getBoolean("pref_quick_switch_language", DEFAULT_QUICK_SWITCH_LANGUAGE); } public int getSettingsFontSize() {