优化选中效果UI

Potato-66 · Mar 25, 2024 · 96c7717 · 96c7717
1 parent 1244c73
commit 96c7717
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 29 deletions.
diff --git a/app/src/main/java/com/ww/simpletv/dialog/BaseDialogFragment.kt b/app/src/main/java/com/ww/simpletv/dialog/BaseDialogFragment.kt
@@ -50,7 +50,7 @@ abstract class BaseDialogFragment<T : ViewDataBinding> : DialogFragment() {
                 window.attributes = params
             }
             it.setOnKeyListener { _, _, keyEvent ->
-                if (keyEvent.keyCode == KeyEvent.KEYCODE_BACK) {
+                if (keyEvent.keyCode == KeyEvent.KEYCODE_BACK && tag != Constant.DIALOG_TAG_UPDATE) {
                     dismiss()
                     true
                 } else {

diff --git a/app/src/main/res/drawable/btn_selector.xml b/app/src/main/res/drawable/btn_selector.xml
@@ -1,23 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/item_color" />
-            <corners android:radius="10dp" />
-            <padding android:left="10dp" android:right="10dp" />
-        </shape>
-    </item>
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/item_color" />
-            <corners android:radius="10dp" />
-            <padding android:left="10dp" android:right="10dp" />
-        </shape>
-    </item>
+    <item android:drawable="@drawable/focus_bg" android:state_pressed="true" />
+    <item android:drawable="@drawable/focus_bg" android:state_focused="true" />
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@color/switch_on_color" />
-            <corners android:radius="10dp" />
+            <corners android:radius="5dp" />
+            <padding android:left="10dp" android:right="10dp" />
         </shape>
     </item>
 </selector>
diff --git a/app/src/main/res/drawable/focus_bg.xml b/app/src/main/res/drawable/focus_bg.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+    <item
+        android:bottom="1dp"
+        android:end="1dp"
+        android:start="1dp"
+        android:top="1dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/item_color" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/item_focus_selector.xml b/app/src/main/res/drawable/item_focus_selector.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/item_color" android:state_focused="true" />
-    <item android:drawable="@color/item_color" android:state_selected="true" />
-    <item android:drawable="@color/item_color" android:state_pressed="true" />
+    <item android:drawable="@drawable/focus_bg" android:state_focused="true" />
+    <item android:drawable="@drawable/focus_bg" android:state_selected="true" />
+    <item android:drawable="@drawable/focus_bg" android:state_pressed="true" />
     <item android:drawable="@color/bg_color" />
 </selector>
diff --git a/app/src/main/res/drawable/switch_selector.xml b/app/src/main/res/drawable/switch_selector.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true">
-        <shape android:shape="rectangle">
-            <corners android:radius="10dp" />
-            <solid android:color="@color/item_color" />
-        </shape>
-    </item>
+    <item android:drawable="@drawable/focus_bg" android:state_focused="true" />
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="10dp" />
+            <corners android:radius="5dp" />
             <solid android:color="@android:color/transparent" />
         </shape>
     </item>

diff --git a/app/src/main/res/layout/dialog_setting.xml b/app/src/main/res/layout/dialog_setting.xml
@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/switch_selector"
                 android:checked="@{autoBoot}"
-                android:nextFocusUp="@id/btn_manual_update"
+                android:nextFocusUp="@id/btn_update_version"
                 android:nextFocusDown="@id/btn_manual_update"
                 android:padding="10dp"
                 android:text="@string/boot_startup"
@@ -50,7 +50,7 @@
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="10dp"
                 android:nextFocusUp="@id/sw_auto_boot"
-                android:nextFocusDown="@id/sw_auto_boot"
+                android:nextFocusDown="@id/btn_update_version"
                 android:text="@string/manual_update" />
 
             <Button
@@ -60,7 +60,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="10dp"
-                android:nextFocusUp="@id/sw_auto_boot"
+                android:nextFocusUp="@id/btn_manual_update"
                 android:nextFocusDown="@id/sw_auto_boot"
                 android:text="@string/update_version" />