Merge pull request #8 from szugyi/custom-ripple

Add custom ripple effect
mrcsxsiq · May 16, 2020 · 14f8ed1 · 14f8ed1
2 parents 4b7b0dc + 1b3c19f
commit 14f8ed1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/app/src/main/res/drawable/background_item_pokemon.xml b/app/src/main/res/drawable/background_item_pokemon.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-<item>
-    <shape>
-        <solid android:color="@color/backgroundLight"/>
-        <corners android:radius="15dp"/>
-    </shape>
-</item>
-</layer-list>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+
+    <item>
+        <shape>
+            <solid android:color="@color/backgroundLight" />
+            <corners android:radius="15dp" />
+        </shape>
+    </item>
+
+    <item android:id="@android:id/mask">
+        <shape>
+            <!-- Color doesn't matter -->
+            <solid android:color="@android:color/white" />
+            <corners android:radius="15dp" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/layout/item_generation.xml b/app/src/main/res/layout/item_generation.xml
@@ -11,8 +11,6 @@
     android:clipToPadding="false"
     android:elevation="8dp"
     android:focusable="true"
-    android:foreground="?android:attr/selectableItemBackground"
-    android:orientation="vertical"
     android:padding="8dp">
 
     <TextView

diff --git a/app/src/main/res/layout/item_menu.xml b/app/src/main/res/layout/item_menu.xml
@@ -10,9 +10,8 @@
     android:clickable="true"
     android:clipToPadding="false"
     android:focusable="true"
-    android:foreground="?android:attr/selectableItemBackground"
-    android:orientation="vertical"
-    android:padding="8dp">
+    android:padding="8dp"
+    tools:backgroundTint="@color/lightTeal">
 
     <TextView
         android:id="@+id/textViewName"

diff --git a/app/src/main/res/layout/item_pokemon.xml b/app/src/main/res/layout/item_pokemon.xml
@@ -10,9 +10,8 @@
     android:clickable="true"
     android:clipToPadding="false"
     android:focusable="true"
-    android:foreground="?android:attr/selectableItemBackground"
-    android:orientation="vertical"
-    android:padding="8dp">
+    android:padding="8dp"
+    tools:backgroundTint="@color/lightTeal">
 
     <TextView
         android:id="@+id/textViewName"