Complete the debug screen migration to Compose

app/build.gradle.kts

@@ -271,9 +271,14 @@ dependencies {
     implementation(libs.androidx.compose.ui.text) // Needed for parsing HTML to AnnotatedString
     implementation(libs.androidx.compose.material.icons.extended)
 
+    // Jetpack navigatio3
+    implementation(libs.androidx.navigation3.ui)
+    implementation(libs.androidx.navigation3.runtime)
+    implementation(libs.androidx.navigation3.viewmodel)
+
     // Jetpack Compose related dependencies
     implementation(libs.androidx.paging.compose)
-    implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.hilt.navigation.compose)
 
     // Coroutines interop
     implementation(libs.kotlinx.coroutines.rx3)

app/src/debug/java/org/schabi/newpipe/settings/DebugSettingsBVDLeakCanary.kt

@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: 2025-2026 NewPipe e.V. <https://newpipe-ev.de>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package org.schabi.newpipe.settings
+
+import android.content.Intent
+import leakcanary.LeakCanary.newLeakDisplayActivityIntent
+
+/**
+ * Build variant dependent (BVD) leak canary API implementation for the debug settings fragment.
+ * This class is loaded via reflection by
+ * [DebugSettingsBVDLeakCanaryAPI].
+ */
+@Suppress("unused") // Class is used but loaded via reflection
+class DebugSettingsBVDLeakCanary :
+
+    DebugSettingsBVDLeakCanaryAPI {
+    override fun getNewLeakDisplayActivityIntent(): Intent {
+        return newLeakDisplayActivityIntent()
+    }
+}

app/src/main/java/org/schabi/newpipe/navigation/Screen.kt

@@ -0,0 +1,54 @@
+/*
+ * SPDX-FileCopyrightText: 2017-2026 NewPipe contributors <https://newpipe.net>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package org.schabi.newpipe.navigation
+
+import androidx.navigation3.runtime.NavKey
+import kotlinx.serialization.Serializable
+
+@Serializable
+sealed interface Screen : NavKey {
+
+    sealed interface Settings : Screen {
+        @Serializable
+        data object Home : Settings
+
+        @Serializable
+        data object Player : Settings
+
+        @Serializable
+        data object Behaviour : Settings
+
+        @Serializable
+        data object Download : Settings
+
+        @Serializable
+        data object LookFeel : Settings
+
+        @Serializable
+        data object HistoryCache : Settings
+
+        @Serializable
+        data object Content : Settings
+
+        @Serializable
+        data object Feed : Settings
+
+        @Serializable
+        data object Services : Settings
+
+        @Serializable
+        data object Language : Settings
+
+        @Serializable
+        data object BackupRestore : Settings
+
+        @Serializable
+        data object Updates : Settings
+
+        @Serializable
+        data object Debug : Settings
+    }
+}

app/src/main/java/org/schabi/newpipe/settings/DebugSettingsBVDLeakCanaryAPI.kt

@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: 2025-2026 NewPipe e.V. <https://newpipe-ev.de>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package org.schabi.newpipe.settings
+
+import android.content.Intent
+
+/**
+ * Build variant dependent (BVD) leak canary API.
+ * Why is LeakCanary not used directly? Because it can't be assured to be available.
+ */
+interface DebugSettingsBVDLeakCanaryAPI {
+    fun getNewLeakDisplayActivityIntent(): Intent
+
+    companion object {
+        const val IMPL_CLASS = "org.schabi.newpipe.settings.DebugSettingsBVDLeakCanary"
+    }
+}

app/src/main/java/org/schabi/newpipe/settings/DebugSettingsFragment.java

@@ -1,6 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2017-2025 NewPipe contributors <https://newpipe.net>
+ * SPDX-FileCopyrightText: 2025-2026 NewPipe e.V. <https://newpipe-ev.de>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package org.schabi.newpipe.settings;
 
-import android.content.Intent;
 import android.os.Bundle;
 
 import androidx.preference.Preference;
@@ -88,15 +93,4 @@ private Optional<DebugSettingsBVDLeakCanaryAPI> getBVDLeakCanary() {
             return Optional.empty();
         }
     }
-
-    /**
-     * Build variant dependent (BVD) leak canary API for this fragment.
-     * Why is LeakCanary not used directly? Because it can't be assured
-     */
-    public interface DebugSettingsBVDLeakCanaryAPI {
-        String IMPL_CLASS =
-                "org.schabi.newpipe.settings.DebugSettingsBVDLeakCanary";
-
-        Intent getNewLeakDisplayActivityIntent();
-    }
 }

app/src/main/java/org/schabi/newpipe/settings/SettingsV2Activity.kt

@@ -1,85 +1,30 @@
+/*
+ * SPDX-FileCopyrightText: 2017-2025 NewPipe contributors <https://newpipe.net>
+ * SPDX-FileCopyrightText: 2025-2026 NewPipe e.V. <https://newpipe-ev.de>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package org.schabi.newpipe.settings
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.activity.viewModels
-import androidx.annotation.StringRes
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Scaffold
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
-import androidx.navigation.navArgument
 import dagger.hilt.android.AndroidEntryPoint
-import org.schabi.newpipe.R
-import org.schabi.newpipe.settings.viewmodel.SettingsViewModel
-import org.schabi.newpipe.ui.Toolbar
+import org.schabi.newpipe.ui.screens.settings.navigation.SettingsNavigation
 import org.schabi.newpipe.ui.theme.AppTheme
 
-const val SCREEN_TITLE_KEY = "SCREEN_TITLE_KEY"
-
 @AndroidEntryPoint
 class SettingsV2Activity : ComponentActivity() {
 
-    private val settingsViewModel: SettingsViewModel by viewModels()
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setContent {
-            val navController = rememberNavController()
-            var screenTitle by remember { mutableIntStateOf(SettingsScreenKey.ROOT.screenTitle) }
-            navController.addOnDestinationChangedListener { _, _, arguments ->
-                screenTitle =
-                    arguments?.getInt(SCREEN_TITLE_KEY) ?: SettingsScreenKey.ROOT.screenTitle
-            }
-
             AppTheme {
-                Scaffold(topBar = {
-                    Toolbar(
-                        title = stringResource(id = screenTitle),
-                        hasSearch = true,
-                        onSearchQueryChange = null // TODO: Add suggestions logic
-                    )
-                }) { padding ->
-                    NavHost(
-                        navController = navController,
-                        startDestination = SettingsScreenKey.ROOT.name,
-                        modifier = Modifier.padding(padding)
-                    ) {
-                        composable(
-                            SettingsScreenKey.ROOT.name,
-                            listOf(createScreenTitleArg(SettingsScreenKey.ROOT.screenTitle))
-                        ) {
-                            SettingsScreen(onSelectSettingOption = { screen ->
-                                navController.navigate(screen.name)
-                            })
-                        }
-                        composable(
-                            SettingsScreenKey.DEBUG.name,
-                            listOf(createScreenTitleArg(SettingsScreenKey.DEBUG.screenTitle))
-                        ) {
-                            DebugScreen(settingsViewModel)
-                        }
-                    }
-                }
+                SettingsNavigation(
+                    onExitSettings = { finish() }
+                )
             }
         }
     }
 }
-
-fun createScreenTitleArg(@StringRes screenTitle: Int) = navArgument(SCREEN_TITLE_KEY) {
-    defaultValue = screenTitle
-}
-
-enum class SettingsScreenKey(@StringRes val screenTitle: Int) {
-    ROOT(R.string.settings),
-    DEBUG(R.string.settings_category_debug_title)
-}