From ebd7e3fa24b71e148ae6cc77d29a50cc389ae808 Mon Sep 17 00:00:00 2001 From: Helium314 Date: Thu, 28 Dec 2023 09:50:36 +0100 Subject: [PATCH] use original symbols as moreKeys on symbol number row --- .../keyboard/internal/keyboard_parser/KeyboardParser.kt | 6 ++++-- .../openboard/inputmethod/latin/utils/MoreKeysUtils.kt | 6 ------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/keyboard_parser/KeyboardParser.kt b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/keyboard_parser/KeyboardParser.kt index 30e6254be..daebc6bea 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/keyboard_parser/KeyboardParser.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/keyboard_parser/KeyboardParser.kt @@ -86,8 +86,10 @@ abstract class KeyboardParser(private val params: KeyboardParams, private val co private fun createAlphaSymbolRows(baseKeys: MutableList>): ArrayList> { // number row related modifications of baseKeys if (!params.mId.mNumberRowEnabled && params.mId.mElementId == KeyboardId.ELEMENT_SYMBOLS) { - // replace first symbols row with number row - baseKeys[0] = params.mLocaleKeyTexts.getNumberRow() + // replace first symbols row with number row, but use the labels as moreKeys + val numberRow = params.mLocaleKeyTexts.getNumberRow() + numberRow.forEachIndexed { index, keyData -> keyData.popup.symbol = baseKeys[0].getOrNull(index)?.label } + baseKeys[0] = numberRow } else if (!params.mId.mNumberRowEnabled && params.mId.isAlphabetKeyboard // todo: move this decision to some other place! && !(params.mId.locale.language == "ko" && baseKeys.size == 4) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/MoreKeysUtils.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/MoreKeysUtils.kt index eea637401..2245bba31 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/MoreKeysUtils.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/MoreKeysUtils.kt @@ -29,12 +29,6 @@ private const val MORE_KEYS_LANGUAGE = "more_keys_language" const val MORE_KEYS_LABEL_DEFAULT = "$MORE_KEYS_NUMBER,true;$MORE_KEYS_LANGUAGE_PRIORITY,false;$MORE_KEYS_LAYOUT,true;$MORE_KEYS_SYMBOLS,true;$MORE_KEYS_LANGUAGE,false" const val MORE_KEYS_ORDER_DEFAULT = "$MORE_KEYS_LANGUAGE_PRIORITY,true;$MORE_KEYS_NUMBER,true;$MORE_KEYS_SYMBOLS,true;$MORE_KEYS_LAYOUT,true;$MORE_KEYS_LANGUAGE,true" -// todo: -// could be done later: -// some way to allow hint labels in symbols layout -// maybe put "language" moreKeys into a different category when not using alphabet layout -// because disabling language moreKeys will remove e.g. quote moreKeys - fun createMoreKeysArray(popupSet: PopupSet<*>?, params: KeyboardParams, label: String): Array? { // often moreKeys are empty, so we want to avoid unnecessarily creating sets val moreKeysDelegate = lazy { mutableSetOf() }