From 8db0e9880e8fa55af89afb54652f49353c3ac634 Mon Sep 17 00:00:00 2001 From: Patryk Michalik Date: Sat, 19 Jun 2021 10:46:54 +0200 Subject: [PATCH] Use custom accent colour for App Drawer search bar cursor --- .../lawnchair/nexuslauncher/AllAppsHotseatQsb.kt | 7 +++++-- .../lawnchair/util/ExtendedEditTextExtensions.kt | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 lawnchair/src/app/lawnchair/util/ExtendedEditTextExtensions.kt diff --git a/lawnchair/src/app/lawnchair/nexuslauncher/AllAppsHotseatQsb.kt b/lawnchair/src/app/lawnchair/nexuslauncher/AllAppsHotseatQsb.kt index cb1eeee5f1..8d27a2e349 100644 --- a/lawnchair/src/app/lawnchair/nexuslauncher/AllAppsHotseatQsb.kt +++ b/lawnchair/src/app/lawnchair/nexuslauncher/AllAppsHotseatQsb.kt @@ -2,7 +2,7 @@ package app.lawnchair.nexuslauncher import android.content.Context import android.content.res.Resources -import android.graphics.Rect +import android.graphics.* import android.text.Selection import android.text.Spannable import android.text.SpannableString @@ -17,6 +17,7 @@ import android.widget.FrameLayout import androidx.recyclerview.widget.RecyclerView import app.lawnchair.allapps.LawnchairAppSearchAlgorithm import app.lawnchair.preferences.PreferenceManager +import app.lawnchair.util.setCursorColor import com.android.launcher3.* import com.android.launcher3.allapps.AllAppsContainerView import com.android.launcher3.allapps.AllAppsStore @@ -56,11 +57,13 @@ class AllAppsHotseatQsb @JvmOverloads constructor(context: Context, attrs: Attri super.onFinishInflate() mFallbackSearchView = findViewById(R.id.fallback_search_view) mSearchWrapperView = findViewById(R.id.search_wrapper_view) + val accentColor = Themes.getColorAccent(context) val spanned = SpannableString(" " + mFallbackSearchView.hint) spanned.setSpan(TintedDrawableSpan(context, R.drawable.ic_allapps_search), 0, 1, Spannable.SPAN_EXCLUSIVE_INCLUSIVE) mFallbackSearchView.hint = spanned - mFallbackSearchView.setHintTextColor(Themes.getColorAccent(context)) + mFallbackSearchView.setHintTextColor(accentColor) + mFallbackSearchView.setCursorColor(accentColor) } override fun onAttachedToWindow() { diff --git a/lawnchair/src/app/lawnchair/util/ExtendedEditTextExtensions.kt b/lawnchair/src/app/lawnchair/util/ExtendedEditTextExtensions.kt new file mode 100644 index 0000000000..d40d45642c --- /dev/null +++ b/lawnchair/src/app/lawnchair/util/ExtendedEditTextExtensions.kt @@ -0,0 +1,13 @@ +package app.lawnchair.util + +import android.graphics.BlendMode +import android.graphics.BlendModeColorFilter +import androidx.annotation.ColorInt +import com.android.launcher3.ExtendedEditText +import com.android.launcher3.Utilities + +fun ExtendedEditText.setCursorColor(@ColorInt color: Int) { + if (Utilities.ATLEAST_Q) { + this.textCursorDrawable?.colorFilter = BlendModeColorFilter(color, BlendMode.SRC) + } +} \ No newline at end of file