feat: mutual chip uses theme primary yellow, plain text distance; top bar text indent; low-zoom meridians via direct Mercator math (bypass osmdroid wrap bug); remove Wavelog sync entry — LoTW is the sole grid source (replace instead of merge)

core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/GridTargetChip.kt

@@ -0,0 +1,142 @@
+package com.rtbishop.look4sat.core.presentation
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.drawscope.rotate
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import kotlin.math.atan2
+import kotlin.math.cos
+import kotlin.math.sin
+import kotlin.math.sqrt
+
+/**
+ * Format a Maidenhead locator for display. Per IARU convention and the user's
+ * preference: field letters (1-2) and square digits (3-4) uppercase, sub-square
+ * letters (5-6 of a 6/8-char locator) lowercase, e.g. "OL62" / "OL62kl".
+ */
+fun formatGridDisplay(grid: String): String? {
+    val g = grid.trim().uppercase()
+    if (g.length !in listOf(4, 6, 8) || g.any { !it.isLetterOrDigit() }) return null
+    if (g.length == 4) return g
+    if (g.length == 6) return g.take(4) + g.drop(4).lowercase()
+    return g.take(4) + g.drop(4).take(2).lowercase() + g.drop(6)
+}
+
+/**
+ * Top-bar chip for the mutual-match screen: navigation needle (rotated by the
+ * great-circle bearing to the target grid, 0 deg = north), grid locator and
+ * distance. Shows a dimmed placeholder when no target grid is entered.
+ */
+@Composable
+fun GridTargetChip(
+    grid: String?,
+    distanceKm: Double?,
+    bearingDeg: Double?,
+    modifier: Modifier = Modifier
+) {
+    val configured = grid != null && distanceKm != null && bearingDeg != null
+    // The app's signature accent yellow (MaterialTheme primary in both themes).
+    val accent = MaterialTheme.colorScheme.primary
+    val placeholder = MaterialTheme.colorScheme.onSurfaceVariant
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
+        modifier = modifier
+            .height(36.dp)
+            .background(
+                color = MaterialTheme.colorScheme.surface.copy(alpha = if (configured) 0.9f else 0.45f),
+                shape = RoundedCornerShape(12.dp)
+            )
+            .padding(horizontal = 12.dp)
+    ) {
+        NavigationNeedle(
+            bearingDeg = bearingDeg ?: 0.0,
+            color = if (configured) accent else placeholder,
+            dimmed = !configured,
+            modifier = Modifier.size(22.dp)
+        )
+        Text(
+            text = grid?.let { formatGridDisplay(it) } ?: "----",
+            fontSize = 15.sp,
+            fontWeight = FontWeight.Bold,
+            fontFamily = FontFamily.Monospace,
+            color = if (configured) accent else placeholder,
+            letterSpacing = 1.sp
+        )
+        Text(
+            text = distanceKm?.let { "${"%,.0f".format(it)} km" } ?: "-- km",
+            fontSize = 14.sp,
+            color = MaterialTheme.colorScheme.onSurface,
+            modifier = Modifier.padding(horizontal = 8.dp, vertical = 2.dp)
+        )
+    }
+}
+
+/**
+ * Map-style navigation needle: slim triangular pointer whose tip points at
+ * [bearingDeg] (0 = north/up, clockwise positive).
+ */
+@Composable
+private fun NavigationNeedle(
+    bearingDeg: Double,
+    color: Color,
+    dimmed: Boolean,
+    modifier: Modifier = Modifier
+) {
+    Canvas(modifier = modifier) {
+        val cx = size.width / 2f
+        val cy = size.height / 2f
+        val r = size.minDimension / 2f
+        if (dimmed) {
+            drawCircle(color = color, radius = r * 0.92f, style = Stroke(width = 1.5f))
+        }
+        rotate(degrees = bearingDeg.toFloat(), pivot = Offset(cx, cy)) {
+            val path = Path().apply {
+                moveTo(cx, cy - r * 0.9f)          // tip (north before rotation)
+                lineTo(cx - r * 0.42f, cy + r * 0.55f)
+                lineTo(cx, cy + r * 0.28f)
+                lineTo(cx + r * 0.42f, cy + r * 0.55f)
+                close()
+            }
+            drawPath(path, color = color)
+        }
+    }
+}
+
+/** Great-circle distance in km between two positions. */
+fun greatCircleDistanceKm(lat1: Double, lon1: Double, lat2: Double, lon2: Double): Double {
+    val rad = Math.PI / 180.0
+    val dLat = (lat2 - lat1) * rad
+    val dLon = (lon2 - lon1) * rad
+    val a = sin(dLat / 2) * sin(dLat / 2) +
+        cos(lat1 * rad) * cos(lat2 * rad) * sin(dLon / 2) * sin(dLon / 2)
+    return 6371.0 * 2 * kotlin.math.atan2(kotlin.math.sqrt(a), kotlin.math.sqrt(1 - a))
+}
+
+/** Initial great-circle bearing in degrees (0 = north, clockwise). */
+fun greatCircleBearingDeg(lat1: Double, lon1: Double, lat2: Double, lon2: Double): Double {
+    val rad = Math.PI / 180.0
+    val dLon = (lon2 - lon1) * rad
+    val y = sin(dLon) * cos(lat2 * rad)
+    val x = cos(lat1 * rad) * sin(lat2 * rad) -
+        sin(lat1 * rad) * cos(lat2 * rad) * cos(dLon)
+    return (Math.atan2(y, x) / rad + 360.0) % 360.0
+}

feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MaidenheadGridOverlay.kt

@@ -94,6 +94,10 @@ class MaidenheadGridOverlay : Overlay() {
         val firstCol = floor(leftLon / cellLon).toInt()
         val lastCol = ceil(rightLon / cellLon).toInt()
         val centerLon = (leftLon + rightLon) / 2.0
+        // World width in screen pixels for the current zoom (256 px per tile,
+        // 2^zoom tiles across the whole 360° world). Used by the custom
+        // Mercator-X computation in projectionToX.
+        val worldWidthPx = 256.0 * Math.pow(2.0, zoom)
 
         // The station's own grid square (4-char, only meaningful at sub-square zoom)
         val ownCell = ownGrid?.takeIf { zoom >= GRID_ZOOM_SUB }
@@ -110,8 +114,8 @@ class MaidenheadGridOverlay : Overlay() {
                 if (yTop == null || yBottom == null) continue
                 for (col in firstCol..lastCol) {
                     val lon = col * cellLon
-                    val xLeft = projectionToX(projection, lon, centerLon) ?: continue
-                    val xRight = projectionToX(projection, lon + cellLon, centerLon) ?: continue
+                    val xLeft = projectionToX(projection, lon, centerLon, worldWidthPx) ?: continue
+                    val xRight = projectionToX(projection, lon + cellLon, centerLon, worldWidthPx) ?: continue
                     if (xRight < 0f || xLeft > canvas.width) continue
                     if (cellLabel(lat, lon, zoom) in workedGrids) {
                         canvas.drawRect(xLeft, yTop, xRight, yBottom, workedPaint)
@@ -123,7 +127,7 @@ class MaidenheadGridOverlay : Overlay() {
         // Vertical lines (meridians)
         for (col in firstCol..lastCol) {
             val lon = col * cellLon
-            val x = projectionToX(projection, lon, centerLon)
+            val x = projectionToX(projection, lon, centerLon, worldWidthPx)
             if (x == null) continue
             canvas.drawLine(x, 0f, x, canvas.height.toFloat(), linePaint)
         }
@@ -147,8 +151,8 @@ class MaidenheadGridOverlay : Overlay() {
                     if (cellLabel(lat, lon, zoom) != ownCell) continue
                     val yTop = projectionToY(projection, lat + cellLat) ?: continue
                     val yBottom = projectionToY(projection, lat) ?: continue
-                    val xLeft = projectionToX(projection, lon, centerLon) ?: continue
-                    val xRight = projectionToX(projection, lon + cellLon, centerLon) ?: continue
+                    val xLeft = projectionToX(projection, lon, centerLon, worldWidthPx) ?: continue
+                    val xRight = projectionToX(projection, lon + cellLon, centerLon, worldWidthPx) ?: continue
                     canvas.drawLine(xLeft, yTop, xRight, yTop, ownLinePaint)
                     canvas.drawLine(xLeft, yBottom, xRight, yBottom, ownLinePaint)
                     canvas.drawLine(xLeft, yTop, xLeft, yBottom, ownLinePaint)
@@ -187,8 +191,8 @@ class MaidenheadGridOverlay : Overlay() {
             if (yBottom < 0f || yTop > canvas.height) continue
             for (col in firstCol..lastCol) {
                 val lon = col * cellLon
-                val xLeft = projectionToX(projection, lon, centerLon) ?: continue
-                val xRight = projectionToX(projection, lon + cellLon, centerLon) ?: continue
+                val xLeft = projectionToX(projection, lon, centerLon, worldWidthPx) ?: continue
+                val xRight = projectionToX(projection, lon + cellLon, centerLon, worldWidthPx) ?: continue
                 if (xRight < 0f || xLeft > canvas.width) continue
                 val label = cellLabel(lat, lon, zoom)
                 canvas.drawText(label, (xLeft + xRight) / 2f, yCenter, labelPaint)
@@ -197,22 +201,18 @@ class MaidenheadGridOverlay : Overlay() {
     }
 
     /** X pixel for a longitude (meridians are vertical in Web Mercator). */
-    private fun projectionToX(projection: Projection, lon: Double, centerLon: Double): Float? {
-        // osmdroid clips Mercator X to [0, mapSize], which destroys the projection of
-        // longitudes outside the [0, 360) window of the current view (visible at low
-        // zoom where the whole world is narrower than the viewport). Normalizing the
-        // longitude to the equivalent value closest to the view center keeps every
-        // meridian's X near the center, safely inside the clip window.
-        var normalized = lon
-        while (normalized < centerLon - 180.0) normalized += 360.0
-        while (normalized > centerLon + 180.0) normalized -= 360.0
-        val geo = org.osmdroid.util.GeoPoint(0.0, normalized)
+    private fun projectionToX(projection: Projection, lon: Double, centerLon: Double, worldWidthPx: Double): Float? {
+        // Do NOT use osmdroid's toPixels() here: at low zoom its wrap-around
+        // logic (getCloserPixel) mis-projects longitudes far from the view
+        // center, which makes meridians vanish while panning. Mercator X is
+        // linear in longitude, so compute it directly:
+        //   x = screenCenterX + (lon - centerLon) / 360 * worldWidthPx
+        var delta = lon - centerLon
+        while (delta > 180.0) delta -= 360.0
+        while (delta < -180.0) delta += 360.0
+        val geo = org.osmdroid.util.GeoPoint(0.0, centerLon)
         val p = projection.toPixels(geo, null)
-        // Accept generous horizontal overshoot: at low zoom the world repeats and
-        // a meridian just off-screen may still be projected; rejecting too early
-        // makes lines vanish while panning. 2x viewport width is plenty.
-        val limit = canvasWidthPx * 2f + MAX_OVERSHOOT_PX
-        return if (p.x >= -limit && p.x <= limit) p.x.toFloat() else null
+        return (p.x + delta / 360.0 * worldWidthPx).toFloat()
     }
 
     /** Y pixel for a latitude, or null when outside the viewport. */

feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MapScreen.kt

@@ -165,11 +165,18 @@ private fun MapScreen(uiState: MapState, onAction: (MapAction) -> Unit, mapView:
                 // the map page with grid mode already ON also centers the map.
                 var prevGridMode by remember { mutableStateOf(false) }
                 AndroidView({ mapView }) { view ->
+                    // Center on the station grid whenever entering grid mode.
+                    // Only mark the transition as consumed once a real position
+                    // was available; otherwise a first frame with a null
+                    // stationPosition would swallow the centering forever.
+                    val shouldCenter = uiState.isGridMode && !prevGridMode
                     setGridMode(
                         uiState.isGridMode, uiState.workedGrids, view,
-                        if (uiState.isGridMode && !prevGridMode) uiState.stationPosition else null
+                        if (shouldCenter) uiState.stationPosition else null
                     )
-                    prevGridMode = uiState.isGridMode
+                    if (!shouldCenter || uiState.stationPosition != null) {
+                        prevGridMode = uiState.isGridMode
+                    }
                     if (!uiState.isGridMode) {
                         uiState.stationPosition?.let { setStationPosition(it, view) }
                         uiState.track?.let { setSatelliteTrack(it, view) }

feature/mutual/src/main/java/com/rtbishop/look4sat/feature/mutual/MutualScreen.kt

@@ -63,6 +63,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.rtbishop.look4sat.core.domain.repository.MutualPassData
 import com.rtbishop.look4sat.core.domain.repository.TrackSampleData
+import com.rtbishop.look4sat.core.presentation.GridTargetChip
 import com.rtbishop.look4sat.core.presentation.R
 import com.rtbishop.look4sat.core.presentation.ScreenColumn
 import com.rtbishop.look4sat.core.presentation.TopBar
@@ -88,7 +89,8 @@ fun MutualScreen(
                     Text(
                         text = stringResource(R.string.mutual_title),
                         style = MaterialTheme.typography.titleMedium,
-                        fontWeight = FontWeight.Bold
+                        fontWeight = FontWeight.Bold,
+                        modifier = Modifier.padding(start = 12.dp)
                     )
                 },
                 bottomInfo = {
@@ -98,7 +100,9 @@ fun MutualScreen(
                         color = MaterialTheme.colorScheme.onSurfaceVariant,
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis,
-                        modifier = Modifier.weight(1f)
+                        modifier = Modifier
+                            .weight(1f)
+                            .padding(start = 12.dp)
                     )
                 },
                 endAction = {
@@ -114,7 +118,29 @@ fun MutualScreen(
                                 strokeWidth = 2.dp
                             )
                         }
-                        MutualStatusChip(state)
+                        // Target-grid chip: station B grid (station A defaults to
+                        // the user's own position), bearing/distance from A to B.
+                        val gridB = state.stationBGrid.trim().uppercase()
+                        val posA = com.rtbishop.look4sat.core.domain.utility.qthToPosition(state.stationAGrid)
+                            ?: state.stationALat.toDoubleOrNull()?.let { lat ->
+                                state.stationALon.toDoubleOrNull()?.let { lon ->
+                                    com.rtbishop.look4sat.core.domain.predict.GeoPos(lat, lon)
+                                }
+                            }
+                        val posB = com.rtbishop.look4sat.core.domain.utility.qthToPosition(gridB)
+                        if (posA != null && posB != null) {
+                            GridTargetChip(
+                                grid = gridB,
+                                distanceKm = com.rtbishop.look4sat.core.presentation.greatCircleDistanceKm(
+                                    posA.latitude, posA.longitude, posB.latitude, posB.longitude
+                                ),
+                                bearingDeg = com.rtbishop.look4sat.core.presentation.greatCircleBearingDeg(
+                                    posA.latitude, posA.longitude, posB.latitude, posB.longitude
+                                )
+                            )
+                        } else {
+                            GridTargetChip(grid = null, distanceKm = null, bearingDeg = null)
+                        }
                     }
                 }
             )

feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsScreen.kt

@@ -203,18 +203,6 @@ private fun SettingsScreen(uiState: SettingsState, onAction: (SettingsAction) ->
             onSave = { onAction(SettingsAction.UpdateRadioControl(it)) }
         )
     }
-    if (dialogs.wavelog) {
-        WavelogDialog(
-            initialSettings = uiState.wavelogSettings,
-            workedGridsCount = uiState.workedGridsCount,
-            isSyncing = uiState.wavelogSyncing,
-            message = uiState.wavelogMessage,
-            dismiss = { dialogs.wavelog = false },
-            onSave = { onAction(SettingsAction.UpdateWavelog(it)) },
-            onSync = { onAction(SettingsAction.SyncWorkedGrids(it)) }
-        )
-    }
-
     if (dialogs.lotw) {
         LoTWDialog(
             initialSettings = uiState.lotwSettings,
@@ -330,13 +318,6 @@ private fun SettingsScreen(uiState: SettingsState, onAction: (SettingsAction) ->
                     onRadioControlClick = { dialogs.radioControl = true }
                 )
             }
-            item {
-                WavelogCard(
-                    settings = uiState.wavelogSettings,
-                    workedGridsCount = uiState.workedGridsCount,
-                    showWavelogDialog = { dialogs.wavelog = true }
-                )
-            }
             item {
                 LoTWCard(
                     settings = uiState.lotwSettings,
@@ -581,44 +562,6 @@ private fun SwitchRow(labelResId: Int, checked: Boolean, onCheckedChange: (Boole
     }
 }
 
-@Preview(showBackground = true)
-@Composable
-private fun WavelogCardPreview() = MainTheme {
-    WavelogCard(settings = WavelogSettings("http://192.168.1.10", "wl2_demo"), workedGridsCount = 42) {}
-}
-
-@Composable
-private fun WavelogCard(
-    settings: WavelogSettings,
-    workedGridsCount: Int,
-    showWavelogDialog: () -> Unit
-) {
-    ElevatedCard(modifier = Modifier.fillMaxWidth()) {
-        Column(modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp)) {
-            Text(
-                text = stringResource(id = R.string.prefs_wavelog_title),
-                color = MaterialTheme.colorScheme.primary
-            )
-            Spacer(modifier = Modifier.height(2.dp))
-            Text(
-                text = if (settings.isConfigured) {
-                    stringResource(R.string.prefs_wavelog_configured, workedGridsCount)
-                } else {
-                    stringResource(R.string.prefs_wavelog_not_configured)
-                },
-                style = MaterialTheme.typography.bodySmall,
-                maxLines = 2
-            )
-            Spacer(modifier = Modifier.height(4.dp))
-            CardButton(
-                onClick = showWavelogDialog,
-                text = stringResource(id = R.string.prefs_wavelog_configure),
-                modifier = Modifier.fillMaxWidth()
-            )
-        }
-    }
-}
-
 @Composable
 private fun LoTWCard(
     settings: com.rtbishop.look4sat.core.domain.model.LoTWSettings,

feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsViewModel.kt

@@ -206,10 +206,10 @@ class SettingsViewModel(
                 if (lotwGrids == null) {
                     state.copy(lotwSyncing = false, lotwMessage = "LoTW sync failed — check callsign/password/network")
                 } else {
-                    // Merge with Wavelog grids: union of both sources, all confirmed/worked
-                    val merged = settingsRepo.getWorkedGrids() + lotwGrids
-                    settingsRepo.setWorkedGrids(merged)
-                    state.copy(lotwSyncing = false, workedGridsCount = merged.size, lotwMessage = null)
+                    // Wavelog entry removed: LoTW is now the only source, so the
+                    // synced set fully replaces the stored worked grids.
+                    settingsRepo.setWorkedGrids(lotwGrids)
+                    state.copy(lotwSyncing = false, workedGridsCount = lotwGrids.size, lotwMessage = null)
                 }
             }
         }

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 #noinspection UnusedVersionCatalogEntry
-appVersionCode = "456"
+appVersionCode = "458"
 #noinspection UnusedVersionCatalogEntry
-appVersionName = "4.4.6-ba7opf.9.4"
+appVersionName = "4.4.6-ba7opf.9.6"
 #noinspection UnusedVersionCatalogEntry
 compileSdk = "37"
 #noinspection UnusedVersionCatalogEntry