i18n: localize AMSAT status screen for Chinese

app/src/main/java/com/rtbishop/look4sat/MainScreen.kt

@@ -68,7 +68,6 @@ import androidx.navigation3.runtime.rememberNavBackStack
 import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
 import com.rtbishop.look4sat.core.domain.repository.IContainerProvider
-import com.rtbishop.look4sat.core.presentation.R
 import com.rtbishop.look4sat.core.domain.repository.RadioTrackingState
 import com.rtbishop.look4sat.core.presentation.DeeplinkResolver
 import com.rtbishop.look4sat.core.presentation.ElevationThresholds
@@ -253,7 +252,7 @@ private fun TrackingBanner(state: RadioTrackingState, onClick: () -> Unit) {
         )
         Spacer(modifier = Modifier.width(8.dp))
         Text(
-            text = stringResource(R.string.tracking_format, state.currentPass?.name ?: ""),
+            text = "Tracking: ${state.currentPass?.name ?: ""}",
             fontSize = 13.sp,
             fontWeight = FontWeight.Medium,
             color = MaterialTheme.colorScheme.onPrimaryContainer,

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

@@ -1,7 +1,5 @@
 package com.rtbishop.look4sat.core.data.repository
 
-import com.rtbishop.look4sat.core.domain.model.AmSatReportSubmission
-import com.rtbishop.look4sat.core.domain.model.AmSatReportSubmitResult
 import com.rtbishop.look4sat.core.domain.model.SatDay
 import com.rtbishop.look4sat.core.domain.model.SatReport
 import com.rtbishop.look4sat.core.domain.model.SatSlot
@@ -14,7 +12,6 @@ import kotlinx.coroutines.withContext
 import org.json.JSONObject
 import java.text.SimpleDateFormat
 import java.util.Calendar
-import java.util.Date
 import java.util.Locale
 import java.util.TimeZone
 
@@ -52,46 +49,6 @@ class AmSatRepository(private val remoteSource: IRemoteSource) : IAmSatRepositor
         SatStatusPage(System.currentTimeMillis(), statuses, reportMap)
     }
 
-    override suspend fun submitReport(submission: AmSatReportSubmission): AmSatReportSubmitResult = withContext(Dispatchers.IO) {
-        val payload = JSONObject().apply {
-            put("name", submission.name)
-            put("report", submission.report)
-            put("callsign", submission.callsign)
-            put("reported_at", isoUtcFormat.format(Date(submission.reportedAtUtcMillis)))
-            if (submission.gridSquare.isNotBlank()) put("grid_square", submission.gridSquare)
-        }
-        val response = remoteSource.submitAmSatReport(payload.toString())
-            ?: return@withContext AmSatReportSubmitResult(success = false, message = "Network request failed")
-        val (code, body) = response
-        val errorMessage = parseSubmitError(body)
-        return@withContext if (code in 200..299 && errorMessage.isBlank()) {
-            AmSatReportSubmitResult(success = true, reportId = parseSubmitReportId(body))
-        } else {
-            AmSatReportSubmitResult(
-                success = false,
-                message = errorMessage.ifBlank { "HTTP $code" }
-            )
-        }
-    }
-
-    private fun parseSubmitError(json: String): String {
-        return try {
-            JSONObject(json).optJSONObject("error")?.optString("message").orEmpty()
-        } catch (_: Exception) {
-            ""
-        }
-    }
-
-    private fun parseSubmitReportId(json: String): String? {
-        return try {
-            val obj = JSONObject(json)
-            obj.optJSONObject("data")?.optString("id")?.takeIf { it.isNotBlank() }
-                ?: obj.optString("id").takeIf { it.isNotBlank() }
-        } catch (_: Exception) {
-            null
-        }
-    }
-
     /** Parse catalog JSON to list of satellite names */
     private fun parseCatalog(json: String): List<String> {
         return try {

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

@@ -40,7 +40,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import org.json.JSONObject
-import java.util.Locale
 
 class SettingsRepo(
     private val locationManager: LocationManager,
@@ -505,16 +504,4 @@ class SettingsRepo(
         }
         preferences.edit { putString(keySatelliteOffsets, updated) }
     }
-
-    //region # AMSAT status report settings
-    private val keyAmSatCallsign = "amSatCallsign"
-
-    override fun getAmSatCallsign(): String {
-        return preferences.getString(keyAmSatCallsign, "").orEmpty()
-    }
-
-    override fun setAmSatCallsign(callsign: String) {
-        preferences.edit { putString(keyAmSatCallsign, callsign.trim().uppercase(Locale.US)) }
-    }
-    //endregion
 }

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

@@ -23,10 +23,8 @@ import com.rtbishop.look4sat.core.domain.source.IRemoteSource
 import com.rtbishop.look4sat.core.domain.source.NetworkResult
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
-import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
 import java.io.InputStream
 
 class RemoteSource(
@@ -99,21 +97,4 @@ class RemoteSource(
             null
         }
     }
-
-    override suspend fun submitAmSatReport(payloadJson: String): Pair<Int, String>? = withContext(dispatcher) {
-        try {
-            val body = payloadJson.toRequestBody("application/json; charset=utf-8".toMediaType())
-            val request = Request.Builder()
-                .url("https://www.amsat.org/status/api/v1/reports.php")
-                .header("User-Agent", "Look4Sat")
-                .post(body)
-                .build()
-            httpClient.newCall(request).execute().use { response ->
-                response.code to response.body.string()
-            }
-        } catch (exception: Exception) {
-            println("RemoteSource submitAmSatReport exception: $exception")
-            null
-        }
-    }
 }

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

