Move NodeMapViewModel and MapScreen

app/src/fdroid/java/com/geeksville/mesh/ui/node/NodeMapScreen.kt

@@ -27,11 +27,11 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.geeksville.mesh.model.MetricsViewModel
-import com.geeksville.mesh.ui.map.NodeMapViewModel
 import org.meshtastic.feature.map.addCopyright
 import org.meshtastic.feature.map.addPolyline
 import org.meshtastic.feature.map.addPositionMarkers
 import org.meshtastic.feature.map.addScaleBarOverlay
+import org.meshtastic.feature.map.node.NodeMapViewModel
 import org.meshtastic.feature.map.rememberMapViewWithLifecycle
 import org.osmdroid.util.BoundingBox
 import org.osmdroid.util.GeoPoint

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

@@ -21,10 +21,10 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
 import androidx.navigation.navDeepLink
-import com.geeksville.mesh.ui.map.MapScreen
 import org.meshtastic.core.navigation.DEEP_LINK_BASE_URI
 import org.meshtastic.core.navigation.MapRoutes
 import org.meshtastic.core.navigation.NodesRoutes
+import org.meshtastic.feature.map.MapScreen
 
 fun NavGraphBuilder.mapGraph(navController: NavHostController) {
     composable<MapRoutes.Map>(deepLinks = listOf(navDeepLink<MapRoutes.Map>(basePath = "$DEEP_LINK_BASE_URI/map"))) {

feature/map/src/main/kotlin/org/meshtastic/feature/map/MapScreen.kt

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.geeksville.mesh.ui.map
+package org.meshtastic.feature.map
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
@@ -28,8 +28,6 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.meshtastic.core.strings.R
 import org.meshtastic.core.ui.component.MainAppBar
-import org.meshtastic.feature.map.MapView
-import org.meshtastic.feature.map.MapViewModel
 
 @Composable
 fun MapScreen(

feature/map/src/main/kotlin/org/meshtastic/feature/map/node/NodeMapViewModel.kt

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.geeksville.mesh.ui.map
+package org.meshtastic.feature.map.node
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel