From 1f21323a7a64c9d1ebbf57066acc01465213ab8c Mon Sep 17 00:00:00 2001 From: devycarol Date: Sun, 14 Jul 2024 12:41:07 -0600 Subject: [PATCH] Updated shift key icon, no longer accent-colored. --- .../keyboard/keyboard/KeyboardView.java | 13 ++----------- .../helium314/keyboard/latin/common/Colors.kt | 11 ++++------- .../res/drawable/sym_keyboard_shift_lock_lxx.xml | 5 ++--- .../drawable/sym_keyboard_shift_lock_rounded.xml | 5 ++--- .../main/res/drawable/sym_keyboard_shift_lxx.xml | 16 ++++++++++++---- .../res/drawable/sym_keyboard_shift_rounded.xml | 16 ++++++++++++---- .../res/drawable/sym_keyboard_shifted_lxx.xml | 13 +++++++++++++ .../drawable/sym_keyboard_shifted_rounded.xml | 13 +++++++++++++ app/src/main/res/values/keyboard-icons-holo.xml | 5 ++--- .../main/res/values/keyboard-icons-lxx-light.xml | 3 +-- .../main/res/values/keyboard-icons-rounded.xml | 2 +- 11 files changed, 64 insertions(+), 38 deletions(-) create mode 100644 app/src/main/res/drawable/sym_keyboard_shifted_lxx.xml create mode 100644 app/src/main/res/drawable/sym_keyboard_shifted_rounded.xml diff --git a/app/src/main/java/helium314/keyboard/keyboard/KeyboardView.java b/app/src/main/java/helium314/keyboard/keyboard/KeyboardView.java index 35f8e6670..5086420ca 100644 --- a/app/src/main/java/helium314/keyboard/keyboard/KeyboardView.java +++ b/app/src/main/java/helium314/keyboard/keyboard/KeyboardView.java @@ -506,7 +506,7 @@ else if (key.hasActionKeyBackground()) iconY = (keyHeight - iconHeight) / 2; // Align vertically center. } final int iconX = (keyWidth - iconWidth) / 2; // Align horizontally center. - setKeyIconColor(key, icon, keyboard); + setKeyIconColor(key, icon); drawIcon(canvas, icon, iconX, iconY, iconWidth, iconHeight); } @@ -603,18 +603,9 @@ public void deallocateMemory() { freeOffscreenBuffer(); } - private void setKeyIconColor(Key key, Drawable icon, Keyboard keyboard) { + private void setKeyIconColor(Key key, Drawable icon) { if (key.isAccentColored()) { mColors.setColor(icon, ColorType.ACTION_KEY_ICON); - } else if (key.isShift() && keyboard != null) { - if (keyboard.mId.mElementId == KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED - || keyboard.mId.mElementId == KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCKED - || keyboard.mId.mElementId == KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED - || keyboard.mId.mElementId == KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED - ) - mColors.setColor(icon, ColorType.SHIFT_KEY_ICON); - else - mColors.setColor(icon, ColorType.KEY_ICON); // normal key if not shifted } else if (key.getBackgroundType() != Key.BACKGROUND_TYPE_NORMAL) { mColors.setColor(icon, ColorType.KEY_ICON); } else if (this instanceof PopupKeysKeyboardView) { diff --git a/app/src/main/java/helium314/keyboard/latin/common/Colors.kt b/app/src/main/java/helium314/keyboard/latin/common/Colors.kt index 6876823c6..39c5d0d0f 100644 --- a/app/src/main/java/helium314/keyboard/latin/common/Colors.kt +++ b/app/src/main/java/helium314/keyboard/latin/common/Colors.kt @@ -271,8 +271,7 @@ class DynamicColors(context: Context, override val themeStyle: String, override } override fun get(color: ColorType): Int = when (color) { - TOOL_BAR_KEY_ENABLED_BACKGROUND, EMOJI_CATEGORY_SELECTED, ACTION_KEY_BACKGROUND, - CLIPBOARD_PIN, SHIFT_KEY_ICON -> accent + TOOL_BAR_KEY_ENABLED_BACKGROUND, EMOJI_CATEGORY_SELECTED, ACTION_KEY_BACKGROUND, CLIPBOARD_PIN -> accent AUTOFILL_BACKGROUND_CHIP, GESTURE_PREVIEW, POPUP_KEYS_BACKGROUND, MORE_SUGGESTIONS_BACKGROUND, KEY_PREVIEW -> adjustedBackground TOOL_BAR_EXPAND_KEY_BACKGROUND -> if (!isNight) accent else doubleAdjustedBackground GESTURE_TRAIL -> gesture @@ -323,7 +322,7 @@ class DynamicColors(context: Context, override val themeStyle: String, override } private fun getColorFilter(color: ColorType): ColorFilter? = when (color) { - EMOJI_CATEGORY_SELECTED, CLIPBOARD_PIN, SHIFT_KEY_ICON -> accentColorFilter + EMOJI_CATEGORY_SELECTED, CLIPBOARD_PIN -> accentColorFilter REMOVE_SUGGESTION_ICON, EMOJI_CATEGORY, KEY_TEXT, KEY_ICON, ONE_HANDED_MODE_BUTTON, TOOL_BAR_KEY, TOOL_BAR_EXPAND_KEY -> keyTextFilter KEY_PREVIEW -> adjustedBackgroundFilter @@ -464,8 +463,7 @@ class DefaultColors ( } override fun get(color: ColorType): Int = when (color) { - TOOL_BAR_KEY_ENABLED_BACKGROUND, EMOJI_CATEGORY_SELECTED, ACTION_KEY_BACKGROUND, - CLIPBOARD_PIN, SHIFT_KEY_ICON -> accent + TOOL_BAR_KEY_ENABLED_BACKGROUND, EMOJI_CATEGORY_SELECTED, ACTION_KEY_BACKGROUND, CLIPBOARD_PIN -> accent AUTOFILL_BACKGROUND_CHIP -> if (themeStyle == STYLE_MATERIAL && !hasKeyBorders) background else adjustedBackground GESTURE_PREVIEW, POPUP_KEYS_BACKGROUND, MORE_SUGGESTIONS_BACKGROUND, KEY_PREVIEW -> adjustedBackground TOOL_BAR_EXPAND_KEY_BACKGROUND, CLIPBOARD_SUGGESTION_BACKGROUND -> doubleAdjustedBackground @@ -539,7 +537,7 @@ class DefaultColors ( } private fun getColorFilter(color: ColorType): ColorFilter? = when (color) { - EMOJI_CATEGORY_SELECTED, CLIPBOARD_PIN, SHIFT_KEY_ICON -> accentColorFilter + EMOJI_CATEGORY_SELECTED, CLIPBOARD_PIN -> accentColorFilter KEY_TEXT, KEY_ICON -> keyTextFilter REMOVE_SUGGESTION_ICON, EMOJI_CATEGORY, ONE_HANDED_MODE_BUTTON, TOOL_BAR_KEY, TOOL_BAR_EXPAND_KEY -> suggestionTextFilter KEY_PREVIEW -> adjustedBackgroundFilter @@ -653,7 +651,6 @@ enum class ColorType { MORE_SUGGESTIONS_WORD_BACKGROUND, POPUP_KEYS_BACKGROUND, NAVIGATION_BAR, - SHIFT_KEY_ICON, SPACE_BAR_BACKGROUND, SPACE_BAR_TEXT, ONE_HANDED_MODE_BUTTON, diff --git a/app/src/main/res/drawable/sym_keyboard_shift_lock_lxx.xml b/app/src/main/res/drawable/sym_keyboard_shift_lock_lxx.xml index 3f2068542..0d3590e60 100644 --- a/app/src/main/res/drawable/sym_keyboard_shift_lock_lxx.xml +++ b/app/src/main/res/drawable/sym_keyboard_shift_lock_lxx.xml @@ -8,7 +8,6 @@ android:height="24dp" android:viewportWidth="960" android:viewportHeight="960"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_shift_lock_rounded.xml b/app/src/main/res/drawable/sym_keyboard_shift_lock_rounded.xml index c07064217..0446e3288 100644 --- a/app/src/main/res/drawable/sym_keyboard_shift_lock_rounded.xml +++ b/app/src/main/res/drawable/sym_keyboard_shift_lock_rounded.xml @@ -8,7 +8,6 @@ android:height="24dp" android:viewportWidth="960" android:viewportHeight="960"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_shift_lxx.xml b/app/src/main/res/drawable/sym_keyboard_shift_lxx.xml index 7c31427bd..739eadcf2 100644 --- a/app/src/main/res/drawable/sym_keyboard_shift_lxx.xml +++ b/app/src/main/res/drawable/sym_keyboard_shift_lxx.xml @@ -1,5 +1,13 @@ - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_shift_rounded.xml b/app/src/main/res/drawable/sym_keyboard_shift_rounded.xml index 7f601c4fa..6db9af7e9 100644 --- a/app/src/main/res/drawable/sym_keyboard_shift_rounded.xml +++ b/app/src/main/res/drawable/sym_keyboard_shift_rounded.xml @@ -1,5 +1,13 @@ - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_shifted_lxx.xml b/app/src/main/res/drawable/sym_keyboard_shifted_lxx.xml new file mode 100644 index 000000000..10e78d7b5 --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_shifted_lxx.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_shifted_rounded.xml b/app/src/main/res/drawable/sym_keyboard_shifted_rounded.xml new file mode 100644 index 000000000..73399c91d --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_shifted_rounded.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/keyboard-icons-holo.xml b/app/src/main/res/values/keyboard-icons-holo.xml index e7dc6853b..78733af2a 100644 --- a/app/src/main/res/values/keyboard-icons-holo.xml +++ b/app/src/main/res/values/keyboard-icons-holo.xml @@ -4,11 +4,12 @@ modified SPDX-License-Identifier: Apache-2.0 AND GPL-3.0-only --> -