More prominent highlight than ripple

The ripple effect only takes a very short time and has low contrast. Now we just set the background color of the list item and keep it that way. This should be a lot easier to see.
ByteHamster · Dec 23, 2023 · 2a2460f · 2a2460f
1 parent e2a168c
commit 2a2460f
Showing 1 changed file with 17 additions and 24 deletions.
diff --git a/lib/src/main/java/com/bytehamster/lib/preferencesearch/SearchPreferenceResult.java b/lib/src/main/java/com/bytehamster/lib/preferencesearch/SearchPreferenceResult.java
@@ -1,12 +1,10 @@
 package com.bytehamster.lib.preferencesearch;
 
-import android.annotation.TargetApi;
+import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.RippleDrawable;
-import android.os.Build;
 import android.os.Handler;
 import android.util.Log;
 import android.util.TypedValue;
@@ -18,7 +16,6 @@
 import androidx.preference.PreferenceGroup;
 import androidx.recyclerview.widget.RecyclerView;
 
-
 public class SearchPreferenceResult {
     private final String key;
     private final int file;
@@ -79,11 +76,11 @@ private void doHighlight(final PreferenceFragmentCompat prefsFragment) {
                 recyclerView.postDelayed(() -> {
                     RecyclerView.ViewHolder holder = recyclerView.findViewHolderForAdapterPosition(position);
                     if (holder != null) {
-                        Drawable background = holder.itemView.getBackground();
-                        if (Build.VERSION.SDK_INT >= 21 && background instanceof RippleDrawable) {
-                            forceRippleAnimation((RippleDrawable) background);
-                            return;
-                        }
+                        Drawable oldBackground = holder.itemView.getBackground();
+                        int color = getColorFromAttr(prefsFragment.getContext(), android.R.attr.textColorPrimary);
+                        holder.itemView.setBackgroundColor(color & 0xffffff | 0x33000000);
+                        new Handler().postDelayed(() -> holder.itemView.setBackgroundDrawable(oldBackground), 1000);
+                        return;
                     }
                     highlightFallback(prefsFragment, prefResult);
                 }, 200);
@@ -94,20 +91,13 @@ private void doHighlight(final PreferenceFragmentCompat prefsFragment) {
     }
 
     /**
-     * Alternative (old) highlight method if ripple does not work
+     * Alternative highlight method if accessing the view did not work
      */
     private void highlightFallback(PreferenceFragmentCompat prefsFragment, final Preference prefResult) {
-        TypedValue typedValue = new TypedValue();
-        Resources.Theme theme = prefsFragment.getActivity().getTheme();
-        theme.resolveAttribute(android.R.attr.textColorPrimary, typedValue, true);
-        TypedArray arr = prefsFragment.getActivity().obtainStyledAttributes(typedValue.data, new int[]{
-                android.R.attr.textColorPrimary});
-        int color = arr.getColor(0, 0xff3F51B5);
-        arr.recycle();
-
         final Drawable oldIcon = prefResult.getIcon();
         final boolean oldSpaceReserved = prefResult.isIconSpaceReserved();
         Drawable arrow = AppCompatResources.getDrawable(prefsFragment.getContext(), R.drawable.searchpreference_ic_arrow_right);
+        int color = getColorFromAttr(prefsFragment.getContext(), android.R.attr.textColorPrimary);
         arrow.setColorFilter(color, PorterDuff.Mode.SRC_IN);
         prefResult.setIcon(arrow);
         prefsFragment.scrollToPreference(prefResult);
@@ -117,12 +107,15 @@ private void highlightFallback(PreferenceFragmentCompat prefsFragment, final Pre
         }, 1000);
     }
 
-    @TargetApi(21)
-    protected void forceRippleAnimation(RippleDrawable background) {
-        final RippleDrawable rippleDrawable = background;
-        Handler handler = new Handler();
-        rippleDrawable.setState(new int[]{android.R.attr.state_pressed, android.R.attr.state_enabled});
-        handler.postDelayed(() -> rippleDrawable.setState(new int[]{}), 1000);
+    private int getColorFromAttr(Context context, int attr) {
+        TypedValue typedValue = new TypedValue();
+        Resources.Theme theme = context.getTheme();
+        theme.resolveAttribute(attr, typedValue, true);
+        TypedArray arr = context.obtainStyledAttributes(typedValue.data, new int[]{
+                android.R.attr.textColorPrimary});
+        int color = arr.getColor(0, 0xff3F51B5);
+        arr.recycle();
+        return color;
     }
 
     /**