From 7db44221b5e9573ce64336e498226263bd2bb4a3 Mon Sep 17 00:00:00 2001
From: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com>
Date: Fri, 7 Nov 2025 14:03:53 +0800
Subject: [PATCH] fix(ui): Simplify debug menu

---
 .../destinations/DebugMenuPreferences.kt      | 54 ++++++-------------
 1 file changed, 16 insertions(+), 38 deletions(-)

diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt
index 51b14ead2b..c37b8e6c7c 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt
@@ -9,7 +9,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.datastore.preferences.core.Preferences
 import app.lawnchair.preferences.PreferenceManager
 import app.lawnchair.preferences.getAdapter
@@ -20,16 +19,13 @@ import app.lawnchair.ui.preferences.LocalIsExpandedScreen
 import app.lawnchair.ui.preferences.LocalNavController
 import app.lawnchair.ui.preferences.components.controls.ClickablePreference
 import app.lawnchair.ui.preferences.components.controls.MainSwitchPreference
-import app.lawnchair.ui.preferences.components.controls.PreferenceCategory
 import app.lawnchair.ui.preferences.components.controls.SwitchPreference
 import app.lawnchair.ui.preferences.components.controls.TextPreference
 import app.lawnchair.ui.preferences.components.layout.PreferenceGroup
 import app.lawnchair.ui.preferences.components.layout.PreferenceLayout
-import app.lawnchair.ui.preferences.components.search.SearchPopupPreference
 import app.lawnchair.ui.preferences.data.liveinfo.liveInformationManager
 import app.lawnchair.ui.preferences.data.liveinfo.model.LiveInformation
 import app.lawnchair.ui.preferences.navigation.FeatureFlags
-import com.android.launcher3.R
 import com.android.launcher3.settings.SettingsActivity
 import com.android.launcher3.settings.SettingsActivity.DEVELOPER_OPTIONS_KEY
 import com.android.launcher3.settings.SettingsActivity.EXTRA_FRAGMENT_HIGHLIGHT_KEY
@@ -63,7 +59,7 @@ fun DebugMenuPreferences(
         MainSwitchPreference(adapter = enableDebug, label = "Show debug menu") {
             PreferenceGroup {
                 ClickablePreference(
-                    label = "Feature flags (View)",
+                    label = "Feature flags (Views)",
                     onClick = {
                         try {
                             Intent(context, SettingsActivity::class.java)
@@ -101,17 +97,6 @@ fun DebugMenuPreferences(
                         }
                     },
                 )
-                SwitchPreference(
-                    label = "Hide version info in About screen",
-                    adapter = prefs.hideVersionInfo.getAdapter(),
-                )
-                SearchPopupPreference(
-                    title = "Set custom pseudonym version",
-                    initialValue = prefs.pseudonymVersion.get(),
-                    placeholder = stringResource(R.string.custom),
-                    onConfirm = prefs.pseudonymVersion.getAdapter()::onChange,
-                    isErrorCheck = { it.isEmpty() },
-                )
             }
 
             PreferenceGroup(heading = "Debug flags") {
@@ -133,29 +118,22 @@ fun DebugMenuPreferences(
                         label = it.key.name,
                     )
                 }
+                TextPreference(
+                    label = "Custom version info",
+                    adapter = prefs.pseudonymVersion.getAdapter(),
+                )
             }
 
-            PreferenceGroup(heading = "Launcher3 Feature Diagnostic") {
-                var apmSupport = false
-                if (LocalContext.current.checkCallingOrSelfPermission(Manifest.permission.PACKAGE_USAGE_STATS)
-                    == PackageManager.PERMISSION_GRANTED
-                ) {
-                    apmSupport = true
-                }
-                PreferenceCategory(
-                    label = "Blur effect",
-                    description = BlurUtils.supportsBlursOnWindows().toString(),
-                    iconResource = R.drawable.ic_search,
-                    onNavigate = { null },
-                    isSelected = false,
-                )
-                PreferenceCategory(
-                    label = "App Prediction",
-                    description = apmSupport.toString(),
-                    iconResource = R.drawable.ic_search,
-                    onNavigate = { null },
-                    isSelected = false,
-                )
+            PreferenceGroup(heading = "Supported features") {
+                val apmSupport = context.checkCallingOrSelfPermission(Manifest.permission.PACKAGE_USAGE_STATS) == PackageManager.PERMISSION_GRANTED
+                ClickablePreference(
+                    label = "Window blurs",
+                    subtitle = BlurUtils.supportsBlursOnWindows().toString(),
+                ) { }
+                ClickablePreference(
+                    label = "App prediction",
+                    subtitle = apmSupport.toString(),
+                ) {}
             }
         }
     }
@@ -168,4 +146,4 @@ private val PreferenceManager2.textFlags: List<Preference<String, String, Prefer
     get() = listOf(additionalFonts, launcherPopupOrder)
 
 private val PreferenceManager.debugFlags
-    get() = listOf(ignoreFeedWhitelist)
+    get() = listOf(ignoreFeedWhitelist, hideVersionInfo)