From 5378d8d0a3cb339fd873a91b3e98d3c29e65ed4b Mon Sep 17 00:00:00 2001 From: Helium314 Date: Fri, 12 Jul 2024 20:55:38 +0200 Subject: [PATCH] add another option to the "more letters with diacritics" settings with letters that used to be default in many languages now this setting is default --- app/src/main/assets/locale_key_texts/hi-Latn.txt | 9 --------- .../{all_popup_keys.txt => more_popups_all.txt} | 0 .../locale_key_texts/{en.txt => more_popups_main.txt} | 0 .../{more_popup_keys.txt => more_popups_more.txt} | 0 .../internal/keyboard_parser/LocaleKeyboardInfos.kt | 7 +++++-- .../java/helium314/keyboard/latin/settings/Settings.java | 5 +++-- app/src/main/res/values/donottranslate.xml | 2 ++ app/src/main/res/values/strings.xml | 4 +++- app/src/main/res/xml/prefs_screen_advanced.xml | 2 +- 9 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 app/src/main/assets/locale_key_texts/hi-Latn.txt rename app/src/main/assets/locale_key_texts/{all_popup_keys.txt => more_popups_all.txt} (100%) rename app/src/main/assets/locale_key_texts/{en.txt => more_popups_main.txt} (100%) rename app/src/main/assets/locale_key_texts/{more_popup_keys.txt => more_popups_more.txt} (100%) diff --git a/app/src/main/assets/locale_key_texts/hi-Latn.txt b/app/src/main/assets/locale_key_texts/hi-Latn.txt deleted file mode 100644 index a091434a..00000000 --- a/app/src/main/assets/locale_key_texts/hi-Latn.txt +++ /dev/null @@ -1,9 +0,0 @@ -[popup_keys] -a à á â ä æ ã å ā -e é è ê ë ē -i í î ï ī ì -o ó ô ö ò œ ø ō õ -u ú û ü ù ū -s ß -n ñ -c ç diff --git a/app/src/main/assets/locale_key_texts/all_popup_keys.txt b/app/src/main/assets/locale_key_texts/more_popups_all.txt similarity index 100% rename from app/src/main/assets/locale_key_texts/all_popup_keys.txt rename to app/src/main/assets/locale_key_texts/more_popups_all.txt diff --git a/app/src/main/assets/locale_key_texts/en.txt b/app/src/main/assets/locale_key_texts/more_popups_main.txt similarity index 100% rename from app/src/main/assets/locale_key_texts/en.txt rename to app/src/main/assets/locale_key_texts/more_popups_main.txt diff --git a/app/src/main/assets/locale_key_texts/more_popup_keys.txt b/app/src/main/assets/locale_key_texts/more_popups_more.txt similarity index 100% rename from app/src/main/assets/locale_key_texts/more_popup_keys.txt rename to app/src/main/assets/locale_key_texts/more_popups_more.txt diff --git a/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/LocaleKeyboardInfos.kt b/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/LocaleKeyboardInfos.kt index 766aeab6..ebf5ac38 100644 --- a/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/LocaleKeyboardInfos.kt +++ b/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/LocaleKeyboardInfos.kt @@ -239,9 +239,11 @@ fun addLocaleKeyTextsToParams(context: Context, params: KeyboardParams, popupKey private fun createLocaleKeyTexts(context: Context, params: KeyboardParams, popupKeysSetting: Int): LocaleKeyboardInfos { val lkt = LocaleKeyboardInfos(getStreamForLocale(params.mId.locale, context), params.mId.locale) if (popupKeysSetting == POPUP_KEYS_MORE) - lkt.addFile(context.assets.open("$LOCALE_TEXTS_FOLDER/all_popup_keys.txt")) + lkt.addFile(context.assets.open("$LOCALE_TEXTS_FOLDER/more_popups_more.txt")) else if (popupKeysSetting == POPUP_KEYS_ALL) - lkt.addFile(context.assets.open("$LOCALE_TEXTS_FOLDER/more_popup_keys.txt")) + lkt.addFile(context.assets.open("$LOCALE_TEXTS_FOLDER/more_popups_all.txt")) + else if (popupKeysSetting == POPUP_KEYS_MAIN) + lkt.addFile(context.assets.open("$LOCALE_TEXTS_FOLDER/more_popups_main.txt")) params.mSecondaryLocales.forEach { locale -> if (locale == params.mId.locale) return@forEach lkt.addFile(getStreamForLocale(locale, context)) @@ -339,6 +341,7 @@ private val euroLocales = "bg|ca|cs|da|de|el|en|es|et|eu|fi|fr|ga|gl|hr|hu|it|lb const val POPUP_KEYS_ALL = 2 const val POPUP_KEYS_MORE = 1 +const val POPUP_KEYS_MAIN = 3 const val POPUP_KEYS_NORMAL = 0 private const val LOCALE_TEXTS_FOLDER = "locale_key_texts" diff --git a/app/src/main/java/helium314/keyboard/latin/settings/Settings.java b/app/src/main/java/helium314/keyboard/latin/settings/Settings.java index 38a60abf..440e7cb3 100644 --- a/app/src/main/java/helium314/keyboard/latin/settings/Settings.java +++ b/app/src/main/java/helium314/keyboard/latin/settings/Settings.java @@ -507,10 +507,11 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang } public static int readMorePopupKeysPref(final SharedPreferences prefs) { - return switch (prefs.getString(Settings.PREF_MORE_POPUP_KEYS, "normal")) { + return switch (prefs.getString(Settings.PREF_MORE_POPUP_KEYS, "main")) { case "all" -> LocaleKeyboardInfosKt.POPUP_KEYS_ALL; case "more" -> LocaleKeyboardInfosKt.POPUP_KEYS_MORE; - default -> LocaleKeyboardInfosKt.POPUP_KEYS_NORMAL; + case "normal" -> LocaleKeyboardInfosKt.POPUP_KEYS_NORMAL; + default -> LocaleKeyboardInfosKt.POPUP_KEYS_MAIN; }; } diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index a5df734f..aad83ab5 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -99,11 +99,13 @@ normal + main more all @string/show_popup_keys_normal + @string/show_popup_keys_main @string/show_popup_keys_more @string/show_popup_keys_all diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4505f923..e785dfe4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -200,7 +200,9 @@ Show more letters with diacritics in popup - Show variants defined in keyboard languages (default) + Show variants defined in keyboard languages + + Add very common variants (default) Add common variants diff --git a/app/src/main/res/xml/prefs_screen_advanced.xml b/app/src/main/res/xml/prefs_screen_advanced.xml index d262c0c8..62e89b1a 100644 --- a/app/src/main/res/xml/prefs_screen_advanced.xml +++ b/app/src/main/res/xml/prefs_screen_advanced.xml @@ -91,7 +91,7 @@ android:title="@string/show_popup_keys_title" android:entries="@array/show_popup_keys_entries" android:entryValues="@array/show_popup_keys_values" - android:defaultValue="normal" + android:defaultValue="main" android:summary="%s" android:persistent="true" latin:singleLineTitle="false" />