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

Update key hints to show morekeys[0]

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-05-08 16:37:24 -05:00
parent 08cfe36dce
commit 3ad22e5a82
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
java/src/org/futo/inputmethod/keyboard/Key.java
View File

@ -329,7 +329,14 @@ public class Key implements Comparable<Key> {
R.styleable.Keyboard_Key_additionalMoreKeys); R.styleable.Keyboard_Key_additionalMoreKeys);
} }
moreKeys = MoreKeySpec.insertAdditionalMoreKeys(moreKeys, additionalMoreKeys); moreKeys = MoreKeySpec.insertAdditionalMoreKeys(moreKeys, additionalMoreKeys);
if (moreKeys != null) {
if(params.mId.mNumberRow && moreKeys != null) {
moreKeys = Arrays.stream(moreKeys)
.filter(s -> !s.matches("\\d+"))
.toArray(String[]::new);
}
if (moreKeys != null && moreKeys.length > 0) {
actionFlags |= ACTION_FLAGS_ENABLE_LONG_PRESS; actionFlags |= ACTION_FLAGS_ENABLE_LONG_PRESS;
mMoreKeys = new MoreKeySpec[moreKeys.length]; mMoreKeys = new MoreKeySpec[moreKeys.length];
for (int i = 0; i < moreKeys.length; i++) { for (int i = 0; i < moreKeys.length; i++) {
@ -361,8 +368,19 @@ public class Key implements Comparable<Key> {
if ((mLabelFlags & LABEL_FLAGS_DISABLE_HINT_LABEL) != 0) { if ((mLabelFlags & LABEL_FLAGS_DISABLE_HINT_LABEL) != 0) {
mHintLabel = null; mHintLabel = null;
} else { } else {
final String hintLabel = style.getString( String hintLabel = style.getString(
keyAttr, R.styleable.Keyboard_Key_keyHintLabel); keyAttr, R.styleable.Keyboard_Key_keyHintLabel);
if(params.mId.mNumberRow && hintLabel != null && hintLabel.matches("\\d+")) {
hintLabel = "";
}
if(moreKeys != null && moreKeys.length > 0) {
final String hintLabelCandidate = moreKeys[0];
if(hintLabelCandidate.length() == 1) {
hintLabel = hintLabelCandidate;
}
}
mHintLabel = needsToUpcase mHintLabel = needsToUpcase
? StringUtils.toTitleCaseOfKeyLabel(hintLabel, localeForUpcasing) ? StringUtils.toTitleCaseOfKeyLabel(hintLabel, localeForUpcasing)
: hintLabel; : hintLabel;