From 7afce7ee68ff61afaf18cd354f74ab5973a87014 Mon Sep 17 00:00:00 2001 From: atsunatsu Date: Tue, 8 Sep 2026 04:47:43 +0800 Subject: [PATCH] =?UTF-8?q?fix(map):=20skip=20labels=20on=20worked=20cells?= =?UTF-8?q?=20=E2=80=94=20bright-yellow=204-char=20text=20on=20green=20fil?= =?UTF-8?q?l=20read=20as=20'green=20too=20bright'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous fix skipped grid LINES through worked cells, but each worked cell still got a bright-yellow (alpha 220 + black shadow) 4-char label drawn dead center on the green fill at zoom>=7. Field zoom never shows this because 2-char labels sit at field centers and almost never overlap a worked 2x1 square. Now worked cells stay completely label-free, matching the field-zoom look. --- .../rtbishop/look4sat/feature/map/MaidenheadGridOverlay.kt | 5 +++++ gradle/libs.versions.toml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MaidenheadGridOverlay.kt b/feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MaidenheadGridOverlay.kt index 65de3f9d..45ab634e 100644 --- a/feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MaidenheadGridOverlay.kt +++ b/feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MaidenheadGridOverlay.kt @@ -273,6 +273,11 @@ class MaidenheadGridOverlay : Overlay() { val xRight = projectionToX(projection, lon + cellLon, centerLon, worldWidthPx) ?: continue if (xRight < 0f || xLeft > canvas.width) continue val label = cellLabel(lat, lon, zoom) + // Worked cells stay label-free: a bright-yellow 4-char label + // centered on a green fill reads as "the green got brighter" + // and breaks consistency with field zoom, where 2-char labels + // sit at field centers and almost never overlap a worked cell. + if (label in workedGrids) continue canvas.drawText(label, (xLeft + xRight) / 2f, yCenter, labelPaint) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a71d7785..3563ffc6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] #noinspection UnusedVersionCatalogEntry -appVersionCode = "460" +appVersionCode = "461" #noinspection UnusedVersionCatalogEntry -appVersionName = "4.4.6-ba7opf.9.9" +appVersionName = "4.4.6-ba7opf.9.10" #noinspection UnusedVersionCatalogEntry compileSdk = "37" #noinspection UnusedVersionCatalogEntry