@@ -128,8 +128,6 @@ private class FakeRemoteSource : IRemoteSource {
     override suspend fun getAmSatCatalog(): String? = null
 
     override suspend fun getAmSatReports(hours: Int, limit: Int): String? = null
-
-    override suspend fun submitAmSatReport(payloadJson: String): Pair<Int, String>? = null
 }
 
 private class FakeLocalSource : ILocalSource {
@@ -231,10 +229,6 @@ private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSou
     override fun getSatelliteOffset(catnum: Int): String = ""
 
     override fun setSatelliteOffset(catnum: Int, offset: String) = Unit
-
-    override fun getAmSatCallsign(): String = ""
-
-    override fun setAmSatCallsign(callsign: String) = Unit
 }
 
 private fun defaultDataSourcesSettings(): DataSourcesSettings {

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

@@ -175,10 +175,6 @@ class SelectionRepoTest {
         override fun getSatelliteOffset(catnum: Int): String = ""
 
         override fun setSatelliteOffset(catnum: Int, offset: String) = Unit
-
-        override fun getAmSatCallsign(): String = ""
-
-        override fun setAmSatCallsign(callsign: String) = Unit
     }
 }
 

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

@@ -1,17 +0,0 @@
-package com.rtbishop.look4sat.core.domain.model
-
-/** One public AMSAT satellite status report submission. */
-data class AmSatReportSubmission(
-    val name: String,
-    val report: String,
-    val callsign: String,
-    val gridSquare: String,
-    val reportedAtUtcMillis: Long
-)
-
-/** Result of submitting an AMSAT satellite status report. */
-data class AmSatReportSubmitResult(
-    val success: Boolean,
-    val message: String = "",
-    val reportId: String? = null
-)

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

@@ -1,14 +1,9 @@
 package com.rtbishop.look4sat.core.domain.repository
 
-import com.rtbishop.look4sat.core.domain.model.AmSatReportSubmission
-import com.rtbishop.look4sat.core.domain.model.AmSatReportSubmitResult
 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?
-
-    /** Submit a public AMSAT satellite status report. */
-    suspend fun submitReport(submission: AmSatReportSubmission): AmSatReportSubmitResult
 }

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

@@ -85,9 +85,4 @@ interface ISettingsRepo {
     fun getSatelliteOffset(catnum: Int): String
     fun setSatelliteOffset(catnum: Int, offset: String)
     //endregion
-
-    //region # AMSAT status report settings
-    fun getAmSatCallsign(): String
-    fun setAmSatCallsign(callsign: String)
-    //endregion
 }

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

@@ -32,5 +32,4 @@ interface IRemoteSource {
     suspend fun getNetworkStream(url: String): NetworkResult
     suspend fun getAmSatCatalog(): String?
     suspend fun getAmSatReports(hours: Int, limit: Int): String?
-    suspend fun submitAmSatReport(payloadJson: String): Pair<Int, String>?
 }

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

