chore: bump version to 4.4.6-ba7opf.9.7

core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/LoTWRepository.kt

@@ -57,15 +57,25 @@ class LoTWRepository : ILoTWRepository {
             }
             try {
                 val connection = URL("$BASE_URL?$query").openConnection() as HttpURLConnection
-                connection.connectTimeout = 15_000
-                connection.readTimeout = 60_000
+                // ARRL can be slow to accept connections from mobile networks
+                // (long TLS handshakes across the Pacific, occasional server-side
+                // queueing). 30s connect + 120s read gives the request enough
+                // headroom; the sync button stays disabled meanwhile so users
+                // see progress rather than a hung dialog.
+                connection.connectTimeout = 30_000
+                connection.readTimeout = 120_000
                 connection.requestMethod = "GET"
+                connection.setRequestProperty("Accept-Encoding", "gzip")
+                connection.instanceFollowRedirects = true
                 val code = connection.responseCode
                 if (code !in 200..299) {
                     connection.disconnect()
                     return@withContext null
                 }
-                val body = connection.inputStream.bufferedReader().use { it.readText() }
+                val stream = connection.inputStream
+                val body = ("gzip".equals(connection.contentEncoding, ignoreCase = true))
+                    .let { gz -> if (gz) java.util.zip.GZIPInputStream(stream) else stream }
+                    .bufferedReader().use { it.readText() }
                 connection.disconnect()
                 if (body.contains(" password=") && !body.startsWith("ARRL")) return@withContext null
                 parseConfirmedGrids(body)

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

@@ -210,12 +210,20 @@ fun RowScope.NextPassRow(pass: OrbitalPass, modifier: Modifier = Modifier, isUtc
 }
 
 @Composable
-fun CardButton(onClick: () -> Unit, text: String, modifier: Modifier = Modifier) {
+fun CardButton(
+    onClick: () -> Unit,
+    text: String,
+    modifier: Modifier = Modifier,
+    isEnabled: Boolean = true
+) {
     ElevatedButton(
         onClick = onClick,
+        enabled = isEnabled,
         colors = ButtonDefaults.buttonColors(
             containerColor = MaterialTheme.colorScheme.surfaceVariant,
-            contentColor = MaterialTheme.colorScheme.onSurfaceVariant
+            contentColor = MaterialTheme.colorScheme.onSurfaceVariant,
+            disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant,
+            disabledContentColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.4f)
         ),
         shape = MaterialTheme.shapes.small,
         modifier = modifier,
@@ -316,9 +324,21 @@ fun InfoDialog(
 
 @Composable
 fun SharedDialog(
-    title: String, onCancel: () -> Unit, onAccept: () -> Unit, content: @Composable () -> Unit
+    title: String,
+    onCancel: () -> Unit,
+    onAccept: () -> Unit,
+    acceptText: String? = null,
+    acceptEnabled: Boolean = true,
+    content: @Composable () -> Unit
 ) {
-    SharedDialog(title = title, onDismissRequest = onCancel, onCancel = onCancel, onAccept = onAccept) { _ ->
+    SharedDialog(
+        title = title,
+        onDismissRequest = onCancel,
+        onCancel = onCancel,
+        onAccept = onAccept,
+        acceptText = acceptText,
+        acceptEnabled = acceptEnabled
+    ) { _ ->
         content()
     }
 }
@@ -329,6 +349,8 @@ fun SharedDialog(
     onDismissRequest: () -> Unit,
     onCancel: (() -> Unit)? = null,
     onAccept: (() -> Unit)? = null,
+    acceptText: String? = null,
+    acceptEnabled: Boolean = true,
     titleFontSize: Int = 16,
     titleTextAlign: TextAlign = if (onCancel != null && onAccept != null) TextAlign.Center else TextAlign.Start,
     content: @Composable (padding: Dp) -> Unit
@@ -356,7 +378,11 @@ fun SharedDialog(
                     .padding(horizontal = if (onCancel != null && onAccept != null) padding else 0.dp)
             )
             if (onAccept != null) {
-                CardButton(onClick = onAccept, text = stringResource(R.string.btn_accept))
+                CardButton(
+                    onClick = onAccept,
+                    text = acceptText ?: stringResource(R.string.btn_accept),
+                    isEnabled = acceptEnabled
+                )
             }
         }
         content(padding)

core/presentation/src/main/res/values-zh/strings.xml

@@ -151,8 +151,8 @@
     <string name="prefs_lotw_title">LoTW 已确认网格</string>
     <string name="prefs_lotw_callsign">LoTW 呼号</string>
     <string name="prefs_lotw_password">LoTW 密码</string>
-    <string name="prefs_lotw_hint">直接从 ARRL LoTW 拉取已确认 QSO 的网格并与 Wavelog 网格合并（当前 %1$d 个）。密码仅保存在手机本地。填好直接点同步，会自动保存并拉取。</string>
-    <string name="prefs_lotw_sync">立即同步</string>
+    <string name="prefs_lotw_hint">直接从 ARRL LoTW 拉取该呼号已确认 QSO 的网格并覆盖本地已存集合（当前 %1$d 个）。密码仅保存在手机本地。点"同步"会自动保存凭据并拉取。</string>
+    <string name="prefs_lotw_sync">同步</string>
     <string name="prefs_lotw_syncing">同步中…</string>
     <string name="prefs_lotw_configured">已从 LoTW 同步 — 共 %1$d 个网格</string>
     <string name="prefs_lotw_not_configured">未配置 — 直接登录 ARRL LoTW 拉取已确认 QSO 的网格，无需自建服务器</string>

core/presentation/src/main/res/values/strings.xml

@@ -186,8 +186,8 @@
     <string name="prefs_lotw_title">LoTW confirmed grids</string>
     <string name="prefs_lotw_callsign">LoTW callsign</string>
     <string name="prefs_lotw_password">LoTW password</string>
-    <string name="prefs_lotw_hint">Fetch confirmed-QSO grids directly from ARRL LoTW and merge them with Wavelog grids (currently %1$d). The password is stored on this device only. Just tap Sync — credentials are saved automatically.</string>
-    <string name="prefs_lotw_sync">Sync now</string>
+    <string name="prefs_lotw_hint">Fetch confirmed-QSO grids directly from ARRL LoTW for this callsign and replace the stored set (currently %1$d). The password is stored on this device only. Tapping Sync saves the credentials and fetches in one step.</string>
+    <string name="prefs_lotw_sync">Sync</string>
     <string name="prefs_lotw_syncing">Syncing…</string>
     <string name="prefs_lotw_configured">Synced from LoTW — %1$d grids total</string>
     <string name="prefs_lotw_not_configured">Not configured — pull confirmed grids directly from ARRL LoTW, no self-hosted server needed</string>

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

@@ -102,25 +102,45 @@ class MaidenheadGridOverlay : Overlay() {
         // The station's own grid square (4-char, only meaningful at sub-square zoom)
         val ownCell = ownGrid?.takeIf { zoom >= GRID_ZOOM_SUB }
 
-        // Worked-grid highlight fills (only meaningful at sub-square zoom)
-        if (workedGrids.isNotEmpty() && zoom >= GRID_ZOOM_SUB) {
-            for (row in firstRow..lastRow) {
-                val lat = row * cellLat
-                if (lat < -90.0 || lat >= 90.0) continue
-                val topLatCell = lat + cellLat
-                if (topLatCell > 90.0) continue
-                val yTop = projectionToY(projection, topLatCell)
-                val yBottom = projectionToY(projection, lat)
-                if (yTop == null || yBottom == null) continue
-                for (col in firstCol..lastCol) {
-                    val lon = col * cellLon
-                    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)
+        // Worked-grid highlight fills.
+        //  - Sub-square zoom: fill each worked 4-char cell directly.
+        //  - Field zoom (two-char labels): do NOT fill whole fields; instead fill
+        //    the individual 2°x1° squares that were worked, without drawing the
+        //    square grid lines — so you see green patches inside the field.
+        if (workedGrids.isNotEmpty()) {
+            if (zoom >= GRID_ZOOM_SUB) {
+                for (row in firstRow..lastRow) {
+                    val lat = row * cellLat
+                    if (lat < -90.0 || lat >= 90.0) continue
+                    val topLatCell = lat + cellLat
+                    if (topLatCell > 90.0) continue
+                    val yTop = projectionToY(projection, topLatCell)
+                    val yBottom = projectionToY(projection, lat)
+                    if (yTop == null || yBottom == null) continue
+                    for (col in firstCol..lastCol) {
+                        val lon = col * cellLon
+                        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)
+                        }
                     }
                 }
+            } else {
+                for (grid in workedGrids) {
+                    val cell = gridCellBounds(grid) ?: continue
+                    if (cell.lonRight <= leftLon || cell.lonLeft >= rightLon ||
+                        cell.latTop <= bottomLat || cell.latBottom >= topLat
+                    ) continue
+                    val yTop = projectionToY(projection, cell.latTop) ?: continue
+                    val yBottom = projectionToY(projection, cell.latBottom) ?: continue
+                    val xLeft = projectionToX(projection, cell.lonLeft, centerLon, worldWidthPx) ?: continue
+                    val xRight = projectionToX(projection, cell.lonRight, centerLon, worldWidthPx) ?: continue
+                    if (xRight < 0f || xLeft > canvas.width) continue
+                    if (yBottom < 0f || yTop > canvas.height) continue
+                    canvas.drawRect(xLeft, yTop, xRight, yBottom, workedPaint)
+                }
             }
         }
 
@@ -237,6 +257,30 @@ class MaidenheadGridOverlay : Overlay() {
         return "$field$squareLon$squareLat"
     }
 
+    /**
+     * Geographic bounds of a 4-char Maidenhead square (e.g. "OL62"):
+     * 2° wide in longitude, 1° tall in latitude.
+     */
+    private fun gridCellBounds(grid: String): CellBounds? {
+        val g = grid.trim().uppercase()
+        if (g.length < 4) return null
+        val fieldLon = g[0] - 'A'
+        val fieldLat = g[1] - 'A'
+        val sqLon = g[2] - '0'
+        val sqLat = g[3] - '0'
+        if (fieldLon !in 0..17 || fieldLat !in 0..17 || sqLon !in 0..9 || sqLat !in 0..9) return null
+        val lonLeft = -180.0 + fieldLon * FIELD_LON + sqLon * SUB_SQUARE_LON
+        val latBottom = -90.0 + fieldLat * FIELD_LAT + sqLat * SUB_SQUARE_LAT
+        return CellBounds(lonLeft, lonLeft + SUB_SQUARE_LON, latBottom, latBottom + SUB_SQUARE_LAT)
+    }
+
+    private data class CellBounds(
+        val lonLeft: Double,
+        val lonRight: Double,
+        val latBottom: Double,
+        val latTop: Double
+    )
+
     private fun normalizeLon(lon: Double): Double {
         var l = lon % 360.0
         if (l >= 180.0) l -= 360.0

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

@@ -139,6 +139,10 @@ private fun MapScreen(uiState: MapState, onAction: (MapAction) -> Unit, mapView:
     val isTimeAos = uiState.mapData?.isTimeAos ?: true
 
     LaunchedEffect(uiState.track) {
+        // In grid mode the map is centered on the local grid square; following
+        // the satellite subpoint here would override that centering on every
+        // track update, so skip the tracking animation entirely.
+        if (uiState.isGridMode) return@LaunchedEffect
         val firstPos = uiState.track?.firstOrNull()?.firstOrNull() ?: return@LaunchedEffect
         mapView.controller.animateTo(GeoPoint(firstPos.latitude, firstPos.longitude))
     }

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

@@ -238,10 +238,13 @@ fun LoTWDialog(
     SharedDialog(
         title = stringResource(R.string.prefs_lotw_title),
         onCancel = dismiss,
+        // The confirm button IS the sync action: saving credentials and
+        // fetching confirmed grids happen in one step.
         onAccept = {
-            onSave(com.rtbishop.look4sat.core.domain.model.LoTWSettings(call.value, pass.value))
-            dismiss()
-        }
+            onSync(com.rtbishop.look4sat.core.domain.model.LoTWSettings(call.value, pass.value))
+        },
+        acceptText = stringResource(if (isSyncing) R.string.prefs_lotw_syncing else R.string.prefs_lotw_sync),
+        acceptEnabled = !isSyncing
     ) {
         OutlinedTextField(
             value = call.value,
@@ -273,20 +276,6 @@ fun LoTWDialog(
                 modifier = Modifier.padding(horizontal = LocalSpacing.current.large)
             )
         }
-        // Sync uses the values typed in the fields directly — saving and syncing
-        // happen in one step, no need to close and reopen the dialog.
-        Row(
-            horizontalArrangement = Arrangement.End,
-            modifier = Modifier.fillMaxWidth().padding(horizontal = LocalSpacing.current.large)
-        ) {
-            TextButton(
-                onClick = { onSync(com.rtbishop.look4sat.core.domain.model.LoTWSettings(call.value, pass.value)) },
-                enabled = !isSyncing
-            ) {
-                Text(text = if (isSyncing) stringResource(R.string.prefs_lotw_syncing)
-                else stringResource(R.string.prefs_lotw_sync))
-            }
-        }
         Spacer(modifier = Modifier.height(0.dp))
     }
 }

gradle/libs.versions.toml

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