refactor: Improve Code Conformance

purofle · purofle · commit a82e5b4f2cb2 · 2023-10-31T09:13:30.000+08:00
diff --git a/app/src/main/java/io/nekohasekai/sagernet/ktx/Utils.kt b/app/src/main/java/io/nekohasekai/sagernet/ktx/Utils.kt
@@ -262,9 +262,7 @@ fun Context.getColorAttr(@AttrRes resId: Int): Int {
     }.resourceId)
 }
 
-var isExpert: Boolean
-    get() = BuildConfig.DEBUG || DataStore.isExpert
-    set(value) = TODO()
+val isExpert: Boolean by lazy { BuildConfig.DEBUG || DataStore.isExpert }
 
 val isExpertFlavor = ((BuildConfig.FLAVOR == "expert") || BuildConfig.DEBUG)
 const val isOss = BuildConfig.FLAVOR == "oss"
diff --git a/app/src/main/res/menu/yacd_menu.xml b/app/src/main/res/menu/yacd_menu.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/reyas-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_set_url"
-        android:title="@string/set_panel_url"
-        app:showAsAction="false" />
+        android:title="@string/set_panel_url" />
     <item
         android:id="@+id/close"
-        android:title="@string/mal_close"
-        app:showAsAction="false" />
+        android:title="@string/mal_close" />
 </menu>

Original file line number	Diff line number	Diff line change
`@@ -262,9 +262,7 @@ fun Context.getColorAttr(@AttrRes resId: Int): Int {`
`262`	`262`	`}.resourceId)`
`263`	`263`	`}`
`264`	`264`
`265`		`-var isExpert: Boolean`
`266`		`- get() = BuildConfig.DEBUG \|\| DataStore.isExpert`
`267`		`- set(value) = TODO()`
	`265`	`+val isExpert: Boolean by lazy { BuildConfig.DEBUG \|\| DataStore.isExpert }`
`268`	`266`
`269`	`267`	`val isExpertFlavor = ((BuildConfig.FLAVOR == "expert") \|\| BuildConfig.DEBUG)`
`270`	`268`	`const val isOss = BuildConfig.FLAVOR == "oss"`