针对6.0+的系统做了水波纹的兼容

kaleai · Oct 11, 2018 · b361711 · b361711
1 parent 484f339
commit b361711
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/app/src/main/res/layout/image_layout.xml b/app/src/main/res/layout/image_layout.xml
@@ -28,6 +28,8 @@
 
             app:pressedStrokeColor="#259b24"
             app:pressedStrokeWidth="8dp"
+
+            app:ripple="true"
             />
 
         <LinearLayout

diff --git a/lib/src/main/java/kale/injection/SelectorInjection.java b/lib/src/main/java/kale/injection/SelectorInjection.java
@@ -212,8 +212,15 @@ private void setSelectorDrawableToView() {
 
             ripple.setColor(ColorStateList.valueOf(pressed.color));
             ripple.setDrawableByLayerId(android.R.id.mask, normal.drawable); // 这里用的normal时的drawable做边界
-            ripple.setDrawableByLayerId(android.R.id.content, selector);
-            view.setBackground(ripple);
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                view.setForeground(ripple);
+                view.setBackground(selector);
+            } else {
+                ripple.setDrawableByLayerId(android.R.id.content, selector);
+                view.setBackground(ripple);
+            }
+
             return;
         }
 

diff --git a/lib/src/main/res/drawable-v23/si_ripple.xml b/lib/src/main/res/drawable-v23/si_ripple.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?><!-- si = selector injection 用来避开资源冲突 -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#ff0000"
+    >
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@color/default_color"
+        />
+
+</ripple>