From 17f33d091c4ccc52841bd4287cf70e64cd1c2cb2 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sat, 18 Feb 2023 12:41:32 +0800
Subject: [PATCH] Clean style

---
 .../leanback/res/layout/activity_detail.xml   |  4 +--
 app/src/leanback/res/layout/activity_live.xml |  4 +--
 app/src/leanback/res/layout/adapter_vod.xml   |  4 +--
 app/src/leanback/res/values/styles.xml        | 15 -----------
 app/src/main/res/values/styles.xml            | 25 +++++++++++++++++++
 app/src/mobile/res/layout/adapter_vod.xml     |  4 +--
 6 files changed, 33 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/res/values/styles.xml

diff --git a/app/src/leanback/res/layout/activity_detail.xml b/app/src/leanback/res/layout/activity_detail.xml
index 874540560..a25028496 100644
--- a/app/src/leanback/res/layout/activity_detail.xml
+++ b/app/src/leanback/res/layout/activity_detail.xml
@@ -21,7 +21,7 @@
 
         <com.google.android.exoplayer2.ui.StyledPlayerView
             android:id="@+id/surface"
-            style="@style/ExoStyle"
+            style="@style/Player.Vod"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone"
@@ -29,7 +29,7 @@
 
         <com.google.android.exoplayer2.ui.StyledPlayerView
             android:id="@+id/texture"
-            style="@style/ExoStyle"
+            style="@style/Player.Vod"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone"
diff --git a/app/src/leanback/res/layout/activity_live.xml b/app/src/leanback/res/layout/activity_live.xml
index c985a27b9..aaaacc7ed 100644
--- a/app/src/leanback/res/layout/activity_live.xml
+++ b/app/src/leanback/res/layout/activity_live.xml
@@ -16,7 +16,7 @@
 
         <com.google.android.exoplayer2.ui.StyledPlayerView
             android:id="@+id/surface"
-            style="@style/ExoStyle"
+            style="@style/Player.Live"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone"
@@ -24,7 +24,7 @@
 
         <com.google.android.exoplayer2.ui.StyledPlayerView
             android:id="@+id/texture"
-            style="@style/ExoStyle"
+            style="@style/Player.Live"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone"
diff --git a/app/src/leanback/res/layout/adapter_vod.xml b/app/src/leanback/res/layout/adapter_vod.xml
index 15ce09cb2..bc951914c 100644
--- a/app/src/leanback/res/layout/adapter_vod.xml
+++ b/app/src/leanback/res/layout/adapter_vod.xml
@@ -13,7 +13,7 @@
         android:layout_height="match_parent"
         android:background="@color/black_20"
         android:scaleType="center"
-        app:shapeAppearanceOverlay="@style/VodStyle"
+        app:shapeAppearanceOverlay="@style/Vod"
         tools:src="@drawable/ic_img_loading" />
 
     <com.google.android.material.imageview.ShapeableImageView
@@ -24,7 +24,7 @@
         android:scaleType="center"
         android:src="@drawable/ic_delete_vod"
         android:visibility="gone"
-        app:shapeAppearanceOverlay="@style/VodStyle"
+        app:shapeAppearanceOverlay="@style/Vod"
         tools:visibility="visible" />
 
     <TextView
diff --git a/app/src/leanback/res/values/styles.xml b/app/src/leanback/res/values/styles.xml
index a1e58e64b..72c9f7e22 100644
--- a/app/src/leanback/res/values/styles.xml
+++ b/app/src/leanback/res/values/styles.xml
@@ -13,19 +13,4 @@
         <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
-    <style name="VodStyle">
-        <item name="cornerSize">8dp</item>
-        <item name="cornerFamily">rounded</item>
-    </style>
-
-    <style name="ExoStyle">
-        <item name="auto_show">false</item>
-        <item name="resize_mode">fit</item>
-        <item name="use_artwork">true</item>
-        <item name="use_controller">false</item>
-        <item name="animation_enabled">false</item>
-        <item name="default_artwork">@drawable/radio</item>
-        <item name="keep_content_on_player_reset">true</item>
-    </style>
-
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 000000000..7069776a4
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,25 @@
+<resources>
+
+    <style name="Vod">
+        <item name="cornerSize">8dp</item>
+        <item name="cornerFamily">rounded</item>
+    </style>
+
+    <style name="Player">
+        <item name="auto_show">false</item>
+        <item name="resize_mode">fit</item>
+        <item name="use_artwork">true</item>
+        <item name="use_controller">false</item>
+        <item name="animation_enabled">false</item>
+        <item name="default_artwork">@drawable/radio</item>
+    </style>
+
+    <style name="Player.Vod">
+        <item name="keep_content_on_player_reset">false</item>
+    </style>
+
+    <style name="Player.Live">
+        <item name="keep_content_on_player_reset">true</item>
+    </style>
+
+</resources>
diff --git a/app/src/mobile/res/layout/adapter_vod.xml b/app/src/mobile/res/layout/adapter_vod.xml
index 3607a94df..c3f4aecb8 100644
--- a/app/src/mobile/res/layout/adapter_vod.xml
+++ b/app/src/mobile/res/layout/adapter_vod.xml
@@ -13,7 +13,7 @@
         android:layout_height="match_parent"
         android:background="@color/black_20"
         android:scaleType="center"
-        app:shapeAppearanceOverlay="@style/VodStyle"
+        app:shapeAppearanceOverlay="@style/Vod"
         tools:src="@drawable/ic_img_loading" />
 
     <com.google.android.material.imageview.ShapeableImageView
@@ -24,7 +24,7 @@
         android:scaleType="center"
         android:src="@drawable/ic_delete_vod"
         android:visibility="gone"
-        app:shapeAppearanceOverlay="@style/VodStyle"
+        app:shapeAppearanceOverlay="@style/Vod"
         tools:visibility="visible" />
 
     <TextView