mirror of
https://github.com/Helium314/HeliBoard.git
synced 2025-04-19 13:49:13 +00:00
add all_colors color for popup key text, fixes #1297
This commit is contained in:
parent
58778b1f23
commit
a3fcce26a7
2 changed files with 6 additions and 2 deletions
|
@ -430,6 +430,8 @@ public class KeyboardView extends View {
|
||||||
paint.setColor(mColors.get(ColorType.ACTION_KEY_ICON));
|
paint.setColor(mColors.get(ColorType.ACTION_KEY_ICON));
|
||||||
else if (this instanceof EmojiPageKeyboardView)
|
else if (this instanceof EmojiPageKeyboardView)
|
||||||
paint.setColor(mColors.get(ColorType.EMOJI_KEY_TEXT));
|
paint.setColor(mColors.get(ColorType.EMOJI_KEY_TEXT));
|
||||||
|
else if (this instanceof PopupKeysKeyboardView)
|
||||||
|
paint.setColor(mColors.get(ColorType.POPUP_KEY_TEXT));
|
||||||
else
|
else
|
||||||
paint.setColor(key.selectTextColor(params));
|
paint.setColor(key.selectTextColor(params));
|
||||||
// Set a drop shadow for the text if the shadow radius is positive value.
|
// Set a drop shadow for the text if the shadow radius is positive value.
|
||||||
|
|
|
@ -277,7 +277,7 @@ class DynamicColors(context: Context, override val themeStyle: String, override
|
||||||
AUTOFILL_BACKGROUND_CHIP, GESTURE_PREVIEW, POPUP_KEYS_BACKGROUND, MORE_SUGGESTIONS_BACKGROUND, KEY_PREVIEW_BACKGROUND -> adjustedBackground
|
AUTOFILL_BACKGROUND_CHIP, GESTURE_PREVIEW, POPUP_KEYS_BACKGROUND, MORE_SUGGESTIONS_BACKGROUND, KEY_PREVIEW_BACKGROUND -> adjustedBackground
|
||||||
TOOL_BAR_EXPAND_KEY_BACKGROUND -> if (!isNight) accent else doubleAdjustedBackground
|
TOOL_BAR_EXPAND_KEY_BACKGROUND -> if (!isNight) accent else doubleAdjustedBackground
|
||||||
GESTURE_TRAIL -> gesture
|
GESTURE_TRAIL -> gesture
|
||||||
KEY_TEXT, SUGGESTION_AUTO_CORRECT, REMOVE_SUGGESTION_ICON, EMOJI_KEY_TEXT, KEY_PREVIEW_TEXT,
|
KEY_TEXT, SUGGESTION_AUTO_CORRECT, REMOVE_SUGGESTION_ICON, EMOJI_KEY_TEXT, KEY_PREVIEW_TEXT, POPUP_KEY_TEXT,
|
||||||
KEY_ICON, ONE_HANDED_MODE_BUTTON, EMOJI_CATEGORY, TOOL_BAR_KEY, FUNCTIONAL_KEY_TEXT -> keyText
|
KEY_ICON, ONE_HANDED_MODE_BUTTON, EMOJI_CATEGORY, TOOL_BAR_KEY, FUNCTIONAL_KEY_TEXT -> keyText
|
||||||
KEY_HINT_TEXT -> keyHintText
|
KEY_HINT_TEXT -> keyHintText
|
||||||
SPACE_BAR_TEXT -> spaceBarText
|
SPACE_BAR_TEXT -> spaceBarText
|
||||||
|
@ -475,7 +475,8 @@ class DefaultColors (
|
||||||
GESTURE_PREVIEW, POPUP_KEYS_BACKGROUND, MORE_SUGGESTIONS_BACKGROUND, KEY_PREVIEW_BACKGROUND -> adjustedBackground
|
GESTURE_PREVIEW, POPUP_KEYS_BACKGROUND, MORE_SUGGESTIONS_BACKGROUND, KEY_PREVIEW_BACKGROUND -> adjustedBackground
|
||||||
TOOL_BAR_EXPAND_KEY_BACKGROUND, CLIPBOARD_SUGGESTION_BACKGROUND -> doubleAdjustedBackground
|
TOOL_BAR_EXPAND_KEY_BACKGROUND, CLIPBOARD_SUGGESTION_BACKGROUND -> doubleAdjustedBackground
|
||||||
GESTURE_TRAIL -> gesture
|
GESTURE_TRAIL -> gesture
|
||||||
KEY_TEXT, REMOVE_SUGGESTION_ICON, FUNCTIONAL_KEY_TEXT, KEY_ICON, EMOJI_KEY_TEXT, KEY_PREVIEW_TEXT -> keyText
|
KEY_TEXT, REMOVE_SUGGESTION_ICON, FUNCTIONAL_KEY_TEXT, KEY_ICON, EMOJI_KEY_TEXT,
|
||||||
|
POPUP_KEY_TEXT, KEY_PREVIEW_TEXT -> keyText
|
||||||
KEY_HINT_TEXT -> keyHintText
|
KEY_HINT_TEXT -> keyHintText
|
||||||
SPACE_BAR_TEXT -> spaceBarText
|
SPACE_BAR_TEXT -> spaceBarText
|
||||||
FUNCTIONAL_KEY_BACKGROUND -> functionalKey
|
FUNCTIONAL_KEY_BACKGROUND -> functionalKey
|
||||||
|
@ -635,6 +636,7 @@ enum class ColorType {
|
||||||
MORE_SUGGESTIONS_BACKGROUND,
|
MORE_SUGGESTIONS_BACKGROUND,
|
||||||
MORE_SUGGESTIONS_WORD_BACKGROUND,
|
MORE_SUGGESTIONS_WORD_BACKGROUND,
|
||||||
POPUP_KEYS_BACKGROUND,
|
POPUP_KEYS_BACKGROUND,
|
||||||
|
POPUP_KEY_TEXT,
|
||||||
NAVIGATION_BAR,
|
NAVIGATION_BAR,
|
||||||
SHIFT_KEY_ICON,
|
SHIFT_KEY_ICON,
|
||||||
SPACE_BAR_BACKGROUND,
|
SPACE_BAR_BACKGROUND,
|
||||||
|
|
Loading…
Add table
Reference in a new issue