luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-05-03 13:14:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

only add number to integrated number row moreKeys

Browse source 
other moreKeys appear to be unwanted, see #324 and #314 (comment)
This commit is contained in:
Helium314 2023-12-15 11:17:35 +01:00
parent 15e4c9aa9f
commit 8b236fd51a
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -172,11 +172,14 @@ class LocaleKeyTexts(dataStream: InputStream?, locale: Locale) {
label.toTextKey(numbersMoreKeys[i]) label.toTextKey(numbersMoreKeys[i])
} }
fun getNumberLabel(numberIndex: Int?): String? = numberIndex?.let { numberKeys.getOrNull(it) }
// get moreKeys with the number itself (as used on alphabet keyboards) // get moreKeys with the number itself (as used on alphabet keyboards)
fun getNumberMoreKeys(numberIndex: Int?): List<String> { // todo: use it or remove it
/* fun getNumberMoreKeys(numberIndex: Int?): List<String> {
if (numberIndex == null) return emptyList() if (numberIndex == null) return emptyList()
return listOf(numberKeys[numberIndex]) + numbersMoreKeys[numberIndex] return listOf(numberKeys[numberIndex]) + numbersMoreKeys[numberIndex]
} }*/
} }
private fun mergeMoreKeys(original: Array<String>, added: List<String>): Array<String> { private fun mergeMoreKeys(original: Array<String>, added: List<String>): Array<String> {

2
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/keyboard_parser/floris/PopupSet.kt
View file

@ -32,7 +32,7 @@ open class PopupSet<T : AbstractKeyData>(
fun toMoreKeys(params: KeyboardParams): Array<String>? { fun toMoreKeys(params: KeyboardParams): Array<String>? {
val moreKeys = mutableListOf<String>() val moreKeys = mutableListOf<String>()
// number + main + relevant in this order (label is later taken from first element in resulting array) // number + main + relevant in this order (label is later taken from first element in resulting array)
moreKeys.addAll(params.mLocaleKeyTexts.getNumberMoreKeys(numberIndex)) params.mLocaleKeyTexts.getNumberLabel(numberIndex)?.let { moreKeys.add(it) }
main?.getLabel(params)?.let { moreKeys.add(transformLabel(it, params)) } main?.getLabel(params)?.let { moreKeys.add(transformLabel(it, params)) }
moreKeys.addAll(relevant.map { transformLabel(it.getLabel(params), params) }) moreKeys.addAll(relevant.map { transformLabel(it.getLabel(params), params) })
return moreKeys.takeIf { it.isNotEmpty() }?.toTypedArray() return moreKeys.takeIf { it.isNotEmpty() }?.toTypedArray()