@@ -305,7 +305,6 @@ fun InfoDialog(
     title: String,
     onDismiss: () -> Unit,
     onAccept: () -> Unit,
-    extraAction: (@Composable () -> Unit)? = null,
     content: @Composable () -> Unit
 ) {
     DialogShell(onDismissRequest = onDismiss) { padding ->
@@ -324,10 +323,6 @@ fun InfoDialog(
                 overflow = TextOverflow.Ellipsis,
                 modifier = Modifier.weight(1f)
             )
-            extraAction?.let {
-                it()
-                Spacer(modifier = Modifier.width(8.dp))
-            }
             CardButton(onClick = onAccept, text = stringResource(R.string.btn_accept))
         }
         content()

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

@@ -30,26 +30,6 @@
     <string name="amsat_status_tlm_only">仅遥测</string>
     <string name="amsat_status_not_heard">未听到</string>
     <string name="amsat_status_crew_active">乘组活跃</string>
-    <string name="amsat_upload">上传</string>
-    <string name="amsat_upload_back">返回</string>
-    <string name="amsat_upload_report">上传报告到 AMSAT</string>
-    <string name="amsat_upload_status">状态</string>
-    <string name="amsat_upload_callsign">呼号</string>
-    <string name="amsat_upload_grid">网格</string>
-    <string name="amsat_upload_time_now">时间：当前 UTC %s</string>
-    <string name="amsat_upload_submit">提交到 AMSAT</string>
-    <string name="amsat_upload_confirm">确认上传</string>
-    <string name="amsat_upload_confirm_title">确认上传到 AMSAT</string>
-    <string name="amsat_upload_confirm_message">这条公开报告将上传到 AMSAT。\n卫星：%1$s\n状态：%2$s\n呼号：%3$s\n网格：%4$s</string>
-    <string name="amsat_upload_grid_none">未填写</string>
-    <string name="amsat_upload_success">报告已上传</string>
-    <string name="amsat_upload_failed">上传失败：%s</string>
-    <string name="amsat_upload_callsign_required">请填写呼号</string>
-    <string name="amsat_upload_grid_invalid">网格应为 4 或 6 位 Maidenhead 定位符</string>
-    <string name="amsat_upload_active">活跃</string>
-    <string name="amsat_upload_tlm">遥测/信标</string>
-    <string name="amsat_upload_not_heard">未听到</string>
-    <string name="amsat_upload_crew_active">ISS 语音</string>
 
     <!-- Satellites screen -->
     <string name="sat_type_hint">模式：%s</string>
@@ -103,24 +83,6 @@
     <string name="radar_doppler_rx_hint">输入下行频率 (MHz)</string>
     <string name="radar_doppler_offset_hint">偏移 (kHz)</string>
 
-    <!-- Radar screen (CAT control / SSTV) -->
-    <string name="radar_connect">连接</string>
-    <string name="radar_disconnect">断开连接</string>
-    <string name="radar_off">关</string>
-    <string name="radar_stop">停止</string>
-    <string name="radar_track">跟踪</string>
-    <string name="radar_tx_base">TX 基频：</string>
-
-    <!-- SSTV screen -->
-    <string name="sstv_grant_permission">授予权限</string>
-    <string name="sstv_listening">正在监听…</string>
-    <string name="sstv_mic_permission">需要麦克风权限</string>
-    <string name="sstv_mode_format">模式：%s</string>
-    <string name="sstv_mode_title">SSTV 模式</string>
-    <string name="sstv_no_signal">无信号</string>
-    <string name="sstv_no_transceiver">未选择收发器</string>
-    <string name="sstv_rx_format">RX：%s Hz</string>
-
     <!-- Map screen -->
     <string name="map_prev">上一个</string>
     <string name="map_next">下一个</string>
@@ -141,12 +103,6 @@
     <string name="prefs_donate_title">支持</string>
     <string name="prefs_privacy_title">隐私政策</string>
 
-    <string name="settings_paired_devices">已配对的蓝牙设备：</string>
-    <string name="settings_split_mode">分频模式（仅 IC-705）</string>
-    <string name="prefs_lat_prefix">纬度：%s°</string>
-    <string name="prefs_lon_prefix">经度：%s°</string>
-    <string name="prefs_qth_prefix">QTH：%s</string>
-
     <string name="prefs_updated_title">更新：%s</string>
     <string name="prefs_updated_time">yyyy MMM d - HH:mm:ss</string>
 
@@ -239,7 +195,4 @@
         \n• Libre Space Foundation (SatNOGS)</string>
     <string name="prefs_outro_license">该应用程序不提供任何保修.</string>
 
-    <!-- Main screen -->
-    <string name="tracking_format">跟踪：%s</string>
-
 </resources>

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

@@ -83,26 +83,6 @@
     <string name="amsat_status_tlm_only">Telemetry Only</string>
     <string name="amsat_status_not_heard">Not Heard</string>
     <string name="amsat_status_crew_active">Crew Active</string>
-    <string name="amsat_upload">Upload</string>
-    <string name="amsat_upload_back">Back</string>
-    <string name="amsat_upload_report">Upload report to AMSAT</string>
-    <string name="amsat_upload_status">Status</string>
-    <string name="amsat_upload_callsign">Callsign</string>
-    <string name="amsat_upload_grid">Grid</string>
-    <string name="amsat_upload_time_now">Time: current UTC %s</string>
-    <string name="amsat_upload_submit">Submit to AMSAT</string>
-    <string name="amsat_upload_confirm">Upload</string>
-    <string name="amsat_upload_confirm_title">Confirm AMSAT upload</string>
-    <string name="amsat_upload_confirm_message">This public report will be uploaded to AMSAT.\nSatellite: %1$s\nStatus: %2$s\nCallsign: %3$s\nGrid: %4$s</string>
-    <string name="amsat_upload_grid_none">Not provided</string>
-    <string name="amsat_upload_success">Report uploaded</string>
-    <string name="amsat_upload_failed">Upload failed: %s</string>
-    <string name="amsat_upload_callsign_required">Callsign is required</string>
-    <string name="amsat_upload_grid_invalid">Grid must be a 4 or 6 character Maidenhead locator</string>
-    <string name="amsat_upload_active">Active</string>
-    <string name="amsat_upload_tlm">TLM/Beacon</string>
-    <string name="amsat_upload_not_heard">Not Heard</string>
-    <string name="amsat_upload_crew_active">Crew Active</string>
 
     <!-- Radar screen -->
     <string name="radar_back">Back</string>
@@ -133,24 +113,6 @@
     <string name="radar_doppler_rx_hint">Enter RX freq (MHz)</string>
     <string name="radar_doppler_offset_hint">Offset (kHz)</string>
 
-    <!-- Radar screen (CAT control / SSTV) -->
-    <string name="radar_connect">Connect</string>
-    <string name="radar_disconnect">Disconnect</string>
-    <string name="radar_off">Off</string>
-    <string name="radar_stop">Stop</string>
-    <string name="radar_track">Track</string>
-    <string name="radar_tx_base">TX Base: </string>
-
-    <!-- SSTV screen -->
-    <string name="sstv_grant_permission">Grant permission</string>
-    <string name="sstv_listening">Listening…</string>
-    <string name="sstv_mic_permission">Microphone access needed</string>
-    <string name="sstv_mode_format">Mode: %s</string>
-    <string name="sstv_mode_title">SSTV Mode</string>
-    <string name="sstv_no_signal">No signal</string>
-    <string name="sstv_no_transceiver">No transceiver selected</string>
-    <string name="sstv_rx_format">RX: %s Hz</string>
-
     <!-- Map screen -->
     <string name="map_prev">Prev</string>
     <string name="map_next">Next</string>
@@ -183,12 +145,6 @@
     <string name="prefs_privacy_title">Privacy Policy</string>
     <string name="prefs_privacy_url" translatable="false">https://sites.google.com/view/look4sat-privacy-policy/home</string>
 
-    <string name="settings_paired_devices">Paired Bluetooth Devices:</string>
-    <string name="settings_split_mode">Split mode (IC-705 only)</string>
-    <string name="prefs_lat_prefix">Lat: %s°</string>
-    <string name="prefs_lon_prefix">Lon: %s°</string>
-    <string name="prefs_qth_prefix">Qth: %s</string>
-
     <string name="prefs_updated_title">Updated: %s</string>
     <string name="prefs_updated_time">d MMM yyyy - HH:mm:ss</string>
 
@@ -283,7 +239,4 @@
     </string>
     <string name="prefs_outro_license">The app comes with no warranty</string>
 
-    <!-- Main screen -->
-    <string name="tracking_format">Tracking: %s</string>
-
 </resources>

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

@@ -49,7 +49,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -79,12 +78,12 @@ internal fun SstvPage(
             ) {
                 Text(text = "🎙️", fontSize = 48.sp)
                 Text(
-                    text = stringResource(R.string.sstv_mic_permission),
+                    text = "Microphone access needed",
                     fontSize = 16.sp,
                     color = MaterialTheme.colorScheme.onSurface
                 )
                 Button(onClick = requestMicPermission) {
-                    Text(stringResource(R.string.sstv_grant_permission))
+                    Text("Grant permission")
                 }
             }
         }
