fix(discovery): map routing and missing parameters

- Add the Map icon to the DiscoveryHistoryDetailScreen so users can view the map of past sessions
- Use @InjectedParam for sessionId in DiscoverySummaryViewModel, DiscoveryHistoryDetailViewModel, and DiscoveryMapViewModel to fix empty screens when using Navigation 3
- Populate userLatitude and userLongitude in the DiscoveryScanEngine so the Map functionality has a valid center anchor.

Author: jamesarich

feature/discovery/src/commonMain/kotlin/org/meshtastic/feature/discovery/DiscoveryHistoryDetailViewModel.kt

@@ -19,16 +19,18 @@ package org.meshtastic.feature.discovery
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.flow.StateFlow
+import org.koin.core.annotation.InjectedParam
 import org.koin.core.annotation.KoinViewModel
 import org.meshtastic.core.database.dao.DiscoveryDao
 import org.meshtastic.core.database.entity.DiscoveryPresetResultEntity
 import org.meshtastic.core.database.entity.DiscoverySessionEntity
 import org.meshtastic.core.ui.viewmodel.stateInWhileSubscribed
 
 @KoinViewModel
-class DiscoveryHistoryDetailViewModel(discoveryDao: DiscoveryDao, savedStateHandle: SavedStateHandle) : ViewModel() {
-
-    private val sessionId: Long = savedStateHandle.get<Long>("sessionId") ?: 0L
+class DiscoveryHistoryDetailViewModel(
+    @InjectedParam private val sessionId: Long,
+    discoveryDao: DiscoveryDao,
+) : ViewModel() {
 
     val session: StateFlow<DiscoverySessionEntity?> =
         discoveryDao.getSessionFlow(sessionId).stateInWhileSubscribed(initialValue = null)

feature/discovery/src/commonMain/kotlin/org/meshtastic/feature/discovery/DiscoveryMapViewModel.kt

@@ -21,6 +21,7 @@ import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import org.koin.core.annotation.InjectedParam
 import org.koin.core.annotation.KoinViewModel
 import org.meshtastic.core.database.dao.DiscoveryDao
 import org.meshtastic.core.database.entity.DiscoveredNodeEntity
@@ -29,9 +30,10 @@ import org.meshtastic.core.ui.viewmodel.safeLaunch
 import org.meshtastic.core.ui.viewmodel.stateInWhileSubscribed
 
 @KoinViewModel
-class DiscoveryMapViewModel(private val discoveryDao: DiscoveryDao, savedStateHandle: SavedStateHandle) : ViewModel() {
-
-    private val sessionId: Long = savedStateHandle.get<Long>("sessionId") ?: 0L
+class DiscoveryMapViewModel(
+    @InjectedParam private val sessionId: Long,
+    private val discoveryDao: DiscoveryDao,
+) : ViewModel() {
 
     val session: StateFlow<DiscoverySessionEntity?> =
         discoveryDao.getSessionFlow(sessionId).stateInWhileSubscribed(initialValue = null)

feature/discovery/src/commonMain/kotlin/org/meshtastic/feature/discovery/DiscoveryScanEngine.kt

@@ -152,13 +152,20 @@ class DiscoveryScanEngine(
                     ChannelOption.entries.firstOrNull { it.modemPreset == modemPreset }
                 } ?: ChannelOption.DEFAULT
 
+            val myNodeNum = nodeRepository.myNodeInfo.value?.myNodeNum
+            val myPosition = myNodeNum?.let { nodeRepository.nodeDBbyNum.value[it]?.position }
+            val latDouble = (myPosition?.latitude_i ?: 0).toDouble() / POSITION_DIVISOR
+            val lonDouble = (myPosition?.longitude_i ?: 0).toDouble() / POSITION_DIVISOR
+
             // Create the DB session
             val session =
                 DiscoverySessionEntity(
                     timestamp = nowMillis,
                     presetsScanned = presets.joinToString(",") { it.name },
                     homePreset = homePreset?.name ?: ChannelOption.DEFAULT.name,
                     completionStatus = "in_progress",
+                    userLatitude = latDouble,
+                    userLongitude = lonDouble,
                 )
             sessionId = discoveryDao.insertSession(session)
             _currentSession.value = session.copy(id = sessionId)

feature/discovery/src/commonMain/kotlin/org/meshtastic/feature/discovery/DiscoverySummaryViewModel.kt

@@ -21,6 +21,7 @@ import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import org.koin.core.annotation.InjectedParam
 import org.koin.core.annotation.KoinViewModel
 import org.meshtastic.core.database.dao.DiscoveryDao
 import org.meshtastic.core.database.entity.DiscoveredNodeEntity
@@ -35,15 +36,13 @@ import org.meshtastic.feature.discovery.export.ExportResult
 
 @KoinViewModel
 class DiscoverySummaryViewModel(
+    @InjectedParam private val sessionId: Long,
     private val discoveryDao: DiscoveryDao,
     private val summaryGenerator: DiscoverySummaryGenerator,
     private val aiProvider: DiscoverySummaryAiProvider,
     private val exporter: DiscoveryExporter,
-    savedStateHandle: SavedStateHandle,
 ) : ViewModel() {
 
-    private val sessionId: Long = savedStateHandle.get<Long>("sessionId") ?: 0L
-
     val session: StateFlow<DiscoverySessionEntity?> =
         discoveryDao.getSessionFlow(sessionId).stateInWhileSubscribed(initialValue = null)
 

feature/discovery/src/commonMain/kotlin/org/meshtastic/feature/discovery/navigation/DiscoveryNavigation.kt

@@ -22,6 +22,7 @@ import androidx.navigation3.runtime.EntryProviderScope
 import androidx.navigation3.runtime.NavBackStack
 import androidx.navigation3.runtime.NavKey
 import org.koin.compose.viewmodel.koinViewModel
+import org.koin.core.parameter.parametersOf
 import org.meshtastic.core.navigation.DiscoveryRoute
 import org.meshtastic.feature.discovery.DiscoveryHistoryDetailViewModel
 import org.meshtastic.feature.discovery.DiscoveryHistoryViewModel
@@ -38,16 +39,16 @@ import org.meshtastic.feature.discovery.ui.DiscoverySummaryScreen
 fun EntryProviderScope<NavKey>.discoveryGraph(backStack: NavBackStack<NavKey>) {
     entry<DiscoveryRoute.DiscoveryGraph> { DiscoveryScanScreenEntry(backStack) }
     entry<DiscoveryRoute.DiscoveryScan> { DiscoveryScanScreenEntry(backStack) }
-    entry<DiscoveryRoute.DiscoverySummary> {
-        val viewModel = koinViewModel<DiscoverySummaryViewModel>()
+    entry<DiscoveryRoute.DiscoverySummary> { route ->
+        val viewModel = koinViewModel<DiscoverySummaryViewModel> { parametersOf(route.sessionId) }
         DiscoverySummaryScreen(
             viewModel = viewModel,
             onNavigateUp = dropUnlessResumed { backStack.removeLastOrNull() },
             onNavigateToMap = { sessionId -> backStack.add(DiscoveryRoute.DiscoveryMap(sessionId)) },
         )
     }
-    entry<DiscoveryRoute.DiscoveryMap> {
-        val viewModel = koinViewModel<DiscoveryMapViewModel>()
+    entry<DiscoveryRoute.DiscoveryMap> { route ->
+        val viewModel = koinViewModel<DiscoveryMapViewModel> { parametersOf(route.sessionId) }
         DiscoveryMapScreen(viewModel = viewModel, onNavigateUp = dropUnlessResumed { backStack.removeLastOrNull() })
     }
     entry<DiscoveryRoute.DiscoveryHistory> {
@@ -61,11 +62,12 @@ fun EntryProviderScope<NavKey>.discoveryGraph(backStack: NavBackStack<NavKey>) {
             onNavigateToDetail = navigateToDetail,
         )
     }
-    entry<DiscoveryRoute.DiscoveryHistoryDetail> {
-        val viewModel = koinViewModel<DiscoveryHistoryDetailViewModel>()
+    entry<DiscoveryRoute.DiscoveryHistoryDetail> { route ->
+        val viewModel = koinViewModel<DiscoveryHistoryDetailViewModel> { parametersOf(route.sessionId) }
         DiscoveryHistoryDetailScreen(
             viewModel = viewModel,
             onNavigateUp = dropUnlessResumed { backStack.removeLastOrNull() },
+            onNavigateToMap = { sessionId -> backStack.add(DiscoveryRoute.DiscoveryMap(sessionId)) },
         )
     }
 }

feature/discovery/src/commonMain/kotlin/org/meshtastic/feature/discovery/ui/DiscoveryHistoryDetailScreen.kt

@@ -45,12 +45,17 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.meshtastic.core.database.entity.DiscoverySessionEntity
 import org.meshtastic.core.ui.icon.ArrowBack
 import org.meshtastic.core.ui.icon.MeshtasticIcons
+import org.meshtastic.core.ui.icon.Map
 import org.meshtastic.feature.discovery.DiscoveryHistoryDetailViewModel
 import org.meshtastic.feature.discovery.ui.component.PresetResultCard
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun DiscoveryHistoryDetailScreen(viewModel: DiscoveryHistoryDetailViewModel, onNavigateUp: () -> Unit) {
+fun DiscoveryHistoryDetailScreen(
+    viewModel: DiscoveryHistoryDetailViewModel,
+    onNavigateUp: () -> Unit,
+    onNavigateToMap: (Long) -> Unit,
+) {
     val session by viewModel.session.collectAsStateWithLifecycle()
     val presetResults by viewModel.presetResults.collectAsStateWithLifecycle()
 
@@ -61,6 +66,14 @@ fun DiscoveryHistoryDetailScreen(viewModel: DiscoveryHistoryDetailViewModel, onN
                 navigationIcon = {
                     IconButton(onClick = onNavigateUp) { Icon(MeshtasticIcons.ArrowBack, contentDescription = "Back") }
                 },
+                actions = {
+                    val s = session
+                    if (s != null && s.userLatitude != 0.0 && s.userLongitude != 0.0) {
+                        IconButton(onClick = { onNavigateToMap(s.id) }) {
+                            Icon(MeshtasticIcons.Map, contentDescription = "View map")
+                        }
+                    }
+                },
             )
         },
     ) { padding ->