From 81804500bd295fad55150d824d08735534e959ce Mon Sep 17 00:00:00 2001
From: Phil Oliver <3497406+poliver@users.noreply.github.com>
Date: Wed, 1 Oct 2025 21:21:51 -0400
Subject: [PATCH] Move `MapViewExtensions` to `:feature:map` (#3284)

---
 app/src/fdroid/java/com/geeksville/mesh/ui/map/MapView.kt | 8 ++++----
 .../java/com/geeksville/mesh/ui/node/NodeMapScreen.kt     | 8 ++++----
 .../ui}/src/main/res/drawable/ic_map_navigation_24.xml    | 0
 .../org/meshtastic/feature/map}/MapViewExtensions.kt      | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename {app => core/ui}/src/main/res/drawable/ic_map_navigation_24.xml (100%)
 rename {app/src/fdroid/java/com/geeksville/mesh/util => feature/map/src/fdroid/kotlin/org/meshtastic/feature/map}/MapViewExtensions.kt (96%)

diff --git a/app/src/fdroid/java/com/geeksville/mesh/ui/map/MapView.kt b/app/src/fdroid/java/com/geeksville/mesh/ui/map/MapView.kt
index 55e5f7912..d37f8089e 100644
--- a/app/src/fdroid/java/com/geeksville/mesh/ui/map/MapView.kt
+++ b/app/src/fdroid/java/com/geeksville/mesh/ui/map/MapView.kt
@@ -68,9 +68,6 @@ import com.geeksville.mesh.android.hasGps
 import com.geeksville.mesh.copy
 import com.geeksville.mesh.ui.map.components.EditWaypointDialog
 import com.geeksville.mesh.util.SqlTileWriterExt
-import com.geeksville.mesh.util.addCopyright
-import com.geeksville.mesh.util.addScaleBarOverlay
-import com.geeksville.mesh.util.createLatLongGrid
 import com.geeksville.mesh.waypoint
 import com.google.accompanist.permissions.ExperimentalPermissionsApi // Added for Accompanist
 import com.google.accompanist.permissions.rememberMultiplePermissionsState // Added for Accompanist
@@ -81,10 +78,13 @@ import org.meshtastic.core.model.DataPacket
 import org.meshtastic.core.model.util.formatAgo
 import org.meshtastic.core.strings.R
 import org.meshtastic.feature.map.MapViewModel
+import org.meshtastic.feature.map.addCopyright
+import org.meshtastic.feature.map.addScaleBarOverlay
 import org.meshtastic.feature.map.cluster.RadiusMarkerClusterer
 import org.meshtastic.feature.map.component.CacheLayout
 import org.meshtastic.feature.map.component.DownloadButton
 import org.meshtastic.feature.map.component.MapButton
+import org.meshtastic.feature.map.createLatLongGrid
 import org.meshtastic.feature.map.model.CustomTileSource
 import org.meshtastic.feature.map.model.MarkerWithLabel
 import org.meshtastic.feature.map.zoomIn
@@ -276,7 +276,7 @@ fun MapView(mapViewModel: MapViewModel = hiltViewModel(), navigateToNodeDetails:
                         setPersonIcon(it)
                         setPersonAnchor(0.5f, 0.5f)
                     }
-                    getBitmapFromVectorDrawable(context, com.geeksville.mesh.R.drawable.ic_map_navigation_24)?.let {
+                    getBitmapFromVectorDrawable(context, org.meshtastic.core.ui.R.drawable.ic_map_navigation_24)?.let {
                         setDirectionIcon(it)
                         setDirectionAnchor(0.5f, 0.5f)
                     }
diff --git a/app/src/fdroid/java/com/geeksville/mesh/ui/node/NodeMapScreen.kt b/app/src/fdroid/java/com/geeksville/mesh/ui/node/NodeMapScreen.kt
index 39a0cdc2a..02e741430 100644
--- a/app/src/fdroid/java/com/geeksville/mesh/ui/node/NodeMapScreen.kt
+++ b/app/src/fdroid/java/com/geeksville/mesh/ui/node/NodeMapScreen.kt
@@ -30,10 +30,10 @@ import androidx.navigation.NavHostController
 import com.geeksville.mesh.model.MetricsViewModel
 import com.geeksville.mesh.ui.map.NodeMapViewModel
 import com.geeksville.mesh.ui.map.rememberMapViewWithLifecycle
-import com.geeksville.mesh.util.addCopyright
-import com.geeksville.mesh.util.addPolyline
-import com.geeksville.mesh.util.addPositionMarkers
-import com.geeksville.mesh.util.addScaleBarOverlay
+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.osmdroid.util.BoundingBox
 import org.osmdroid.util.GeoPoint
 
diff --git a/app/src/main/res/drawable/ic_map_navigation_24.xml b/core/ui/src/main/res/drawable/ic_map_navigation_24.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_map_navigation_24.xml
rename to core/ui/src/main/res/drawable/ic_map_navigation_24.xml
diff --git a/app/src/fdroid/java/com/geeksville/mesh/util/MapViewExtensions.kt b/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapViewExtensions.kt
similarity index 96%
rename from app/src/fdroid/java/com/geeksville/mesh/util/MapViewExtensions.kt
rename to feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapViewExtensions.kt
index 24ce2669c..465d63cca 100644
--- a/app/src/fdroid/java/com/geeksville/mesh/util/MapViewExtensions.kt
+++ b/feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapViewExtensions.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.geeksville.mesh.util
+package org.meshtastic.feature.map
 
 import android.graphics.Color
 import android.graphics.DashPathEffect
@@ -26,7 +26,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat
 import com.geeksville.mesh.MeshProtos
-import org.meshtastic.core.strings.R
+import org.meshtastic.core.ui.R
 import org.osmdroid.util.GeoPoint
 import org.osmdroid.views.MapView
 import org.osmdroid.views.overlay.CopyrightOverlay
@@ -126,7 +126,7 @@ fun MapView.addPolyline(density: Density, geoPoints: List<GeoPoint>, onClick: ()
 }
 
 fun MapView.addPositionMarkers(positions: List<MeshProtos.Position>, onClick: () -> Unit): List<Marker> {
-    val navIcon = ContextCompat.getDrawable(context, com.geeksville.mesh.R.drawable.ic_map_navigation_24)
+    val navIcon = ContextCompat.getDrawable(context, R.drawable.ic_map_navigation_24)
     val markers =
         positions.map {
             Marker(this).apply {