From 02d21531958306e7916c8c266331ac614e726702 Mon Sep 17 00:00:00 2001
From: Brosssh <44944126+Brosssh@users.noreply.github.com>
Date: Wed, 7 May 2025 18:37:30 +0200
Subject: [PATCH] feat(Compose): Move developer options to top level (#2528)

---
 app/src/main/java/app/revanced/manager/MainActivity.kt     | 7 ++++---
 .../java/app/revanced/manager/ui/screen/SettingsScreen.kt  | 5 +++++
 .../manager/ui/screen/settings/AboutSettingsScreen.kt      | 5 -----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/app/revanced/manager/MainActivity.kt b/app/src/main/java/app/revanced/manager/MainActivity.kt
index 60399f10..0f0ac772 100644
--- a/app/src/main/java/app/revanced/manager/MainActivity.kt
+++ b/app/src/main/java/app/revanced/manager/MainActivity.kt
@@ -277,6 +277,10 @@ private fun ReVancedManager(vm: MainViewModel) {
                 AdvancedSettingsScreen(onBackClick = navController::popBackStack)
             }
 
+            composable<Settings.DeveloperOptions> {
+                DeveloperOptionsScreen(onBackClick = navController::popBackStack)
+            }
+
             composable<Settings.Updates> {
                 UpdatesSettingsScreen(
                     onBackClick = navController::popBackStack,
@@ -312,9 +316,6 @@ private fun ReVancedManager(vm: MainViewModel) {
                 LicensesScreen(onBackClick = navController::popBackStack)
             }
 
-            composable<Settings.DeveloperOptions> {
-                DeveloperOptionsScreen(onBackClick = navController::popBackStack)
-            }
         }
     }
 }
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
index 46a25b10..acab88d9 100644
--- a/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
@@ -41,6 +41,11 @@ private val settingsSections = listOf(
         R.string.advanced_description,
         Icons.Outlined.Tune
     ) to Settings.Advanced,
+    Triple(
+        R.string.developer_options,
+        R.string.developer_options_description,
+        Icons.Outlined.Code
+    ) to Settings.DeveloperOptions,
     Triple(
         R.string.about,
         R.string.app_name,
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt
index 695db368..63a9e9c3 100644
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt
@@ -126,11 +126,6 @@ fun AboutSettingsScreen(
                 navigate(Settings.Contributors)
             }
         ),
-        Triple(
-            stringResource(R.string.developer_options),
-            stringResource(R.string.developer_options_description),
-            third = { navigate(Settings.DeveloperOptions) }
-        ),
         Triple(
             stringResource(R.string.opensource_licenses),
             stringResource(R.string.opensource_licenses_description),