n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix hints and outputText

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-08-28 20:09:36 +03:00
parent be32a25307
commit 0c78fe5f12
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/src/org/futo/inputmethod/keyboard/Key.kt
View File

@ -129,7 +129,7 @@ data class Key(
val hintLabel: String? = null, val hintLabel: String? = null,
/** Hint icon to display instead of hint label. Icon takes precedence over a label */ /** Hint icon to display instead of hint label. Icon takes precedence over a label */
val hintIconId: String? = null, val hintIconId: String? = if(hintLabel?.isNotEmpty() == true) { "" } else { null },
/** Flags of the label */ /** Flags of the label */
val labelFlags: Int, val labelFlags: Int,
@ -190,6 +190,14 @@ data class Key(
/** Key is enabled and responds on press */ /** Key is enabled and responds on press */
val isEnabled: Boolean = code != Constants.CODE_UNSPECIFIED, val isEnabled: Boolean = code != Constants.CODE_UNSPECIFIED,
) { ) {
/** Validation */
init {
assert((code == Constants.CODE_OUTPUT_TEXT && outputText != null) ||
(code != Constants.CODE_OUTPUT_TEXT && outputText == null)) {
"Output text validation failed: $code $outputText"
}
}
/** The current pressed state of this key */ /** The current pressed state of this key */
private var mPressed = false private var mPressed = false

4
java/src/org/futo/inputmethod/v2keyboard/LayoutEngine.kt
View File

@ -503,7 +503,9 @@ data class LayoutEngine(
labelFlags = data.labelFlags, labelFlags = data.labelFlags,
moreKeys = data.moreKeys, moreKeys = data.moreKeys,
moreKeysColumnAndFlags = data.moreKeyFlags, moreKeysColumnAndFlags = data.moreKeyFlags,
visualStyle = data.style visualStyle = data.style,
outputText = data.outputText,
hintLabel = data.hint.ifEmpty { null }
) )
params.onAddKey(key) params.onAddKey(key)