From 928a0e9807767f21a0ad1181fa8e26fa869a574c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=82=A8=E7=9A=84=E5=90=8D=E5=AD=97?= <您的邮箱>
Date: Tue, 14 Oct 2025 12:35:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96UI=E4=BA=A4=E4=BA=92?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C=E5=92=8C=E8=A7=86=E8=A7=89=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复按钮点击效果过于明显的问题
- 统一使用自定义背景替代系统selectableItemBackgroundBorderless
- 移除Control.Action样式中的文字阴影效果
- 优化直播页面选择按钮颜色为主题黄色
- 调整许可协议页面按钮区域上间距为8dp
- 修复跨类和换源按钮的文字重叠问题
- 提升整体UI视觉一致性和用户体验
---
 app/src/leanback/res/color/group.xml                    | 2 +-
 app/src/leanback/res/drawable/shape_group.xml           | 2 +-
 app/src/leanback/res/drawable/shape_item_normal.xml     | 2 +-
 app/src/leanback/res/drawable/shape_text_activated.xml  | 2 +-
 app/src/leanback/res/layout/adapter_quick.xml           | 2 +-
 app/src/leanback/res/values/styles.xml                  | 1 +
 app/src/main/res/layout/activity_privacy_agreement.xml  | 5 ++++-
 app/src/mobile/res/color/group.xml                      | 2 +-
 app/src/mobile/res/drawable/shape_action_background.xml | 9 +++++++++
 app/src/mobile/res/drawable/shape_channel.xml           | 2 +-
 app/src/mobile/res/drawable/shape_group.xml             | 2 +-
 app/src/mobile/res/drawable/shape_item.xml              | 2 +-
 app/src/mobile/res/layout/activity_history.xml          | 6 +++---
 app/src/mobile/res/layout/activity_keep.xml             | 6 +++---
 app/src/mobile/res/layout/activity_setting_player.xml   | 2 +-
 app/src/mobile/res/layout/fragment_vod.xml              | 8 ++++----
 app/src/mobile/res/values/styles.xml                    | 7 ++-----
 17 files changed, 36 insertions(+), 26 deletions(-)
 create mode 100644 app/src/mobile/res/drawable/shape_action_background.xml

diff --git a/app/src/leanback/res/color/group.xml b/app/src/leanback/res/color/group.xml
index 6be396f5..ea73a72e 100644
--- a/app/src/leanback/res/color/group.xml
+++ b/app/src/leanback/res/color/group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/white" android:state_focused="true" android:state_selected="true" />
-    <item android:color="@color/green_400" android:state_selected="true" />
+    <item android:color="@color/primary" android:state_selected="true" />
     <item android:color="@color/white" />
 </selector>
\ No newline at end of file
diff --git a/app/src/leanback/res/drawable/shape_group.xml b/app/src/leanback/res/drawable/shape_group.xml
index e786aab0..d43b5401 100644
--- a/app/src/leanback/res/drawable/shape_group.xml
+++ b/app/src/leanback/res/drawable/shape_group.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/green_400" />
+    <solid android:color="@color/primary" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/leanback/res/drawable/shape_item_normal.xml b/app/src/leanback/res/drawable/shape_item_normal.xml
index edef8746..2dc0f703 100644
--- a/app/src/leanback/res/drawable/shape_item_normal.xml
+++ b/app/src/leanback/res/drawable/shape_item_normal.xml
@@ -4,7 +4,7 @@
 
     <solid android:color="@color/black_20" />
 
-    <corners android:radius="4dp" />
+    <corners android:radius="12dp" />
 
     <padding
         android:bottom="8dp"
diff --git a/app/src/leanback/res/drawable/shape_text_activated.xml b/app/src/leanback/res/drawable/shape_text_activated.xml
index af4eaf32..87018ce6 100644
--- a/app/src/leanback/res/drawable/shape_text_activated.xml
+++ b/app/src/leanback/res/drawable/shape_text_activated.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/black_60" />
+    <solid android:color="@color/primary" />
 
     <corners android:radius="4dp" />
 
