From 7ecf0dacd711b3a3a5c5e143f3d6c4093e643af6 Mon Sep 17 00:00:00 2001
From: sifacaii <sifacai@outlook.com>
Date: Tue, 23 Aug 2022 18:05:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                   |  5 +++++
 .idea/vcs.xml                                    |  6 ++++++
 app/src/main/res/drawable/shape_user_focus.xml   |  2 +-
 .../res/drawable/shape_user_focus_vholder.xml    | 16 ++++++++++++++++
 app/src/main/res/layout/activity_detail.xml      | 15 ++++++++-------
 app/src/main/res/layout/item_h.xml               |  2 +-
 app/src/main/res/layout/item_v.xml               |  2 +-
 7 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 .idea/vcs.xml
 create mode 100644 app/src/main/res/drawable/shape_user_focus_vholder.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index ecc0d65..7d6449f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,10 +3,15 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/work/VlcJellyfin/app/src/main/res/drawable/shape_user_focus.xml" value="0.1625" />
+        <entry key="..\:/work/VlcJellyfin/app/src/main/res/drawable/shape_user_focus_VH.xml" value="0.1625" />
+        <entry key="..\:/work/VlcJellyfin/app/src/main/res/drawable/shape_user_focus_vholder.xml" value="0.1625" />
         <entry key="..\:/work/VlcJellyfin/app/src/main/res/layout/activity_collection.xml" value="0.14895833333333333" />
         <entry key="..\:/work/VlcJellyfin/app/src/main/res/layout/activity_detail.xml" value="0.14895833333333333" />
         <entry key="..\:/work/VlcJellyfin/app/src/main/res/layout/activity_main.xml" value="0.2957427536231884" />
         <entry key="..\:/work/VlcJellyfin/app/src/main/res/layout/activity_vlc_player.xml" value="0.14895833333333333" />
+        <entry key="..\:/work/VlcJellyfin/app/src/main/res/layout/item_h.xml" value="0.14895833333333333" />
+        <entry key="..\:/work/VlcJellyfin/app/src/main/res/layout/item_v.xml" value="0.14895833333333333" />
         <entry key="..\:/work/VlcJellyfin/app/src/main/res/layout/loading.xml" value="0.2957427536231884" />
         <entry key="..\:/work/VlcJellyfin/app/src/main/res/layout/loading_alert.xml" value="0.14895833333333333" />
       </map>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_user_focus.xml b/app/src/main/res/drawable/shape_user_focus.xml
index 130db54..bddc660 100644
--- a/app/src/main/res/drawable/shape_user_focus.xml
+++ b/app/src/main/res/drawable/shape_user_focus.xml
@@ -10,7 +10,7 @@
     <item android:state_focused="false">
         <shape>
             <corners android:radius="1dp" />
-            <solid android:color="@color/color_6C3D3D3D"/>
+            <solid android:color="#00000000"/>
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_user_focus_vholder.xml b/app/src/main/res/drawable/shape_user_focus_vholder.xml
new file mode 100644
index 0000000..db9c3a7
--- /dev/null
+++ b/app/src/main/res/drawable/shape_user_focus_vholder.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <shape>
+            <corners android:radius="1dp" />
+            <stroke android:width="2dp" android:color="@color/color_FFFFFF" />
+            <solid android:color="@color/color_6C3D3D3D" />
+        </shape>
+    </item>
+    <item android:state_focused="false">
+        <shape>
+            <corners android:radius="1dp" />
+            <solid android:color="@color/color_6C3D3D3D"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml
index deaff41..8e83b2a 100644
--- a/app/src/main/res/layout/activity_detail.xml
+++ b/app/src/main/res/layout/activity_detail.xml
@@ -45,7 +45,7 @@
                     android:id="@+id/tvGenres"
                     android:layout_width="match_parent"
                     android:layout_height="28dp"
-                    android:layout_marginTop="6dp"
+                    android:layout_marginTop="2dp"
                     android:text="风格："
                     android:textColor="@android:color/white"
                     android:textSize="20dp" />
@@ -85,27 +85,27 @@
                 <TextView
                     android:id="@+id/tvOverview"
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
+                    android:layout_height="110dp"
                     android:layout_marginTop="6dp"
                     android:ellipsize="end"
-                    android:maxLines="8"
+                    android:maxLines="4"
                     android:text="简介："
                     android:textColor="@android:color/white"
                     android:textSize="20dp" />
 
                 <ImageView
                     android:id="@+id/tvPlay"
-                    android:layout_width="match_parent"
+                    android:layout_width="160dp"
                     android:layout_height="60dp"
                     android:padding="20dp"
                     android:layout_marginTop="120dp"
+                    android:layout_gravity="center_horizontal"
                     android:focusable="true"
                     android:scaleType="centerInside"
                     android:src="@drawable/ic_outline_play_arrow_48"
-                    android:background="@drawable/shape_user_focus"
+                    android:background="@drawable/shape_user_focus_vholder"
                     android:visibility="gone"/>
 
-
                 <org.sifacai.vlcjellyfin.JRecyclerView
                     android:id="@+id/mGridView"
                     android:layout_width="match_parent"
@@ -115,11 +115,12 @@
                     android:padding="@dimen/padding_border"
                     android:layout_marginTop="20dp"
                     android:visibility="gone"
+                    android:focusable="false"
+                    android:focusableInTouchMode="false"
                     app:tv_horizontalSpacingWithMargins="@dimen/vh_space_width"
                     app:tv_selectedItemIsCentered="true"
                     app:tv_verticalSpacingWithMargins="@dimen/vh_space_width" />
 
-
             </LinearLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/item_h.xml b/app/src/main/res/layout/item_h.xml
index ea96a85..191a744 100644
--- a/app/src/main/res/layout/item_h.xml
+++ b/app/src/main/res/layout/item_h.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/shape_user_focus"
+    android:background="@drawable/shape_user_focus_vholder"
     android:focusable="true"
     android:padding="@dimen/vh_padding_border">
 
diff --git a/app/src/main/res/layout/item_v.xml b/app/src/main/res/layout/item_v.xml
index fd8ba50..0d99af1 100644
--- a/app/src/main/res/layout/item_v.xml
+++ b/app/src/main/res/layout/item_v.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/shape_user_focus"
+    android:background="@drawable/shape_user_focus_vholder"
     android:focusable="true"
     android:padding="@dimen/vh_padding_border">