From 57d6f9d7edf09ab1a580c3a7e3fce02c5d62033e Mon Sep 17 00:00:00 2001 From: QIU Date: Thu, 20 Aug 2026 13:24:45 +0000 Subject: [PATCH] chore(merge): drop dead leftovers from the upstream merge Post-merge audit found code the merge left unreferenced: - SettingsRepo: keySatelliteUrls / keyTransceiversUrls / separatorUrl were upstream's list-shaped data-source keys. The merge kept the fork's map-shaped DataSourcesSettings, so these three had a definition and zero uses. - feature/status/res/drawable/ic_refresh.xml: SatStatusScreen imports core.presentation.R only, so its R.drawable.ic_refresh resolves to the core copy; the feature-local copy was never addressable. It was the only file under feature/status/src/main/res, so the directory goes with it. Verified zero references with a repo-wide grep before removing each symbol. compileReleaseKotlin plus core:domain / core:data / feature:map / feature:roaming unit tests stay green. --- .../look4sat/core/data/repository/SettingsRepo.kt | 3 --- feature/status/src/main/res/drawable/ic_refresh.xml | 12 ------------ 2 files changed, 15 deletions(-) delete mode 100644 feature/status/src/main/res/drawable/ic_refresh.xml diff --git a/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SettingsRepo.kt b/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SettingsRepo.kt index fa11f6dd..4f02b3de 100644 --- a/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SettingsRepo.kt +++ b/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SettingsRepo.kt @@ -105,11 +105,8 @@ class SettingsRepo( private val keyWavelogAutoUpload = "wavelogAutoUpload" private val keyRadarCompassOffset = "radarCompassOffset" private val keyRadarCompassOffsetElev = "radarCompassOffsetElev" - private val keySatelliteUrls = "satelliteUrls" - private val keyTransceiversUrls = "transceiversUrls" private val separatorComma = "," - private val separatorUrl = "\n" //region # Satellites selection settings private val _satelliteSelection = MutableStateFlow(getSelectedIds()) diff --git a/feature/status/src/main/res/drawable/ic_refresh.xml b/feature/status/src/main/res/drawable/ic_refresh.xml deleted file mode 100644 index 909aa74e..00000000 --- a/feature/status/src/main/res/drawable/ic_refresh.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - -