refactor: decouple NavGraph from ViewModel and NodeEntity

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

@@ -73,7 +73,6 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.geeksville.mesh.R
 import com.geeksville.mesh.android.Logging
-import com.geeksville.mesh.database.entity.NodeEntity
 import com.geeksville.mesh.model.MetricsViewModel
 import com.geeksville.mesh.model.RadioConfigViewModel
 import com.geeksville.mesh.ui.components.DeviceMetricsScreen
@@ -163,8 +162,6 @@ class NavGraphFragment : ScreenFragment("NavGraph"), Logging {
                         }
                     ) { innerPadding ->
                         NavGraph(
-                            node = node,
-                            viewModel = model,
                             navController = navController,
                             startDestination = startDestination,
                             modifier = Modifier.padding(innerPadding),
@@ -290,8 +287,6 @@ private fun MeshAppBar(
 @Suppress("LongMethod")
 @Composable
 fun NavGraph(
-    node: NodeEntity?,
-    viewModel: RadioConfigViewModel = hiltViewModel(),
     navController: NavHostController = rememberNavController(),
     startDestination: Any,
     modifier: Modifier = Modifier,
@@ -302,9 +297,7 @@ fun NavGraph(
         modifier = modifier,
     ) {
         composable<Route.NodeDetail> {
-            NodeDetailScreen(
-                node = node,
-            ) { navController.navigate(route = it) }
+            NodeDetailScreen { navController.navigate(route = it) }
         }
         composable<Route.DeviceMetrics> {
             val parentEntry = remember { navController.getBackStackEntry<Route.NodeDetail>() }
@@ -331,79 +324,99 @@ fun NavGraph(
             TracerouteLogScreen(hiltViewModel<MetricsViewModel>(parentEntry))
         }
         composable<Route.RadioConfig> {
-            RadioConfigScreen(
-                node = node,
-                viewModel = viewModel,
-            ) { navController.navigate(route = it) }
+            RadioConfigScreen { navController.navigate(route = it) }
         }
         composable<Route.User> {
-            UserConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            UserConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Channels> {
-            ChannelConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            ChannelConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Device> {
-            DeviceConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            DeviceConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Position> {
-            PositionConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            PositionConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Power> {
-            PowerConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            PowerConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Network> {
-            NetworkConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            NetworkConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Display> {
-            DisplayConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            DisplayConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.LoRa> {
-            LoRaConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            LoRaConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Bluetooth> {
-            BluetoothConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            BluetoothConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Security> {
-            SecurityConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            SecurityConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.MQTT> {
-            MQTTConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            MQTTConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Serial> {
-            SerialConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            SerialConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.ExtNotification> {
-            ExternalNotificationConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            ExternalNotificationConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.StoreForward> {
-            StoreForwardConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            StoreForwardConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.RangeTest> {
-            RangeTestConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            RangeTestConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Telemetry> {
-            TelemetryConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            TelemetryConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.CannedMessage> {
-            CannedMessageConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            CannedMessageConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Audio> {
-            AudioConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            AudioConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.RemoteHardware> {
-            RemoteHardwareConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            RemoteHardwareConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.NeighborInfo> {
-            NeighborInfoConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            NeighborInfoConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.AmbientLighting> {
-            AmbientLightingConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            AmbientLightingConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.DetectionSensor> {
-            DetectionSensorConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            DetectionSensorConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Paxcounter> {
-            PaxcounterConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            PaxcounterConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
     }
 }

app/src/main/java/com/geeksville/mesh/ui/NodeDetail.kt

@@ -98,14 +98,14 @@ import kotlin.math.ln
 
 @Composable
 fun NodeDetailScreen(
-    node: NodeEntity?,
     viewModel: MetricsViewModel = hiltViewModel(),
     modifier: Modifier = Modifier,
     onNavigate: (Any) -> Unit,
 ) {
     val state by viewModel.state.collectAsStateWithLifecycle()
 
-    if (node != null) {
+    if (state.node != null) {
+        val node = state.node ?: return
         NodeDetailList(
             node = node,
             metricsState = state,

app/src/main/java/com/geeksville/mesh/ui/RadioConfigScreen.kt

@@ -34,8 +34,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentSize
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.AlertDialog
 import androidx.compose.material.Button
@@ -65,7 +65,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.geeksville.mesh.ClientOnlyProtos.DeviceProfile
 import com.geeksville.mesh.R
-import com.geeksville.mesh.database.entity.NodeEntity
 import com.geeksville.mesh.model.RadioConfigViewModel
 import com.geeksville.mesh.ui.components.PreferenceCategory
 import com.geeksville.mesh.ui.components.config.EditDeviceProfileDialog
@@ -79,12 +78,10 @@ private fun getNavRouteFrom(routeName: String): Any? {
 @Suppress("LongMethod", "CyclomaticComplexMethod")
 @Composable
 fun RadioConfigScreen(
-    node: NodeEntity?,
     viewModel: RadioConfigViewModel = hiltViewModel(),
     modifier: Modifier = Modifier,
     onNavigate: (Any) -> Unit = {}
 ) {
-    val isLocal = node?.num == viewModel.myNodeNum
     val state by viewModel.radioConfigState.collectAsStateWithLifecycle()
     var isWaiting by remember { mutableStateOf(false) }
 
@@ -140,7 +137,7 @@ fun RadioConfigScreen(
                     val intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
                         addCategory(Intent.CATEGORY_OPENABLE)
                         type = "application/*"
-                        putExtra(Intent.EXTRA_TITLE, "${node!!.num.toUInt()}.cfg")
+                        putExtra(Intent.EXTRA_TITLE, "device_profile.cfg")
                     }
                     exportConfigLauncher.launch(intent)
                 }
@@ -154,7 +151,7 @@ fun RadioConfigScreen(
 
     RadioConfigItemList(
         enabled = state.connected && !isWaiting,
-        isLocal = isLocal,
+        isLocal = state.isLocal,
         modifier = modifier,
         onRouteClick = { route ->
             isWaiting = true