From 9d44a339d012265abb249fa9dfd72e91c51ddfd8 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Mon, 24 Apr 2023 10:41:19 +0800
Subject: [PATCH] [mobile] update dialog ui - part 5

---
 app/src/mobile/res/color/text_accent.xml      |  5 +++
 .../res/color/text_outline.xml}               |  0
 .../res/drawable/shape_accent_activated.xml   | 34 ++++++++++--------
 .../res/drawable/shape_accent_normal.xml      | 35 ++++++++++++-------
 app/src/mobile/res/drawable/shape_item.xml    |  2 +-
 app/src/mobile/res/drawable/shape_text.xml    |  2 +-
 .../mobile/res/drawable/shape_text_round.xml  |  2 +-
 app/src/mobile/res/drawable/shape_vod.xml     |  2 +-
 app/src/mobile/res/layout/adapter_live.xml    |  2 +-
 app/src/mobile/res/layout/adapter_site.xml    |  2 +-
 app/src/mobile/res/layout/adapter_value.xml   |  2 +-
 app/src/mobile/res/layout/dialog_control.xml  | 26 +++++++-------
 12 files changed, 67 insertions(+), 47 deletions(-)
 create mode 100644 app/src/mobile/res/color/text_accent.xml
 rename app/src/{main/res/color/dialog.xml => mobile/res/color/text_outline.xml} (100%)

diff --git a/app/src/mobile/res/color/text_accent.xml b/app/src/mobile/res/color/text_accent.xml
new file mode 100644
index 000000000..38e8d3613
--- /dev/null
+++ b/app/src/mobile/res/color/text_accent.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/white" android:state_activated="true" />
+    <item android:color="?android:attr/textColorPrimary" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/dialog.xml b/app/src/mobile/res/color/text_outline.xml
similarity index 100%
rename from app/src/main/res/color/dialog.xml
rename to app/src/mobile/res/color/text_outline.xml
diff --git a/app/src/mobile/res/drawable/shape_accent_activated.xml b/app/src/mobile/res/drawable/shape_accent_activated.xml
index 3f803f540..6d068dd37 100644
--- a/app/src/mobile/res/drawable/shape_accent_activated.xml
+++ b/app/src/mobile/res/drawable/shape_accent_activated.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/accent" />
-
-    <corners android:radius="4dp" />
-
-    <padding
-        android:bottom="6dp"
-        android:left="12dp"
-        android:right="12dp"
-        android:top="6dp" />
-
-</shape>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="#000000" />
+            <corners android:radius="4dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/accent" />
+            <corners android:radius="4dp" />
+            <padding
+                android:bottom="6dp"
+                android:left="12dp"
+                android:right="12dp"
+                android:top="6dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/mobile/res/drawable/shape_accent_normal.xml b/app/src/mobile/res/drawable/shape_accent_normal.xml
index 8079f0563..8d3bf637a 100644
--- a/app/src/mobile/res/drawable/shape_accent_normal.xml
+++ b/app/src/mobile/res/drawable/shape_accent_normal.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="#000000" />
+            <corners android:radius="4dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <stroke
+                android:width="0.5dp"
+                android:color="?android:attr/textColorPrimary" />
+            <corners android:radius="4dp" />
+            <padding
+                android:bottom="6dp"
+                android:left="12dp"
+                android:right="12dp"
+                android:top="6dp" />
+        </shape>
+    </item>
+</ripple>
 
-    <solid android:color="@color/black_50" />
-
-    <corners android:radius="4dp" />
-
-    <padding
-        android:bottom="6dp"
-        android:left="12dp"
-        android:right="12dp"
-        android:top="6dp" />
-
-</shape>
\ No newline at end of file
diff --git a/app/src/mobile/res/drawable/shape_item.xml b/app/src/mobile/res/drawable/shape_item.xml
index 6bd391c11..2bc99bb97 100644
--- a/app/src/mobile/res/drawable/shape_item.xml
+++ b/app/src/mobile/res/drawable/shape_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_light">
+    android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
             <solid android:color="@color/black_20" />
diff --git a/app/src/mobile/res/drawable/shape_text.xml b/app/src/mobile/res/drawable/shape_text.xml
index 99a703d07..ebfa517ee 100644
--- a/app/src/mobile/res/drawable/shape_text.xml
+++ b/app/src/mobile/res/drawable/shape_text.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_light">
+    android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
             <solid android:color="@color/black_50" />
diff --git a/app/src/mobile/res/drawable/shape_text_round.xml b/app/src/mobile/res/drawable/shape_text_round.xml
index fdc253393..f5b20eb16 100644
--- a/app/src/mobile/res/drawable/shape_text_round.xml
+++ b/app/src/mobile/res/drawable/shape_text_round.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_light">
+    android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
             <solid android:color="@color/black_50" />
diff --git a/app/src/mobile/res/drawable/shape_vod.xml b/app/src/mobile/res/drawable/shape_vod.xml
index c5ef015b9..f68aef83a 100644
--- a/app/src/mobile/res/drawable/shape_vod.xml
+++ b/app/src/mobile/res/drawable/shape_vod.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_light">
+    android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <solid android:color="@android:color/white" />
diff --git a/app/src/mobile/res/layout/adapter_live.xml b/app/src/mobile/res/layout/adapter_live.xml
index 453609cec..1fcbd2b49 100644
--- a/app/src/mobile/res/layout/adapter_live.xml
+++ b/app/src/mobile/res/layout/adapter_live.xml
@@ -8,5 +8,5 @@
     android:ellipsize="marquee"
     android:gravity="center"
     android:singleLine="true"
