Merge pull request #4 from wty2019wty/patch-1

fix: i18n 补充翻译

core/data/src/main/java/com/rtbishop/look4sat/core/data/injection/MainContainer.kt

@@ -29,7 +29,6 @@ import com.rtbishop.look4sat.core.data.framework.Ft817Controller
 import com.rtbishop.look4sat.core.data.framework.Ic705Controller
 import com.rtbishop.look4sat.core.data.framework.NetworkReporter
 import com.rtbishop.look4sat.core.data.framework.RadioTrackingService
-import com.rtbishop.look4sat.core.data.repository.AmSatRepository
 import com.rtbishop.look4sat.core.data.repository.DatabaseRepo
 import com.rtbishop.look4sat.core.data.repository.SatelliteRepo
 import com.rtbishop.look4sat.core.data.repository.SelectionRepo
@@ -67,14 +66,12 @@ import okhttp3.OkHttpClient
 class MainContainer(private val context: Context) : IMainContainer {
 
     private val localSource = provideLocalSource()
-    private val remoteSource = provideRemoteSource()
     private val mainHandler = CoroutineExceptionHandler { _, error -> println("MainHandler: $error") }
     override val appScope = CoroutineScope(SupervisorJob() + Dispatchers.Default + mainHandler)
     override val settingsRepo = provideSettingsRepo()
     override val selectionRepo = provideSelectionRepo()
     override val satelliteRepo = provideSatelliteRepo()
     override val databaseRepo = provideDatabaseRepo()
-    override val amSatRepo by lazy { AmSatRepository(remoteSource) }
     override val radioTrackingService: IRadioTrackingService by lazy {
         val manager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
         RadioTrackingService(appScope, manager, satelliteRepo, settingsRepo)

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

@@ -1,156 +0,0 @@
-package com.rtbishop.look4sat.core.data.repository
-
-import com.rtbishop.look4sat.core.domain.model.SatDay
-import com.rtbishop.look4sat.core.domain.model.SatReport
-import com.rtbishop.look4sat.core.domain.model.SatSlot
-import com.rtbishop.look4sat.core.domain.model.SatStatus
-import com.rtbishop.look4sat.core.domain.model.SatStatusPage
-import com.rtbishop.look4sat.core.domain.repository.IAmSatRepository
-import com.rtbishop.look4sat.core.domain.source.IRemoteSource
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import org.json.JSONObject
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-import java.util.TimeZone
-
-/** One report from the AMSAT API (data layer model). */
-private data class ApiReport(
-    val id: String,
-    val name: String,
-    val callsign: String,
-    val report: String,
-    val gridSquare: String,
-    val reportedTimeUtcSec: Long
-)
-
-/** AMSAT status repository using RemoteSource (Clean Architecture: data layer handles HTTP). */
-class AmSatRepository(private val remoteSource: IRemoteSource) : IAmSatRepository {
-
-    private val isoUtcFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US).apply {
-        timeZone = TimeZone.getTimeZone("UTC")
-    }
-
-    override suspend fun fetchStatus(): SatStatusPage? = withContext(Dispatchers.IO) {
-        val nowSec = System.currentTimeMillis() / 1000
-        val catalogJson = remoteSource.getAmSatCatalog() ?: return@withContext null
-        val reportsJson = remoteSource.getAmSatReports(hours = 168, limit = 500) ?: return@withContext null
-        
-        val names = parseCatalog(catalogJson)
-        val reports = parseReports(reportsJson)
-        
-        if (names.isEmpty() && reports.isEmpty()) return@withContext null
-        
-        val statuses = buildStatuses(names, reports, nowSec)
-        val reportMap = reports.associate { it.id to toSatReport(it) }
-        SatStatusPage(System.currentTimeMillis(), statuses, reportMap)
-    }
-
-    /** Parse catalog JSON to list of satellite names */
-    private fun parseCatalog(json: String): List<String> {
-        return try {
-            val arr = JSONObject(json).getJSONArray("data")
-            (0 until arr.length()).map { arr.getJSONObject(it).getString("name") }
-        } catch (e: Exception) {
-            emptyList()
-        }
-    }
-
-    /** Parse reports JSON to list of ApiReport domain objects */
-    private fun parseReports(json: String): List<ApiReport> {
-        return try {
-            val arr = JSONObject(json).getJSONArray("data")
-            (0 until arr.length()).mapNotNull { i ->
-                val o = arr.getJSONObject(i)
-                val iso = o.optString("reported_time", "")
-                if (iso.isEmpty()) null else ApiReport(
-                    id = o.optString("id", ""),
-                    name = o.optString("name", ""),
-                    callsign = o.optString("callsign", ""),
-                    report = o.optString("report", ""),
-                    gridSquare = o.optString("grid_square", ""),
-                    reportedTimeUtcSec = parseIsoUtcSec(iso)
-                )
-            }
-        } catch (e: Exception) {
-            emptyList()
-        }
-    }
-
-    /** Parse ISO 8601 UTC timestamp to epoch seconds (e.g., "2026-08-05T07:30:00Z") */
-    private fun parseIsoUtcSec(iso: String): Long {
-        return try {
-            (isoUtcFormat.parse(iso)?.time ?: 0L) / 1000
-        } catch (e: Exception) {
-            0L
-        }
-    }
-
-    /** Build one SatStatus (6 days x 12 slots) per catalog satellite, slotting reports by age. */
-    private fun buildStatuses(names: List<String>, reports: List<ApiReport>, nowSec: Long): List<SatStatus> {
-        val byName = reports.groupBy { it.name }
-        val monthAbbr = arrayOf("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec")
-        val utc = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
-        val labels = (0 until 6).map { d ->
-            utc.timeInMillis = (nowSec - d * 86400L) * 1000
-            "${monthAbbr[utc.get(Calendar.MONTH)]} ${utc.get(Calendar.DAY_OF_MONTH)}"
-        }
-        return names.map { name ->
-            val slots = (0 until 72).map { slotIdx ->
-                val slotStart = nowSec - (slotIdx + 1) * 7200L
-                val slotEnd = nowSec - slotIdx * 7200L
-                val inSlot = byName[name].orEmpty().filter { it.reportedTimeUtcSec in slotStart until slotEnd }
-                if (inSlot.isEmpty()) {
-                    SatSlot(statusColor = NO_REPORT_GRAY, count = 0)
-                } else {
-                    val newest = inSlot.maxByOrNull { it.reportedTimeUtcSec }!!
-                    SatSlot(
-                        statusColor = statusColorOf(newest.report),
-                        count = inSlot.size,
-                        reportIds = inSlot.map { it.id }
-                    )
-                }
-            }
-            val days = (0 until 6).map { d ->
-                SatDay(dateLabel = labels[d], slots = slots.subList(d * 12, (d + 1) * 12))
-            }
-            SatStatus(name = name, days = days)
-        }
-    }
-
-    private fun toSatReport(r: ApiReport): SatReport {
-        val cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
-        cal.timeInMillis = r.reportedTimeUtcSec * 1000
-        val hh = cal.get(Calendar.HOUR_OF_DAY).toString().padStart(2, '0')
-        val mm = cal.get(Calendar.MINUTE).toString().padStart(2, '0')
-        val y = cal.get(Calendar.YEAR)
-        val mo = (cal.get(Calendar.MONTH) + 1).toString().padStart(2, '0')
-        val d = cal.get(Calendar.DAY_OF_MONTH).toString().padStart(2, '0')
-        return SatReport(
-            id = r.id,
-            statusText = r.report,
-            call = r.callsign,
-            grid = r.gridSquare,
-            dateUtc = "$y-$mo-$d",
-            timeUtc = "$hh:$mm UTC"
-        )
-    }
-
-    /** Map status text to color value (for UI rendering). */
-    private fun statusColorOf(report: String): Long = when (report.lowercase()) {
-        "heard", "crew active" -> ACTIVE_BLUE
-        "telemetry only" -> TLM_ORANGE
-        "not heard" -> NOT_HEARD_PINK
-        else -> CONFLICT_DEEP_ORANGE
-    }
-
-    companion object {
-        // AMSAT official status colors (from amsat.org/status)
-        private const val ACTIVE_BLUE = 0xFF648FFF
-        private const val TLM_ORANGE = 0xFFFFB000
-        private const val NOT_HEARD_PINK = 0xFFDC267F
-        private const val CONFLICT_DEEP_ORANGE = 0xFFFE6100
-        private const val NO_REPORT_GRAY = 0xFFC0C0C0
-    }
-}

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

@@ -34,7 +34,6 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.withContext
 import java.util.TimeZone
@@ -65,23 +64,19 @@ class SatelliteRepo(
     override suspend fun getRadiosWithId(id: Int) = localStorage.getRadiosWithId(id)
 
     override suspend fun initRepository() = withContext(dispatcher) {
-        combine(
-            settingsRepo.selectedIds,
-            settingsRepo.stationPosition
-        ) { selectedIds, _ -> selectedIds }
-            .collect { selectedIds ->
-                _satellites.update { localStorage.getEntriesWithIds(selectedIds) }
-                val settings = settingsRepo.passesSettings.value
-                calculatePasses(
-                    time = System.currentTimeMillis(),
-                    hoursAhead = settings.hoursAhead,
-                    minElevation = settings.minElevation,
-                    aosStartMinute = settings.aosStartMinute,
-                    aosEndMinute = settings.aosEndMinute,
-                    invertAosTimeWindow = settings.invertAosTimeWindow,
-                    modes = settingsRepo.selectedSatModes.value
-                )
-            }
+        settingsRepo.selectedIds.collect { selectedIds ->
+            _satellites.update { localStorage.getEntriesWithIds(selectedIds) }
+            val settings = settingsRepo.passesSettings.value
+            calculatePasses(
+                time = System.currentTimeMillis(),
+                hoursAhead = settings.hoursAhead,
+                minElevation = settings.minElevation,
+                aosStartMinute = settings.aosStartMinute,
+                aosEndMinute = settings.aosEndMinute,
+                invertAosTimeWindow = settings.invertAosTimeWindow,
+                modes = settingsRepo.selectedSatModes.value
+            )
+        }
     }
 
     override suspend fun getPosition(sat: OrbitalObject, pos: GeoPos, time: Long): OrbitalPos {

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

@@ -37,7 +37,6 @@ import com.rtbishop.look4sat.core.domain.utility.round
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
-import org.json.JSONObject
 
 class SettingsRepo(
     private val locationManager: LocationManager,
@@ -418,27 +417,5 @@ class SettingsRepo(
         baudRate = preferences.getInt(keyRadioBaudRate, 4800),
         splitMode = preferences.getBoolean(keyRadioSplitMode, false)
     )
-
-    private val keySatelliteOffsets = "satelliteOffsets"
-
-    override fun getSatelliteOffset(catnum: Int): String {
-        val json = preferences.getString(keySatelliteOffsets, "{}") ?: "{}"
-        return try {
-            JSONObject(json).optString(catnum.toString(), "")
-        } catch (e: Exception) {
-            ""
-        }
-    }
-
-    override fun setSatelliteOffset(catnum: Int, offset: String) {
-        val json = preferences.getString(keySatelliteOffsets, "{}") ?: "{}"
-        val updated = try {
-            val obj = JSONObject(json)
-            if (offset.isEmpty()) obj.remove(catnum.toString()) else obj.put(catnum.toString(), offset)
-            obj.toString()
-        } catch (e: Exception) {
-            """{"$catnum": "$offset"}"""
-        }
-        preferences.edit { putString(keySatelliteOffsets, updated) }
-    }
+    //endregion
 }

core/data/src/main/java/com/rtbishop/look4sat/core/data/source/RemoteSource.kt

@@ -58,36 +58,4 @@ class RemoteSource(
             null
         }
     }
-
-    override suspend fun getAmSatCatalog(): String? = withContext(dispatcher) {
-        try {
-            val request = Request.Builder()
-                .url("https://www.amsat.org/status/api/v1/catalog.php")
-                .header("User-Agent", "Look4Sat")
-                .build()
-            httpClient.newCall(request).execute().use { response ->
-                if (!response.isSuccessful) return@use null
-                response.body.string()
-            }
-        } catch (exception: Exception) {
-            println("RemoteSource getAmSatCatalog exception: $exception")
-            null
-        }
-    }
-
-    override suspend fun getAmSatReports(hours: Int, limit: Int): String? = withContext(dispatcher) {
-        try {
-            val request = Request.Builder()
-                .url("https://www.amsat.org/status/api/v1/reports.php?hours=$hours&limit=$limit")
-                .header("User-Agent", "Look4Sat")
-                .build()
-            httpClient.newCall(request).execute().use { response ->
-                if (!response.isSuccessful) return@use null
-                response.body.string()
-            }
-        } catch (exception: Exception) {
-            println("RemoteSource getAmSatReports exception: $exception")
-            null
-        }
-    }
 }

core/data/src/test/java/com/rtbishop/look4sat/core/data/repository/DatabaseRepoTest.kt

@@ -213,10 +213,6 @@ private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSou
     }
 
     override fun updateRadioControlSettings(settings: RadioControlSettings) = Unit
