chore: bump version to v4.4.6-ba7opf.10.3

fix(radar): CW decoder text hidden behind system nav bar on gesture-nav devices
The radar page is a full-screen destination; the transceiver list had no bottom inset padding, so on gesture navigation the translucent system bar floated over the CW decoder's decoded-text output at the end of the list. Add navigationBars height as LazyColumn contentPadding (no-op on three-button nav where the window is already resized).
2026-10-03 11:17:25 +00:00 · 2026-09-12 01:51:13 +08:00 · 2026-09-12 01:22:02 +08:00 · 2026-09-12 01:08:43 +08:00 · 2026-09-12 00:32:59 +08:00 · 2026-09-11 23:58:57 +08:00
10 changed files with 174 additions and 81 deletions
@@ -264,9 +264,6 @@ class LoTWRepository : ILoTWRepository {
    }

    internal fun parseConfirmedGrids(body: String): Set<String>? {
-        // LoTW answers with ADIF text; on bad credentials it returns a short error page
-        // containing "password=?" or an <eoh>-less block. Treat anything without a header
-        // marker as failure so the caller can show a sensible message.
        // LoTW answers with ADIF text; on bad credentials it returns a short error
        // page without an <eoh> header terminator. Real reports always carry <eoh>
        // (LoTW writes it lowercase). Match case-insensitively to be safe.
@@ -277,25 +274,34 @@ class LoTWRepository : ILoTWRepository {
        // QSOs omit it. Grid fields (GRIDSQUARE / VUCC_GRIDS) must only be
        // collected for records whose PROP_MODE is SAT, otherwise the map mixes
        // in terrestrial contacts.
+        //
+        // Buffered per-record pattern (same as parseConfirmedGridQsos): field order
+        // is NOT reliable — ADIF producers (incl. LoTW) emit fields alphabetically,
+        // so <GRIDSQUARE> (G) arrives BEFORE <PROP_MODE> (P) within a record. A
+        // sequential gate ("only add while propMode == SAT") silently drops every
+        // grid on real reports. Buffer the record and decide at <EOR> instead.
        var propMode: String? = null
+        var pendingGrids = mutableListOf<String>()
        for (raw in body.lineSequence()) {
            val line = raw.trim()
            when {
-                line.equals("<EOR>", ignoreCase = true) -> propMode = null
+                line.equals("<EOR>", ignoreCase = true) -> {
+                    if (propMode == "SAT") grids.addAll(pendingGrids)
+                    propMode = null
+                    pendingGrids = mutableListOf()
+                }
                line.startsWith("<PROP_MODE:") -> {
-                    propMode = line.substringAfter('>').substringBefore("E<").trim().uppercase()
+                    propMode = adifValue(line).uppercase()
                }
                line.startsWith("<GRIDSQUARE:") || line.startsWith("<VUCC_GRIDS:") -> {
-                    if (propMode == "SAT") {
-                        // VUCC_GRIDS holds a comma-separated PAIR of grids
-                        // ("EN52en,EN53fa") for contacts spanning two squares —
-                        // split on ',' and take the 4-char field of each, or the
-                        // second grid is silently dropped.
-                        val value = line.substringAfter('>').substringBefore("E<")
-                        value.split(',').forEach { grid ->
-                            val field = grid.trim().uppercase()
-                            if (field.length >= 4) grids.add(field.take(4))
-                        }
+                    // VUCC_GRIDS holds a comma-separated PAIR of grids
+                    // ("EN52en,EN53fa") for contacts spanning two squares —
+                    // split on ',' and take the 4-char field of each, or the
+                    // second grid is silently dropped.
+                    val value = adifValue(line)
+                    value.split(',').forEach { grid ->
+                        val field = grid.trim().uppercase()
+                        if (field.length >= 4) pendingGrids.add(field.take(4))
                    }
                }
            }
@@ -314,22 +320,30 @@ class LoTWRepository : ILoTWRepository {
    internal fun parseRoamedGrids(body: String): Set<String>? {
        if (!body.contains("<eoh>", ignoreCase = true)) return null
        val grids = mutableSetOf<String>()
+        // Buffered per-record pattern (same as parseConfirmedGridQsos): field
+        // order is NOT reliable — ADIF producers (incl. LoTW) emit fields
+        // alphabetically, so <MY_GRIDSQUARE> (M) arrives BEFORE <PROP_MODE> (P)
+        // within a record. A sequential gate ("only add while propMode == SAT")
+        // would silently drop every own grid on real reports; buffer the record
+        // and decide at <EOR> instead.
        var propMode: String? = null
+        var myGrid: String? = null
        for (raw in body.lineSequence()) {
            val line = raw.trim()
            when {
-                line.equals("<EOR>", ignoreCase = true) -> propMode = null
+                line.equals("<EOR>", ignoreCase = true) -> {
+                    if (propMode == "SAT" && myGrid != null) grids.add(myGrid)
+                    propMode = null
+                    myGrid = null
+                }
                line.startsWith("<PROP_MODE:") -> {
-                    propMode = line.substringAfter('>').substringBefore("E<").trim().uppercase()
+                    propMode = adifValue(line).uppercase()
                }
                line.startsWith("<MY_GRIDSQUARE:") -> {
                    // MY_GRIDSQUARE must not be mistaken for GRIDSQUARE (the
                    // opposite station's grid) — only own-station grids count.
-                    if (propMode == "SAT") {
-                        val value = line.substringAfter('>').substringBefore("E<")
-                        val field = value.trim().uppercase()
-                        if (field.length >= 4) grids.add(field.take(4))
-                    }
+                    val value = adifValue(line)
+                    if (value.length >= 4) myGrid = value.take(4)
                }
            }
        }
@@ -61,6 +61,28 @@ class LoTWRepositoryTest {
        assertEquals(setOf("OL62"), result)
    }

+    @Test
+    fun parseHandlesAlphabeticalFieldOrder() {
+        // Real lotwreport.adi emits fields in ALPHABETICAL order: GRIDSQUARE (G)
+        // and VUCC_GRIDS come BEFORE PROP_MODE (P) inside each record. The old
+        // sequential gate (add only while propMode == SAT) dropped every grid on
+        // real reports — the buffered parser must collect them regardless of
+        // field order and filter at <EOR>.
+        val satQso = "<CALL:6>BA7OPF\n" +
+            "<GRIDSQUARE:4>NL47\n" +
+            "<MODE:3>FM\n" +
+            "<PROP_MODE:3>SAT\n" +
+            "<SAT_NAME:5>FO-29\n" +
+            "<VUCC_GRIDS:11>EN52en,EN53fa\n" +
+            "<EOR>\n"
+        val groundQso = "<CALL:6>BA7OPF\n" +
+            "<GRIDSQUARE:4>PM95\n" +
+            "<QSO_DATE:8>20260821\n" +
+            "<EOR>\n"
+        val result = repo.parseConfirmedGrids(report(satQso, groundQso))
+        assertEquals(setOf("NL47", "EN52", "EN53"), result)
+    }
+
    @Test
    fun parseReturnsEmptySetForReportWithoutGrids() {
        val satQso = "<PROP_MODE:3>SAT\n<SAT_NAME:5>AO-07\n<EOR>\n"
@@ -163,6 +185,21 @@ class LoTWRepositoryTest {
        assertEquals(setOf("OL62"), repo.parseRoamedGrids(report(qso)))
    }

+    @Test
+    fun parseRoamedGridsHandlesAlphabeticalFieldOrder() {
+        // Real lotwreport.adi emits fields alphabetically, so <MY_GRIDSQUARE>
+        // (M) arrives BEFORE <PROP_MODE> (P). The old sequential gate (add only
+        // while propMode == SAT) silently returned an EMPTY set on real reports —
+        // this is the exact bug that made the blue roamed stripes never appear.
+        val qso = "<CALL:6>BA7OPF\n" +
+            "<GRIDSQUARE:4>PM95\n" +
+            "<MY_GRIDSQUARE:6>OL72XX\n" +
+            "<PROP_MODE:3>SAT\n" +
+            "<SAT_NAME:5>IO-86\n" +
+            "<EOR>\n"
+        assertEquals(setOf("OL72"), repo.parseRoamedGrids(report(qso)))
+    }
+
    @Test
    fun parseRoamedGridsRejectsBodyWithoutEoh() {
        assertNull(repo.parseRoamedGrids("<HTML>Username/password incorrect</HTML>"))
@@ -1 +1 @@
-{"type":"dxcc","regions":[{"id":0,"code":176,"name":"Fiji","label_lon":177.9759,"label_lat":-17.9376,"rings":[[[180.0,-16.0671],[180.0,-16.5552],[179.3641,-16.8014],[178.7251,-17.012],[178.5968,-16.6392],[179.0966,-16.434],[179.4135,-16.3791]],[[178.1256,-17.5048],[178.3736,-17.3399],[178.7181,-17.6285],[178.5527,-18.1506],[177.9327,-18.288],[177.3815,-18.1643],[177.285,-17.7247],[177.6709,-17.3811]],[[-179.7933,-16.0209],[-179.9174,-16.5018],[-180.0,-16.5552],[-180.0,-16.0671]]]},{"id":1,"code":470,"name":"Tanzania","label_lon":34.1421,"label_lat":-6.2078,"rings":[[[33.9037,-0.95],[34.0726,-1.0598],[37.6987,-3.097],[37.7669,-3.6771],[39.2022,-4.6768],[38.7405,-5.9089],[38.7998,-6.4757],[39.44,-6.84],[39.47,-7.1],[39.1947,-7.7039],[39.252,-8.0078],[39.1865,-8.4855],[39.5357,-9.1124],[39.9496,-10.0984],[40.3166,-10.3171],[40.3166,-10.3171],[39.521,-10.8969],[38.4276,-11.2852],[37.8276,-11.2688],[37.4713,-11.5688],[36.7752,-11.5945],[36.5141,-11.7209],[35.3124,-11.4391],[34.56,-11.52],[34.28,-10.16],[33.9408,-9.6937],[33.7397,-9.4171],[32.7594,-9.2306],[32.1919,-8.9304],[31.5563,-8.762],[31.1578,-8.5946],[30.74,-8.34],[30.74,-8.34],[30.2,-7.08],[29.62,-6.52],[29.42,-5.94],[29.52,-5.42],[29.34,-4.5],[29.7535,-4.4524],[30.1163,-4.0901],[30.5055,-3.5686],[30.7522,-3.3593],[30.743,-3.0343],[30.5277,-2.8076],[30.4697,-2.4139],[30.4697,-2.4138],[30.7583,-2.2872],[30.8161,-1.6989],[30.4191,-1.1347],[30.7699,-1.0146],[31.8662,-1.0274]]]},{"id":2,"code":302,"name":"W. Sahara","label_lon":-12.572,"label_lat":24.2306,"rings":[[[-8.6656,27.6564],[-8.6651,27.5895],[-8.6844,27.3957],[-8.6873,25.8811],[-11.9694,25.9334],[-11.9372,23.3746],[-12.8742,23.2848],[-13.1188,22.7712],[-12.9291,21.3271],[-16.8452,21.3333],[-17.0634,20.9998],[-17.0204,21.4223],[-17.003,21.4207],[-14.751,21.5006],[-14.6308,21.8609],[-14.2212,22.3102],[-13.8911,23.691],[-12.501,24.7701],[-12.0308,26.0309],[-11.7182,26.1041],[-11.3926,26.8834],[-10.5513,26.9908],[-10.1894,26.8609],[-9.7353,26.8609],[-9.413,27.0885],[-8.7949,27.1207],[-8.8178,27.6564]]]},{"id":3,"code":1,"name":"Canada","label_lon":-110.2438,"label_lat":56.7019,"rings":[[[-122.84,49.0],[-122.9742,49.0025],[-124.9102,49.9846],[-125.6246,50.4166],[-127.4356,50.8306],[-127.9928,51.7158],[-127.8503,52.3296],[-129.1298,52.7554],[-129.3052,53.5616],[-130.515,54.2876],[-130.5361,54.8028],[-130.5361,54.8028],[-129.98,55.285],[-130.0078,55.9158],[-131.7078,56.5521],[-132.7304,57.6929],[-133.3556,58.4103],[-134.2711,58.8611],[-134.945,59.2706],[-135.4758,59.7878],[-136.4797,59.4639],[-137.4525,58.905],[-138.3409,59.5621],[-139.039,60.0],[-140.013,60.2768],[-140.9978,60.3064],[-140.9925,66.0],[-140.986,69.712],[-140.986,69.712],[-139.1205,69.471],[-137.5464,68.99],[-136.5036,68.898],[-135.6258,69.3151],[-134.4146,69.6274],[-132.9292,69.5053],[-131.4314,69.9445],[-129.7947,70.1937],[-129.1077,69.7793],[-128.3616,70.0129],[-128.1382,70.4838],[-127.4471,70.3772],[-125.7563,69.4806],[-124.4248,70.1584],[-124.2897,69.3997],[-123.0611,69.5637],[-122.6835,69.8555],[-121.4723,69.7978],[-119.9429,69.3779],[-117.6027,69.0113],[-116.2264,68.8415],[-115.2469,68.9059],[-113.8979,68.3989],[-115.3049,67.9026],[-113.4973,67.6881],[-110.798,67.8061],[-109.9462,67.981],[-108.8802,67.3814],[-107.7924,67.8874],[-108.813,68.3116],[-108.1672,68.6539],[-106.95,68.7],[-106.15,68.8],[-105.3428,68.5612],[-104.3379,68.018],[-103.2211,68.0978],[-101.4543,67.6469],[-99.9019,67.8057],[-98.4432,67.7816],[-98.5586,68.4039],[-97.6695,68.5786],[-96.1199,68.2394],[-96.1259,67.2934],[-95.4894,68.0907],[-94.685,68.0638],[-94.2328,69.069],[-95.3041,69.6857],[-96.4713,70.0898],[-96.3911,71.1948],[-95.2088,71.9205],[-93.89,71.7601],[-92.8782,71.3187],[-91.5196,70.1913],[-92.4069,69.7],[-90.5471,69.4977],[-90.5515,68.475],[-89.2151,69.2587],[-88.0197,68.6151],[-88.3175,67.8734],[-87.3502,67.1987],[-86.3061,67.9215],[-85.5766,68.7846],[-85.522,69.8821],[-84.1008,69.8054],[-82.6226,69.6583],[-81.2804,69.162],[-81.2202,68.6657],[-81.9644,68.1325],[-81.2593,67.5972],[-81.3865,67.1108],[-83.3446,66.4115],[-84.7354,66.2573],[-85.7694,66.5583],[-86.0676,66.0563],[-87.0314,65.213],[-87.3232,64.7756],[-88.483,64.099],[-89.9144,64.0327],[-90.704,63.6102],[-90.77,62.9602],[-91.9334,62.8351],[-93.157,62.0247],[-94.2415,60.8987],[-94.6293,60.1102],[-94.6846,58.9488],[-93.215,58.7821],[-92.7646,57.8457],[-92.297,57.0871],[-90.8977,57.2847],[-89.0395,56.8517],[-88.0398,56.4716],[-87.3242,55.9991],[-86.0712,55.7238],[-85.0118,55.3026],[-83.3606,55.2449],[-82.2729,55.1483],[-82.4362,54.2823],[-82.125,53.277],[-81.4008,52.1579],[-79.9129,51.2084],[-79.143,51.5339],[-78.6019,52.5621],[-79.1242,54.1414],[-79.8296,54.6677],[-78.2287,55.1365],[-77.0956,55.8374],[-76.5414,56.5342],[-76.6232,57.2026],[-77.3023,58.0521],[-78.5169,58.8046],[-77.3368,59.8526],[-77.7727,60.7579],[-78.1069,62.3196],[-77.4107,62.5505],[-75.6962,62.2784],[-74.6682,62.1811],[-73.8399,62.4438],[-72.9085,62.1051],[-71.6771,61.5254],[-71.3737,61.1372],[-69.5904,61.0614],[-69.6203,60.2212]Line truncated
+{"type":"dxcc","regions":[{"id":0,"code":176,"name":"Fiji","label_lon":177.9759,"label_lat":-17.9376,"rings":[[[180.0,-16.0671],[180.0,-16.5552],[179.3641,-16.8014],[178.7251,-17.012],[178.5968,-16.6392],[179.0966,-16.434],[179.4135,-16.3791]],[[178.1256,-17.5048],[178.3736,-17.3399],[178.7181,-17.6285],[178.5527,-18.1506],[177.9327,-18.288],[177.3815,-18.1643],[177.285,-17.7247],[177.6709,-17.3811]],[[-179.7933,-16.0209],[-179.9174,-16.5018],[-180.0,-16.5552],[-180.0,-16.0671]]]},{"id":1,"code":470,"name":"Tanzania","label_lon":34.1421,"label_lat":-6.2078,"rings":[[[33.9037,-0.95],[34.0726,-1.0598],[37.6987,-3.097],[37.7669,-3.6771],[39.2022,-4.6768],[38.7405,-5.9089],[38.7998,-6.4757],[39.44,-6.84],[39.47,-7.1],[39.1947,-7.7039],[39.252,-8.0078],[39.1865,-8.4855],[39.5357,-9.1124],[39.9496,-10.0984],[40.3166,-10.3171],[40.3166,-10.3171],[39.521,-10.8969],[38.4276,-11.2852],[37.8276,-11.2688],[37.4713,-11.5688],[36.7752,-11.5945],[36.5141,-11.7209],[35.3124,-11.4391],[34.56,-11.52],[34.28,-10.16],[33.9408,-9.6937],[33.7397,-9.4171],[32.7594,-9.2306],[32.1919,-8.9304],[31.5563,-8.762],[31.1578,-8.5946],[30.74,-8.34],[30.74,-8.34],[30.2,-7.08],[29.62,-6.52],[29.42,-5.94],[29.52,-5.42],[29.34,-4.5],[29.7535,-4.4524],[30.1163,-4.0901],[30.5055,-3.5686],[30.7522,-3.3593],[30.743,-3.0343],[30.5277,-2.8076],[30.4697,-2.4139],[30.4697,-2.4138],[30.7583,-2.2872],[30.8161,-1.6989],[30.4191,-1.1347],[30.7699,-1.0146],[31.8662,-1.0274]]]},{"id":2,"code":302,"name":"W. Sahara","label_lon":-12.572,"label_lat":24.2306,"rings":[[[-8.6656,27.6564],[-8.6651,27.5895],[-8.6844,27.3957],[-8.6873,25.8811],[-11.9694,25.9334],[-11.9372,23.3746],[-12.8742,23.2848],[-13.1188,22.7712],[-12.9291,21.3271],[-16.8452,21.3333],[-17.0634,20.9998],[-17.0204,21.4223],[-17.003,21.4207],[-14.751,21.5006],[-14.6308,21.8609],[-14.2212,22.3102],[-13.8911,23.691],[-12.501,24.7701],[-12.0308,26.0309],[-11.7182,26.1041],[-11.3926,26.8834],[-10.5513,26.9908],[-10.1894,26.8609],[-9.7353,26.8609],[-9.413,27.0885],[-8.7949,27.1207],[-8.8178,27.6564]]]},{"id":3,"code":1,"name":"Canada","label_lon":-110.2438,"label_lat":56.7019,"rings":[[[-122.84,49.0],[-122.9742,49.0025],[-124.9102,49.9846],[-125.6246,50.4166],[-127.4356,50.8306],[-127.9928,51.7158],[-127.8503,52.3296],[-129.1298,52.7554],[-129.3052,53.5616],[-130.515,54.2876],[-130.5361,54.8028],[-130.5361,54.8028],[-129.98,55.285],[-130.0078,55.9158],[-131.7078,56.5521],[-132.7304,57.6929],[-133.3556,58.4103],[-134.2711,58.8611],[-134.945,59.2706],[-135.4758,59.7878],[-136.4797,59.4639],[-137.4525,58.905],[-138.3409,59.5621],[-139.039,60.0],[-140.013,60.2768],[-140.9978,60.3064],[-140.9925,66.0],[-140.986,69.712],[-140.986,69.712],[-139.1205,69.471],[-137.5464,68.99],[-136.5036,68.898],[-135.6258,69.3151],[-134.4146,69.6274],[-132.9292,69.5053],[-131.4314,69.9445],[-129.7947,70.1937],[-129.1077,69.7793],[-128.3616,70.0129],[-128.1382,70.4838],[-127.4471,70.3772],[-125.7563,69.4806],[-124.4248,70.1584],[-124.2897,69.3997],[-123.0611,69.5637],[-122.6835,69.8555],[-121.4723,69.7978],[-119.9429,69.3779],[-117.6027,69.0113],[-116.2264,68.8415],[-115.2469,68.9059],[-113.8979,68.3989],[-115.3049,67.9026],[-113.4973,67.6881],[-110.798,67.8061],[-109.9462,67.981],[-108.8802,67.3814],[-107.7924,67.8874],[-108.813,68.3116],[-108.1672,68.6539],[-106.95,68.7],[-106.15,68.8],[-105.3428,68.5612],[-104.3379,68.018],[-103.2211,68.0978],[-101.4543,67.6469],[-99.9019,67.8057],[-98.4432,67.7816],[-98.5586,68.4039],[-97.6695,68.5786],[-96.1199,68.2394],[-96.1259,67.2934],[-95.4894,68.0907],[-94.685,68.0638],[-94.2328,69.069],[-95.3041,69.6857],[-96.4713,70.0898],[-96.3911,71.1948],[-95.2088,71.9205],[-93.89,71.7601],[-92.8782,71.3187],[-91.5196,70.1913],[-92.4069,69.7],[-90.5471,69.4977],[-90.5515,68.475],[-89.2151,69.2587],[-88.0197,68.6151],[-88.3175,67.8734],[-87.3502,67.1987],[-86.3061,67.9215],[-85.5766,68.7846],[-85.522,69.8821],[-84.1008,69.8054],[-82.6226,69.6583],[-81.2804,69.162],[-81.2202,68.6657],[-81.9644,68.1325],[-81.2593,67.5972],[-81.3865,67.1108],[-83.3446,66.4115],[-84.7354,66.2573],[-85.7694,66.5583],[-86.0676,66.0563],[-87.0314,65.213],[-87.3232,64.7756],[-88.483,64.099],[-89.9144,64.0327],[-90.704,63.6102],[-90.77,62.9602],[-91.9334,62.8351],[-93.157,62.0247],[-94.2415,60.8987],[-94.6293,60.1102],[-94.6846,58.9488],[-93.215,58.7821],[-92.7646,57.8457],[-92.297,57.0871],[-90.8977,57.2847],[-89.0395,56.8517],[-88.0398,56.4716],[-87.3242,55.9991],[-86.0712,55.7238],[-85.0118,55.3026],[-83.3606,55.2449],[-82.2729,55.1483],[-82.4362,54.2823],[-82.125,53.277],[-81.4008,52.1579],[-79.9129,51.2084],[-79.143,51.5339],[-78.6019,52.5621],[-79.1242,54.1414],[-79.8296,54.6677],[-78.2287,55.1365],[-77.0956,55.8374],[-76.5414,56.5342],[-76.6232,57.2026],[-77.3023,58.0521],[-78.5169,58.8046],[-77.3368,59.8526],[-77.7727,60.7579],[-78.1069,62.3196],[-77.4107,62.5505],[-75.6962,62.2784],[-74.6682,62.1811],[-73.8399,62.4438],[-72.9085,62.1051],[-71.6771,61.5254],[-71.3737,61.1372],[-69.5904,61.0614],[-69.6203,60.2212]Line truncated
@@ -58,16 +58,17 @@ class MaidenheadGridOverlay : Overlay() {
    }
    private val roamStripePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
        style = Paint.Style.STROKE
-        strokeWidth = 7f
-        // Fully opaque blue: stripe bands stay pure blue even over a green
-        // worked fill — no alpha blend into a teal/green mix (user requirement:
-        // the two colors must never stack into a single mixed color).
-        color = Color.argb(255, 66, 133, 244)
+        strokeWidth = 14f
+        // Same alpha as the green worked fill (90) — user req: stripe opacity
+        // must match the green grid. Wide 14f stripes at 44f spacing read as a
+        // sparse GridMaster-style zebra (user picked spacing 44 / width 14).
+        color = Color.argb(90, 66, 133, 244)
    }
    private val ownLinePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
        strokeWidth = 6f
        style = Paint.Style.STROKE
-        color = Color.argb(255, 90, 200, 255)
+        // 与普通网格线同色(淡黄), 仅加粗 — 用户要求当前网格框线不换色
+        color = Color.argb(160, 255, 224, 130)
    }
    private val selectedLinePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
        strokeWidth = 4.5f
@@ -134,11 +135,13 @@ class MaidenheadGridOverlay : Overlay() {
        val worldTurns = ceil(((rightLon - leftLon) / 360.0) - 1e-9).toInt().coerceAtLeast(0)
        val colRepeats = if (worldTurns > 0) worldTurns else 0

-        // The station's own grid: 4-char square at sub-square zoom, 2-char
-        // field at field zoom. Always marked so the "you are here" outline is
-        // visible even at the default entry zoom (below GRID_ZOOM_SUB).
-        val ownCell = ownGrid?.let { if (zoom >= GRID_ZOOM_SUB) it else it.take(2) }
-        // The tapped worked grid gets a distinct outline (same zoom gate).
+        // The station's own grid: always keep a bold outline of the 4-char
+        // square. At sub-square zoom it matches the visible cell grid; at field
+        // zoom (2-char labels) the own 2°x1° square is drawn on top of the
+        // field grid so the operator still sees exactly where they are (user
+        // req: "field zoom must also draw the own 4-char grid, bolded").
+        val ownCell = ownGrid
+        // The tapped worked grid gets a distinct outline (sub-square zoom only).
        val selectedCell = selectedGrid?.takeIf { zoom >= GRID_ZOOM_SUB }

        // Worked-grid highlight fills.
@@ -292,22 +295,50 @@ class MaidenheadGridOverlay : Overlay() {
        // The station's own grid square: redraw its four borders thicker on top.
        // The tapped worked grid gets the same treatment in a different color.
        if (ownCell != null || selectedCell != null) {
-            for (row in firstRow..lastRow) {
-                val lat = row * cellLat
-                if (lat < -90.0 || lat >= 90.0) continue
-                for (col in firstCol..lastCol) {
-                    val lon = col * cellLon
-                    val label = cellLabel(lat, lon, zoom)
-                    if (label != ownCell && label != selectedCell) continue
-                    val yTop = projectionToY(projection, lat + cellLat) ?: continue
-                    val yBottom = projectionToY(projection, lat) ?: continue
-                    val xLeft = projectionToX(projection, lon, centerLon, worldWidthPx) ?: continue
-                    val xRight = projectionToX(projection, lon + cellLon, centerLon, worldWidthPx) ?: continue
-                    val paint = if (label == selectedCell) selectedLinePaint else ownLinePaint
-                    canvas.drawLine(xLeft, yTop, xRight, yTop, paint)
-                    canvas.drawLine(xLeft, yBottom, xRight, yBottom, paint)
-                    canvas.drawLine(xLeft, yTop, xLeft, yBottom, paint)
-                    canvas.drawLine(xRight, yTop, xRight, yBottom, paint)
+            if (zoom >= GRID_ZOOM_SUB) {
+                for (row in firstRow..lastRow) {
+                    val lat = row * cellLat
+                    if (lat < -90.0 || lat >= 90.0) continue
+                    for (col in firstCol..lastCol) {
+                        val lon = col * cellLon
+                        val label = cellLabel(lat, lon, zoom)
+                        if (label != ownCell && label != selectedCell) continue
+                        val yTop = projectionToY(projection, lat + cellLat) ?: continue
+                        val yBottom = projectionToY(projection, lat) ?: continue
+                        val xLeft = projectionToX(projection, lon, centerLon, worldWidthPx) ?: continue
+                        val xRight = projectionToX(projection, lon + cellLon, centerLon, worldWidthPx) ?: continue
+                        val paint = if (label == selectedCell) selectedLinePaint else ownLinePaint
+                        canvas.drawLine(xLeft, yTop, xRight, yTop, paint)
+                        canvas.drawLine(xLeft, yBottom, xRight, yBottom, paint)
+                        canvas.drawLine(xLeft, yTop, xLeft, yBottom, paint)
+                        canvas.drawLine(xRight, yTop, xRight, yBottom, paint)
+                    }
+                }
+            } else {
+                // Field zoom: the visible grid shows 2-char fields only, but the
+                // station's own 2°x1° square still gets its bold outline drawn
+                // on top of the field grid (user req). selectedCell is null here.
+                val grid = ownCell
+                if (grid != null) {
+                    val cell = gridCellBounds(grid)
+                    if (cell != null) {
+                        for (turn in -colRepeats..colRepeats) {
+                            val dLon = turn * 360.0
+                            if (cell.lonRight + dLon <= leftLon || cell.lonLeft + dLon >= rightLon) continue
+                            val yTop = projectionToY(projection, cell.latTop) ?: continue
+                            val yBottom = projectionToY(projection, cell.latBottom) ?: continue
+                            val xLeftBase = projectionToX(projection, cell.lonLeft, centerLon, worldWidthPx) ?: continue
+                            val xRightBase = projectionToX(projection, cell.lonRight, centerLon, worldWidthPx) ?: continue
+                            val xLeft = xLeftBase + turn * worldWidthPx.toFloat()
+                            val xRight = xRightBase + turn * worldWidthPx.toFloat()
+                            if (xRight < 0f || xLeft > canvas.width) continue
+                            if (yBottom < 0f || yTop > canvas.height) continue
+                            canvas.drawLine(xLeft, yTop, xRight, yTop, ownLinePaint)
+                            canvas.drawLine(xLeft, yBottom, xRight, yBottom, ownLinePaint)
+                            canvas.drawLine(xLeft, yTop, xLeft, yBottom, ownLinePaint)
+                            canvas.drawLine(xRight, yTop, xRight, yBottom, ownLinePaint)
+                        }
+                    }
                }
            }
        }
@@ -337,8 +368,14 @@ class MaidenheadGridOverlay : Overlay() {
            if (topLatCell > 90.0) continue
            val yTop = projectionToY(projection, topLatCell) ?: continue
            val yBottom = projectionToY(projection, lat) ?: continue
-            val yCenter = (yTop + yBottom) / 2f - textHalfHeight
-            if (yBottom < 0f || yTop > canvas.height) continue
+            // Polar bands (80..90 / -90..-80) extend beyond the map's latitude
+            // limit, so their geometric center falls off-screen and the label
+            // would never be visible. Center the label in the VISIBLE part of
+            // the cell instead; fully off-screen cells are still skipped.
+            val visTop = maxOf(yTop, 0f)
+            val visBottom = minOf(yBottom, canvas.height.toFloat())
+            if (visBottom < 0f || visTop > canvas.height) continue
+            val yCenter = (visTop + visBottom) / 2f - textHalfHeight
            for (turn in -colRepeats..colRepeats) for (col in firstCol..lastCol) {
                val lon = col * cellLon
                // World-repeat copies: keep the turn offset in pixels (same
@@ -458,6 +495,8 @@ class MaidenheadGridOverlay : Overlay() {
        const val MIN_LABEL_CELL_PX = 48f
        const val MAX_OVERSHOOT_PX = 64
        /** Center-to-center spacing of the roamed-grid zebra stripes, in px. */
-        const val STRIPE_SPACING_PX = 16f
+        // 44f spacing (was 16f — too dense per user) with 14f-wide stripes;
+        // sparse GridMaster-style zebra.
+        const val STRIPE_SPACING_PX = 44f
    }
 }
@@ -256,7 +256,8 @@ private fun MapScreen(uiState: MapState, onAction: (MapAction) -> Unit, mapView:
                        val shouldCenter = uiState.isGridMode && !prevGridMode
                        setGridMode(
                            uiState.isGridMode, uiState.workedGrids, uiState.roamedGrids, view,
-                            if (shouldCenter) uiState.stationPosition else null
+                            uiState.stationPosition,
+                            centerOnStation = shouldCenter
                        )
                        if (!shouldCenter || uiState.stationPosition != null) {
                            prevGridMode = uiState.isGridMode
@@ -639,7 +640,8 @@ private fun setGridMode(
    workedGrids: Set<String>,
    roamedGrids: Set<String>,
    mapView: MapView,
-    stationPosition: GeoPos?
+    stationPosition: GeoPos?,
+    centerOnStation: Boolean = false
 ) {
    try {
        val gridOverlay = mapView.overlays[OVERLAY_GRID]
@@ -647,6 +649,9 @@ private fun setGridMode(
            gridOverlay.isEnabled = gridMode
            gridOverlay.workedGrids = workedGrids
            gridOverlay.roamedGrids = roamedGrids
+            // ownGrid must be set on EVERY update — the position is available
+            // regardless of whether this frame centers (centering happens only
+            // on entry, but passing null here would wipe the bold outline).
            gridOverlay.ownGrid = ownGridOf(stationPosition)
        } else {
            mapView.overlays[OVERLAY_GRID] = MaidenheadGridOverlay().apply {
@@ -666,7 +671,7 @@ private fun setGridMode(
        // first composition this runs before MapView's first layout, and a
        // setCenter issued pre-layout is discarded when the view lays out —
        // the map then keeps its default center forever.
-        if (gridMode) {
+        if (gridMode && centerOnStation) {
            val pos = stationPosition ?: return
            val lat = pos.latitude
            val lon = pos.longitude
@@ -156,7 +156,7 @@ private fun PassesScreen(
            TopBar(
                isVerticalLayout = isVerticalLayout,
                startAction = {
-                    IconCard(action = { onAction(PassesAction.TogglePassesDialog) }, resId = R.drawable.ic_filter)
+                    IconCard(action = { onAction(PassesAction.ToggleRadiosDialog) }, resId = R.drawable.ic_radios)
                },
                topInfo = {
                    TimerRow(timeString = uiState.nextTime, isTimeAos = uiState.isNextTimeAos)
@@ -165,19 +165,7 @@ private fun PassesScreen(
                    NextPassRow(pass = uiState.nextPass, isUtc = uiState.isUtc)
                },
                endAction = {
-                    // 日程功能: 把下个过境写入系统日历 (原仓库雷达页的 addToCalendar).
-                    IconCard(
-                        action = {
-                            onAction(
-                                PassesAction.AddToCalendar(
-                                    uiState.nextPass.name,
-                                    uiState.nextPass.aosTime,
-                                    uiState.nextPass.losTime
-                                )
-                            )
-                        },
-                        resId = R.drawable.ic_calendar
-                    )
+                    IconCard(action = { onAction(PassesAction.TogglePassesDialog) }, resId = R.drawable.ic_filter)
                }
            )
        }
@@ -61,6 +61,4 @@ sealed interface PassesAction {
    data object ToggleRadiosDialog : PassesAction
    data class FocusCatNum(val catNum: Int) : PassesAction
    data object ClearFocus : PassesAction
-    /** 日程功能: 把下个过境写入系统日历 (ic_calendar 按钮). */
-    data class AddToCalendar(val name: String, val aosTime: Long, val losTime: Long) : PassesAction
 }
@@ -28,7 +28,6 @@ import com.rtbishop.look4sat.core.domain.predict.OrbitalPass
 import com.rtbishop.look4sat.core.domain.repository.IMainContainer
 import com.rtbishop.look4sat.core.domain.repository.ISatelliteRepo
 import com.rtbishop.look4sat.core.domain.repository.ISettingsRepo
-import com.rtbishop.look4sat.core.domain.usecase.IAddToCalendar
 import com.rtbishop.look4sat.core.domain.utility.round
 import com.rtbishop.look4sat.core.domain.utility.toTimerString
 import com.rtbishop.look4sat.core.presentation.getDefaultPass
@@ -47,8 +46,7 @@ import java.util.TimeZone

 class PassesViewModel(
    private val satelliteRepo: ISatelliteRepo,
-    private val settingsRepo: ISettingsRepo,
-    private val addToCalendar: IAddToCalendar
+    private val settingsRepo: ISettingsRepo
 ) : ViewModel() {

    private val defaultPass = getDefaultPass()
@@ -153,8 +151,6 @@ class PassesViewModel(
                _uiState.update { it.copy(isRadiosDialogShown = !it.isRadiosDialogShown) }
            is PassesAction.FocusCatNum -> _uiState.update { it.copy(focusedCatNum = action.catNum) }
            PassesAction.ClearFocus -> _uiState.update { it.copy(focusedCatNum = null) }
-            is PassesAction.AddToCalendar ->
-                addToCalendar(action.name, action.aosTime, action.losTime)
        }
    }

@@ -349,8 +345,7 @@ class PassesViewModel(
            initializer {
                PassesViewModel(
                    satelliteRepo = container.satelliteRepo,
-                    settingsRepo = container.settingsRepo,
-                    addToCalendar = container.provideAddToCalendar()
+                    settingsRepo = container.settingsRepo
                )
            }
        }
@@ -48,6 +48,8 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Button
 import androidx.compose.material3.FilterChip
@@ -78,6 +80,7 @@ import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
@@ -123,7 +126,21 @@ fun TransceiversPage(
                }
            }
        }
-        LazyColumn(modifier = modifier.fillMaxSize(), state = listState) {
+        // contentPadding for the system navigation bar: the radar page is a
+        // full-screen destination, so on gesture-nav devices the translucent
+        // nav bar floats over the list bottom and covers the CW decoder's
+        // decoded-text output when the panel is scrolled to the end. Padding
+        // the last item above the bar fixes it (three-button nav already
+        // resizes the window, where this padding is a harmless no-op).
+        LazyColumn(
+            modifier = modifier.fillMaxSize(),
+            state = listState,
+            contentPadding = PaddingValues(
+                bottom = with(LocalDensity.current) {
+                    (WindowInsets.navigationBars.getBottom(this) / density).dp
+                }
+            )
+        ) {
            itemsIndexed(items = transceivers, key = { _, radio -> radio.uuid }) { _, radio ->
                val isExpanded = radio.uuid == selectedUuid
                TransceiverItem(
@@ -2,7 +2,7 @@
 #noinspection UnusedVersionCatalogEntry
 appVersionCode = "468"
 #noinspection UnusedVersionCatalogEntry
-appVersionName = "4.4.6-ba7opf.10"
+appVersionName = "4.4.6-ba7opf.10.3"
 #noinspection UnusedVersionCatalogEntry
 compileSdk = "37"
 #noinspection UnusedVersionCatalogEntry
Author	SHA1	Message	Date
atsunatsu	2d76aeda23	chore: bump version to v4.4.6-ba7opf.10.3	2026-09-12 01:51:13 +08:00
atsunatsu	ecc24fd836	fix(radar): CW decoder text hidden behind system nav bar on gesture-nav devices The radar page is a full-screen destination; the transceiver list had no bottom inset padding, so on gesture navigation the translucent system bar floated over the CW decoder's decoded-text output at the end of the list. Add navigationBars height as LazyColumn contentPadding (no-op on three-button nav where the window is already resized).	2026-09-12 01:22:02 +08:00
atsunatsu	689f08881c	fix(map): dxcc boundary aligns with Chinese official claim — Zangnan + Karakoram corridor - Zangnan (Arunachal Pradesh): China ring south edge moved from the de-facto line to the official claim (DataV Tibet south arc); India ring's Arunachal protrusion removed so the region shows as China (both rings share the new boundary). Verified: Zangnan points in China ring only, Assam stays India. - Karakoram corridor / Shaksgam valley (China-controlled since 1963): the coarse 13-pt west segment (Karakoram Pass -> Afghan/Tajik corner) replaced with the official Xinjiang south arc (232 pts) — the valley is now inside the China ring. Aksai Chin was already correct; no other entity deviates from the official map (SCS islands follow their own DXCC entities).	2026-09-12 01:08:43 +08:00
atsunatsu	d467200a45	style(map): roamed stripes — 44f spacing, 14f width, alpha 90 (match green fill) User picked the spacing-44/width-14 GridMaster-style zebra from the preview grid; opacity lowered to the same alpha as the worked green fill (90).	2026-09-12 00:32:59 +08:00
atsunatsu	6277e36a96	feat(map): own 4-char grid bold outline also at field zoom; bump v4.4.6-ba7opf.10.2 Field zoom (2-char labels) now draws the station's own 2°x1° square outline on top of the field grid, so the operator always sees their exact grid. Polar labels + order-independent LoTW parsing fixes ride along in this release.	2026-09-11 23:58:57 +08:00
atsunatsu	08a5c8c460	fix(lotw): order-independent ADIF parsing — roamed/work grids dropped by sequential PROP_MODE gate parseConfirmedGrids and parseRoamedGrids gated grid fields on propMode == SAT at the moment the field line was read. LoTW emits ADIF fields alphabetically (GRIDSQUARE/MY_GRIDSQUARE before PROP_MODE), so the gate was never satisfied on real reports: the worked set AND the roamed set silently came back empty. Both parsers now buffer the record and decide at <EOR>, matching the proven parseConfirmedGridQsos pattern. Regression tests cover the alphabetical order.	2026-09-11 23:47:08 +08:00
atsunatsu	1ffb5ed9e8	fix(map): polar 2-char labels visible + own-grid bold only at sub-square zoom - Polar bands (80..90 / -90..-80) extend past the map's latitude limit, so their label center fell off-screen and the labels never rendered. Labels are now centered in the VISIBLE part of the cell; fully off-screen cells are still skipped. Verified with a projection-accurate simulation render: Arctic band shows IR/JR, Antarctic band shows IA/JA, ±80 lines intact. - Own-grid bold outline is drawn only at sub-square zoom (zoom >= 6): at field zoom (2-char labels) the current grid is no longer marked (user request). The ownGrid-set-every-frame fix stays, so the outline still survives map refreshes at sub-square zoom.	2026-09-11 23:12:33 +08:00
atsunatsu	cc684b6e3a	fix(map): own-grid outline in grid-line color (bold only); passes top bar aligned to upstream; v10.1 - Bold outline now uses the same yellow as the regular grid lines (argb(160,255,224,130)) at 6f stroke — no color change, just thicker. - Passes top bar matches upstream exactly: left = radios dialog (ic_radios -> ToggleRadiosDialog), right = passes filter dialog (ic_filter -> TogglePassesDialog). The calendar button stays only on the radar page (upstream behavior); removes the now-unreachable PassesAction.AddToCalendar wiring. - Version bumped to 4.4.6-ba7opf.10.1.	2026-09-11 22:48:53 +08:00
atsunatsu	6cb5b062d3	fix(map): own-grid bold outline wiped on every recomposition — keep ownGrid set setGridMode only received stationPosition on the grid-mode entry frame (for centering); every later recomposition (map refreshes once per second) passed null, so gridOverlay.ownGrid was reset to null and the bold outline vanished. Split the concerns: ownGrid is now derived from uiState.stationPosition on EVERY update, while centering stays gated by centerOnStation (= entry only).	2026-09-11 22:40:44 +08:00