fix: refactor node detail navigation (#2009)

resolves #2004
This commit is contained in:
James Rich 2025-06-03 15:19:50 -05:00 committed by GitHub
parent 3115bbe58d
commit ff5cc55a60
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 65 additions and 57 deletions

View file

@ -37,7 +37,6 @@ import com.geeksville.mesh.ui.debug.DebugScreen
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.ShareScreen
import kotlinx.serialization.Serializable
@ -52,9 +51,6 @@ const val DEEP_LINK_BASE_URI = "meshtastic://meshtastic"
@Serializable
sealed interface Graph : Route {
@Serializable
data class NodeDetailGraph(val destNum: Int) : Graph
@Serializable
data class RadioConfigGraph(val destNum: Int? = null) : Graph
}
@ -64,9 +60,6 @@ sealed interface Route {
@Serializable
data object Contacts : Route
@Serializable
data object Nodes : Route
@Serializable
data object Map : Route
@ -223,13 +216,6 @@ fun NavGraph(
onNavigate = { navController.navigate(Route.Messages(it)) }
)
}
composable<Route.Nodes> {
NodeScreen(
model = uIViewModel,
navigateToMessages = { navController.navigate(Route.Messages(it)) },
navigateToNodeDetails = { navController.navigate(Route.NodeDetail(it)) },
)
}
composable<Route.Map> {
MapView(uIViewModel)
}
@ -262,7 +248,7 @@ fun NavGraph(
composable<Route.QuickChat> {
QuickChatScreen()
}
nodeDetailGraph(
nodesGraph(
navController,
uIViewModel,
)