refactor: channel qr clean (#1983)

app/src/main/java/com/geeksville/mesh/navigation/ChannelsGraph.kt

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.geeksville.mesh.navigation
+
+import androidx.compose.runtime.remember
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.composable
+import androidx.navigation.navigation
+import com.geeksville.mesh.model.UIViewModel
+import com.geeksville.mesh.ui.sharing.ChannelScreen
+import com.geeksville.mesh.ui.radioconfig.components.ChannelConfigScreen
+import com.geeksville.mesh.ui.radioconfig.components.LoRaConfigScreen
+
+/**
+ * Navigation graph for for the top level ChannelScreen - [Route.Channels].
+ */
+fun NavGraphBuilder.channelsGraph(navController: NavHostController, uiViewModel: UIViewModel) {
+    navigation<Graph.ChannelsGraph>(
+        startDestination = Route.Channels,
+    ) {
+        composable<Route.Channels> { backStackEntry ->
+            val parentEntry = remember(backStackEntry) {
+                navController.getBackStackEntry<Graph.ChannelsGraph>()
+            }
+            ChannelScreen(
+                viewModel = uiViewModel,
+                radioConfigViewModel = hiltViewModel(parentEntry),
+                onNavigate = { route -> navController.navigate(route) }
+            )
+        }
+        configRoutes(navController)
+    }
+}
+
+private fun NavGraphBuilder.configRoutes(
+    navController: NavHostController,
+) {
+    ConfigRoute.entries.forEach { configRoute ->
+        composable(configRoute.route::class) { backStackEntry ->
+            val parentEntry = remember(backStackEntry) {
+                navController.getBackStackEntry<Graph.ChannelsGraph>()
+            }
+            when (configRoute) {
+                ConfigRoute.CHANNELS -> ChannelConfigScreen(hiltViewModel(parentEntry))
+                ConfigRoute.LORA -> LoRaConfigScreen(hiltViewModel(parentEntry))
+                else -> Unit
+            }
+        }
+    }
+}

app/src/main/java/com/geeksville/mesh/navigation/NavGraph.kt

@@ -39,7 +39,6 @@ import com.geeksville.mesh.ui.map.MapView
 import com.geeksville.mesh.ui.message.MessageScreen
 import com.geeksville.mesh.ui.message.QuickChatScreen
 import com.geeksville.mesh.ui.node.NodeScreen
-import com.geeksville.mesh.ui.sharing.ChannelScreen
 import com.geeksville.mesh.ui.sharing.ShareScreen
 import kotlinx.serialization.Serializable
 
@@ -54,6 +53,9 @@ const val DEEP_LINK_BASE_URI = "meshtastic://meshtastic"
 
 @Serializable
 sealed interface Graph : Route {
+    @Serializable
+    data class ChannelsGraph(val destNum: Int?)
+
     @Serializable
     data class NodeDetailGraph(val destNum: Int) : Graph
 
@@ -241,9 +243,9 @@ fun NavGraph(
         composable<Route.Map> {
             MapView(uIViewModel)
         }
-        composable<Route.Channels> {
-            ChannelScreen(uIViewModel)
-        }
+
+        channelsGraph(navController, uIViewModel)
+
         composable<Route.Connections>(
             deepLinks = listOf(
                 navDeepLink {

app/src/main/java/com/geeksville/mesh/navigation/RadioConfigGraph.kt

@@ -77,6 +77,11 @@ import com.geeksville.mesh.ui.radioconfig.components.StoreForwardConfigScreen
 import com.geeksville.mesh.ui.radioconfig.components.TelemetryConfigScreen
 import com.geeksville.mesh.ui.radioconfig.components.UserConfigScreen
 
+fun getNavRouteFrom(routeName: String): Route? {
+    return ConfigRoute.entries.find { it.name == routeName }?.route
+        ?: ModuleRoute.entries.find { it.name == routeName }?.route
+}
+
 fun NavGraphBuilder.radioConfigGraph(navController: NavHostController, uiViewModel: UIViewModel) {
     navigation<Graph.RadioConfigGraph>(
         startDestination = Route.RadioConfig(),