From a52929344c555d805b4de276ed3227844cc47f58 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 1 Feb 2023 16:52:58 +0800
Subject: [PATCH] Fix ripple

---
 app/src/mobile/res/drawable/shape_item.xml    | 28 +++++++++----------
 app/src/mobile/res/drawable/shape_text.xml    | 28 +++++++++----------
 app/src/mobile/res/layout/adapter_config.xml  |  2 --
 app/src/mobile/res/layout/adapter_live.xml    |  1 -
 app/src/mobile/res/layout/adapter_site.xml    |  3 --
 app/src/mobile/res/layout/adapter_vod.xml     |  3 +-
 app/src/mobile/res/layout/dialog_config.xml   |  2 --
 .../mobile/res/layout/fragment_setting.xml    | 16 -----------
 8 files changed, 30 insertions(+), 53 deletions(-)

diff --git a/app/src/mobile/res/drawable/shape_item.xml b/app/src/mobile/res/drawable/shape_item.xml
index edef87464..6bd391c11 100644
--- a/app/src/mobile/res/drawable/shape_item.xml
+++ b/app/src/mobile/res/drawable/shape_item.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/black_20" />
-
-    <corners android:radius="4dp" />
-
-    <padding
-        android:bottom="8dp"
-        android:left="12dp"
-        android:right="12dp"
-        android:top="8dp" />
-
-</shape>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/ripple_material_light">
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/black_20" />
+            <corners android:radius="4dp" />
+            <padding
+                android:bottom="8dp"
+                android:left="12dp"
+                android:right="12dp"
+                android:top="8dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/mobile/res/drawable/shape_text.xml b/app/src/mobile/res/drawable/shape_text.xml
index bb15f6d3c..99a703d07 100644
--- a/app/src/mobile/res/drawable/shape_text.xml
+++ b/app/src/mobile/res/drawable/shape_text.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/black_50" />
-
-    <corners android:radius="4dp" />
-
-    <padding
-        android:bottom="8dp"
-        android:left="12dp"
-        android:right="12dp"
-        android:top="8dp" />
-
-</shape>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/ripple_material_light">
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/black_50" />
+            <corners android:radius="4dp" />
+            <padding
+                android:bottom="8dp"
+                android:left="12dp"
+                android:right="12dp"
+                android:top="8dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/adapter_config.xml b/app/src/mobile/res/layout/adapter_config.xml
index 2e77b0900..d2a5f929b 100644
--- a/app/src/mobile/res/layout/adapter_config.xml
+++ b/app/src/mobile/res/layout/adapter_config.xml
@@ -12,7 +12,6 @@
         android:layout_weight="1"
         android:background="@drawable/shape_text"
         android:ellipsize="middle"
-        android:foreground="?android:attr/selectableItemBackground"
         android:gravity="center"
         android:singleLine="true"
         android:textColor="@color/white"
@@ -25,7 +24,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:background="@drawable/shape_text"
-        android:foreground="?android:attr/selectableItemBackground"
         android:padding="7dp"
         android:scaleType="fitCenter"
         android:src="@drawable/ic_delete_config" />
diff --git a/app/src/mobile/res/layout/adapter_live.xml b/app/src/mobile/res/layout/adapter_live.xml
index 803702e27..9b83aed1f 100644
--- a/app/src/mobile/res/layout/adapter_live.xml
+++ b/app/src/mobile/res/layout/adapter_live.xml
@@ -6,7 +6,6 @@
     android:layout_height="wrap_content"
     android:background="@drawable/shape_text"
     android:ellipsize="middle"
-    android:foreground="?android:attr/selectableItemBackground"
     android:gravity="center"
     android:singleLine="true"
     android:textColor="@color/text"
diff --git a/app/src/mobile/res/layout/adapter_site.xml b/app/src/mobile/res/layout/adapter_site.xml
index 38f3d424a..8ccfcc18d 100644
--- a/app/src/mobile/res/layout/adapter_site.xml
+++ b/app/src/mobile/res/layout/adapter_site.xml
@@ -12,7 +12,6 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:background="@drawable/shape_text"
-        android:foreground="?android:attr/selectableItemBackground"
         android:gravity="center"
         android:singleLine="true"
         android:textColor="@color/text"
@@ -25,7 +24,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:background="@drawable/shape_text"
-        android:foreground="?android:attr/selectableItemBackground"
         android:padding="7dp"
         android:scaleType="fitCenter"
         android:src="@drawable/ic_search_on"
@@ -37,7 +35,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:background="@drawable/shape_text"
-        android:foreground="?android:attr/selectableItemBackground"
         android:padding="7dp"
         android:scaleType="fitCenter"
         android:src="@drawable/ic_filter_on"
diff --git a/app/src/mobile/res/layout/adapter_vod.xml b/app/src/mobile/res/layout/adapter_vod.xml
index 89ffb7a85..55afbf0e1 100644
--- a/app/src/mobile/res/layout/adapter_vod.xml
+++ b/app/src/mobile/res/layout/adapter_vod.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="150dp"
-    android:layout_height="200dp">
+    android:layout_height="200dp"
+    android:foreground="@drawable/shape_vod">
 
     <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/image"