-
-    override fun getSatelliteOffset(catnum: Int): String = ""
-
-    override fun setSatelliteOffset(catnum: Int, offset: String) = Unit
 }
 
 private fun defaultDataSourcesSettings(): DataSourcesSettings {

core/data/src/test/java/com/rtbishop/look4sat/core/data/repository/SelectionRepoTest.kt

@@ -167,10 +167,6 @@ class SelectionRepoTest {
         override fun updateDataSourcesSettings(settings: DataSourcesSettings) = Unit
 
         override fun updateRadioControlSettings(settings: RadioControlSettings) = Unit
-
-        override fun getSatelliteOffset(catnum: Int): String = ""
-
-        override fun setSatelliteOffset(catnum: Int, offset: String) = Unit
     }
 }
 

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/model/SatStatus.kt

@@ -1,37 +0,0 @@
-package com.rtbishop.look4sat.core.domain.model
-
-/** One satellite status report (AMSAT site tooltip data) */
-data class SatReport(
-    val id: String,          // 报告 ID(a885153)
-    val statusText: String,  // Heard / Telemetry Only / Not Heard ...
-    val call: String,        // 呼号
-    val grid: String,        // 网格坐标(可为空)
-    val dateUtc: String,     // 2026-08-04
-    val timeUtc: String      // 2:46-:59 UTC
-)
-
-/** State of one 2-hour slot */
-data class SatSlot(
-    val statusColor: Long,   // ARGB 状态色(-1 = 无报告)
-    val count: Int,          // 报告数量(0 = 无)
-    val reportIds: List<String> = emptyList() // 该槽报告 ID 列表
-)
-
-/** One satellite day (12 two-hour slots) */
-data class SatDay(
-    val dateLabel: String,   // "Aug 4"
-    val slots: List<SatSlot> // 12 槽(00-02 ... 22-24)
-)
-
-/** One satellite, 6 days of state */
-data class SatStatus(
-    val name: String,        // "AO-123_[FM]"
-    val days: List<SatDay>   // 6 天(新→旧)
-)
-
-/** Overall page parse result */
-data class SatStatusPage(
-    val fetchedAtUtcMs: Long,
-    val statuses: List<SatStatus>,
-    val reports: Map<String, SatReport> // id → 报告
-)

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/repository/IAmSatRepository.kt

