From c2f4b617b3f6046d5f7e882d320e25c62fc30159 Mon Sep 17 00:00:00 2001 From: Helium314 Date: Sun, 19 Nov 2023 22:00:31 +0100 Subject: [PATCH] replace some dividers with shape drawables, avoids them turning green depending on some display settings --- .../keyboard/MoreKeysKeyboardView.java | 4 ---- .../main/res/drawable-hdpi/more_keys_divider.webp | Bin 128 -> 0 bytes .../suggestions_strip_divider_holo.png | Bin 73 -> 0 bytes .../suggestions_strip_divider_lxx_dark.webp | Bin 100 -> 0 bytes .../suggestions_strip_divider_lxx_light.webp | Bin 108 -> 0 bytes .../main/res/drawable-mdpi/more_keys_divider.webp | Bin 128 -> 0 bytes .../suggestions_strip_divider_holo.webp | Bin 100 -> 0 bytes .../suggestions_strip_divider_lxx_dark.webp | Bin 98 -> 0 bytes .../suggestions_strip_divider_lxx_light.webp | Bin 108 -> 0 bytes .../res/drawable-xhdpi/more_keys_divider.webp | Bin 138 -> 0 bytes .../suggestions_strip_divider_holo.webp | Bin 100 -> 0 bytes .../suggestions_strip_divider_lxx_dark.webp | Bin 100 -> 0 bytes .../suggestions_strip_divider_lxx_light.webp | Bin 108 -> 0 bytes .../suggestions_strip_divider_holo.webp | Bin 102 -> 0 bytes .../suggestions_strip_divider_lxx_dark.webp | Bin 102 -> 0 bytes .../suggestions_strip_divider_lxx_light.webp | Bin 108 -> 0 bytes .../suggestions_strip_divider_lxx_dark.webp | Bin 106 -> 0 bytes .../suggestions_strip_divider_lxx_light.webp | Bin 110 -> 0 bytes app/src/main/res/drawable/more_keys_divider.xml | 7 +++++++ .../res/drawable/suggestions_strip_divider.xml | 6 ++++++ .../drawable/suggestions_strip_divider_holo.xml | 6 ++++++ app/src/main/res/values/themes-lxx-base.xml | 2 +- app/src/main/res/values/themes-rounded-base.xml | 2 +- 23 files changed, 21 insertions(+), 6 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/more_keys_divider.webp delete mode 100644 app/src/main/res/drawable-hdpi/suggestions_strip_divider_holo.png delete mode 100644 app/src/main/res/drawable-hdpi/suggestions_strip_divider_lxx_dark.webp delete mode 100644 app/src/main/res/drawable-hdpi/suggestions_strip_divider_lxx_light.webp delete mode 100644 app/src/main/res/drawable-mdpi/more_keys_divider.webp delete mode 100644 app/src/main/res/drawable-mdpi/suggestions_strip_divider_holo.webp delete mode 100644 app/src/main/res/drawable-mdpi/suggestions_strip_divider_lxx_dark.webp delete mode 100644 app/src/main/res/drawable-mdpi/suggestions_strip_divider_lxx_light.webp delete mode 100644 app/src/main/res/drawable-xhdpi/more_keys_divider.webp delete mode 100644 app/src/main/res/drawable-xhdpi/suggestions_strip_divider_holo.webp delete mode 100644 app/src/main/res/drawable-xhdpi/suggestions_strip_divider_lxx_dark.webp delete mode 100644 app/src/main/res/drawable-xhdpi/suggestions_strip_divider_lxx_light.webp delete mode 100644 app/src/main/res/drawable-xxhdpi/suggestions_strip_divider_holo.webp delete mode 100644 app/src/main/res/drawable-xxhdpi/suggestions_strip_divider_lxx_dark.webp delete mode 100644 app/src/main/res/drawable-xxhdpi/suggestions_strip_divider_lxx_light.webp delete mode 100644 app/src/main/res/drawable-xxxhdpi/suggestions_strip_divider_lxx_dark.webp delete mode 100644 app/src/main/res/drawable-xxxhdpi/suggestions_strip_divider_lxx_light.webp create mode 100644 app/src/main/res/drawable/more_keys_divider.xml create mode 100644 app/src/main/res/drawable/suggestions_strip_divider.xml create mode 100644 app/src/main/res/drawable/suggestions_strip_divider_holo.xml diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/MoreKeysKeyboardView.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/MoreKeysKeyboardView.java index 39936eaeb..32ad28948 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/MoreKeysKeyboardView.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/MoreKeysKeyboardView.java @@ -56,10 +56,6 @@ public class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel final TypedArray moreKeysKeyboardViewAttr = context.obtainStyledAttributes(attrs, R.styleable.MoreKeysKeyboardView, defStyle, R.style.MoreKeysKeyboardView); mDivider = moreKeysKeyboardViewAttr.getDrawable(R.styleable.MoreKeysKeyboardView_divider); - if (mDivider != null) { - // TODO: Drawable itself should have an alpha value. - mDivider.setAlpha(128); - } moreKeysKeyboardViewAttr.recycle(); mKeyDetector = new MoreKeysDetector(getResources().getDimension( R.dimen.config_more_keys_keyboard_slide_allowance)); diff --git a/app/src/main/res/drawable-hdpi/more_keys_divider.webp b/app/src/main/res/drawable-hdpi/more_keys_divider.webp deleted file mode 100644 index 18573ddf1045cc06dcb8649eb50749c868dd464b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmWIYbaSgEFr zrjCE?hvGRHfI1YcfbtiZ8Rjx-F)^4k*!7yta9^slXrX}w55oe%&P)adz0wBl2DjB~ b?=Ud@`y()Q`OS>OB9|`nZm>Soz`y_inh_-3 diff --git a/app/src/main/res/drawable-hdpi/suggestions_strip_divider_holo.png b/app/src/main/res/drawable-hdpi/suggestions_strip_divider_holo.png deleted file mode 100644 index 5d44d9ce543a07dd5715503bcdd6877d4a8f33e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73 zcmeAS@N?(olHy`uVBq!ia0vp^j6iI_!3HER7z;E4DFIIx#}JO|$q5Mw25AzOEDU)e WoD+G@ocINlWAJqKb6Mw<&;$V8i4Yh7 diff --git a/app/src/main/res/drawable-hdpi/suggestions_strip_divider_lxx_dark.webp b/app/src/main/res/drawable-hdpi/suggestions_strip_divider_lxx_dark.webp deleted file mode 100644 index 9967b8cb3d13d4714c072a34f2fae131933aa31a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 100 zcmWIYbaRVgU|jq=8IEaRmX7Pupi_^mcHt8zpvJ z+`rYkx#M5EsXHSBP?v%kP)z|d!(2u!Mg~;|yGEla?n{-G6iq!C76@==GB8vztP^{% Z>{0{6zdzSFY`>Q7aNBn5QAh+(7XYmYBtifH diff --git a/app/src/main/res/drawable-mdpi/suggestions_strip_divider_holo.webp b/app/src/main/res/drawable-mdpi/suggestions_strip_divider_holo.webp deleted file mode 100644 index 06cd0eaf7138a86a3421cdcd530d6f1c66fa7807..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 100 zcmWIYbaRVgU|jKs-kF3o|=77+4jKs-kFfXN*k3@i`#$2htCcV-5v uR8RqmZ(w4W%c#Z3Ai-ca(Q3N;(#1-O1{@3jKs-kFfXN*k3@i`#$2htCcV-5v zRL}#8e_&#m%c#Z3Ai-ca(Q3N;(#1-O1{@3Z-&7pcw#TO>~*-wRG{Kg)2B1HVAQMGBDUKUcm70$GJBQ3;;KD8Xo`v diff --git a/app/src/main/res/drawable-xhdpi/suggestions_strip_divider_lxx_dark.webp b/app/src/main/res/drawable-xhdpi/suggestions_strip_divider_lxx_dark.webp deleted file mode 100644 index 6bf3aa2d2cac56102b776cf4c9de20e79d242713..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 100 zcmWIYbaRVgU|_$m;cWE zK$Qv_K=BVu409Q^m>Cin>?XR+^HyEFXyMWfh7CfTnG6h?&bc2L{{1-j2B;1IY{nXQ diff --git a/app/src/main/res/drawable-xxhdpi/suggestions_strip_divider_lxx_dark.webp b/app/src/main/res/drawable-xxhdpi/suggestions_strip_divider_lxx_dark.webp deleted file mode 100644 index 0533837dd8a1a048296b5079b69ef8983d5b44b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102 zcmWIYbaRViU| + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/suggestions_strip_divider.xml b/app/src/main/res/drawable/suggestions_strip_divider.xml new file mode 100644 index 000000000..65b0ba2e5 --- /dev/null +++ b/app/src/main/res/drawable/suggestions_strip_divider.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/suggestions_strip_divider_holo.xml b/app/src/main/res/drawable/suggestions_strip_divider_holo.xml new file mode 100644 index 000000000..3f4b77cab --- /dev/null +++ b/app/src/main/res/drawable/suggestions_strip_divider_holo.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/themes-lxx-base.xml b/app/src/main/res/values/themes-lxx-base.xml index 53d4d08ed..06927a1ca 100644 --- a/app/src/main/res/values/themes-lxx-base.xml +++ b/app/src/main/res/values/themes-lxx-base.xml @@ -123,7 +123,7 @@ @integer/config_max_more_suggestions_row @fraction/config_min_more_suggestions_width @drawable/keyboard_background_lxx_base - @drawable/suggestions_strip_divider_lxx_light + @drawable/suggestions_strip_divider autoCorrectBold|validTypedWordBold @color/typed_word_color_lxx_light @color/typed_word_color_lxx_light diff --git a/app/src/main/res/values/themes-rounded-base.xml b/app/src/main/res/values/themes-rounded-base.xml index 46f0c1bc2..4f0a56ddd 100644 --- a/app/src/main/res/values/themes-rounded-base.xml +++ b/app/src/main/res/values/themes-rounded-base.xml @@ -135,7 +135,7 @@ @integer/config_max_more_suggestions_row @fraction/config_min_more_suggestions_width @drawable/keyboard_background_lxx_base - @drawable/suggestions_strip_divider_lxx_light + @drawable/suggestions_strip_divider autoCorrectBold|validTypedWordBold @color/typed_word_color_lxx_light @color/typed_word_color_lxx_light