refactor: migrate from Hilt to Koin and expand KMP common modules (#4746)

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>

app/src/fdroid/kotlin/org/meshtastic/app/analytics/FdroidPlatformAnalytics.kt

@@ -18,16 +18,17 @@ package org.meshtastic.app.analytics
 
 import co.touchlab.kermit.Logger
 import co.touchlab.kermit.Severity
+import org.koin.core.annotation.Single
 import org.meshtastic.app.BuildConfig
 import org.meshtastic.core.repository.DataPair
 import org.meshtastic.core.repository.PlatformAnalytics
-import javax.inject.Inject
 
 /**
  * F-Droid specific implementation of [PlatformAnalytics]. This provides no-op implementations for analytics and other
  * platform services.
  */
-class FdroidPlatformAnalytics @Inject constructor() : PlatformAnalytics {
+@Single
+class FdroidPlatformAnalytics : PlatformAnalytics {
     init {
         // For F-Droid builds we don't initialize external analytics services.
         // In debug builds we attach a DebugTree for convenient local logging, but

app/src/fdroid/kotlin/org/meshtastic/app/di/FDroidNetworkModule.kt

@@ -16,24 +16,19 @@
  */
 package org.meshtastic.app.di
 
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Single
 import org.meshtastic.core.common.BuildConfigProvider
 import org.meshtastic.core.model.NetworkDeviceHardware
 import org.meshtastic.core.model.NetworkFirmwareReleases
 import org.meshtastic.core.network.service.ApiService
-import javax.inject.Singleton
 
-@InstallIn(SingletonComponent::class)
 @Module
 class FDroidNetworkModule {
 
-    @Provides
-    @Singleton
+    @Single
     fun provideOkHttpClient(buildConfigProvider: BuildConfigProvider): OkHttpClient = OkHttpClient.Builder()
         .addInterceptor(
             interceptor =
@@ -45,8 +40,7 @@ class FDroidNetworkModule {
         )
         .build()
 
-    @Provides
-    @Singleton
+    @Single
     fun provideApiService(): ApiService = object : ApiService {
         override suspend fun getDeviceHardware(): List<NetworkDeviceHardware> =
             throw NotImplementedError("API calls to getDeviceHardware are not supported on Fdroid builds.")

app/src/fdroid/kotlin/org/meshtastic/app/di/FlavorModule.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2026 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 org.meshtastic.app.di
+
+import org.koin.core.annotation.Module
+
+@Module(includes = [FDroidNetworkModule::class])
+class FlavorModule

app/src/fdroid/kotlin/org/meshtastic/app/map/FdroidMapViewProvider.kt

@@ -18,9 +18,11 @@ package org.meshtastic.app.map
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import org.koin.compose.viewmodel.koinViewModel
+import org.koin.core.annotation.Single
 import org.meshtastic.core.ui.util.MapViewProvider
 
+@Single
 class FdroidMapViewProvider : MapViewProvider {
     @Composable
     override fun MapView(
@@ -33,7 +35,7 @@ class FdroidMapViewProvider : MapViewProvider {
         tracerouteNodePositions: Map<Int, Any>,
         onTracerouteMappableCountChanged: (Int, Int) -> Unit,
     ) {
-        val mapViewModel: MapViewModel = hiltViewModel()
+        val mapViewModel: MapViewModel = koinViewModel()
         org.meshtastic.app.map.MapView(
             modifier = modifier,
             mapViewModel = mapViewModel,

app/src/fdroid/kotlin/org/meshtastic/app/map/MapView.kt

@@ -74,7 +74,6 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import co.touchlab.kermit.Logger
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
@@ -83,6 +82,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.StringResource
 import org.jetbrains.compose.resources.stringResource
+import org.koin.compose.viewmodel.koinViewModel
 import org.meshtastic.app.R
 import org.meshtastic.app.map.cluster.RadiusMarkerClusterer
 import org.meshtastic.app.map.component.CacheLayout
@@ -235,7 +235,7 @@ private fun cacheManagerCallback(onTaskComplete: () -> Unit, onTaskFailed: (Int)
 @Composable
 fun MapView(
     modifier: Modifier = Modifier,
-    mapViewModel: MapViewModel = hiltViewModel(),
+    mapViewModel: MapViewModel = koinViewModel(),
     navigateToNodeDetails: (Int) -> Unit,
     focusedNodeNum: Int? = null,
     nodeTracks: List<Position>? = null,

app/src/fdroid/kotlin/org/meshtastic/app/map/MapViewModel.kt

@@ -18,10 +18,10 @@ package org.meshtastic.app.map
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.navigation.toRoute
-import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import org.koin.core.annotation.KoinViewModel
 import org.meshtastic.core.common.BuildConfigProvider
 import org.meshtastic.core.model.DataPacket
 import org.meshtastic.core.model.RadioController
@@ -33,13 +33,10 @@ import org.meshtastic.core.repository.RadioConfigRepository
 import org.meshtastic.core.ui.viewmodel.stateInWhileSubscribed
 import org.meshtastic.feature.map.BaseMapViewModel
 import org.meshtastic.proto.LocalConfig
-import javax.inject.Inject
 
 @Suppress("LongParameterList")
-@HiltViewModel
-class MapViewModel
-@Inject
-constructor(
+@KoinViewModel
+class MapViewModel(
     mapPrefs: MapPrefs,
     packetRepository: PacketRepository,
     override val nodeRepository: NodeRepository,

app/src/fdroid/kotlin/org/meshtastic/app/map/model/NOAAWmsTileSource.kt

@@ -86,22 +86,6 @@ open class NOAAWmsTileSource(
         if (time != null) this.time = time
     }
 
-    //    fun createFrom(endpoint: WMSEndpoint, layer: WMSLayer): WMSTileSource? {
-    //        var srs: String? = "EPSG:900913"
-    //        if (layer.srs.isNotEmpty()) {
-    //            srs = layer.srs[0]
-    //        }
-    //        return if (layer.styles.isEmpty()) {
-    //            WMSTileSource(
-    //                layer.name, arrayOf(endpoint.baseurl), layer.name,
-    //                endpoint.wmsVersion, srs, null, layer.pixelSize
-    //            )
-    //        } else WMSTileSource(
-    //            layer.name, arrayOf(endpoint.baseurl), layer.name,
-    //            endpoint.wmsVersion, srs, layer.styles[0], layer.pixelSize
-    //        )
-    //    }
-
     private fun tile2lon(x: Int, z: Int): Double = x / 2.0.pow(z.toDouble()) * 360.0 - 180
 
     private fun tile2lat(y: Int, z: Int): Double {

app/src/fdroid/kotlin/org/meshtastic/app/node/component/InlineMap.kt

@@ -14,22 +14,13 @@
  * 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 org.meshtastic.app.di
+package org.meshtastic.app.node.component
 
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import org.meshtastic.app.analytics.FdroidPlatformAnalytics
-import org.meshtastic.core.repository.PlatformAnalytics
-import javax.inject.Singleton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import org.meshtastic.core.model.Node
 
-/** Hilt module to provide the [FdroidPlatformAnalytics] for the fdroid flavor. */
-@Module
-@InstallIn(SingletonComponent::class)
-abstract class FdroidPlatformAnalyticsModule {
-
-    @Binds
-    @Singleton
-    abstract fun bindPlatformHelper(fdroidPlatformAnalytics: FdroidPlatformAnalytics): PlatformAnalytics
+@Composable
+fun InlineMap(node: Node, modifier: Modifier = Modifier) {
+    // No-op for F-Droid builds
 }

app/src/fdroid/kotlin/org/meshtastic/app/node/metrics/TracerouteMapOverlayInsets.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025-2026 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 org.meshtastic.app.node.metrics
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.unit.dp
+import org.meshtastic.core.ui.util.TracerouteMapOverlayInsets
+
+fun getTracerouteMapOverlayInsets(): TracerouteMapOverlayInsets = TracerouteMapOverlayInsets(
+    overlayAlignment = Alignment.BottomEnd,
+    overlayPadding = PaddingValues(end = 16.dp, bottom = 16.dp),
+    contentHorizontalAlignment = Alignment.End,
+)