[优化] MD3视觉效果

YenalyLiew · YenalyLiew · commit 5d9d4b47c85f · 2024-09-06T00:46:28.000+08:00
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/activity/LoginActivity.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/activity/LoginActivity.kt
@@ -39,7 +39,7 @@ class LoginActivity : FrameActivity() {
 
     private lateinit var binding: ActivityLoginBinding
 
-    private val dialog by unsafeLazy { LoginDialog(R.layout.dialog_login) }
+    private val dialog = unsafeLazy { LoginDialog(R.layout.dialog_login) }
 
     override fun setUiStyle() {
         enableEdgeToEdge(
@@ -80,6 +80,9 @@ class LoginActivity : FrameActivity() {
 
     override fun onDestroy() {
         super.onDestroy()
+        if (dialog.isInitialized()) {
+            dialog.value.dismiss()
+        }
         binding.wvLogin.removeAllViews()
         binding.wvLogin.destroy()
         binding.unbind()
@@ -144,7 +147,7 @@ class LoginActivity : FrameActivity() {
                     // #issue-160: 修复字段销毁后调用引发的错误
                     if (!isDestroyed && !isFinishing) {
                         binding.srlLogin.finishRefresh()
-                        dialog.show()
+                        dialog.value.show()
                     }
                 }
             }
@@ -212,5 +215,9 @@ class LoginActivity : FrameActivity() {
         fun show() {
             dialog.show()
         }
+
+        fun dismiss() {
+            dialog.dismiss()
+        }
     }
 }
diff --git a/app/src/main/res/xml/settings_h_keyframe.xml b/app/src/main/res/xml/settings_h_keyframe.xml
@@ -2,7 +2,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <SwitchPreferenceCompat
+    <com.yenaly.yenaly_libs.base.preference.MaterialSwitchPreference
         app:defaultValue="true"
         app:iconSpaceReserved="false"
         app:key="h_keyframes_enable"
@@ -27,14 +27,14 @@
         app:key="shared_h_keyframes_category"
         app:title="@string/shared">
 
-        <SwitchPreferenceCompat
+        <com.yenaly.yenaly_libs.base.preference.MaterialSwitchPreference
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="shared_h_keyframes_enable"
             app:summary="@string/shared_h_keyframes_enable_tip"
             app:title="@string/shared_h_keyframes_enable" />
 
-        <SwitchPreferenceCompat
+        <com.yenaly.yenaly_libs.base.preference.MaterialSwitchPreference
             app:defaultValue="false"
             app:iconSpaceReserved="false"
             app:key="shared_h_keyframes_use_first"
@@ -54,7 +54,7 @@
         app:key="h_keyframe_custom_category"
         app:title="@string/custom">
 
-        <SwitchPreferenceCompat
+        <com.yenaly.yenaly_libs.base.preference.MaterialSwitchPreference
             app:defaultValue="false"
             app:iconSpaceReserved="false"
             app:key="show_comment_when_countdown"
diff --git a/app/src/main/res/xml/settings_home.xml b/app/src/main/res/xml/settings_home.xml
@@ -55,7 +55,7 @@
             app:key="update"
             app:title="@string/check_update" />
 
-        <SwitchPreferenceCompat
+        <com.yenaly.yenaly_libs.base.preference.MaterialSwitchPreference
             app:defaultValue="false"
             app:key="use_ci_update_channel"
             app:summary="@string/use_ci_update_channel_summary"
diff --git a/app/src/main/res/xml/settings_network.xml b/app/src/main/res/xml/settings_network.xml
@@ -11,7 +11,7 @@
         app:key="proxy"
         app:title="@string/proxy" />
 
-    <SwitchPreferenceCompat
+    <com.yenaly.yenaly_libs.base.preference.MaterialSwitchPreference
         app:iconSpaceReserved="false"
         app:key="use_built_in_hosts"
         app:summary="@string/use_built_in_hosts_summary"
diff --git a/app/src/main/res/xml/settings_player.xml b/app/src/main/res/xml/settings_player.xml
@@ -8,7 +8,7 @@
         app:title="@string/switch_player_kernel"
         app:useSimpleSummaryProvider="true" />
 
-    <SwitchPreferenceCompat
+    <com.yenaly.yenaly_libs.base.preference.MaterialSwitchPreference
         app:defaultValue="true"
         app:iconSpaceReserved="false"
         app:key="show_bottom_progress"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -28,8 +28,8 @@ lifecycleLiveDataKtx = "2.8.4"
 roomRuntime = "2.6.1"
 roomKtx = "2.6.1"
 roomCompiler = "2.6.1"
-navigationFragmentKtx = "2.7.7"
-navigationUiKtx = "2.7.7"
+navigationFragmentKtx = "2.8.0"
+navigationUiKtx = "2.8.0"
 preferenceKtx = "1.2.1"
 workRuntime = "2.9.1"
 workRuntimeKtx = "2.9.1"
diff --git a/yenaly_libs/src/main/java/com/yenaly/yenaly_libs/base/preference/MaterialSwitchPreference.kt b/yenaly_libs/src/main/java/com/yenaly/yenaly_libs/base/preference/MaterialSwitchPreference.kt
@@ -0,0 +1,14 @@
+package com.yenaly.yenaly_libs.base.preference
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.preference.SwitchPreferenceCompat
+import com.yenaly.yenaly_libs.R
+
+open class MaterialSwitchPreference @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null,
+): SwitchPreferenceCompat(context, attrs) {
+    init {
+        widgetLayoutResource = R.layout.yenaly_preference_switch_widget
+    }
+}
diff --git a/yenaly_libs/src/main/java/com/yenaly/yenaly_libs/base/settings/YenalySettingsFragment.kt b/yenaly_libs/src/main/java/com/yenaly/yenaly_libs/base/settings/YenalySettingsFragment.kt
@@ -1,5 +1,6 @@
 package com.yenaly.yenaly_libs.base.settings
 
+import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.util.Log
 import androidx.annotation.XmlRes
@@ -28,6 +29,10 @@ abstract class YenalySettingsFragment(@XmlRes private val xmlRes: Int) :
         bindDataObservers()
     }
 
+    override fun setDivider(divider: Drawable?) {
+        super.setDivider(null)
+    }
+
     /**
      * 用于绑定数据观察器 (optional)
      */
diff --git a/yenaly_libs/src/main/res/layout/yenaly_preference_switch_widget.xml b/yenaly_libs/src/main/res/layout/yenaly_preference_switch_widget.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switchWidget"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@null"
+    android:clickable="false"
+    android:focusable="false" />

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class LoginActivity : FrameActivity() {`
`39`	`39`
`40`	`40`	`private lateinit var binding: ActivityLoginBinding`
`41`	`41`
`42`		`- private val dialog by unsafeLazy { LoginDialog(R.layout.dialog_login) }`
	`42`	`+ private val dialog = unsafeLazy { LoginDialog(R.layout.dialog_login) }`
`43`	`43`
`44`	`44`	`override fun setUiStyle() {`
`45`	`45`	`enableEdgeToEdge(`
`@@ -80,6 +80,9 @@ class LoginActivity : FrameActivity() {`
`80`	`80`
`81`	`81`	`override fun onDestroy() {`
`82`	`82`	`super.onDestroy()`
	`83`	`+ if (dialog.isInitialized()) {`
	`84`	`+ dialog.value.dismiss()`
	`85`	`+ }`
`83`	`86`	`binding.wvLogin.removeAllViews()`
`84`	`87`	`binding.wvLogin.destroy()`
`85`	`88`	`binding.unbind()`
`@@ -144,7 +147,7 @@ class LoginActivity : FrameActivity() {`
`144`	`147`	`// #issue-160: 修复字段销毁后调用引发的错误`
`145`	`148`	`if (!isDestroyed && !isFinishing) {`
`146`	`149`	`binding.srlLogin.finishRefresh()`
`147`		`- dialog.show()`
	`150`	`+ dialog.value.show()`
`148`	`151`	`}`
`149`	`152`	`}`
`150`	`153`	`}`
`@@ -212,5 +215,9 @@ class LoginActivity : FrameActivity() {`
`212`	`215`	`fun show() {`
`213`	`216`	`dialog.show()`
`214`	`217`	`}`
	`218`	`+`
	`219`	`+ fun dismiss() {`
	`220`	`+ dialog.dismiss()`
	`221`	`+ }`
`215`	`222`	`}`
`216`	`223`	`}`