diff --git a/app/src/leanback/res/layout/adapter_quick.xml b/app/src/leanback/res/layout/adapter_quick.xml
index 78885a4d..56795b1c 100644
--- a/app/src/leanback/res/layout/adapter_quick.xml
+++ b/app/src/leanback/res/layout/adapter_quick.xml
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
         android:singleLine="true"
-        android:textColor="@color/green_a_400"
+        android:textColor="@color/primary"
         android:textSize="14sp"
         tools:text="泥巴"
         tools:visibility="visible" />
diff --git a/app/src/leanback/res/values/styles.xml b/app/src/leanback/res/values/styles.xml
index 5b991e4c..ec15bde0 100644
--- a/app/src/leanback/res/values/styles.xml
+++ b/app/src/leanback/res/values/styles.xml
@@ -10,6 +10,7 @@
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primaryDark</item>
         <item name="colorAccent">@color/accent</item>
+        <item name="colorControlHighlight">@color/primary</item>
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowBackground">@null</item>
         <item name="android:windowDisablePreview">true</item>
diff --git a/app/src/main/res/layout/activity_privacy_agreement.xml b/app/src/main/res/layout/activity_privacy_agreement.xml
index e1bebc07..469af5f1 100644
--- a/app/src/main/res/layout/activity_privacy_agreement.xml
+++ b/app/src/main/res/layout/activity_privacy_agreement.xml
@@ -63,7 +63,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:padding="24dp">
+        android:paddingTop="8dp"
+        android:paddingBottom="24dp"
+        android:paddingStart="24dp"
+        android:paddingEnd="24dp">
 
         <Button
             android:id="@+id/disagreeButton"
diff --git a/app/src/mobile/res/color/group.xml b/app/src/mobile/res/color/group.xml
index 6be396f5..ea73a72e 100644
--- a/app/src/mobile/res/color/group.xml
+++ b/app/src/mobile/res/color/group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/white" android:state_focused="true" android:state_selected="true" />
-    <item android:color="@color/green_400" android:state_selected="true" />
+    <item android:color="@color/primary" android:state_selected="true" />
     <item android:color="@color/white" />
 </selector>
\ No newline at end of file
diff --git a/app/src/mobile/res/drawable/shape_action_background.xml b/app/src/mobile/res/drawable/shape_action_background.xml
new file mode 100644
index 00000000..37bd823e
--- /dev/null
+++ b/app/src/mobile/res/drawable/shape_action_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/mobile/res/drawable/shape_channel.xml b/app/src/mobile/res/drawable/shape_channel.xml
index 04ec9b5a..1cee01c6 100644
--- a/app/src/mobile/res/drawable/shape_channel.xml
+++ b/app/src/mobile/res/drawable/shape_channel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="#802196F3">
+    android:color="#80FFEB3B">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <solid android:color="#f5f5f5" />
diff --git a/app/src/mobile/res/drawable/shape_group.xml b/app/src/mobile/res/drawable/shape_group.xml
index 0bbb932a..1cee01c6 100644
--- a/app/src/mobile/res/drawable/shape_group.xml
+++ b/app/src/mobile/res/drawable/shape_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="#8066BB6A">
+    android:color="#80FFEB3B">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <solid android:color="#f5f5f5" />
diff --git a/app/src/mobile/res/drawable/shape_item.xml b/app/src/mobile/res/drawable/shape_item.xml
index 8bf974bd..0c9e4e64 100644
--- a/app/src/mobile/res/drawable/shape_item.xml
+++ b/app/src/mobile/res/drawable/shape_item.xml
@@ -4,7 +4,7 @@
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
             <solid android:color="@color/black_20" />
-            <corners android:radius="8dp" />
+            <corners android:radius="12dp" />
             <padding
                 android:bottom="14dp"
                 android:left="16dp"
diff --git a/app/src/mobile/res/layout/activity_history.xml b/app/src/mobile/res/layout/activity_history.xml
index 821072fc..574f7a87 100644
--- a/app/src/mobile/res/layout/activity_history.xml
+++ b/app/src/mobile/res/layout/activity_history.xml
@@ -18,7 +18,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginEnd="16dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:background="@drawable/shape_action_background"
             android:src="@drawable/ic_back" />
 
         <TextView