diff --git a/app/src/mobile/res/layout/dialog_config.xml b/app/src/mobile/res/layout/dialog_config.xml
index f7a79c4da..c3abdba6a 100644
--- a/app/src/mobile/res/layout/dialog_config.xml
+++ b/app/src/mobile/res/layout/dialog_config.xml
@@ -29,7 +29,6 @@
             android:layout_marginEnd="16dp"
             android:layout_weight="1"
             android:background="@drawable/shape_text"
-            android:foreground="?android:attr/selectableItemBackground"
             android:gravity="center"
             android:text="@string/dialog_positive"
             android:textColor="@color/white"
@@ -41,7 +40,6 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:background="@drawable/shape_text"
-            android:foreground="?android:attr/selectableItemBackground"
             android:gravity="center"
             android:text="@string/dialog_negative"
             android:textColor="@color/white"
diff --git a/app/src/mobile/res/layout/fragment_setting.xml b/app/src/mobile/res/layout/fragment_setting.xml
index 78c3aa65f..8d13c418b 100644
--- a/app/src/mobile/res/layout/fragment_setting.xml
+++ b/app/src/mobile/res/layout/fragment_setting.xml
@@ -36,7 +36,6 @@
                     android:layout_marginEnd="12dp"
                     android:layout_weight="1"
                     android:background="@drawable/shape_item"
-                    android:foreground="?android:attr/selectableItemBackground"
                     android:orientation="horizontal">
 
                     <TextView
@@ -66,7 +65,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="12dp"
                     android:background="@drawable/shape_item"
-                    android:foreground="?android:attr/selectableItemBackground"
                     android:padding="7dp"
                     android:scaleType="fitCenter"
                     android:src="@drawable/ic_setting_home" />
@@ -76,7 +74,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="@drawable/shape_item"
-                    android:foreground="?android:attr/selectableItemBackground"
                     android:padding="7dp"
                     android:scaleType="fitCenter"
                     android:src="@drawable/ic_setting_history" />
@@ -96,7 +93,6 @@
                     android:layout_marginEnd="12dp"
                     android:layout_weight="1"
                     android:background="@drawable/shape_item"
-                    android:foreground="?android:attr/selectableItemBackground"
                     android:orientation="horizontal">
 
                     <TextView
@@ -126,7 +122,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="12dp"
                     android:background="@drawable/shape_item"
-                    android:foreground="?android:attr/selectableItemBackground"
                     android:padding="7dp"
                     android:scaleType="fitCenter"
                     android:src="@drawable/ic_setting_home" />
@@ -136,7 +131,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="@drawable/shape_item"
-                    android:foreground="?android:attr/selectableItemBackground"
                     android:padding="7dp"
                     android:scaleType="fitCenter"
                     android:src="@drawable/ic_setting_history" />
@@ -156,7 +150,6 @@
                     android:layout_marginEnd="12dp"
                     android:layout_weight="1"
                     android:background="@drawable/shape_item"
-                    android:foreground="?android:attr/selectableItemBackground"
                     android:orientation="horizontal">
 
                     <TextView
@@ -186,7 +179,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="12dp"
                     android:background="@drawable/shape_item"
-                    android:foreground="?android:attr/selectableItemBackground"
                     android:padding="7dp"
                     android:scaleType="fitCenter"
                     android:src="@drawable/ic_setting_home" />
@@ -196,7 +188,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="@drawable/shape_item"
-                    android:foreground="?android:attr/selectableItemBackground"
                     android:padding="7dp"
                     android:scaleType="fitCenter"
                     android:src="@drawable/ic_setting_refresh" />
@@ -209,7 +200,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:background="@drawable/shape_item"
-                android:foreground="?android:attr/selectableItemBackground"
                 android:orientation="horizontal">
 
                 <TextView
@@ -237,7 +227,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:background="@drawable/shape_item"
-                android:foreground="?android:attr/selectableItemBackground"
                 android:orientation="horizontal">
 
                 <TextView
@@ -265,7 +254,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:background="@drawable/shape_item"
-                android:foreground="?android:attr/selectableItemBackground"
                 android:orientation="horizontal">
 
                 <TextView
@@ -293,7 +281,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:background="@drawable/shape_item"
-                android:foreground="?android:attr/selectableItemBackground"
                 android:orientation="horizontal">
 
                 <TextView
@@ -321,7 +308,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:background="@drawable/shape_item"
-                android:foreground="?android:attr/selectableItemBackground"
                 android:orientation="horizontal">
 
                 <TextView
@@ -349,7 +335,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:background="@drawable/shape_item"
-                android:foreground="?android:attr/selectableItemBackground"
                 android:orientation="horizontal">
 
                 <TextView
@@ -377,7 +362,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:background="@drawable/shape_item"
-                android:foreground="?android:attr/selectableItemBackground"
                 android:orientation="horizontal">
 
                 <TextView