From a5fde31ca2062b85c3787d34b0d8f9c468abd263 Mon Sep 17 00:00:00 2001 From: BlackyHawky Date: Tue, 17 Oct 2023 12:23:24 +0200 Subject: [PATCH] Restored pin icon color for material style (#196) * Pin icon uses accent color for both styles --- .../inputmethod/keyboard/clipboard/ClipboardAdapter.kt | 2 +- .../org/dslul/openboard/inputmethod/latin/common/Colors.kt | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/clipboard/ClipboardAdapter.kt b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/clipboard/ClipboardAdapter.kt index 9b8f985b..31454244 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/clipboard/ClipboardAdapter.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/clipboard/ClipboardAdapter.kt @@ -68,7 +68,7 @@ class ClipboardAdapter( } clipboardLayoutParams.setItemProperties(view) val colors = Settings.getInstance().current.mColors - pinnedIconView.colorFilter = colors.clipboardPinFilter + pinnedIconView.colorFilter = colors.accentColorFilter } fun setContent(historyEntry: ClipboardHistoryEntry?) { diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt index 7d7ebec9..a25a0657 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt @@ -56,8 +56,6 @@ class Colors ( val accentColorFilter: ColorFilter /** color filter for the white action key icons in material theme, switches to gray if necessary for contrast */ val actionKeyIconColorFilter: ColorFilter? - /** color filter for the clipboard pin, used only in holo theme */ - val clipboardPinFilter: ColorFilter? private val backgroundStateList: ColorStateList private val keyStateList: ColorStateList @@ -77,12 +75,10 @@ class Colors ( navBar = darkerBackground keyboardBackground = GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM, intArrayOf(background, darkerBackground)) spaceBarText = keyText - clipboardPinFilter = accentColorFilter } else { navBar = background keyboardBackground = null spaceBarText = keyHintText - clipboardPinFilter = null } // create color filters, todo: maybe better / simplify