@@ -35,7 +35,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginStart="16dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:background="@drawable/shape_action_background"
             android:src="@drawable/ic_action_sync" />
 
         <ImageView
@@ -43,7 +43,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginStart="16dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:background="@drawable/shape_action_background"
             android:src="@drawable/ic_action_delete"
             android:visibility="gone"
             tools:visibility="visible" />
diff --git a/app/src/mobile/res/layout/activity_keep.xml b/app/src/mobile/res/layout/activity_keep.xml
index a8fedb88..816d0832 100644
--- a/app/src/mobile/res/layout/activity_keep.xml
+++ b/app/src/mobile/res/layout/activity_keep.xml
@@ -18,7 +18,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginEnd="16dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:background="@drawable/shape_action_background"
             android:src="@drawable/ic_back" />
 
         <TextView
@@ -35,7 +35,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginStart="16dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:background="@drawable/shape_action_background"
             android:src="@drawable/ic_action_sync" />
 
         <ImageView
@@ -43,7 +43,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginStart="16dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:background="@drawable/shape_action_background"
             android:src="@drawable/ic_action_delete"
             android:visibility="gone"
             tools:visibility="visible" />
diff --git a/app/src/mobile/res/layout/activity_setting_player.xml b/app/src/mobile/res/layout/activity_setting_player.xml
index 3688e081..38b04657 100644
--- a/app/src/mobile/res/layout/activity_setting_player.xml
+++ b/app/src/mobile/res/layout/activity_setting_player.xml
@@ -19,7 +19,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginEnd="16dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:background="@drawable/shape_action_background"
             android:src="@drawable/ic_back" />
 
         <TextView
diff --git a/app/src/mobile/res/layout/fragment_vod.xml b/app/src/mobile/res/layout/fragment_vod.xml
index 4394802a..79a59a10 100644
--- a/app/src/mobile/res/layout/fragment_vod.xml
+++ b/app/src/mobile/res/layout/fragment_vod.xml
@@ -28,7 +28,7 @@
                 android:id="@+id/logo"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:background="?attr/selectableItemBackgroundBorderless"
+                android:background="@drawable/shape_action_background"
                 android:src="@drawable/ic_logo" />
 
             <LinearLayout
@@ -66,14 +66,14 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_marginEnd="12dp"
-                android:background="?attr/selectableItemBackgroundBorderless"
+                android:background="@drawable/shape_action_background"
                 android:src="@drawable/ic_action_keep" />
 
             <ImageView
                 android:id="@+id/history"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:background="?attr/selectableItemBackgroundBorderless"
+                android:background="@drawable/shape_action_background"
                 android:src="@drawable/ic_action_history" />
 
         </LinearLayout>
@@ -144,7 +144,7 @@
         android:layout_width="56dp"
         android:layout_height="56dp"
         android:layout_gravity="center"
-        android:background="?attr/selectableItemBackgroundBorderless"
+        android:background="@drawable/shape_action_background"
         android:src="@drawable/ic_action_retry"
         android:visibility="gone" />
 
diff --git a/app/src/mobile/res/values/styles.xml b/app/src/mobile/res/values/styles.xml
index 539a0d13..d47daaf0 100644
--- a/app/src/mobile/res/values/styles.xml
+++ b/app/src/mobile/res/values/styles.xml
@@ -17,6 +17,7 @@
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primaryDark</item>
         <item name="colorAccent">@color/accent</item>
+        <item name="colorControlHighlight">@color/primary</item>
         <item name="android:windowBackground">@null</item>
         <item name="android:windowDisablePreview">true</item>
         <item name="android:navigationBarColor">@color/transparent</item>
@@ -30,12 +31,8 @@
     <style name="Control.Action">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
+        <item name="android:background">@drawable/shape_action_background</item>
         <item name="android:padding">8dp</item>
-        <item name="android:shadowColor">@color/grey_200</item>
-        <item name="android:shadowDx">1</item>
-        <item name="android:shadowDy">1</item>
-        <item name="android:shadowRadius">0.5</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:textSize">14sp</item>
     </style>