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 issues with keys texts not using user-defined color

Browse source
This commit is contained in:
Helium314 2023-07-08 08:03:57 +02:00
parent 3f3a2c4230
commit 2439791322
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java
View file

@ -461,7 +461,9 @@ public class KeyboardView extends View {
paint.setColor(key.selectTextColor(params)); paint.setColor(key.selectTextColor(params));
if (mUserTheme) { if (mUserTheme) {
// set key color only if not in emoji keyboard range // set key color only if not in emoji keyboard range
if (keyboard != null && !containsEmoji(key.getLabel())) if (keyboard != null
&& (keyboard.mId.mElementId < 10 || keyboard.mId.mElementId > 26) // not showing emoji keyboard
&& !containsEmoji(key.getLabel())) // doesn't contain emoji, necessary for more suggestions view (but doesn't find all)
paint.setColorFilter(keyTextColorFilter); paint.setColorFilter(keyTextColorFilter);
else else
paint.setColorFilter(null); paint.setColorFilter(null);
@ -553,14 +555,16 @@ public class KeyboardView extends View {
drawKeyPopupHint(key, canvas, paint, params); drawKeyPopupHint(key, canvas, paint, params);
} }
} }
private static boolean containsEmoji(String s) { private static boolean containsEmoji(String s) {
for (int i = 0; i < s.length(); i++) { for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i); char c = s.charAt(i);
if (!((c <= 174 && c >= 169) || (c <= 12953 && c >= 8205) || (c >= 126980 && c <=127569))) if (!(c <= 0xD7FF || (c >= 0xE000 && c <= 0xFFFD) || (c >= 0x10000 && c <= 0x10FFFF)))
return true; return true;
} }
return false; return false;
} }
// Draw popup hint "..." at the bottom right corner of the key. // Draw popup hint "..." at the bottom right corner of the key.
protected void drawKeyPopupHint(@Nonnull final Key key, @Nonnull final Canvas canvas, protected void drawKeyPopupHint(@Nonnull final Key key, @Nonnull final Canvas canvas,
@Nonnull final Paint paint, @Nonnull final KeyDrawParams params) { @Nonnull final Paint paint, @Nonnull final KeyDrawParams params) {