luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-04-26 09:36:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use original symbols as moreKeys on symbol number row

Browse source
This commit is contained in:
Helium314 2023-12-28 09:50:36 +01:00
parent 33ea631235
commit ebd7e3fa24
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/keyboard_parser/KeyboardParser.kt
View file

@ -86,8 +86,10 @@ abstract class KeyboardParser(private val params: KeyboardParams, private val co
private fun createAlphaSymbolRows(baseKeys: MutableList<List<KeyData>>): ArrayList<ArrayList<KeyParams>> { private fun createAlphaSymbolRows(baseKeys: MutableList<List<KeyData>>): ArrayList<ArrayList<KeyParams>> {
// number row related modifications of baseKeys // number row related modifications of baseKeys
if (!params.mId.mNumberRowEnabled && params.mId.mElementId == KeyboardId.ELEMENT_SYMBOLS) { if (!params.mId.mNumberRowEnabled && params.mId.mElementId == KeyboardId.ELEMENT_SYMBOLS) {
// replace first symbols row with number row // replace first symbols row with number row, but use the labels as moreKeys
baseKeys[0] = params.mLocaleKeyTexts.getNumberRow() 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 } else if (!params.mId.mNumberRowEnabled && params.mId.isAlphabetKeyboard
// todo: move this decision to some other place! // todo: move this decision to some other place!
&& !(params.mId.locale.language == "ko" && baseKeys.size == 4) && !(params.mId.locale.language == "ko" && baseKeys.size == 4)

6
app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/MoreKeysUtils.kt
View file

@ -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_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" 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<String>? { fun createMoreKeysArray(popupSet: PopupSet<*>?, params: KeyboardParams, label: String): Array<String>? {
// often moreKeys are empty, so we want to avoid unnecessarily creating sets // often moreKeys are empty, so we want to avoid unnecessarily creating sets
val moreKeysDelegate = lazy { mutableSetOf<String>() } val moreKeysDelegate = lazy { mutableSetOf<String>() }