@@ -98,7 +97,7 @@ internal fun SstvPage(
         val allModes = remember(sstv.supportedModes) { listOf("Auto") + sstv.supportedModes }
         val dismiss = { showModeDialog.value = false }
         ConfirmDialog(
-            title = stringResource(R.string.sstv_mode_title),
+            title = "SSTV Mode",
             onAccept = dismiss,
             onCancel = dismiss
         ) {
@@ -168,7 +167,7 @@ internal fun SstvPage(
             )
         } else {
             Text(
-                text = if (sstv.status == SstvStatus.Recording) stringResource(R.string.sstv_listening) else stringResource(R.string.sstv_no_signal),
+                text = if (sstv.status == SstvStatus.Recording) "Listening…" else "No signal",
                 color = MaterialTheme.colorScheme.onSurface,
                 fontSize = 16.sp,
                 modifier = Modifier.align(Alignment.Center)
@@ -197,7 +196,7 @@ internal fun SstvPage(
         ) {
             // Doppler-corrected downlink frequency hint
             OutlinedText(
-                text = dopplerFrequency?.let { stringResource(R.string.sstv_rx_format, it) } ?: stringResource(R.string.sstv_no_transceiver),
+                text = dopplerFrequency?.let { "RX: $it Hz" } ?: "No transceiver selected",
                 fontSize = 18.sp,
                 fontWeight = FontWeight.Bold,
                 fillColor = MaterialTheme.colorScheme.primary,
@@ -228,7 +227,7 @@ internal fun SstvPage(
                 ) {
                     Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                         Text(
-                            text = stringResource(R.string.sstv_mode_format, sstv.selectedMode),
+                            text = "Mode: ${sstv.selectedMode}",
                             fontSize = 14.sp,
                             maxLines = 1,
                             color = MaterialTheme.colorScheme.onSurface,

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

@@ -403,7 +403,7 @@ private fun ExpandedRadioControl(
                     modifier = Modifier.fillMaxWidth()
                 ) {
                     Text(
-                        text = stringResource(R.string.radar_tx_base),
+                        text = "TX Base: ",
                         fontSize = 14.sp,
                         color = MaterialTheme.colorScheme.onSurfaceVariant
                     )
@@ -460,7 +460,7 @@ private fun ExpandedRadioControl(
                         onClick = { onAction(RadarAction.SetCtcssTone(null)) },
                         label = {
                             Text(
-                                text = stringResource(R.string.radar_off),
+                                text = "Off",
                                 fontSize = 12.sp,
                                 textAlign = TextAlign.Center,
                                 modifier = Modifier.fillMaxWidth()
@@ -492,19 +492,19 @@ private fun ExpandedRadioControl(
             if (!radioControl.txPanel.isConnected && !radioControl.rxPanel.isConnected) {
                 CardButton(
                     onClick = { onAction(RadarAction.ConnectRadios) },
-                    text = stringResource(R.string.radar_connect),
+                    text = "Connect",
                     modifier = Modifier.weight(1f)
                 )
             } else {
                 CardButton(
                     onClick = { onAction(RadarAction.DisconnectRadios) },
-                    text = stringResource(R.string.radar_disconnect),
+                    text = "Disconnect",
                     modifier = Modifier.weight(1f)
                 )
             }
             CardButton(
                 onClick = { onAction(RadarAction.ToggleTracking) },
-                text = if (radioControl.isTracking) stringResource(R.string.radar_stop) else stringResource(R.string.radar_track),
+                text = if (radioControl.isTracking) "Stop" else "Track",
                 modifier = Modifier.weight(1f)
             )
         }
@@ -726,7 +726,7 @@ private fun DopplerFrequencyCalculator(
                         decorationBox = { innerTextField ->
                             if (offsetKHz.isEmpty()) {
                                 Text(
-                                    text = stringResource(R.string.radar_doppler_offset_hint),
+                                    text = "Offset (kHz)",
                                     fontSize = 16.sp,
                                     color = MaterialTheme.colorScheme.onSurfaceVariant
                                 )

feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsDialog.kt

@@ -980,7 +980,7 @@ fun RadioControlDialog(
                 modifier = Modifier.fillMaxWidth()
             ) {
                 Text(
-                    text = stringResource(R.string.settings_split_mode),
+                    text = "Split mode (IC-705 only)",
                     fontWeight = FontWeight.Medium,
                     color = splitModeLabelColor
                 )
@@ -1020,7 +1020,7 @@ fun RadioControlDialog(
 
             if (selectingFor.value.isNotBlank()) {
                 Text(
-                    text = stringResource(R.string.settings_paired_devices),
+                    text = "Paired Bluetooth Devices:",
                     fontWeight = FontWeight.Medium,
                     color = MaterialTheme.colorScheme.primary
                 )

feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsScreen.kt

@@ -342,9 +342,9 @@ private fun LocationCard(
             Text(text = formatUpdateTime(updateTime = settings.stationPos.timestamp))
             Spacer(modifier = Modifier.height(2.dp))
             Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
-                Text(text = stringResource(R.string.prefs_lat_prefix, settings.stationPos.latitude))
-                Text(text = stringResource(R.string.prefs_lon_prefix, settings.stationPos.longitude))
-                Text(text = stringResource(R.string.prefs_qth_prefix, settings.stationPos.qthLocator))
+                Text(text = "Lat: ${settings.stationPos.latitude}°")
+                Text(text = "Lon: ${settings.stationPos.longitude}°")
+                Text(text = "Qth: ${settings.stationPos.qthLocator}")
             }
             Spacer(modifier = Modifier.height(1.dp))
             Row(horizontalArrangement = Arrangement.SpaceEvenly) {

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

@@ -1,6 +1,5 @@
 package com.rtbishop.look4sat.feature.status
 
-import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -21,14 +20,9 @@ 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.Button
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.FilterChip
-import androidx.compose.material3.FilterChipDefaults
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
@@ -57,32 +51,15 @@ 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.IContainerProvider
-import com.rtbishop.look4sat.core.presentation.CardButton
 import com.rtbishop.look4sat.core.presentation.InfoDialog
 import com.rtbishop.look4sat.core.presentation.R
 import com.rtbishop.look4sat.core.presentation.layoutPadding
-import java.text.SimpleDateFormat
 import java.util.Calendar
-import java.util.Date
 import java.util.Locale
-import java.util.TimeZone
 
 /** Fixed width per day tile — tablet-safe; name column absorbs remaining space. */
 private val TILE_WIDTH: Dp = 64.dp
 
-private data class UploadOption(
-    val apiValue: String,
-    val labelResId: Int,
-    val color: Color
-)
-
-private val UPLOAD_OPTIONS = listOf(
-    UploadOption(AMSAT_REPORT_HEARD, R.string.amsat_upload_active, Color(0xFF648FFF)),
-    UploadOption(AMSAT_REPORT_TELEMETRY_ONLY, R.string.amsat_upload_tlm, Color(0xFFFFB000)),
-    UploadOption(AMSAT_REPORT_NOT_HEARD, R.string.amsat_upload_not_heard, Color(0xFFDC267F)),
-    UploadOption(AMSAT_REPORT_CREW_ACTIVE, R.string.amsat_upload_crew_active, Color(0xFFFE6100))
-)
-
 /**
  * Map AMSAT status text to Material3 colorScheme colors.
  * Addresses PR #233 review: use colorScheme instead of hardcoded Color() constants.
@@ -120,33 +97,11 @@ fun SatStatusDestination() {
     val container = (context.applicationContext as IContainerProvider).getMainContainer()
     val viewModel: SatStatusViewModel = viewModel(factory = SatStatusViewModel.factory(container))
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-    SatStatusScreen(
-        uiState = uiState,
-        refresh = viewModel::refresh,
-        onToggleUpload = viewModel::toggleUploadPanel,
-        onUploadReportChange = viewModel::setUploadReport,
-        onUploadCallsignChange = viewModel::setUploadCallsign,
-        onUploadGridChange = viewModel::setUploadGrid,
-        onRequestSubmitUpload = viewModel::requestSubmitConfirmation,
-        onConfirmSubmitUpload = viewModel::confirmSubmitReport,
-        onDismissSubmitConfirmation = viewModel::dismissSubmitConfirmation,
-        onDismissUpload = viewModel::collapseUploadPanel
-    )
+    SatStatusScreen(uiState) { viewModel.refresh() }
 }
 
 @Composable
-private fun SatStatusScreen(
-    uiState: SatStatusUiState,
-    refresh: () -> Unit,
-    onToggleUpload: () -> Unit,
-    onUploadReportChange: (String) -> Unit,
-    onUploadCallsignChange: (String) -> Unit,
-    onUploadGridChange: (String) -> Unit,
-    onRequestSubmitUpload: () -> Unit,
-    onConfirmSubmitUpload: (String) -> Unit,
-    onDismissSubmitConfirmation: () -> Unit,
-    onDismissUpload: () -> Unit
-) {
+private fun SatStatusScreen(uiState: SatStatusUiState, refresh: () -> Unit) {
     var selectedDay by remember { mutableStateOf<Pair<SatStatus, SatDay>?>(null) }
     Column(modifier = Modifier.fillMaxSize().layoutPadding()) {
         StatusHeader(fetchedAtUtcMs = uiState.fetchedAtUtcMs, isRefreshing = uiState.isRefreshing, onRefresh = refresh)
@@ -181,23 +136,7 @@ private fun SatStatusScreen(
     }
 
     selectedDay?.let { (status, day) ->
-        ReportDialog(
-            statusName = status.name,
-            day = day,
-            reports = uiState.reports,
-            upload = uiState.upload,
-            onToggleUpload = onToggleUpload,
-            onReportChange = onUploadReportChange,
-            onCallsignChange = onUploadCallsignChange,
-            onGridChange = onUploadGridChange,
-            onRequestSubmitReport = onRequestSubmitUpload,
-            onConfirmSubmitReport = { onConfirmSubmitUpload(status.name) },
-            onDismissSubmitConfirmation = onDismissSubmitConfirmation,
-            onDismiss = {
-                selectedDay = null
-                onDismissUpload()
-            }
-        )
+        ReportDialog(statusName = status.name, day = day, reports = uiState.reports, onDismiss = { selectedDay = null })
     }
 }
 
@@ -351,57 +290,13 @@ private fun DayCell(slot: SatSlot, modifier: Modifier, onClick: () -> Unit) {
     }
 }
 
-/** Report detail dialog (callsign / date / time / grid) + AMSAT report upload panel. */
+/** Report detail dialog (callsign / date / time / grid) */
 @Composable
-private fun ReportDialog(
-    statusName: String,
-    day: SatDay,
-    reports: Map<String, SatReport>,
-    upload: AmSatUploadUiState,
-    onToggleUpload: () -> Unit,
-    onReportChange: (String) -> Unit,
-    onCallsignChange: (String) -> Unit,
-    onGridChange: (String) -> Unit,
-    onRequestSubmitReport: () -> Unit,
-    onConfirmSubmitReport: () -> Unit,
-    onDismissSubmitConfirmation: () -> Unit,
-    onDismiss: () -> Unit
-) {
+private fun ReportDialog(statusName: String, day: SatDay, reports: Map<String, SatReport>, onDismiss: () -> Unit) {
     val dayReports = day.slots.flatMap { it.reportIds }.mapNotNull { reports[it] }
-    InfoDialog(
-        title = "$statusName · ${day.dateLabel}",
-        onDismiss = onDismiss,
-        onAccept = onDismiss,
-        extraAction = {
-            CardButton(
-                onClick = onToggleUpload,
-                text = stringResource(if (upload.isExpanded) R.string.amsat_upload_back else R.string.amsat_upload)
-            )
-        }
-    ) {
-        AnimatedVisibility(visible = upload.isExpanded) {
-            AmSatUploadPanel(
-                statusName = statusName,
-                upload = upload,
-                onReportChange = onReportChange,
-                onCallsignChange = onCallsignChange,
-                onGridChange = onGridChange,
-                onRequestSubmitReport = onRequestSubmitReport
-            )
-        }
-        if (upload.isConfirmingSubmit) {
-            AmSatUploadConfirmDialog(
-                statusName = statusName,
-                upload = upload,
-                onConfirm = onConfirmSubmitReport,
-                onDismiss = onDismissSubmitConfirmation
-            )
-        }
+    InfoDialog(title = "$statusName · ${day.dateLabel}", onDismiss = onDismiss, onAccept = onDismiss) {
         if (dayReports.isEmpty()) {
-            Text(
-                text = stringResource(id = R.string.amsat_no_reports),
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
-            )
+            Text(stringResource(id = R.string.amsat_no_reports))
             Spacer(modifier = Modifier.height(8.dp))
         } else {
             LazyColumn(modifier = Modifier.heightIn(max = 480.dp)) {
@@ -431,171 +326,6 @@ private fun ReportDialog(
     }
 }
 
-@Composable
-private fun AmSatUploadPanel(
-    statusName: String,
-    upload: AmSatUploadUiState,
-    onReportChange: (String) -> Unit,
-    onCallsignChange: (String) -> Unit,
-    onGridChange: (String) -> Unit,
-    onRequestSubmitReport: () -> Unit
-) {
-    val options = remember(statusName) {
-        if (statusName.startsWith("ISS")) UPLOAD_OPTIONS else UPLOAD_OPTIONS.filter { it.apiValue != AMSAT_REPORT_CREW_ACTIVE }
-    }
-    Column(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp, vertical = 8.dp)
-            .clip(RoundedCornerShape(16.dp))
-            .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.45f))
-            .padding(12.dp),
-        verticalArrangement = Arrangement.spacedBy(10.dp)
-    ) {
-        Text(
-            text = stringResource(R.string.amsat_upload_report),
-            fontSize = 16.sp,
-            fontWeight = FontWeight.Medium,
-            color = MaterialTheme.colorScheme.primary
-        )
-        Text(
-            text = stringResource(R.string.amsat_upload_time_now, formatUtcNowForUpload(System.currentTimeMillis())),
-            fontSize = 12.sp,
-            color = MaterialTheme.colorScheme.onSurfaceVariant
-        )
-        Text(
-            text = stringResource(R.string.amsat_upload_status),
-            fontSize = 12.sp,
-            color = MaterialTheme.colorScheme.onSurfaceVariant
-        )
-        FlowRow(
-            horizontalArrangement = Arrangement.spacedBy(6.dp),
-            verticalArrangement = Arrangement.spacedBy(4.dp)
-        ) {
-            options.forEach { option ->
-                val selected = upload.selectedReport == option.apiValue
-                FilterChip(
-                    selected = selected,
-                    onClick = { onReportChange(option.apiValue) },
-                    label = {
-                        Row(verticalAlignment = Alignment.CenterVertically) {
-                            Box(
-                                modifier = Modifier
-                                    .size(8.dp)
-                                    .clip(CircleShape)
-                                    .background(if (selected) Color.White else option.color)
-                            )
-                            Spacer(modifier = Modifier.width(6.dp))
-                            Text(stringResource(option.labelResId), maxLines = 1)
-                        }
-                    },
-                    colors = FilterChipDefaults.filterChipColors(
-                        containerColor = option.color.copy(alpha = 0.10f),
-                        labelColor = MaterialTheme.colorScheme.onSurface,
-                        selectedContainerColor = option.color,
-                        selectedLabelColor = Color.White
-                    ),
-                    border = FilterChipDefaults.filterChipBorder(
-                        enabled = true,
-                        selected = selected,
-                        borderColor = option.color.copy(alpha = 0.60f),
-                        selectedBorderColor = option.color
-                    )
-                )
-            }
-        }
-        Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) {
-            OutlinedTextField(
-                value = upload.callsign,
-                onValueChange = onCallsignChange,
-                label = { Text(stringResource(R.string.amsat_upload_callsign)) },
-                singleLine = true,
-                modifier = Modifier.weight(1f)
-            )
-            OutlinedTextField(
-                value = upload.gridSquare,
-                onValueChange = onGridChange,
-                label = { Text(stringResource(R.string.amsat_upload_grid)) },
-                singleLine = true,
-                modifier = Modifier.weight(1f)
-            )
-        }
-        Button(
-            onClick = onRequestSubmitReport,
-            enabled = !upload.isSubmitting && upload.callsign.isNotBlank(),
-            modifier = Modifier.fillMaxWidth()
-        ) {
-            if (upload.isSubmitting) {
-                CircularProgressIndicator(modifier = Modifier.size(16.dp), strokeWidth = 2.dp)
-            } else {
-                Text(stringResource(R.string.amsat_upload_submit))
-            }
-        }
-        upload.message?.let { message ->
-            if (message == UPLOAD_MESSAGE_SUCCESS) {
-                Text(
-                    text = stringResource(R.string.amsat_upload_success),
-                    fontSize = 12.sp,
-                    color = MaterialTheme.colorScheme.primary
-                )
-            }
-        }
-        upload.error?.let { error ->
-            Text(
-                text = uploadErrorText(error),
-                fontSize = 12.sp,
-                color = MaterialTheme.colorScheme.error
-            )
-        }
-    }
-}
-
-@Composable
-private fun AmSatUploadConfirmDialog(
-    statusName: String,
-    upload: AmSatUploadUiState,
-    onConfirm: () -> Unit,
-    onDismiss: () -> Unit
-) {
-    val option = UPLOAD_OPTIONS.firstOrNull { it.apiValue == upload.selectedReport } ?: UPLOAD_OPTIONS.first()
-    val statusLabel = stringResource(option.labelResId)
-    val grid = upload.gridSquare.ifBlank { stringResource(R.string.amsat_upload_grid_none) }
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(stringResource(R.string.amsat_upload_confirm_title)) },
-        text = {
-            Text(
-                text = stringResource(
-                    R.string.amsat_upload_confirm_message,
-                    statusName,
-                    statusLabel,
-                    upload.callsign,
-                    grid
-                )
-            )
-        },
-        confirmButton = {
-            TextButton(onClick = onConfirm, enabled = !upload.isSubmitting) {
-                Text(stringResource(R.string.amsat_upload_confirm))
-            }
-        },
-        dismissButton = {
-            TextButton(onClick = onDismiss, enabled = !upload.isSubmitting) {
-                Text(stringResource(R.string.btn_cancel))
-            }
-        }
-    )
-}
-
-@Composable
-private fun uploadErrorText(error: String): String {
-    return when (error) {
-        UPLOAD_ERROR_CALLSIGN_REQUIRED -> stringResource(R.string.amsat_upload_callsign_required)
-        UPLOAD_ERROR_GRID_INVALID -> stringResource(R.string.amsat_upload_grid_invalid)
-        else -> stringResource(R.string.amsat_upload_failed, error)
-    }
-}
-
 private val MONTH_ABBR = arrayOf("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec")
 
 private fun formatFetchedAt(utcMs: Long): String {
@@ -613,10 +343,3 @@ private fun formatFetchedAt(utcMs: Long): String {
         "$day${MONTH_ABBR[monthIndex]} $year - $hh:$mm:$ss"
     }
 }
-
-private fun formatUtcNowForUpload(utcMs: Long): String {
-    val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.US).apply {
-        timeZone = TimeZone.getTimeZone("UTC")
-    }
-    return formatter.format(Date(utcMs))
-}

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

@@ -4,38 +4,14 @@ 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.AmSatReportSubmission
 import com.rtbishop.look4sat.core.domain.model.SatReport
 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.repository.IMainContainer
-import com.rtbishop.look4sat.core.domain.repository.ISettingsRepo
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import java.util.Locale
-
-const val AMSAT_REPORT_HEARD = "Heard"
-const val AMSAT_REPORT_TELEMETRY_ONLY = "Telemetry Only"
-const val AMSAT_REPORT_NOT_HEARD = "Not Heard"
-const val AMSAT_REPORT_CREW_ACTIVE = "Crew Active"
-
-const val UPLOAD_ERROR_CALLSIGN_REQUIRED = "callsign_required"
-const val UPLOAD_ERROR_GRID_INVALID = "grid_invalid"
-const val UPLOAD_MESSAGE_SUCCESS = "success"
-
-data class AmSatUploadUiState(
-    val isExpanded: Boolean = false,
-    val selectedReport: String = AMSAT_REPORT_HEARD,
-    val callsign: String = "",
-    val gridSquare: String = "",
-    val isSubmitting: Boolean = false,
-    val isConfirmingSubmit: Boolean = false,
-    val message: String? = null,
-    val error: String? = null
-)
 
 data class SatStatusUiState(
     val isLoading: Boolean = false,
@@ -43,13 +19,11 @@ data class SatStatusUiState(
     val statuses: List<SatStatus> = emptyList(),
     val reports: Map<String, SatReport> = emptyMap(),
     val fetchedAtUtcMs: Long = 0L,
-    val error: String? = null,
-    val upload: AmSatUploadUiState = AmSatUploadUiState()
+    val error: String? = null
 )
 
 class SatStatusViewModel(
-    private val amSatRepo: IAmSatRepository,
-    private val settingsRepo: ISettingsRepo
+    private val amSatRepo: IAmSatRepository
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(SatStatusUiState(isLoading = true))
@@ -65,7 +39,15 @@ class SatStatusViewModel(
             try {
                 val page = amSatRepo.fetchStatus()
                 if (page != null && page.statuses.isNotEmpty()) {
-                    applyStatusPage(page)
+                    _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")
@@ -86,7 +68,14 @@ class SatStatusViewModel(
             try {
                 val page = amSatRepo.fetchStatus()
                 if (page != null && page.statuses.isNotEmpty()) {
-                    applyStatusPage(page)
+                    _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") }
                 }
@@ -96,196 +85,11 @@ class SatStatusViewModel(
         }
     }
 
-    private fun applyStatusPage(page: SatStatusPage) {
-        _uiState.update {
-            it.copy(
-                isLoading = false,
-                isRefreshing = false,
-                statuses = page.statuses,
-                reports = page.reports,
-                fetchedAtUtcMs = page.fetchedAtUtcMs,
-                error = null
-            )
-        }
-    }
-
-    fun toggleUploadPanel() {
-        val storedCallsign = settingsRepo.getAmSatCallsign()
-        val defaultGrid = defaultGridSquare()
-        _uiState.update { state ->
-            val upload = state.upload
-            val expanded = !upload.isExpanded
-            state.copy(
-                upload = if (expanded) {
-                    upload.copy(
-                        isExpanded = true,
-                        callsign = upload.callsign.ifBlank { storedCallsign },
-                        gridSquare = upload.gridSquare.ifBlank { defaultGrid },
-                        message = null,
-                        error = null
-                    )
-                } else {
-                    upload.copy(isExpanded = false, isConfirmingSubmit = false, message = null, error = null)
-                }
-            )
-        }
-    }
-
-    fun collapseUploadPanel() {
-        _uiState.update {
-            it.copy(upload = it.upload.copy(isExpanded = false, isConfirmingSubmit = false, message = null, error = null))
-        }
-    }
-
-    fun setUploadReport(report: String) {
-        _uiState.update {
-            it.copy(upload = it.upload.copy(selectedReport = report, isConfirmingSubmit = false, message = null, error = null))
-        }
-    }
-
-    fun setUploadCallsign(callsign: String) {
-        val normalized = callsign.trim().uppercase(Locale.US)
-        settingsRepo.setAmSatCallsign(normalized)
-        _uiState.update {
-            it.copy(upload = it.upload.copy(callsign = normalized, isConfirmingSubmit = false, message = null, error = null))
-        }
-    }
-
-    fun setUploadGrid(grid: String) {
-        val normalized = grid.trim().uppercase(Locale.US)
-        _uiState.update {
-            it.copy(upload = it.upload.copy(gridSquare = normalized, isConfirmingSubmit = false, message = null, error = null))
-        }
-    }
-
-    fun requestSubmitConfirmation() {
-        val prepared = validateUpload(_uiState.value.upload) ?: return
-        _uiState.update {
-            it.copy(
-                upload = it.upload.copy(
-                    callsign = prepared.callsign,
-                    gridSquare = prepared.grid,
-                    isConfirmingSubmit = true,
-                    message = null,
-                    error = null
-                )
-            )
-        }
-    }
-
-    fun dismissSubmitConfirmation() {
-        _uiState.update { it.copy(upload = it.upload.copy(isConfirmingSubmit = false)) }
-    }
-
-    fun confirmSubmitReport(satelliteName: String) {
-        val upload = _uiState.value.upload
-        if (upload.isSubmitting) return
-        val prepared = validateUpload(upload) ?: return
-
-        settingsRepo.setAmSatCallsign(prepared.callsign)
-        _uiState.update {
-            it.copy(
-                upload = it.upload.copy(
-                    callsign = prepared.callsign,
-                    gridSquare = prepared.grid,
-                    isSubmitting = true,
-                    isConfirmingSubmit = false,
-                    error = null,
-                    message = null
-                )
-            )
-        }
-        viewModelScope.launch {
-            val result = amSatRepo.submitReport(
-                AmSatReportSubmission(
-                    name = satelliteName,
-                    report = prepared.report,
-                    callsign = prepared.callsign,
-                    gridSquare = prepared.grid,
-                    reportedAtUtcMillis = System.currentTimeMillis()
-                )
-            )
-            if (result.success) {
-                _uiState.update {
-                    it.copy(
-                        upload = it.upload.copy(
-                            isSubmitting = false,
-                            callsign = prepared.callsign,
-                            gridSquare = prepared.grid,
-                            message = UPLOAD_MESSAGE_SUCCESS,
-                            error = null
-                        )
-                    )
-                }
-                refresh()
-            } else {
-                _uiState.update {
-                    it.copy(
-                        upload = it.upload.copy(
-                            isSubmitting = false,
-                            message = null,
-                            error = result.message.ifBlank { "Upload failed" }
-                        )
-                    )
-                }
-            }
-        }
-    }
-
-    private fun validateUpload(upload: AmSatUploadUiState): PreparedUpload? {
-        val callsign = upload.callsign.trim().uppercase(Locale.US)
-        val grid = upload.gridSquare.trim().uppercase(Locale.US)
-        return when {
-            callsign.isBlank() -> {
-                _uiState.update {
-                    it.copy(
-                        upload = it.upload.copy(
-                            isConfirmingSubmit = false,
-                            error = UPLOAD_ERROR_CALLSIGN_REQUIRED,
-                            message = null
-                        )
-                    )
-                }
-                null
-            }
-            grid.isNotBlank() && !MAIDENHEAD_GRID.matches(grid) -> {
-                _uiState.update {
-                    it.copy(
-                        upload = it.upload.copy(
-                            isConfirmingSubmit = false,
-                            error = UPLOAD_ERROR_GRID_INVALID,
-                            message = null
-                        )
-                    )
-                }
-                null
-            }
-            else -> PreparedUpload(
-                report = upload.selectedReport,
-                callsign = callsign,
-                grid = grid
-            )
-        }
-    }
-
-    private fun defaultGridSquare(): String {
-        val grid = settingsRepo.stationPosition.value.qthLocator.trim().uppercase(Locale.US)
-        return grid.takeUnless { it == "JJ00AA" }.orEmpty()
-    }
-
     companion object {
         fun factory(container: IMainContainer) = viewModelFactory {
             initializer {
-                SatStatusViewModel(container.amSatRepo, container.settingsRepo)
+                SatStatusViewModel(container.amSatRepo)
             }
         }
     }
 }
-
-private data class PreparedUpload(
-    val report: String,
-    val callsign: String,
-    val grid: String
-)
-
-private val MAIDENHEAD_GRID = Regex("^[A-R]{2}[0-9]{2}([A-X]{2})?$")