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

fix missing preview popups for keys with icon and negative code

Browse source
This commit is contained in:
Helium314 2024-06-08 11:31:40 +02:00
parent d11237ba23
commit a297b6037c
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/helium314/keyboard/keyboard/Key.java
View file

@ -921,6 +921,8 @@ public class Key implements Comparable<Key> {
public final boolean isAccentColored() { public final boolean isAccentColored() {
if (hasActionKeyBackground()) return true; if (hasActionKeyBackground()) return true;
final String iconName = getIconName(); final String iconName = getIconName();
// todo: other way of identifying the color?
// if yes, NAME_CLIPBOARD_ACTION_KEY and NAME_CLIPBOARD_NORMAL_KEY could be merged
return iconName.equals(KeyboardIconsSet.NAME_NEXT_KEY) return iconName.equals(KeyboardIconsSet.NAME_NEXT_KEY)
|| iconName.equals(KeyboardIconsSet.NAME_PREVIOUS_KEY) || iconName.equals(KeyboardIconsSet.NAME_PREVIOUS_KEY)
|| iconName.equals(KeyboardIconsSet.NAME_CLIPBOARD_ACTION_KEY) || iconName.equals(KeyboardIconsSet.NAME_CLIPBOARD_ACTION_KEY)
@ -1149,12 +1151,15 @@ public class Key implements Comparable<Key> {
|| (mCode == KeyCode.SYMBOL_ALPHA && !params.mId.isAlphabetKeyboard()) || (mCode == KeyCode.SYMBOL_ALPHA && !params.mId.isAlphabetKeyboard())
) )
actionFlags |= ACTION_FLAGS_ENABLE_LONG_PRESS; actionFlags |= ACTION_FLAGS_ENABLE_LONG_PRESS;
if (mCode <= Constants.CODE_SPACE && mCode != KeyCode.MULTIPLE_CODE_POINTS) if (mCode <= Constants.CODE_SPACE && mCode != KeyCode.MULTIPLE_CODE_POINTS && mIconName.equals(KeyboardIconsSet.NAME_UNDEFINED))
actionFlags |= ACTION_FLAGS_NO_KEY_PREVIEW; actionFlags |= ACTION_FLAGS_NO_KEY_PREVIEW;
switch (mCode) {
case KeyCode.DELETE, KeyCode.SHIFT, Constants.CODE_ENTER, KeyCode.SHIFT_ENTER, KeyCode.ALPHA, Constants.CODE_SPACE,
KeyCode.SYMBOL, KeyCode.SYMBOL_ALPHA -> actionFlags |= ACTION_FLAGS_NO_KEY_PREVIEW; // no preview even if icon!
case KeyCode.SETTINGS, KeyCode.LANGUAGE_SWITCH -> actionFlags |= ACTION_FLAGS_ALT_CODE_WHILE_TYPING;
}
if (mCode == KeyCode.DELETE) if (mCode == KeyCode.DELETE)
actionFlags |= ACTION_FLAGS_IS_REPEATABLE; actionFlags |= ACTION_FLAGS_IS_REPEATABLE;
if (mCode == KeyCode.SETTINGS || mCode == KeyCode.LANGUAGE_SWITCH)
actionFlags |= ACTION_FLAGS_ALT_CODE_WHILE_TYPING;
mActionFlags = actionFlags; mActionFlags = actionFlags;
final int altCodeInAttr; // settings and language switch keys have alt code space, all others nothing final int altCodeInAttr; // settings and language switch keys have alt code space, all others nothing

2
app/src/main/java/helium314/keyboard/keyboard/internal/KeySpecParser.java
View file

@ -221,7 +221,7 @@ public final class KeySpecParser {
return defaultCode; return defaultCode;
} }
@NonNull @NonNull // todo: why not null instead of NAME_UNDEFINED?
public static String getIconName(@Nullable final String keySpec) { public static String getIconName(@Nullable final String keySpec) {
if (keySpec == null) { if (keySpec == null) {
// TODO: Throw {@link KeySpecParserError} once Key.keyLabel attribute becomes mandatory. // TODO: Throw {@link KeySpecParserError} once Key.keyLabel attribute becomes mandatory.

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

@ -113,6 +113,7 @@ sealed interface KeyData : AbstractKeyData {
else "!icon/space_key_for_number_layout|!code/key_space" else "!icon/space_key_for_number_layout|!code/key_space"
// todo: emoji and language switch popups should actually disappear depending on current layout (including functional keys) // todo: emoji and language switch popups should actually disappear depending on current layout (including functional keys)
// keys could be replaced with toolbar keys, but parsing needs to be adjusted (should happen anyway...)
private fun getCommaPopupKeys(params: KeyboardParams): List<String> { private fun getCommaPopupKeys(params: KeyboardParams): List<String> {
val keys = mutableListOf<String>() val keys = mutableListOf<String>()
if (!params.mId.mDeviceLocked) if (!params.mId.mDeviceLocked)