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

remove unused keyboard_background color

Browse source
This commit is contained in:
Helium314 2024-01-26 18:52:49 +01:00
parent 2353cf491a
commit 2226bb98a8
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -204,7 +204,8 @@ public class KeyboardView extends View {
} else if (keyboard instanceof MoreKeysKeyboard) { } else if (keyboard instanceof MoreKeysKeyboard) {
mColors.setBackground(this, ColorType.MORE_KEYS_BACKGROUND); mColors.setBackground(this, ColorType.MORE_KEYS_BACKGROUND);
} else { } else {
mColors.setBackground(this, ColorType.KEYBOARD_BACKGROUND); // actual background color/drawable is applied to main_keyboard_frame
setBackgroundColor(Color.TRANSPARENT);
} }
mKeyboard = keyboard; mKeyboard = keyboard;

7
app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt
View file

@ -258,7 +258,7 @@ class DynamicColors(context: Context, override val themeStyle: String, override
SPACE_BAR_TEXT -> spaceBarText SPACE_BAR_TEXT -> spaceBarText
FUNCTIONAL_KEY_BACKGROUND -> functionalKey FUNCTIONAL_KEY_BACKGROUND -> functionalKey
SPACE_BAR_BACKGROUND -> spaceBar SPACE_BAR_BACKGROUND -> spaceBar
BACKGROUND, KEYBOARD_BACKGROUND, MAIN_BACKGROUND -> background BACKGROUND, MAIN_BACKGROUND -> background
KEY_BACKGROUND -> keyBackground KEY_BACKGROUND -> keyBackground
ACTION_KEY_MORE_KEYS_BACKGROUND -> if (themeStyle == STYLE_HOLO) adjustedBackground else accent ACTION_KEY_MORE_KEYS_BACKGROUND -> if (themeStyle == STYLE_HOLO) adjustedBackground else accent
STRIP_BACKGROUND -> if (!hasKeyBorders && themeStyle == STYLE_MATERIAL) adjustedBackground else background STRIP_BACKGROUND -> if (!hasKeyBorders && themeStyle == STYLE_MATERIAL) adjustedBackground else background
@ -340,7 +340,6 @@ class DynamicColors(context: Context, override val themeStyle: String, override
if (themeStyle != STYLE_HOLO) if (themeStyle != STYLE_HOLO)
setColor(view.background, MORE_KEYS_BACKGROUND) setColor(view.background, MORE_KEYS_BACKGROUND)
else view.background.colorFilter = adjustedBackgroundFilter else view.background.colorFilter = adjustedBackgroundFilter
KEYBOARD_BACKGROUND -> view.setBackgroundColor(Color.TRANSPARENT)
MAIN_BACKGROUND -> { MAIN_BACKGROUND -> {
if (keyboardBackground != null) { if (keyboardBackground != null) {
if (!backgroundSetupDone) { if (!backgroundSetupDone) {
@ -469,7 +468,7 @@ class DefaultColors (
SPACE_BAR_TEXT -> spaceBarText SPACE_BAR_TEXT -> spaceBarText
FUNCTIONAL_KEY_BACKGROUND -> functionalKey FUNCTIONAL_KEY_BACKGROUND -> functionalKey
SPACE_BAR_BACKGROUND -> spaceBar SPACE_BAR_BACKGROUND -> spaceBar
BACKGROUND, KEYBOARD_BACKGROUND, MAIN_BACKGROUND -> background BACKGROUND, MAIN_BACKGROUND -> background
KEY_BACKGROUND -> keyBackground KEY_BACKGROUND -> keyBackground
ACTION_KEY_MORE_KEYS_BACKGROUND -> if (themeStyle == STYLE_HOLO) adjustedBackground else accent ACTION_KEY_MORE_KEYS_BACKGROUND -> if (themeStyle == STYLE_HOLO) adjustedBackground else accent
STRIP_BACKGROUND -> if (!hasKeyBorders && themeStyle == STYLE_MATERIAL) adjustedBackground else background STRIP_BACKGROUND -> if (!hasKeyBorders && themeStyle == STYLE_MATERIAL) adjustedBackground else background
@ -517,7 +516,6 @@ class DefaultColors (
FUNCTIONAL_KEY_BACKGROUND, KEY_BACKGROUND, BACKGROUND, SPACE_BAR_BACKGROUND, STRIP_BACKGROUND -> setColor(view.background, color) FUNCTIONAL_KEY_BACKGROUND, KEY_BACKGROUND, BACKGROUND, SPACE_BAR_BACKGROUND, STRIP_BACKGROUND -> setColor(view.background, color)
ONE_HANDED_MODE_BUTTON -> setColor(view.background, if (keyboardBackground == null) BACKGROUND else STRIP_BACKGROUND) ONE_HANDED_MODE_BUTTON -> setColor(view.background, if (keyboardBackground == null) BACKGROUND else STRIP_BACKGROUND)
MORE_SUGGESTIONS_BACKGROUND -> view.background.colorFilter = backgroundFilter MORE_SUGGESTIONS_BACKGROUND -> view.background.colorFilter = backgroundFilter
KEYBOARD_BACKGROUND -> view.setBackgroundColor(Color.TRANSPARENT)
MAIN_BACKGROUND -> { MAIN_BACKGROUND -> {
if (keyboardBackground != null) { if (keyboardBackground != null) {
if (!backgroundSetupDone) { if (!backgroundSetupDone) {
@ -598,7 +596,6 @@ enum class ColorType {
KEY_TEXT, KEY_TEXT,
KEY_HINT_TEXT, KEY_HINT_TEXT,
KEY_PREVIEW, KEY_PREVIEW,
KEYBOARD_BACKGROUND,
MORE_SUGGESTIONS_HINT, MORE_SUGGESTIONS_HINT,
MORE_SUGGESTIONS_BACKGROUND, MORE_SUGGESTIONS_BACKGROUND,
MORE_KEYS_BACKGROUND, MORE_KEYS_BACKGROUND,