Modularize more maps files (#3262)

app/src/fdroid/java/com/geeksville/mesh/ui/map/MapView.kt

@@ -66,10 +66,7 @@ import com.geeksville.mesh.MeshProtos.Waypoint
 import com.geeksville.mesh.android.gpsDisabled
 import com.geeksville.mesh.android.hasGps
 import com.geeksville.mesh.copy
-import com.geeksville.mesh.ui.map.components.CacheLayout
-import com.geeksville.mesh.ui.map.components.DownloadButton
 import com.geeksville.mesh.ui.map.components.EditWaypointDialog
-import com.geeksville.mesh.ui.map.components.MapButton
 import com.geeksville.mesh.util.SqlTileWriterExt
 import com.geeksville.mesh.util.addCopyright
 import com.geeksville.mesh.util.addScaleBarOverlay
@@ -83,7 +80,11 @@ import org.meshtastic.core.database.model.Node
 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.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.model.CustomTileSource
 import org.meshtastic.feature.map.model.MarkerWithLabel
 import org.meshtastic.feature.map.zoomIn

app/src/google/java/com/geeksville/mesh/di/MapModule.kt

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2025 Meshtastic LLC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.geeksville.mesh.di
-
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import kotlinx.serialization.json.Json
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-object MapModule {
-
-    // Serialization Provider (from original SerializationModule)
-    @Provides @Singleton
-    fun provideJson(): Json = Json { prettyPrint = false }
-}

app/src/google/java/com/geeksville/mesh/ui/map/MapView.kt

@@ -68,10 +68,7 @@ import com.geeksville.mesh.MeshProtos.Position
 import com.geeksville.mesh.MeshProtos.Waypoint
 import com.geeksville.mesh.copy
 import com.geeksville.mesh.ui.map.components.ClusterItemsListDialog
-import com.geeksville.mesh.ui.map.components.CustomMapLayersSheet
-import com.geeksville.mesh.ui.map.components.CustomTileProviderManagerSheet
 import com.geeksville.mesh.ui.map.components.EditWaypointDialog
-import com.geeksville.mesh.ui.map.components.MapControlsOverlay
 import com.geeksville.mesh.ui.map.components.NodeClusterMarkers
 import com.geeksville.mesh.ui.map.components.WaypointMarkers
 import com.geeksville.mesh.ui.metrics.HEADING_DEG
@@ -115,6 +112,13 @@ import org.meshtastic.core.model.util.mpsToKmph
 import org.meshtastic.core.model.util.mpsToMph
 import org.meshtastic.core.model.util.toString
 import org.meshtastic.core.strings.R
+import org.meshtastic.feature.map.LastHeardFilter
+import org.meshtastic.feature.map.LayerType
+import org.meshtastic.feature.map.LocationPermissionsHandler
+import org.meshtastic.feature.map.MapViewModel
+import org.meshtastic.feature.map.component.CustomMapLayersSheet
+import org.meshtastic.feature.map.component.CustomTileProviderManagerSheet
+import org.meshtastic.feature.map.component.MapControlsOverlay
 import timber.log.Timber
 import java.text.DateFormat
 

app/src/google/java/com/geeksville/mesh/ui/map/components/NodeClusterMarkers.kt

@@ -20,7 +20,6 @@ package com.geeksville.mesh.ui.map.components
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.key
 import androidx.compose.ui.graphics.Color
-import com.geeksville.mesh.ui.map.BaseMapViewModel
 import com.geeksville.mesh.ui.map.NodeClusterItem
 import com.geeksville.mesh.ui.node.components.NodeChip
 import com.google.maps.android.clustering.Cluster
@@ -28,6 +27,7 @@ import com.google.maps.android.clustering.view.DefaultClusterRenderer
 import com.google.maps.android.compose.Circle
 import com.google.maps.android.compose.MapsComposeExperimentalApi
 import com.google.maps.android.compose.clustering.Clustering
+import org.meshtastic.feature.map.BaseMapViewModel
 
 @OptIn(MapsComposeExperimentalApi::class)
 @Suppress("NestedBlockDepth")

app/src/google/java/com/geeksville/mesh/ui/map/components/WaypointMarkers.kt

@@ -21,13 +21,13 @@ import android.widget.Toast
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import com.geeksville.mesh.MeshProtos
-import com.geeksville.mesh.ui.map.BaseMapViewModel
 import com.geeksville.mesh.ui.node.DEG_D
 import com.google.android.gms.maps.model.BitmapDescriptor
 import com.google.android.gms.maps.model.LatLng
 import com.google.maps.android.compose.Marker
 import com.google.maps.android.compose.rememberUpdatedMarkerState
 import org.meshtastic.core.strings.R
+import org.meshtastic.feature.map.BaseMapViewModel
 
 @Composable
 fun WaypointMarkers(

app/src/main/java/com/geeksville/mesh/ui/map/MapScreen.kt

@@ -28,6 +28,7 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.geeksville.mesh.ui.common.components.MainAppBar
 import org.meshtastic.core.strings.R
+import org.meshtastic.feature.map.MapViewModel
 
 @Composable
 fun MapScreen(

core/data/src/google/kotlin/org/meshtastic/core/data/di/GoogleDataModule.kt

@@ -19,8 +19,10 @@ package org.meshtastic.core.data.di
 
 import dagger.Binds
 import dagger.Module
+import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import kotlinx.serialization.json.Json
 import org.meshtastic.core.data.repository.CustomTileProviderRepository
 import org.meshtastic.core.data.repository.CustomTileProviderRepositoryImpl
 import javax.inject.Singleton
@@ -32,4 +34,9 @@ interface GoogleDataModule {
     @Binds
     @Singleton
     fun bindCustomTileProviderRepository(impl: CustomTileProviderRepositoryImpl): CustomTileProviderRepository
+
+    companion object {
+        @Provides @Singleton
+        fun provideJson(): Json = Json { prettyPrint = false }
+    }
 }

feature/map/build.gradle.kts

@@ -18,8 +18,28 @@
 plugins {
     alias(libs.plugins.kover)
     alias(libs.plugins.meshtastic.android.library)
+    alias(libs.plugins.meshtastic.android.library.compose)
+    alias(libs.plugins.meshtastic.hilt)
 }
 
 android { namespace = "org.meshtastic.feature.map" }
 
-dependencies { implementation(libs.bundles.osm) }
+dependencies {
+    implementation(projects.core.data)
+    implementation(projects.core.database)
+    implementation(projects.core.datastore)
+    implementation(projects.core.model)
+    implementation(projects.core.prefs)
+    implementation(projects.core.proto)
+    implementation(projects.core.service)
+    implementation(projects.core.strings)
+    implementation(projects.core.ui)
+
+    implementation(libs.bundles.coroutines)
+    implementation(libs.bundles.lifecycle)
+    implementation(libs.bundles.osm)
+    googleImplementation(libs.bundles.maps.compose)
+
+    implementation(libs.annotation)
+    implementation(libs.timber)
+}

feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/MapViewModel.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.lifecycle.viewModelScope
 import com.geeksville.mesh.LocalOnlyProtos.LocalConfig

feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/component/CacheLayout.kt

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.geeksville.mesh.ui.map.components
+package org.meshtastic.feature.map.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -40,7 +40,7 @@ import org.meshtastic.core.strings.R
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-internal fun CacheLayout(
+fun CacheLayout(
     cacheEstimate: String,
     onExecuteJob: () -> Unit,
     onCancelDownload: () -> Unit,

feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/component/DownloadButton.kt

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.geeksville.mesh.ui.map.components
+package org.meshtastic.feature.map.component
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.FastOutSlowInEasing
@@ -34,7 +34,7 @@ import androidx.compose.ui.res.stringResource
 import org.meshtastic.core.strings.R
 
 @Composable
-internal fun DownloadButton(enabled: Boolean, onClick: () -> Unit) {
+fun DownloadButton(enabled: Boolean, onClick: () -> Unit) {
     AnimatedVisibility(
         visible = enabled,
         enter =

feature/map/src/fdroid/kotlin/org/meshtastic/feature/map/component/MapButton.kt

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.geeksville.mesh.ui.map.components
+package org.meshtastic.feature.map.component
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.size

feature/map/src/google/kotlin/org/meshtastic/feature/map/LocationHandler.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 android.Manifest
 import android.app.Activity

feature/map/src/google/kotlin/org/meshtastic/feature/map/MapViewModel.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 android.app.Application
 import android.net.Uri

feature/map/src/google/kotlin/org/meshtastic/feature/map/component/CustomMapLayersSheet.kt

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.geeksville.mesh.ui.map.components
+package org.meshtastic.feature.map.component
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
@@ -39,8 +39,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.geeksville.mesh.ui.map.MapLayerItem
 import org.meshtastic.core.strings.R
+import org.meshtastic.feature.map.MapLayerItem
 
 @Suppress("LongMethod")
 @Composable

feature/map/src/google/kotlin/org/meshtastic/feature/map/component/CustomTileProviderManagerSheet.kt

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.geeksville.mesh.ui.map.components
+package org.meshtastic.feature.map.component
 
 import android.widget.Toast
 import androidx.compose.foundation.layout.Arrangement
@@ -51,10 +51,10 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.geeksville.mesh.ui.map.MapViewModel
 import kotlinx.coroutines.flow.collectLatest
 import org.meshtastic.core.data.model.CustomTileProviderConfig
 import org.meshtastic.core.strings.R
+import org.meshtastic.feature.map.MapViewModel
 
 @Suppress("LongMethod")
 @Composable

feature/map/src/google/kotlin/org/meshtastic/feature/map/component/MapButton.kt

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.geeksville.mesh.ui.map.components
+package org.meshtastic.feature.map.component
 
 import androidx.compose.material3.FilledIconButton
 import androidx.compose.material3.Icon

feature/map/src/google/kotlin/org/meshtastic/feature/map/component/MapControlsOverlay.kt

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.geeksville.mesh.ui.map.components
+package org.meshtastic.feature.map.component
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.material.icons.Icons
@@ -33,9 +33,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.res.stringResource
-import com.geeksville.mesh.ui.map.MapViewModel
 import org.meshtastic.core.strings.R
 import org.meshtastic.core.ui.theme.StatusColors.StatusRed
+import org.meshtastic.feature.map.MapViewModel
 
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable

feature/map/src/google/kotlin/org/meshtastic/feature/map/component/MapFilterDropdown.kt

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.geeksville.mesh.ui.map.components
+package org.meshtastic.feature.map.component
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
@@ -40,9 +40,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.geeksville.mesh.ui.map.LastHeardFilter
-import com.geeksville.mesh.ui.map.MapViewModel
 import org.meshtastic.core.strings.R
+import org.meshtastic.feature.map.LastHeardFilter
+import org.meshtastic.feature.map.MapViewModel
 import kotlin.math.roundToInt
 
 @Composable

feature/map/src/google/kotlin/org/meshtastic/feature/map/component/MapTypeDropdown.kt

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.geeksville.mesh.ui.map.components
+package org.meshtastic.feature.map.component
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
@@ -28,9 +28,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.geeksville.mesh.ui.map.MapViewModel
 import com.google.maps.android.compose.MapType
 import org.meshtastic.core.strings.R
+import org.meshtastic.feature.map.MapViewModel
 
 @Suppress("LongMethod")
 @Composable

feature/map/src/main/kotlin/org/meshtastic/feature/map/BaseMapViewModel.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 android.os.RemoteException
 import androidx.annotation.StringRes