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

fix regression, abc and delete keys sharing background state in emoji view

Browse source
This commit is contained in:
Helium314 2023-10-20 13:21:49 +02:00
parent 2677e3eeb8
commit d2f43e21c2
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/emoji/EmojiPalettesView.java
View file

@ -62,7 +62,7 @@ import static org.dslul.openboard.inputmethod.latin.common.Constants.NOT_A_COORD
public final class EmojiPalettesView extends LinearLayout public final class EmojiPalettesView extends LinearLayout
implements OnTabChangeListener, View.OnClickListener, View.OnTouchListener, implements OnTabChangeListener, View.OnClickListener, View.OnTouchListener,
OnKeyEventListener { OnKeyEventListener {
private final Drawable mFunctionalKeyBackground; private final int mFunctionalKeyBackgroundId;
private final Drawable mSpacebarBackground; private final Drawable mSpacebarBackground;
private final boolean mCategoryIndicatorEnabled; private final boolean mCategoryIndicatorEnabled;
private final int mCategoryIndicatorDrawableResId; private final int mCategoryIndicatorDrawableResId;
@ -97,9 +97,11 @@ public final class EmojiPalettesView extends LinearLayout
super(context, attrs, defStyle); super(context, attrs, defStyle);
final TypedArray keyboardViewAttr = context.obtainStyledAttributes(attrs, final TypedArray keyboardViewAttr = context.obtainStyledAttributes(attrs,
R.styleable.KeyboardView, defStyle, R.style.KeyboardView); R.styleable.KeyboardView, defStyle, R.style.KeyboardView);
final Colors colors = Settings.getInstance().getCurrent().mColors; final int keyBackgroundId = keyboardViewAttr.getResourceId(
mFunctionalKeyBackground = colors.getDrawable(BackgroundType.FUNCTIONAL, keyboardViewAttr); R.styleable.KeyboardView_keyBackground, 0);
mSpacebarBackground = colors.getDrawable(BackgroundType.SPACE, keyboardViewAttr); mFunctionalKeyBackgroundId = keyboardViewAttr.getResourceId(
R.styleable.KeyboardView_functionalKeyBackground, keyBackgroundId);
mSpacebarBackground = Settings.getInstance().getCurrent().mColors.getDrawable(BackgroundType.SPACE, keyboardViewAttr);
keyboardViewAttr.recycle(); keyboardViewAttr.recycle();
final KeyboardLayoutSet.Builder builder = new KeyboardLayoutSet.Builder(context, null); final KeyboardLayoutSet.Builder builder = new KeyboardLayoutSet.Builder(context, null);
final Resources res = context.getResources(); final Resources res = context.getResources();
@ -232,7 +234,7 @@ public final class EmojiPalettesView extends LinearLayout
// deleteKey depends only on OnTouchListener. // deleteKey depends only on OnTouchListener.
mDeleteKey = findViewById(R.id.emoji_keyboard_delete); mDeleteKey = findViewById(R.id.emoji_keyboard_delete);
mDeleteKey.setBackground(mFunctionalKeyBackground); mDeleteKey.setBackgroundResource(mFunctionalKeyBackgroundId);
mDeleteKey.setColorFilter(colors.getKeyTextFilter()); mDeleteKey.setColorFilter(colors.getKeyTextFilter());
mDeleteKey.setTag(Constants.CODE_DELETE); mDeleteKey.setTag(Constants.CODE_DELETE);
mDeleteKey.setOnTouchListener(mDeleteKeyOnTouchListener); mDeleteKey.setOnTouchListener(mDeleteKeyOnTouchListener);
@ -245,7 +247,7 @@ public final class EmojiPalettesView extends LinearLayout
// The text on alphabet keys are set at // The text on alphabet keys are set at
// {@link #startEmojiPalettes(String,int,float,Typeface)}. // {@link #startEmojiPalettes(String,int,float,Typeface)}.
mAlphabetKeyLeft = findViewById(R.id.emoji_keyboard_alphabet_left); mAlphabetKeyLeft = findViewById(R.id.emoji_keyboard_alphabet_left);
mAlphabetKeyLeft.setBackground(mFunctionalKeyBackground); mAlphabetKeyLeft.setBackgroundResource(mFunctionalKeyBackgroundId);
mAlphabetKeyLeft.setTag(Constants.CODE_ALPHA_FROM_EMOJI); mAlphabetKeyLeft.setTag(Constants.CODE_ALPHA_FROM_EMOJI);
mAlphabetKeyLeft.setOnTouchListener(this); mAlphabetKeyLeft.setOnTouchListener(this);
mAlphabetKeyLeft.setOnClickListener(this); mAlphabetKeyLeft.setOnClickListener(this);