@@ -1,9 +0,0 @@
-package com.rtbishop.look4sat.core.domain.repository
-
-import com.rtbishop.look4sat.core.domain.model.SatStatusPage
-
-/** AMSAT satellite status data source */
-interface IAmSatRepository {
-    /** Fetch and parse the AMSAT status page; null on failure */
-    suspend fun fetchStatus(): SatStatusPage?
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/repository/IMainContainer.kt

@@ -29,7 +29,6 @@ interface IMainContainer {
     val selectionRepo: ISelectionRepo
     val satelliteRepo: ISatelliteRepo
     val databaseRepo: IDatabaseRepo
-    val amSatRepo: IAmSatRepository
     val radioTrackingService: IRadioTrackingService
     fun provideAddToCalendar(): IAddToCalendar
     fun provideShowToast(): IShowToast

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/repository/ISettingsRepo.kt

@@ -75,9 +75,4 @@ interface ISettingsRepo {
     val radioControlSettings: StateFlow<RadioControlSettings>
     fun updateRadioControlSettings(settings: RadioControlSettings)
     //endregion
-
-    //region # Per-satellite calculator offset settings
-    fun getSatelliteOffset(catnum: Int): String
-    fun setSatelliteOffset(catnum: Int, offset: String)
-    //endregion
 }

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/source/IRemoteSource.kt

@@ -22,6 +22,4 @@ import java.io.InputStream
 interface IRemoteSource {
     suspend fun getFileStream(uri: String): InputStream?
     suspend fun getNetworkStream(url: String): InputStream?
-    suspend fun getAmSatCatalog(): String?
-    suspend fun getAmSatReports(hours: Int, limit: Int): String?
 }

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/utility/DopplerFrequencyCalculator.kt

@@ -112,30 +112,11 @@ object DopplerFrequencyCalculator {
         val modes = listOfNotNull(transponder.downlinkMode, transponder.uplinkMode)
             .joinToString(separator = " ")
             .lowercase(Locale.ENGLISH)
-        val hasLinearName = info.contains("linear") || info.contains(" lin") || info.startsWith("lin")
+        val hasLinearName = info.contains("linear")
         val hasTransponderName = info.contains("transponder") || info.contains("transp") ||
                 info.contains("xponder") || info.contains("xpdr")
         val hasLinearMode = listOf("ssb", "usb", "lsb", "cw").any { modes.contains(it) }
 
-        return (hasLinearName && hasTransponderName) || (hasTransponderName && hasLinearMode) ||
-                (hasLinearName && hasLinearMode)
-    }
-
-    /**
-     * Removes duplicate transponder entries that describe the same physical
-     * transponder with different mode labels (e.g. SatNOGS lists AO-7's Mode A
-     * as both "Lin SSB" and "Lin CW", and JO-97's U/V transponder as both
-     * "CW Transponder" and "SSB Transponder").
-     *
-     * Entries sharing the same uplink/downlink frequency range are considered
-     * the same transponder. The non-CW entry is preferred because its invert
-     * flag is more reliable (e.g. JO-97's CW entry wrongly has invert=false).
-     */
-    fun deduplicateTransponders(radios: List<SatRadio>): List<SatRadio> {
-        return radios.groupBy { radio ->
-            listOf(radio.uplinkLow, radio.uplinkHigh, radio.downlinkLow, radio.downlinkHigh)
-        }.values.map { group ->
-            group.firstOrNull { it.downlinkMode?.equals("CW", ignoreCase = true) != true } ?: group.first()
-        }
+        return (hasLinearName && hasTransponderName) || (hasTransponderName && hasLinearMode)
     }
 }

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/DopplerFrequencyCalculatorTest.kt

@@ -13,7 +13,6 @@ import org.junit.Test
 class DopplerFrequencyCalculatorTest {
 
     private fun linearTransponder(
-        uuid: String = "linear",
         upLow: Long = 145_000_000L,
         upHigh: Long = 145_500_000L,
         downLow: Long = 435_000_000L,
@@ -23,7 +22,7 @@ class DopplerFrequencyCalculatorTest {
         downlinkMode: String? = "USB",
         uplinkMode: String? = "LSB"
     ) = SatRadio(
-        uuid = uuid, info = info, isAlive = true,
+        uuid = "linear", info = info, isAlive = true,
         downlinkLow = downLow, downlinkHigh = downHigh,
         downlinkMode = downlinkMode, uplinkLow = upLow, uplinkHigh = upHigh,
         uplinkMode = uplinkMode, isInverted = inverted, catnum = 12345
@@ -73,93 +72,11 @@ class DopplerFrequencyCalculatorTest {
         assertFalse(DopplerFrequencyCalculator.isNamedLinearTransponder(driftingRangeEntry))
     }
 
-    @Test
-    fun isNamedLinearTransponder_returnsTrueForAbbreviatedLinName() {
-        // AO-7 style: "Mode V/A (A) Lin SSB" — "Lin" abbreviation, no "transponder" word
-        val ao7Entry = linearTransponder(info = "Mode V/A (A) Lin SSB", downlinkMode = "USB", uplinkMode = "USB")
-        assertTrue(DopplerFrequencyCalculator.isNamedLinearTransponder(ao7Entry))
-        val ao7CwEntry = linearTransponder(info = "Mode V/A (A) Lin CW", downlinkMode = "CW", uplinkMode = "CW")
-        assertTrue(DopplerFrequencyCalculator.isNamedLinearTransponder(ao7CwEntry))
-        val ao7ModeBEntry = linearTransponder(info = "Mode U/V (B) Lin", downlinkMode = "USB", uplinkMode = "LSB")
-        assertTrue(DopplerFrequencyCalculator.isNamedLinearTransponder(ao7ModeBEntry))
-    }
-
-    @Test
-    fun isNamedLinearTransponder_returnsTrueForLinearWithoutTransponderWord() {
-        // AO-73 style: "Mode U/V Linear" — has "Linear" but no "transponder"
-        val ao73Entry = linearTransponder(info = "Mode U/V Linear", downlinkMode = "USB", uplinkMode = "LSB")
-        assertTrue(DopplerFrequencyCalculator.isNamedLinearTransponder(ao73Entry))
-    }
-
-    @Test
-    fun isNamedLinearTransponder_returnsFalseForDownlinkContainingLinInsideWord() {
-        // "Downlink" contains "lin" but is not a linear-transponder name
-        val downlinkEntry = linearTransponder(info = "Mode U Downlink", downlinkMode = "FM", uplinkMode = "FM")
-        assertFalse(DopplerFrequencyCalculator.isNamedLinearTransponder(downlinkEntry))
-    }
-
     @Test
     fun isNamedLinearTransponder_returnsFalseForFmRepeater() {
         assertFalse(DopplerFrequencyCalculator.isNamedLinearTransponder(fmTransponder()))
     }
 
-    @Test
-    fun deduplicateTransponders_mergesSameFrequencyRange() {
-        // AO-7's Mode A: same range, SSB and CW entries
-        val ssb = linearTransponder(
-            uuid = "ssb-uuid", info = "Mode V/A (A) Lin SSB",
-            downlinkMode = "USB", uplinkMode = "USB"
-        )
-        val cw = linearTransponder(
-            uuid = "cw-uuid", info = "Mode V/A (A) Lin CW",
-            downlinkMode = "CW", uplinkMode = "CW"
-        )
-        val modeB = linearTransponder(
-            uuid = "modeb-uuid", info = "Mode U/V (B) Lin",
-            upLow = 432_125_000L, upHigh = 432_175_000L,
-            downLow = 145_925_000L, downHigh = 145_975_000L,
-            downlinkMode = "USB", uplinkMode = "LSB"
-        )
-        val result = DopplerFrequencyCalculator.deduplicateTransponders(listOf(ssb, cw, modeB))
-        assertEquals(2, result.size)
-        // SSB entry should be preferred over CW (same range)
-        assertEquals("ssb-uuid", result[0].uuid)
-        assertEquals("modeb-uuid", result[1].uuid)
-    }
-
-    @Test
-    fun deduplicateTransponders_prefersNonCwEntry() {
-        // JO-97: CW entry has invert=false (wrong), SSB has invert=true (correct)
-        val cw = linearTransponder(
-            uuid = "cw-uuid", info = "U/V CW Transponder",
-            downlinkMode = "CW", uplinkMode = "CW",
-            upLow = 435_100_000L, upHigh = 435_120_000L,
-            downLow = 145_855_000L, downHigh = 145_875_000L
-        )
-        val ssb = linearTransponder(
-            uuid = "ssb-uuid", info = "U/V SSB Transponder",
-            downlinkMode = "USB", uplinkMode = "LSB",
-            upLow = 435_100_000L, upHigh = 435_120_000L,
-            downLow = 145_855_000L, downHigh = 145_875_000L,
-            inverted = true
-        )
-        val result = DopplerFrequencyCalculator.deduplicateTransponders(listOf(cw, ssb))
-        assertEquals(1, result.size)
-        assertEquals("ssb-uuid", result[0].uuid)
-        // Verify the correct invert flag is preserved
-        assertTrue(result[0].isInverted)
-    }
-
-    @Test
-    fun deduplicateTransponders_preservesUniqueEntries() {
-        val t1 = linearTransponder(uuid = "t1", upLow = 145_000_000L, upHigh = 145_500_000L,
-            downLow = 435_000_000L, downHigh = 435_500_000L)
-        val t2 = linearTransponder(uuid = "t2", upLow = 435_000_000L, upHigh = 435_500_000L,
-            downLow = 145_000_000L, downHigh = 145_500_000L)
-        val result = DopplerFrequencyCalculator.deduplicateTransponders(listOf(t1, t2))
-        assertEquals(2, result.size)
-    }
-
     @Test
     fun computeUplinkFromDownlink_linear_noDoppler() {
         val xpdr = linearTransponder()

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

@@ -79,10 +79,6 @@ private val lightScheme = lightColorScheme(
     onSecondary = Color(0xFFFFFFFF),
     secondaryContainer = Color(0xFFF1E1BB),
     onSecondaryContainer = Color(0xFF221B04),
-    tertiary = Color(0xFF3C6FE0), // AMSAT Active (darker for light theme)
-    onTertiary = Color(0xFFFFFFFF),
-    tertiaryContainer = Color(0xFFE09800), // AMSAT Telemetry (darker)
-    onTertiaryContainer = Color(0xFF000000),
     background = Color(0xFFFFF8F0),
     onBackground = Color(0xFF1E1B13),
     surface = Color(0xFFFFF8F0),
@@ -105,10 +101,10 @@ private val darkScheme = darkColorScheme(
     onSecondary = Color(0xFF000000),
     secondaryContainer = Color(0xFF404040), // navBar indicator,
     onSecondaryContainer = Color(0xFFE0E0E0), // navBar active icon
-    tertiary = Color(0xFF648FFF), // AMSAT Active (from amsat.org/status)
-    onTertiary = Color(0xFF000000),
-    tertiaryContainer = Color(0xFFFFB000), // AMSAT Telemetry
-    onTertiaryContainer = Color(0xFF000000),
+//    tertiary = Color(0xFF121212),
+//    onTertiary = Color(0xFF121212),
+//    tertiaryContainer = Color(0xFF121212),
+//    onTertiaryContainer = Color(0xFF121212),
     background = Color(0xFF121212),
     onBackground = Color(0xFFE0E0E0),
     surface = Color(0xFF202020), // card background

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

@@ -67,21 +67,6 @@
         \n* Replaced the types selection dialog with modes selection to avoid confusion
     </string>
 
-    <!-- AMSAT Status screen -->
-    <string name="nav_amsat">AMSAT</string>
-    <string name="amsat_title">AMSAT Satellite Status</string>
-    <string name="amsat_refresh">Refresh</string>
-    <string name="amsat_retry">Retry</string>
-    <string name="amsat_updated">Updated:</string>
-    <string name="amsat_active">Active</string>
-    <string name="amsat_tlm">TLM/Beacon</string>
-    <string name="amsat_not_heard">Not Heard</string>
-    <string name="amsat_conflict">Conflicting</string>
-    <string name="amsat_name">Name</string>
-    <string name="amsat_load_failed">Load failed - check network and retry</string>
-    <string name="amsat_no_reports">No reports for this period</string>
-    <string name="amsat_close">Close</string>
-
     <!-- Radar screen -->
     <string name="radar_back">Back</string>
     <string name="radar_notify">Notify</string>

feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesScreen.kt

@@ -156,7 +156,7 @@ private fun PassesScreen(
             TopBar(
                 isVerticalLayout = isVerticalLayout,
                 startAction = {
-                    IconCard(action = { onAction(PassesAction.ToggleRadiosDialog) }, resId = R.drawable.ic_radios)
+                    IconCard(action = { onAction(PassesAction.TogglePassesDialog) }, resId = R.drawable.ic_filter)
                 },
                 topInfo = {
                     TimerRow(timeString = uiState.nextTime, isTimeAos = uiState.isNextTimeAos)
@@ -165,7 +165,7 @@ private fun PassesScreen(
                     NextPassRow(pass = uiState.nextPass, isUtc = uiState.isUtc)
                 },
                 endAction = {
-                    IconCard(action = { onAction(PassesAction.TogglePassesDialog) }, resId = R.drawable.ic_filter)
+                    IconCard(action = { onAction(PassesAction.ToggleRadiosDialog) }, resId = R.drawable.ic_radios)
                 }
             )
         }

feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesViewModel.kt

@@ -106,18 +106,17 @@ class PassesViewModel(
                 .collectLatest { (allPasses, isUtc, showDeepSpace) ->
                     val filtered = if (showDeepSpace) allPasses
                     else allPasses.filter { !it.isDeepSpace }
-                    // Expensive: recompute sun times once per items/UTC change, not every second
+                    // Expensive: recompute once per pass-list/UTC change, not every second
                     val sunTimes = computeSunTimes(filtered, isUtc)
-                    _uiState.update { it.copy(sunTimes = sunTimes) }
+                    val grouped = groupPasses(filtered, isUtc)
+                    _uiState.update { it.copy(sunTimes = sunTimes, groupedPasses = grouped) }
                     while (isActive) {
                         val timeNow = System.currentTimeMillis()
                         val processed = computePassProgress(filtered, timeNow)
-                        val grouped = groupPasses(processed, isUtc)
                         val (nextPass, nextTime, isAos) = resolveNextPass(processed, timeNow)
                         _uiState.update {
                             it.copy(
                                 itemsList = processed,
-                                groupedPasses = grouped,
                                 nextPass = nextPass,
                                 nextTime = nextTime,
                                 isNextTimeAos = isAos

feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarScreen.kt

@@ -198,8 +198,7 @@ private fun PagerCard(
                         transceivers = uiState.transceivers.transmitters,
                         selectedUuid = uiState.transceivers.selectedUuid,
                         orbitalPos = uiState.orbitalPos,
-                        onAction = onAction,
-                        calculatorOffsetKHz = uiState.calculatorOffsetKHz
+                        onAction = onAction
                     )
                     RadarPage.Sstv -> SstvPage(
                         sstv = uiState.sstv,

feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarState.kt

@@ -63,8 +63,7 @@ data class RadarState(
     val moonPosition: CelestialComputer.MoonPosition? = null,
     val transceivers: TransceiverSubState = TransceiverSubState(),
     val radioControl: RadioControlSubState = RadioControlSubState(),
-    val sstv: SstvSubState = SstvSubState(),
-    val calculatorOffsetKHz: String = ""
+    val sstv: SstvSubState = SstvSubState()
 )
 
 enum class SstvStatus { Idle, Recording }
@@ -98,7 +97,4 @@ sealed interface RadarAction {
     data object SstvReset : RadarAction
     data class SstvSelectMode(val modeName: String) : RadarAction
     data class SstvPermissionResult(val granted: Boolean) : RadarAction
-
-    // Calculator actions
-    data class ChangeCalculatorOffset(val offsetKHz: String) : RadarAction
 }

feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarViewModel.kt

@@ -260,17 +260,7 @@ class RadarViewModel(
                 // Compute toggle state before the update so we don't read post-update value
                 val isTogglingOff = _uiState.value.transceivers.selectedUuid == action.uuid
                 val newUuid = if (isTogglingOff) null else action.uuid
-                // Load the saved offset for the newly selected satellite
-                val offsetKHz = if (!isTogglingOff) {
-                    transponders.find { it.uuid == action.uuid }
-                        ?.catnum?.let { settingsRepo.getSatelliteOffset(it) } ?: ""
-                } else ""
-                _uiState.update {
-                    it.copy(
-                        transceivers = it.transceivers.copy(selectedUuid = newUuid),
-                        calculatorOffsetKHz = offsetKHz
-                    )
-                }
+                _uiState.update { it.copy(transceivers = it.transceivers.copy(selectedUuid = newUuid)) }
                 // Only update the tracking service when selecting a different transponder to
                 // avoid resetting a user-adjusted TX base on re-expand
                 if (!isTogglingOff) {
@@ -319,15 +309,6 @@ class RadarViewModel(
                 sstvDecoder?.clearPixels()
                 _uiState.update { it.copy(sstv = it.sstv.copy(currentFrame = null)) }
             }
-            is RadarAction.ChangeCalculatorOffset -> {
-                val catnum = _uiState.value.transceivers.selectedUuid?.let { uuid ->
-                    transponders.find { it.uuid == uuid }?.catnum
-                }
-                if (catnum != null) {
-                    settingsRepo.setSatelliteOffset(catnum, action.offsetKHz)
-                }
-                _uiState.update { it.copy(calculatorOffsetKHz = action.offsetKHz) }
-            }
         }
     }
 

feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/TransceiversPage.kt

@@ -21,18 +21,14 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.expandVertically
 import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -43,20 +39,16 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Slider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -67,7 +59,6 @@ import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
@@ -77,7 +68,6 @@ import androidx.compose.ui.unit.sp
 import com.rtbishop.look4sat.core.domain.model.SatRadio
 import com.rtbishop.look4sat.core.domain.predict.OrbitalPos
 import com.rtbishop.look4sat.core.domain.utility.DopplerFrequencyCalculator
-import com.rtbishop.look4sat.core.domain.utility.TransponderMapper
 import com.rtbishop.look4sat.core.presentation.CardButton
 import com.rtbishop.look4sat.core.presentation.R
 import com.rtbishop.look4sat.core.presentation.formatFrequency
@@ -128,12 +118,10 @@ fun CalculatorPage(
     selectedUuid: String?,
     orbitalPos: OrbitalPos?,
     onAction: (RadarAction) -> Unit,
-    calculatorOffsetKHz: String = "",
     modifier: Modifier = Modifier
 ) {
     val calculatorTransceivers = remember(transceivers) {
         transceivers.filter(DopplerFrequencyCalculator::isNamedLinearTransponder)
-            .let(DopplerFrequencyCalculator::deduplicateTransponders)
     }
     val selectedTransceiver = remember(calculatorTransceivers, selectedUuid) {
         calculatorTransceivers.firstOrNull { it.uuid == selectedUuid }
@@ -178,11 +166,9 @@ fun CalculatorPage(
         }
 
         item {
-            DopplerFrequencyCalculator(
+            DopplerCalculatorPanel(
                 transponder = selectedTransceiver,
                 orbitalPos = orbitalPos,
-                offsetKHz = calculatorOffsetKHz,
-                onOffsetChange = { onAction(RadarAction.ChangeCalculatorOffset(it)) },
                 modifier = Modifier.fillMaxWidth()
             )
         }
@@ -518,362 +504,108 @@ private fun ExpandedRadioControl(
     }
 }
 
-private enum class EditedField { TX, PASSBAND, RX }
-
 @Composable
-private fun DopplerFrequencyCalculator(
+private fun DopplerCalculatorPanel(
     transponder: SatRadio,
     orbitalPos: OrbitalPos?,
-    offsetKHz: String = "",
-    onOffsetChange: (String) -> Unit = {},
     modifier: Modifier = Modifier
 ) {
     if (orbitalPos == null || !DopplerFrequencyCalculator.isLinearTransponder(transponder)) return
 
-    var lastEditedField by remember { mutableStateOf(EditedField.TX) }
-    var txFrequencyHz by remember { mutableStateOf(0L) }
-    var rxFrequencyHz by remember { mutableStateOf(0L) }
-    var passbandPosition by remember { mutableStateOf(0.5f) }
-    var stepSizeKHz by remember { mutableIntStateOf(1) }
+    var txInputMHz by remember(transponder.uuid) { mutableStateOf("") }
+    var rxInputMHz by remember(transponder.uuid) { mutableStateOf("") }
+    var offsetKHz by remember(transponder.uuid) { mutableStateOf("") }
+    var lastEditedBy by remember(transponder.uuid) { mutableStateOf(EditedField.TX) }
 
-    val offsetHz = offsetKHz.toDoubleOrNull()?.let { it * 1000 }?.toLong() ?: 0L
+    fun offsetHz(text: String): Long = text.toDoubleOrNull()?.let { (it * 1000).toLong() } ?: 0L
+    fun formatHz(hz: Long): String = String.format(Locale.ENGLISH, "%.6f", hz / 1_000_000.0)
+    fun mhzToHz(text: String): Long? = text.toDoubleOrNull()
+        ?.takeIf { it > 0.0 }
+        ?.let { (it * 1_000_000).toLong() }
 
-    val txLow = transponder.uplinkLow ?: return
-    val txHigh = transponder.uplinkHigh ?: return
-    val rxLow = transponder.downlinkLow ?: return
-    val rxHigh = transponder.downlinkHigh ?: return
-    val txRange = txHigh - txLow
-    val rxRange = rxHigh - rxLow
-    if (txRange <= 0L || rxRange <= 0L) return
-
-    // 原始转发器值（逆转多普勒），用于 passband 映射计算
-    val rawTxLow = orbitalPos.getDownlinkFreq(txLow)
-    val rawTxHigh = orbitalPos.getDownlinkFreq(txHigh)
-    val rawRxLow = orbitalPos.getUplinkFreq(rxLow)
-    val rawRxHigh = orbitalPos.getUplinkFreq(rxHigh)
-    val rawTxRange = rawTxHigh - rawTxLow
-    val rawRxRange = rawRxHigh - rawRxLow
-    val rawTransponder = transponder.copy(
-        uplinkLow = rawTxLow, uplinkHigh = rawTxHigh,
-        downlinkLow = rawRxLow, downlinkHigh = rawRxHigh
-    )
-
-    // 初始化
-    LaunchedEffect(Unit) {
-        if (txFrequencyHz == 0L) {
-            txFrequencyHz = txLow + txRange / 2
-            rxFrequencyHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
-                txFrequencyHz, rawTransponder, orbitalPos, offsetHz
-            ) ?: (rxLow + rxRange / 2)
-        }
+    fun calculateDownlink(txText: String, offsetText: String): String? {
+        val txHz = mhzToHz(txText) ?: return null
+        return DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
+            uplinkHz = txHz,
+            transponder = transponder,
+            orbitalPos = orbitalPos,
+            offsetHz = offsetHz(offsetText)
+        )?.let(::formatHz)
     }
 
-    // 实时重算：卫星移动时，锚点侧不变，重算另一侧
-    LaunchedEffect(orbitalPos) {
-        if (lastEditedField == EditedField.TX) {
-            // TX 是锚点，不变；重算 RX
-            rxFrequencyHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
-                txFrequencyHz, rawTransponder, orbitalPos, offsetHz
-            ) ?: rxFrequencyHz
-        } else if (lastEditedField == EditedField.RX) {
-            // RX 是锚点，不变；重算 TX
-            txFrequencyHz = DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset(
-                rxFrequencyHz, rawTransponder, orbitalPos, offsetHz
-            ) ?: txFrequencyHz
-        } else if (lastEditedField == EditedField.PASSBAND) {
-            // 相对位置不变（passbandPosition），TX 用地面频率，RX 经 Transceiver 完整路径计算
-            txFrequencyHz = txLow + (passbandPosition * txRange).toLong()
-            rxFrequencyHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
-                txFrequencyHz, rawTransponder, orbitalPos, offsetHz
-            ) ?: rxFrequencyHz
-        }
+    fun calculateUplink(rxText: String, offsetText: String): String? {
+        val rxHz = mhzToHz(rxText) ?: return null
+        return DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset(
+            downlinkHz = rxHz,
+            transponder = transponder,
+            orbitalPos = orbitalPos,
+            offsetHz = offsetHz(offsetText)
+        )?.let(::formatHz)
     }
 
-    val txSliderValue = if (lastEditedField == EditedField.PASSBAND) {
-        passbandPosition
-    } else {
-        ((txFrequencyHz - txLow).toFloat() / txRange).coerceIn(0f, 1f)
-    }
-    val rxSliderValue = if (lastEditedField == EditedField.PASSBAND) {
-        ((rxFrequencyHz - rxLow).toFloat() / rxRange).coerceIn(0f, 1f)
-    } else {
-        ((rxFrequencyHz - rxLow).toFloat() / rxRange).coerceIn(0f, 1f)
-    }
-
-    fun updateTx(newTxHz: Long) {
-        when (lastEditedField) {
-            EditedField.PASSBAND -> {
-                // Passband 模式：滑块位置 → passbandPosition → 地面频率，RX 经 Transceiver 计算
-                val pos = ((newTxHz - txLow).toFloat() / txRange).coerceIn(0f, 1f)
-                passbandPosition = pos
-                txFrequencyHz = txLow + (pos * txRange).toLong()
-                rxFrequencyHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
-                    txFrequencyHz, rawTransponder, orbitalPos, offsetHz
-                ) ?: rxFrequencyHz
-            }
-            else -> {
-                txFrequencyHz = newTxHz.coerceIn(txLow, txHigh)
-                rxFrequencyHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
-                    txFrequencyHz, rawTransponder, orbitalPos, offsetHz
-                ) ?: rxFrequencyHz
-            }
-        }
-    }
-
-    fun updateRx(newRxHz: Long) {
-        when (lastEditedField) {
-            EditedField.PASSBAND -> {
-                // Passband 模式：从 RX 反推 TX 位置，TX 用地面频率
-                val pos = ((newRxHz - rxLow).toFloat() / rxRange).coerceIn(0f, 1f)
-                val txFromRx = TransponderMapper.mapDownlinkToUplink(newRxHz, rawTransponder)
-                passbandPosition = if (txFromRx != null) {
-                    ((txFromRx - rawTxLow).toFloat() / rawTxRange).coerceIn(0f, 1f)
-                } else pos
-                txFrequencyHz = txLow + (passbandPosition * txRange).toLong()
-                rxFrequencyHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
-                    txFrequencyHz, rawTransponder, orbitalPos, offsetHz
-                ) ?: rxFrequencyHz
-            }
-            else -> {
-                rxFrequencyHz = newRxHz.coerceIn(rxLow, rxHigh)
-                txFrequencyHz = DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset(
-                    rxFrequencyHz, rawTransponder, orbitalPos, offsetHz
-                ) ?: txFrequencyHz
-            }
+    LaunchedEffect(orbitalPos, transponder.uuid) {
+        if (lastEditedBy == EditedField.TX) {
+            calculateDownlink(txInputMHz, offsetKHz)?.let { rxInputMHz = it }
+        } else {
+            calculateUplink(rxInputMHz, offsetKHz)?.let { txInputMHz = it }
         }
     }
 
     Column(
-        modifier = modifier.fillMaxWidth().padding(top = 16.dp),
-        verticalArrangement = Arrangement.spacedBy(12.dp)
+        modifier = modifier,
+        verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
-            Row(
-                modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(6.dp)
-            ) {
-                // 左半边: TX + RX 按钮
-                Row(
-                    modifier = Modifier.weight(1f),
-                    horizontalArrangement = Arrangement.spacedBy(4.dp),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    FilterChip(
-                        selected = lastEditedField == EditedField.TX,
-                        onClick = {
-                            when (lastEditedField) {
-                                EditedField.TX -> {
-                                    passbandPosition = ((txFrequencyHz - txLow).toFloat() / txRange).coerceIn(0f, 1f)
-                                    lastEditedField = EditedField.PASSBAND
-                                    rxFrequencyHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
-                                        txFrequencyHz, rawTransponder, orbitalPos, offsetHz
-                                    ) ?: rxFrequencyHz
-                                }
-                                EditedField.PASSBAND -> { lastEditedField = EditedField.TX }
-                                else -> { lastEditedField = EditedField.TX }
-                            }
-                        },
-                        label = {
-                            Text("TX", fontSize = 13.sp, textAlign = TextAlign.Center,
-                                modifier = Modifier.fillMaxWidth())
-                        },
-                        modifier = Modifier.weight(1f).fillMaxHeight()
-                    )
-                    FilterChip(
-                        selected = lastEditedField == EditedField.RX,
-                        onClick = {
-                            when (lastEditedField) {
-                                EditedField.RX -> {
-                                    txFrequencyHz = DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset(
-                                        rxFrequencyHz, rawTransponder, orbitalPos, offsetHz
-                                    ) ?: txFrequencyHz
-                                    passbandPosition = ((txFrequencyHz - txLow).toFloat() / txRange).coerceIn(0f, 1f)
-                                    lastEditedField = EditedField.PASSBAND
-                                }
-                                EditedField.PASSBAND -> {
-                                    lastEditedField = EditedField.RX
-                                    txFrequencyHz = DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset(
-                                        rxFrequencyHz, rawTransponder, orbitalPos, offsetHz
-                                    ) ?: txFrequencyHz
-                                }
-                                else -> { lastEditedField = EditedField.RX }
-                            }
-                        },
-                        label = {
-                            Text("RX", fontSize = 13.sp, textAlign = TextAlign.Center,
-                                modifier = Modifier.fillMaxWidth())
-                        },
-                        modifier = Modifier.weight(1f).fillMaxHeight()
-                    )
+        OutlinedTextField(
+            value = offsetKHz,
+            onValueChange = { newValue ->
+                offsetKHz = newValue
+                if (lastEditedBy == EditedField.TX) {
+                    calculateDownlink(txInputMHz, newValue)?.let { rxInputMHz = it }
+                } else {
+                    calculateUplink(rxInputMHz, newValue)?.let { txInputMHz = it }
                 }
-                // 右半边: Offset 输入框（带细线边框）
-                Box(
-                    modifier = Modifier
-                        .weight(1f)
-                        .height(48.dp)
-                        .border(1.dp, MaterialTheme.colorScheme.outline, MaterialTheme.shapes.small),
-                    contentAlignment = Alignment.Center
-                ) {
-                    BasicTextField(
-                        value = offsetKHz,
-                        onValueChange = onOffsetChange,
-                        singleLine = true,
-                        textStyle = TextStyle(
-                            fontSize = 16.sp,
-                            textAlign = TextAlign.Center,
-                            color = MaterialTheme.colorScheme.onSurface
-                        ),
-                        decorationBox = { innerTextField ->
-                            if (offsetKHz.isEmpty()) {
-                                Text(
-                                    text = "Offset (kHz)",
-                                    fontSize = 16.sp,
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant
-                                )
-                            }
-                            innerTextField()
-                        }
-                    )
-                }
-            }
+            },
+            label = { Text(stringResource(R.string.radar_doppler_offset_hint)) },
+            singleLine = true,
+            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text),
+            modifier = Modifier.fillMaxWidth()
+        )
 
-            // TX 行
-            Column(modifier = Modifier.fillMaxWidth()) {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    OutlinedButton(
-                        onClick = { updateTx(txFrequencyHz - stepSizeKHz * 1000L) },
-                        modifier = Modifier.width(32.dp).height(28.dp),
-                        contentPadding = PaddingValues(0.dp),
-                        shape = MaterialTheme.shapes.extraSmall
-                    ) { Text("−", fontSize = 14.sp) }
-
-                    Slider(
-                        value = txSliderValue,
-                        onValueChange = { norm ->
-                            val rawFreq = txLow + (txRange * norm).toLong()
-                            val snapped = ((rawFreq + 500) / 1000L) * 1000L
-                            updateTx(snapped.coerceIn(txLow, txHigh))
-                        },
-                        valueRange = 0f..1f,
-                        modifier = Modifier.weight(1f).height(20.dp).padding(horizontal = 4.dp)
-                    )
-
-                    OutlinedButton(
-                        onClick = { updateTx(txFrequencyHz + stepSizeKHz * 1000L) },
-                        modifier = Modifier.width(32.dp).height(28.dp),
-                        contentPadding = PaddingValues(0.dp),
-                        shape = MaterialTheme.shapes.extraSmall
-                    ) { Text("+", fontSize = 14.sp) }
-                }
-                Row(
-                    modifier = Modifier.fillMaxWidth().padding(horizontal = 4.dp),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    Text(
-                        text = String.format(Locale.ENGLISH, "%.4f", txLow / 1_000_000.0),
-                        fontSize = 12.sp,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                        modifier = Modifier.weight(1f)
-                    )
-                    Row(
-                        verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.Center
-                    ) {
-                        Text(
-                            text = String.format(Locale.ENGLISH, "%.6f", txFrequencyHz / 1_000_000.0),
-                            fontSize = 20.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = MaterialTheme.colorScheme.primary
-                        )
-                        Text(
-                            text = " MHz",
-                            fontSize = 20.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = MaterialTheme.colorScheme.primary
-                        )
-                    }
-                    Text(
-                        text = String.format(Locale.ENGLISH, "%.4f", txHigh / 1_000_000.0),
-                        fontSize = 12.sp,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                        modifier = Modifier.weight(1f),
-                        textAlign = TextAlign.End
-                    )
-                }
-            }
-
-            HorizontalDivider(
-                thickness = 0.5.dp,
-                color = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f)
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            OutlinedTextField(
+                value = txInputMHz,
+                onValueChange = { newValue ->
+                    txInputMHz = newValue
+                    lastEditedBy = EditedField.TX
+                    rxInputMHz = calculateDownlink(newValue, offsetKHz) ?: if (newValue.isEmpty()) "" else rxInputMHz
+                },
+                label = { Text(stringResource(R.string.radar_doppler_tx_hint)) },
+                singleLine = true,
+                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal),
+                modifier = Modifier.weight(1f)
             )
 
-            // RX 行
-            Column(modifier = Modifier.fillMaxWidth()) {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    OutlinedButton(
-                        onClick = { updateRx(rxFrequencyHz - stepSizeKHz * 1000L) },
-                        modifier = Modifier.width(32.dp).height(28.dp),
-                        contentPadding = PaddingValues(0.dp),
-                        shape = MaterialTheme.shapes.extraSmall
-                    ) { Text("−", fontSize = 14.sp) }
-
-                    Slider(
-                        value = rxSliderValue,
-                        onValueChange = { norm ->
-                            val rawFreq = rxLow + (rxRange * norm).toLong()
-                            val snapped = ((rawFreq + 500) / 1000L) * 1000L
-                            updateRx(snapped.coerceIn(rxLow, rxHigh))
-                        },
-                        valueRange = 0f..1f,
-                        modifier = Modifier.weight(1f).height(20.dp).padding(horizontal = 4.dp)
-                    )
-
-                    OutlinedButton(
-                        onClick = { updateRx(rxFrequencyHz + stepSizeKHz * 1000L) },
-                        modifier = Modifier.width(32.dp).height(28.dp),
-                        contentPadding = PaddingValues(0.dp),
-                        shape = MaterialTheme.shapes.extraSmall
-                    ) { Text("+", fontSize = 14.sp) }
-                }
-                Row(
-                    modifier = Modifier.fillMaxWidth().padding(horizontal = 4.dp),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    Text(
-                        text = String.format(Locale.ENGLISH, "%.4f", rxLow / 1_000_000.0),
-                        fontSize = 12.sp,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                        modifier = Modifier.weight(1f)
-                    )
-                    Row(
-                        verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.Center
-                    ) {
-                        Text(
-                            text = String.format(Locale.ENGLISH, "%.6f", rxFrequencyHz / 1_000_000.0),
-                            fontSize = 20.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = MaterialTheme.colorScheme.primary
-                        )
-                        Text(
-                            text = " MHz",
-                            fontSize = 20.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = MaterialTheme.colorScheme.primary
-                        )
-                    }
-                    Text(
-                        text = String.format(Locale.ENGLISH, "%.4f", rxHigh / 1_000_000.0),
-                        fontSize = 12.sp,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                        modifier = Modifier.weight(1f),
-                        textAlign = TextAlign.End
-                    )
-                }
-            }
+            OutlinedTextField(
+                value = rxInputMHz,
+                onValueChange = { newValue ->
+                    rxInputMHz = newValue
+                    lastEditedBy = EditedField.RX
+                    txInputMHz = calculateUplink(newValue, offsetKHz) ?: if (newValue.isEmpty()) "" else txInputMHz
+                },
+                label = { Text(stringResource(R.string.radar_doppler_rx_hint)) },
+                singleLine = true,
+                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal),
+                modifier = Modifier.weight(1f)
+            )
         }
+    }
 }
 
+private enum class EditedField { TX, RX }
+
 @Composable
 private fun FrequencyText(frequency: Long?, modifier: Modifier = Modifier) {
     val text = frequency?.let {
@@ -897,4 +629,3 @@ private fun transceiverTitle(radio: SatRadio): String {
 
 private val FREQ_ADJUSTMENTS =
     listOf(-10_000L to "-10k", -1_000L to "-1k", -100L to "-100", 100L to "+100", 1_000L to "+1k", 10_000L to "+10k")
-

feature/status/build.gradle.kts

@@ -1,17 +0,0 @@
-import com.android.build.api.dsl.LibraryExtension
-
-plugins {
-    alias(libs.plugins.convention.featurePlugin)
-}
-
-android {
-    namespace = "com.rtbishop.look4sat.feature.status"
-    compileOptions {
-        encoding = "UTF-8"
-    }
-}
-
-dependencies {
-    implementation(project(":core:domain"))
-    implementation(project(":core:presentation"))
-}

feature/status/src/main/java/com/rtbishop/look4sat/feature/status/SatStatusScreen.kt

@@ -1,370 +0,0 @@
-package com.rtbishop.look4sat.feature.status
-
-import androidx.compose.animation.core.RepeatMode
-import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.infiniteRepeatable
-import androidx.compose.animation.core.rememberInfiniteTransition
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.navigationBarsPadding
-import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.res.painterResource
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.rotate
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.rtbishop.look4sat.core.domain.model.SatDay
-import com.rtbishop.look4sat.core.domain.model.SatReport
-import com.rtbishop.look4sat.core.domain.model.SatSlot
-import com.rtbishop.look4sat.core.domain.model.SatStatus
-import com.rtbishop.look4sat.core.domain.repository.IMainContainer
-import com.rtbishop.look4sat.core.presentation.R
-import com.rtbishop.look4sat.feature.status.R as StatusR
-import java.util.Calendar
-
-/**
- * Map AMSAT status text to Material3 colorScheme colors.
- * Addresses PR #233 review: use colorScheme instead of hardcoded Color() constants.
- */
-@Composable
-private fun statusColorOf(statusText: String): Color {
-    return when {
-        statusText.contains("Heard", ignoreCase = true) && !statusText.contains("Not", ignoreCase = true) ->
-            MaterialTheme.colorScheme.tertiary // Active
-        statusText.contains("Telemetry", ignoreCase = true) || statusText.contains("Beacon", ignoreCase = true) ->
-            MaterialTheme.colorScheme.tertiaryContainer // Telemetry
-        statusText.contains("Not Heard", ignoreCase = true) ->
-            Color(0xFFDC267F) // NotHeard pink (no semantic slot)
-        else ->
-            MaterialTheme.colorScheme.error // Conflict
-    }
-}
-
-private val NoReportGray = Color(0xFFC0C0C0) // Neutral state
-
-@Composable
-fun SatStatusScreen(container: IMainContainer) {
-    val viewModel: SatStatusViewModel = viewModel(factory = SatStatusViewModel.factory(container))
-    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-    var selectedDay by remember { mutableStateOf<Pair<SatStatus, SatDay>?>(null) }
-
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .statusBarsPadding()
-            .navigationBarsPadding()
-            .padding(horizontal = 8.dp)
-    ) {
-        // Top: legend + refresh
-        StatusHeader(
-            fetchedAtUtcMs = uiState.fetchedAtUtcMs,
-            isRefreshing = uiState.isRefreshing,
-            onRefresh = { viewModel.refresh() }
-        )
-        LegendRow()
-
-        when {
-            uiState.isLoading -> {
-                Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-                    CircularProgressIndicator()
-                }
-            }
-            uiState.error != null && uiState.statuses.isEmpty() -> {
-                Column(
-                    modifier = Modifier.fillMaxSize(),
-                    verticalArrangement = Arrangement.Center,
-                    horizontalAlignment = Alignment.CenterHorizontally
-                ) {
-                    Text(
-                        text = stringResource(id = R.string.amsat_load_failed),
-                        color = MaterialTheme.colorScheme.error
-                    )
-                    TextButton(onClick = { viewModel.refresh() }) {
-                        Text(text = stringResource(id = R.string.amsat_retry))
-                    }
-                }
-            }
-            else -> {
-                // Header
-                HeaderRow(statuses = uiState.statuses)
-                HorizontalDivider(thickness = 1.dp)
-                // Row
-                LazyColumn(
-                    modifier = Modifier.fillMaxSize(),
-                    contentPadding = PaddingValues(bottom = 16.dp)
-                ) {
-                    items(uiState.statuses, key = { it.name }) { status ->
-                        StatusRow(
-                            status = status,
-                            onClickDay = { day -> selectedDay = status to day }
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    selectedDay?.let { (status, day) ->
-        ReportDialog(
-            statusName = status.name,
-            day = day,
-            reports = uiState.reports,
-            onDismiss = { selectedDay = null }
-        )
-    }
-}
-
-/** Top: update time + refresh button (spinner while loading) */
-@Composable
-private fun StatusHeader(
-    fetchedAtUtcMs: Long,
-    isRefreshing: Boolean,
-    onRefresh: () -> Unit
-) {
-    val infiniteTransition = rememberInfiniteTransition(label = "refresh")
-    val angle by infiniteTransition.animateFloat(
-        initialValue = 0f,
-        targetValue = 360f,
-        animationSpec = infiniteRepeatable(tween(800), RepeatMode.Restart),
-        label = "angle"
-    )
-    Row(
-        modifier = Modifier.fillMaxWidth().padding(vertical = 6.dp),
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        Text(
-            text = if (fetchedAtUtcMs > 0) stringResource(id = R.string.amsat_updated) + " " + formatFetchedAt(fetchedAtUtcMs) else stringResource(id = R.string.amsat_title),
-            fontSize = 13.sp,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
-            modifier = Modifier.weight(1f)
-        )
-        Box(
-            modifier = Modifier
-                .size(34.dp)
-                .clip(CircleShape)
-                .background(MaterialTheme.colorScheme.surfaceVariant)
-                .clickable(onClick = onRefresh),
-            contentAlignment = Alignment.Center
-        ) {
-            if (isRefreshing) {
-                CircularProgressIndicator(modifier = Modifier.size(18.dp), strokeWidth = 2.dp)
-            } else {
-                Image(
-                    painter = painterResource(id = StatusR.drawable.ic_refresh),
-                    contentDescription = stringResource(id = R.string.amsat_refresh),
-                    modifier = Modifier
-                        .size(18.dp)
-                        .rotate(angle),
-                    colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary)
-                )
-            }
-        }
-    }
-}
-
-/** Legend (official four colors) */
-@Composable
-private fun LegendRow() {
-    val legend = listOf(
-        stringResource(id = R.string.amsat_active) to MaterialTheme.colorScheme.tertiary,
-        stringResource(id = R.string.amsat_tlm) to MaterialTheme.colorScheme.tertiaryContainer,
-        stringResource(id = R.string.amsat_not_heard) to Color(0xFFDC267F),
-        stringResource(id = R.string.amsat_conflict) to MaterialTheme.colorScheme.error
-    )
-    Row(
-        modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp),
-        horizontalArrangement = Arrangement.spacedBy(8.dp)
-    ) {
-        legend.forEach { (label, color) ->
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Box(
-                    modifier = Modifier
-                        .size(10.dp)
-                        .clip(RoundedCornerShape(2.dp))
-                        .background(color)
-                )
-                Spacer(modifier = Modifier.width(3.dp))
-                Text(text = label, fontSize = 10.sp, color = MaterialTheme.colorScheme.onSurfaceVariant)
-            }
-        }
-    }
-}
-
-/** Header: satellite name + 6 day dates */
-@Composable
-private fun HeaderRow(statuses: List<SatStatus>) {
-    val dates = statuses.firstOrNull()?.days?.map { it.dateLabel } ?: emptyList()
-    Row(
-        modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp),
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        Text(
-            text = stringResource(id = R.string.amsat_name),
-            fontSize = 11.sp,
-            fontWeight = FontWeight.Bold,
-            color = MaterialTheme.colorScheme.primary,
-            modifier = Modifier.weight(2f).padding(start = 4.dp)
-        )
-        dates.forEach { date ->
-            Text(
-                text = date,
-                fontSize = 10.sp,
-                fontWeight = FontWeight.Bold,
-                textAlign = TextAlign.Center,
-                color = MaterialTheme.colorScheme.primary,
-                modifier = Modifier.weight(0.8f)
-            )
-        }
-    }
-}
-
-/** Satellite row: name + 6 day color blocks (displays the newest non-gray status) */
-@Composable
-private fun StatusRow(status: SatStatus, onClickDay: (SatDay) -> Unit) {
-    val noReportGray = 0xFFC0C0C0L
-    Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(vertical = 3.dp),
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        Text(
-            text = status.name,
-            fontSize = 11.sp,
-            maxLines = 1,
-            overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
-            modifier = Modifier.weight(2f).padding(start = 4.dp)
-        )
-        status.days.forEach { day ->
-            val slot = day.slots.firstOrNull { it.statusColor != noReportGray } ?: day.slots.first()
-            DayCell(
-                slot = slot,
-                modifier = Modifier.weight(0.8f).padding(horizontal = 1.dp),
-                onClick = { onClickDay(day) }
-            )
-        }
-    }
-}
-
-/** Day block: newest reported status among the day's 12 slots; gray when none */
-@Composable
-private fun DayCell(slot: SatSlot, modifier: Modifier, onClick: () -> Unit) {
-    val color = Color(slot.statusColor)
-    Box(
-        modifier = modifier
-            .height(24.dp)
-            .clip(RoundedCornerShape(4.dp))
-            .background(color)
-            .clickable(onClick = onClick),
-        contentAlignment = Alignment.Center
-    ) {
-        if (slot.count > 0) {
-            Text(
-                text = slot.count.toString(),
-                fontSize = 11.sp,
-                fontWeight = FontWeight.Bold,
-                color = Color.White
-            )
-        }
-    }
-}
-
-/** Report detail dialog (3 levels: callsign/date/time/grid) */
-@Composable
-private fun ReportDialog(
-    statusName: String,
-    day: SatDay,
-    reports: Map<String, SatReport>,
-    onDismiss: () -> Unit
-) {
-    val dayReports = day.slots.flatMap { it.reportIds }
-        .mapNotNull { reports[it] }
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(text = "$statusName · ${day.dateLabel}") },
-        text = {
-            if (dayReports.isEmpty()) {
-                Text(stringResource(id = R.string.amsat_no_reports))
-            } else {
-                LazyColumn(modifier = Modifier.height(320.dp)) {
-                    items(dayReports) { report ->
-                        Column(modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp)) {
-                            Row(verticalAlignment = Alignment.CenterVertically) {
-                                Box(
-                                    modifier = Modifier
-                                        .size(8.dp)
-                                        .clip(CircleShape)
-                                        .background(statusColorOf(report.statusText))
-                                )
-                                Spacer(modifier = Modifier.width(6.dp))
-                                Text(
-                                    text = report.statusText,
-                                    fontSize = 13.sp,
-                                    fontWeight = FontWeight.Bold
-                                )
-                            }
-                            Text(
-                                text = "${report.call}  ${report.dateUtc}  ${report.timeUtc}" +
-                                    if (report.grid.isNotBlank() && report.grid != "-") "  ${report.grid}" else "",
-                                fontSize = 12.sp,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
-                            )
-                        }
-                        HorizontalDivider(thickness = 0.5.dp)
-                    }
-                }
-            }
-        },
-        confirmButton = {
-            TextButton(onClick = onDismiss) { Text(stringResource(id = R.string.amsat_close)) }
-        }
-    )
-}
-
-
-private fun formatFetchedAt(utcMs: Long): String {
-    val cal = Calendar.getInstance()
-    cal.timeInMillis = utcMs
-    return "%02d-%02d %02d:%02d".format(
-        cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH),
-        cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE)
-    )
-}

feature/status/src/main/java/com/rtbishop/look4sat/feature/status/SatStatusViewModel.kt

@@ -1,94 +0,0 @@
-package com.rtbishop.look4sat.feature.status
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.initializer
-import androidx.lifecycle.viewmodel.viewModelFactory
-import com.rtbishop.look4sat.core.domain.model.SatReport
-import com.rtbishop.look4sat.core.domain.model.SatStatus
-import com.rtbishop.look4sat.core.domain.repository.IMainContainer
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-
-data class SatStatusUiState(
-    val isLoading: Boolean = false,
-    val isRefreshing: Boolean = false,
-    val statuses: List<SatStatus> = emptyList(),
-    val reports: Map<String, SatReport> = emptyMap(),
-    val fetchedAtUtcMs: Long = 0L,
-    val error: String? = null
-)
-
-class SatStatusViewModel(
-    private val container: IMainContainer
-) : ViewModel() {
-
-    private val _uiState = MutableStateFlow(SatStatusUiState(isLoading = true))
-    val uiState: StateFlow<SatStatusUiState> = _uiState
-
-    init {
-        fetch()
-    }
-
-    fun fetch() {
-        viewModelScope.launch {
-            _uiState.update { it.copy(isLoading = true, error = null) }
-            try {
-                val page = container.amSatRepo.fetchStatus()
-                if (page != null && page.statuses.isNotEmpty()) {
-                    _uiState.update {
-                        it.copy(
-                            isLoading = false,
-                            isRefreshing = false,
-                            statuses = page.statuses,
-                            reports = page.reports,
-                            fetchedAtUtcMs = page.fetchedAtUtcMs
-                        )
-                    }
-                } else {
-                    _uiState.update {
-                        it.copy(isLoading = false, isRefreshing = false, error = "fetch_failed")
-                    }
-                }
-            } catch (exception: Exception) {
-                _uiState.update {
-                    it.copy(isLoading = false, isRefreshing = false, error = exception.message ?: "fetch_failed")
-                }
-            }
-        }
-    }
-
-    fun refresh() {
-        if (_uiState.value.isRefreshing) return
-        _uiState.update { it.copy(isRefreshing = true, error = null) }
-        viewModelScope.launch {
-            try {
-                val page = container.amSatRepo.fetchStatus()
-                if (page != null && page.statuses.isNotEmpty()) {
-                    _uiState.update {
-                        it.copy(
-                            isRefreshing = false,
-                            statuses = page.statuses,
-                            reports = page.reports,
-                            fetchedAtUtcMs = page.fetchedAtUtcMs
-                        )
-                    }
-                } else {
-                    _uiState.update { it.copy(isRefreshing = false, error = "fetch_failed") }
-                }
-            } catch (exception: Exception) {
-                _uiState.update { it.copy(isRefreshing = false, error = exception.message ?: "fetch_failed") }
-            }
-        }
-    }
-
-    companion object {
-        fun factory(container: IMainContainer) = viewModelFactory {
-            initializer {
-                SatStatusViewModel(container)
-            }
-        }
-    }
-}

feature/status/src/main/res/drawable/ic_refresh.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Standard Material refresh icon (24dp viewport), centered geometry -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
->
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z" />
-</vector>

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 #noinspection UnusedVersionCatalogEntry
-appVersionCode = "445"
+appVersionCode = "444"
 #noinspection UnusedVersionCatalogEntry
-appVersionName = "4.4.5"
+appVersionName = "4.4.4"
 #noinspection UnusedVersionCatalogEntry
 compileSdk = "37"
 #noinspection UnusedVersionCatalogEntry

settings.gradle.kts

@@ -25,6 +25,5 @@ include(
     ":feature:passes",
     ":feature:radar",
     ":feature:satellites",
-    ":feature:settings",
-    ":feature:status"
+    ":feature:settings"
 )