-    android:textColor="@color/dialog"
+    android:textColor="@color/text_outline"
     tools:text="https://fongmi.github.io/live.json" />
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/adapter_site.xml b/app/src/mobile/res/layout/adapter_site.xml
index a12785709..20fed37d7 100644
--- a/app/src/mobile/res/layout/adapter_site.xml
+++ b/app/src/mobile/res/layout/adapter_site.xml
@@ -14,7 +14,7 @@
         android:layout_weight="1"
         android:ellipsize="marquee"
         android:gravity="center"
-        android:textColor="@color/dialog"
+        android:textColor="@color/text_outline"
         tools:text="泥巴" />
 
     <ImageView
diff --git a/app/src/mobile/res/layout/adapter_value.xml b/app/src/mobile/res/layout/adapter_value.xml
index 9303212e0..7d303bf8a 100644
--- a/app/src/mobile/res/layout/adapter_value.xml
+++ b/app/src/mobile/res/layout/adapter_value.xml
@@ -7,6 +7,6 @@
     android:layout_marginStart="4dp"
     android:layout_marginEnd="4dp"
     android:background="@drawable/selector_accent"
-    android:textColor="@color/white"
+    android:textColor="@color/text_accent"
     android:textSize="14sp"
     tools:text="全部" />
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/dialog_control.xml b/app/src/mobile/res/layout/dialog_control.xml
index 5ca4fa947..8c8cad38a 100644
--- a/app/src/mobile/res/layout/dialog_control.xml
+++ b/app/src/mobile/res/layout/dialog_control.xml
@@ -73,7 +73,7 @@
             android:foreground="?android:attr/selectableItemBackground"
             android:gravity="center"
             android:tag="0"
-            android:textColor="@color/white"
+            android:textColor="@color/text_accent"
             android:textSize="14sp"
             tools:text="預設" />
 
@@ -86,7 +86,7 @@
             android:foreground="?android:attr/selectableItemBackground"
             android:gravity="center"
             android:tag="1"
-            android:textColor="@color/white"
+            android:textColor="@color/text_accent"
             android:textSize="14sp"
             tools:text="16:9" />
 
@@ -99,7 +99,7 @@
             android:foreground="?android:attr/selectableItemBackground"
             android:gravity="center"
             android:tag="2"
-            android:textColor="@color/white"
+            android:textColor="@color/text_accent"
             android:textSize="14sp"
             tools:text="4:3" />
 
@@ -112,7 +112,7 @@
             android:foreground="?android:attr/selectableItemBackground"
             android:gravity="center"
             android:tag="3"
-            android:textColor="@color/white"
+            android:textColor="@color/text_accent"
             android:textSize="14sp"
             tools:text="填充" />
 
@@ -124,7 +124,7 @@
             android:foreground="?android:attr/selectableItemBackground"
             android:gravity="center"
             android:tag="4"
-            android:textColor="@color/white"
+            android:textColor="@color/text_accent"
             android:textSize="14sp"
             tools:text="裁剪" />
 
@@ -152,7 +152,7 @@
             android:background="@drawable/selector_accent"
             android:foreground="?android:attr/selectableItemBackground"
             android:gravity="center"
-            android:textColor="@color/white"
+            android:textColor="@color/text_accent"
             android:textSize="14sp"
             tools:text="EXO" />
 
@@ -164,7 +164,7 @@
             android:background="@drawable/selector_accent"
             android:foreground="?android:attr/selectableItemBackground"
             android:gravity="center"
-            android:textColor="@color/white"
+            android:textColor="@color/text_accent"
             android:textSize="14sp"
             tools:text="硬解" />
 
@@ -177,7 +177,7 @@
             android:foreground="?android:attr/selectableItemBackground"
             android:gravity="center"
             android:text="@string/play_loop"
-            android:textColor="@color/white"
+            android:textColor="@color/text_accent"
             android:textSize="14sp" />
 
         <TextView
@@ -188,7 +188,7 @@
             android:background="@drawable/selector_accent"
             android:foreground="?android:attr/selectableItemBackground"
             android:gravity="center"
-            android:textColor="@color/white"
+            android:textColor="@color/text_accent"
             android:textSize="14sp"
             tools:text="片頭" />
 
@@ -200,7 +200,7 @@
             android:background="@drawable/selector_accent"
             android:foreground="?android:attr/selectableItemBackground"
             android:gravity="center"
-            android:textColor="@color/white"
+            android:textColor="@color/text_accent"
             android:textSize="14sp"
             tools:text="片尾" />
 
@@ -233,7 +233,7 @@
             android:gravity="center"
             android:tag="3"
             android:text="@string/play_track_text"
-            android:textColor="@color/white"
+            android:textColor="@color/text_accent"
             android:textSize="14sp"
             android:visibility="gone"
             tools:visibility="visible" />
@@ -248,7 +248,7 @@
             android:gravity="center"
             android:tag="1"
             android:text="@string/play_track_audio"
-            android:textColor="@color/white"
+            android:textColor="@color/text_accent"
             android:textSize="14sp"
             android:visibility="gone"
             tools:visibility="visible" />
@@ -262,7 +262,7 @@
             android:gravity="center"
             android:tag="2"
             android:text="@string/play_track_video"
-            android:textColor="@color/white"
+            android:textColor="@color/text_accent"
             android:textSize="14sp"
             android:visibility="gone"
             tools:visibility="visible" />