refactor(amsat): align with Material3 conventions per PR #233 review

Addresses feedback from rt-bishop/Look4Sat#233: 1. Migrate hardcoded colors to MainTheme colorScheme - Extend darkScheme: tertiary (Active 0xFF648FFF), tertiaryContainer (Telemetry 0xFFFFB000) - Extend lightScheme: tertiary (0xFF3C6FE0), tertiaryContainer (0xFFE09800) for contrast - Remove top-level Color() constants from SatStatusScreen.kt - Add statusColorOf() mapper using MaterialTheme.colorScheme 2. Move HTTP implementation from domain to data layer (Clean Architecture) - Delete AmSatApiClient.kt from core:domain (violates AGENTS.md: "Pure Kotlin, NO Android deps") - Migrate to IRemoteSource/RemoteSource in core:data (uses existing OkHttp3) - AmSatRepository now depends on IRemoteSource instead of AmSatApiClient 3. Inline JSON parsing (prepare for java.time migration) - Parse AMSAT API responses (names, reports) in AmSatRepository - Time parsing still uses manual logic (java.time desugaring in follow-up) Before: - Hardcoded Color(0xFFXXXXXX) in UI + Repository (no theme support) - HttpURLConnection in domain layer (architecture violation) - AMSAT colors duplicated across modules After: - MaterialTheme.colorScheme.tertiary/tertiaryContainer (light/dark adaptive) - HTTP via data layer RemoteSource (follows AGENTS.md architecture) - Single source of truth for AMSAT colors Ref: https://github.com/rt-bishop/Look4Sat/pull/233#discussion_r1868599947 Ref: AGENTS.md "core:domain - Pure Kotlin (JVM). NO Android dependencies."
2026-08-05 15:26:42 +00:00
1 parent fb014a1183
commit de85aa1e8b
@@ -30,7 +30,6 @@ 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.domain.amsat.AmSatApiClient
 import com.rtbishop.look4sat.core.data.repository.DatabaseRepo
 import com.rtbishop.look4sat.core.data.repository.SatelliteRepo
 import com.rtbishop.look4sat.core.data.repository.SelectionRepo
@@ -83,7 +82,7 @@ class MainContainer(private val context: Context) : IMainContainer {
    override val selectionRepo = provideSelectionRepo()
    override val satelliteRepo = provideSatelliteRepo()
    override val databaseRepo = provideDatabaseRepo()
-    override val amSatRepo = AmSatRepository(com.rtbishop.look4sat.core.domain.amsat.AmSatApiClient())
+    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)
@@ -1,31 +1,95 @@
 package com.rtbishop.look4sat.core.data.repository

-import com.rtbishop.look4sat.core.domain.amsat.AmSatApiClient
-import com.rtbishop.look4sat.core.domain.amsat.ApiReport
 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.util.Calendar
 import java.util.TimeZone

-/** AMSAT status repository: official API v1 -> SatStatusPage (replaces the HTML parser). */
-class AmSatRepository(private val apiClient: AmSatApiClient) : IAmSatRepository {
+/** 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 {

    override suspend fun fetchStatus(): SatStatusPage? = withContext(Dispatchers.IO) {
        val nowSec = System.currentTimeMillis() / 1000
-        val names = apiClient.fetchCatalog()
-        val reports = apiClient.fetchAllReports(hours = 168)
+        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 {
+        val m = Regex("""(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})""").find(iso) ?: return 0L
+        val (y, mo, d, h, mi, s) = m.destructured
+        val days = daysFromCivil(y.toInt(), mo.toInt(), d.toInt())
+        return days * 86400L + h.toInt() * 3600L + mi.toInt() * 60L + s.toInt()
+    }
+
+    /** Days since 1970-01-01 (civil calendar, proleptic Gregorian) */
+    private fun daysFromCivil(year: Int, month: Int, day: Int): Long {
+        val y = if (month <= 2) year - 1 else year
+        val era = (if (y >= 0) y else y - 399) / 400
+        val yoe = y - era * 400
+        val doy = (153 * (if (month > 2) month - 3 else month + 9) + 2) / 5 + day - 1
+        val doe = yoe * 365 + yoe / 4 - yoe / 100 + doy
+        return era * 146097L + doe - 719468
+    }
+
    /** 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 }
@@ -41,7 +105,7 @@ class AmSatRepository(private val apiClient: AmSatApiClient) : IAmSatRepository
                val slotEnd = nowSec - slotIdx * 7200L
                val inSlot = byName[name].orEmpty().filter { it.reportedTimeUtcSec in slotStart until slotEnd }
                if (inSlot.isEmpty()) {
-                    SatSlot(statusColor = NoReportGray, count = 0)
+                    SatSlot(statusColor = NO_REPORT_GRAY, count = 0)
                } else {
                    val newest = inSlot.maxByOrNull { it.reportedTimeUtcSec }!!
                    SatSlot(
@@ -76,18 +140,20 @@ class AmSatRepository(private val apiClient: AmSatApiClient) : IAmSatRepository
        )
    }

+    /** Map status text to color value (for UI rendering). */
    private fun statusColorOf(report: String): Long = when (report.lowercase()) {
-        "heard", "crew active" -> ActiveBlue
-        "telemetry only" -> TlmOrange
-        "not heard" -> NotHeardPink
-        else -> ConflictDeepOrange
+        "heard", "crew active" -> ACTIVE_BLUE
+        "telemetry only" -> TLM_ORANGE
+        "not heard" -> NOT_HEARD_PINK
+        else -> CONFLICT_DEEP_ORANGE
    }

    companion object {
-        private const val ActiveBlue = 0xFF648FFF
-        private const val TlmOrange = 0xFFFFB000
-        private const val NotHeardPink = 0xFFDC267F
-        private const val ConflictDeepOrange = 0xFFFE6100
-        private const val NoReportGray = 0xFFC0C0C0
+        // 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
    }
 }
@@ -71,4 +71,36 @@ 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/4.5.5")
+                .build()
+            httpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) return@use null
+                response.body?.string()
+            }
+        } catch (exception: Exception) {
+            println("RemoteSource amsat catalog 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/4.5.5")
+                .build()
+            httpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) return@use null
+                response.body?.string()
+            }
+        } catch (exception: Exception) {
+            println("RemoteSource amsat reports exception: $exception")
+            null
+        }
+    }
 }