refactor: KMP Migration, Messaging Modularization, and Handshake Robustness (#4631)

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

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

@@ -18,7 +18,6 @@ package org.meshtastic.feature.map
 
 import android.Manifest
 import android.graphics.Paint
-import android.text.format.DateUtils
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -85,6 +84,7 @@ import org.jetbrains.compose.resources.StringResource
 import org.jetbrains.compose.resources.stringResource
 import org.meshtastic.core.common.gpsDisabled
 import org.meshtastic.core.common.hasGps
+import org.meshtastic.core.common.util.DateFormatter
 import org.meshtastic.core.common.util.nowMillis
 import org.meshtastic.core.database.entity.Packet
 import org.meshtastic.core.database.model.Node
@@ -496,12 +496,7 @@ fun MapView(
             val pt = waypoint.data.waypoint ?: return@mapNotNull null
             if (!mapFilterState.showWaypoints) return@mapNotNull null // Use collected mapFilterState
             val lock = if ((pt.locked_to ?: 0) != 0) "\uD83D\uDD12" else ""
-            val time =
-                DateUtils.formatDateTime(
-                    context,
-                    waypoint.received_time,
-                    DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_TIME or DateUtils.FORMAT_ABBREV_ALL,
-                )
+            val time = DateFormatter.formatDateTime(waypoint.received_time)
             val label = (pt.name ?: "") + " " + formatAgo((waypoint.received_time / 1000).toInt())
             val emoji = String(Character.toChars(if ((pt.icon ?: 0) == 0) 128205 else pt.icon!!))
             val now = nowMillis
@@ -510,14 +505,7 @@ fun MapView(
                 when {
                     (pt.expire ?: 0) == 0 || pt.expire == Int.MAX_VALUE -> "Never"
                     expireTimeMillis <= now -> "Expired"
-                    else ->
-                        DateUtils.getRelativeTimeSpanString(
-                            expireTimeMillis,
-                            now,
-                            DateUtils.MINUTE_IN_MILLIS,
-                            DateUtils.FORMAT_ABBREV_RELATIVE,
-                        )
-                            .toString()
+                    else -> DateFormatter.formatRelativeTime(expireTimeMillis)
                 }
             MarkerWithLabel(this, label, emoji).apply {
                 id = "${pt.id}"
@@ -719,6 +707,7 @@ fun MapView(
                     modifier = Modifier.align(Alignment.BottomCenter),
                 )
             } else {
+                @Suppress("MagicNumber")
                 Column(
                     modifier = Modifier.padding(top = 16.dp, end = 16.dp).align(Alignment.TopEnd),
                     verticalArrangement = Arrangement.spacedBy(8.dp),
@@ -805,6 +794,7 @@ fun MapView(
                                             text = stringResource(Res.string.show_precision_circle),
                                             modifier = Modifier.weight(1f),
                                         )
+                                        @Suppress("MagicNumber")
                                         Checkbox(
                                             checked = mapFilterState.showPrecisionCircle,
                                             onCheckedChange = { mapViewModel.toggleShowPrecisionCircleOnMap() },
@@ -1075,7 +1065,8 @@ private const val TRACEROUTE_SINGLE_POINT_ZOOM = 12.0
 private const val TRACEROUTE_ZOOM_OUT_LEVELS = 0.5
 private const val WAYPOINT_ZOOM = 15.0
 
-private fun Double.toRad(): Double = Math.toRadians(this)
+@Suppress("MagicNumber")
+private fun Double.toRad(): Double = this * Math.PI / 180.0
 
 private fun bearingRad(from: GeoPoint, to: GeoPoint): Double {
     val lat1 = from.latitude.toRad()
@@ -1116,6 +1107,8 @@ private fun offsetPolyline(
 
     return points.mapIndexed { index, point ->
         val heading = headings[index.coerceIn(0, headings.lastIndex)]
+
+        @Suppress("MagicNumber")
         val perpendicularHeading = heading + (Math.PI / 2 * sideMultiplier)
         point.offsetPoint(perpendicularHeading, abs(offsetMeters))
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025 Meshtastic LLC
+ * 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
@@ -14,11 +14,10 @@
  * 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.feature.map.model
 
 import android.content.res.Resources
-import android.util.Log
+import co.touchlab.kermit.Logger
 import org.osmdroid.api.IMapView
 import org.osmdroid.tileprovider.tilesource.OnlineTileSourceBase
 import org.osmdroid.tileprovider.tilesource.TileSourcePolicy
@@ -78,7 +77,7 @@ open class NOAAWmsTileSource(
     private var forceHttp = false
 
     init {
-        Log.i(IMapView.LOGTAG, "WMS support is BETA. Please report any issues")
+        Logger.withTag(IMapView.LOGTAG).i { "WMS support is BETA. Please report any issues" }
         layer = layername
         this.version = version
         this.srs = srs
@@ -165,7 +164,7 @@ open class NOAAWmsTileSource(
         sb.append(bbox[minY]).append(",")
         sb.append(bbox[maxX]).append(",")
         sb.append(bbox[maxY])
-        Log.i(IMapView.LOGTAG, sb.toString())
+        Logger.withTag(IMapView.LOGTAG).i { sb.toString() }
         return sb.toString()
     }
 

feature/map/src/fdroid/res/drawable/ic_location_on.xml

@@ -6,9 +6,9 @@
     <path
         android:fillColor="#3388ff"
         android:strokeWidth="1.25"
-        android:strokeColor="@android:color/white"
+        android:strokeColor="#ffffffff"
         android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z" />
     <path
-        android:fillColor="@android:color/transparent"
+        android:fillColor="#00000000"
         android:pathData="M12,9m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0" />
-</vector>
+</vector>

feature/map/src/fdroid/res/drawable/ic_map_location_dot.xml

@@ -7,5 +7,5 @@
         android:fillColor="#3388ff"
         android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
         android:strokeWidth="2.0"
-        android:strokeColor="@android:color/white" />
-</vector>
+        android:strokeColor="#ffffffff" />
+</vector>

feature/map/src/fdroid/res/drawable/ic_map_navigation.xml

@@ -7,5 +7,5 @@
         android:fillColor="#3388ff"
         android:pathData="M12,2L4.5,20.29l0.71,0.71L12,18l6.79,3 0.71,-0.71z"
         android:strokeWidth="1.5"
-        android:strokeColor="@android:color/white" />
-</vector>
+        android:strokeColor="#ffffffff" />
+</vector>