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

convert popup multiTextKey codePoints into (KeySpec) label

Browse source 
fixes #1376
This commit is contained in:
Helium314 2025-02-26 21:16:23 +01:00
parent 2e9ba954ad
commit 1c955a34b2
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/floris/TextKeyData.kt
View file

@ -301,6 +301,8 @@ sealed interface KeyData : AbstractKeyData {
// idea: directly create PopupKeySpec, but need to deal with needsToUpcase and popupKeysColumnAndFlags // idea: directly create PopupKeySpec, but need to deal with needsToUpcase and popupKeysColumnAndFlags
fun getPopupLabel(params: KeyboardParams): String { fun getPopupLabel(params: KeyboardParams): String {
val newLabel = processLabel(params) val newLabel = processLabel(params)
if (newLabel == "!")
Log.w("test", "code $code, newCode ${processCode()}")
if (code == KeyCode.UNSPECIFIED) { if (code == KeyCode.UNSPECIFIED) {
if (newLabel == label) return label if (newLabel == label) return label
val newCode = processCode() val newCode = processCode()
@ -315,11 +317,14 @@ sealed interface KeyData : AbstractKeyData {
return "${newLabel.substringBefore("|")}|${StringUtils.newSingleCodePointString(code)}" return "${newLabel.substringBefore("|")}|${StringUtils.newSingleCodePointString(code)}"
} }
return "$newLabel|${StringUtils.newSingleCodePointString(code)}" return "$newLabel|${StringUtils.newSingleCodePointString(code)}"
} }
if (code in KeyCode.Spec.CURRENCY) { if (code in KeyCode.Spec.CURRENCY) {
return getCurrencyLabel(params) return getCurrencyLabel(params)
} }
if (code == KeyCode.MULTIPLE_CODE_POINTS && this is MultiTextKeyData) {
val outputText = String(codePoints, 0, codePoints.size)
return "${newLabel}|$outputText"
}
return if (newLabel.endsWith("|")) "$newLabel!code/${processCode()}" // for toolbar keys return if (newLabel.endsWith("|")) "$newLabel!code/${processCode()}" // for toolbar keys
else "$newLabel|!code/${processCode()}" else "$newLabel|!code/${processCode()}"
} }