mirror/florisboard
0
0
Fork 0
mirror of https://github.com/florisboard/florisboard.git synced 2024-09-20 03:52:18 +02:00
Code

Fix currency slot popup bug

Browse Source
This commit is contained in:
Patrick Goldinger 2021-04-28 04:34:17 +02:00
parent dd12de7b88
commit 84b827d652
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/dev/patrickgold/florisboard/ime/text/key/CurrencySet.kt
View File

@ -42,12 +42,12 @@ class CurrencySet(
name = "\$default",
label = "Default",
slots = listOf(
AutoTextKeyData(code = 36, label = "$"),
AutoTextKeyData(code = 162, label = "¢"),
AutoTextKeyData(code = 8364, label = "€"),
AutoTextKeyData(code = 163, label = "£"),
AutoTextKeyData(code = 165, label = "¥"),
AutoTextKeyData(code = 8369, label = "₱")
BasicTextKeyData(code = 36, label = "$"),
BasicTextKeyData(code = 162, label = "¢"),
BasicTextKeyData(code = 8364, label = "€"),
BasicTextKeyData(code = 163, label = "£"),
BasicTextKeyData(code = 165, label = "¥"),
BasicTextKeyData(code = 8369, label = "₱")
)
)
}

14
app/src/main/java/dev/patrickgold/florisboard/ime/text/key/KeyData.kt
View File

@ -296,7 +296,12 @@ class BasicTextKeyData(
) : TextKeyData {
override fun computeTextKeyData(evaluator: TextComputingEvaluator): TextKeyData? {
return if (evaluator.isSlot(this)) {
evaluator.getSlotData(this)
val slotData = evaluator.getSlotData(this)
if (slotData != null) {
BasicTextKeyData(slotData.type, slotData.code, slotData.label, slotData.groupId, popup)
} else {
null
}
} else {
this
}
@ -323,7 +328,12 @@ class AutoTextKeyData(
override fun computeTextKeyData(evaluator: TextComputingEvaluator): TextKeyData? {
return if (evaluator.isSlot(this)) {
evaluator.getSlotData(this)
val slotData = evaluator.getSlotData(this)
if (slotData != null) {
BasicTextKeyData(slotData.type, slotData.code, slotData.label, slotData.groupId, popup)
} else {
null
}
} else {
if (evaluator.evaluateCaps(this)) { upper } else { lower }
}