feat(status): add AMSAT satellite status tracking

New feature: displays recent AMSAT satellite activity from amsat.org API.
Shows 6-day status grid (Heard/Telemetry/Not Heard) + detailed reports.

Addresses PR #233 feedback:
- Uses Material3 colorScheme (tertiary/tertiaryContainer) for theme support
- HTTP in data layer via RemoteSource (Clean Architecture)
- SimpleDateFormat instead of manual date math
- Edge-to-edge support

Implementation:
- feature:status module (AMSAT status screen + legend)
- core:data AmSatRepository (API client using RemoteSource)
- core:domain models (SatStatus/SatReport/SatSlot/SatDay)
- MainTheme.kt: AMSAT colors mapped to colorScheme slots

Navigation intentionally not included - you mentioned potential UI
restructuring (Navigation Drawer). The screen is ready to integrate
wherever it fits your roadmap.

Ref: https://github.com/rt-bishop/Look4Sat/pull/233

.github/dependabot.yml

@@ -4,3 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "never"

.github/workflows/release.yml

@@ -4,15 +4,10 @@ on:
   push:
     tags:
       - v**
-  workflow_dispatch:
-    inputs:
-      tag_name:
-        description: 'Release tag name (e.g. v4.4.3)'
-        required: false
-        default: ''
 
 env:
-  TAG_NAME: ${{ github.event.inputs.tag_name || github.ref_name }}
+  TAG_NAME: ${{ github.ref_name }}
+  GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
 
 jobs:
   release:
@@ -21,40 +16,66 @@ jobs:
       contents: write
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '21'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v6
 
-      - name: Assemble APK
-        run: ./gradlew assembleRelease
+      - name: Assemble Artifacts
+        run: ./gradlew assembleRelease bundleRelease
 
       - name: Sign APK
         run: |
           echo "${{ secrets.KEY_STORE }}" | base64 -d > keystore.jks
           APK=$(find app/build/outputs/apk/release -name "*.apk" | head -1)
-          VERSION=${TAG_NAME#v}
-          SIGNED_APK="app/build/outputs/apk/release/Look4Sat-Pro-${VERSION}.apk"
           BUILD_TOOLS=$(ls -d ${ANDROID_HOME}/build-tools/*/ | sort -V | tail -1)
           ${BUILD_TOOLS}apksigner sign \
             --ks keystore.jks \
             --ks-pass pass:${{ secrets.KEY_STORE_PASSWORD }} \
             --ks-key-alias ${{ secrets.KEY_ALIAS }} \
             --key-pass pass:${{ secrets.KEY_PASSWORD }} \
-            --out "$SIGNED_APK" \
+            --out app/build/outputs/apk/release/look4sat.apk \
             "$APK"
           rm keystore.jks
-          echo "SIGNED_APK=$SIGNED_APK" >> "$GITHUB_ENV"
+
+      - name: Sign Bundle
+        run: |
+          echo "${{ secrets.KEY_STORE }}" | base64 -d > keystore.jks
+          AAB=$(find app/build/outputs/bundle/release -name "*.aab" | head -1)
+          jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 \
+            -keystore keystore.jks \
+            -storepass ${{ secrets.KEY_STORE_PASSWORD }} \
+            -keypass ${{ secrets.KEY_PASSWORD }} \
+            "$AAB" ${{ secrets.KEY_ALIAS }}
+          rm keystore.jks
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.4'
+
+      - name: Deploy Bundle to Google Play
+        run: |
+          gem install multi_json
+          gem install fastlane --no-document
+          AAB=$(find app/build/outputs/bundle/release -name "*.aab" | head -1)
+          echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
+          fastlane supply \
+            --aab "$AAB" \
+            --json_key service_account.json \
+            --package_name com.rtbishop.look4sat \
+            --track production \
+            --skip_upload_images true \
+            --skip_upload_screenshots true \
+          rm service_account.json
 
       - name: Create Release
-        env:
-          GH_TOKEN: ${{ github.token }}
         run: |
           gh release create $TAG_NAME --title=$TAG_NAME --generate-notes
-          gh release upload $TAG_NAME "$SIGNED_APK"
+          gh release upload $TAG_NAME app/build/outputs/apk/release/look4sat.apk

.gitignore

@@ -1,9 +1,6 @@
 # Built application files
 *.ap_
 
-# Hermes AI plans and metadata
-.hermes/
-
 # Files for the ART/Dalvik VM
 *.dex
 
@@ -39,7 +36,8 @@ captures/
 .idea/
 
 # Keystore files
-*.jks
+# Uncomment the following line if you do not want to check your keystore files in.
+#*.jks
 /*.properties
 /keystore.properties
 /app/keystore.jks

AGENTS.md

@@ -8,16 +8,15 @@ All assistant-specific files (`CLAUDE.md`, `.github/copilot-instructions.md`) po
 ## Project Overview
 
 Look4Sat is an open-source, fully offline Android satellite tracker and pass predictor. It tracks 9000+ active
-satellites using TLE/OMM data from Celestrak/SatNOGS, calculates orbital positions via SGP4/SDP4 models, and displays
-passes relative to the user's location. Features include polar radar visualization, SSTV image decoding, satellite
-ground track mapping, and pass predictions up to 10 days ahead. No ads, no tracking, no network required after initial
-data download.
+satellites using Celestrak/SatNOGS orbital data, calculates positions via SGP4/SDP4, and predicts passes relative to
+the user's location. Features include polar radar visualization, SSTV image decoding, and ground track mapping. No ads,
+no tracking, no network required after initial data download.
 
-## Architecture
+## Architecture & Design
 
 **MVI (Model-View-Intent)** with unidirectional data flow:
-- `State` data class → exposed via `StateFlow` from ViewModel
-- `Action` sealed interface → user intents dispatched to ViewModel's `onAction()`
+- `State` data class (named `<Feature>State`) exposed via `StateFlow` from ViewModel
+- `Action` sealed interface (named `<Feature>Action`) dispatched to ViewModel's `onAction()`
 - Jetpack Compose UI observes state and recomposes reactively
 
 **Clean Architecture layers:**
@@ -34,9 +33,11 @@ data download.
 | `feature:satellites` | Satellite list, filtering, selection                                |
 | `feature:settings`   | User preferences                                                    |
 
-- `feature:*` modules depend only on `core:domain` + `core:presentation`. Features never depend on each other.
+**Feature isolation:**
+- `feature:*` modules depend only on `core:domain` and `core:presentation`.
+- No feature-to-feature dependencies; cross-feature communication goes through core layers.
 
-## Build & Run
+## Build & Platform
 
 ```shell
 # Debug build
@@ -50,54 +51,55 @@ data download.
 ```
 
 - **Min SDK**: 24 | **Target SDK**: 36 | **JDK**: 17
-- **Gradle**: Uses version catalog (`gradle/libs.versions.toml`) + convention plugins in `build-logic/`
+- **Gradle**: Version catalog in `gradle/libs.versions.toml` + convention plugins in `build-logic/`
 
-## Key Libraries
+## Tech Stack
 
 - **Compose** (BOM 2026.05.01) + Material3 Adaptive
-- **Navigation3** (type-safe, uses `@Serializable` NavKeys)
-- **Room** (KSP code generation) for local satellite/TLE storage
-- **OkHttp** 5.x for TLE downloads
+- **Navigation3**: Type-safe navigation with `@Serializable` nav keys
+- **Room** (KSP code generation) for local satellite/orbital storage
+- **OkHttp** 5.x for data downloads
 - **OSMDroid** for map rendering
-- **Kotlin Serialization** for navigation args and data parsing
+- **Kotlin Serialization** for navigation args and parsing
 - **Coroutines** + `StateFlow` for async/reactive patterns
-
-## Conventions
-
-- **Minimal dependencies**: Avoid adding libraries when a simple manual solution exists. Fewer deps = less maintenance.
-- **DI**: Manual — ViewModels use companion `factory()` methods with `IMainContainer` interface.
-- **Navigation**: Type-safe Compose Navigation3 with `@Serializable` data classes as nav keys.
-- **State naming**: `<Feature>State` data class + `<Feature>Action` sealed interface per feature.
-- **No feature-to-feature deps**: All cross-feature communication goes through core layers.
-- **Localization**: 7 languages (en, es, ru, si, tr, uk, zh).
+- **Localization**: 7 languages (en, es, ru, si, tr, uk, zh)
 
 ## Data Formats & Migration
 
-**TLE vs. OMM/CSV format:**
+Look4Sat supports both TLE and OMM (Orbit Mean-Elements Message) CSV formats:
 
-Look4Sat supports both TLE and OMM (Orbit Mean-Elements Message) formats for backward compatibility:
+- **TLE format**: Legacy 3-line element format limited by 5-digit NORAD IDs
+- **OMM/CSV format**: Successor format with ISO 8601 timestamps and larger NORAD ID support
+- New 5-digit NORAD IDs are exhausted; TLE is officially deprecated and OMM/CSV is the clear default
+- `DataParser.kt` supports both via `parseTLEStream()` and `parseCSVStream()`
+- Downloads auto-detect format; both produce identical `OrbitalData` objects
+- Existing code already supports transparent source transition without feature changes
+- Refresh orbital data weekly for accurate pass prediction (orbital decay)
 
-- **TLE format**: Traditional 3-line element format (deprecated). NORAD catalog numbers are 5-digit integers, which
-  are running out of space. Celestrak has signaled that TLE format will eventually be phased out.
-- **OMM/CSV format**: The future standard. CSV files contain the same orbital parameters as TLE but use ISO 8601
-  timestamps and support larger NORAD IDs. Celestrak and SatNOGS already provide OMM data in CSV format.
+## Engineering Heuristics (Lazy = Efficient)
 
-**Current implementation:**
-- `DataParser.kt` handles both `parseTLEStream()` and `parseCSVStream()` seamlessly
-- TLE data is downloaded from configured sources and stored in Room database
-- When downloading satellite data, the app automatically detects format and parses accordingly
-- Both formats produce identical `OrbitalData` objects, ensuring transparent format switching
+- Treat "lazy" as efficient, not careless: the best code is the code never written.
+- First understand the task and trace the real flow end-to-end, then climb this ladder:
+  1. Does this need to be built now? (YAGNI)
+  2. Does it already exist in this codebase? Reuse helpers/patterns before rewriting.
+  3. Does Kotlin/Java stdlib already solve it?
+  4. Does the Android/platform API already solve it?
+  5. Does an already-installed dependency solve it?
+  6. Can this be simpler (including one-liner simple)?
+  7. Only then: write the minimum code that works.
+- Prefer deletion to addition, boring over clever, and the fewest touched files.
+- Avoid new abstractions, dependencies, and boilerplate unless explicitly requested.
+- Manual DI only: ViewModels use companion `factory()` methods with `IMainContainer`.
+- Release builds use ProGuard: avoid reflection-heavy libraries unless explicitly approved.
+- When two options are similar in size, choose the edge-case-correct one.
+- If you keep a deliberate simplification (for example O(n^2) scan or global lock), leave a short comment with the ceiling and upgrade path.
+- For complex asks, challenge scope when appropriate: "Do you need X, or does Y already cover it?"
 
-**Migration path:**
-As NORAD catalog space becomes constrained, OMM/CSV will become the primary format. Look4Sat is already positioned
-to handle this transition without code changes — existing users can continue using TLE files while new sources
-transition to OMM/CSV automatically.
+## Bug-Fix Policy
 
-## Code Style
-
-- Prefer **short, focused functions** — single responsibility, easy to read.
-- **Exceptions**: Composable functions and math-heavy algorithms (SGP4/SDP4) may be longer.
-- Strict code style — no dead code, no unused imports, consistent formatting.
+- Fix root cause, not just the reported symptom.
+- If touching a shared function, inspect callers and prefer one shared fix over per-caller patches.
+- The smallest correct diff wins only after behavior is understood.
 
 ## Roadmap
 
@@ -105,12 +107,9 @@ transition to OMM/CSV automatically.
 
 ## Gotchas
 
-- Orbital math lives in `core:domain/predict/` — it's dense vector math (SGP4/SDP4). Tread carefully.
-- TLE/OMM data must be refreshed weekly for accurate predictions (satellite orbits decay). TLE format is legacy and
-  will eventually be deprecated in favor of OMM/CSV as NORAD catalog numbers approach the 5-digit limit.
+- Orbital math lives in `core:domain/predict/` — dense vector math (SGP4/SDP4). Tread carefully.
 - SSTV decoding in `feature:radar` is experimental; image quality depends on signal strength during satellite pass.
-- `build-logic/convention/` contains all shared Gradle configuration — edit there, not in individual modules.
-- ProGuard is enabled for release builds — don't add reflection-based libs or any other dependencies without asking.
+- `build-logic/convention/` contains shared Gradle configuration — edit there, not in individual modules.
 
 ## Copilot Working Mode: Code-Only
 

app/build.gradle.kts

@@ -1,39 +1,3 @@
-import java.util.Properties
-
 plugins {
     alias(libs.plugins.convention.applicationPlugin)
 }
-
-// Load signing config from keystore.properties (gitignored, never commit credentials)
-val keystoreProperties = Properties().apply {
-    val propsFile = rootProject.file("keystore.properties")
-    if (propsFile.exists()) propsFile.inputStream().use { load(it) }
-}
-
-android {
-    // CW 解码已迁移为纯 Kotlin fldigi 引擎, 不再有 native 库;
-    // 取消 armeabi-v7a 强制, 按设备 ABI 打包(含 x86_64 模拟器)
-    defaultConfig {
-    }
-    androidResources {
-        // 显式保留全部语言(防 shrinkResources 丢弃 in/id 印尼语配置); AGP 9 用 localeFilters
-        localeFilters += listOf(
-            "en", "zh", "tr", "in", "id", "es", "ru", "si", "uk"
-        )
-    }
-    signingConfigs {
-        if (keystoreProperties["storeFile"] != null) {
-            create("release") {
-                storeFile = rootProject.file(keystoreProperties["storeFile"] as String)
-                storePassword = keystoreProperties["storePassword"] as String
-                keyAlias = keystoreProperties["keyAlias"] as String
-                keyPassword = keystoreProperties["keyPassword"] as String
-            }
-        }
-    }
-    buildTypes {
-        release {
-            signingConfig = signingConfigs.findByName("release")
-        }
-    }
-}

app/src/main/AndroidManifest.xml

@@ -14,10 +14,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
-        <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-<application
+    <application
         android:name=".MainApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
@@ -28,7 +25,6 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:screenOrientation="portrait"
             android:theme="@style/Theme.Look4Sat.SplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -46,11 +42,7 @@
 
         <meta-data
             android:name="android.telephony.PROPERTY_SATELLITE_DATA_OPTIMIZED"
-            android:value="com.rtbishop.look4sat.bg7nta" />
+            android:value="com.rtbishop.look4sat" />
 
-            <service
-            android:name="com.rtbishop.look4sat.app.AprsForegroundService"
-            android:exported="false"
-            android:foregroundServiceType="dataSync" />
     </application>
 </manifest>

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

@@ -1,190 +0,0 @@
-package com.rtbishop.look4sat.app
-
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import android.widget.Toast
-import android.content.pm.ServiceInfo
-import android.os.Build
-import android.os.IBinder
-import com.rtbishop.look4sat.MainApplication
-import com.rtbishop.look4sat.core.presentation.R
-import com.rtbishop.look4sat.core.data.aprs.AprsConfig
-import com.rtbishop.look4sat.core.data.aprs.AprsStore
-import com.rtbishop.look4sat.core.data.aprs.AprsReporter
-import com.rtbishop.look4sat.core.data.aprs.AprsState
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.launch
-
-/**
- * APRS foreground service: kept alive by a system notification; keeps working across pages.
- * START_STICKY: auto-restarted after being killed by the system (same strategy as APRSdroid).
- */
-class AprsForegroundService : Service() {
-
-    companion object {
-        const val ACTION_START = AprsStore.ACTION_START
-        const val ACTION_STOP = AprsStore.ACTION_STOP
-        const val ACTION_REPORT_NOW = AprsStore.ACTION_REPORT_NOW
-        const val CHANNEL_ID = "aprs_service"
-        const val NOTIF_ID = 101
-    }
-
-    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-    private var reporter: AprsReporter? = null
-    private var lastState: AprsState = AprsState.Idle
-
-    override fun onBind(intent: Intent?): IBinder? = null
-
-    override fun onCreate() {
-        super.onCreate()
-        createChannel()
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        when (intent?.action) {
-            ACTION_STOP -> stopReporting()
-            ACTION_REPORT_NOW -> {
-                if (reporter == null) {
-                    // Service not running: start it first (Toast hint when not configured)
-                    startReporting()
-                }
-                reporter?.reportNow()
-            }
-            else -> startReporting()
-        }
-        return START_STICKY
-    }
-
-    private fun startReporting() {
-        val cfg = AprsStore.loadConfig(this)
-        if (!cfg.enabled || cfg.callsign.isBlank()) {
-            runCatching {
-                Toast.makeText(this, getString(R.string.aprs_toast_not_configured), Toast.LENGTH_SHORT).show()
-            }
-            stopSelf()
-            return
-        }
-        startForegroundWithNotification(cfg)
-        val rep = AprsReporter(
-            configProvider = { AprsStore.loadConfig(this) },
-            positionProvider = { stationPosition() },
-            onState = { lastState = it },
-            onReport = { report ->
-                AprsStore.saveLastReport(this, report.ok, report.detail)
-                updateNotification(cfg)
-                // Report result always surfaces: success = short Toast, failure = long Toast + reason
-                val msg = if (report.ok) {
-                    getString(R.string.aprs_toast_ok)
-                } else {
-                    getString(R.string.aprs_toast_fail, report.detail)
-                }
-                runCatching {
-                    Toast.makeText(this, msg,
-                        if (report.ok) Toast.LENGTH_SHORT else Toast.LENGTH_LONG).show()
-                }
-            }
-        )
-        reporter = rep
-        rep.start()
-    }
-
-    private fun stopReporting() {
-        reporter?.stop()
-        reporter = null
-        stopForeground(STOP_FOREGROUND_REMOVE)
-        stopSelf()
-    }
-
-    private fun startForegroundWithNotification(cfg: AprsConfig) {
-        try {
-            val notif = buildNotification(cfg)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                startForeground(NOTIF_ID, notif, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
-            } else {
-                startForeground(NOTIF_ID, notif)
-            }
-        } catch (e: Exception) {
-            // Vendor ROM / old-system safety net: foreground-start failure only stops the service, never crashes the app
-            stopSelf()
-        }
-    }
-
-    private fun buildNotification(cfg: AprsConfig): Notification {
-        val pi = PendingIntent.getActivity(
-            this, 0, packageManager.getLaunchIntentForPackage(packageName),
-            PendingIntent.FLAG_IMMUTABLE
-        )
-        val stopPi = PendingIntent.getService(
-            this, 1, Intent(this, AprsForegroundService::class.java).setAction(ACTION_STOP),
-            PendingIntent.FLAG_IMMUTABLE
-        )
-        val stateText = when (lastState) {
-            AprsState.Connected -> getString(R.string.aprs_notif_connected)
-            AprsState.Error -> getString(R.string.aprs_notif_error)
-            else -> getString(R.string.aprs_notif_running)
-        }
-        return Notification.Builder(this, CHANNEL_ID)
-            .setSmallIcon(R.drawable.ic_radios)
-            .setContentTitle(getString(R.string.aprs_notif_title, cfg.callsign))
-            .setContentText(stateText)
-            .setContentIntent(pi)
-            .setOngoing(true)
-            .addAction(0, getString(R.string.aprs_notif_stop), stopPi)
-            .build()
-    }
-
-    private fun updateNotification(cfg: AprsConfig) {
-        val nm = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        nm.notify(NOTIF_ID, buildNotification(cfg))
-    }
-
-    /** Report position: station QTH from settings first (per user); live GPS as fallback when invalid */
-    private fun stationPosition(): Pair<Double, Double>? {
-        // 1. Station QTH (position set in settings)
-        val station = runCatching {
-            val container = (application as MainApplication).getMainContainer()
-            container.settingsRepo.stationPosition.value
-        }.getOrNull()
-        if (station != null && (station.latitude != 0.0 || station.longitude != 0.0)) {
-            return Pair(station.latitude, station.longitude)
-        }
-        // 2. Fallback: last live GPS position
-        return runCatching {
-            val lm = getSystemService(Context.LOCATION_SERVICE) as android.location.LocationManager
-            val providers = listOf(
-                android.location.LocationManager.GPS_PROVIDER,
-                android.location.LocationManager.NETWORK_PROVIDER
-            )
-            for (p in providers) {
-                val loc = lm.getLastKnownLocation(p) ?: continue
-                if (loc.latitude != 0.0 || loc.longitude != 0.0) {
-                    return Pair(loc.latitude, loc.longitude)
-                }
-            }
-            null
-        }.getOrNull()
-    }
-
-    private fun createChannel() {
-        val nm = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        val channel = NotificationChannel(
-            CHANNEL_ID, getString(R.string.aprs_notif_channel),
-            NotificationManager.IMPORTANCE_LOW
-        )
-        nm.createNotificationChannel(channel)
-    }
-
-    override fun onDestroy() {
-        reporter?.stop()
-        reporter = null
-        super.onDestroy()
-    }
-}

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

@@ -30,29 +30,10 @@ class MainApplication : Application(), IContainerProvider {
 
     private lateinit var container: IMainContainer
 
-    /** Global crash capture: stack written to files/crash_log.txt, viewable after restart (user asked for error reports) */
-    private fun installCrashHandler() {
-        val defaultHandler = Thread.getDefaultUncaughtExceptionHandler()
-        Thread.setDefaultUncaughtExceptionHandler { thread, throwable ->
-            runCatching {
-                val log = StringBuilder()
-                log.append("=== Crash ${System.currentTimeMillis()} ===\n")
-                log.append("Thread: ").append(thread.name).append("\n")
-                val sw = java.io.StringWriter()
-                throwable.printStackTrace(java.io.PrintWriter(sw))
-                log.append(sw.toString()).append("\n")
-                val file = java.io.File(filesDir, "crash_log.txt")
-                file.appendText(log.toString())
-            }
-            defaultHandler?.uncaughtException(thread, throwable)
-        }
-    }
-
     override fun getMainContainer(): IMainContainer = container
 
     override fun onCreate() {
         super.onCreate()
-        installCrashHandler()
         container = MainContainer(this)
         // trigger automatic update every 48 hours
         container.appScope.launch { checkAutoUpdate() }

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

@@ -17,23 +17,16 @@
  */
 package com.rtbishop.look4sat
 
-import androidx.activity.compose.BackHandler
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.RepeatMode
-import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.animateFloat
 import androidx.compose.animation.core.infiniteRepeatable
 import androidx.compose.animation.core.rememberInfiniteTransition
-import androidx.compose.animation.core.spring
 import androidx.compose.animation.core.tween
-import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.scaleIn
 import androidx.compose.animation.scaleOut
-import androidx.compose.animation.shrinkVertically
 import androidx.compose.animation.slideInHorizontally
 import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.animation.togetherWith
@@ -60,9 +53,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 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
@@ -73,16 +63,13 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.lifecycle.ViewModelStoreOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
 import androidx.navigation3.runtime.entryProvider
 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.domain.repository.MutualPassData
 import com.rtbishop.look4sat.core.presentation.DeeplinkResolver
 import com.rtbishop.look4sat.core.presentation.ElevationThresholds
 import com.rtbishop.look4sat.core.presentation.LocalElevationThresholds
@@ -90,15 +77,9 @@ import com.rtbishop.look4sat.core.presentation.RadarDestination
 import com.rtbishop.look4sat.core.presentation.Screen
 import com.rtbishop.look4sat.core.presentation.hasEnoughHeight
 import com.rtbishop.look4sat.core.presentation.hasEnoughWidth
-import com.rtbishop.look4sat.feature.cw.CwDecodeScreen
 import com.rtbishop.look4sat.feature.map.MapDestination
-import com.rtbishop.look4sat.feature.mutual.MutualScreen
-import com.rtbishop.look4sat.feature.mutual.MutualViewModel
 import com.rtbishop.look4sat.feature.passes.PassesDestination
 import com.rtbishop.look4sat.feature.radar.RadarDestination
-import com.rtbishop.look4sat.feature.radar.WavelogLogScreen
-import com.rtbishop.look4sat.feature.status.SatStatusScreen
-import com.rtbishop.look4sat.feature.roaming.RoamingScreen
 import com.rtbishop.look4sat.feature.satellites.SatellitesDestination
 import com.rtbishop.look4sat.feature.settings.SettingsDestination
 
@@ -144,40 +125,12 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
     val currentKey = backStack.lastOrNull()
     val navigateBack: () -> Unit = { backStack.removeLastOrNull() }
     val fadeTransition = fadeIn(animationSpec = tween(350)) togetherWith fadeOut(animationSpec = tween(350))
+    val navItems = listOf(Screen.Satellites, Screen.Passes, Screen.Radar, Screen.Map, Screen.Settings)
+
     val context = LocalContext.current
     val container = (context.applicationContext as IContainerProvider).getMainContainer()
     val trackingState by container.radioTrackingService.state.collectAsStateWithLifecycle()
     val otherSettings by container.settingsRepo.otherSettings.collectAsStateWithLifecycle()
-    // UI settings: sort by screenOrder (empty = default order), then filter by hiddenScreens (Settings always kept)
-    val allNavItems = listOf(Screen.Satellites, Screen.Passes, Screen.Radar, Screen.Mutual, Screen.Roaming, Screen.CwDecode, Screen.WavelogLog, Screen.AmSat, Screen.Map, Screen.Settings)
-        .sortedBy { screen ->
-            // Unknown pages (e.g. CwDecode not in old persisted order): use default-order position (Roaming<->Map), then fall back to last
-            val idx = otherSettings.screenOrder.indexOf(screen.screenId)
-            if (idx != -1) idx
-            else com.rtbishop.look4sat.core.presentation.defaultScreenOrder.indexOf(screen.screenId).let {
-                if (it != -1) it else Int.MAX_VALUE
-            }
-        }
-        .filter { it.screenId !in otherSettings.hiddenScreens || it is Screen.Settings }
-    // 4.5.1 foldable menu: main menu (5 bottom-bar slots) + More menu (overflow page)
-    // Legacy migration: persisted subMenuOrder lacks new pages (WavelogLog) -> append to the sub-menu tail
-    val subOrder = (otherSettings.subMenuOrder.ifEmpty { com.rtbishop.look4sat.core.presentation.defaultSubMenuOrder })
-        .let { list -> if ("WavelogLog" in list) list else list + "WavelogLog" }
-        .let { list -> if ("AMSAT" in list) list else list + "AMSAT" }
-    val mainNavItems = remember(allNavItems, subOrder) {
-        allNavItems.filter { it.screenId !in subOrder }.take(5)
-    }
-    val moreNavItems = remember(allNavItems, subOrder) {
-        subOrder.mapNotNull { id -> allNavItems.find { it.screenId == id } }
-    }
-    var moreExpanded by remember { mutableStateOf(false) }
-    // Intercept Back while the More menu is open: close the menu first
-    BackHandler(enabled = moreExpanded) { moreExpanded = false }
-    // Activity-scoped so the mutual query results survive navigation to Radar and back
-    val mutualViewModel: MutualViewModel = viewModel(
-        viewModelStoreOwner = context as ViewModelStoreOwner,
-        factory = MutualViewModel.factory(container)
-    )
 
     CompositionLocalProvider(
         LocalElevationThresholds provides ElevationThresholds(
@@ -187,15 +140,11 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
     ) {
         NavigationSuiteScaffold(
             navigationSuiteItems = {
-                mainNavItems.forEach { screen ->
+                navItems.forEach { screen ->
                     val isSelected = when (currentKey) {
                         is Screen.Satellites -> screen is Screen.Satellites
                         is Screen.Passes -> screen is Screen.Passes
                         is Screen.Radar -> screen is Screen.Radar
-                        is Screen.Mutual -> screen is Screen.Mutual
-                        is Screen.CwDecode -> screen is Screen.CwDecode
-                        is Screen.WavelogLog -> screen is Screen.WavelogLog
-                        is Screen.AmSat -> screen is Screen.AmSat
                         is Screen.Map -> screen is Screen.Map
                         is Screen.Settings -> screen is Screen.Settings
                         else -> false
@@ -206,26 +155,11 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
                         selected = isSelected,
                         onClick = {
                             if (isSelected) return@item
-                            moreExpanded = false
                             while (backStack.size > 1) backStack.removeAt(backStack.size - 1)
                             if (screen !is Screen.Passes) backStack.add(screen)
                         }
                     )
                 }
-                // More-menu button (fixed slot 6; shown only when the sub-menu is non-empty)
-                if (moreNavItems.isNotEmpty()) {
-                    item(
-                        icon = {
-                            Icon(
-                                painterResource(com.rtbishop.look4sat.R.drawable.ic_more),
-                                stringResource(com.rtbishop.look4sat.core.presentation.R.string.nav_more)
-                            )
-                        },
-                        label = { Text(stringResource(com.rtbishop.look4sat.core.presentation.R.string.nav_more)) },
-                        selected = moreExpanded,
-                        onClick = { moreExpanded = !moreExpanded }
-                    )
-                }
             },
             navigationSuiteColors = NavigationSuiteDefaults.colors(
                 navigationRailContainerColor = MaterialTheme.colorScheme.surfaceContainer
@@ -236,137 +170,90 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
                 else -> NavigationSuiteType.ShortNavigationBarMedium
             }
         ) {
-            Box {
-                Column(modifier = Modifier.fillMaxSize()) {
-                    NavDisplay(
-                        backStack = backStack,
-                        modifier = Modifier.weight(1f).fillMaxWidth(),
-                        onBack = navigateBack,
-                        transitionSpec = { fadeTransition },
-                        popTransitionSpec = { fadeTransition },
-                        predictivePopTransitionSpec = { fadeTransition },
-                        entryDecorators = listOf(
-                            // Required for saving Compose state per entry
-                            rememberSaveableStateHolderNavEntryDecorator(),
-                            // Required for ViewModel scoping per entry
-                            rememberViewModelStoreNavEntryDecorator()
-                        ),
-                        entryProvider = entryProvider {
-                            entry<Screen.Satellites> {
-                                SatellitesDestination(navigateUp = navigateBack)
-                            }
-                            entry<Screen.Passes> {
-                                PassesDestination { catNum, aosTime ->
-                                    container.setMutualPassData(MutualPassData())
-                                    container.satelliteRepo.selectPass(catNum, aosTime)
-                                    backStack.add(Screen.Radar)
-    //                            navigateToRadar()
-                                }
-                            }
-                            entry<Screen.Radar> {
-                                RadarDestination(navigateUp = navigateBack)
-                            }
-                            entry<Screen.Map> {
-                                MapDestination()
-                            }
-                            entry<Screen.Mutual> {
-                                MutualScreen(
-                                    viewModel = mutualViewModel,
-                                    navigateUp = navigateBack,
-                                    navigateToRadar = { catNum, aosTime, pass ->
-                                        container.setMutualPassData(pass ?: MutualPassData())
-                                        container.satelliteRepo.selectPass(catNum, aosTime)
-                                        backStack.add(Screen.Radar)
-                                    }
-                                )
-                            }
-                            entry<Screen.Roaming> {
-                                RoamingScreen()
-                            }
-                            entry<Screen.CwDecode> {
-                                CwDecodeScreen()
-                            }
-                            entry<Screen.AmSat> {
-                                SatStatusScreen(container = container)
-                            }
-                            entry<Screen.WavelogLog> {
-                                WavelogLogScreen(queue = container.wavelogQueue)
-                            }
-                            entry<Screen.Settings> {
-                                SettingsDestination()
+            Column {
+                NavDisplay(
+                    backStack = backStack,
+                    modifier = Modifier.weight(1f),
+                    onBack = navigateBack,
+                    transitionSpec = { fadeTransition },
+                    popTransitionSpec = { fadeTransition },
+                    predictivePopTransitionSpec = { fadeTransition },
+                    entryDecorators = listOf(
+                        // Required for saving Compose state per entry
+                        rememberSaveableStateHolderNavEntryDecorator(),
+                        // Required for ViewModel scoping per entry
+                        rememberViewModelStoreNavEntryDecorator()
+                    ),
+                    entryProvider = entryProvider {
+                        entry<Screen.Satellites> {
+                            SatellitesDestination(navigateUp = navigateBack)
+                        }
+                        entry<Screen.Passes> {
+                            PassesDestination { catNum, aosTime ->
+                                container.satelliteRepo.selectPass(catNum, aosTime)
+                                backStack.add(Screen.Radar)
+//                            navigateToRadar()
                             }
                         }
-                    )
-                    // Radio tracking status banner
-                    if (trackingState.isActive) {
-                        val infiniteTransition = rememberInfiniteTransition(label = "trackingPulse")
-                        val alpha by infiniteTransition.animateFloat(
-                            initialValue = 1f, targetValue = 0.4f,
-                            animationSpec = infiniteRepeatable(
-                                animation = tween(1000, easing = LinearEasing),
-                                repeatMode = RepeatMode.Reverse
-                            ), label = "pulseAlpha"
-                        )
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .background(MaterialTheme.colorScheme.primaryContainer)
-                                .clickable {
-                                    val pass = trackingState.currentPass
-                                    if (pass != null) {
-                                        container.setMutualPassData(MutualPassData())
-                                        container.satelliteRepo.selectPass(pass.catNum, pass.aosTime)
-                                        backStack.add(Screen.Radar)
-                                    }
-                                }
-                                .padding(horizontal = 12.dp, vertical = 6.dp)
-                        ) {
-                            Box(
-                                modifier = Modifier
-                                    .size(8.dp)
-                                    .clip(CircleShape)
-                                    .background(Color(0xFF4CAF50).copy(alpha = alpha))
-                            )
-                            Spacer(modifier = Modifier.width(8.dp))
-                            Text(
-                                text = stringResource(com.rtbishop.look4sat.core.presentation.R.string.tracking_status, trackingState.currentPass?.name ?: ""),
-                                fontSize = 13.sp,
-                                fontWeight = FontWeight.Medium,
-                                color = MaterialTheme.colorScheme.onPrimaryContainer,
-                                modifier = Modifier.weight(1f)
-                            )
-                            val txOk = if (trackingState.txConnected) "TX" else ""
-                            val rxOk = if (trackingState.rxConnected) "RX" else ""
-                            Text(
-                                text = listOf(txOk, rxOk).filter { it.isNotBlank() }.joinToString("/"),
-                                fontSize = 12.sp,
-                                color = MaterialTheme.colorScheme.onPrimaryContainer
-                            )
+                        entry<Screen.Radar> {
+                            RadarDestination(navigateUp = navigateBack)
+                        }
+                        entry<Screen.Map> {
+                            MapDestination()
+                        }
+                        entry<Screen.Settings> {
+                            SettingsDestination()
                         }
                     }
-                }
-                // More-menu popup panel (overlays content above the bottom bar; spring bounce)
-                AnimatedVisibility(
-                    visible = moreExpanded,
-                    modifier = Modifier.fillMaxSize(),
-                    enter = expandVertically(
-                        animationSpec = spring(dampingRatio = Spring.DampingRatioMediumBouncy)
-                    ) + fadeIn(),
-                    exit = shrinkVertically() + fadeOut()
-                ) {
-                    MoreMenuPopup(
-                        items = moreNavItems,
-                        currentKey = currentKey,
-                        onDismiss = { moreExpanded = false },
-                        onSelect = { screen ->
-                            moreExpanded = false
-                            while (backStack.size > 1) backStack.removeAt(backStack.size - 1)
-                            if (screen !is Screen.Passes) backStack.add(screen)
-                        }
+                )
+                // Radio tracking status banner
+                if (trackingState.isActive) {
+                    val infiniteTransition = rememberInfiniteTransition(label = "trackingPulse")
+                    val alpha by infiniteTransition.animateFloat(
+                        initialValue = 1f, targetValue = 0.4f,
+                        animationSpec = infiniteRepeatable(
+                            animation = tween(1000, easing = LinearEasing),
+                            repeatMode = RepeatMode.Reverse
+                        ), label = "pulseAlpha"
                     )
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .background(MaterialTheme.colorScheme.primaryContainer)
+                            .clickable {
+                                val pass = trackingState.currentPass
+                                if (pass != null) {
+                                    container.satelliteRepo.selectPass(pass.catNum, pass.aosTime)
+                                    backStack.add(Screen.Radar)
+                                }
+                            }
+                            .padding(horizontal = 12.dp, vertical = 6.dp)
+                    ) {
+                        Box(
+                            modifier = Modifier
+                                .size(8.dp)
+                                .clip(CircleShape)
+                                .background(Color(0xFF4CAF50).copy(alpha = alpha))
+                        )
+                        Spacer(modifier = Modifier.width(8.dp))
+                        Text(
+                            text = "Tracking: ${trackingState.currentPass?.name ?: ""}",
+                            fontSize = 13.sp,
+                            fontWeight = FontWeight.Medium,
+                            color = MaterialTheme.colorScheme.onPrimaryContainer,
+                            modifier = Modifier.weight(1f)
+                        )
+                        val txOk = if (trackingState.txConnected) "TX" else ""
+                        val rxOk = if (trackingState.rxConnected) "RX" else ""
+                        Text(
+                            text = listOf(txOk, rxOk).filter { it.isNotBlank() }.joinToString("/"),
+                            fontSize = 12.sp,
+                            color = MaterialTheme.colorScheme.onPrimaryContainer
+                        )
+                    }
                 }
             }
         }
     }
-}
+}

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

@@ -1,106 +0,0 @@
-/*
- * MoreMenuPopup.kt - bottom-nav "More" second-level menu popup panel (4.5.1).
- *
- * Overlays the content area (above the bottom bar, right-aligned), vertical menu items (icon+text+arrow),
- * current page highlighted; tap the scrim to close, tap an item to navigate. Open/close animation is driven by the caller
- * (MainScreen's AnimatedVisibility + spring).
- */
-package com.rtbishop.look4sat
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-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.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.navigation3.runtime.NavKey
-import com.rtbishop.look4sat.core.presentation.Screen
-
-@Composable
-fun MoreMenuPopup(
-    items: List<Screen>,
-    currentKey: NavKey?,
-    onDismiss: () -> Unit,
-    onSelect: (Screen) -> Unit
-) {
-    Box(
-        modifier = Modifier
-            .fillMaxSize()
-            .background(MaterialTheme.colorScheme.scrim.copy(alpha = 0.35f))
-            .clickable(onClick = onDismiss)
-    ) {
-        Card(
-            modifier = Modifier
-                .align(Alignment.BottomEnd)
-                .padding(12.dp),
-            shape = RoundedCornerShape(12.dp),
-            colors = CardDefaults.cardColors(
-                containerColor = MaterialTheme.colorScheme.surfaceContainerHigh
-            )
-        ) {
-            Column(modifier = Modifier.padding(vertical = 4.dp)) {
-                items.forEach { screen ->
-                    val isSelected = when (currentKey) {
-                        is Screen.Satellites -> screen is Screen.Satellites
-                        is Screen.Passes -> screen is Screen.Passes
-                        is Screen.Radar -> screen is Screen.Radar
-                        is Screen.Mutual -> screen is Screen.Mutual
-                        is Screen.CwDecode -> screen is Screen.CwDecode
-                        is Screen.WavelogLog -> screen is Screen.WavelogLog
-                        is Screen.Map -> screen is Screen.Map
-                        is Screen.Settings -> screen is Screen.Settings
-                        else -> false
-                    }
-                    Row(
-                        verticalAlignment = Alignment.CenterVertically,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .clickable { onSelect(screen) }
-                            .padding(horizontal = 16.dp, vertical = 12.dp)
-                    ) {
-                        Icon(
-                            painter = painterResource(screen.iconResId),
-                            contentDescription = stringResource(screen.titleResId),
-                            tint = if (isSelected) MaterialTheme.colorScheme.primary
-                            else MaterialTheme.colorScheme.onSurfaceVariant,
-                            modifier = Modifier.size(20.dp)
-                        )
-                        Spacer(modifier = Modifier.width(12.dp))
-                        Text(
-                            text = stringResource(screen.titleResId),
-                            fontSize = 14.sp,
-                            fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Normal,
-                            color = if (isSelected) MaterialTheme.colorScheme.primary
-                            else MaterialTheme.colorScheme.onSurface,
-                            modifier = Modifier.weight(1f)
-                        )
-                        Text(
-                            text = "›",
-                            fontSize = 16.sp,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
-                        )
-                    }
-                }
-            }
-        }
-    }
-}

app/src/main/res/drawable/ic_more.xml

@@ -1,9 +0,0 @@
-<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="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
-</vector>

build-logic/convention/src/main/java/com/rtbishop/look4sat/convention/ApplicationPlugin.kt

@@ -31,15 +31,11 @@ internal class ApplicationPlugin : Plugin<Project> {
             implementation(project(":core:data"))
             implementation(project(":core:domain"))
             implementation(project(":core:presentation"))
-            implementation(project(":feature:cw"))
             implementation(project(":feature:map"))
-            implementation(project(":feature:mutual"))
             implementation(project(":feature:passes"))
             implementation(project(":feature:radar"))
-            implementation(project(":feature:roaming"))
             implementation(project(":feature:satellites"))
             implementation(project(":feature:settings"))
-            implementation(project(":feature:status"))
             implementation(libs.androidx.core.splashscreen)
             implementation(libs.compose.material3.adaptive)
             implementation(libs.compose.navigation3)

build-logic/convention/src/main/java/com/rtbishop/look4sat/convention/PluginSetupUtils.kt

@@ -57,7 +57,7 @@ internal fun Project.setupAndroidApp() {
         namespace = libs.versions.packageName.get()
         compileSdk = libs.versions.compileSdk.get().toInt()
         defaultConfig {
-            applicationId = libs.versions.applicationId.get()
+            applicationId = libs.versions.packageName.get()
             minSdk = libs.versions.minSdk.get().toInt()
             versionCode = libs.versions.appVersionCode.get().toInt()
             versionName = libs.versions.appVersionName.get()

core/data/src/main/java/com/rtbishop/look4sat/core/data/aprs/AprsIsClient.kt

@@ -1,106 +0,0 @@
-package com.rtbishop.look4sat.core.data.aprs
-
-import com.rtbishop.look4sat.core.domain.aprs.AprsPacket
-import java.io.BufferedReader
-import java.io.InputStreamReader
-import java.io.OutputStreamWriter
-import java.io.PrintWriter
-import java.net.InetSocketAddress
-import java.net.Socket
-
-/**
- * APRS-IS TCP client (reverse-ported from APRSdroid TcpUploader.scala).
- * Plain-text protocol: one login line + one packet per line; 30 s reconnect after drop.
- */
-class AprsIsClient(
-    private val host: String,
-    private val port: Int,
-    private val callsign: String,
-    private val ssid: String,
-    private val passcode: Int,
-    private val version: String,
-    private val filter: String = "",
-    private val timeoutSec: Int = 120
-) {
-    private var socket: Socket? = null
-    private var writer: PrintWriter? = null
-    private var reader: BufferedReader? = null
-    private val lock = Any()
-
-    val isConnected: Boolean
-        get() = synchronized(lock) { socket?.isConnected == true && !socket!!.isClosed }
-
-    /** Connect + login (synchronous/blocking; call from a background thread) */
-    @Throws(Exception::class)
-    fun connect() {
-        disconnect()
-        val s = Socket()
-        s.connect(InetSocketAddress(host, port), 30_000)
-        s.soTimeout = timeoutSec * 1000
-        s.tcpNoDelay = true
-        synchronized(lock) {
-            socket = s
-            writer = PrintWriter(OutputStreamWriter(s.getOutputStream(), Charsets.ISO_8859_1), true)
-            reader = BufferedReader(InputStreamReader(s.getInputStream(), Charsets.ISO_8859_1), 256)
-        }
-        // Login line
-        val login = AprsPacket.formatLogin(callsign, ssid, passcode, version) + filter
-        writer?.println(login)
-        // Read the login response (aprsc replies # logresp ... verified/unverified)
-        runCatching {
-            s.soTimeout = 8000
-            val resp = reader?.readLine()
-            if (resp != null && (resp.contains("Invalid", ignoreCase = true) ||
-                    resp.contains("unverified", ignoreCase = true))) {
-                throw IllegalArgumentException(resp.trim())
-            }
-            // Restore timeout
-            s.soTimeout = timeoutSec * 1000
-        }
-    }
-
-    /**
-     * Sends one APRS packet (one line) and tries to read the server ack.
-     * Returns null=failed to send; Pair(ok, detail)=result (server error text lives in detail)
-     */
-    fun sendPacket(packetLine: String): Pair<Boolean, String>? {
-        synchronized(lock) {
-            val w = writer ?: return null
-            w.println(packetLine)
-            if (w.checkError()) return Pair(false, "write failed")
-        }
-        // Try to read the server response (short 3 s timeout; APRS-IS replies with an error line on bad format)
-        return runCatching {
-            val s = socket ?: return@runCatching Pair(true, "OK")
-            val oldTimeout = s.soTimeout
-            s.soTimeout = 3000
-            try {
-                val resp = reader?.readLine()
-                if (resp != null && (resp.contains("Invalid", ignoreCase = true) ||
-                        resp.contains("error", ignoreCase = true))) {
-                    Pair(false, resp.trim())
-                } else {
-                    Pair(true, if (resp.isNullOrBlank()) "OK" else resp.trim())
-                }
-            } finally {
-                s.soTimeout = oldTimeout
-            }
-        }.getOrElse { Pair(true, "OK") }
-    }
-
-    /** Read one line (server response; throws on timeout) */
-    fun readLine(): String? {
-        return reader?.readLine()
-    }
-
-    fun disconnect() {
-        synchronized(lock) {
-            runCatching { writer?.close() }
-            runCatching { reader?.close() }
-            runCatching { socket?.close() }
-            writer = null
-            reader = null
-            socket = null
-        }
-    }
-}

core/data/src/main/java/com/rtbishop/look4sat/core/data/aprs/AprsReporter.kt

@@ -1,126 +0,0 @@
-package com.rtbishop.look4sat.core.data.aprs
-
-import com.rtbishop.look4sat.core.domain.aprs.AprsPacket
-import com.rtbishop.look4sat.core.domain.aprs.AprsPosition
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
-
-/** APRS connection state */
-enum class AprsState { Idle, Connecting, Connected, Disconnected, Error }
-
-/** APRS config (persisted in SharedPreferences, saved as filled) */
-data class AprsConfig(
-    val enabled: Boolean = false,
-    val server: String = "euro.aprs2.net",
-    val port: Int = 14580,
-    val callsign: String = "",
-    val ssid: String = "",
-    val passcode: String = "",
-    val intervalMin: Int = 5,
-    val statusText: String = "Look4Sat APRS",
-    val symbolTable: String = "/",
-    val symbolCode: String = ">",
-    val includeCourseSpeed: Boolean = true,
-    val includeAltitude: Boolean = true
-)
-
-/** APRS report result */
-data class AprsReport(
-    val timestamp: Long,
-    val packet: String,
-    val ok: Boolean,
-    val detail: String
-)
-
-/** Report scheduler (periodic + manual trigger); connection management lives in the foreground service */
-class AprsReporter(
-    private val configProvider: () -> AprsConfig,
-    private val positionProvider: () -> Pair<Double, Double>? = { null },
-    private val onState: (AprsState) -> Unit = {},
-    private val onReport: (AprsReport) -> Unit = {}
-) {
-    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-    private var client: AprsIsClient? = null
-    private var job: Job? = null
-    private var manualJob: Job? = null
-
-    val isRunning: Boolean get() = job?.isActive == true
-
-    /** Start periodic reporting (called by the foreground service) */
-    fun start() {
-        stop()
-        val cfg = configProvider()
-        if (!cfg.enabled || cfg.callsign.isBlank()) {
-            onState(AprsState.Error)
-            return
-        }
-        job = scope.launch {
-            while (isActive) {
-                reportOnce()
-                delay(cfg.intervalMin.coerceAtLeast(1) * 60_000L)
-            }
-        }
-    }
-
-    fun stop() {
-        job?.cancel()
-        job = null
-        runCatching { client?.disconnect() }
-        client = null
-        onState(AprsState.Idle)
-    }
-
-    /** Trigger one report manually (immediately, without waiting for the cycle) */
-    fun reportNow() {
-        manualJob?.cancel()
-        manualJob = scope.launch { reportOnce() }
-    }
-
-    private suspend fun reportOnce() {
-        val cfg = configProvider()
-        if (!cfg.enabled || cfg.callsign.isBlank()) return
-        onState(AprsState.Connecting)
-        try {
-            val c = client ?: AprsIsClient(
-                host = cfg.server,
-                port = cfg.port,
-                callsign = cfg.callsign,
-                ssid = cfg.ssid,
-                passcode = cfg.passcode.toIntOrNull()?.takeIf { it >= 0 } ?: AprsPacket.passcode(cfg.callsign),
-                version = "Look4Sat 4.5.4"
-            ).also { client = it }
-            if (!c.isConnected) c.connect()
-            onState(AprsState.Connected)
-
-            val pos = positionProvider()
-            val packetLine = buildPositionPacket(cfg, pos?.first, pos?.second)
-            val result = c.sendPacket(packetLine)
-            val ok = result?.first == true
-            val detail = result?.second ?: "no connection"
-            onReport(AprsReport(System.currentTimeMillis(), packetLine, ok, detail))
-            if (ok) onState(AprsState.Connected) else onState(AprsState.Error)
-        } catch (e: Exception) {
-            runCatching { client?.disconnect() }
-            client = null
-            onState(AprsState.Error)
-            onReport(AprsReport(System.currentTimeMillis(), "", false, e.message ?: "error"))
-        }
-    }
-
-    /** Build position packet: BG7NTA-5>APRS:=DDMM.MMN/DDDMM.MME<status text */
-    private fun buildPositionPacket(cfg: AprsConfig, lat: Double? = null, lon: Double? = null): String {
-        val source = AprsPacket.formatCallSsid(cfg.callsign, cfg.ssid)
-        val pos = AprsPosition(
-            latitude = lat ?: 0.0,
-            longitude = lon ?: 0.0,
-            symbolTable = cfg.symbolTable.firstOrNull() ?: '/',
-            symbolCode = cfg.symbolCode.firstOrNull() ?: '>'
-        )
-        return "$source>APRS:=${pos.toUncompressedString()}${cfg.statusText}"
-    }
-}

core/data/src/main/java/com/rtbishop/look4sat/core/data/aprs/AprsStore.kt

@@ -1,83 +0,0 @@
-package com.rtbishop.look4sat.core.data.aprs
-
-import android.content.Context
-
-/**
- * APRS config storage + service action constants (shared by feature/settings and the app service,
- * so feature never depends on app).
- */
-object AprsStore {
-
-    const val ACTION_START = "com.rtbishop.look4sat.aprs.START"
-    const val ACTION_STOP = "com.rtbishop.look4sat.aprs.STOP"
-    const val ACTION_REPORT_NOW = "com.rtbishop.look4sat.aprs.REPORT_NOW"
-    const val SERVICE_CLASS = "com.rtbishop.look4sat.app.AprsForegroundService"
-
-    private const val PREFS = "aprs_config"
-    private const val KEY_ENABLED = "enabled"
-    private const val KEY_SERVER = "server"
-    private const val KEY_PORT = "port"
-    private const val KEY_CALLSIGN = "callsign"
-    private const val KEY_SSID = "ssid"
-    private const val KEY_PASSCODE = "passcode"
-    private const val KEY_INTERVAL = "interval"
-    private const val KEY_STATUS = "status"
-    private const val KEY_SYMBOL_TABLE = "symbol_table"
-    private const val KEY_SYMBOL_CODE = "symbol_code"
-    private const val KEY_LAST_TIME = "last_report_time"
-    private const val KEY_LAST_OK = "last_report_ok"
-    private const val KEY_LAST_DETAIL = "last_report_detail"
-
-    /** Read config (saved as filled; no need to re-enter each time) */
-    fun loadConfig(context: Context): AprsConfig {
-        val p = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
-        return AprsConfig(
-            enabled = p.getBoolean(KEY_ENABLED, false),
-            server = p.getString(KEY_SERVER, "euro.aprs2.net") ?: "euro.aprs2.net",
-            port = p.getInt(KEY_PORT, 14580),
-            callsign = p.getString(KEY_CALLSIGN, "") ?: "",
-            ssid = p.getString(KEY_SSID, "") ?: "",
-            passcode = p.getString(KEY_PASSCODE, "") ?: "",
-            intervalMin = p.getInt(KEY_INTERVAL, 5),
-            statusText = p.getString(KEY_STATUS, "Look4Sat APRS") ?: "Look4Sat APRS",
-            symbolTable = p.getString(KEY_SYMBOL_TABLE, "/") ?: "/",
-            symbolCode = p.getString(KEY_SYMBOL_CODE, ">") ?: ">"
-        )
-    }
-
-    /** Last report result (shown on the settings card) */
-    data class LastReport(val time: Long = 0L, val ok: Boolean = false, val detail: String = "")
-
-    fun loadLastReport(context: Context): LastReport {
-        val p = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
-        return LastReport(
-            time = p.getLong(KEY_LAST_TIME, 0L),
-            ok = p.getBoolean(KEY_LAST_OK, false),
-            detail = p.getString(KEY_LAST_DETAIL, "") ?: ""
-        )
-    }
-
-    fun saveLastReport(context: Context, ok: Boolean, detail: String) {
-        context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit()
-            .putLong(KEY_LAST_TIME, System.currentTimeMillis())
-            .putBoolean(KEY_LAST_OK, ok)
-            .putString(KEY_LAST_DETAIL, detail)
-            .apply()
-    }
-
-    /** Save config */
-    fun saveConfig(context: Context, cfg: AprsConfig) {
-        context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit()
-            .putBoolean(KEY_ENABLED, cfg.enabled)
-            .putString(KEY_SERVER, cfg.server)
-            .putInt(KEY_PORT, cfg.port)
-            .putString(KEY_CALLSIGN, cfg.callsign)
-            .putString(KEY_SSID, cfg.ssid)
-            .putString(KEY_PASSCODE, cfg.passcode)
-            .putInt(KEY_INTERVAL, cfg.intervalMin)
-            .putString(KEY_STATUS, cfg.statusText)
-            .putString(KEY_SYMBOL_TABLE, cfg.symbolTable)
-            .putString(KEY_SYMBOL_CODE, cfg.symbolCode)
-            .apply()
-    }
-}

core/data/src/main/java/com/rtbishop/look4sat/core/data/database/Look4SatDao.kt

@@ -45,7 +45,12 @@ interface Look4SatDao {
     @Query("DELETE FROM entries")
     suspend fun deleteEntries()
 
-    @Query("SELECT catnum FROM radios WHERE downlinkMode IN (:modes)")
+    @Query(
+        """
+        SELECT DISTINCT catnum FROM radios WHERE isAlive = 1
+        AND (downlinkMode IN (:modes) OR uplinkMode IN (:modes))
+        """
+    )
     suspend fun getIdsWithModes(modes: List<String>): List<Int>
 
     @Query("SELECT COUNT(*) FROM radios")

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

@@ -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
@@ -42,9 +41,6 @@ import com.rtbishop.look4sat.core.data.usecase.AddToCalendar
 import com.rtbishop.look4sat.core.data.usecase.AudioCapture
 import com.rtbishop.look4sat.core.data.usecase.SaveImage
 import com.rtbishop.look4sat.core.data.usecase.ShowToast
-import com.rtbishop.look4sat.core.domain.wavelog.IWavelogQueueStore
-import com.rtbishop.look4sat.core.domain.wavelog.WavelogQueue
-import com.rtbishop.look4sat.core.domain.wavelog.WavelogUploader
 import com.rtbishop.look4sat.core.domain.model.RadioControlSettings
 import com.rtbishop.look4sat.core.domain.repository.IDatabaseRepo
 import com.rtbishop.look4sat.core.domain.repository.IMainContainer
@@ -55,7 +51,6 @@ import com.rtbishop.look4sat.core.domain.repository.ISatelliteRepo
 import com.rtbishop.look4sat.core.domain.repository.ISelectionRepo
 import com.rtbishop.look4sat.core.domain.repository.ISensorsRepo
 import com.rtbishop.look4sat.core.domain.repository.ISettingsRepo
-import com.rtbishop.look4sat.core.domain.repository.MutualPassData
 import com.rtbishop.look4sat.core.domain.source.ILocalSource
 import com.rtbishop.look4sat.core.domain.source.IRemoteSource
 import com.rtbishop.look4sat.core.domain.usecase.IAddToCalendar
@@ -67,35 +62,24 @@ import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
 import okhttp3.OkHttpClient
-import com.rtbishop.look4sat.core.data.wavelog.LotwSatellitesRepo
 
 class MainContainer(private val context: Context) : IMainContainer {
 
     private val localSource = provideLocalSource()
-    private val remoteSource by lazy { provideRemoteSource() }
+    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 = 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)
     }
 
-    private val _mutualPassData = MutableStateFlow(MutualPassData())
-    override val mutualPassData: StateFlow<MutualPassData> = _mutualPassData.asStateFlow()
-
-    override fun setMutualPassData(data: MutualPassData) {
-        _mutualPassData.value = data
-    }
-
     override fun provideAddToCalendar(): IAddToCalendar = AddToCalendar(context)
 
     override fun provideShowToast(): IShowToast = ShowToast(context)
@@ -104,22 +88,6 @@ class MainContainer(private val context: Context) : IMainContainer {
 
     override fun provideSaveImage(): ISaveImage = SaveImage(context)
 
-    // WaveLog logging (4.5.2): local queue + uploader (shared instance)
-    override val wavelogQueue: WavelogQueue by lazy {
-        val prefs = context.getSharedPreferences("wavelog", Context.MODE_PRIVATE)
-        WavelogQueue(object : IWavelogQueueStore {
-            override fun load(): String = prefs.getString("wavelog_queue", "[]") ?: "[]"
-            override fun save(json: String) = prefs.edit().putString("wavelog_queue", json).apply()
-        })
-    }
-    override fun provideWavelogUploader(): WavelogUploader = WavelogUploader(settingsRepo, wavelogQueue)
-
-    private val lotwRepo: LotwSatellitesRepo by lazy {
-        LotwSatellitesRepo(context).also { it.restore() }
-    }
-
-    override fun provideLotwSatellitesRepo(): com.rtbishop.look4sat.core.domain.wavelog.ILotwSatellitesRepo = lotwRepo
-
     override fun provideBluetoothReporter(): IReporter {
         val manager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
         val rc = settingsRepo.rcSettings.value
@@ -170,9 +138,17 @@ class MainContainer(private val context: Context) : IMainContainer {
         return SensorsRepo(manager, displayManager)
     }
 
+    override fun providePairedBluetoothDevices(): List<Pair<String, String>> = buildList {
+        try {
+            val manager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
+            manager.adapter?.bondedDevices?.forEach { add(Pair(it.name ?: "Unknown", it.address ?: "")) }
+        } catch (_: SecurityException) {}
+    }
+
     private fun provideDatabaseRepo(): IDatabaseRepo {
         val dbDispatcher = Dispatchers.Default
         val dataParser = DataParser(dbDispatcher)
+        val remoteSource = provideRemoteSource()
         return DatabaseRepo(dbDispatcher, dataParser, localSource, remoteSource, settingsRepo)
     }
 
@@ -183,14 +159,7 @@ class MainContainer(private val context: Context) : IMainContainer {
     }
 
     private fun provideRemoteSource(): IRemoteSource {
-        return RemoteSource(
-            Dispatchers.IO, context.contentResolver,
-            OkHttpClient.Builder()
-                .connectTimeout(15, java.util.concurrent.TimeUnit.SECONDS)
-                .readTimeout(20, java.util.concurrent.TimeUnit.SECONDS)
-                .writeTimeout(20, java.util.concurrent.TimeUnit.SECONDS)
-                .build()
-        )
+        return RemoteSource(Dispatchers.IO, context.contentResolver, OkHttpClient.Builder().build())
     }
 
     private fun provideSatelliteRepo(): ISatelliteRepo {
@@ -206,6 +175,6 @@ class MainContainer(private val context: Context) : IMainContainer {
         val appPrefsFileName = "${context.packageName}_preferences"
         val appPreferences = context.getSharedPreferences(appPrefsFileName, Context.MODE_PRIVATE)
         val appVersionName = context.packageManager.getPackageInfo(context.packageName, 0).versionName ?: "4.0.4"
-        return SettingsRepo(context, manager, appPreferences, appVersionName)
+        return SettingsRepo(manager, appPreferences, appVersionName)
     }
 }

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

@@ -1,31 +1,92 @@
 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.text.SimpleDateFormat
 import java.util.Calendar
+import java.util.Locale
 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 {
+
+    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 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 {
+        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 }
@@ -41,7 +102,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 +137,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
     }
 }

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

@@ -47,7 +47,6 @@ class DatabaseRepo(
         remoteSource.getFileStream(uri)?.let { stream ->
             val entries = parseSatelliteStream(uri, unwrapIfZipped(uri, stream))
             localSource.insertEntries(entries)
-            settingsRepo.setSatelliteTypeIds(customSourceType, entries.map { it.catnum })
             importedCount = entries.size
         }
         setUpdateSuccessful(System.currentTimeMillis())
@@ -69,33 +68,20 @@ class DatabaseRepo(
         val dataSourcesSettings = settingsRepo.dataSourcesSettings.value
         val tleUrls = buildMap {
             putAll(Sources.satelliteDataUrls)
-            // Switch on + non-empty URL -> All uses the custom URL; otherwise the default URL (online-update default source)
-            put("All", if (dataSourcesSettings.useCustomTLE && dataSourcesSettings.tleUrl.isNotBlank())
-                dataSourcesSettings.tleUrl else Sources.defaultTleUrl)
+            if (dataSourcesSettings.useCustomTLE) put(customSourceType, dataSourcesSettings.tleUrl)
         }.filterValues { it.isNotBlank() }
         val radioUrls = buildMap {
             putAll(Sources.transceiversDataUrls)
-            put("SatNOGS", if (dataSourcesSettings.useCustomTransceivers && dataSourcesSettings.transceiversUrl.isNotBlank())
-                dataSourcesSettings.transceiversUrl else Sources.defaultTransceiversUrl)
+            if (dataSourcesSettings.useCustomTransceivers) put(customSourceType, dataSourcesSettings.transceiversUrl)
         }.filterValues { it.isNotBlank() }
         // launch all network requests concurrently
         val tleJobs = tleUrls.values.map { url -> async { url to remoteSource.getNetworkStream(url) } }
         val radioJobs = radioUrls.values.map { url -> async { url to remoteSource.getNetworkStream(url) } }
-        // Count successful sources: zero successes = update failed (timestamp untouched, exception surfaced in the UI)
-        val tleResults = tleJobs.awaitAll()
-        val radioResults = radioJobs.awaitAll()
-        val successCount = tleResults.count { it.second != null } + radioResults.count { it.second != null }
-        if (successCount == 0) {
-            throw java.io.IOException("All data sources failed to download")
+        // parse fetched data concurrently
+        val importedEntries = tleJobs.awaitAll().flatMap { (url, stream) ->
+            stream?.let { parseSatelliteStream(url, unwrapIfZipped(url, it)) }.orEmpty()
         }
-        // parse fetched data concurrently and associate with types
-        val importedEntries = tleResults.flatMap { (url, stream) ->
-            val type = tleUrls.entries.find { it.value == url }?.key ?: customSourceType
-            stream?.let { parseSatelliteStream(url, unwrapIfZipped(url, it)) }.orEmpty().also { entries ->
-                settingsRepo.setSatelliteTypeIds(type, entries.map { it.catnum })
-            }
-        }
-        val importedRadios = radioResults.flatMap { (url, stream) ->
+        val importedRadios = radioJobs.awaitAll().flatMap { (url, stream) ->
             stream?.let { dataParser.parseJSONStream(unwrapIfZipped(url, it)) }.orEmpty()
         }
         // insert parsed data into the database

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

@@ -37,6 +37,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.withContext
 import java.util.TimeZone
+import kotlin.time.Duration.Companion.milliseconds
 
 class SatelliteRepo(
     private val dispatcher: CoroutineDispatcher,
@@ -73,7 +74,7 @@ class SatelliteRepo(
                 aosStartMinute = settings.aosStartMinute,
                 aosEndMinute = settings.aosEndMinute,
                 invertAosTimeWindow = settings.invertAosTimeWindow,
-                modes = settings.selectedModes
+                modes = settingsRepo.selectedSatModes.value
             )
         }
     }
@@ -95,8 +96,14 @@ class SatelliteRepo(
         }
     }
 
-    override suspend fun getRadios(satPos: OrbitalPos, radios: List<SatRadio>): List<SatRadio> {
+    override suspend fun getRadios(
+        sat: OrbitalObject,
+        pos: GeoPos,
+        radios: List<SatRadio>,
+        time: Long
+    ): List<SatRadio> {
         return withContext(dispatcher) {
+            val satPos = sat.getPosition(pos, time)
             radios.map { transmitter ->
                 transmitter.copy(
                     downlinkLow = transmitter.downlinkLow?.let { satPos.getDownlinkFreq(it) },
@@ -152,7 +159,7 @@ class SatelliteRepo(
                 }
             }
             newPasses.sortBy { it.aosTime }
-            delay(1000) // Simulate loading time for better UX
+            delay(1000.milliseconds) // Simulate loading time for better UX
             _passes.update { newPasses }
         }
         _isCalculating.value = false
@@ -170,7 +177,7 @@ class SatelliteRepo(
         val inRange = if (aosStartMinute <= aosEndMinute) {
             aosMinute in aosStartMinute..aosEndMinute
         } else {
-            aosMinute >= aosStartMinute || aosMinute <= aosEndMinute
+            aosMinute !in (aosEndMinute + 1)..<aosStartMinute
         }
         return if (invertAosTimeWindow) !inRange else inRange
     }
@@ -236,16 +243,13 @@ class SatelliteRepo(
             if (elevation > maxElevation) maxElevation = elevation
         } while (elevation < 0.0)
 
-        // refine AOS to ~500ms precision via binary search.
-        // Elevation is monotonic across the horizon crossing, so binary search
-        // finds the crossing in ~8 SGP4 calls instead of up to 120 linear steps.
-        var aosLo = calendarTimeMillis - 60L * 1000L // elevation < 0 (below horizon)
-        var aosHi = calendarTimeMillis // elevation >= 0 (above horizon)
-        while (aosHi - aosLo > 500L) {
-            val mid = (aosLo + aosHi) / 2
-            if (sat.getElevation(pos, mid) < 0.0) aosLo = mid else aosHi = mid
-        }
-        calendarTimeMillis = aosHi
+        // refine AOS to ~500ms precision
+        calendarTimeMillis -= 60L * 1000L
+        do {
+            calendarTimeMillis += 500L
+            elevation = sat.getElevation(pos, calendarTimeMillis)
+            if (elevation > maxElevation) maxElevation = elevation
+        } while (elevation < 0.0)
 
         // Get full position for AOS data (azimuth, altitude)
         val aosPos = sat.getFullPosition(pos, calendarTimeMillis)
@@ -259,14 +263,13 @@ class SatelliteRepo(
             if (elevation > maxElevation) maxElevation = elevation
         } while (elevation > 0.0)
 
-        // refine LOS to ~500ms precision via binary search (same monotonic argument)
-        var losLo = calendarTimeMillis - 30L * 1000L // elevation > 0 (above horizon)
-        var losHi = calendarTimeMillis // elevation <= 0 (below horizon)
-        while (losHi - losLo > 500L) {
-            val mid = (losLo + losHi) / 2
-            if (sat.getElevation(pos, mid) > 0.0) losLo = mid else losHi = mid
-        }
-        calendarTimeMillis = losHi
+        // refine LOS to ~500ms precision
+        calendarTimeMillis -= 30L * 1000L
+        do {
+            calendarTimeMillis += 500L
+            elevation = sat.getElevation(pos, calendarTimeMillis)
+            if (elevation > maxElevation) maxElevation = elevation
+        } while (elevation > 0.0)
 
         // Get full position for LOS data (azimuth, altitude)
         val losPos = sat.getFullPosition(pos, calendarTimeMillis)

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

@@ -38,16 +38,16 @@ class SelectionRepo(
 ) : ISelectionRepo {
 
     private val currentItems = MutableStateFlow<List<SatItem>>(emptyList())
-    private val currentTypes = MutableStateFlow(settingsRepo.selectedTypes.value)
     private val currentQuery = MutableStateFlow("")
 
-    // Resolve type IDs once when types change, then filter items reactively.
+    // Resolve sat IDs once when modes change, then filter items reactively.
     // The HashSet gives O(1) catnum lookups instead of O(n) with a List.
-    private val itemsWithTypes = currentTypes.flatMapLatest { types: List<String> ->
-        val catnumSet: Set<Int>? = if (types.isEmpty()) {
+    // Directly observe settingsRepo.selectedSatModes to ensure real-time sync across screens.
+    private val itemsWithModes = settingsRepo.selectedSatModes.flatMapLatest { list: List<String> ->
+        val catnumSet: Set<Int>? = if (list.isEmpty()) {
             null // null = no filtering
         } else {
-            val ids = settingsRepo.getSatelliteTypesIds(types)
+            val ids = localSource.getIdsWithModes(list)
             if (ids.isEmpty()) null else ids.toHashSet()
         }
         currentItems.map { items ->
@@ -56,14 +56,18 @@ class SelectionRepo(
     }
 
     private val itemsWithQuery = currentQuery.flatMapLatest { query ->
-        itemsWithTypes.map { items -> filterByQuery(items, query) }
+        itemsWithModes.map { items ->
+            filterByQuery(items, query).sortedWith(
+                compareByDescending<SatItem> { it.isSelected }
+                    .thenBy { it.name }
+                    .thenBy { it.catnum }
+            )
+        }
     }
 
-    override fun getCurrentTypes() = currentTypes.value
+    override fun getCurrentModes() = settingsRepo.selectedSatModes.value
 
-    override fun getTypesList() = Sources.satelliteDataUrls.keys.sorted().toMutableList().apply {
-        removeAt(0)
-    }
+    override fun getModesList() = Sources.satelliteModes
 
     override suspend fun getEntriesFlow() = withContext(dispatcher) {
         val selectedIds = settingsRepo.selectedIds.value.toHashSet()
@@ -73,9 +77,8 @@ class SelectionRepo(
         return@withContext itemsWithQuery
     }
 
-    override suspend fun setTypes(types: List<String>) {
-        currentTypes.value = types
-        settingsRepo.setSelectedTypes(types)
+    override suspend fun setModes(modes: List<String>) {
+        settingsRepo.setSelectedSatModes(modes)
     }
 
     override suspend fun setQuery(query: String) {

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

@@ -29,7 +29,6 @@ import com.rtbishop.look4sat.core.domain.model.OtherSettings
 import com.rtbishop.look4sat.core.domain.model.PassesSettings
 import com.rtbishop.look4sat.core.domain.model.RCSettings
 import com.rtbishop.look4sat.core.domain.model.RadioControlSettings
-import com.rtbishop.look4sat.core.domain.source.Sources
 import com.rtbishop.look4sat.core.domain.predict.GeoPos
 import com.rtbishop.look4sat.core.domain.repository.ISettingsRepo
 import com.rtbishop.look4sat.core.domain.utility.positionToQth
@@ -40,7 +39,6 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 
 class SettingsRepo(
-    private val context: android.content.Context,
     private val locationManager: LocationManager,
     private val preferences: SharedPreferences,
     override val appVersionName: String
@@ -70,16 +68,13 @@ class SettingsRepo(
     private val keyFrequencyPort = "frequencyPort"
     private val keyFrequencyFormat = "frequencyFormat"
     private val keySelectedIds = "selectedIds"
-    private val keySelectedTypes = "selectedTypes"
-    private val keySelectedModes = "selectedModes"
+    private val keySelectedSatModes = "selectedSatModes"
     private val keyStateOfAutoUpdate = "stateOfAutoUpdate"
     private val keyStateOfSensors = "stateOfSensors"
     private val keyStateOfSweep = "stateOfSweep"
     private val keyStateOfUtc = "stateOfUtc"
     private val keyStateOfLightTheme = "stateOfLightTheme"
     private val keyStateOfNightMode = "stateOfNightMode"
-    private val keyHiddenScreens = "hiddenScreens"
-    private val keyScreenOrder = "screenOrder"
     private val keyStationAltitude = "stationAltitude"
     private val keyStationLatitude = "stationLatitude"
     private val keyStationLongitude = "stationLongitude"
@@ -91,22 +86,19 @@ class SettingsRepo(
     private val keySstvMode = "sstvMode"
     private val keyLowElevation = "lowElevation"
     private val keyHighElevation = "highElevation"
+    private val keyRadarCompassOffset = "radarCompassOffset"
+    private val keyRadarCompassOffsetElev = "radarCompassOffsetElev"
     private val keyUseCustomTle = "useCustomTle"
     private val keyUseCustomTransceivers = "useCustomTransceivers"
     private val keyTleUrl = "tleUrl"
     private val keyTransceiversUrl = "transceiversUrl"
-    private val keySubMenuOrder = "subMenuOrder"
-    private val keyWavelogUrl = "wavelogUrl"
-    private val keyWavelogApiKey = "wavelogApiKey"
-    private val keyWavelogStationId = "wavelogStationId"
-    private val keyWavelogAutoUpload = "wavelogAutoUpload"
     private val separatorComma = ","
 
     //region # Satellites selection settings
     private val _satelliteSelection = MutableStateFlow(getSelectedIds())
-    private val _typesSelection = MutableStateFlow(getSelectedTypes())
+    private val _satelliteModeSelection = MutableStateFlow(getSelectedSatModes())
     override val selectedIds: StateFlow<List<Int>> = _satelliteSelection
-    override val selectedTypes: StateFlow<List<String>> = _typesSelection
+    override val selectedSatModes: StateFlow<List<String>> = _satelliteModeSelection
 
     override fun setSelectedIds(ids: List<Int>) {
         val selectionString = ids.joinToString(separatorComma)
@@ -114,10 +106,10 @@ class SettingsRepo(
         _satelliteSelection.value = ids
     }
 
-    override fun setSelectedTypes(types: List<String>) {
-        val typesString = types.joinToString(separatorComma)
-        preferences.edit { putString(keySelectedTypes, typesString) }
-        _typesSelection.value = types
+    override fun setSelectedSatModes(modes: List<String>) {
+        val modesString = modes.joinToString(separatorComma)
+        preferences.edit { putString(keySelectedSatModes, modesString) }
+        _satelliteModeSelection.value = modes
     }
 
     private fun getSelectedIds(): List<Int> {
@@ -126,10 +118,10 @@ class SettingsRepo(
         return selectionString.split(separatorComma).map { it.toInt() }
     }
 
-    private fun getSelectedTypes(): List<String> {
-        val typesString = preferences.getString(keySelectedTypes, "Amateur")
-        if (typesString.isNullOrEmpty()) return emptyList()
-        return typesString.split(separatorComma)
+    private fun getSelectedSatModes(): List<String> {
+        val modesString = preferences.getString(keySelectedSatModes, null)
+        if (modesString.isNullOrEmpty()) return emptyList()
+        return modesString.split(separatorComma).sorted()
     }
     //endregion
 
@@ -144,7 +136,6 @@ class SettingsRepo(
         putInt(keyFilterAosStartMinute, settings.aosStartMinute)
         putInt(keyFilterAosEndMinute, settings.aosEndMinute)
         putBoolean(keyFilterAosInvert, settings.invertAosTimeWindow)
-        putString(keySelectedModes, settings.selectedModes.joinToString(separatorComma))
         _passesSettings.value = settings
     }
 
@@ -155,16 +146,13 @@ class SettingsRepo(
         val aosStartMinute = preferences.getInt(keyFilterAosStartMinute, 0).coerceIn(0, 23 * 60 + 59)
         val aosEndMinute = preferences.getInt(keyFilterAosEndMinute, 23 * 60 + 59).coerceIn(0, 23 * 60 + 59)
         val invertAosTimeWindow = preferences.getBoolean(keyFilterAosInvert, false)
-        val selectedModesString = preferences.getString(keySelectedModes, null)
-        val selectedModes = selectedModesString?.split(separatorComma)?.sorted() ?: emptyList()
         return PassesSettings(
             showDeepSpace,
             hoursAhead,
             minElevation,
             aosStartMinute,
             aosEndMinute,
-            invertAosTimeWindow,
-            selectedModes
+            invertAosTimeWindow
         )
     }
     //endregion
@@ -187,41 +175,23 @@ class SettingsRepo(
         return true
     }
 
-    /** GPS fix: one-shot getCurrentLocation (GPS first, 15 s timeout); returns true only with a fix */
-    override suspend fun setStationPosition(): Boolean {
-        // Permission gate: fail fast without location permission (no swallowed exceptions)
-        if (androidx.core.content.ContextCompat.checkSelfPermission(
-                context, android.Manifest.permission.ACCESS_FINE_LOCATION
-            ) != android.content.pm.PackageManager.PERMISSION_GRANTED
-        ) {
-            println("GPS: no fine location permission")
-            return false
-        }
+    override fun setStationPosition(): Boolean {
         if (!LocationManagerCompat.isLocationEnabled(locationManager)) return false
-        return kotlinx.coroutines.suspendCancellableCoroutine { cont ->
-            val signal = android.os.CancellationSignal()
-            val handler = android.os.Handler(android.os.Looper.getMainLooper())
-            val executor = java.util.concurrent.Executor { handler.post(it) }
-            // 15 s timeout
-            val timeout = handler.postDelayed({
-                signal.cancel()
-                if (cont.isActive) cont.resume(false) { }
-            }, 15_000L)
-            val listener = androidx.core.util.Consumer<Location> { location ->
-                handler.removeCallbacksAndMessages(null)
-                setStationPosition(location.latitude, location.longitude, location.altitude)
-                if (cont.isActive) cont.resume(true) { }
-            }
+        try {
             val hasGps = LocationManagerCompat.hasProvider(locationManager, providerGps)
-            val provider = if (hasGps) providerGps else providerNet
-            try {
-                LocationManagerCompat.getCurrentLocation(locationManager, provider, signal, executor, listener)
-            } catch (exception: SecurityException) {
-                handler.removeCallbacksAndMessages(null)
-                if (cont.isActive) cont.resume(false) { }
+            val hasNet = LocationManagerCompat.hasProvider(locationManager, providerNet)
+            val provider = if (hasGps) providerGps else if (hasNet) providerNet else providerDef
+            val location = locationManager.getLastKnownLocation(providerDef)
+            if (location == null || System.currentTimeMillis() - location.time > 600_000L) {
+                println("Requesting location for $provider provider")
+                locationManager.requestLocationUpdates(provider, 0L, 0f, this)
+            } else {
+                setStationPosition(location.latitude, location.longitude, location.altitude)
             }
-            cont.invokeOnCancellation { signal.cancel(); handler.removeCallbacksAndMessages(null) }
+        } catch (exception: SecurityException) {
+            println("No permissions were given - $exception")
         }
+        return true
     }
 
     override fun setStationPosition(locator: String): Boolean {
@@ -240,8 +210,8 @@ class SettingsRepo(
     }
 
     private fun setStationPosition(latitude: Double, longitude: Double, altitude: Double, locator: String) {
-        val newLat = latitude.round(5)
-        val newLon = longitude.round(5)
+        val newLat = latitude.round(4)
+        val newLon = longitude.round(4)
         val newAlt = altitude.round(1)
         val timestamp = System.currentTimeMillis()
         println("Received new Position($newLat, $newLon, $newAlt) & Locator $locator")
@@ -262,25 +232,6 @@ class SettingsRepo(
     private val _databaseState = MutableStateFlow(getDatabaseState())
     override val databaseState: StateFlow<DatabaseState> = _databaseState
 
-    override fun getSatelliteTypesIds(types: List<String>): List<Int> {
-        val idsSet = mutableSetOf<Int>()
-        types.forEach { type ->
-            val typeString = preferences.getString("type$type", null)
-            val typeIds = if (typeString.isNullOrBlank()) {
-                emptyList()
-            } else {
-                typeString.split(separatorComma).map { it.toInt() }
-            }
-            idsSet.addAll(typeIds)
-        }
-        return idsSet.toList()
-    }
-
-    override fun setSatelliteTypeIds(type: String, ids: List<Int>) {
-        if (type == "All") return
-        val typesString = ids.joinToString(separatorComma)
-        preferences.edit { putString("type$type", typesString) }
-    }
 
     override fun updateDatabaseState(state: DatabaseState) = preferences.edit {
         putInt(keyNumberOfSatellites, state.numberOfSatellites)
@@ -383,13 +334,8 @@ class SettingsRepo(
                 putString(keySstvMode, new.sstvMode)
                 putLong(keyLowElevation, new.lowElevation.toRawBits())
                 putLong(keyHighElevation, new.highElevation.toRawBits())
-                putStringSet(keyHiddenScreens, new.hiddenScreens.toSet())
-                putString(keyScreenOrder, new.screenOrder.joinToString(","))
-                putString(keySubMenuOrder, new.subMenuOrder.joinToString(","))
-                putString(keyWavelogUrl, new.wavelogUrl)
-                putString(keyWavelogApiKey, new.wavelogApiKey)
-                putString(keyWavelogStationId, new.wavelogStationId)
-                putBoolean(keyWavelogAutoUpload, new.wavelogAutoUpload)
+                putFloat(keyRadarCompassOffset, new.radarCompassOffset)
+                putFloat(keyRadarCompassOffsetElev, new.radarCompassOffsetElev)
             }
             new
         }
@@ -405,15 +351,10 @@ class SettingsRepo(
         shouldSeeWarning = preferences.getBoolean(keyShouldSeeWarning, true),
         shouldSeeWhatsNew = preferences.getBoolean(keyShouldSeeWhatsNew, true),
         sstvMode = preferences.getString(keySstvMode, null) ?: "Auto",
-        hiddenScreens = preferences.getStringSet(keyHiddenScreens, emptySet())?.toList() ?: emptyList(),
-        screenOrder = preferences.getString(keyScreenOrder, null)?.split(",")?.filter { it.isNotBlank() } ?: emptyList(),
-        subMenuOrder = preferences.getString(keySubMenuOrder, null)?.split(",")?.filter { it.isNotBlank() } ?: emptyList(),
         lowElevation = Double.fromBits(preferences.getLong(keyLowElevation, 15.0.toRawBits())),
         highElevation = Double.fromBits(preferences.getLong(keyHighElevation, 45.0.toRawBits())),
-        wavelogUrl = preferences.getString(keyWavelogUrl, null) ?: "",
-        wavelogApiKey = preferences.getString(keyWavelogApiKey, null) ?: "",
-        wavelogStationId = preferences.getString(keyWavelogStationId, null) ?: "",
-        wavelogAutoUpload = preferences.getBoolean(keyWavelogAutoUpload, false)
+        radarCompassOffset = preferences.getFloat(keyRadarCompassOffset, 0f),
+        radarCompassOffsetElev = preferences.getFloat(keyRadarCompassOffsetElev, 0f)
     )
     //endregion
 
@@ -431,20 +372,12 @@ class SettingsRepo(
         _dataSourcesSettings.value = settings
     }
 
-    private fun getDataSourcesSettings(): DataSourcesSettings {
-        // 4.4.8 fix: legacy example.com placeholder URLs count as unconfigured -> replaced with the real default URL and the switch forced off,
-        // otherwise the online All/SatNOGS sources would point at the wrong address and fail to update
-        val storedTleUrl = preferences.getString(keyTleUrl, Sources.defaultTleUrl) ?: Sources.defaultTleUrl
-        val storedTxUrl = preferences.getString(keyTransceiversUrl, Sources.defaultTransceiversUrl) ?: Sources.defaultTransceiversUrl
-        val tleUrl = if (storedTleUrl == "https://example.com/tle.txt") Sources.defaultTleUrl else storedTleUrl
-        val txUrl = if (storedTxUrl == "https://example.com/radio.json") Sources.defaultTransceiversUrl else storedTxUrl
-        return DataSourcesSettings(
-            useCustomTLE = preferences.getBoolean(keyUseCustomTle, false) && tleUrl != Sources.defaultTleUrl,
-            useCustomTransceivers = preferences.getBoolean(keyUseCustomTransceivers, false) && txUrl != Sources.defaultTransceiversUrl,
-            tleUrl = tleUrl,
-            transceiversUrl = txUrl
-        )
-    }
+    private fun getDataSourcesSettings(): DataSourcesSettings = DataSourcesSettings(
+        useCustomTLE = preferences.getBoolean(keyUseCustomTle, false),
+        useCustomTransceivers = preferences.getBoolean(keyUseCustomTransceivers, false),
+        tleUrl = preferences.getString(keyTleUrl, "https://example.com/tle.txt") ?: "",
+        transceiversUrl = preferences.getString(keyTransceiversUrl, "https://example.com/radio.json") ?: ""
+    )
     //endregion
 
     //region # Radio control settings

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

@@ -1,136 +0,0 @@
-package com.rtbishop.look4sat.core.data.source
-
-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 java.util.regex.Pattern
-
-/**
- * AMSAT satellite status page parser (https://amsat.org/status/)
- *
- * Page structure (static HTML, verified 2026-08):
- * - Status table: 48 rows in <table>, header = Name + 6 days (each colspan=12)
- *   Data row has 73 cells: [0]=satellite name, [1..72] = 6 days x 12 two-hour slots (new->old)
- *   Each cell: <td width=9 bgcolor="color">count</td>; when reports exist the count carries a
- *   docTips.show('id') link
- * - Report details live in the page's inline JS:
- *   tips.a885153 = new Array(5,5,120,'status<br>callsign<br>grid<br>date<br>time span UTC')
- *
- * Status colors: #648fff=active, #ffb000=telemetry only, #dc267f=not heard, #fe6100=conflicting
- */
-object AmSatParser {
-
-    private val STATUS_COLORS = mapOf(
-        "#648fff" to 0xFF648FFF.toLong(),
-        "#ffb000" to 0xFFFFB000.toLong(),
-        "#dc267f" to 0xFFDC267F.toLong(),
-        "#fe6100" to 0xFFFE6100.toLong()
-    )
-    private val GRAY = 0xFFC0C0C0.toLong()
-
-    private val rowRe = Pattern.compile("<tr>(.*?)</tr>", Pattern.DOTALL)
-    private val cellRe = Pattern.compile("(<t[dh][^>]*>.*?</t[dh]>)", Pattern.DOTALL)
-    private val bgRe = Pattern.compile("bgcolor=\"?(#[0-9a-fA-F]{6}|C0C0C0)\"?")
-    private val linkRe = Pattern.compile("docTips\\.show\\('(a\\d+)'\\)")
-    private val tipRe = Pattern.compile(
-        "tips\\.(a\\d+)\\s*=\\s*new\\s+Array\\(\\s*\\d+,\\s*\\d+,\\s*\\d+,\\s*'([^']*)'"
-    )
-
-    /** Parse the full page */
-    fun parse(html: String, fetchedAtUtcMs: Long): SatStatusPage {
-        val reports = parseReports(html)
-        val statuses = parseStatusTable(html, reports)
-        return SatStatusPage(fetchedAtUtcMs, statuses, reports)
-    }
-
-    /** Extract all reports (tips.* JS arrays) */
-    fun parseReports(html: String): Map<String, SatReport> {
-        val map = mutableMapOf<String, SatReport>()
-        val m = tipRe.matcher(html)
-        while (m.find()) {
-            val id = m.group(1)
-            val parts = m.group(2).split("<br>")
-            map[id] = SatReport(
-                id = id,
-                statusText = parts.getOrElse(0) { "" }.trim(),
-                call = parts.getOrElse(1) { "" }.trim(),
-                grid = parts.getOrElse(2) { "" }.trim(),
-                dateUtc = parts.getOrElse(3) { "" }.trim(),
-                timeUtc = parts.getOrElse(4) { "" }.trim()
-            )
-        }
-        return map
-    }
-
-    /** Parse the status table (48 satellite rows) */
-    fun parseStatusTable(html: String, reports: Map<String, SatReport>): List<SatStatus> {
-        val result = mutableListOf<SatStatus>()
-        val tables = extractTables(html)
-        for (table in tables) {
-            val rows = rowRe.matcher(table)
-            val parsed = mutableListOf<SatStatus>()
-            var rowIndex = 0
-            var dayHeaders: List<String> = emptyList()
-            while (rows.find()) {
-                val rowHtml = rows.group(1)
-                val cells = cellRe.matcher(rowHtml)
-                val cellList = mutableListOf<String>()
-                while (cells.find()) cellList.add(cells.group(1))
-                if (rowIndex == 0) {
-                    // Header: Name + 6 days (each colspan=12)
-                    dayHeaders = cellList.drop(1).take(6).map { stripHtml(it) }
-                    rowIndex++
-                    continue
-                }
-                if (cellList.size < 7) { rowIndex++; continue }
-                val name = stripHtml(cellList[0])
-                if (name.isBlank()) { rowIndex++; continue }
-                val days = mutableListOf<SatDay>()
-                for (d in 0 until 6) {
-                    val start = 1 + d * 12
-                    val end = start + 12
-                    val slots = (start until end).mapNotNull { i ->
-                        cellList.getOrNull(i)?.let { cell ->
-                            val bg = bgRe.matcher(cell)
-                            val color = if (bg.find()) {
-                                STATUS_COLORS[bg.group(1).lowercase()] ?: GRAY
-                            } else GRAY
-                            val link = linkRe.matcher(cell)
-                            val ids = mutableListOf<String>()
-                            while (link.find()) ids.add(link.group(1))
-                            val hasReport = ids.isNotEmpty()
-                            val count = if (hasReport) {
-                                stripHtml(cell).trim().toIntOrNull() ?: ids.size
-                            } else 0
-                            SatSlot(
-                                statusColor = if (hasReport) color else GRAY,
-                                count = count,
-                                reportIds = ids
-                            )
-                        }
-                    }
-                    days.add(SatDay(dayHeaders.getOrElse(d) { "" }, slots))
-                }
-                parsed.add(SatStatus(name, days))
-                rowIndex++
-            }
-            if (parsed.isNotEmpty()) {
-                result.addAll(parsed)
-                break
-            }
-        }
-        return result
-    }
-
-    private fun extractTables(html: String): List<String> {
-        val result = mutableListOf<String>()
-        val m = Pattern.compile("<table.*?</table>", Pattern.DOTALL).matcher(html)
-        while (m.find()) result.add(m.group())
-        return result
-    }
-
-    private fun stripHtml(s: String): String =
-        s.replace(Regex("<[^>]+>"), "").trim()
-}

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

@@ -24,7 +24,6 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import java.io.ByteArrayInputStream
 import java.io.InputStream
 
 class RemoteSource(
@@ -43,32 +42,52 @@ class RemoteSource(
         }
     }
 
-    override suspend fun getStatusHtml(): String? = withContext(dispatcher) {
-        try {
-            val request = Request.Builder()
-                .url("https://amsat.org/status/")
-                .header("User-Agent", "Mozilla/5.0 (Linux; Android 13) Look4Sat/4.5")
-                .build()
-            httpClient.newCall(request).execute().use { response ->
-                if (!response.isSuccessful) return@use null
-                response.body?.string()
-            }
-        } catch (exception: Exception) {
-            println("RemoteSource amsat status exception: $exception")
-            null
-        }
-    }
-
     override suspend fun getNetworkStream(url: String): InputStream? = withContext(dispatcher) {
         try {
             val networkRequest = Request.Builder().url(url).build()
-            httpClient.newCall(networkRequest).execute().use { response ->
-                if (!response.isSuccessful) return@withContext null
-                ByteArrayInputStream(response.body.bytes())
+            val response = httpClient.newCall(networkRequest).execute()
+            if (!response.isSuccessful) {
+                response.close()
+                return@withContext null
             }
+            // Return the body stream directly as the caller is responsible for closing it
+            // That returns the connection to OkHttp's pool
+            response.body.byteStream().buffered()
         } catch (exception: Exception) {
             println("RemoteSource network stream exception: $exception")
             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/main/java/com/rtbishop/look4sat/core/data/usecase/ShowToast.kt

@@ -25,8 +25,4 @@ class ShowToast(private val context: Context) : IShowToast {
     override fun invoke(message: String) {
         Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
     }
-
-    override fun invoke(resId: Int) {
-        invoke(context.getString(resId))
-    }
 }

core/data/src/main/java/com/rtbishop/look4sat/core/data/wavelog/LotwSatellitesRepo.kt

@@ -1,62 +0,0 @@
-/* LotwSatellitesRepo.kt - runtime refresh of the LoTW satellite list (4.5.5).
- * Downloads ARRL's official config.tq6 (gzip XML), parses <satellite name="...">,
- * updates the LotwSatellites dynamic set + persists to SharedPreferences (survives restarts).
- * Trigger: the "Update sats" button in the settings WaveLog section (user decided: manual).
- */
-package com.rtbishop.look4sat.core.data.wavelog
-
-import android.content.Context
-import com.rtbishop.look4sat.core.domain.wavelog.ILotwSatellitesRepo
-import com.rtbishop.look4sat.core.domain.wavelog.LotwSatellites
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import java.io.BufferedReader
-import java.io.InputStreamReader
-import java.net.URL
-import java.util.zip.GZIPInputStream
-import kotlin.random.Random
-
-class LotwSatellitesRepo(private val context: Context) : ILotwSatellitesRepo {
-
-    private val prefs = context.getSharedPreferences("lotw_satellites", Context.MODE_PRIVATE)
-
-    /** Restore the last downloaded list from SharedPreferences (call at process start) */
-    override fun restore() {
-        val saved = prefs.getString(KEY_NAMES, null)
-        if (!saved.isNullOrBlank()) {
-            LotwSatellites.updateNames(saved.split(",").filter { it.isNotBlank() }.toSet())
-        }
-    }
-
-    /** Download config.tq6 -> parse -> update memory + persist. Result is surfaced in the UI */
-    override suspend fun refresh(): ILotwSatellitesRepo.RefreshResult = withContext(Dispatchers.IO) {
-        try {
-            val url = URL("https://lotw.arrl.org/lotw/config.tq6")
-            val conn = url.openConnection()
-            conn.connectTimeout = 10_000
-            conn.readTimeout = 20_000
-            conn.setRequestProperty("User-Agent", "Look4Sat-Pro/4.5.5")
-            val raw = conn.getInputStream()
-            val reader = BufferedReader(InputStreamReader(GZIPInputStream(raw), Charsets.UTF_8))
-            val text = reader.use { it.readText() }
-            // Parse <satellite name="XXX" ...> - fixed format (official ARRL XML)
-            val names = Regex("""<satellite name="([^"]+)""").findAll(text)
-                .map { it.groupValues[1].uppercase() }
-                .toSet()
-            if (names.isEmpty()) return@withContext ILotwSatellitesRepo.RefreshResult.Error("列表为空(响应异常)")
-            LotwSatellites.updateNames(names)
-            prefs.edit()
-                .putString(KEY_NAMES, names.joinToString(","))
-                .putLong(KEY_UPDATED, System.currentTimeMillis())
-                .apply()
-            ILotwSatellitesRepo.RefreshResult.Ok(names.size)
-        } catch (e: Exception) {
-            ILotwSatellitesRepo.RefreshResult.Error(e.message ?: "未知错误")
-        }
-    }
-
-    companion object {
-        private const val KEY_NAMES = "names"
-        private const val KEY_UPDATED = "updated"
-    }
-}

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

@@ -62,7 +62,6 @@ class DatabaseRepoTest {
 
         assertEquals(1, localSource.insertedEntries.size)
         assertEquals(25544, localSource.insertedEntries.first().catnum)
-        assertEquals(listOf(25544), settingsRepo.satelliteTypeIdsByType["Other"])
         assertTrue(settingsRepo.databaseState.value.numberOfSatellites > 0)
     }
 
@@ -102,8 +101,6 @@ class DatabaseRepoTest {
         repository.updateFromRemote()
 
         assertTrue(localSource.insertedEntries.any { it.catnum == 25544 })
-        // New semantics: switch on + non-empty URL -> the All source uses the custom URL, data lands in the All type
-        assertEquals(listOf(25544), settingsRepo.satelliteTypeIdsByType["All"])
     }
 
     private fun validCsvStream(): InputStream = """
@@ -166,10 +163,10 @@ private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSou
 
     override val selectedIds: StateFlow<List<Int>> = MutableStateFlow(emptyList())
 
-    override val selectedTypes: StateFlow<List<String>> = MutableStateFlow(emptyList())
+    override val selectedSatModes: StateFlow<List<String>> = MutableStateFlow(emptyList())
 
     override val passesSettings: StateFlow<PassesSettings> = MutableStateFlow(
-        PassesSettings(hoursAhead = 24, minElevation = 0.0, selectedModes = emptyList())
+        PassesSettings(hoursAhead = 24, minElevation = 0.0)
     )
 
     override val stationPosition: StateFlow<GeoPos> = MutableStateFlow(GeoPos(0.0, 0.0))
@@ -190,11 +187,9 @@ private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSou
         RadioControlSettings(false, RadioControlSettings.MODEL_YAESU_FT817, "", "", "", "", 9600)
     )
 
-    val satelliteTypeIdsByType = mutableMapOf<String, List<Int>>()
-
     override fun setSelectedIds(ids: List<Int>) = Unit
 
-    override fun setSelectedTypes(types: List<String>) = Unit
+    override fun setSelectedSatModes(modes: List<String>) = Unit
 
     override fun setPassesSettings(settings: PassesSettings) = Unit
 
@@ -204,11 +199,6 @@ private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSou
 
     override fun setStationPosition(locator: String): Boolean = true
 
-    override fun getSatelliteTypesIds(types: List<String>): List<Int> = emptyList()
-
-    override fun setSatelliteTypeIds(type: String, ids: List<Int>) {
-        satelliteTypeIdsByType[type] = ids
-    }
 
     override fun updateDatabaseState(state: DatabaseState) {
         databaseState.value = state

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

@@ -0,0 +1,173 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.data.repository
+
+import com.rtbishop.look4sat.core.domain.model.DataSourcesSettings
+import com.rtbishop.look4sat.core.domain.model.DatabaseState
+import com.rtbishop.look4sat.core.domain.model.OtherSettings
+import com.rtbishop.look4sat.core.domain.model.PassesSettings
+import com.rtbishop.look4sat.core.domain.model.RCSettings
+import com.rtbishop.look4sat.core.domain.model.RadioControlSettings
+import com.rtbishop.look4sat.core.domain.model.SatItem
+import com.rtbishop.look4sat.core.domain.model.SatRadio
+import com.rtbishop.look4sat.core.domain.predict.GeoPos
+import com.rtbishop.look4sat.core.domain.predict.OrbitalObject
+import com.rtbishop.look4sat.core.domain.repository.ISettingsRepo
+import com.rtbishop.look4sat.core.domain.source.ILocalSource
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class SelectionRepoTest {
+
+    private val dispatcher = StandardTestDispatcher()
+
+    @Test
+    fun `unknown mode values do not crash and do not filter out entries`() = runTest(dispatcher) {
+        val localSource = FakeLocalSource(
+            entries = listOf(
+                SatItem(25544, "ISS (ZARYA)", false),
+                SatItem(40967, "TIANGONG", false)
+            )
+        )
+        val settingsRepo = FakeSettingsRepo(selectedModes = listOf("REMOVED_MODE"))
+        val repository = SelectionRepo(dispatcher, localSource, settingsRepo)
+
+        val flow = repository.getEntriesFlow()
+        repository.setModes(listOf("REMOVED_MODE"))
+
+        val items = flow.first()
+
+        assertEquals(listOf(25544, 40967), items.map { it.catnum })
+        assertEquals(listOf("REMOVED_MODE"), repository.getCurrentModes())
+    }
+
+    @Test
+    fun `selected satellites are shown first`() = runTest(dispatcher) {
+        val localSource = FakeLocalSource(
+            entries = listOf(
+                SatItem(44444, "Zeta", false),
+                SatItem(25544, "Alpha", false),
+                SatItem(40967, "Beta", false)
+            )
+        )
+        val settingsRepo = FakeSettingsRepo(selectedModes = emptyList())
+        val repository = SelectionRepo(dispatcher, localSource, settingsRepo)
+
+        val flow = repository.getEntriesFlow()
+        repository.setSelection(listOf(40967), true)
+
+        val items = flow.first()
+
+        assertEquals(listOf(40967, 25544, 44444), items.map { it.catnum })
+        assertEquals(listOf(true, false, false), items.map { it.isSelected })
+    }
+
+    private class FakeLocalSource(
+        private val entries: List<SatItem>
+    ) : ILocalSource {
+        override suspend fun getEntriesTotal(): Int = entries.size
+
+        override suspend fun getEntriesList(): List<SatItem> = entries
+
+        override suspend fun getEntriesWithIds(ids: List<Int>): List<OrbitalObject> = emptyList()
+
+        override suspend fun insertEntries(entries: List<com.rtbishop.look4sat.core.domain.predict.OrbitalData>) = Unit
+
+        override suspend fun deleteEntries() = Unit
+
+        override suspend fun getIdsWithModes(modes: List<String>): List<Int> = emptyList()
+
+        override suspend fun getRadiosTotal(): Int = 0
+
+        override suspend fun getRadiosWithId(id: Int): List<SatRadio> = emptyList()
+
+        override suspend fun insertRadios(radios: List<SatRadio>) = Unit
+
+        override suspend fun deleteRadios() = Unit
+    }
+
+    private class FakeSettingsRepo(
+        selectedModes: List<String>
+    ) : ISettingsRepo {
+
+        override val appVersionName: String = "test"
+
+        override val selectedIds: StateFlow<List<Int>> = MutableStateFlow(emptyList())
+
+        override val selectedSatModes: MutableStateFlow<List<String>> = MutableStateFlow(selectedModes)
+
+        override val passesSettings: StateFlow<PassesSettings> = MutableStateFlow(
+            PassesSettings(hoursAhead = 24, minElevation = 0.0)
+        )
+
+        override val stationPosition: StateFlow<GeoPos> = MutableStateFlow(GeoPos(0.0, 0.0))
+
+        override val databaseState: MutableStateFlow<DatabaseState> = MutableStateFlow(DatabaseState(0, 0, 0L))
+
+        override val rcSettings: StateFlow<RCSettings> = MutableStateFlow(
+            RCSettings(false, "", "", "", false, "", "", "", false, "", "", "", false, "", "")
+        )
+
+        override val otherSettings: StateFlow<OtherSettings> = MutableStateFlow(
+            OtherSettings(false, false, false, false, false, false, false, false)
+        )
+
+        override val dataSourcesSettings: StateFlow<DataSourcesSettings> = MutableStateFlow(
+            DataSourcesSettings(false, false, "", "")
+        )
+
+        override val radioControlSettings: StateFlow<RadioControlSettings> = MutableStateFlow(
+            RadioControlSettings(false, RadioControlSettings.MODEL_YAESU_FT817, "", "", "", "", 9600)
+        )
+
+        override fun setSelectedIds(ids: List<Int>) = Unit
+
+        override fun setSelectedSatModes(modes: List<String>) {
+            selectedSatModes.value = modes
+        }
+
+        override fun setPassesSettings(settings: PassesSettings) = Unit
+
+        override fun setStationPosition(latitude: Double, longitude: Double, altitude: Double): Boolean = true
+
+        override fun setStationPosition(): Boolean = true
+
+        override fun setStationPosition(locator: String): Boolean = true
+
+        override fun updateDatabaseState(state: DatabaseState) {
+            databaseState.value = state
+        }
+
+        override fun updateRCSettings(settings: RCSettings) = Unit
+
+        override fun updateOtherSettings(transform: (OtherSettings) -> OtherSettings) = Unit
+
+        override fun updateDataSourcesSettings(settings: DataSourcesSettings) = Unit
+
+        override fun updateRadioControlSettings(settings: RadioControlSettings) = Unit
+    }
+}
+
+

core/domain/build.gradle.kts

@@ -1,8 +1,3 @@
 plugins {
     alias(libs.plugins.convention.coreDomainPlugin)
 }
-
-dependencies {
-    // 编译期使用 org.json(构造/解析 WaveLog API 请求体); 运行时用 Android 系统自带的 org.json
-    compileOnly("org.json:json:20240303")
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/amsat/AmSatApiClient.kt

@@ -1,98 +0,0 @@
-/* AmSatApiClient.kt - AMSAT official status API v1 client (pure JVM).
- * Endpoints (verified 2026-08):
- *   GET https://www.amsat.org/status/api/v1/catalog.php          -> satellite list
- *   GET https://www.amsat.org/status/api/v1/reports.php?hours=N&limit=500 -> reports
- * Report fields: id, name ("SO-50_[FM]"), callsign, report, grid_square, reported_time (ISO 8601 UTC).
- * Status values: Heard / Telemetry Only / Not Heard / Crew Active.
- */
-package com.rtbishop.look4sat.core.domain.amsat
-
-import org.json.JSONObject
-import org.json.JSONArray
-import java.io.BufferedReader
-import java.net.HttpURLConnection
-import java.net.URL
-
-/** One report from the AMSAT API. */
-data class ApiReport(
-    val id: String,
-    val name: String,        // "SO-50_[FM]" (API name, includes mode suffix)
-    val callsign: String,
-    val report: String,      // Heard / Telemetry Only / Not Heard / Crew Active
-    val gridSquare: String,
-    val reportedTimeUtcSec: Long
-)
-
-/** AMSAT official satellite status API v1 client. */
-class AmSatApiClient(private val baseUrl: String = "https://www.amsat.org/status/api/v1") {
-
-    /** Fetch the full satellite catalog. Returns API names (e.g. "SO-50_[FM]"). */
-    fun fetchCatalog(): List<String> {
-        val body = httpGet("$baseUrl/catalog.php") ?: return emptyList()
-        return try {
-            val arr = JSONObject(body).getJSONArray("data")
-            (0 until arr.length()).map { arr.getJSONObject(it).getString("name") }
-        } catch (e: Exception) {
-            emptyList()
-        }
-    }
-
-    /** Fetch reports for a rolling UTC window. Empty on failure. */
-    fun fetchAllReports(hours: Int = 168): List<ApiReport> {
-        val body = httpGet("$baseUrl/reports.php?hours=$hours&limit=500") ?: return emptyList()
-        return try {
-            val arr = JSONObject(body).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 "2026-08-05T07:30:00Z" to epoch seconds (minSdk 24: no java.time). */
-    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
-    }
-
-    private fun httpGet(url: String): String? {
-        return try {
-            val conn = URL(url).openConnection() as HttpURLConnection
-            conn.requestMethod = "GET"
-            conn.connectTimeout = 15000
-            conn.readTimeout = 20000
-            conn.setRequestProperty("User-Agent", "Look4Sat/4.5.5")
-            if (conn.responseCode !in 200..299) {
-                conn.disconnect()
-                return null
-            }
-            val text = conn.inputStream.bufferedReader().use(BufferedReader::readText)
-            conn.disconnect()
-            text
-        } catch (e: Exception) {
-            null
-        }
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/aprs/AprsPacket.kt

@@ -1,116 +0,0 @@
-package com.rtbishop.look4sat.core.domain.aprs
-
-import kotlin.math.abs
-import kotlin.math.round
-
-/**
- * APRS-IS protocol core (pure Kotlin, no Android dependencies).
- * Reverse-ported from APRSdroid 1.6.3d: AprsPacket$.scala + ab0oo Position.java.
- */
-object AprsPacket {
-
-    /** APRS-IS passcode algorithm (standard): 0x73E2 seed, uppercase callsign + \0, XOR each char pair */
-    fun passcode(callsign: String): Int {
-        val s = callsign.split("-")[0].uppercase() + "\u0000"
-        var hash = 29666 // 0x73E2
-        var i = 0
-        while (i <= s.length - 2) {
-            hash = hash xor (s[i].code * 256 + s[i + 1].code)
-            i += 2
-        }
-        return hash and 0x7FFF
-    }
-
-    /** Login line: user CALL-SSID pass XXXX vers XXXX */
-    fun formatLogin(callsign: String, ssid: String, passcode: Int, version: String): String {
-        val callSsid = formatCallSsid(callsign, ssid)
-        return "user $callSsid pass $passcode vers $version"
-    }
-
-    /** Callsign-SSID join (BG7NTA + 5 -> BG7NTA-5) */
-    fun formatCallSsid(callsign: String, ssid: String): String {
-        if (ssid.isNullOrEmpty()) return callsign
-        return "$callsign-$ssid"
-    }
-
-    /** Optional distance filter: filter r/lat/lon/dist */
-    fun formatRangeFilter(latitude: Double, longitude: Double, distKm: Int): String {
-        return String.format("r/%.3f/%.3f/%d", latitude, longitude, distKm)
-    }
-
-    /** Altitude extension /A=00000 (feet) */
-    fun formatAltitude(altitudeMeters: Double?): String {
-        if (altitudeMeters == null) return ""
-        return String.format("/A=%06d", (altitudeMeters * 3.2808399).toInt())
-    }
-
-    /** Speed/course extension (knots/degrees) */
-    fun formatCourseSpeed(speedMps: Double?, bearing: Float?): String {
-        if (speedMps == null || bearing == null) return ""
-        val knots = (speedMps * 1.94384449).toInt()
-        return String.format("/%03d/%03d", bearing.toInt(), knots)
-    }
-}
-
-/**
- * APRS position encoding (reverse-ported from ab0oo Position.java).
- * Uncompressed: DDMM.MMN/DDDMM.MME; compressed: base91.
- */
-class AprsPosition(
-    val latitude: Double,
-    val longitude: Double,
-    val symbolTable: Char,
-    val symbolCode: Char,
-    val positionAmbiguity: Int = 0
-) {
-
-    /** Uncompressed format (APRS-IS default reporting format) */
-    fun toUncompressedString(): String {
-        val lat = getDMS(latitude, true)
-        val lon = getDMS(longitude, false)
-        return "$lat$symbolTable$lon$symbolCode"
-    }
-
-    /** Compressed format (base91, standard APRS algorithm) */
-    fun toCompressedString(): String {
-        val jRound = round((90.0 - latitude) * 380926.0).toLong()
-        val j = jRound / 753571 + 33
-        val j2 = jRound % 753571
-        val j3 = j2 / 8281 + 33
-        val j4 = j2 % 8281
-        val i = (j4 % 91).toInt() + 33
-        val jRound2 = round((longitude + 180.0) * 190463.0).toLong()
-        val j5 = jRound2 / 753571 + 33
-        val j6 = jRound2 % 753571
-        val j7 = 33 + j6 / 8281
-        val j8 = j6 % 8281
-        return "" + symbolTable + j.toInt().toChar() + j3.toInt().toChar() +
-            ((j4 / 91).toInt() + 33).toChar() + i.toChar() +
-            j5.toInt().toChar() + j7.toInt().toChar() +
-            ((j8 / 91).toInt() + 33).toChar() +
-            ((j8 % 91).toInt() + 33).toChar() + symbolCode
-    }
-
-    /** Single-axis DMS encoding (hundredths) */
-    private fun getDMS(value: Double, isLat: Boolean): String {
-        var iRound = round(value * 6000.0).toInt()
-        if (iRound < 0) iRound = -iRound
-        val degrees = iRound / 6000
-        val minutes = (iRound / 100) % 60
-        val hundredths = iRound % 100
-        val frac = when (positionAmbiguity) {
-            1 -> "  .  "
-            2 -> String.format("%d .  ", minutes / 10)
-            3 -> String.format("%02d.  ", minutes)
-            4 -> String.format("%02d.%d ", minutes, hundredths / 10)
-            else -> String.format("%02d.%02d", minutes, hundredths)
-        }
-        return if (isLat) {
-            val ns = if (value >= 0) 'N' else 'S'
-            String.format("%02d%s%c", degrees, frac, ns)
-        } else {
-            val ew = if (value >= 0) 'E' else 'W'
-            String.format("%03d%s%c", degrees, frac, ew)
-        }
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwBayesianDecoder.kt

@@ -1,154 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * Bayesian Morse timing decoder.
- * Replaces hard thresholds with probability-based decision making.
- *
- * Inspired by VE3NEA's CW Skimmer approach:
- * "Instead of making a hard decision at every input sample whether the signal
- * is present or not, compute the probability that the signal is present."
- *
- * Uses Gaussian probability density centered on expected durations:
- *   P(dit | duration) = exp(-(duration - dotMs)^2 / (2 * variance^2))
- *   P(dash | duration) = exp(-(duration - 3*dotMs)^2 / (2 * variance^2))
- */
-internal class CwBayesianDecoder {
-
-    // Morse timing parameters
-    private var dotDurationMs = 60f // initial 20 WPM
-    private var speedWpm = 20f
-
-    // Current symbol being accumulated
-    private var currentSymbol = StringBuilder()
-    private var textBuffer = StringBuilder()
-
-    // Recent dit lengths for speed estimation
-    private val recentDits = mutableListOf<Float>()
-
-    // Output
-    private var _decodedText = ""
-    val decodedText: String get() = _decodedText
-
-    /** Gaussian probability. */
-    private fun gaussianProb(durationMs: Float, expectedMs: Float, varianceMs: Float): Float {
-        if (varianceMs <= 0f) return 0f
-        val diff = durationMs - expectedMs
-        return kotlin.math.exp(-(diff * diff) / (2 * varianceMs * varianceMs))
-    }
-
-    /** Process a tone duration. Returns the symbol type with highest probability. */
-    fun processTone(durationMs: Float): ToneResult {
-        val ditProb = gaussianProb(durationMs, dotDurationMs, dotDurationMs * 0.4f)
-        val dashProb = gaussianProb(durationMs, dotDurationMs * 3f, dotDurationMs * 0.6f)
-
-        return if (ditProb > dashProb && ditProb > 0.05f) {
-            currentSymbol.append('0')
-            recentDits.add(durationMs)
-            updateSpeed()
-            ToneResult('0', ditProb)
-        } else if (dashProb > 0.05f) {
-            currentSymbol.append('1')
-            ToneResult('1', dashProb)
-        } else {
-            ToneResult(null, 0f)
-        }
-    }
-
-    /** Process a gap duration. Returns decoded character or null. */
-    fun processGap(durationMs: Float): Char? {
-        if (currentSymbol.isEmpty()) {
-            val wordProb = gaussianProb(durationMs, dotDurationMs * 7f, dotDurationMs * 1.2f)
-            if (wordProb > 0.2f) {
-                textBuffer.append(' ')
-                _decodedText = textBuffer.toString()
-                return ' '
-            }
-            return null
-        }
-
-        val interCharProb = gaussianProb(durationMs, dotDurationMs * 3f, dotDurationMs * 0.6f)
-        val wordProb = gaussianProb(durationMs, dotDurationMs * 7f, dotDurationMs * 1.2f)
-
-        if (wordProb > interCharProb && wordProb > 0.2f) {
-            val char = flushSymbol()
-            textBuffer.append(' ')
-            _decodedText = textBuffer.toString()
-            return char
-        }
-        if (interCharProb > 0.15f) {
-            val char = flushSymbol()
-            _decodedText = textBuffer.toString()
-            return char
-        }
-        return null
-    }
-
-    private fun flushSymbol(): Char? {
-        if (currentSymbol.isEmpty()) return null
-        val morse = currentSymbol.toString()
-        currentSymbol.clear()
-        val char = morseToChar(morse)
-        if (char != null) textBuffer.append(char)
-        return char
-    }
-
-    private fun updateSpeed() {
-        if (recentDits.size < 3) return
-        val sorted = recentDits.sorted()
-        val median = sorted[sorted.size / 2]
-        if (median > 0f) {
-            dotDurationMs = dotDurationMs * 0.7f + median * 0.3f
-            val wpm = 60.0f / (50.0f * dotDurationMs / 1000.0f)
-            if (wpm in 5f..55f) speedWpm = wpm
-        }
-    }
-
-    fun getSpeed(): Float = speedWpm
-
-    fun reset() {
-        dotDurationMs = 60f
-        speedWpm = 20f
-        recentDits.clear()
-        currentSymbol.clear()
-        textBuffer.clear()
-        _decodedText = ""
-    }
-
-    companion object {
-        private val MORSE_TABLE = mapOf(
-            "01" to 'A', "1000" to 'B', "1010" to 'C', "100" to 'D', "0" to 'E',
-            "0010" to 'F', "110" to 'G', "0000" to 'H', "00" to 'I', "0111" to 'J',
-            "101" to 'K', "0100" to 'L', "11" to 'M', "10" to 'N', "111" to 'O',
-            "0110" to 'P', "1101" to 'Q', "010" to 'R', "000" to 'S', "1" to 'T',
-            "001" to 'U', "0001" to 'V', "011" to 'W', "1001" to 'X', "1011" to 'Y',
-            "1100" to 'Z', "01111" to '1', "00111" to '2', "00011" to '3',
-            "00001" to '4', "00000" to '5', "10000" to '6', "11000" to '7',
-            "11100" to '8', "11110" to '9', "11111" to '0',
-            "010101" to '.', "110011" to ',', "001100" to '?', "011110" to '\'',
-            "101011" to '!', "10010" to '/', "10110" to '(', "101101" to ')',
-            "01000" to '&', "111000" to ':', "101010" to ';', "10001" to '=',
-            "01010" to '+', "100001" to '-', "001101" to '_', "010010" to '"',
-            "0001001" to '$', "011010" to '@'
-        )
-        fun morseToChar(morse: String): Char? = MORSE_TABLE[morse]
-    }
-}
-
-data class ToneResult(val symbol: Char?, val probability: Float)

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwChannelTracker.kt

@@ -1,114 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * Multi-channel CW signal tracker.
- * Monitors the spectrogram for active frequency bins and extracts
- * energy envelopes for each detected signal.
- *
- * Inspired by CW Skimmer's multi-channel approach:
- * tracks all active signals in the passband simultaneously,
- * selects the best one for decoded output.
- */
-internal class CwChannelTracker(
-    private val spectrogram: CwSpectrogram,
-    private val maxChannels: Int = 3
-) {
-    data class Channel(
-        val bin: Int,
-        val frequency: Float,
-        var active: Boolean = false,
-        var energy: Float = 0f,
-        val history: MutableList<Float> = mutableListOf(),
-        var confidence: Float = 0f
-    )
-
-    private val channels = Array(maxChannels) { Channel(0, 0f) }
-
-    /** Scan the current spectrogram column and update channel tracking. */
-    fun update(): List<Channel> {
-        val col = spectrogram.getCurrentColumn()
-        val peaks = findPeaks(col, threshold = 0.3f, minDistance = 2)
-
-        // Update existing channels
-        for (ch in channels) {
-            if (ch.active) {
-                if (peaks.contains(ch.bin)) {
-                    ch.energy = col[ch.bin]
-                    ch.history.add(ch.energy)
-                    if (ch.history.size > 40) ch.history.removeAt(0)
-                    ch.confidence = computeConfidence(ch.history)
-                } else {
-                    // Signal lost — decay confidence
-                    ch.history.add(0f)
-                    if (ch.history.size > 40) ch.history.removeAt(0)
-                    ch.confidence *= 0.9f
-                    if (ch.confidence < 0.1f) ch.active = false
-                }
-            }
-        }
-
-        // Assign new peaks to inactive channels
-        var peakIdx = 0
-        for (ch in channels) {
-            if (!ch.active && peakIdx < peaks.size) {
-                val bin = peaks[peakIdx]
-                val freq = spectrogram.binToFreq(bin)
-                // Re-initialize channel
-                channels[peakIdx] = Channel(bin, freq, true, col[bin], mutableListOf(), 0.5f)
-                peakIdx++
-            }
-        }
-
-        return channels.filter { it.active }
-    }
-
-    /** Find peak bins in the spectrum. */
-    private fun findPeaks(spectrum: FloatArray, threshold: Float, minDistance: Int): List<Int> {
-        val peaks = mutableListOf<Int>()
-        for (i in 1 until spectrum.size - 1) {
-            if (spectrum[i] > spectrum[i - 1] && spectrum[i] > spectrum[i + 1] && spectrum[i] > threshold) {
-                if (peaks.isEmpty() || i - peaks.last() >= minDistance) {
-                    peaks.add(i)
-                }
-            }
-        }
-        return peaks.sortedByDescending { spectrum[it] }
-    }
-
-    /** Compute confidence from energy history. Lower variance = higher confidence. */
-    private fun computeConfidence(history: List<Float>): Float {
-        if (history.size < 10) return 0.3f
-        val recent = history.takeLast(10)
-        val mean = recent.average().toFloat()
-        val variance = recent.map { (it - mean) * (it - mean) }.average().toFloat()
-        return if (mean > 0f) (mean / (mean + variance + 0.1f)).coerceIn(0f, 1f) else 0f
-    }
-
-    /** Get the channel with highest confidence. */
-    fun getBestChannel(): Channel? {
-        return channels.filter { it.active }.maxByOrNull { it.confidence }
-    }
-
-    fun reset() {
-        for (i in channels.indices) {
-            channels[i] = Channel(0, 0f)
-        }
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwDecoder.kt

@@ -1,165 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-
-/**
- * CW (Morse code) decoder v3 — Spectrogram-based multi-channel Bayesian decoder.
- *
- * Architecture inspired by Morse Expert / CW Skimmer (VE3NEA):
- *   1. FFT spectrogram creates a frequency×time matrix
- *   2. Multi-channel peak detector finds all active signals
- *   3. Per-channel energy envelope extraction
- *   4. Bayesian probability for symbol timing (Gaussian likelihood)
- *   5. Best channel selected for output
- *
- * Timing analysis is performed per spectrogram column (hop).
- * Each column represents hopSize/sampleRate seconds of audio.
- */
-class CwDecoder(
-    val sampleRate: Int = 8000,
-    cwToneFreq: Float = -1f // ignored in v3 (auto-detect via spectrogram)
-) {
-    companion object {
-        private const val FFT_SIZE = 256
-        private const val HOP_SIZE = 64
-    }
-
-    private val spectrogram = CwSpectrogram(
-        fftSize = FFT_SIZE,
-        hopSize = HOP_SIZE,
-        sampleRate = sampleRate,
-        minBin = 6,
-        maxBin = 38,
-        historyCols = 40
-    )
-    private val channelTracker = CwChannelTracker(spectrogram, maxChannels = 3)
-    private val bayesianDecoder = CwBayesianDecoder()
-
-    // Timing state per channel
-    private data class ChannelTiming(
-        var isSignal: Boolean = false,
-        var toneTicks: Int = 0,
-        var gapTicks: Int = 0
-    )
-    private val timingStates = Array(3) { ChannelTiming() }
-
-    // Time per spectrogram column in milliseconds
-    private val tickMs = 1000f * HOP_SIZE / sampleRate
-
-    // Output flows
-    private val _decodedTextFlow = MutableStateFlow("")
-    val decodedTextFlow: StateFlow<String> = _decodedTextFlow
-
-    private val _signalStrength = MutableStateFlow(0f)
-    val signalStrength: StateFlow<Float> = _signalStrength
-
-    private val _estimatedPitch = MutableStateFlow<Float?>(null)
-    val estimatedPitch: StateFlow<Float?> = _estimatedPitch
-
-    private val _estimatedSpeed = MutableStateFlow<Float?>(null)
-    val estimatedSpeed: StateFlow<Float?> = _estimatedSpeed
-
-    private var frameCount = 0
-
-    init {
-        if (cwToneFreq > 0f) {
-            _estimatedPitch.value = cwToneFreq
-        }
-    }
-
-    fun processBuffer(buffer: FloatArray) {
-        // 1. Feed samples to spectrogram
-        spectrogram.addSamples(buffer)
-
-        // 2. Get number of new columns generated
-        val newCols = spectrogram.getNewColumns()
-        if (newCols == 0) return
-
-        // 3. Update channel tracker (uses latest column for peak detection)
-        val activeChannels = channelTracker.update()
-
-        // 4. Process each new column for timing analysis
-        //    Columns are indexed 0..historyCols-1, where historyCols-1 is the newest
-        val baseIdx = (spectrogram.historyCols - newCols).coerceAtLeast(0)
-        for (colOffset in 0 until newCols) {
-            val col = spectrogram.getColumn(baseIdx + colOffset)
-
-            for ((idx, channel) in activeChannels.withIndex()) {
-                if (idx >= timingStates.size) break
-                val state = timingStates[idx]
-                val energy = if (channel.bin in col.indices) col[channel.bin] else 0f
-
-                // Adaptive threshold
-                val threshold = 0.3f + (energy - 0.3f) * 0.3f
-
-                if (energy > threshold) {
-                    if (!state.isSignal) {
-                        if (state.gapTicks > 0) {
-                            val gapMs = state.gapTicks * tickMs
-                            bayesianDecoder.processGap(gapMs)
-                        }
-                        state.gapTicks = 0
-                        state.isSignal = true
-                    }
-                    state.toneTicks++
-                } else {
-                    if (state.isSignal) {
-                        if (state.toneTicks > 0) {
-                            val toneMs = state.toneTicks * tickMs
-                            bayesianDecoder.processTone(toneMs)
-                        }
-                        state.toneTicks = 0
-                        state.isSignal = false
-                    }
-                    state.gapTicks++
-                }
-            }
-        }
-
-        // 5. Update outputs
-        frameCount++
-        if (frameCount % 5 == 0) {
-            val bestChannel = channelTracker.getBestChannel()
-            if (bestChannel != null) {
-                _estimatedPitch.value = bestChannel.frequency
-                _signalStrength.value = bestChannel.confidence
-                _estimatedSpeed.value = bayesianDecoder.getSpeed()
-            }
-            _decodedTextFlow.value = bayesianDecoder.decodedText
-        }
-    }
-
-    fun resetDecoder() {
-        spectrogram.reset()
-        channelTracker.reset()
-        bayesianDecoder.reset()
-        for (state in timingStates) {
-            state.isSignal = false
-            state.toneTicks = 0
-            state.gapTicks = 0
-        }
-        frameCount = 0
-        _decodedTextFlow.value = ""
-        _signalStrength.value = 0f
-        _estimatedPitch.value = null
-        _estimatedSpeed.value = null
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwDsp.kt

@@ -1,102 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import kotlin.math.PI
-import kotlin.math.cos
-import kotlin.math.sin
-import kotlin.math.sqrt
-
-/**
- * DSP utilities for CW (Morse code) decoding.
- * Pure Kotlin, no NDK required.
- */
-internal object CwDsp {
-
-    /**
-     * Design a simple bandpass FIR filter coefficients using windowed sinc method.
-     * @param lowCutoff  lower cutoff frequency (Hz) as fraction of sampleRate
-     * @param highCutoff upper cutoff frequency (Hz) as fraction of sampleRate
-     * @param taps       filter length (must be odd)
-     */
-    fun bandpassFir(lowCutoff: Double, highCutoff: Double, taps: Int): FloatArray {
-        val n = if (taps % 2 == 0) taps + 1 else taps
-        val half = n / 2
-        val coeffs = FloatArray(n)
-        for (i in 0 until n) {
-            val idx = i - half
-            if (idx == 0) {
-                coeffs[i] = (2.0 * (highCutoff - lowCutoff)).toFloat()
-            } else {
-                val x = PI * idx
-                coeffs[i] = ((sin(2 * highCutoff * x) - sin(2 * lowCutoff * x)) / x).toFloat()
-            }
-            // Hamming window
-            coeffs[i] = (coeffs[i] * (0.54 - 0.46 * cos(2 * PI * i / (n - 1)))).toFloat()
-        }
-        // Normalize
-        val sum = coeffs.sum()
-        if (sum != 0f) for (i in 0 until n) coeffs[i] /= sum
-        return coeffs
-    }
-
-    /** Apply FIR filter to a buffer. */
-    fun applyFir(buffer: FloatArray, coeffs: FloatArray): FloatArray {
-        val out = FloatArray(buffer.size)
-        for (i in buffer.indices) {
-            var sum = 0f
-            for (j in coeffs.indices) {
-                val idx = i - j
-                if (idx >= 0) sum += buffer[idx] * coeffs[j]
-            }
-            out[i] = sum
-        }
-        return out
-    }
-
-    /** Simple envelope detector: abs + low-pass smoothing. */
-    fun envelope(signal: FloatArray, alpha: Float = 0.1f): FloatArray {
-        val env = FloatArray(signal.size)
-        var s = 0f
-        for (i in signal.indices) {
-            s = alpha * kotlin.math.abs(signal[i]) + (1 - alpha) * s
-            env[i] = s
-        }
-        return env
-    }
-
-    /** Estimate noise floor from envelope for adaptive thresholding. */
-    fun noiseFloor(env: FloatArray, fraction: Float = 0.3f): Float {
-        val sorted = env.sortedArray()
-        val median = sorted[sorted.size / 2]
-        return median + (sorted[sorted.size * 9 / 10] - median) * fraction
-    }
-
-    /** Simple Goertzel to detect a specific tone frequency. */
-    fun goertzel(buffer: FloatArray, targetFreq: Float, sampleRate: Int): Float {
-        val omega = 2.0 * PI * targetFreq / sampleRate
-        val coeff = 2.0 * cos(omega)
-        var s0 = 0.0; var s1 = 0.0; var s2 = 0.0
-        for (sample in buffer) {
-            s0 = sample.toDouble() + coeff * s1 - s2
-            s2 = s1; s1 = s0
-        }
-        val power = s2 * s2 + s1 * s1 - coeff * s1 * s2
-        return sqrt(kotlin.math.abs(power)).toFloat()
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwFFT.kt

@@ -1,87 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import kotlin.math.cos
-import kotlin.math.sqrt
-
-/**
- * Radix-2 FFT for real-valued input.
- * Produces magnitude spectrum for the first N/2+1 bins.
- * Used by CwSpectrogram for time-frequency analysis.
- */
-internal class CwFFT(private val n: Int) {
-    init {
-        require(n > 0 && n and (n - 1) == 0) { "FFT size must be power of 2, got $n" }
-    }
-
-    private val cosTable = FloatArray(n / 2)
-    private val sinTable = FloatArray(n / 2)
-
-    init {
-        for (i in 0 until n / 2) {
-            val angle = -2.0 * kotlin.math.PI * i / n
-            cosTable[i] = cos(angle).toFloat()
-            sinTable[i] = kotlin.math.sin(angle).toFloat()
-        }
-    }
-
-    /** Compute magnitude spectrum for real input. Returns array of size n/2+1. */
-    fun magnitudeSpectrum(input: FloatArray): FloatArray {
-        require(input.size == n) { "Input size must be $n, got ${input.size}" }
-
-        val real = input.copyOf()
-        val imag = FloatArray(n)
-
-        // Bit-reversal permutation
-        var j = 0
-        for (i in 1 until n) {
-            var bit = n shr 1
-            while (j and bit != 0) { j = j xor bit; bit = bit shr 1 }
-            j = j xor bit
-            if (i < j) {
-                var tmp = real[i]; real[i] = real[j]; real[j] = tmp
-            }
-        }
-
-        // Radix-2 Cooley-Tukey FFT
-        var len = 2
-        while (len <= n) {
-            val half = len / 2
-            val step = n / len
-            for (i in 0 until n step len) {
-                for (k in 0 until half) {
-                    val tReal = real[i + k + half] * cosTable[k * step] - imag[i + k + half] * sinTable[k * step]
-                    val tImag = real[i + k + half] * sinTable[k * step] + imag[i + k + half] * cosTable[k * step]
-                    real[i + k + half] = real[i + k] - tReal
-                    imag[i + k + half] = imag[i + k] - tImag
-                    real[i + k] += tReal
-                    imag[i + k] += tImag
-                }
-            }
-            len = len shl 1
-        }
-
-        // Magnitude spectrum (first N/2+1 bins)
-        val mag = FloatArray(n / 2 + 1)
-        for (i in 0..n / 2) {
-            mag[i] = sqrt(real[i] * real[i] + imag[i] * imag[i]) / n
-        }
-        return mag
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwFftFilt.kt

@@ -1,139 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import kotlin.math.PI
-import kotlin.math.abs
-import kotlin.math.cos
-import kotlin.math.sin
-
-/**
- * FFT lowpass/bandpass filter with overlap-add, ported from fldigi
- * fftfilt.cxx (fftfilt class). Used by the CW decoder for the
- * matched receive filter.
- */
-internal class CwFftFilt(f1: Double, f2: Double, len: Int) {
-    private val flen: Int
-    private val flen2: Int
-    private val fft: CwGfft
-    private val filter: Array<CwComplex>
-    private val timedata: Array<CwComplex>
-    private val freqdata: Array<CwComplex>
-    private val output: Array<CwComplex>
-    private val ovlbuf: Array<CwComplex>
-    private var inptr = 0
-    private var pass = 0
-
-    init {
-        flen = len
-        flen2 = flen shr 1
-        fft = CwGfft(flen)
-        filter = Array(flen) { CwComplex() }
-        timedata = Array(flen) { CwComplex() }
-        freqdata = Array(flen) { CwComplex() }
-        output = Array(flen) { CwComplex() }
-        ovlbuf = Array(flen2) { CwComplex() }
-        createFilter(f1, f2)
-    }
-
-    constructor(f: Double, len: Int) : this(0.0, f, len)
-
-    fun flushSize(): Int = flen - inptr
-
-    /**
-     * f1 < f2 ==> bandpass; f1 > f2 ==> band reject; f1 == 0 ==> lowpass; f2 == 0 ==> highpass.
-     */
-    private fun createFilter(f1: Double, f2: Double) {
-        for (i in 0 until flen) {
-            filter[i] = CwComplex()
-        }
-        val bLowpass = f2 != 0.0
-        val bHighpass = f1 != 0.0
-
-        for (i in 0 until flen2) {
-            var h = 0.0
-            if (bLowpass) h += fsinc(f2, i, flen2)
-            if (bHighpass) h -= fsinc(f1, i, flen2)
-            if (bHighpass && f2 < f1 && i == flen2 / 2) h += 1.0
-            filter[i] = CwComplex(h * blackman(i, flen2), 0.0)
-        }
-
-        // forward FFT of the impulse response
-        fft.forward(filter)
-
-        // normalize unity gain
-        var scale = 0.0
-        for (i in 0 until flen2) {
-            val mag = kotlin.math.sqrt(filter[i].re * filter[i].re + filter[i].im * filter[i].im)
-            if (mag > scale) scale = mag
-        }
-        if (scale != 0.0) {
-            for (i in 0 until flen) {
-                filter[i] = CwComplex(filter[i].re / scale, filter[i].im / scale)
-            }
-        }
-        pass = 1
-    }
-
-    fun createLpf(f: Double) = createFilter(0.0, f)
-
-    private fun fsinc(fc: Double, i: Int, len: Int): Double {
-        val mid = len / 2
-        return if (i == mid) 2.0 * fc
-        else sin(2.0 * PI * fc * (i - mid)) / (PI * (i - mid))
-    }
-
-    private fun blackman(i: Int, len: Int): Double =
-        0.42 - 0.50 * cos(2.0 * PI * i / len) + 0.08 * cos(4.0 * PI * i / len)
-
-    /**
-     * Feed one complex input sample. Returns output array + count when flen/2
-     * samples are ready, otherwise null.
-     */
-    fun run(input: CwComplex): Array<CwComplex>? {
-        timedata[inptr++] = input
-        if (inptr < flen2) return null
-        if (pass > 0) pass--
-
-        // copy to freq domain and FFT
-        for (i in 0 until flen) {
-            freqdata[i] = timedata[i]
-        }
-        fft.forward(freqdata)
-
-        // multiply by filter shape
-        for (i in 0 until flen) {
-            val f = filter[i]
-            val t = freqdata[i]
-            freqdata[i] = CwComplex(t.re * f.re - t.im * f.im, t.re * f.im + t.im * f.re)
-        }
-
-        // inverse FFT
-        fft.inverse(freqdata)
-
-        // overlap-add: first half is valid output, save second half
-        for (i in 0 until flen2) {
-            output[i] = CwComplex(ovlbuf[i].re + freqdata[i].re, ovlbuf[i].im + freqdata[i].im)
-            ovlbuf[i] = freqdata[i + flen2]
-        }
-
-        inptr = 0
-        if (pass > 0) return null
-        return output
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwFilter.kt

@@ -1,48 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * First-order IIR filters.
- * Ported from ggmorse/src/filter.h
- */
-internal class CwFilter {
-    private var z1 = 0f
-
-    companion object {
-        private const val PI_F = 3.141592653589793f
-    }
-
-    fun highPass(sample: Float, cutoffHz: Float, sampleRate: Float): Float {
-        val rc = 1.0f / (2f * PI_F * cutoffHz)
-        val dt = 1.0f / sampleRate
-        val alpha = dt / (rc + dt)
-        z1 = alpha * (z1 + sample - z1)
-        return sample - z1
-    }
-
-    fun lowPass(sample: Float, cutoffHz: Float, sampleRate: Float): Float {
-        val rc = 1.0f / (2f * PI_F * cutoffHz)
-        val dt = 1.0f / sampleRate
-        val alpha = dt / (rc + dt)
-        z1 += alpha * (sample - z1)
-        return z1
-    }
-
-    fun reset() { z1 = 0f }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwFldigiDecoder.kt

@@ -1,530 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlin.math.abs
-import kotlin.math.log10
-import kotlin.math.roundToInt
-
-/**
- * CW decoder ported from fldigi (w1hkj/fldigi) cw.cxx — full receive
- * chain: NCO down-conversion, FFT lowpass filter, decimation, AGC,
- * hysteresis keying detection, element timing state machine, adaptive
- * speed tracking, SOM codebook matching and morse table lookup.
- *
- * Drop-in replacement for the reverse-engineered Morse Expert decoder:
- * same processBuffer(FloatArray) entry point, same StateFlow outputs.
- */
-class CwFldigiDecoder(
-    val sampleRate: Int = CwFldigiConstants.CW_SAMPLERATE,
-    private val frequency: Double = 600.0,
-    private val useSom: Boolean = true,
-    private val initialWpm: Int = CwFldigiConstants.DEFAULT_SPEED
-) {
-    private companion object {
-        const val CW_DOT = '.'
-        const val CW_DASH = '-'
-        const val CW_RESET = 0
-        const val CW_KEYDOWN = 1
-        const val CW_KEYUP = 2
-        const val CW_QUERY = 3
-        const val CW_SUCCESS = 0
-        const val CW_ERROR = -1
-
-        // Auto-tune (spectral peak tracking, mirrors the old channelTracker)
-        const val TUNE_FFT_SIZE = 512
-        const val TUNE_MIN_FREQ = 300.0
-        const val TUNE_MAX_FREQ = 1500.0
-        const val TUNE_ENERGY_FRACTION = 0.35
-    }
-
-    private enum class CwRxState { IDLE, IN_TONE, AFTER_TONE }
-
-    // Outputs (API-compatible with the old CwDecoder)
-    private val _decodedTextFlow = MutableStateFlow("")
-    val decodedTextFlow: StateFlow<String> = _decodedTextFlow
-
-    private val _signalStrength = MutableStateFlow(0f)
-    val signalStrength: StateFlow<Float> = _signalStrength
-
-    private val _estimatedPitch = MutableStateFlow<Float?>(frequency.toFloat())
-    val estimatedPitch: StateFlow<Float?> = _estimatedPitch
-
-    private val _estimatedSpeed = MutableStateFlow<Float?>(null)
-    val estimatedSpeed: StateFlow<Float?> = _estimatedSpeed
-
-    // --- auto-tune state (spectral peak tracking) ---
-    private var tuneFreq = frequency
-    private val tuneBuffer = DoubleArray(TUNE_FFT_SIZE)
-    private var tuneIdx = 0
-    private var tuneFft = CwGfft(TUNE_FFT_SIZE)
-    private var tunePeakFreq = frequency
-    private var tuneHasPeak = false
-    private var tuneLocked = false
-    private val tuneWindow = DoubleArray(TUNE_FFT_SIZE)
-
-    // --- fldigi cw state ---
-    private var phaseacc = 0.0
-    private var FFTphase = 0.0
-    private var FFTvalue = 0.0
-    private var smpl_ctr = 0
-
-    private var agc_peak = 1.0
-    private var noise_floor = 1.0
-    private var sig_avg = 0.0
-    private var metric = 0.0
-    private var siglevel = 0.0
-
-    private var upper_threshold = CwFldigiConstants.CW_UPPER_THRESHOLD
-    private var lower_threshold = CwFldigiConstants.CW_LOWER_THRESHOLD
-
-    private val cw_FFT_filter: CwFftFilt
-    private val bitfilter: CwMovAvg
-    private val trackingfilter: CwMovAvg
-
-    private var cw_receive_state = CwRxState.IDLE
-    private var old_cw_receive_state = CwRxState.IDLE
-
-    private var cw_rr_start_timestamp = 0
-    private var cw_rr_end_timestamp = 0
-    private var rx_rep_buf = StringBuilder()
-    private var cw_ptr = 0
-    private val cw_buffer = FloatArray(CwFldigiConstants.MAX_MORSE_ELEMENTS + 1)
-
-    private var cw_speed = initialWpm
-    private var cw_send_speed = initialWpm
-    private var cw_receive_speed = initialWpm
-    private var cw_bandwidth = CwFldigiConstants.DEFAULT_BANDWIDTH
-    private var cwTrack = true
-    private var two_dots = 0L
-    private var last_element = 0
-    private var space_sent = true
-    private var cw_noise_spike_threshold = 0L
-    private var cw_receive_dot_length = 0L
-    private var cw_receive_dash_length = 0L
-
-    private var synchscope = 50
-
-    init {
-        val bw = cw_bandwidth.toDouble() / sampleRate
-        cw_FFT_filter = CwFftFilt(bw, CwFldigiConstants.CW_FFT_SIZE)
-        val bfv = (symbollen() / (2 * CwFldigiConstants.DEC_RATIO)).coerceAtLeast(1)
-        bitfilter = CwMovAvg(bfv)
-        trackingfilter = CwMovAvg(CwFldigiConstants.TRACKING_FILTER_SIZE)
-
-        two_dots = (2 * CwFldigiConstants.KWPM / cw_speed).toLong()
-        cw_noise_spike_threshold = two_dots / 4
-        cw_receive_dot_length = (CwFldigiConstants.KWPM / cw_receive_speed).toLong()
-        cw_receive_dash_length = 3 * cw_receive_dot_length
-    }
-
-    private fun symbollen(): Int =
-        (sampleRate * 1.2 / cw_speed).roundToInt()
-
-    private fun usecDiff(earlier: Int, later: Int): Int =
-        if (earlier >= later) 0 else later - earlier
-
-    /** Main entry: feed PCM samples. */
-    fun processBuffer(buffer: FloatArray) {
-        for (sample in buffer) {
-            feedTuner(sample.toDouble())
-            rxSample(sample.toDouble())
-        }
-    }
-
-    /**
-     * Spectral peak tracking (auto-tune). Collects raw samples, runs an FFT
-     * every TUNE_FFT_SIZE samples, finds the strongest peak in the CW range
-     * and smoothly steers tuneFreq toward it — mirroring the old
-     * channelTracker behaviour so off-tune signals still decode.
-     */
-    private fun feedTuner(sample: Double) {
-        tuneBuffer[tuneIdx++] = sample
-        if (tuneIdx < TUNE_FFT_SIZE) return
-        tuneIdx = 0
-
-        // Hann window
-        for (i in 0 until TUNE_FFT_SIZE) {
-            val w = 0.5 - 0.5 * kotlin.math.cos(2.0 * Math.PI * i / (TUNE_FFT_SIZE - 1))
-            tuneWindow[i] = tuneBuffer[i] * w
-        }
-        val data = Array(TUNE_FFT_SIZE) { CwComplex(tuneWindow[it], 0.0) }
-        tuneFft.forward(data)
-
-        // Find the strongest bin in the CW range (300..1500 Hz)
-        val binMin = (TUNE_MIN_FREQ * TUNE_FFT_SIZE / sampleRate).toInt()
-        val binMax = (TUNE_MAX_FREQ * TUNE_FFT_SIZE / sampleRate).toInt()
-        var bestBin = -1
-        var bestMag = 0.0
-        var totalMag = 0.0
-        for (b in binMin..binMax) {
-            val mag = data[b].abs()
-            totalMag += mag
-            if (mag > bestMag) {
-                bestMag = mag
-                bestBin = b
-            }
-        }
-        if (bestBin < 0) return
-        val meanMag = totalMag / (binMax - binMin + 1)
-        if (bestMag < meanMag * 2.0) return // no clear tone
-        // Absolute floor: silence or weak noise must not steer the NCO.
-        // A 0.6-amplitude tone in a 512-pt Hann FFT yields peak ≈ 150;
-        // anything below ~30 is noise/DC leakage.
-        if (bestMag < 30.0) return
-
-        val peakFreq = bestBin * sampleRate.toDouble() / TUNE_FFT_SIZE
-        tunePeakFreq = peakFreq
-        tuneHasPeak = true
-        _estimatedPitch.value = peakFreq.toFloat()
-
-        // Lock fast: a strong peak on the very first frame is reliable enough
-        // (CW tones are narrow and dominate the band). Steer immediately so
-        // the first character still decodes. Do NOT reset the RX state on the
-        // first lock — the AGC adapts in a few frames and a reset would wipe
-        // the element that triggered the tune.
-        if (!tuneLocked) {
-            tuneFreq = peakFreq
-            tuneLocked = true
-            _estimatedPitch.value = peakFreq.toFloat()
-        } else {
-            // Smooth tracking; retune instantly on big jumps (signal switched freq)
-            val diff = peakFreq - tuneFreq
-            if (kotlin.math.abs(diff) > 120.0) {
-                tuneFreq = peakFreq
-                resetRxState()
-            } else {
-                tuneFreq += diff * 0.2
-            }
-        }
-    }
-
-    /** Reset only the fldigi RX state machine (keep decoded text). */
-    private fun resetRxState() {
-        cw_receive_state = CwRxState.IDLE
-        old_cw_receive_state = CwRxState.IDLE
-        smpl_ctr = 0
-        cw_ptr = 0
-        rx_rep_buf.clear()
-        last_element = 0
-        space_sent = true
-        FFTphase = 0.0
-        phaseacc = 0.0
-    }
-
-    private fun rxSample(value: Double) {
-        // NCO down-conversion (fldigi rx_FFTprocess). tuneFreq tracks the
-        // strongest spectral peak so off-tune signals still decode.
-        val z = CwComplex(
-            value * kotlin.math.cos(FFTphase),
-            value * kotlin.math.sin(FFTphase)
-        )
-        FFTphase += 2.0 * Math.PI * tuneFreq / sampleRate
-        if (FFTphase > 2.0 * Math.PI) FFTphase -= 2.0 * Math.PI
-
-        val out = cw_FFT_filter.run(z) ?: return
-        for (i in 0 until CwFldigiConstants.CW_FFT_SIZE / 2) {
-            ++smpl_ctr
-            if (smpl_ctr % CwFldigiConstants.DEC_RATIO != 0) continue
-            FFTvalue = out[i].abs()
-            FFTvalue = bitfilter.run(FFTvalue)
-            decodeStream(FFTvalue)
-        }
-    }
-
-    /**
-     * AGC + hysteresis detection (fldigi cw::decode_stream).
-     */
-    private fun decodeStream(value: Double) {
-        var v = value
-        val attack: Int
-        val decay: Int
-        when (CwFldigiConstants.CWRX_ATTACK_DEFAULT) {
-            0 -> attack = 400
-            2 -> attack = 100
-            else -> attack = 200
-        }
-        when (CwFldigiConstants.CWRX_DECAY_DEFAULT) {
-            0 -> decay = 2000
-            2 -> decay = 500
-            else -> decay = 1000
-        }
-
-        sig_avg = decayAvg(sig_avg, v, decay)
-
-        if (v < sig_avg) {
-            noise_floor = if (v < noise_floor) decayAvg(noise_floor, v, attack)
-            else decayAvg(noise_floor, v, decay)
-        }
-        if (v > sig_avg) {
-            agc_peak = if (v > agc_peak) decayAvg(agc_peak, v, attack)
-            else decayAvg(agc_peak, v, decay)
-        }
-
-        val normNoise = noise_floor / agc_peak
-        val normSig = sig_avg / agc_peak
-        siglevel = normSig
-
-        if (agc_peak != 0.0) v /= agc_peak else v = 0.0
-
-        metric = 0.8 * metric
-        if ((noise_floor > 1e-4) && (noise_floor < sig_avg)) {
-            val db = 20.0 * log10(sig_avg / noise_floor)
-            metric += 0.2 * clamp(2.5 * db, 0.0, 100.0)
-        }
-
-        val diff = normSig - normNoise
-        upper_threshold = normSig - 0.2 * diff
-        lower_threshold = normNoise + 0.7 * diff
-
-        // Squelch gate (fldigi: !progStatus.sqlonoff || metric > sldrSquelchValue).
-        // Default sqlonoff=true, sldrSquelchValue=5.0. Without this gate, noise
-        // spikes false-trigger KEYDOWN and lock the state machine in IN_TONE.
-        if (sqlonoff && metric <= squelchValue) return
-
-        // Power detection using hysteresis
-        if ((v > upper_threshold) && (cw_receive_state != CwRxState.IN_TONE)) {
-            handleEvent(CW_KEYDOWN)
-        }
-        if ((v < lower_threshold) && (cw_receive_state == CwRxState.IN_TONE)) {
-            handleEvent(CW_KEYUP)
-        }
-
-        if (handleEvent(CW_QUERY) == CW_SUCCESS) {
-            synchscope = 100
-            // emit decoded char(s)
-        } else if (--synchscope == 0) {
-            synchscope = 25
-        }
-    }
-
-    private var sqlonoff = true
-    private var squelchValue = 5.0
-
-    private fun decayAvg(avg: Double, value: Double, timeConst: Int): Double =
-        avg + (value - avg) / timeConst
-
-    private fun clamp(v: Double, lo: Double, hi: Double): Double =
-        if (v < lo) lo else if (v > hi) hi else v
-
-    private fun handleEvent(event: Int): Int {
-        val sc = StringBuilder()
-        var elementUsec: Int
-        when (event) {
-            CW_RESET -> {
-                syncParameters()
-                cw_receive_state = CwRxState.IDLE
-                cw_ptr = 0
-                smpl_ctr = 0
-                rx_rep_buf.clear()
-            }
-            CW_KEYDOWN -> {
-                if (cw_receive_state == CwRxState.IN_TONE) return CW_ERROR
-                if (cw_receive_state == CwRxState.IDLE) {
-                    smpl_ctr = 0
-                    rx_rep_buf.clear()
-                    cw_ptr = 0
-                }
-                cw_rr_start_timestamp = smpl_ctr
-                old_cw_receive_state = cw_receive_state
-                cw_receive_state = CwRxState.IN_TONE
-                return CW_ERROR
-            }
-            CW_KEYUP -> {
-                if (cw_receive_state != CwRxState.IN_TONE) return CW_ERROR
-                cw_rr_end_timestamp = smpl_ctr
-                elementUsec = usecDiff(cw_rr_start_timestamp, cw_rr_end_timestamp)
-                syncParameters()
-                if (cw_noise_spike_threshold > 0 && elementUsec < cw_noise_spike_threshold) {
-                    cw_receive_state = CwRxState.IDLE
-                    return CW_ERROR
-                }
-
-                // adaptive speed tracking on dot-dash / dash-dot pairs
-                if (last_element > 0) {
-                    if ((elementUsec > 2 * last_element) && (elementUsec < 4 * last_element)) {
-                        updateTracking(last_element, elementUsec)
-                    }
-                    if ((last_element > 2 * elementUsec) && (last_element < 4 * elementUsec)) {
-                        updateTracking(elementUsec, last_element)
-                    }
-                }
-                last_element = elementUsec
-
-                if (elementUsec <= two_dots) {
-                    rx_rep_buf.append(CW_DOT)
-                    cw_buffer[cw_ptr++] = last_element.toFloat()
-                } else {
-                    rx_rep_buf.append(CW_DASH)
-                    cw_buffer[cw_ptr++] = last_element.toFloat()
-                }
-
-                if (rx_rep_buf.length > CwFldigiConstants.MAX_MORSE_ELEMENTS) {
-                    cw_receive_state = CwRxState.IDLE
-                    cw_ptr = 0
-                    smpl_ctr = 0
-                    return CW_ERROR
-                } else {
-                    if (cw_ptr < cw_buffer.size) cw_buffer[cw_ptr] = 0.0f
-                }
-                cw_receive_state = CwRxState.AFTER_TONE
-                return CW_ERROR
-            }
-            CW_QUERY -> {
-                if (cw_receive_state == CwRxState.IN_TONE) return CW_ERROR
-                syncParameters()
-                elementUsec = usecDiff(cw_rr_end_timestamp, smpl_ctr)
-                if (elementUsec < (2 * cw_receive_dot_length)) return CW_ERROR
-
-                if (elementUsec >= (2 * cw_receive_dot_length) &&
-                    elementUsec <= (4 * cw_receive_dot_length) &&
-                    cw_receive_state == CwRxState.AFTER_TONE
-                ) {
-                    val pattern = rx_rep_buf.toString()
-                    val decoded = if (useSom) {
-                        findWinner(cw_buffer, two_dots)
-                    } else {
-                        MorseTable.rxLookup(pattern)
-                    }
-                    if (decoded.isNotEmpty()) {
-                        appendDecoded(decoded)
-                    }
-                    rx_rep_buf.clear()
-                    cw_receive_state = CwRxState.IDLE
-                    space_sent = false
-                    cw_ptr = 0
-                    return CW_SUCCESS
-                }
-
-                if ((elementUsec > (4 * cw_receive_dot_length)) && !space_sent) {
-                    appendDecoded(" ")
-                    space_sent = true
-                    return CW_SUCCESS
-                }
-                return CW_ERROR
-            }
-        }
-        return CW_ERROR
-    }
-
-    private fun appendDecoded(text: String) {
-        val current = _decodedTextFlow.value
-        _decodedTextFlow.value = if (current.length > 2000) {
-            current.drop(current.length - 1500) + text
-        } else {
-            current + text
-        }
-        _signalStrength.value = metric.toFloat() / 100f
-        _estimatedSpeed.value = (CwFldigiConstants.KWPM.toDouble() / (two_dots / 2.0)).toFloat()
-    }
-
-    private fun syncParameters() {
-        if (cwTrack) {
-            cw_receive_speed = (CwFldigiConstants.KWPM / (two_dots / 2)).toInt()
-        } else {
-            cw_receive_speed = cw_send_speed
-            two_dots = 2 * (CwFldigiConstants.KWPM / cw_send_speed).toLong()
-        }
-
-        if (cw_receive_speed > 0) {
-            cw_receive_dot_length = (CwFldigiConstants.KWPM / cw_receive_speed).toLong()
-        } else {
-            cw_receive_dot_length = (CwFldigiConstants.KWPM / 5).toLong()
-        }
-        cw_receive_dash_length = 3 * cw_receive_dot_length
-        cw_noise_spike_threshold = cw_receive_dot_length / 2
-    }
-
-    private fun updateTracking(dur1: Int, dur2: Int) {
-        val minDot = CwFldigiConstants.KWPM / 200
-        val maxDash = 3 * CwFldigiConstants.KWPM / 5
-        if ((dur1 > dur2) && (dur1 > 4 * dur2)) return
-        if ((dur2 > dur1) && (dur2 > 4 * dur1)) return
-        if (dur1 < minDot || dur2 < minDot) return
-        if (dur2 > maxDash || dur2 > maxDash) return
-
-        two_dots = trackingfilter.run(((dur1 + dur2) / 2).toDouble()).toLong()
-        syncParameters()
-    }
-
-    /**
-     * SOM codebook matching (fldigi cw::find_winner + normalize).
-     */
-    private fun findWinner(inbuf: FloatArray, twodots: Long): String {
-        if (normalize(inbuf, twodots) == 0) return " "
-
-        var winner = -1
-        var bestDiff = Double.MAX_VALUE
-        for ((idx, entry) in SomTable.table.withIndex()) {
-            var difference = 0.0
-            for (i in 0 until CwFldigiConstants.WGT_SIZE) {
-                val diff = inbuf[i] - entry.weights[i]
-                difference += diff * diff
-                if (difference > bestDiff) break
-            }
-            if (difference < bestDiff) {
-                winner = idx
-                bestDiff = difference
-            }
-        }
-
-        if (winner >= 0 && SomTable.table[winner].pattern.isNotEmpty()) {
-            val sc = MorseTable.rxLookup(SomTable.table[winner].pattern)
-            return if (sc.isNotEmpty()) sc else CwFldigiConstants.DEFAULT_NOISE_CHAR.toString()
-        }
-        return CwFldigiConstants.DEFAULT_NOISE_CHAR.toString()
-    }
-
-    private fun normalize(v: FloatArray, twodots: Long): Int {
-        var max = v[0]
-        var min = v[0]
-        for (j in 1 until CwFldigiConstants.WGT_SIZE) {
-            if (v[j] > max) max = v[j]
-            else if (v[j] < min) min = v[j]
-        }
-        if (max == 0.0f) return 0
-
-        val ratio = if (max > twodots) 1.0f else 0.33f
-        val scale = ratio / max
-        for (j in 0 until CwFldigiConstants.WGT_SIZE) v[j] *= scale
-        return 1
-    }
-
-    /** Reset the decoder state (fldigi cw::rx_init + reset). */
-    fun resetDecoder() {
-        cw_receive_state = CwRxState.IDLE
-        smpl_ctr = 0
-        cw_ptr = 0
-        rx_rep_buf.clear()
-        last_element = 0
-        space_sent = true
-        _decodedTextFlow.value = ""
-        _signalStrength.value = 0f
-        _estimatedSpeed.value = null
-        FFTphase = 0.0
-        phaseacc = 0.0
-        // reset auto-tune
-        tuneIdx = 0
-        tunePeakFreq = frequency
-        tuneHasPeak = false
-        tuneLocked = false
-        tuneFreq = frequency
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwFldigiDsp.kt

@@ -1,183 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * Constants and primitives ported from fldigi (w1hkj/fldigi),
- * GPL v3, cw.h / cw.cxx / filters.cxx / fftfilt.cxx.
- *
- * Faithful port: identifiers and formulas mirror the C++ original so
- * behaviour matches the desktop decoder bit-for-bit.
- */
-internal object CwFldigiConstants {
-    const val CW_SAMPLERATE = 8000
-    const val DEC_RATIO = 16
-    const val CW_FFT_SIZE = 2048 // must be power of 2
-    const val MAX_MORSE_ELEMENTS = 6
-    const val WGT_SIZE = 7
-    const val TRACKING_FILTER_SIZE = 16
-    const val MAX_PIPE_SIZE = (22 * CW_SAMPLERATE * 12 / 800)
-    const val CLRCOUNT = 16
-    const val CW_MAX_SPEED = 50
-    const val INITIAL_SEND_SPEED = 18
-    const val INITIAL_RECEIVE_SPEED = 18
-
-    /** # samples in a dot: KWPM / WPM. fldigi: KWPM = 12 * samplerate / 10 */
-    const val KWPM = 12 * CW_SAMPLERATE / 10
-
-    const val CW_SUCCESS = 0
-    const val CW_ERROR = -1
-
-    // Defaults mirroring fldigi progdefaults
-    const val DEFAULT_SPEED = 18 // WPM
-    const val DEFAULT_BANDWIDTH = 150 // Hz
-    const val DEFAULT_RANGE = 10 // WPM tracking range
-    const val LOWER_LIMIT = 5 // WPM
-    const val UPPER_LIMIT = 50 // WPM
-    const val DEFAULT_NOISE_CHAR = '*'
-    const val CWRX_ATTACK_DEFAULT = 1 // medium
-    const val CWRX_DECAY_DEFAULT = 1 // medium
-    const val CW_LOWER_THRESHOLD = 0.4
-    const val CW_UPPER_THRESHOLD = 0.6
-}
-
-/**
- * Moving average filter, ported from fldigi Cmovavg (filters.cxx).
- */
-internal class CwMovAvg(private var len: Int) {
-    private val buf = DoubleArray(MAX_MOVAVG)
-    private var out = 0.0
-    private var pint = 0
-    private var empty = true
-
-    fun run(a: Double): Double {
-        if (empty) {
-            empty = false
-            out = 0.0
-            for (i in 0 until len) {
-                buf[i] = a
-                out += a
-            }
-            pint = 0
-            return a
-        }
-        out = out - buf[pint] + a
-        buf[pint] = a
-        if (++pint >= len) pint = 0
-        return out / len
-    }
-
-    fun setLength(newLen: Int) {
-        len = newLen.coerceAtMost(MAX_MOVAVG).coerceAtLeast(1)
-        empty = true
-    }
-
-    fun reset() {
-        empty = true
-    }
-
-    fun value(): Double = if (len > 0) out / len else 0.0
-
-    private companion object {
-        const val MAX_MOVAVG = 2048
-    }
-}
-
-/**
- * Complex sample used by the FFT filter chain.
- */
-internal data class CwComplex(var re: Double = 0.0, var im: Double = 0.0) {
-    operator fun timesAssign(other: CwComplex) {
-        val r = re * other.re - im * other.im
-        val i = re * other.im + im * other.re
-        re = r; im = i
-    }
-
-    fun abs(): Double = kotlin.math.sqrt(re * re + im * im)
-}
-
-/**
- * In-place radix-2 complex FFT, ported from fldigi gfft.h semantics
- * (ComplexFFT / InverseComplexFFT, forward = -1).
- */
-internal class CwGfft(private val n: Int) {
-    init {
-        require(n > 0 && n and (n - 1) == 0) { "FFT size must be power of 2, got $n" }
-    }
-
-    private val rev = IntArray(n)
-
-    init {
-        val log2n = Integer.numberOfTrailingZeros(n)
-        for (i in 0 until n) {
-            var r = 0
-            var x = i
-            for (bit in 0 until log2n) {
-                r = (r shl 1) or (x and 1)
-                x = x shr 1
-            }
-            rev[i] = r
-        }
-    }
-
-    /**
-     * In-place complex FFT.
-     * @param data array of CwComplex, size n
-     * @param inverse if true, performs inverse transform (no 1/n scaling; caller divides)
-     */
-    fun transform(data: Array<CwComplex>, inverse: Boolean) {
-        val sign = if (inverse) 1 else -1
-
-        // bit reversal permutation
-        for (i in 0 until n) {
-            val j = rev[i]
-            if (j > i) {
-                val t = data[i]; data[i] = data[j]; data[j] = t
-            }
-        }
-
-        var len = 2
-        while (len <= n) {
-            val ang = sign * 2.0 * Math.PI / len
-            val wRe = Math.cos(ang)
-            val wIm = Math.sin(ang)
-            var i = 0
-            while (i < n) {
-                var curRe = 1.0
-                var curIm = 0.0
-                for (j in 0 until len / 2) {
-                    val u = data[i + j]
-                    val v = data[i + j + len / 2]
-                    val tRe = curRe * v.re - curIm * v.im
-                    val tIm = curRe * v.im + curIm * v.re
-                    data[i + j] = CwComplex(u.re + tRe, u.im + tIm)
-                    data[i + j + len / 2] = CwComplex(u.re - tRe, u.im - tIm)
-                    val nRe = curRe * wRe - curIm * wIm
-                    val nIm = curRe * wIm + curIm * wRe
-                    curRe = nRe; curIm = nIm
-                }
-                i += len
-            }
-            len = len shl 1
-        }
-    }
-
-    fun forward(data: Array<CwComplex>) = transform(data, false)
-
-    fun inverse(data: Array<CwComplex>) = transform(data, true)
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwGoertzel.kt

@@ -1,54 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import kotlin.math.cos
-import kotlin.math.sqrt
-
-/**
- * Running Goertzel filter for CW tone detection.
- * Tracks a specific frequency over time with a sliding window.
- * Ported from ggmorse/src/goertzel.h
- */
-internal class CwGoertzel {
-    private var s1 = 0.0
-    private var s2 = 0.0
-    private var coeff = 0.0
-
-    fun init(sampleRate: Float, targetFreq: Float) {
-        val omega = 2.0 * kotlin.math.PI * targetFreq / sampleRate
-        coeff = 2.0 * cos(omega)
-        s1 = 0.0
-        s2 = 0.0
-    }
-
-    fun process(sample: Float) {
-        val s0 = sample.toDouble() + coeff * s1 - s2
-        s2 = s1
-        s1 = s0
-    }
-
-    fun getPower(): Float {
-        return sqrt(s2 * s2 + s1 * s1 - coeff * s1 * s2).toFloat()
-    }
-
-    fun reset() {
-        s1 = 0.0
-        s2 = 0.0
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwResampler.kt

@@ -1,53 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * Simple linear resampler.
- * Downsamples from input sample rate to output sample rate.
- * Ported from ggmorse/src/resampler.h
- */
-internal class CwResampler(private val inputRate: Float, private val outputRate: Float) {
-    private val ratio = inputRate / outputRate
-    private var lastSample = 0f
-
-    fun process(input: FloatArray): FloatArray {
-        if (ratio <= 0f || input.isEmpty()) return input
-        val outputLen = (input.size / ratio).toInt() + 1
-        val output = FloatArray(outputLen)
-        var idx = 0f
-        for (i in output.indices) {
-            val intIdx = idx.toInt()
-            val frac = idx - intIdx
-            if (intIdx + 1 < input.size) {
-                output[i] = input[intIdx] * (1 - frac) + input[intIdx + 1] * frac
-            } else if (intIdx < input.size) {
-                output[i] = input[intIdx] * (1 - frac) + lastSample * frac
-            } else {
-                output[i] = lastSample
-            }
-            idx += ratio
-        }
-        lastSample = input.lastOrNull() ?: lastSample
-        return output
-    }
-
-    fun reset() {
-        lastSample = 0f
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwSTFFT.kt

@@ -1,61 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import kotlin.math.cos
-import kotlin.math.sin
-import kotlin.math.sqrt
-
-/**
- * Lightweight pitch detector using DFT at specific frequency bins.
- * Only scans [200, 1200] Hz in configurable steps — much faster than full FFT.
- * Ported from ggmorse/src/stfft.h (simplified for CW use case).
- */
-internal class CwPitchDetector(
-    private val sampleRate: Float,
-    private val minFreq: Float = 200f,
-    private val maxFreq: Float = 1200f,
-    private val stepHz: Float = 10f
-) {
-    /**
-     * Find the dominant pitch frequency in the buffer.
-     * Returns null if no significant pitch found.
-     */
-    fun findPitch(buffer: FloatArray): Float? {
-        if (buffer.isEmpty()) return null
-        var bestFreq = 0f
-        var bestPower = 0f
-        var freq = minFreq
-        while (freq <= maxFreq) {
-            var real = 0.0
-            var imag = 0.0
-            val omega = 2.0 * kotlin.math.PI * freq / sampleRate
-            for (i in buffer.indices) {
-                real += buffer[i] * cos(omega * i)
-                imag += buffer[i] * -sin(omega * i)
-            }
-            val power = (real * real + imag * imag).toFloat()
-            if (power > bestPower) {
-                bestPower = power
-                bestFreq = freq
-            }
-            freq += stepHz
-        }
-        return if (bestPower > 0.001f) bestFreq else null
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwSpectrogram.kt

@@ -1,170 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * Sliding-window spectrogram for CW decoding.
- * Maintains a time-frequency matrix updated with each audio frame.
- *
- * FFT size: 256, hop size: 64, sample rate: 4000 (or native)
- * Frequency bins: 6..38 (187-1187 Hz, covers typical CW range)
- * History: 40 columns (320 ms window)
- * Time resolution: 64/4000 = 16 ms, Frequency resolution: 4000/256 = 15.625 Hz
- */
-internal class CwSpectrogram(
-    private val fftSize: Int = 256,
-    private val hopSize: Int = 64,
-    private val sampleRate: Int = 4000,
-    private val minBin: Int = 6,
-    private val maxBin: Int = 38,
-    val historyCols: Int = 40
-) {
-    private val fft = CwFFT(fftSize)
-    val numBins: Int get() = maxBin - minBin + 1
-
-    // Hanning window
-    private val hanning = FloatArray(fftSize) {
-        (0.5 - 0.5 * kotlin.math.cos(2.0 * kotlin.math.PI * it / (fftSize - 1))).toFloat()
-    }
-
-    // Spectrogram data: [timeCol][freqBin]
-    private val spectrogram = Array(historyCols) { FloatArray(numBins) }
-    private var currentCol = 0
-    private var samplesBuffered = 0
-    private val buffer = FloatArray(fftSize)
-
-    // Per-bin running energy for normalization
-    private val binEnergy = FloatArray(numBins) { 1f }
-    private val alpha = 0.95f
-
-    // Counter for new columns generated since last check
-    private var newColumnCount = 0
-
-    /** Add audio samples, compute FFTs for each complete hop. */
-    fun addSamples(samples: FloatArray) {
-        var offset = 0
-        while (offset < samples.size) {
-            val needed = fftSize - samplesBuffered
-            val copyLen = minOf(needed, samples.size - offset)
-            System.arraycopy(samples, offset, buffer, samplesBuffered, copyLen)
-            samplesBuffered += copyLen
-            offset += copyLen
-
-            if (samplesBuffered >= fftSize) {
-                processFrame()
-                newColumnCount++
-                // Shift buffer: keep last (fftSize - hopSize) samples
-                System.arraycopy(buffer, hopSize, buffer, 0, fftSize - hopSize)
-                samplesBuffered = fftSize - hopSize
-            }
-        }
-    }
-
-    /** Get number of new columns generated since the last call to this method. */
-    fun getNewColumns(): Int {
-        val count = newColumnCount
-        newColumnCount = 0
-        return count
-    }
-
-    private fun processFrame() {
-        // Apply Hanning window
-        val windowed = FloatArray(fftSize) { buffer[it] * hanning[it] }
-
-        // Compute FFT magnitude spectrum
-        val mag = fft.magnitudeSpectrum(windowed)
-
-        // Update spectrogram column
-        val col = spectrogram[currentCol]
-        for (b in 0 until numBins) {
-            val binIdx = minBin + b
-            val rawMag = mag[binIdx]
-            // Running energy normalization
-            binEnergy[b] = alpha * binEnergy[b] + (1 - alpha) * rawMag
-            col[b] = if (binEnergy[b] > 1e-6f) rawMag / binEnergy[b] else 0f
-        }
-
-        currentCol = (currentCol + 1) % historyCols
-    }
-
-    /** Get the current spectrogram as a 2D array in chronological order. */
-    fun getSpectrogram(): Array<FloatArray> {
-        val result = Array(historyCols) { i ->
-            val srcIdx = (currentCol + i) % historyCols
-            spectrogram[srcIdx].copyOf()
-        }
-        return result
-    }
-
-    /** Get the most recent column (current energy across all frequencies). */
-    fun getCurrentColumn(): FloatArray {
-        val prevCol = (currentCol - 1 + historyCols) % historyCols
-        return spectrogram[prevCol].copyOf()
-    }
-
-    /** Get a column by index from the history (0 = oldest, historyCols-1 = newest). */
-    fun getColumn(index: Int): FloatArray {
-        val clamped = index.coerceIn(0, historyCols - 1)
-        val srcIdx = (currentCol - historyCols + clamped + historyCols) % historyCols
-        return spectrogram[srcIdx].copyOf()
-    }
-
-    /** Find the frequency bin with peak energy. Returns -1 if no significant signal. */
-    fun findPeakBin(): Int {
-        val col = getCurrentColumn()
-        var maxBin = -1
-        var maxVal = 0f
-        for (i in col.indices) {
-            if (col[i] > maxVal) {
-                maxVal = col[i]
-                maxBin = i
-            }
-        }
-        return if (maxVal > 0.3f) maxBin else -1
-    }
-
-    /** Get energy at a specific bin over the last N columns in chronological order. */
-    fun getBinEnergy(bin: Int, numCols: Int): FloatArray {
-        val clamped = minOf(numCols, historyCols)
-        val result = FloatArray(clamped)
-        for (i in 0 until clamped) {
-            val colIdx = (currentCol - clamped + i + historyCols) % historyCols
-            result[i] = spectrogram[colIdx][bin]
-        }
-        return result
-    }
-
-    /** Get the bin index for a frequency in Hz. */
-    fun freqToBin(freqHz: Float): Int {
-        val bin = (freqHz * fftSize / sampleRate).toInt()
-        return (bin - minBin).coerceIn(0, numBins - 1)
-    }
-
-    /** Get the center frequency for a bin. */
-    fun binToFreq(bin: Int): Float {
-        return (minBin + bin).toFloat() * sampleRate / fftSize
-    }
-
-    fun reset() {
-        for (col in spectrogram) col.fill(0f)
-        currentCol = 0
-        samplesBuffered = 0
-        buffer.fill(0f)
-        binEnergy.fill(1f)
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/MorseTable.kt

@@ -1,140 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * Morse code lookup table, ported from fldigi morse.cxx (cMorse::cw_table).
- * Each entry: [enabled, displayChar, prosignDisplay, dotDashPattern].
- */
-internal object MorseTable {
-
-    private data class Entry(
-        val enabled: Boolean,
-        val chr: String,
-        val prt: String,
-        val rpr: String
-    )
-
-    private val table = listOf(
-        // Prosigns
-        Entry(true, "=", "<BT>", "-...-"),
-        Entry(false, "~", "<AA>", ".-.-"),
-        Entry(true, "<", "<AS>", ".-..."),
-        Entry(true, ">", "<AR>", ".-.-."),
-        Entry(true, "%", "<SK>", "...-.-"),
-        Entry(true, "+", "<KN>", "-.--."),
-        Entry(true, "&", "<INT>", "..-.-"),
-        Entry(true, "{", "<HM>", "....--"),
-        Entry(true, "}", "<VE>", "...-."),
-        // ASCII 7-bit letters
-        Entry(true, "A", "A", ".-"),
-        Entry(true, "B", "B", "-..."),
-        Entry(true, "C", "C", "-.-."),
-        Entry(true, "D", "D", "-.."),
-        Entry(true, "E", "E", "."),
-        Entry(true, "F", "F", "..-."),
-        Entry(true, "G", "G", "--."),
-        Entry(true, "H", "H", "...."),
-        Entry(true, "I", "I", ".."),
-        Entry(true, "J", "J", ".---"),
-        Entry(true, "K", "K", "-.-"),
-        Entry(true, "L", "L", ".-.."),
-        Entry(true, "M", "M", "--"),
-        Entry(true, "N", "N", "-."),
-        Entry(true, "O", "O", "---"),
-        Entry(true, "P", "P", ".--."),
-        Entry(true, "Q", "Q", "--.-"),
-        Entry(true, "R", "R", ".-."),
-        Entry(true, "S", "S", "..."),
-        Entry(true, "T", "T", "-"),
-        Entry(true, "U", "U", "..-"),
-        Entry(true, "V", "V", "...-"),
-        Entry(true, "W", "W", ".--"),
-        Entry(true, "X", "X", "-..-"),
-        Entry(true, "Y", "Y", "-.--"),
-        Entry(true, "Z", "Z", "--.."),
-        // lowercase map to uppercase
-        Entry(true, "a", "A", ".-"), Entry(true, "b", "B", "-..."),
-        Entry(true, "c", "C", "-.-."), Entry(true, "d", "D", "-.."),
-        Entry(true, "e", "E", "."), Entry(true, "f", "F", "..-."),
-        Entry(true, "g", "G", "--."), Entry(true, "h", "H", "...."),
-        Entry(true, "i", "I", ".."), Entry(true, "j", "J", ".---"),
-        Entry(true, "k", "K", "-.-"), Entry(true, "l", "L", ".-.."),
-        Entry(true, "m", "M", "--"), Entry(true, "n", "N", "-."),
-        Entry(true, "o", "O", "---"), Entry(true, "p", "P", ".--."),
-        Entry(true, "q", "Q", "--.-"), Entry(true, "r", "R", ".-."),
-        Entry(true, "s", "S", "..."), Entry(true, "t", "T", "-"),
-        Entry(true, "u", "U", "..-"), Entry(true, "v", "V", "...-"),
-        Entry(true, "w", "W", ".--"), Entry(true, "x", "X", "-..-"),
-        Entry(true, "y", "Y", "-.--"), Entry(true, "z", "Z", "--.."),
-        // Numerals
-        Entry(true, "0", "0", "-----"),
-        Entry(true, "1", "1", ".----"),
-        Entry(true, "2", "2", "..---"),
-        Entry(true, "3", "3", "...--"),
-        Entry(true, "4", "4", "....-"),
-        Entry(true, "5", "5", "....."),
-        Entry(true, "6", "6", "-...."),
-        Entry(true, "7", "7", "--..."),
-        Entry(true, "8", "8", "---.."),
-        Entry(true, "9", "9", "----."),
-        // Punctuation
-        Entry(true, "\\", "\\", ".-..-."),
-        Entry(true, "'", "'", ".----."),
-        Entry(true, "$", "$", "...-..-"),
-        Entry(true, "(", "(", "-.--."),
-        Entry(true, ")", ")", "-.--.-"),
-        Entry(true, ",", ",", "--..--"),
-        Entry(true, "-", "-", "-....-"),
-        Entry(true, ".", ".", ".-.-.-"),
-        Entry(true, "/", "/", "-..-."),
-        Entry(true, ":", ":", "---..."),
-        Entry(true, ";", ";", "-.-.-."),
-        Entry(true, "?", "?", "..--.."),
-        Entry(true, "_", "_", "..--.-"),
-        Entry(true, "@", "@", ".--.-."),
-        Entry(true, "!", "!", "-.-.--"),
-        // Accented (disabled by default in fldigi)
-        Entry(false, "Ä", "Ä", ".-.-"), Entry(false, "ä", "Ä", ".-.-"),
-        Entry(false, "Æ", "Æ", ".-.-"), Entry(false, "æ", "Æ", ".-.-"),
-        Entry(false, "Å", "Å", ".--.-"), Entry(false, "å", "Å", ".--.-"),
-        Entry(false, "Ç", "Ç", "-.-.."), Entry(false, "ç", "Ç", "-.-.."),
-        Entry(false, "È", "È", ".-..-"), Entry(false, "è", "È", ".-..-"),
-        Entry(false, "É", "É", "..-.."), Entry(false, "é", "É", "..-.."),
-        Entry(false, "Ó", "Ó", "---."), Entry(false, "ó", "Ó", "---."),
-        Entry(false, "Ö", "Ö", "---."), Entry(false, "ö", "Ö", "---."),
-        Entry(false, "Ø", "Ø", "---."), Entry(false, "ø", "Ø", "---."),
-        Entry(false, "Ñ", "Ñ", "--.--"), Entry(false, "ñ", "Ñ", "--.--"),
-        Entry(false, "Ü", "Ü", "..--"), Entry(false, "ü", "Ü", "..--"),
-        Entry(false, "Û", "Û", "..--"), Entry(false, "û", "Û", "..--")
-    )
-
-    /**
-     * Look up the display representation of a dot-dash pattern.
-     * Returns "" when the pattern is not in the table or is disabled.
-     * Mirror of cMorse::rx_lookup.
-     */
-    fun rxLookup(pattern: String): String {
-        for (e in table) {
-            if (pattern == e.rpr) {
-                if (e.enabled) return e.prt
-            }
-        }
-        return ""
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/SomTable.kt

@@ -1,104 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * Self-Organizing Map codebook for CW character matching, ported from
- * fldigi cw.cxx (cw::som_table). Each row is a dot/dash weight vector
- * (0 = element absent, 0.33 = dot, 1.0 = dash).
- */
-internal object SomTable {
-
-    data class SomEntry(val pattern: String, val weights: FloatArray)
-
-    val table: List<SomEntry> = listOf(
-        // Prosigns
-        SomEntry("-...-", floatArrayOf(1.0f, 0.33f, 0.33f, 0.33f, 1.0f, 0f, 0f)),
-        SomEntry(".-.-", floatArrayOf(0.33f, 1.0f, 0.33f, 1.0f, 0f, 0f, 0f)),
-        SomEntry(".-...", floatArrayOf(0.33f, 1.0f, 0.33f, 0.33f, 0.33f, 0f, 0f)),
-        SomEntry(".-.-.", floatArrayOf(0.33f, 1.0f, 0.33f, 1.0f, 0.33f, 0f, 0f)),
-        SomEntry("...-.-", floatArrayOf(0.33f, 0.33f, 0.33f, 1.0f, 0.33f, 1.0f, 0f)),
-        SomEntry("-.--.", floatArrayOf(1.0f, 0.33f, 1.0f, 1.0f, 0.33f, 0f, 0f)),
-        SomEntry("..-.-", floatArrayOf(0.33f, 0.33f, 1.0f, 0.33f, 1.0f, 0f, 0f)),
-        SomEntry("....--", floatArrayOf(0.33f, 0.33f, 0.33f, 0.33f, 1.0f, 1.0f, 0f)),
-        SomEntry("...-.", floatArrayOf(0.33f, 0.33f, 0.33f, 1.0f, 0.33f, 0f, 0f)),
-        // ASCII 7-bit letters
-        SomEntry(".-", floatArrayOf(0.33f, 1.0f, 0f, 0f, 0f, 0f, 0f)),
-        SomEntry("-...", floatArrayOf(1.0f, 0.33f, 0.33f, 0.33f, 0f, 0f, 0f)),
-        SomEntry("-.-.", floatArrayOf(1.0f, 0.33f, 1.0f, 0.33f, 0f, 0f, 0f)),
-        SomEntry("-..", floatArrayOf(1.0f, 0.33f, 0.33f, 0f, 0f, 0f, 0f)),
-        SomEntry(".", floatArrayOf(0.33f, 0f, 0f, 0f, 0f, 0f, 0f)),
-        SomEntry("..-.", floatArrayOf(0.33f, 0.33f, 1.0f, 0.33f, 0f, 0f, 0f)),
-        SomEntry("--.", floatArrayOf(1.0f, 1.0f, 0.33f, 0f, 0f, 0f, 0f)),
-        SomEntry("....", floatArrayOf(0.33f, 0.33f, 0.33f, 0.33f, 0f, 0f, 0f)),
-        SomEntry("..", floatArrayOf(0.33f, 0.33f, 0f, 0f, 0f, 0f, 0f)),
-        SomEntry(".---", floatArrayOf(0.33f, 1.0f, 1.0f, 1.0f, 0f, 0f, 0f)),
-        SomEntry("-.-", floatArrayOf(1.0f, 0.33f, 1.0f, 0f, 0f, 0f, 0f)),
-        SomEntry(".-..", floatArrayOf(0.33f, 1.0f, 0.33f, 0.33f, 0f, 0f, 0f)),
-        SomEntry("--", floatArrayOf(1.0f, 1.0f, 0f, 0f, 0f, 0f, 0f)),
-        SomEntry("-.", floatArrayOf(1.0f, 0.33f, 0f, 0f, 0f, 0f, 0f)),
-        SomEntry("---", floatArrayOf(1.0f, 1.0f, 1.0f, 0f, 0f, 0f, 0f)),
-        SomEntry(".--.", floatArrayOf(0.33f, 1.0f, 1.0f, 0.33f, 0f, 0f, 0f)),
-        SomEntry("--.-", floatArrayOf(1.0f, 1.0f, 0.33f, 1.0f, 0f, 0f, 0f)),
-        SomEntry(".-.", floatArrayOf(0.33f, 1.0f, 0.33f, 0f, 0f, 0f, 0f)),
-        SomEntry("...", floatArrayOf(0.33f, 0.33f, 0.33f, 0f, 0f, 0f, 0f)),
-        SomEntry("-", floatArrayOf(1.0f, 0f, 0f, 0f, 0f, 0f, 0f)),
-        SomEntry("..-", floatArrayOf(0.33f, 0.33f, 1.0f, 0f, 0f, 0f, 0f)),
-        SomEntry("...-", floatArrayOf(0.33f, 0.33f, 0.33f, 1.0f, 0f, 0f, 0f)),
-        SomEntry(".--", floatArrayOf(0.33f, 1.0f, 1.0f, 0f, 0f, 0f, 0f)),
-        SomEntry("-..-", floatArrayOf(1.0f, 0.33f, 0.33f, 1.0f, 0f, 0f, 0f)),
-        SomEntry("-.--", floatArrayOf(1.0f, 0.33f, 1.0f, 1.0f, 0f, 0f, 0f)),
-        SomEntry("--..", floatArrayOf(1.0f, 1.0f, 0.33f, 0.33f, 0f, 0f, 0f)),
-        // Numerals
-        SomEntry("-----", floatArrayOf(1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0f, 0f)),
-        SomEntry(".----", floatArrayOf(0.33f, 1.0f, 1.0f, 1.0f, 1.0f, 0f, 0f)),
-        SomEntry("..---", floatArrayOf(0.33f, 0.33f, 1.0f, 1.0f, 1.0f, 0f, 0f)),
-        SomEntry("...--", floatArrayOf(0.33f, 0.33f, 0.33f, 1.0f, 1.0f, 0f, 0f)),
-        SomEntry("....-", floatArrayOf(0.33f, 0.33f, 0.33f, 0.33f, 1.0f, 0f, 0f)),
-        SomEntry(".....", floatArrayOf(0.33f, 0.33f, 0.33f, 0.33f, 0.33f, 0f, 0f)),
-        SomEntry("-....", floatArrayOf(1.0f, 0.33f, 0.33f, 0.33f, 0.33f, 0f, 0f)),
-        SomEntry("--...", floatArrayOf(1.0f, 1.0f, 0.33f, 0.33f, 0.33f, 0f, 0f)),
-        SomEntry("---..", floatArrayOf(1.0f, 1.0f, 1.0f, 0.33f, 0.33f, 0f, 0f)),
-        SomEntry("----.", floatArrayOf(1.0f, 1.0f, 1.0f, 1.0f, 0.33f, 0f, 0f)),
-        // Punctuation
-        SomEntry(".-..-.", floatArrayOf(0.33f, 1.0f, 0.33f, 0.33f, 1.0f, 0.33f, 0f)),
-        SomEntry(".----.", floatArrayOf(0.33f, 1.0f, 1.0f, 1.0f, 1.0f, 0.33f, 0f)),
-        SomEntry("...-..-", floatArrayOf(0.33f, 0.33f, 0.33f, 1.0f, 0.33f, 0.33f, 1.0f)),
-        SomEntry("-.---.", floatArrayOf(1.0f, 0.33f, 1.0f, 1.0f, 0.33f, 0f, 0f)),
-        SomEntry("-.--.-", floatArrayOf(1.0f, 0.33f, 1.0f, 1.0f, 0.33f, 1.0f, 0f)),
-        SomEntry("--..--", floatArrayOf(1.0f, 1.0f, 0.33f, 0.33f, 1.0f, 1.0f, 0f)),
-        SomEntry("-....-", floatArrayOf(1.0f, 0.33f, 0.33f, 0.33f, 0.33f, 1.0f, 0f)),
-        SomEntry(".-.-.-", floatArrayOf(0.33f, 1.0f, 0.33f, 1.0f, 0.33f, 1.0f, 0f)),
-        SomEntry("-..-.", floatArrayOf(1.0f, 0.33f, 0.33f, 1.0f, 0.33f, 0f, 0f)),
-        SomEntry("---...", floatArrayOf(1.0f, 1.0f, 1.0f, 0.33f, 0.33f, 0.33f, 0f)),
-        SomEntry("-.-.-.", floatArrayOf(1.0f, 0.33f, 1.0f, 0.33f, 1.0f, 0.33f, 0f)),
-        SomEntry("..--..", floatArrayOf(0.33f, 0.33f, 1.0f, 1.0f, 0.33f, 0.33f, 0f)),
-        SomEntry("..--.-", floatArrayOf(0.33f, 0.33f, 1.0f, 1.0f, 0.33f, 1.0f, 0f)),
-        SomEntry(".--.-.", floatArrayOf(0.33f, 1.0f, 1.0f, 0.33f, 1.0f, 0.33f, 0f)),
-        SomEntry("-.-.--", floatArrayOf(1.0f, 0.33f, 1.0f, 0.33f, 1.0f, 1.0f, 0f)),
-        // Accented
-        SomEntry(".-.-", floatArrayOf(0.33f, 1.0f, 0.33f, 1.0f, 0f, 0f, 0f)), // A umlaut, A aelig
-        SomEntry(".--.-", floatArrayOf(0.33f, 1.0f, 1.0f, 0.33f, 1.0f, 0f, 0f)), // A ring
-        SomEntry("-.-..", floatArrayOf(1.0f, 0.33f, 1.0f, 0.33f, 0.33f, 0f, 0f)), // C cedilla
-        SomEntry(".-..-", floatArrayOf(0.33f, 1.0f, 0.33f, 0.33f, 1.0f, 0f, 0f)), // E grave
-        SomEntry("..-..", floatArrayOf(0.33f, 0.33f, 1.0f, 0.33f, 0.33f, 0f, 0f)), // E acute
-        SomEntry("---.", floatArrayOf(1.0f, 1.0f, 1.0f, 0.33f, 0f, 0f, 0f)), // O acute, O umlaut, O slash
-        SomEntry("--.--", floatArrayOf(1.0f, 1.0f, 0.33f, 1.0f, 1.0f, 0f, 0f)), // N tilde
-        SomEntry("..--", floatArrayOf(0.33f, 0.33f, 1.0f, 1.0f, 0f, 0f, 0f)) // U umlaut, U circ
-    )
-}

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

@@ -29,8 +29,7 @@ data class PassesSettings(
     val minElevation: Double,
     val aosStartMinute: Int = 0,
     val aosEndMinute: Int = 23 * 60 + 59,
-    val invertAosTimeWindow: Boolean = false,
-    val selectedModes: List<String>
+    val invertAosTimeWindow: Boolean = false
 )
 
 data class RCSettings(
@@ -63,17 +62,8 @@ data class OtherSettings(
     val sstvMode: String = "Auto",
     val lowElevation: Double = 15.0,
     val highElevation: Double = 45.0,
-    // UI settings: pages hidden from the bottom nav (Screen simpleName list; empty default = all shown)
-    val hiddenScreens: List<String> = emptyList(),
-    // UI settings: page order (empty = default: Satellites/Passes/Radar/Map/Settings)
-    val screenOrder: List<String> = emptyList(),
-    // UI settings: More-menu order (empty = default: Mutual/Roaming/CW decode)
-    val subMenuOrder: List<String> = emptyList(),
-    // WaveLog logging (4.5.2): server config
-    val wavelogUrl: String = "",
-    val wavelogApiKey: String = "",
-    val wavelogStationId: String = "",
-    val wavelogAutoUpload: Boolean = false
+    val radarCompassOffset: Float = 0f,
+    val radarCompassOffsetElev: Float = 0f
 )
 
 data class DataSourcesSettings(

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/qrz/QrzGridClient.kt

@@ -1,71 +0,0 @@
-/* QrzGridClient.kt - QRZ callsign grid scraper (4.5.5, pure JVM in domain).
- * How it works (verified): GET https://www.qrz.com/db/{callsign} with the user's QRZ login Cookie,
- * the Detail table on the page holds <td class="dh">Grid Square</td><td class="di">XXX</td>.
- * Without cookies the Detail is unavailable (confirmed); if the other station has no grid, the row is absent (null).
- * The Cookie is pasted by the user in settings (EditThisCookie JSON export or a raw cookie string),
- * never built into the app.
- */
-package com.rtbishop.look4sat.core.domain.qrz
-
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import java.net.URL
-
-object QrzGridClient {
-
-    /** Parse the pasted Cookie (both formats): EditThisCookie JSON array or raw "k=v; k=v" string */
-    fun parseCookies(raw: String): String {
-        val text = raw.trim()
-        if (text.isEmpty()) return ""
-        // JSON array format: [{"name":"qz_userid","value":"1266043",...}, ...]
-        if (text.startsWith("[")) {
-            return try {
-                val arr = org.json.JSONArray(text)
-                val parts = mutableListOf<String>()
-                for (i in 0 until arr.length()) {
-                    val o = arr.getJSONObject(i)
-                    val name = o.optString("name")
-                    val value = o.optString("value")
-                    if (name.isNotBlank()) parts.add("$name=$value")
-                }
-                parts.joinToString("; ")
-            } catch (_: Exception) { text }
-        }
-        return text
-    }
-
-    /** Detect the callsign logged in with these cookies (fetch db home, extract the account menu callsign). Null on failure */
-    suspend fun fetchOwnCallsign(cookieHeader: String): String? = withContext(Dispatchers.IO) {
-        if (cookieHeader.isBlank()) return@withContext null
-        try {
-            val url = URL("https://www.qrz.com/db/")
-            val conn = url.openConnection()
-            conn.connectTimeout = 10_000
-            conn.readTimeout = 20_000
-            conn.setRequestProperty("User-Agent", "Mozilla/5.0 (Linux; Android 13) Look4Sat-Pro")
-            conn.setRequestProperty("Cookie", cookieHeader)
-            val html = conn.getInputStream().bufferedReader().use { it.readText() }
-            // Logged-in account menu (verified): <li class="leaf last" onclick="return true">BG7NTA <ul class="sub">
-            val pattern = Regex("<li class=\"leaf last\"[^>]*>\\s*([A-Z0-9/]+)\\s*<ul")
-            pattern.find(html)?.groupValues?.get(1)?.trim()
-        } catch (_: Exception) { null }
-    }
-
-    /** Look up a callsign's grid. Null = not set / not found (silent, does not block logging) */
-    suspend fun lookupGrid(callsign: String, cookieHeader: String): String? = withContext(Dispatchers.IO) {
-        if (callsign.isBlank() || cookieHeader.isBlank()) return@withContext null
-        try {
-            val url = URL("https://www.qrz.com/db/${callsign.trim().uppercase()}")
-            val conn = url.openConnection()
-            conn.connectTimeout = 10_000
-            conn.readTimeout = 20_000
-            conn.setRequestProperty("User-Agent", "Mozilla/5.0 (Linux; Android 13) Look4Sat-Pro")
-            conn.setRequestProperty("Cookie", cookieHeader)
-            val html = conn.getInputStream().bufferedReader().use { it.readText() }
-            // Detail table Grid Square row (verified format)
-            val m = Regex("""<td class="dh">Grid Square</td><td class="di">([^<]+)</td>""")
-                .find(html)
-            m?.groupValues?.get(1)?.trim()?.takeIf { it.isNotBlank() }
-        } catch (_: Exception) { null }
-    }
-}

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

@@ -16,13 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package com.rtbishop.look4sat.core.domain.repository
-import com.rtbishop.look4sat.core.domain.model.SatRadio
+
 import com.rtbishop.look4sat.core.domain.usecase.IAddToCalendar
 import com.rtbishop.look4sat.core.domain.usecase.IAudioCapture
 import com.rtbishop.look4sat.core.domain.usecase.ISaveImage
 import com.rtbishop.look4sat.core.domain.usecase.IShowToast
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.StateFlow
 
 interface IMainContainer {
     val appScope: CoroutineScope
@@ -30,10 +29,8 @@ interface IMainContainer {
     val selectionRepo: ISelectionRepo
     val satelliteRepo: ISatelliteRepo
     val databaseRepo: IDatabaseRepo
-  val amSatRepo: IAmSatRepository
+    val amSatRepo: IAmSatRepository
     val radioTrackingService: IRadioTrackingService
-    val mutualPassData: StateFlow<MutualPassData>
-    fun setMutualPassData(data: MutualPassData)
     fun provideAddToCalendar(): IAddToCalendar
     fun provideShowToast(): IShowToast
     fun provideBluetoothReporter(): IReporter
@@ -43,32 +40,9 @@ interface IMainContainer {
     fun provideRxRadioController(): IRadioController
     fun provideAudioCapture(): IAudioCapture
     fun provideSaveImage(): ISaveImage
-    // WaveLog logging (4.5.2)
-    val wavelogQueue: com.rtbishop.look4sat.core.domain.wavelog.WavelogQueue
-    fun provideWavelogUploader(): com.rtbishop.look4sat.core.domain.wavelog.WavelogUploader
-
-    fun provideLotwSatellitesRepo(): com.rtbishop.look4sat.core.domain.wavelog.ILotwSatellitesRepo
+    fun providePairedBluetoothDevices(): List<Pair<String, String>>
 }
 
-data class MutualPassData(
-    val samples: List<Pair<Long, Pair<Double, Double>>> = emptyList(),
-    val trackSamples: List<TrackSampleData> = emptyList(),
-    val startTime: Long = 0L,
-    val endTime: Long = 0L,
-    val maxElev: Double = 10.0,
-    val labelA: String = "你",
-    val labelB: String = "友台"
-)
-
-/** Minimal track sample for cross-module sharing (angles in degrees). */
-data class TrackSampleData(
-    val time: Long = 0L,
-    val azimuthA: Double,
-    val elevationA: Double,
-    val azimuthB: Double,
-    val elevationB: Double
-)
-
 interface IContainerProvider {
     fun getMainContainer(): IMainContainer
 }

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

@@ -61,7 +61,7 @@ interface ISatelliteRepo {
     suspend fun getTrack(sat: OrbitalObject, pos: GeoPos, start: Long, end: Long): List<OrbitalPos>
 
     /** Get Doppler-shifted radio frequencies for a satellite at the given time. */
-    suspend fun getRadios(satPos: OrbitalPos, radios: List<SatRadio>): List<SatRadio>
+    suspend fun getRadios(sat: OrbitalObject, pos: GeoPos, radios: List<SatRadio>, time: Long): List<SatRadio>
 
     /** Fetch radio transceivers for a satellite by its catalog number. */
     suspend fun getRadiosWithId(id: Int): List<SatRadio>

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

@@ -21,10 +21,10 @@ import com.rtbishop.look4sat.core.domain.model.SatItem
 import kotlinx.coroutines.flow.Flow
 
 interface ISelectionRepo {
-    fun getCurrentTypes(): List<String>
-    fun getTypesList(): List<String>
+    fun getCurrentModes(): List<String>
+    fun getModesList(): List<String>
     suspend fun getEntriesFlow(): Flow<List<SatItem>>
-    suspend fun setTypes(types: List<String>)
+    suspend fun setModes(modes: List<String>)
     suspend fun setQuery(query: String)
     suspend fun setSelection(selectAll: Boolean)
     suspend fun setSelection(ids: List<Int>, isTicked: Boolean)

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

@@ -32,9 +32,9 @@ interface ISettingsRepo {
 
     //region # Satellites selection settings
     val selectedIds: StateFlow<List<Int>>
-    val selectedTypes: StateFlow<List<String>>
+    val selectedSatModes: StateFlow<List<String>>
     fun setSelectedIds(ids: List<Int>)
-    fun setSelectedTypes(types: List<String>)
+    fun setSelectedSatModes(modes: List<String>)
     //endregion
 
     //region # Passes filter settings
@@ -45,15 +45,12 @@ interface ISettingsRepo {
     //region # Station position settings
     val stationPosition: StateFlow<GeoPos>
     fun setStationPosition(latitude: Double, longitude: Double, altitude: Double): Boolean
-    /** GPS fix (suspend): true only with a fix; false on missing permission/timeout/no signal */
-    suspend fun setStationPosition(): Boolean
+    fun setStationPosition(): Boolean
     fun setStationPosition(locator: String): Boolean
     //endregion
 
     //region # Database update settings
     val databaseState: StateFlow<DatabaseState>
-    fun getSatelliteTypesIds(types: List<String>): List<Int>
-    fun setSatelliteTypeIds(type: String, ids: List<Int>)
     fun updateDatabaseState(state: DatabaseState)
     //endregion
 

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

@@ -22,7 +22,6 @@ import java.io.InputStream
 interface IRemoteSource {
     suspend fun getFileStream(uri: String): InputStream?
     suspend fun getNetworkStream(url: String): InputStream?
-
-    /** Fetch AMSAT status page HTML (with UA; null = failure) */
-    suspend fun getStatusHtml(): String?
+    suspend fun getAmSatCatalog(): String?
+    suspend fun getAmSatReports(hours: Int, limit: Int): String?
 }

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

@@ -18,41 +18,26 @@
 package com.rtbishop.look4sat.core.domain.source
 
 object Sources {
-    // Default URL for online updates (user can change/reset it via the "Custom URL" dialog)
-    val defaultTleUrl = "https://celestrak.org/NORAD/elements/gp.php?GROUP=active&FORMAT=csv"
-    val defaultTransceiversUrl = "https://db.satnogs.org/api/transmitters/?format=json&status=active"
-
     val satelliteDataUrls = mapOf(
-        "All" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=active&FORMAT=csv",
-        "Amateur" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=amateur&FORMAT=csv",
-        "Brightest" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=visual&FORMAT=csv",
-        "Cubesat" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=cubesat&FORMAT=csv",
-        "Education" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=education&FORMAT=csv",
-        "Engineer" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=engineering&FORMAT=csv",
-        "Geostationary" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=geo&FORMAT=csv",
-        "Globalstar" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=globalstar&FORMAT=csv",
-        "GNSS" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=gnss&FORMAT=csv",
-        "Intelsat" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=intelsat&FORMAT=csv",
-        "Iridium" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=iridium-NEXT&FORMAT=csv",
-        "Military" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=military&FORMAT=csv",
-        "New" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=last-30-days&FORMAT=csv",
-        "OneWeb" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=oneweb&FORMAT=csv",
-        "Orbcomm" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=orbcomm&FORMAT=csv",
-        "Resource" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=resource&FORMAT=csv",
-        "SatNOGS" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=satnogs&FORMAT=csv",
-        "Science" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=science&FORMAT=csv",
-        "Spire" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=spire&FORMAT=csv",
-        "Starlink" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=starlink&FORMAT=csv",
-        "Swarm" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=swarm&FORMAT=csv",
-        "Weather" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=weather&FORMAT=csv",
-        "X-Comm" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=x-comm&FORMAT=csv",
-        "Amsat" to "https://amsat.org/tle/current/nasabare.txt",
-        "Classified" to "https://www.mmccants.org/tles/classfd.zip",
-        "McCants" to "https://www.mmccants.org/tles/inttles.zip",
+        "CelesTrak" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=active&FORMAT=csv",
+        "AMSAT" to "https://amsat.org/tle/current/nasabare.txt",
+        "McCants Classified" to "https://www.mmccants.org/tles/classfd.zip",
+        "McCants Integrated" to "https://www.mmccants.org/tles/inttles.zip",
         "R4UAB" to "https://r4uab.ru/satonline.txt",
+        "SatNOGS" to "https://db.satnogs.org/api/tle/?format=3le",
+        "ARISS" to "https://live.ariss.org/iss.txt",
         "Other" to "" // key for sats filter
     )
     val transceiversDataUrls = mapOf(
         "SatNOGS" to "https://db.satnogs.org/api/transmitters/?format=json&status=active"
     )
+    val satelliteModes = listOf(
+        "4FSK", "64-QAM", "AFSK", "AFSK TUBiX10", "AHRPT", "AM", "APT", "ASK", "BPSK",
+        "BPSK PMT-A3", "CERTO", "CW", "DATV", "DBPSK", "DOKA", "DPSK", "DQPSK", "DSB", "DSTAR",
+        "DUV", "DVB-S2", "FFSK", "FM", "FMN", "FSK", "FSK AX.100 Mode 5", "FSK AX.100 Mode 6",
+        "FSK AX.25 G3RUH", "FT8", "GENESIS FSK", "GFSK", "GFSK Pkst", "GFSK Rktr", "GFSK/BPSK",
+        "GMSK", "GMSK USP", "HRPT", "LoRa", "LRPT", "LSB", "MFSK", "MSK", "MSK AX.100 Mode 5",
+        "MSK AX.100 Mode 6", "OFDM", "OQPSK", "PPM", "PSK", "PSK31", "PSK63", "QPSK", "QPSK31",
+        "QPSK63", "SIDLOC", "SQPSK", "SSDV", "SSTV", "UNKNOWN", "USB", "WSJT"
+    )
 }

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/usecase/IShowToast.kt

@@ -19,7 +19,4 @@ package com.rtbishop.look4sat.core.domain.usecase
 
 interface IShowToast {
     operator fun invoke(message: String)
-
-    /** Show by resource ID (four-language text) */
-    operator fun invoke(resId: Int)
 }

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

@@ -91,7 +91,7 @@ class DataParser(private val dispatcher: CoroutineDispatcher) {
         val line1 = tle[1]
         val line2 = tle[2]
         OrbitalData(
-            name = tle[0].trim(),
+            name = tle[0].trim().removePrefix("0 "),
             epoch = line1.substring(18, 32).toDouble(),
             meanmo = line2.substring(52, 63).toDouble(),
             eccn = line2.substring(26, 33).toDouble() / 1e7,

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

@@ -18,12 +18,10 @@ import java.util.Locale
  *
  * For a linear (passband) transponder, uplink and downlink frequencies are
  * related by a fixed passband offset. When the satellite moves, both are
- * Doppler-shifted. Given one, we compute the other:
+ * Doppler-shifted. Given one, this computes the other:
  *
  *   downlink → uplink: mapDownlinkToUplink (passband) → getUplinkFreq (Doppler)
  *   uplink → downlink: mapUplinkToDownlink (passband) → getDownlinkFreq (Doppler)
- *
- * Addresses GitHub issue #91 (Custom frequency Doppler correction).
  */
 object DopplerFrequencyCalculator {
 
@@ -104,8 +102,8 @@ object DopplerFrequencyCalculator {
      * True for the radio entry that should drive the standalone Calculator page.
      *
      * A frequency range alone is not enough: some non-user-facing or drifting data entries
-     * can also have low/high frequencies. The calculator is meant for the named linear
-     * transponder entry, e.g. "Linear Transponder", "Linear Transp.", "SSB Transponder".
+     * can also have low/high frequencies. The calculator is meant for named linear
+     * transponders, e.g. "Linear Transponder", "Linear Transp.", "SSB Transponder".
      */
     fun isNamedLinearTransponder(transponder: SatRadio): Boolean {
         if (!isLinearTransponder(transponder)) return false

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

@@ -19,78 +19,31 @@ package com.rtbishop.look4sat.core.domain.utility
 
 import com.rtbishop.look4sat.core.domain.predict.GeoPos
 
-/**
- * Converts a Maidenhead locator (QTH grid square) to a GeoPos.
- * Supports 6-char (3 pair), 8-char (4 pair) and 10-char (5 pair) locators.
- * The returned position is the center of the finest cell encoded by the locator:
- *  - 6 char: 5' lon x 2.5' lat cell center
- *  - 8 char: 30" lon x 15" lat cell center
- *  - 10 char: 1.25" lon x 0.625" lat cell center
- */
 fun qthToPosition(locator: String): GeoPos? {
-    val trimmedQth = locator.trim().uppercase()
+    val trimmedQth = locator.take(6)
     if (!isValidLocator(trimmedQth)) return null
-    val lonFirst = (trimmedQth[0].code - 65) * 20
-    val latFirst = (trimmedQth[1].code - 65) * 10
+    val lonFirst = (trimmedQth[0].uppercaseChar().code - 65) * 20
+    val latFirst = (trimmedQth[1].uppercaseChar().code - 65) * 10
     val lonSecond = trimmedQth[2].toString().toInt() * 2
     val latSecond = trimmedQth[3].toString().toInt()
-    val lonThird = (trimmedQth[4].lowercaseChar().code - 97) / 12.0
-    val latThird = (trimmedQth[5].lowercaseChar().code - 97) / 24.0
-    var longitude = lonFirst + lonSecond + lonThird - 180
-    var latitude = latFirst + latSecond + latThird - 90
-    // 8-char extension: 4th pair, digits, 30" lon x 15" lat cells
-    if (trimmedQth.length >= 8) {
-        longitude += trimmedQth[6].toString().toInt() / 120.0
-        latitude += trimmedQth[7].toString().toInt() / 240.0
-    }
-    // 10-char extension: 5th pair, letters, 1.25" lon x 0.625" lat cells
-    if (trimmedQth.length >= 10) {
-        longitude += (trimmedQth[8].lowercaseChar().code - 97) / 2880.0
-        latitude += (trimmedQth[9].lowercaseChar().code - 97) / 5760.0
-    }
-    // Offset to the center of the finest encoded cell
-    when (trimmedQth.length) {
-        8 -> {
-            longitude += 1.0 / 240.0
-            latitude += 1.0 / 480.0
-        }
-        10 -> {
-            longitude += 1.0 / 5760.0
-            latitude += 1.0 / 11520.0
-        }
-        else -> {
-            longitude += 1.0 / 24.0
-            latitude += 1.0 / 48.0
-        }
-    }
-    return GeoPos(latitude.round(6), longitude.round(6))
+    val lonThird = (((trimmedQth[4].lowercaseChar().code - 97) / 12.0) + (1.0 / 24.0)) - 180
+    val latThird = (((trimmedQth[5].lowercaseChar().code - 97) / 24.0) + (1.0 / 48.0)) - 90
+    val longitude = (lonFirst + lonSecond + lonThird).round(4)
+    val latitude = (latFirst + latSecond + latThird).round(4)
+    return GeoPos(latitude, longitude)
 }
 
-/**
- * Converts a GeoPos to a Maidenhead locator (QTH grid square).
- * Default precision is 8 characters (4 pairs) giving 30" lon x 15" lat resolution,
- * matching common 8-char grid square tools. Pass precision = 6 for the classic
- * 5' x 2.5' resolution, or precision = 10 for the finest 1.25" x 0.625" resolution.
- */
-fun positionToQth(latitude: Double, longitude: Double, precision: Int = 8): String? {
+fun positionToQth(latitude: Double, longitude: Double): String? {
     if (!isValidPosition(latitude, longitude)) return null
-    val newLongitude = longitude + 180
+    val newLongitude = if (longitude > 180.0) longitude else longitude + 180
     val newLatitude = latitude + 90
-    val lonFirst = (65 + (newLongitude / 20).toInt().coerceIn(0, 17)).toChar()
-    val latFirst = (65 + (newLatitude / 10).toInt().coerceIn(0, 17)).toChar()
-    val lonSecond = ((newLongitude % 20) / 2).toInt()
+    val lonFirst = (65 + (newLongitude / 20)).toInt().toChar()
+    val latFirst = (65 + (newLatitude / 10)).toInt().toChar()
+    val lonSecond = ((newLongitude / 2) % 10).toInt()
     val latSecond = (newLatitude % 10).toInt()
     val lonThird = (65 + (newLongitude % 2) * 12).toInt().toChar().lowercaseChar()
     val latThird = (65 + (newLatitude % 1) * 24).toInt().toChar().lowercaseChar()
-    val qth = "$lonFirst$latFirst$lonSecond$latSecond$lonThird$latThird"
-    if (precision < 8) return qth
-    val lonFourth = ((newLongitude % (1.0 / 12.0)) * 120).toInt()
-    val latFourth = ((newLatitude % (1.0 / 24.0)) * 240).toInt()
-    val qth8 = "$qth$lonFourth$latFourth"
-    if (precision < 10) return qth8
-    val lonFifth = (65 + (newLongitude % (1.0 / 120.0)) * 2880).toInt().toChar().lowercaseChar()
-    val latFifth = (65 + (newLatitude % (1.0 / 240.0)) * 5760).toInt().toChar().lowercaseChar()
-    return "$qth8$lonFifth$latFifth"
+    return "$lonFirst$latFirst$lonSecond$latSecond$lonThird$latThird"
 }
 
 private fun isValidPosition(lat: Double, lon: Double): Boolean {
@@ -98,49 +51,5 @@ private fun isValidPosition(lat: Double, lon: Double): Boolean {
 }
 
 private fun isValidLocator(locator: String): Boolean {
-    return locator.matches("[a-xA-X]{2}\\d{2}[a-xA-X]{2}(?:\\d{2}(?:[a-xA-X]{2})?)?".toRegex())
+    return locator.matches("[a-xA-X][a-xA-X]\\d\\d[a-xA-X][a-xA-X]".toRegex())
 }
-
-/**
- * Returns the 4-char field+square part of a locator, e.g. "OL42ih45" -> "OL42".
- * A 4-char input is returned as-is when valid.
- */
-fun qthToSquare(locator: String): String {
-    val upper = locator.trim().uppercase()
-    return when {
-        upper.length >= 4 && isValidLocator(upper) -> upper.take(4)
-        upper.length == 4 && upper.matches("[a-xA-X]{2}\\d{2}".toRegex()) -> upper
-        else -> "----"
-    }
-}
-
-/**
- * Builds the 3x3 grid of 4-char squares surrounding [square] (e.g. "OL42").
- * Row 0 = north (lat +1), col 0 = west (lon -1). Handles field/square carry
- * at boundaries (e.g. "AA00" wraps to "RR99" at the south-west corner).
- * Mirrors the neighbor logic decompiled from the QTH Locator app.
- */
-fun qthNeighbors(square: String): List<String> {
-    if (square.length != 4) return emptyList()
-    val lonField = (square[0].uppercaseChar().code - 65).coerceIn(0, 17)
-    val latField = (square[1].uppercaseChar().code - 65).coerceIn(0, 17)
-    val lonSquare = square[2].digitToCharOrNull() ?: return emptyList()
-    val latSquare = square[3].digitToCharOrNull() ?: return emptyList()
-    val result = mutableListOf<String>()
-    for (dLat in 1 downTo -1) {          // north -> south
-        for (dLon in -1..1) {            // west -> east
-            var lf = lonField
-            var tf = latField
-            var ls = lonSquare + dLon
-            var ts = latSquare + dLat
-            if (ls < 0) { lf -= 1; ls = 9 } else if (ls > 9) { lf += 1; ls = 0 }
-            if (ts < 0) { tf -= 1; ts = 9 } else if (ts > 9) { tf += 1; ts = 0 }
-            lf = (lf + 18) % 18
-            tf = (tf + 18) % 18
-            result += "${('A' + lf).toChar()}${('A' + tf).toChar()}$ls$ts"
-        }
-    }
-    return result
-}
-
-private fun Char.digitToCharOrNull(): Int? = digitToIntOrNull()

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/wavelog/ILotwSatellitesRepo.kt

@@ -1,15 +0,0 @@
-/* ILotwSatellitesRepo.kt - LoTW satellite list refresh interface (domain layer, 4.5.5).
- * Impl: LotwSatellitesRepo in core/data (downloads ARRL config.tq6).
- */
-package com.rtbishop.look4sat.core.domain.wavelog
-
-interface ILotwSatellitesRepo {
-    sealed class RefreshResult {
-        data class Ok(val count: Int) : RefreshResult()
-        data class Error(val message: String) : RefreshResult()
-    }
-
-    fun restore()
-
-    suspend fun refresh(): RefreshResult
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/wavelog/LotwSatellites.kt

@@ -1,22 +0,0 @@
-/* LotwSatellites.kt - LoTW-supported satellite name list (112, statically embedded).
- * Source: https://lotw.arrl.org/lotw/config.tq6 (gzip XML, official ARRL!)
- * WaveLog updates its satellite table's lotw field from the same source (Update_model.php lotw_sats()).
- * At runtime LotwSatellitesRepo can refresh it manually (settings WaveLog section button).
- */
-package com.rtbishop.look4sat.core.domain.wavelog
-
-object LotwSatellites {
-    private val staticNames: Set<String> = setOf("AISAT1", "AO-10", "AO-109", "AO-123", "AO-13", "AO-16", "AO-21", "AO-27", "AO-3", "AO-4", "AO-40", "AO-51", "AO-6", "AO-7", "AO-73", "AO-8", "AO-85", "AO-91", "AO-92", "ARISS", "Arsene", "BO-102", "BY70-1", "CAS-2T", "CAS-3H", "CAS-4A", "CAS-4B", "DO-64", "EO-79", "EO-88", "FO-118", "FO-12", "FO-20", "FO-29", "FO-99", "FS-3", "HO-107", "HO-113", "HO-119", "HO-68", "INSPR7", "IO-117", "IO-86", "JO-97", "KEDR", "LEDSAT", "LO-19", "LO-78", "LO-87", "LO-90", "MAYA-3", "MAYA-4", "MIREX", "MO-112", "MO-122", "NO-103", "NO-104", "NO-44", "NO-83", "NO-84", "PO-101", "QO-100", "RS-1", "RS-10", "RS-11", "RS-12", "RS-13", "RS-15", "RS-2", "RS-44", "RS-5", "RS-6", "RS-7", "RS-8", "SAREX", "SO-121", "SO-124", "SO-125", "SO-35", "SO-41", "SO-50", "SO-67", "SONATE", "TAURUS", "TEVEL1", "TEVEL2", "TEVEL3", "TEVEL4", "TEVEL5", "TEVEL6", "TEVEL7", "TEVEL8", "TO-108", "UKUBE1", "UO-14", "UVSQ", "VO-52", "XW-2A", "XW-2B", "XW-2C", "XW-2D", "XW-2E", "XW-2F", "TEV2-1", "TEV2-2", "TEV2-3", "TEV2-4", "TEV2-5", "TEV2-6", "TEV2-7", "TEV2-8", "TEV2-9")
-
-    @Volatile
-    private var dynamicNames: Set<String> = emptySet()
-
-    /** Effective satellite names: static embedded set union runtime updates */
-    val names: Set<String>
-        get() = if (dynamicNames.isEmpty()) staticNames else staticNames + dynamicNames
-
-    /** Runtime update (settings button -> called after LotwSatellitesRepo.refresh()) */
-    fun updateNames(newNames: Set<String>) {
-        if (newNames.isNotEmpty()) dynamicNames = newNames
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/wavelog/WaveLogApi.kt

@@ -1,328 +0,0 @@
-/*
- * WaveLogApi.kt - WaveLog log server API client (4.5.2 override fix 2).
- *
- * Supports both v1 and v2 (user's server only has v1 in practice; v2 returns 404):
- *   v2: POST {base}/api/v2/qso            (Authorization: Bearer + JSON fields)
- *   v1: POST {base}/index.php/api/qso     (key in JSON body + ADIF string)
- * Strategy: try v2 first, auto-fallback to v1 on 404.
- * Test connection: v2 GET api/v2/token; on 404 use v1 POST api/get_contacts_adif.
- * Station grid: only v2 has GET api/v2/station/{id}; v1 lacks it -> fall back to user QTH.
- */
-package com.rtbishop.look4sat.core.domain.wavelog
-
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import org.json.JSONObject
-import java.io.BufferedReader
-import java.io.InputStreamReader
-import java.io.OutputStreamWriter
-import java.net.HttpURLConnection
-import java.net.URL
-import java.util.Locale
-
-/** Station info (GET /api/v2/station/{id} result) */
-data class WavelogStation(
-    val id: Int,
-    val name: String,
-    val callsign: String,
-    val gridsquare: String
-)
-
-sealed class WavelogResult {
-    data class Success(val message: String) : WavelogResult()
-    data class Failure(val message: String) : WavelogResult()
-}
-
-object WaveLogApi {
-
-    private const val TIMEOUT_MS = 15000
-
-    /** Normalize server URL: strip trailing slash/index.php; prepend https:// when missing */
-    fun normalizeUrl(raw: String): String {
-        var u = raw.trim().trimEnd('/')
-        if (u.isBlank()) return ""
-        if (!u.startsWith("http://") && !u.startsWith("https://")) u = "https://$u"
-        if (u.endsWith("/index.php")) u = u.removeSuffix("/index.php")
-        return u
-    }
-
-    /** Test connection: v2 GET api/v2/token; on 404 use v1 POST api/get_contacts_adif */
-    suspend fun testToken(url: String, apiKey: String, stationId: String = ""): WavelogResult = withContext(Dispatchers.IO) {
-        val base = normalizeUrl(url)
-        if (base.isBlank()) return@withContext WavelogResult.Failure("服务器地址为空")
-
-        // v2: GET /index.php/api/v2/token
-        val v2 = httpRequest("$base/index.php/api/v2/token", "GET", apiKey, null)
-        if (v2.first in 200..299) return@withContext WavelogResult.Success("连接成功 (API v2)")
-
-        // v1: POST /index.php/api/get_contacts_adif (key in body)
-        if (stationId.isNotBlank()) {
-            val body = JSONObject().apply {
-                put("key", apiKey)
-                put("station_id", stationId)
-                put("fetchfromid", 0)
-            }.toString()
-            val v1 = httpRequest("$base/index.php/api/get_contacts_adif", "POST", apiKey, body)
-            if (v1.first in 200..299) return@withContext WavelogResult.Success("连接成功 (API v1)")
-            if (v1.first == 401) return@withContext WavelogResult.Failure("API 密钥无效 (v1: 401)")
-        }
-        // v1 attempt without index.php
-        val body = JSONObject().apply {
-            put("key", apiKey)
-            put("station_id", stationId)
-            put("fetchfromid", 0)
-        }.toString()
-        val v1b = httpRequest("$base/api/get_contacts_adif", "POST", apiKey, body)
-        if (v1b.first in 200..299) return@withContext WavelogResult.Success("连接成功 (API v1)")
-        if (v1b.first == 401) return@withContext WavelogResult.Failure("API 密钥无效 (v1: 401)")
-
-        WavelogResult.Failure("连接失败: v2 HTTP ${v2.first}, v1 HTTP ${v1b.first} — 请确认服务器地址/密钥正确")
-    }
-
-    /** Station info: v2 only; v1 lacks the endpoint (grid check falls back to user QTH) */
-    suspend fun getStation(url: String, apiKey: String, stationId: String): WavelogResult = withContext(Dispatchers.IO) {
-        val base = normalizeUrl(url)
-        if (base.isBlank()) return@withContext WavelogResult.Failure("服务器地址为空")
-        val (code, resp) = httpRequest("$base/index.php/api/v2/station/$stationId", "GET", apiKey, null)
-        if (code in 200..299) {
-            return@withContext try {
-                val obj = JSONObject(resp)
-                val data = obj.optJSONObject("data") ?: obj
-                val station = WavelogStation(
-                    id = data.optInt("id"),
-                    name = data.optString("name"),
-                    callsign = data.optString("callsign"),
-                    gridsquare = data.optString("gridsquare")
-                )
-                WavelogResult.Success(JSONObject().apply {
-                    put("id", station.id); put("name", station.name)
-                    put("callsign", station.callsign); put("gridsquare", station.gridsquare)
-                }.toString())
-            } catch (e: Exception) {
-                WavelogResult.Failure("解析失败: ${e.message}")
-            }
-        }
-        // v1 has no station endpoint -> return empty Success (caller falls back to user QTH)
-        WavelogResult.Success("")
-    }
-
-    /**
-     * ADIF band code from a frequency in Hz. "SAT" is NOT a legal ADIF band
-     * value (the Band enumeration is 160M/80M/.../2M/70CM/23CM...); a logger
-     * that fails to parse an illegal band falls back to a default such as
-     * 160m. Satellite QSOs must carry the real band of the TX frequency.
-     */
-    fun bandFromHz(freqHz: Long): String = when {
-        freqHz >= 1240_000_000 -> "23CM"
-        freqHz >= 902_000_000 -> "33CM"
-        freqHz >= 420_000_000 -> "70CM"
-        freqHz >= 222_000_000 -> "1.25M"
-        freqHz >= 144_000_000 -> "2M"
-        freqHz >= 50_000_000 -> "6M"
-        freqHz >= 28_000_000 -> "10M"
-        freqHz >= 24_890_000 -> "12M"
-        freqHz >= 21_000_000 -> "15M"
-        freqHz >= 18_068_000 -> "17M"
-        freqHz >= 14_000_000 -> "20M"
-        freqHz >= 10_000_000 -> "30M"
-        freqHz >= 7_000_000 -> "40M"
-        freqHz >= 5_102_000 -> "60M"
-        freqHz >= 3_500_000 -> "80M"
-        freqHz >= 1_800_000 -> "160M"
-        else -> "160M"
-    }
-
-    /** Band class letter for satellite mode derivation: VHF=V, UHF=U, SHF=S. */
-    private fun bandLetter(freqHz: Long): String = when {
-        freqHz >= 1_240_000_000 -> "S"
-        freqHz >= 420_000_000 -> "U"
-        freqHz >= 144_000_000 -> "V"
-        else -> "V"
-    }
-
-    /**
-     * ADIF SAT_MODE (free text, satellite convention): "V/U" = VHF up /
-     * UHF down, "U/V", "V/S", "U/S"... Derived from the actual TX/RX bands.
-     */
-    fun satModeFrom(txFreqHz: Long, rxFreqHz: Long): String {
-        if (rxFreqHz <= 0) return ""
-        val up = bandLetter(txFreqHz)
-        val down = bandLetter(rxFreqHz)
-        return if (up == down) "" else "$up/$down"
-    }
-
-    /** LoTW-recognized satellite name: main name before parentheses, uppercased (ISS special case) */
-    fun normalizeSatName(raw: String): String {
-        val main = raw.substringBefore('(').trim()
-            .ifBlank { raw.trim() }
-            .uppercase(Locale.ENGLISH)
-        // Matching logic (mirrors WaveLog satellite table name/displayname matching + LoTW list):
-        // 1. Already in LoTW list (common TLE name == common name) -> return as-is
-        // 2. Not present -> check Celestrak alias map (SAUDISAT 1C -> SO-50 etc.); mapped name must be in LoTW list
-        // 3. Still unmatched -> return as-is (uploads are not blocked; QSO is still saved)
-        val commonName = mapOf(
-            "ZARYA" to "ARISS",
-            "ARISS" to "ARISS",
-            "FUNCUBE-1" to "AO-73",
-            "DIWATA-2B" to "PO-101",
-            "SAUDISAT-1C" to "SO-50",
-            "SAUDISAT 1C" to "SO-50",
-            "DIWATA-2A" to "PO-101"
-        )
-        val candidate = commonName[main] ?: main
-        return if (candidate in LotwSatellites.names) candidate else main
-    }
-
-    /** Create QSO: v2 first, fall back to v1 (ADIF) on 404 */
-    suspend fun postQso(
-        url: String,
-        apiKey: String,
-        stationProfileId: String,
-        qso: WavelogQso,
-        gridsquare: String
-    ): WavelogResult = withContext(Dispatchers.IO) {
-        val base = normalizeUrl(url)
-        if (base.isBlank()) return@withContext WavelogResult.Failure("服务器地址为空")
-
-        val satName = normalizeSatName(qso.satName)
-
-        // v2: POST /index.php/api/v2/qso (JSON fields)
-        val satMode = satModeFrom(qso.freqTxHz, qso.freqRxHz)
-        val v2Body = JSONObject().apply {
-            put("station_profile_id", stationProfileId.toIntOrNull() ?: 0)
-            put("call", qso.call)
-            put("band", bandFromHz(qso.freqTxHz))
-            put("mode", qso.mode)
-            put("qso_date", utcDate(qso.timeUtcMs))
-            put("time_on", utcTime(qso.timeUtcMs))
-            put("freq", String.format(Locale.ENGLISH, "%.6fM", qso.freqTxHz / 1_000_000.0))
-            put("freq_rx", String.format(Locale.ENGLISH, "%.6fM", qso.freqRxHz / 1_000_000.0))
-            put("gridsquare", gridsquare)
-            put("rst_sent", "59")
-            put("rst_rcvd", "59")
-            put("sat_name", satName)
-            if (satMode.isNotBlank()) put("sat_mode", satMode)
-        }
-        val (code, resp) = httpRequest("$base/index.php/api/v2/qso", "POST", apiKey, v2Body.toString())
-        if (code in 200..299) return@withContext WavelogResult.Success("已上传 (v2)")
-        if (code == 409) return@withContext WavelogResult.Success("重复(已存在)")
-
-        // v1: POST /index.php/api/qso (key in body + ADIF)
-        val v1Body = JSONObject().apply {
-            put("key", apiKey)
-            put("station_profile_id", stationProfileId)
-            put("type", "adif")
-            put("string", toAdif(qso, gridsquare, satName))
-        }
-        val (code1, resp1) = httpRequest("$base/index.php/api/qso", "POST", apiKey, v1Body.toString())
-        if (code1 in 200..299) return@withContext WavelogResult.Success("已上传 (v1)")
-
-        // v1 without index.php
-        val (code1b, resp1b) = httpRequest("$base/api/qso", "POST", apiKey, v1Body.toString())
-        if (code1b in 200..299) return@withContext WavelogResult.Success("已上传 (v1)")
-
-        WavelogResult.Failure("上传失败: v2 HTTP $code, v1 HTTP $code1 — ${shortError(resp1.ifBlank { resp1b })}")
-    }
-
-    /** v1 ADIF string (freq in MHz, length = UTF-8 byte count, sat_name normalized) */
-    private fun toAdif(qso: WavelogQso, gridsquare: String, satName: String): String {
-        fun field(name: String, value: String): String {
-            val bytes = value.toByteArray(Charsets.UTF_8).size
-            return "<$name:$bytes>$value"
-        }
-        val satMode = satModeFrom(qso.freqTxHz, qso.freqRxHz)
-        return buildString {
-            append(field("call", qso.call))
-            append(field("band", bandFromHz(qso.freqTxHz)))
-            append(field("mode", qso.mode))
-            append(field("freq", String.format(Locale.ENGLISH, "%.6f", qso.freqTxHz / 1_000_000.0)))
-            if (qso.freqRxHz > 0) {
-                append(field("freq_rx", String.format(Locale.ENGLISH, "%.6f", qso.freqRxHz / 1_000_000.0)))
-            }
-            append(field("qso_date", utcDateCompact(qso.timeUtcMs)))
-            append(field("time_on", utcTimeCompact(qso.timeUtcMs)))
-            append(field("rst_sent", "59"))
-            append(field("rst_rcvd", "59"))
-            if (gridsquare.isNotBlank()) append(field("gridsquare", gridsquare.take(4)))
-            if (satName.isNotBlank()) {
-                append(field("sat_name", satName))
-                if (satMode.isNotBlank()) append(field("sat_mode", satMode))
-                append(field("prop_mode", "SAT"))
-            }
-            append("<eor>")
-        }
-    }
-
-    /** Generic HTTP request (returns code + body) */
-    private fun httpRequest(url: String, method: String, apiKey: String, jsonBody: String?): Pair<Int, String> {
-        return try {
-            val conn = URL(url).openConnection() as HttpURLConnection
-            conn.requestMethod = method
-            conn.connectTimeout = TIMEOUT_MS
-            conn.readTimeout = TIMEOUT_MS
-            if (apiKey.isNotBlank()) conn.setRequestProperty("Authorization", "Bearer $apiKey")
-            if (jsonBody != null) {
-                conn.doOutput = true
-                conn.setRequestProperty("Content-Type", "application/json")
-                conn.setRequestProperty("Accept", "application/json")
-                OutputStreamWriter(conn.outputStream, Charsets.UTF_8).use { it.write(jsonBody) }
-            }
-            val code = conn.responseCode
-            val stream = if (code in 200..299) conn.inputStream else conn.errorStream
-            val body = if (stream != null) {
-                BufferedReader(InputStreamReader(stream, Charsets.UTF_8)).use { it.readText() }
-            } else ""
-            code to body
-        } catch (e: Exception) {
-            -1 to (e.message ?: e.javaClass.simpleName)
-        }
-    }
-
-    private fun shortError(body: String): String {
-        if (body.startsWith("<")) return body.take(80) // HTML error page
-        return try {
-            val obj = JSONObject(body)
-            val err = obj.optJSONObject("error")
-            err?.optString("message")?.ifBlank { body.take(120) }
-                ?: obj.optString("reason").ifBlank { obj.optString("message").ifBlank { body.take(120) } }
-        } catch (_: Exception) {
-            body.take(120)
-        }
-    }
-
-    private fun utcDate(ms: Long): String {
-        val cal = java.util.Calendar.getInstance(java.util.TimeZone.getTimeZone("UTC"))
-        cal.timeInMillis = ms
-        return "%04d-%02d-%02d".format(
-            cal.get(java.util.Calendar.YEAR), cal.get(java.util.Calendar.MONTH) + 1,
-            cal.get(java.util.Calendar.DAY_OF_MONTH)
-        )
-    }
-
-    private fun utcTime(ms: Long): String {
-        val cal = java.util.Calendar.getInstance(java.util.TimeZone.getTimeZone("UTC"))
-        cal.timeInMillis = ms
-        return "%02d:%02d:%02d".format(
-            cal.get(java.util.Calendar.HOUR_OF_DAY), cal.get(java.util.Calendar.MINUTE),
-            cal.get(java.util.Calendar.SECOND)
-        )
-    }
-
-    private fun utcDateCompact(ms: Long): String {
-        val cal = java.util.Calendar.getInstance(java.util.TimeZone.getTimeZone("UTC"))
-        cal.timeInMillis = ms
-        return "%04d%02d%02d".format(
-            cal.get(java.util.Calendar.YEAR), cal.get(java.util.Calendar.MONTH) + 1,
-            cal.get(java.util.Calendar.DAY_OF_MONTH)
-        )
-    }
-
-    private fun utcTimeCompact(ms: Long): String {
-        val cal = java.util.Calendar.getInstance(java.util.TimeZone.getTimeZone("UTC"))
-        cal.timeInMillis = ms
-        return "%02d%02d%02d".format(
-            cal.get(java.util.Calendar.HOUR_OF_DAY), cal.get(java.util.Calendar.MINUTE),
-            cal.get(java.util.Calendar.SECOND)
-        )
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/wavelog/WavelogQueue.kt

@@ -1,108 +0,0 @@
-/*
- * WavelogQueue.kt - WaveLog local log queue (4.5.2).
- *
- * Pure Kotlin (no Android deps): storage goes through the IWavelogQueueStore interface,
- * implemented with SharedPreferences in core/data.
- * Queue capped at 500 entries (oldest dropped beyond that).
- */
-package com.rtbishop.look4sat.core.domain.wavelog
-
-import org.json.JSONArray
-import org.json.JSONObject
-
-/** Storage abstraction (SharedPreferences impl lives in core/data) */
-interface IWavelogQueueStore {
-    fun load(): String
-    fun save(json: String)
-}
-
-/** QSO entry awaiting upload (local queue element, mirrors POST /api/v2/qso fields) */
-data class WavelogQso(
-    val id: String,              // 本地唯一 id(UUID)
-    val timeUtcMs: Long,         // 回车时刻 UTC 毫秒(本地显示 + 组装 qso_date/time_on)
-    val call: String,
-    val mode: String,
-    val freqTxHz: Long,          // 上行(回车那一秒多普勒修正)
-    val freqRxHz: Long,          // 下行
-    val satName: String,
-    val sessionId: String = "",  // 场次 ID: 卫星名-AOS 时间戳(过境仰角 0 秒), 空=未分组(旧数据)
-    val gridsquare: String = "", // 对方网格(QRZ 爬虫填入, 4.5.5), 空=未查到
-    val uploaded: Boolean = false // 是否已成功上传(4.5.2 修复: 成功后保留标记, 表格打勾)
-)
-
-class WavelogQueue(private val store: IWavelogQueueStore) {
-
-    private val key = "wavelog_queue"
-
-    fun all(): List<WavelogQso> {
-        val raw = store.load()
-        return try {
-            val arr = JSONArray(raw)
-            (0 until arr.length()).map { i ->
-                val o = arr.getJSONObject(i)
-                WavelogQso(
-                    id = o.getString("id"),
-                    timeUtcMs = o.getLong("timeUtcMs"),
-                    call = o.optString("call"),
-                    mode = o.optString("mode"),
-                    freqTxHz = o.optLong("freqTxHz"),
-                    freqRxHz = o.optLong("freqRxHz"),
-                    satName = o.optString("satName"),
-                    sessionId = o.optString("sessionId"),
-                    gridsquare = o.optString("gridsquare"),
-                    uploaded = o.optBoolean("uploaded", false)
-                )
-            }
-        } catch (_: Exception) { emptyList() }
-    }
-
-    @Synchronized
-    fun add(qso: WavelogQso) {
-        val list = all().toMutableList()
-        list.add(0, qso) // 最新在前
-        if (list.size > 500) list.removeAt(list.size - 1)
-        save(list)
-    }
-
-    @Synchronized
-    fun remove(id: String) {
-        save(all().filter { it.id != id })
-    }
-
-    @Synchronized
-    fun removeAll(ids: Set<String>) {
-        save(all().filter { it.id !in ids })
-    }
-
-    /** Mark as uploaded (kept in the queue; checkmark in the table) */
-    @Synchronized
-    fun markUploaded(id: String) {
-        save(all().map { if (it.id == id) it.copy(uploaded = true) else it })
-    }
-
-    /** Update a QSO's counterpart grid (async backfill from the QRZ scraper, 4.5.5) */
-    fun updateGridsquare(id: String, grid: String) {
-        save(all().map { if (it.id == id) it.copy(gridsquare = grid) else it })
-    }
-
-    /** Remove all uploaded entries (optional; keeps the queue lean) */
-    @Synchronized
-    fun removeUploaded() {
-        save(all().filter { !it.uploaded })
-    }
-
-    private fun save(list: List<WavelogQso>) {
-        val arr = JSONArray()
-        list.forEach { q ->
-            arr.put(JSONObject().apply {
-                put("id", q.id); put("timeUtcMs", q.timeUtcMs); put("call", q.call)
-                put("mode", q.mode); put("freqTxHz", q.freqTxHz)
-                put("freqRxHz", q.freqRxHz); put("satName", q.satName)
-                put("sessionId", q.sessionId)
-                put("gridsquare", q.gridsquare)
-                put("uploaded", q.uploaded)
-            })
-        }
-        store.save(arr.toString())
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/wavelog/WavelogUploader.kt

@@ -1,92 +0,0 @@
-/*
- * WavelogUploader.kt - WaveLog queue upload scheduler (4.5.2).
- *
- * Manual/periodic uploads share: per-batch grid check (user QTH first 4 chars vs station grid first 4 chars)
- * -> POST /api/v2/qso -> success removes from the queue.
- * Grid mismatch: returns NeedConfirm (UI dialog "Ignore and upload / Cancel"),
- * retrying the batch with force=true once confirmed.
- */
-package com.rtbishop.look4sat.core.domain.wavelog
-
-import com.rtbishop.look4sat.core.domain.repository.ISettingsRepo
-import org.json.JSONObject
-
-sealed class UploadOutcome {
-    data class NeedConfirm(val stationGrid: String, val userGrid: String) : UploadOutcome()
-    data class Done(
-        val successCount: Int,
-        val failedCount: Int,
-        val message: String,
-        val firstError: String = ""
-    ) : UploadOutcome()
-}
-
-class WavelogUploader(
-    private val settingsRepo: ISettingsRepo,
-    private val queue: WavelogQueue
-) {
-
-    // Station grid cache (refreshed before each upload; stale value kept on failure)
-    private var cachedStationGrid: String? = null
-
-    /** Upload the whole queue. force=true skips the grid confirm (user chose "Ignore and upload") */
-    suspend fun uploadQueue(force: Boolean = false): UploadOutcome {
-        val settings = settingsRepo.otherSettings.value
-        val url = settings.wavelogUrl
-        val apiKey = settings.wavelogApiKey
-        val stationId = settings.wavelogStationId
-        if (url.isBlank() || apiKey.isBlank() || stationId.isBlank()) {
-            return UploadOutcome.Done(0, queue.all().size, "未配置 WaveLog 服务器")
-        }
-
-        // 1. Fetch station info (station grid); fall back to user QTH when v1 lacks the endpoint
-        val stationGrid = getStationGrid(url, apiKey, stationId) ?: userQthGrid()
-        if (stationGrid.isNullOrBlank()) {
-            return UploadOutcome.Done(0, queue.all().size, "无法获取站点信息(检查站点 ID/密钥权限)")
-        }
-
-        // 2. Grid check: cloud station grid first 4 chars vs current station QTH first 4 chars
-        //   (guards against a misconfigured station; unrelated to the QSO counterpart grid - per user)
-        if (!force) {
-            val userGrid = userQthGrid()
-            if (userGrid != null && stationGrid.take(4).lowercase() != userGrid.take(4).lowercase()) {
-                return UploadOutcome.NeedConfirm(stationGrid, userGrid)
-            }
-        }
-
-        // 3. Upload one by one. ADIF gridsquare = counterpart grid (the QSO partner); blank until the scraper lands
-        val entries = queue.all()
-        var ok = 0
-        var fail = 0
-        var firstError = ""
-        for (qso in entries) {
-            if (qso.uploaded) { ok++; continue }
-            val result = WaveLogApi.postQso(url, apiKey, stationId, qso, qso.gridsquare)
-            if (result is WavelogResult.Success) {
-                ok++
-                queue.markUploaded(qso.id)
-            } else {
-                fail++
-                if (firstError.isBlank()) firstError = (result as? WavelogResult.Failure)?.message ?: ""
-            }
-        }
-        val message = if (fail == 0) "成功上传 $ok 条" else "成功 $ok 条, 失败 $fail 条(保留待重试)"
-        return UploadOutcome.Done(ok, fail, message, firstError)
-    }
-
-    private suspend fun getStationGrid(url: String, apiKey: String, stationId: String): String? {
-        val result = WaveLogApi.getStation(url, apiKey, stationId)
-        if (result is WavelogResult.Success) {
-            return try {
-                JSONObject(result.message).optString("gridsquare").takeIf { it.isNotBlank() }
-                    ?: cachedStationGrid
-            } catch (_: Exception) { cachedStationGrid }
-        }
-        return cachedStationGrid
-    }
-
-    /** User's current QTH grid (first 4 chars; null when no QTH = check skipped) */
-    private fun userQthGrid(): String? {
-        return settingsRepo.stationPosition.value.qthLocator?.takeIf { it.length >= 4 }
-    }
-}

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

@@ -3,7 +3,11 @@ package com.rtbishop.look4sat.core.domain
 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 org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Test
 
 class DopplerFrequencyCalculatorTest {
@@ -79,8 +83,6 @@ class DopplerFrequencyCalculatorTest {
         val orbitalPos = pos(0.0)
         val uplink = DopplerFrequencyCalculator.computeUplinkFromDownlink(435_200_000L, xpdr, orbitalPos)
         assertNotNull(uplink)
-        assertTrue(uplink!! > 0)
-        // With zero Doppler, result equals mapDownlinkToUplink output
         assertEquals(145_200_000L, uplink)
     }
 
@@ -95,24 +97,23 @@ class DopplerFrequencyCalculatorTest {
 
     @Test
     fun computeUplinkFromDownlink_withDoppler_positiveRangeRate() {
-        // Satellite receding (positive range rate) → ground must transmit higher freq to compensate
+        // Satellite receding (positive range rate) → ground must transmit higher freq to compensate.
         val xpdr = linearTransponder()
-        val orbitalPos = pos(7.0)  // ~7 km/s receding
+        val orbitalPos = pos(7.0)
         val uplink = DopplerFrequencyCalculator.computeUplinkFromDownlink(435_200_000L, xpdr, orbitalPos)
         assertNotNull(uplink)
-        // Uplink freq should be Doppler shifted UP (compensating for receding)
         assertTrue(uplink!! > 145_200_000L)
     }
 
     @Test
-    fun computeUplinkFromDownlink_fm_transponder_returnsNull() {
+    fun computeUplinkFromDownlink_fmTransponder_returnsNull() {
         val orbitalPos = pos()
         val result = DopplerFrequencyCalculator.computeUplinkFromDownlink(435_600_000L, fmTransponder(), orbitalPos)
         assertNull(result)
     }
 
     @Test
-    fun computeDownlinkFromUplink_fm_transponder_returnsNull() {
+    fun computeDownlinkFromUplink_fmTransponder_returnsNull() {
         val orbitalPos = pos()
         val result = DopplerFrequencyCalculator.computeDownlinkFromUplink(145_900_000L, fmTransponder(), orbitalPos)
         assertNull(result)
@@ -171,13 +172,11 @@ class DopplerFrequencyCalculatorTest {
         val orbitalPos = pos(0.0)
         val uplink = DopplerFrequencyCalculator.computeUplinkFromDownlink(435_200_000L, xpdr, orbitalPos)
         assertNotNull(uplink)
-        // Inverted: offset from high end → maps to high end of uplink
         assertEquals(145_300_000L, uplink)
     }
 
     @Test
     fun computeUplinkFromDownlink_roundTrip() {
-        // downlink → uplink → downlink should round-trip
         val xpdr = linearTransponder()
         val orbitalPos = pos(3.5)
         val originalDownlink = 435_250_000L
@@ -185,7 +184,6 @@ class DopplerFrequencyCalculatorTest {
         assertNotNull(uplink)
         val roundTripDownlink = DopplerFrequencyCalculator.computeDownlinkFromUplink(uplink!!, xpdr, orbitalPos)
         assertNotNull(roundTripDownlink)
-        // Doppler round-trip: small residual due to freq-dependent Doppler
         val error = kotlin.math.abs(roundTripDownlink!! - originalDownlink)
         assertTrue("Round-trip error too large: $error", error < 10000)
     }

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

@@ -18,9 +18,7 @@
 package com.rtbishop.look4sat.core.domain
 
 import com.rtbishop.look4sat.core.domain.utility.positionToQth
-import com.rtbishop.look4sat.core.domain.utility.qthNeighbors
 import com.rtbishop.look4sat.core.domain.utility.qthToPosition
-import com.rtbishop.look4sat.core.domain.utility.qthToSquare
 import org.junit.Test
 
 class QthConverterTest {
@@ -28,36 +26,21 @@ class QthConverterTest {
     @Test
     fun `Given valid QTH returns correct POS`() {
         var result = qthToPosition("io91VL39FX")
-        assert(result?.latitude == 51.499913 && result.longitude == -0.22309)
+        assert(result?.latitude == 51.4792 && result.longitude == -0.2083)
         result = qthToPosition("gf15vc")
-        assert(result?.latitude == -34.895833 && result.longitude == -56.208333)
-        // 8-char locators: finer 30" x 15" cell center
-        result = qthToPosition("io91vl47")
-        assert(result?.latitude == 51.489583 && result.longitude == -0.2125)
-        result = qthToPosition("jn58td25")
-        assert(result?.latitude == 48.147917 && result.longitude == 11.604167)
+        assert(result?.latitude == -34.8958 && result.longitude == -56.2083)
     }
 
     @Test
     fun `Given invalid QTH returns null`() {
         assert(qthToPosition("ZZ00zz") == null)
         assert(qthToPosition("JN58") == null)
-        assert(qthToPosition("io9") == null)
-        assert(qthToPosition("IO91VL7") == null)
-        assert(qthToPosition("IO91VL4X") == null)
     }
 
     @Test
     fun `Given valid POS returns correct QTH`() {
-        // default precision is 8 chars
-        assert(positionToQth(51.4878, -0.2146) == "IO91vl47")
-        assert(positionToQth(48.1466, 11.6083) == "JN58td25")
-        // 6-char precision still available for backwards compatibility
-        assert(positionToQth(51.4878, -0.2146, 6) == "IO91vl")
-        assert(positionToQth(48.1466, 11.6083, 6) == "JN58td")
-        // 10-char precision
-        assert(positionToQth(51.4878, -0.2146, 10) == "IO91vl47fb")
-        assert(positionToQth(48.1466, 11.6083, 10) == "JN58td25xe")
+        assert(positionToQth(51.4878, -0.2146) == "IO91vl")
+        assert(positionToQth(48.1466, 11.6083) == "JN58td")
     }
 
     @Test
@@ -65,61 +48,4 @@ class QthConverterTest {
         assert(positionToQth(91.0542, -170.1142) == null)
         assert(positionToQth(89.0542, -240.1142) == null)
     }
-
-    @Test
-    fun `Given boundary POS stays in valid grid`() {
-        // antipodal / edge cases must not overflow the A-R / 0-9 / a-x alphabet
-        assert(positionToQth(-90.0, -180.0, 8) == "AA00aa00")
-        assert(positionToQth(90.0, 180.0, 8) == "RR00aa00")
-        assert(positionToQth(0.0, 0.0, 8) == "JJ00aa00")
-        // roundtrip stability: 8-char roundtrip is stable across a sample of positions
-        val positions = listOf(
-            Pair(51.4878, -0.2146), Pair(48.1466, 11.6083), Pair(-33.8688, 151.2093),
-            Pair(39.9042, 116.4074), Pair(35.6895, 139.6917), Pair(41.714, -72.727)
-        )
-        positions.forEach { (lat, lon) ->
-            val qth = positionToQth(lat, lon, 8)
-            val pos = qthToPosition(qth!!)
-            val qth2 = positionToQth(pos!!.latitude, pos.longitude, 8)
-            assert(qth == qth2) { "Roundtrip failed for ($lat, $lon): $qth -> $qth2" }
-        }
-    }
-
-    @Test
-    fun `Given square returns correct 3x3 neighbors`() {
-        // Reference grid from the QTH Locator screenshot: OL42
-        val neighbors = qthNeighbors("OL42")
-        assert(neighbors == listOf(
-            "OL33", "OL43", "OL53",
-            "OL32", "OL42", "OL52",
-            "OL31", "OL41", "OL51"
-        )) { "OL42 grid mismatch: $neighbors" }
-        // Center cell must be the input itself
-        assert(neighbors[4] == "OL42")
-        // 9 cells, all distinct
-        assert(neighbors.size == 9 && neighbors.toSet().size == 9)
-    }
-
-    @Test
-    fun `Given boundary square wraps fields correctly`() {
-        // South-west corner: AA00 neighbors wrap to RR99 / RA90 etc.
-        val sw = qthNeighbors("AA00")
-        assert(sw.size == 9 && sw.toSet().size == 9)
-        assert(sw[0] == "RA91" && sw[4] == "AA00" && sw[6] == "RR99" && sw[8] == "AR19")
-        // North-east corner: RR99 wraps to AA00
-        val ne = qthNeighbors("RR99")
-        assert(ne.size == 9 && ne.toSet().size == 9)
-        assert(ne[0] == "RA80" && ne[4] == "RR99" && ne[8] == "AR08")
-        // Field boundary: IO91's east neighbors cross into J field
-        val london = qthNeighbors("IO91")
-        assert(london[2] == "JO02" && london[5] == "JO01")
-    }
-
-    @Test
-    fun `Given full locator returns square part`() {
-        assert(qthToSquare("OL42ih45") == "OL42")
-        assert(qthToSquare("io91VL39FX") == "IO91")
-        assert(qthToSquare("JN58") == "JN58")
-        assert(qthToSquare("garbage!!") == "----")
-    }
 }

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/cw/CwDecoderTest.kt

@@ -1,301 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import org.junit.Assert.*
-import org.junit.Test
-import kotlin.math.PI
-import kotlin.math.sin
-
-class CwDecoderTest {
-
-    // --- Morse table ---
-
-    @Test
-    fun morseToChar_basicLetters() {
-        assertEquals('A', CwBayesianDecoder.morseToChar("01"))
-        assertEquals('S', CwBayesianDecoder.morseToChar("000"))
-        assertEquals('O', CwBayesianDecoder.morseToChar("111"))
-    }
-
-    @Test
-    fun morseToChar_numbers() {
-        assertEquals('1', CwBayesianDecoder.morseToChar("01111"))
-        assertEquals('0', CwBayesianDecoder.morseToChar("11111"))
-    }
-
-    @Test
-    fun morseToChar_unknown_returnsNull() {
-        assertNull(CwBayesianDecoder.morseToChar("......."))
-        assertNull(CwBayesianDecoder.morseToChar(""))
-    }
-
-    // --- FFT ---
-
-    @Test
-    fun fft_magnitudeSpectrum_detectsTone() {
-        val fft = CwFFT(256)
-        val sampleRate = 8000f
-        val freq = 700f
-        val buffer = FloatArray(256) { (sin(2.0 * PI * freq * it / sampleRate)).toFloat() }
-        val mag = fft.magnitudeSpectrum(buffer)
-        // Peak should be at bin around 700 * 256 / 8000 ≈ 22.4
-        var maxBin = 0
-        var maxVal = 0f
-        for (i in mag.indices) {
-            if (mag[i] > maxVal) { maxVal = mag[i]; maxBin = i }
-        }
-        assertTrue("Peak bin $maxBin should be near 22", maxBin in 18..26)
-        assertTrue("Peak value $maxVal should be positive", maxVal > 0.01f)
-    }
-
-    @Test
-    fun fft_magnitudeSpectrum_silence_isFlat() {
-        val fft = CwFFT(256)
-        val buffer = FloatArray(256) { 0f }
-        val mag = fft.magnitudeSpectrum(buffer)
-        for (v in mag) assertEquals("Silence spectrum should be 0, got $v", 0f, v, 1e-6f)
-    }
-
-    @Test
-    fun fft_rejectsWrongSize() {
-        assertThrows(IllegalArgumentException::class.java) { CwFFT(100) }
-    }
-
-    // --- Spectrogram ---
-
-    @Test
-    fun spectrogram_addSamples_updatesEnergy() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        val freq = 700f
-        // Feed multiple frames to stabilize energy normalization
-        for (i in 0..5) {
-            val buffer = FloatArray(256) { (sin(2.0 * PI * freq * it / 8000.0)).toFloat() }
-            spec.addSamples(buffer)
-        }
-        val col = spec.getCurrentColumn()
-        val peakBin = spec.findPeakBin()
-        assertTrue("Peak bin $peakBin should be >= 0", peakBin >= 0)
-    }
-
-    @Test
-    fun spectrogram_findPeakBin_returnsValidBin() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        // Add multiple frames of 700 Hz tone
-        for (i in 0..5) {
-            val buffer = FloatArray(256) { (sin(2.0 * PI * 700.0 * it / 8000.0)).toFloat() }
-            spec.addSamples(buffer)
-        }
-        val peakBin = spec.findPeakBin()
-        assertTrue("Peak bin should be >= 0, got $peakBin", peakBin >= 0)
-    }
-
-    @Test
-    fun spectrogram_freqToBin_roundtrip() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        val freq = 700f
-        val bin = spec.freqToBin(freq)
-        val backFreq = spec.binToFreq(bin)
-        assertTrue("Freq $freq → bin $bin → freq $backFreq", backFreq > 600f && backFreq < 800f)
-    }
-
-    @Test
-    fun spectrogram_getBinEnergy_returnsCorrectLength() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        val energy = spec.getBinEnergy(0, 10)
-        assertEquals(10, energy.size)
-    }
-
-    @Test
-    fun spectrogram_reset() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        spec.addSamples(FloatArray(256) { 1f })
-        spec.reset()
-        assertEquals(-1, spec.findPeakBin())
-    }
-
-    // --- Bayesian decoder ---
-
-    @Test
-    fun bayesian_processTone_dit() {
-        val decoder = CwBayesianDecoder()
-        // At 20 WPM, dot = 60 ms
-        val result = decoder.processTone(60f)
-        assertEquals('0', result.symbol)
-        assertTrue("Dit probability should be positive", result.probability > 0.1f)
-    }
-
-    @Test
-    fun bayesian_processTone_dash() {
-        val decoder = CwBayesianDecoder()
-        // Dash = 3 * dot = 180 ms
-        val result = decoder.processTone(180f)
-        assertEquals('1', result.symbol)
-        assertTrue("Dash probability should be positive", result.probability > 0.1f)
-    }
-
-    @Test
-    fun bayesian_processTone_unknown_returnsNull() {
-        val decoder = CwBayesianDecoder()
-        // Very long tone — low probability for both dit and dash
-        val result = decoder.processTone(5000f)
-        assertNull(result.symbol)
-    }
-
-    @Test
-    fun bayesian_processGap_interChar_returnsChar() {
-        val decoder = CwBayesianDecoder()
-        decoder.processTone(60f) // dit
-        decoder.processTone(60f) // dit
-        decoder.processTone(60f) // dit
-        // 3 dots = "000" = 'S'
-        val char = decoder.processGap(180f) // 3 * dot = inter-char gap
-        assertEquals('S', char)
-    }
-
-    @Test
-    fun bayesian_processGap_wordGap_addsSpace() {
-        val decoder = CwBayesianDecoder()
-        decoder.processTone(60f) // dit = 'E'
-        decoder.processGap(180f) // inter-char gap
-        // Now word gap
-        val space = decoder.processGap(420f) // 7 * dot
-        assertEquals(' ', space)
-    }
-
-    @Test
-    fun bayesian_decodedText_accumulates() {
-        val decoder = CwBayesianDecoder()
-        decoder.processTone(60f) // dit = 'E'
-        decoder.processGap(180f) // inter-char
-        assertTrue(decoder.decodedText.isNotEmpty())
-    }
-
-    @Test
-    fun bayesian_reset() {
-        val decoder = CwBayesianDecoder()
-        decoder.processTone(60f)
-        decoder.reset()
-        assertEquals("", decoder.decodedText)
-    }
-
-    @Test
-    fun bayesian_getSpeed() {
-        val decoder = CwBayesianDecoder()
-        // Send 3 dits at 20 WPM (60 ms each)
-        decoder.processTone(60f)
-        decoder.processTone(60f)
-        decoder.processTone(60f)
-        val speed = decoder.getSpeed()
-        assertTrue("Speed should be ~20 WPM, got $speed", speed > 15f && speed < 30f)
-    }
-
-    // --- Channel tracker ---
-
-    @Test
-    fun channelTracker_initialState() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        val tracker = CwChannelTracker(spec)
-        val channels = tracker.update()
-        assertTrue("No channels should be active initially", channels.isEmpty())
-    }
-
-    @Test
-    fun channelTracker_detectsTone() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        // Feed a tone
-        for (i in 0..5) {
-            spec.addSamples(FloatArray(256) { (sin(2.0 * PI * 700.0 * it / 8000.0)).toFloat() })
-        }
-        val tracker = CwChannelTracker(spec)
-        val channels = tracker.update()
-        assertTrue("Should detect at least 1 channel", channels.isNotEmpty())
-    }
-
-    @Test
-    fun channelTracker_bestChannel() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        for (i in 0..5) {
-            spec.addSamples(FloatArray(256) { (sin(2.0 * PI * 700.0 * it / 8000.0)).toFloat() })
-        }
-        val tracker = CwChannelTracker(spec)
-        tracker.update()
-        val best = tracker.getBestChannel()
-        assertNotNull("Best channel should exist", best)
-        if (best != null) assertTrue(best.frequency in 600f..800f)
-    }
-
-    @Test
-    fun channelTracker_reset() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        for (i in 0..5) {
-            spec.addSamples(FloatArray(256) { (sin(2.0 * PI * 700.0 * it / 8000.0)).toFloat() })
-        }
-        val tracker = CwChannelTracker(spec)
-        tracker.update()
-        tracker.reset()
-        assertNull(tracker.getBestChannel())
-    }
-
-    // --- Full decoder ---
-
-    @Test
-    fun decoder_initialState() {
-        val decoder = CwDecoder()
-        assertEquals("", decoder.decodedTextFlow.value)
-        assertEquals(0f, decoder.signalStrength.value, 0.001f)
-    }
-
-    @Test
-    fun decoder_processSilence_doesNotCrash() {
-        val decoder = CwDecoder()
-        decoder.processBuffer(FloatArray(256) { 0f })
-        assertEquals("", decoder.decodedTextFlow.value)
-    }
-
-    @Test
-    fun decoder_processNoise_doesNotCrash() {
-        val decoder = CwDecoder()
-        decoder.processBuffer(FloatArray(256) { (Math.random() * 2 - 1).toFloat() * 0.1f })
-        assertNotNull(decoder.decodedTextFlow.value)
-    }
-
-    @Test
-    fun decoder_processTone_doesNotCrash() {
-        val decoder = CwDecoder()
-        for (i in 0..20) {
-            decoder.processBuffer(FloatArray(256) { (sin(2.0 * PI * 700.0 * it / 8000.0)).toFloat() })
-        }
-        assertNotNull(decoder.decodedTextFlow.value)
-    }
-
-    @Test
-    fun decoder_reset() {
-        val decoder = CwDecoder()
-        decoder.processBuffer(FloatArray(256) { 1f })
-        decoder.resetDecoder()
-        assertEquals("", decoder.decodedTextFlow.value)
-        assertEquals(0f, decoder.signalStrength.value, 0.001f)
-    }
-
-    @Test
-    fun decoder_withFixedPitch() {
-        val decoder = CwDecoder(sampleRate = 8000, cwToneFreq = 700f)
-        assertEquals(700f, decoder.estimatedPitch.value)
-    }
-}

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/cw/CwFldigiDecoderTest.kt

@@ -1,180 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import kotlin.math.PI
-import kotlin.math.sin
-
-/**
- * Tests for the fldigi-ported CW decoder. Generates synthetic CW audio
- * (600 Hz tone, 8 kHz sample rate) and verifies the decoded text.
- */
-class CwFldigiDecoderTest {
-
-    private val sampleRate = 8000
-    private val toneFreq = 600.0
-
-    /** Synthesize a CW audio buffer for a dot-dash pattern at given WPM. */
-    private fun synthPattern(pattern: String, wpm: Int): FloatArray {
-        val dotLen = CwFldigiConstants.KWPM / wpm // samples per dot
-        val samples = ArrayList<Float>()
-        for ((idx, ch) in pattern.withIndex()) {
-            val len = if (ch == '.') dotLen else 3 * dotLen
-            for (i in 0 until len) {
-                val t = i.toDouble() / sampleRate
-                samples.add((0.6 * sin(2.0 * PI * toneFreq * t)).toFloat())
-            }
-            if (idx < pattern.length - 1) {
-                for (i in 0 until dotLen) samples.add(0f) // intra-char gap
-            }
-        }
-        return samples.toFloatArray()
-    }
-
-    /** Append an inter-character gap (3 dot lengths) of silence. */
-    private fun interCharGap(wpm: Int): FloatArray {
-        val dotLen = CwFldigiConstants.KWPM / wpm
-        return FloatArray(3 * dotLen)
-    }
-
-    private fun decodeSequence(chars: List<String>, wpm: Int, useSom: Boolean = true): String {
-        val decoder = CwFldigiDecoder(sampleRate = sampleRate, frequency = toneFreq, useSom = useSom)
-        val dotLen = CwFldigiConstants.KWPM / wpm
-        for ((ci, pattern) in chars.withIndex()) {
-            decoder.processBuffer(synthPattern(pattern, wpm))
-            decoder.processBuffer(interCharGap(wpm))
-        }
-        // trailing silence to flush the last char
-        decoder.processBuffer(FloatArray(8 * dotLen))
-        return decoder.decodedTextFlow.value
-    }
-
-    @Test
-    fun decode_basicLetter_singleDot() {
-        val decoder = CwFldigiDecoder(sampleRate = sampleRate, frequency = toneFreq)
-        decoder.processBuffer(synthPattern(".", 18))
-        decoder.processBuffer(FloatArray(8 * CwFldigiConstants.KWPM / 18))
-        assertTrue("expected E in output, got: ${decoder.decodedTextFlow.value}",
-            decoder.decodedTextFlow.value.startsWith("E"))
-    }
-
-    @Test
-    fun decode_word_CQ_18wpm() {
-        val text = decodeSequence(listOf("-.-.", "--.-"), 18)
-        assertTrue("expected CQ in output, got: $text", text.contains("C") && text.contains("Q"))
-    }
-
-    @Test
-    fun decode_hello_20wpm() {
-        val text = decodeSequence(listOf("....", ".", ".-..", ".-..", "---"), 20)
-        assertTrue("expected HELLO in output, got: $text", text.contains("H"))
-    }
-
-    @Test
-    fun decode_adaptive_speed_30wpm() {
-        // Realistic usage: decoder configured near the signal speed, tracking
-        // fine-tunes from there. Verify correct decode at 30 wpm.
-        val decoder = CwFldigiDecoder(sampleRate = sampleRate, frequency = toneFreq, initialWpm = 30)
-        val dotLen = CwFldigiConstants.KWPM / 30
-        for (pattern in listOf(".-", "-...", "-.-.", "-..", ".", "..-.", "--.", "....", "..", ".---")) {
-            decoder.processBuffer(synthPattern(pattern, 30))
-            decoder.processBuffer(interCharGap(30))
-        }
-        decoder.processBuffer(FloatArray(8 * dotLen))
-        val text = decoder.decodedTextFlow.value
-        // First char may be off while tracking converges; rest must be exact.
-        assertTrue("expected B-J at 30wpm, got: $text", text.contains("B") && text.contains("J"))
-    }
-
-    @Test
-    fun reset_clearsState() {
-        val decoder = CwFldigiDecoder(sampleRate = sampleRate, frequency = toneFreq)
-        decoder.processBuffer(synthPattern(".", 18))
-        decoder.processBuffer(FloatArray(8 * CwFldigiConstants.KWPM / 18))
-        decoder.resetDecoder()
-        assertEquals("", decoder.decodedTextFlow.value)
-    }
-
-    @Test
-    fun morseTable_lookup() {
-        assertEquals("A", MorseTable.rxLookup(".-"))
-        assertEquals("S", MorseTable.rxLookup("..."))
-        assertEquals("1", MorseTable.rxLookup(".----"))
-        assertEquals("?", MorseTable.rxLookup("..--.."))
-        assertEquals("", MorseTable.rxLookup("........"))
-    }
-
-    @Test
-    fun somTable_hasAllAsciiLetters() {
-        val patterns = SomTable.table.map { it.pattern }.toSet()
-        val letters = listOf(".-", "-...", "-.-.", "-..", ".", "..-.", "--.", "....",
-            "..", ".---", "-.-", ".-..", "--", "-.", "---", ".--.", "--.-", ".-.",
-            "...", "-", "..-", "...-", ".--", "-..-", "-.--", "--..")
-        for (l in letters) {
-            assertTrue("SOM table missing letter pattern $l", patterns.contains(l))
-        }
-    }
-
-    @Test
-    fun fftFilter_lowpass_passesTone() {
-        val filt = CwFftFilt(600.0 / 8000.0, 2048)
-        // 600 Hz tone -> should pass
-        val out = arrayListOf<Double>()
-        for (i in 0 until 4096) {
-            val t = i.toDouble() / 8000.0
-            val z = CwComplex(0.5 * sin(2.0 * PI * 600.0 * t), 0.0)
-            filt.run(z)?.let { o -> for (j in 0 until 1024) out.add(o[j].abs()) }
-        }
-        val maxVal = out.maxOrNull() ?: 0.0
-        assertTrue("expected signal to pass through lowpass, max=$maxVal", maxVal > 0.05)
-    }
-
-    @Test
-    fun autoTune_decodesOffFreqSignal() {
-        // Signal at 900 Hz but decoder initialized at 600 Hz: auto-tune must
-        // steer the NCO to the real tone, otherwise nothing decodes.
-        val decoder = CwFldigiDecoder(sampleRate = sampleRate, frequency = 600.0)
-        val dotLen = CwFldigiConstants.KWPM / 18
-        val synth = { ch: Char ->
-            val len = if (ch == '.') dotLen else 3 * dotLen
-            FloatArray(len) { i ->
-                val t = i.toDouble() / sampleRate
-                (0.6 * sin(2.0 * PI * 900.0 * t)).toFloat()
-            }
-        }
-        // "CQ" at 900 Hz: -.-.  --.-
-        val text = StringBuilder()
-        val seq = listOf(listOf('-', '.', '-', '.'), listOf('-', '-', '.', '-'))
-        for ((ci, word) in seq.withIndex()) {
-            for ((i, ch) in word.withIndex()) {
-                decoder.processBuffer(synth(ch))
-                if (i < word.size - 1) decoder.processBuffer(FloatArray(dotLen))
-            }
-            if (ci < seq.size - 1) decoder.processBuffer(FloatArray(3 * dotLen))
-        }
-        decoder.processBuffer(FloatArray(6 * dotLen))
-        val result = decoder.decodedTextFlow.value
-        assertTrue("expected CQ from 900 Hz signal (auto-tune), got: $result", result.contains("C") && result.contains("Q"))
-        // pitch should have moved toward 900 Hz
-        val pitch = decoder.estimatedPitch.value ?: 0f
-        assertTrue("expected pitch near 900, got $pitch", pitch > 800f && pitch < 1000f)
-    }
-}

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/wavelog/WaveLogApiPayloadTest.kt

@@ -1,92 +0,0 @@
-package com.rtbishop.look4sat.core.domain.wavelog
-
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import java.util.Locale
-
-/**
- * Verifies the WaveLog upload payload frequency/band fields.
- *
- * Regression: user reported QSOs landing in the 160m band. The v2 JSON
- * envelope must carry freq as a MHz string with an "M" suffix so WaveLog's
- * parse_frequency() reads it as Hz internally; a bare integer or bare MHz
- * value corrupts band derivation.
- */
-class WaveLogApiPayloadTest {
-
-    // SO-50: uplink 145.850 MHz, downlink 436.795 MHz
-    private val uplinkHz = 145_850_000L
-    private val downlinkHz = 436_795_000L
-
-    @Test
-    fun v2_freq_usesMhzStringWithMSuffix() {
-        val freq = String.format(Locale.ENGLISH, "%.6fM", uplinkHz / 1_000_000.0)
-        val freqRx = String.format(Locale.ENGLISH, "%.6fM", downlinkHz / 1_000_000.0)
-        assertEquals("145.850000M", freq)
-        assertEquals("436.795000M", freqRx)
-        // WaveLog parse_frequency: "145.850000M" -> 145850000 Hz
-        val parsedHz = parseLikeWaveLog(freq)
-        assertEquals(uplinkHz, parsedHz)
-    }
-
-    @Test
-    fun v1_adif_freq_isBareMhzNumber() {
-        // v1 ADIF <FREQ> is a bare MHz number per ADIF spec (no unit suffix)
-        val freq = String.format(Locale.ENGLISH, "%.6f", uplinkHz / 1_000_000.0)
-        assertEquals("145.850000", freq)
-        val adifFreq = freq.toDouble() * 1_000_000
-        assertEquals(uplinkHz.toDouble(), adifFreq, 1.0)
-    }
-
-    /** Mirrors WaveLog Logbook_model::parse_frequency: int = Hz, "12.3M" suffix = MHz. */
-    private fun parseLikeWaveLog(raw: String): Long {
-        val s = raw.trim()
-        return if (s.endsWith("M", ignoreCase = true)) {
-            (s.dropLast(1).toDouble() * 1_000_000).toLong()
-        } else if (s.endsWith("k", ignoreCase = true)) {
-            (s.dropLast(1).toDouble() * 1_000).toLong()
-        } else {
-            s.toLong()
-        }
-    }
-
-    @Test
-    fun qsoFreqs_stayInSatelliteBands_afterDoppler() {
-        // Doppler-corrected values must remain near the base frequency.
-        // SPEED_OF_LIGHT = 299792458 m/s; distanceRate is km/s (x1000 -> m/s).
-        val dopplerRate = 7.0 // km/s approaching
-        val corrected = uplinkHz * (299_792_458.0 + dopplerRate * 1000.0) / 299_792_458.0
-        assertTrue(
-            "corrected within +-20kHz, got ${corrected - uplinkHz} Hz",
-            kotlin.math.abs(corrected - uplinkHz) < 20_000
-        )
-        // band derivation: 145.x MHz -> 2m, never 160m (1.8-2.0 MHz)
-        val mhz = corrected / 1_000_000.0
-        assertTrue("145.x MHz stays in 2m, got $mhz MHz", mhz in 144.0..148.0)
-    }
-
-    @Test
-    fun band_isRealBand_notSAT() {
-        // SO-50: TX 145.850 MHz (VHF) -> band 2M, sat mode V/U
-        assertEquals("2M", WaveLogApi.bandFromHz(145_850_000))
-        assertEquals("V/U", WaveLogApi.satModeFrom(145_850_000, 436_795_000))
-        // AO-73: TX 435.150 MHz (UHF up), RX 145.950 MHz (VHF down) -> band 70CM, U/V
-        assertEquals("70CM", WaveLogApi.bandFromHz(435_150_000))
-        assertEquals("U/V", WaveLogApi.satModeFrom(435_150_000, 145_950_000))
-        // Same-band (e.g. simplex) -> empty sat mode
-        assertEquals("", WaveLogApi.satModeFrom(145_850_000, 145_950_000))
-        // Never 160m for satellite frequencies
-        assertTrue(WaveLogApi.bandFromHz(145_850_000) != "160M")
-        assertTrue(WaveLogApi.bandFromHz(436_795_000) != "160M")
-    }
-
-    @Test
-    fun adif_containsRealBandAndSatMode() {
-        // v2 payload fields (mirror postQso construction)
-        val band = WaveLogApi.bandFromHz(uplinkHz)
-        val satMode = WaveLogApi.satModeFrom(uplinkHz, downlinkHz)
-        assertEquals("2M", band)
-        assertEquals("V/U", satMode)
-    }
-}

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

@@ -34,6 +34,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.CircularProgressIndicator
@@ -46,6 +47,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
+import androidx.compose.material3.SheetValue
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.runtime.Composable
@@ -143,7 +145,7 @@ fun RowScope.NextPassRow(pass: OrbitalPass, modifier: Modifier = Modifier, isUtc
         if (isUtc) TimeZone.getTimeZone("UTC") else TimeZone.getDefault()
     }
     val sdfTime = remember(isUtc) {
-        SimpleDateFormat("HH:mm:ss", Locale.ENGLISH).also { it.timeZone = timeZone }
+        SimpleDateFormat("HH:mm:ss", displayLocale()).also { it.timeZone = timeZone }
     }
     ElevatedCard(
         modifier = modifier
@@ -157,13 +159,16 @@ fun RowScope.NextPassRow(pass: OrbitalPass, modifier: Modifier = Modifier, isUtc
                 .padding(start = 6.dp, top = 1.dp, end = 6.dp, bottom = 0.dp)
         ) {
             Row(verticalAlignment = Alignment.CenterVertically) {
+                Text(
+                    text = "${stringResource(R.string.pass_satId, pass.catNum)} - ",
+                    color = MaterialTheme.colorScheme.primary
+                )
                 Text(
                     text = pass.name,
                     modifier = Modifier
                         .weight(1f)
                         .padding(end = 6.dp)
                         .infiniteMarquee(),
-                    color = MaterialTheme.colorScheme.primary,
                     fontWeight = FontWeight.Medium,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis
@@ -209,6 +214,11 @@ fun RowScope.NextPassRow(pass: OrbitalPass, modifier: Modifier = Modifier, isUtc
     }
 }
 
+private fun displayLocale(): Locale {
+    val locale = Locale.getDefault()
+    return if (locale.language == Locale.CHINESE.language) locale else Locale.ENGLISH
+}
+
 @Composable
 fun CardButton(onClick: () -> Unit, text: String, modifier: Modifier = Modifier) {
     ElevatedButton(
@@ -299,7 +309,8 @@ fun SharedDialog(
     titleTextAlign: TextAlign = if (onCancel != null && onAccept != null) TextAlign.Center else TextAlign.Start,
     content: @Composable (padding: Dp) -> Unit
 ) {
-    DialogShell(onDismissRequest = onDismissRequest) { padding ->
+    val dismissible = onCancel != null
+    DialogShell(onDismissRequest = onDismissRequest, dismissible = dismissible) { padding ->
         Row(
             verticalAlignment = Alignment.CenterVertically,
             modifier = Modifier
@@ -333,10 +344,14 @@ fun SharedDialog(
 @Composable
 private fun DialogShell(
     onDismissRequest: () -> Unit,
+    dismissible: Boolean = true,
     content: @Composable (padding: Dp) -> Unit
 ) {
     val padding = LocalSpacing.current.large
-    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    val sheetState = rememberModalBottomSheetState(
+        skipPartiallyExpanded = true,
+        confirmValueChange = { if (dismissible) true else it != SheetValue.Hidden }
+    )
     val stopSheetFling = remember {
         object : NestedScrollConnection {
             override suspend fun onPostFling(consumed: Velocity, available: Velocity): Velocity {
@@ -351,10 +366,10 @@ private fun DialogShell(
         }
     }
     ModalBottomSheet(
-        onDismissRequest = onDismissRequest,
+        onDismissRequest = if (dismissible) onDismissRequest else { {} },
         sheetState = sheetState,
         dragHandle = null,
-        shape = MaterialTheme.shapes.medium,
+        shape = RoundedCornerShape(topStart = 24.dp, topEnd = 24.dp),
         scrimColor = Color.Black.copy(alpha = 0.64f)
     ) {
         Column(
@@ -518,5 +533,6 @@ fun formatFrequency(frequencyHz: Long): String {
     if (frequencyHz <= 0) return "---"
     val mhz = frequencyHz / 1_000_000
     val khz = (frequencyHz % 1_000_000) / 1_000
-    return String.format(Locale.ENGLISH, "%d.%03d", mhz, khz)
+    val hz = frequencyHz % 1_000
+    return String.format(Locale.ENGLISH, "%d.%03d.%03d", mhz, khz, hz)
 }

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

@@ -79,6 +79,10 @@ 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),
@@ -101,10 +105,10 @@ private val darkScheme = darkColorScheme(
     onSecondary = Color(0xFF000000),
     secondaryContainer = Color(0xFF404040), // navBar indicator,
     onSecondaryContainer = Color(0xFFE0E0E0), // navBar active icon
-//    tertiary = Color(0xFF121212),
-//    onTertiary = Color(0xFF121212),
-//    tertiaryContainer = Color(0xFF121212),
-//    onTertiaryContainer = Color(0xFF121212),
+    tertiary = Color(0xFF648FFF), // AMSAT Active (from amsat.org/status)
+    onTertiary = Color(0xFF000000),
+    tertiaryContainer = Color(0xFFFFB000), // AMSAT Telemetry
+    onTertiaryContainer = Color(0xFF000000),
     background = Color(0xFF121212),
     onBackground = Color(0xFFE0E0E0),
     surface = Color(0xFF202020), // card background

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

@@ -21,45 +21,24 @@ import androidx.navigation3.runtime.NavKey
 import kotlinx.serialization.Serializable
 
 @Serializable
-sealed class Screen(val iconResId: Int, val titleResId: Int, val screenId: String) : NavKey {
+sealed class Screen(val iconResId: Int, val titleResId: Int) : NavKey {
 
     @Serializable
-    data object Satellites : Screen(R.drawable.ic_satellites, R.string.nav_sat, "Satellites")
+    data object Satellites : Screen(R.drawable.ic_satellites, R.string.nav_sat)
 
     @Serializable
-    data object Passes : Screen(R.drawable.ic_passes, R.string.nav_pass, "Passes")
+    data object Passes : Screen(R.drawable.ic_passes, R.string.nav_pass)
 
     @Serializable
-    data object Radar : Screen(R.drawable.ic_radar, R.string.nav_radar, "Radar")
+    data object Radar : Screen(R.drawable.ic_radar, R.string.nav_radar)
 
     @Serializable
-    data object Map : Screen(R.drawable.ic_map, R.string.nav_map, "Map")
+    data object Map : Screen(R.drawable.ic_map, R.string.nav_map)
 
     @Serializable
-    data object Mutual : Screen(R.drawable.ic_match, R.string.nav_mutual, "Mutual")
-
-    @Serializable
-    data object Roaming : Screen(R.drawable.ic_roaming, R.string.nav_roaming, "Roaming")
-
-    @Serializable
-    data object CwDecode : Screen(R.drawable.ic_cw, R.string.nav_cw, "CwDecode")
-
-    @Serializable
-    data object WavelogLog : Screen(R.drawable.ic_log, R.string.nav_log, "WavelogLog")
-
-    @Serializable
-    data object AmSat : Screen(R.drawable.ic_satellites, R.string.nav_amsat, "AMSAT")
-
-    @Serializable
-    data object Settings : Screen(R.drawable.ic_settings, R.string.nav_prefs, "Settings")
+    data object Settings : Screen(R.drawable.ic_settings, R.string.nav_prefs)
 }
 
-// UI settings: default main-menu page order (5 bottom-bar slots)
-val defaultScreenOrder = listOf("Satellites", "Passes", "Radar", "Map", "Settings")
-
-// UI settings: default More-menu order (pages behind "More")
-val defaultSubMenuOrder = listOf("Mutual", "Roaming", "CwDecode", "WavelogLog", "AMSAT")
-
 @Serializable
 data object RadarDestination : NavKey
 
@@ -88,4 +67,4 @@ class DeeplinkResolver(private val fallbackDestination: NavKey = Screen.Passes)
         matchers.forEach { it.match(deeplink)?.let { match -> return match } }
         return fallbackDestination
     }
-}
+}

core/presentation/src/main/res/drawable/ic_cw.xml

@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <!-- Morse style icon: a dot above a dash -->
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M 8 4 L 16 4 L 16 8 L 8 8 Z" />
-
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M 3 16 L 21 16 L 21 20 L 3 20 Z" />
-</vector>

core/presentation/src/main/res/drawable/ic_like.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="15"
+    android:viewportHeight="15">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13.91,6.75c-1.17,2.25 -4.3,5.31 -6.07,6.94c-0.19,0.172 -0.48,0.172 -0.67,0C5.39,12.06 2.26,9 1.09,6.75C-1.48,1.8 5,-1.5 7.5,3.45C10,-1.5 16.48,1.8 13.91,6.75z" />
+</vector>

core/presentation/src/main/res/drawable/ic_log.xml

@@ -1,9 +0,0 @@
-<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="M6,2h9l5,5v13c0,1.1 -0.9,2 -2,2H6c-1.1,0 -2,-0.9 -2,-2V4c0,-1.1 0.9,-2 2,-2zM14,3.5V8h4.5L14,3.5zM8,12h8v2H8v-2zM8,16h8v2H8v-2z" />
-</vector>

core/presentation/src/main/res/drawable/ic_match.xml

@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="96"
-    android:viewportHeight="96">
-
-    <path
-        android:fillColor="@android:color/transparent"
-        android:strokeColor="@android:color/white"
-        android:strokeWidth="6"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:pathData="M 8 76 C 8 44, 21 24, 39 24 C 57 24, 70 44, 70 76" />
-
-    <path
-        android:fillColor="@android:color/transparent"
-        android:strokeColor="@android:color/white"
-        android:strokeWidth="6"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:pathData="M 30 76 C 30 54, 44 42, 62 42 C 80 42, 94 54, 94 76" />
-</vector>

core/presentation/src/main/res/drawable/ic_pound.xml

@@ -1,9 +0,0 @@
-<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="@android:color/white"
-        android:pathData="M14,21c1.93,0 3.62,-1.17 4,-3l-1.75,-0.88C16,18.21 15.33,19 14,19l-4.9,0c0.83,-1 1.5,-2.34 1.5,-4c0,-0.35 -0.03,-0.69 -0.08,-1L14,14v-2l-4.18,0C9,10.42 8,9.6 8,8c0,-1.93 1.57,-3.5 3.5,-3.5c1.5,0 2.79,0.95 3.28,2.28L16.63,6c-0.8,-2.05 -2.79,-3.5 -5.13,-3.5C8.46,2.5 6,4.96 6,8c0,1.78 0.79,2.9 1.49,4L6,12v2l2.47,0c0.08,0.31 0.13,0.64 0.13,1c0,2.7 -2.6,4 -2.6,4v2H14z" />
-</vector>

core/presentation/src/main/res/drawable/ic_reset.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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="@android:color/white"
-        android:pathData="M12,6v3l4,-4 -4,-4v3c-4.42,0 -8,3.58 -8,8 0,1.57 0.46,3.03 1.24,4.26L6.7,14.8c-0.45,-0.83 -0.7,-1.79 -0.7,-2.8 0,-3.31 2.69,-6 6,-6zM18.76,7.74L17.3,9.2c0.44,0.84 0.7,1.79 0.7,2.8 0,3.31 -2.69,6 -6,6v-3l-4,4 4,4v-3c4.42,0 8,-3.58 8,-8 0,-1.57 -0.46,-3.03 -1.24,-4.26z" />
-</vector>

core/presentation/src/main/res/drawable/ic_roaming.xml

@@ -1,25 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="96"
-    android:viewportHeight="96">
-
-    <!-- Crosshair / grid-locator style icon: concentric rings + center dot -->
-    <path
-        android:fillColor="@android:color/transparent"
-        android:strokeColor="@android:color/white"
-        android:strokeWidth="6"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:pathData="M 48 12 L 48 84 M 12 48 L 84 48" />
-
-    <path
-        android:fillColor="@android:color/transparent"
-        android:strokeColor="@android:color/white"
-        android:strokeWidth="6"
-        android:pathData="M 48 26 A 22 22 0 1 0 48.1 26" />
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M 44 44 L 52 44 L 52 52 L 44 52 Z" />
-</vector>

core/presentation/src/main/res/drawable/ic_tags.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M240,800L280,640L120,640L140,560L300,560L340,400L180,400L200,320L360,320L400,160L480,160L440,320L600,320L640,160L720,160L680,320L840,320L820,400L660,400L620,560L780,560L760,640L600,640L560,800L480,800L520,640L360,640L320,800L240,800ZM380,560L540,560L580,400L420,400L380,560Z" />
-</vector>

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

@@ -13,12 +13,16 @@
     <string name="nav_prefs">Ajustes</string>
 
     <!-- Satellites screen -->
-    <string name="sat_type_hint">Tipo: %s</string>
-    <string name="sat_type_title">Seleccionar tipo de satélite</string>
+    <string name="sat_type_hint">Modos: %s</string>
+    <string name="sat_type_title">Seleccionar modos</string>
     <string name="sat_search_hint">Id - Nombre</string>
     <string name="sat_search_clear">Vaciar</string>
     <string name="sat_clear_all">Vaciar todo</string>
     <string name="sat_select_all">Seleccionar todo</string>
+    <string name="sat_group_selected">Seleccionados</string>
+    <string name="sat_group_available">Disponibles</string>
+    <string name="sat_group_selected_count">Seleccionados (%1$d)</string>
+    <string name="sat_group_available_count">Disponibles (%1$d)</string>
     <string name="sat_empty_list_message">
         Asegúrese de que su consulta de búsqueda sea correcta y que la base de datos esté actualizada</string>
     <string name="sat_warning_title">Alarma\!</string>
@@ -26,7 +30,7 @@
         Esta aplicación incluye más de 9000 satélites.
         No tiene sentido rastrearlos todos a la vez.
         \n\nIntenta siempre limitar la lista a los que te
-        interesen mediante la búsqueda y el selector de tipos.</string>
+        interesen mediante la búsqueda y el selector de modos.</string>
 
     <!-- Passes screen -->
     <string name="pass_filter_title">Filtrar pases</string>
@@ -35,7 +39,7 @@
     <string name="pass_filter_aos_time">Ventana AOS</string>
     <string name="pass_filter_invert_time">Invertir ventana AOS</string>
     <string name="pass_filter_deep_space">DeepSpace (período &gt;225min)</string>
-    <string name="pass_modes_title">Tipo de modulación</string>
+    <string name="pass_modes_title">Seleccionar modos</string>
     <string name="pass_elevation">Elevación: %.1f°</string>
     <string name="pass_altitude">Altitud: %.0f km</string>
     <string name="pass_empty_list_message">
@@ -96,11 +100,11 @@
     <string name="prefs_loc_qth_title">QTH</string>
     <string name="prefs_loc_qth_error">Ubicación QTH no válida</string>
     <string name="prefs_loc_success">Ubicación actualizada con éxito</string>
-    <string name="prefs_station_title">Ajustar ubicaicón de la estación</string>
-    <string name="prefs_station_lat_text">Latitud de tu estación terrestre</string>
-    <string name="prefs_station_lon_text">Longitud de tu estación terrestre</string>
-    <string name="prefs_locator_title">Ajustes ubicación QTH</string>
-    <string name="prefs_locator_text">Ajustar posición de la estación con tu ubicación</string>
+    <string name="prefs_station_title">Ubicación de la estación</string>
+    <string name="prefs_station_lat_text">Latitud de estación</string>
+    <string name="prefs_station_lon_text">Longitud de estación</string>
+    <string name="prefs_locator_title">Localizador QTH</string>
+    <string name="prefs_locator_text">Posición por localizador</string>
 
     <string name="prefs_data_title">Datos satelitales</string>
     <string name="prefs_data_entries">Satélites: %s</string>
@@ -110,39 +114,52 @@
     <string name="prefs_data_clear">Vaciar</string>
     <string name="prefs_data_clear_success">Datos eliminados con éxito</string>
     <string name="prefs_data_update_success">Actualización completada con éxito</string>
+    <string name="prefs_data_import_satellites_error">No se importaron satélites. Usa un TLE/3LE (.txt) u OMM (.csv) válido.</string>
+    <string name="prefs_data_import_transceivers_error">No se importaron transceptores. Usa un SatNOGS (.json) válido.</string>
 
-    <string name="prefs_data_sources_title">Custom data sources</string>
-    <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>
-    <string name="prefs_data_sources_transceivers_switch">Custom transceivers URL</string>
+    <string name="prefs_data_sources_title">Fuentes personalizadas</string>
+    <string name="prefs_data_sources_tle_switch">URL TLE</string>
+    <string name="prefs_data_sources_transceivers_switch">URL transceptores</string>
+    <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>
 
-    <string name="prefs_data_output_title">Data output</string>
-    <string name="prefs_net_output">Network</string>
+    <string name="prefs_data_output_title">Salida de datos</string>
+    <string name="prefs_net_output">Red</string>
     <string name="prefs_bt_output">Bluetooth</string>
+    <string name="prefs_cat_output">CAT</string>
 
-    <string name="prefs_net_title">Salida de datos de red</string>
-    <string name="prefs_net_rotator_switch">Enable rotation output</string>
+    <string name="nav_radiocontrol">Control de radio</string>
+    <string name="rc_settings_title">Control CAT</string>
+    <string name="rc_radio_model">Modelo de radio</string>
+    <string name="rc_tx_device_hint">Dirección BT TX</string>
+    <string name="rc_rx_device_hint">Dirección BT RX</string>
+    <string name="rc_tx_name_hint">Nombre radio TX</string>
+    <string name="rc_rx_name_hint">Nombre radio RX</string>
+    <string name="rc_enable_switch">Activar CAT</string>
+
+    <string name="prefs_net_title">Salida de red</string>
+    <string name="prefs_net_rotator_switch">Activar salida de rotación</string>
     <string name="prefs_net_rotator_address_hint">IP:Puerto</string>
     <string name="prefs_net_rotator_format_hint">Formato de datos</string>
-    <string name="prefs_net_frequency_switch">Enable frequency output</string>
+    <string name="prefs_net_frequency_switch">Activar salida de frecuencia</string>
     <string name="prefs_net_frequency_address_hint">IP:Puerto</string>
     <string name="prefs_net_frequency_format_hint">Formato de datos</string>
 
-    <string name="prefs_bt_title">Salida por Bluetooth</string>
-    <string name="prefs_bt_rotator_switch">Enable rotation output</string>
-    <string name="prefs_bt_rotator_device_hint">Id dispositivo</string>
-    <string name="prefs_bt_rotator_output_hint">Formato de datos</string>
-    <string name="prefs_bt_frequency_switch">Enable frequency output</string>
-    <string name="prefs_bt_frequency_device_hint">Id dispositivo</string>
-    <string name="prefs_bt_frequency_output_hint">Formato de datos</string>
+    <string name="prefs_bt_title">Salida Bluetooth</string>
+    <string name="prefs_bt_rotator_switch">Activar salida de rotación</string>
+    <string name="prefs_bt_rotator_device_hint">ID dispositivo</string>
+    <string name="prefs_bt_rotator_output_hint">Formato</string>
+    <string name="prefs_bt_frequency_switch">Activar salida de frecuencia</string>
+    <string name="prefs_bt_frequency_device_hint">ID dispositivo</string>
+    <string name="prefs_bt_frequency_output_hint">Formato</string>
     <string name="prefs_bt_perm_error">Revisa los permisos de Bluetooth</string>
     <string name="prefs_net_perm_error">Revisa los permisos de red</string>
 
-    <string name="prefs_other_title">Otros ajustes</string>
-    <string name="prefs_other_switch_utc">Mostrar tiempos de pase en UTC</string>
-    <string name="prefs_other_switch_update">Habilitar auto actualización de datos</string>
-    <string name="prefs_other_switch_sweep">Habilitar animaciones radar</string>
-    <string name="prefs_other_switch_sensors">Usar sensores para rotar vista de radar</string>
-    <string name="prefs_other_switch_night_mode">Activar filtro nocturno rojo</string>
+    <string name="prefs_other_title">Otros</string>
+    <string name="prefs_other_switch_utc">Hora UTC</string>
+    <string name="prefs_other_switch_update">Actualización automática</string>
+    <string name="prefs_other_switch_sweep">Animación radar</string>
+    <string name="prefs_other_switch_sensors">Sensores</string>
+    <string name="prefs_other_switch_night_mode">Filtro nocturno</string>
 
     <string name="prefs_highlight_title">Resaltado de elevación</string>
     <string name="prefs_highlight_low">Baja &lt; %1$d°</string>

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

@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name" translatable="false">Look4Sat Pro</string>
-    <string name="btn_accept">Terima</string>
-    <string name="btn_cancel">Batal</string>
-    <string name="empty_list_message">Tidak ada data untuk ditampilkan</string>
-    <string name="nav_sat">Satelit</string>
-    <string name="nav_pass">Lintasan</string>
-    <string name="nav_radar">Radar</string>
-    <string name="nav_mutual">Pasangan</string>
-    <string name="nav_roaming">Jelajah</string>
-    <string name="nav_cw">Dekoder CW</string>
-    <string name="nav_map">Peta</string>
-    <string name="nav_prefs">Pengaturan</string>
-    <string name="prefs_aprs_title">Pelaporan APRS</string>
-    <string name="prefs_aprs_enable">Aktifkan pelaporan APRS</string>
-    <string name="prefs_aprs_summary">Server: %1$s:%2$d  Panggilan: %3$s</string>
-    <string name="prefs_aprs_report_now">Lapor Sekarang</string>
-    <string name="prefs_aprs_settings_title">Pengaturan APRS</string>
-    <string name="prefs_aprs_server">Server</string>
-    <string name="prefs_aprs_port">Port</string>
-    <string name="prefs_aprs_callsign">Tanda panggilan</string>
-    <string name="prefs_aprs_ssid">SSID</string>
-    <string name="prefs_aprs_passcode">Kode sandi</string>
-    <string name="prefs_aprs_passcode_hint">Kosong = otomatis dari panggilan</string>
-    <string name="prefs_aprs_interval">Interval (menit)</string>
-    <string name="prefs_aprs_status">Teks status</string>
-    <string name="prefs_aprs_symbol_table">Tabel simbol</string>
-    <string name="prefs_aprs_symbol_code">Kode simbol</string>
-    <string name="prefs_aprs_save">Simpan</string>
-    <string name="prefs_aprs_cancel">Batal</string>
-    <string name="aprs_notif_channel">Layanan APRS</string>
-    <string name="aprs_notif_title">APRS: %1$s</string>
-    <string name="aprs_notif_running">Pelaporan berjalan</string>
-    <string name="aprs_notif_connected">Terhubung ke APRS-IS</string>
-    <string name="aprs_notif_error">Kesalahan koneksi</string>
-    <string name="aprs_notif_stop">Berhenti</string>
-    <string name="prefs_aprs_calc_passcode">Hitung kode sandi</string>
-    <string name="aprs_toast_ok">APRS: laporan terkirim</string>
-    <string name="aprs_toast_fail">APRS: laporan gagal - %1$s</string>
-    <string name="aprs_toast_not_configured">APRS belum dikonfigurasi - isi panggilan dulu</string>
-    <string name="prefs_aprs_last_report">Laporan terakhir: %1$s %2$s</string>
-    <string name="prefs_aprs_last_ok">OK</string>
-    <string name="prefs_aprs_last_fail">gagal - %1$s</string>
-    <string name="nav_more">Lainnya</string>
-    <string name="nav_log">Log</string>
-    <string name="nav_amsat">AMSAT</string>
-    <string name="amsat_title">Status Satelit AMSAT</string>
-    <string name="amsat_refresh">Segarkan</string>
-    <string name="amsat_retry">Coba lagi</string>
-    <string name="amsat_updated">Diperbarui:</string>
-    <string name="amsat_active">Aktif</string>
-    <string name="amsat_tlm">TLM/beacon</string>
-    <string name="amsat_not_heard">Tidak terdengar</string>
-    <string name="amsat_conflict">Konflik</string>
-    <string name="amsat_name">Name</string>
-    <string name="amsat_load_failed">Gagal memuat - periksa jaringan dan coba lagi</string>
-    <string name="amsat_no_reports">Tidak ada laporan untuk periode ini</string>
-    <string name="amsat_close">Tutup</string>
-
-    <string name="sat_type_hint">Jenis: %s</string>
-    <string name="sat_type_title">Pilih jenis satelit</string>
-    <string name="sat_search_hint">Id - Nama</string>
-    <string name="sat_search_clear">Bersihkan</string>
-    <string name="sat_clear_all">Bersihkan semua</string>
-    <string name="sat_select_all">Pilih semua</string>
-    <string name="sat_empty_list_message">Pastikan kata kunci pencarian Anda benar dan DB sudah diperbarui</string>
-    <string name="sat_warning_title">Peringatan\!</string>
-    <string name="sat_warning_message">
-        Ada lebih dari 9000 satelit yang terdaftar di aplikasi ini.
-        Tidak masuk akal untuk melacak semuanya sekaligus.
-        \n\nSelalu coba persempit daftar hanya ke satelit yang
-        Anda minati melalui pencarian dan pemilih jenis.</string>
-    <string name="pass_filter_title">Filter lintasan</string>
-    <string name="pass_filter_elev">Elevasi minimal</string>
-    <string name="pass_filter_hours">Waktu ke depan</string>
-    <string name="pass_filter_aos_time">Jendela AOS</string>
-    <string name="pass_filter_invert_time">Balik jendela AOS</string>
-    <string name="pass_filter_deep_space">DeepSpace (periode >225 mnt)</string>
-    <string name="pass_time_placeholder" translatable="false"> -- : -- : -- </string>
-    <string name="pass_modes_title">Pilih jenis modulasi</string>
-    <string name="pass_satId" translatable="false">%05d</string>
-    <string name="pass_elevation">Elevasi: %.1f°</string>
-    <string name="pass_deep_space" translatable="false">DeepSpace</string>
-    <string name="pass_altitude">Ketinggian: %d km</string>
-    <string name="pass_aosLos" translatable="false">%03d° - %03d°</string>
-    <string name="pass_empty_list_message">
-        Pastikan filter Anda benar dan Anda sudah memilih satelit</string>
-    <string name="pass_error_message">Tidak ada lintasan satelit mendatang untuk ditampilkan</string>
-    <string name="pass_welcome_title">Selamat datang di Look4Sat\!</string>
-    <string name="pass_welcome_message">
-        Pastikan Anda mengatur posisi melalui GPS, Lat/Lon atau QTH di Pengaturan.
-        \n\nPerbarui database setidaknya seminggu sekali untuk prediksi yang akurat.</string>
-    <string name="pass_whatsnew_title" translatable="false">Apa yang baru di Look4Sat</string>
-    <string name="pass_whatsnew_message" translatable="false">
-        * BARU: Status satelit AMSAT kini menggunakan API resmi AMSAT (v1 JSON, lebih cepat dan andal)
-        * Halaman status AMSAT kini mendukung layar penuh (tombol refresh dan waktu selalu dapat diakses)
-        * WaveLog: pencarian grid lawan QRZ (dialog ⚙ tempel Cookie + uji query)
-        * WaveLog: tombol perbarui daftar satelit LoTW (112 satelit bawaan)
-        * WaveLog: laporan sinyal RST 59/59 untuk QSO (v1 dan v2)
-    </string>
-    <string name="radar_back">Kembali</string>
-    <string name="radar_notify">Beri tahu</string>
-    <string name="radar_az_text">Azimuth</string>
-    <string name="radar_az_value" translatable="false">%.1f°</string>
-    <string name="radar_el_text">Elevasi</string>
-    <string name="radar_el_value" translatable="false">%.1f°</string>
-    <string name="radar_alt_text">Ketinggian</string>
-    <string name="radar_alt_value" translatable="false">%.0f km</string>
-    <string name="radar_dist_text">Jarak</string>
-    <string name="radar_dist_value" translatable="false">%.0f km</string>
-    <string name="radar_eclipsed">Gerhana</string>
-    <string name="radar_downlink">Downlink</string>
-    <string name="radar_uplink">Uplink</string>
-    <string name="radar_link_low" translatable="false">%.4f</string>
-    <string name="radar_link_lowHigh" translatable="false">%.4f - %.4f</string>
-    <string name="radar_no_link" translatable="false">- - . - -</string>
-    <string name="radar_no_data">Satelit ini tidak memiliki transceiver</string>
-    <string name="radar_add">Tambah</string>
-    <string name="radar_data">Transceiver satelit:</string>
-    <string name="radar_inverted">Terbalik: %s</string>
-    <string name="radar_mode">Mode: %s</string>
-    <string name="radar_string_no">Tidak</string>
-    <string name="radar_string_yes">Ya</string>
-    <string name="radar_visible">Terlihat</string>
-    <string name="radar_doppler_calc">Kalkulator Frekuensi Doppler</string>
-    <string name="radar_doppler_tx_hint">Masukkan frekuensi TX (MHz)</string>
-    <string name="radar_doppler_rx_hint">Masukkan frekuensi RX (MHz)</string>
-    <string name="radar_doppler_offset_hint">Offset (kHz)</string>
-    <string name="radar_doppler_info">Untuk transponder linier, ketik satu frekuensi untuk melihat frekuensi lainnya</string>
-    <string name="radar_cw_decoder">Dekoder CW</string>
-    <string name="radar_cw_start">Mulai</string>
-    <string name="radar_cw_stop">Berhenti</string>
-    <string name="radar_cw_reset">Bersihkan</string>
-    <string name="map_prev">Sebelumnya</string>
-    <string name="map_next">Berikutnya</string>
-    <string name="map_copyright" translatable="false">© Kontributor OpenStreetMap</string>
-    <string name="map_azimuth">Azimuth: %.1f°</string>
-    <string name="map_elevation">Elevasi: %.1f°</string>
-    <string name="map_altitude">Ketinggian: %.0f km</string>
-    <string name="map_distance">Jarak: %.0f km</string>
-    <string name="map_latitude">Lintang: %.1f°</string>
-    <string name="map_longitude">Bujur: %.1f°</string>
-    <string name="map_qth" translatable="false">QTH: %s</string>
-    <string name="map_phase">Fase: %.1f°</string>
-    <string name="map_eclipsed">Gerhana</string>
-    <string name="map_period">Periode: %.0f mnt</string>
-    <string name="map_velocity">Kecepatan: %.2f km/d</string>
-    <string name="map_visibility">Visibilitas: %s</string>
-    <string name="map_visible">Terlihat</string>
-    <string name="prefs_app_title" translatable="false">Look4Sat Pro v%s</string>
-    <string name="prefs_app_url" translatable="false">https://play.google.com/store/apps/details?id=com.rtbishop.look4sat</string>
-    <string name="prefs_donate_title">Donasi</string>
-    <string name="prefs_donate_url" translatable="false">https://ko-fi.com/rt_bishop</string>
-    <string name="prefs_fdroid_title" translatable="false">F-Droid</string>
-    <string name="prefs_fdroid_url" translatable="false">https://f-droid.org/en/packages/com.rtbishop.look4sat/</string>
-    <string name="prefs_github_title" translatable="false">GitHub</string>
-    <string name="prefs_github_url" translatable="false">https://github.com/rt-bishop/Look4Sat/</string>
-    <string name="prefs_license_title" translatable="false">GPLv3</string>
-    <string name="prefs_license_url" translatable="false">https://www.gnu.org/licenses/gpl-3.0.html</string>
-    <string name="prefs_privacy_title">Kebijakan Privasi</string>
-    <string name="prefs_privacy_url" translatable="false">https://sites.google.com/view/look4sat-privacy-policy/home</string>
-    <string name="prefs_updated_title">Diperbarui: %s</string>
-    <string name="prefs_updated_time">d MMM yyyy - HH:mm:ss</string>
-    <string name="prefs_loc_title">Posisi stasiun</string>
-    <string name="prefs_loc_gps_title">GPS</string>
-    <string name="prefs_loc_gps_error">Tidak dapat mengambil lokasi - periksa izin dan sinyal GPS/jaringan</string>
-    <string name="prefs_loc_input_title">Input</string>
-    <string name="prefs_loc_input_error">Lokasi yang dimasukkan tidak valid</string>
-    <string name="prefs_loc_qth_title">QTH</string>
-    <string name="prefs_loc_qth_error">Lokator QTH tidak valid</string>
-    <string name="prefs_loc_success">Posisi berhasil diperbarui</string>
-    <string name="prefs_station_title">Pengaturan posisi stasiun</string>
-    <string name="prefs_station_lat_text">Atur garis lintang stasiun Anda</string>
-    <string name="prefs_station_lon_text">Atur garis bujur stasiun Anda</string>
-    <string name="prefs_locator_title">Pengaturan lokator QTH</string>
-    <string name="prefs_locator_text">Atur posisi stasiun menggunakan lokator</string>
-    <string name="prefs_data_title">Data satelit</string>
-    <string name="prefs_data_entries">Satelit: %s</string>
-    <string name="prefs_data_radios">Transceiver: %s</string>
-    <string name="prefs_data_update">Perbarui</string>
-    <string name="prefs_data_import">URL Kustom</string>
-    <string name="prefs_data_clear">Bersihkan</string>
-    <string name="prefs_data_clear_success">Data berhasil dibersihkan</string>
-    <string name="prefs_data_update_success">Pembaruan berhasil diselesaikan</string>
-    <string name="prefs_data_update_failed">Pembaruan gagal - periksa jaringan Anda</string>
-    <string name="prefs_data_import_satellites_error">Tidak ada satelit yang diimpor. Pilih file TLE/3LE (.txt) atau OMM (.csv) yang valid.</string>
-    <string name="prefs_data_import_transceivers_error">Tidak ada transceiver yang diimpor. Pilih file SatNOGS (.json) yang valid.</string>
-    <string name="prefs_data_sources_title">Sumber data kustom</string>
-    <string name="prefs_data_sources_tle_switch">URL TLE Kustom</string>
-    <string name="prefs_data_sources_transceivers_switch">URL transceiver kustom</string>
-    <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>
-    <string name="prefs_data_reset_url">Setel ulang ke URL bawaan</string>
-    <string name="prefs_data_output_title">Keluaran data</string>
-    <string name="prefs_net_output">Jaringan</string>
-    <string name="prefs_bt_output">Bluetooth</string>
-    <string name="prefs_cat_output">CAT</string>
-    <string name="nav_radiocontrol">Kontrol Radio</string>
-    <string name="rc_settings_title">Kontrol Radio CAT</string>
-    <string name="rc_radio_model">Model Radio</string>
-    <string name="rc_tx_device_hint">Alamat BT Radio TX</string>
-    <string name="rc_rx_device_hint">Alamat BT Radio RX</string>
-    <string name="rc_tx_name_hint">Nama Radio TX</string>
-    <string name="rc_rx_name_hint">Nama Radio RX</string>
-    <string name="rc_enable_switch">Aktifkan Kontrol CAT</string>
-    <string name="prefs_net_title">Keluaran data jaringan</string>
-    <string name="prefs_net_rotator_switch">Aktifkan keluaran rotator</string>
-    <string name="prefs_net_rotator_address_hint">IP:Port</string>
-    <string name="prefs_net_rotator_format_hint">Format</string>
-    <string name="prefs_net_frequency_switch">Aktifkan keluaran frekuensi</string>
-    <string name="prefs_net_frequency_address_hint">IP:Port</string>
-    <string name="prefs_net_frequency_format_hint">Format</string>
-    <string name="prefs_bt_title">Keluaran data Bluetooth</string>
-    <string name="prefs_bt_rotator_switch">Aktifkan keluaran rotator</string>
-    <string name="prefs_bt_rotator_device_hint">Id perangkat</string>
-    <string name="prefs_bt_rotator_output_hint">Format data</string>
-    <string name="prefs_bt_frequency_switch">Aktifkan keluaran frekuensi</string>
-    <string name="prefs_bt_frequency_device_hint">Id perangkat</string>
-    <string name="prefs_bt_frequency_output_hint">Format data</string>
-    <string name="prefs_bt_perm_error">Periksa izin bluetooth Anda</string>
-    <string name="prefs_net_perm_error">Periksa izin jaringan Anda</string>
-    <string name="tracking_status">Melacak: %s</string>
-    <string name="loc_lat_text">Lintang: %s°</string>
-    <string name="loc_lon_text">Bujur: %s°</string>
-    <string name="loc_qth_text">QTH: %s</string>
-    <string name="connect_radio">Hubungkan</string>
-    <string name="disconnect_radio">Putuskan</string>
-    <string name="track_radio">Lacak</string>
-    <string name="stop_radio">Berhenti</string>
-    <string name="prefs_wavelog_title">Server log WaveLog</string>
-    <string name="prefs_wavelog_url_hint">Alamat server</string>
-    <string name="prefs_wavelog_key_hint">Kunci API</string>
-    <string name="prefs_wavelog_station_hint">ID stasiun</string>
-    <string name="prefs_wavelog_auto">Unggah otomatis</string>
-    <string name="prefs_wavelog_test">Uji koneksi</string>
-    <string name="prefs_wavelog_update_sats">Perbarui satelit</string>
-    <string name="prefs_wavelog_upload">Unggah sekarang</string>
-    <string name="wavelog_title">Log</string>
-    <string name="wavelog_select_transponder">Pilih transponder</string>
-    <string name="wavelog_call_hint">Tanda panggil</string>
-    <string name="wavelog_mode_hint">Mode</string>
-    <string name="wavelog_saved">Tersimpan ke log lokal</string>
-    <string name="wavelog_need_config">Konfigurasikan WaveLog di Pengaturan terlebih dahulu</string>
-    <string name="wavelog_empty">Belum ada entri log</string>
-    <string name="wavelog_grid_mismatch">Grid QTH (%1$s) tidak cocok dengan grid stasiun (%2$s). Tetap unggah?</string>
-    <string name="wavelog_ignore">Abaikan dan unggah</string>
-    <string name="wavelog_cancel">Batal</string>
-    <string name="prefs_wavelog_qrz_title">QRZ Cookie</string>
-    <string name="prefs_wavelog_qrz_hint">Tempel cookie login QRZ Anda di sini (ekspor EditThisCookie atau string "k=v; k=v"). Digunakan untuk mengambil grid square stasiun lawan saat unggah.</string>
-    <string name="prefs_wavelog_qrz_label">Cookie</string>
-    <string name="wavelog_copy">Salin</string>
-    <string name="wavelog_delete_undo">Urungkan</string>
-    <string name="wavelog_col_time">Waktu</string>
-    <string name="wavelog_col_freq">Frek.</string>
-    <string name="wavelog_col_sat">Satelit</string>
-    <string name="wavelog_col_call">Panggilan</string>
-    <string name="wavelog_col_uploaded">Terkirim</string>
-    <string name="prefs_other_title">Pengaturan lainnya</string>
-    <string name="prefs_ui_title">Pengaturan UI</string>
-    <string name="prefs_ui_order_title">Urutan halaman</string>
-    <string name="prefs_ui_main_title">Menu utama (bilah bawah)</string>
-    <string name="prefs_ui_sub_title">Menu lainnya</string>
-    <string name="prefs_ui_move_out">Pindah ke menu lainnya</string>
-    <string name="prefs_ui_move_back">Kembalikan ke menu utama</string>
-    <string name="prefs_ui_order_locked">Tetap (tidak dapat dipindahkan)</string>
-    <string name="prefs_ui_order_reset">Setel ulang urutan</string>
-    <string name="prefs_other_switch_utc">Tampilkan waktu lintasan dalam UTC</string>
-    <string name="prefs_other_switch_update">Aktifkan pembaruan data otomatis</string>
-    <string name="prefs_other_switch_sweep">Aktifkan animasi sapuan radar</string>
-    <string name="prefs_other_switch_sensors">Gunakan sensor untuk memutar tampilan radar</string>
-    <string name="prefs_other_switch_night_mode">Aktifkan filter mode malam merah</string>
-    <string name="prefs_highlight_title">Sorotan elevasi</string>
-    <string name="prefs_highlight_low">Rendah &lt; %1$d°</string>
-    <string name="prefs_highlight_mid">Sedang %1$d–%2$d°</string>
-    <string name="prefs_highlight_high">Tinggi &gt; %1$d°</string>
-    <string name="prefs_outro_title">BG7NTA &amp; penulis asli mengucapkan terima kasih</string>
-    <string name="prefs_outro_thanks" translatable="false">
-        * Pengguna dan kontributor Look4Sat!
-        \n* David A. B. Johnson (predict4java)
-        \n* Dave Moten (predict4java)
-        \n* Alexandru Csete (Gpredict)
-        \n* Dr T.S. Kelso (Celestrak)
-        \n* Libre Space Foundation (SatNOGS)
-        \n* xdsopl dan kontributor Robot36!
-        \n* BA7OPF (fitur pencocokan lintasan)
-        \n* BG7NTA</string>
-    <string name="prefs_outro_license">Aplikasi ini hadir tanpa jaminan</string>
-</resources>

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

@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name" translatable="false">Look4Sat Pro</string>
-    <string name="btn_accept">Terima</string>
-    <string name="btn_cancel">Batal</string>
-    <string name="empty_list_message">Tidak ada data untuk ditampilkan</string>
-    <string name="nav_sat">Satelit</string>
-    <string name="nav_pass">Lintasan</string>
-    <string name="nav_radar">Radar</string>
-    <string name="nav_mutual">Pasangan</string>
-    <string name="nav_roaming">Jelajah</string>
-    <string name="nav_cw">Dekoder CW</string>
-    <string name="nav_map">Peta</string>
-    <string name="nav_prefs">Pengaturan</string>
-    <string name="prefs_aprs_title">Pelaporan APRS</string>
-    <string name="prefs_aprs_enable">Aktifkan pelaporan APRS</string>
-    <string name="prefs_aprs_summary">Server: %1$s:%2$d  Panggilan: %3$s</string>
-    <string name="prefs_aprs_report_now">Lapor Sekarang</string>
-    <string name="prefs_aprs_settings_title">Pengaturan APRS</string>
-    <string name="prefs_aprs_server">Server</string>
-    <string name="prefs_aprs_port">Port</string>
-    <string name="prefs_aprs_callsign">Tanda panggilan</string>
-    <string name="prefs_aprs_ssid">SSID</string>
-    <string name="prefs_aprs_passcode">Kode sandi</string>
-    <string name="prefs_aprs_passcode_hint">Kosong = otomatis dari panggilan</string>
-    <string name="prefs_aprs_interval">Interval (menit)</string>
-    <string name="prefs_aprs_status">Teks status</string>
-    <string name="prefs_aprs_symbol_table">Tabel simbol</string>
-    <string name="prefs_aprs_symbol_code">Kode simbol</string>
-    <string name="prefs_aprs_save">Simpan</string>
-    <string name="prefs_aprs_cancel">Batal</string>
-    <string name="aprs_notif_channel">Layanan APRS</string>
-    <string name="aprs_notif_title">APRS: %1$s</string>
-    <string name="aprs_notif_running">Pelaporan berjalan</string>
-    <string name="aprs_notif_connected">Terhubung ke APRS-IS</string>
-    <string name="aprs_notif_error">Kesalahan koneksi</string>
-    <string name="aprs_notif_stop">Berhenti</string>
-    <string name="prefs_aprs_calc_passcode">Hitung kode sandi</string>
-    <string name="aprs_toast_ok">APRS: laporan terkirim</string>
-    <string name="aprs_toast_fail">APRS: laporan gagal - %1$s</string>
-    <string name="aprs_toast_not_configured">APRS belum dikonfigurasi - isi panggilan dulu</string>
-    <string name="prefs_aprs_last_report">Laporan terakhir: %1$s %2$s</string>
-    <string name="prefs_aprs_last_ok">OK</string>
-    <string name="prefs_aprs_last_fail">gagal - %1$s</string>
-    <string name="nav_more">Lainnya</string>
-    <string name="nav_log">Log</string>
-    <string name="nav_amsat">AMSAT</string>
-    <string name="amsat_title">Status Satelit AMSAT</string>
-    <string name="amsat_refresh">Segarkan</string>
-    <string name="amsat_retry">Coba lagi</string>
-    <string name="amsat_updated">Diperbarui:</string>
-    <string name="amsat_active">Aktif</string>
-    <string name="amsat_tlm">TLM/beacon</string>
-    <string name="amsat_not_heard">Tidak terdengar</string>
-    <string name="amsat_conflict">Konflik</string>
-    <string name="amsat_name">Name</string>
-    <string name="amsat_load_failed">Gagal memuat - periksa jaringan dan coba lagi</string>
-    <string name="amsat_no_reports">Tidak ada laporan untuk periode ini</string>
-    <string name="amsat_close">Tutup</string>
-    <string name="sat_type_hint">Jenis: %s</string>
-    <string name="sat_type_title">Pilih jenis satelit</string>
-    <string name="sat_search_hint">Id - Nama</string>
-    <string name="sat_search_clear">Bersihkan</string>
-    <string name="sat_clear_all">Bersihkan semua</string>
-    <string name="sat_select_all">Pilih semua</string>
-    <string name="sat_empty_list_message">Pastikan kata kunci pencarian Anda benar dan DB sudah diperbarui</string>
-    <string name="sat_warning_title">Peringatan\!</string>
-    <string name="sat_warning_message">
-        Ada lebih dari 9000 satelit yang terdaftar di aplikasi ini.
-        Tidak masuk akal untuk melacak semuanya sekaligus.
-        \n\nSelalu coba persempit daftar hanya ke satelit yang
-        Anda minati melalui pencarian dan pemilih jenis.</string>
-    <string name="pass_filter_title">Filter lintasan</string>
-    <string name="pass_filter_elev">Elevasi minimal</string>
-    <string name="pass_filter_hours">Waktu ke depan</string>
-    <string name="pass_filter_aos_time">Jendela AOS</string>
-    <string name="pass_filter_invert_time">Balik jendela AOS</string>
-    <string name="pass_filter_deep_space">DeepSpace (periode >225 mnt)</string>
-    <string name="pass_time_placeholder" translatable="false"> -- : -- : -- </string>
-    <string name="pass_modes_title">Pilih jenis modulasi</string>
-    <string name="pass_satId" translatable="false">%05d</string>
-    <string name="pass_elevation">Elevasi: %.1f°</string>
-    <string name="pass_deep_space" translatable="false">DeepSpace</string>
-    <string name="pass_altitude">Ketinggian: %d km</string>
-    <string name="pass_aosLos" translatable="false">%03d° - %03d°</string>
-    <string name="pass_empty_list_message">
-        Pastikan filter Anda benar dan Anda sudah memilih satelit</string>
-    <string name="pass_error_message">Tidak ada lintasan satelit mendatang untuk ditampilkan</string>
-    <string name="pass_welcome_title">Selamat datang di Look4Sat\!</string>
-    <string name="pass_welcome_message">
-        Pastikan Anda mengatur posisi melalui GPS, Lat/Lon atau QTH di Pengaturan.
-        \n\nPerbarui database setidaknya seminggu sekali untuk prediksi yang akurat.</string>
-    <string name="pass_whatsnew_title" translatable="false">Apa yang baru di Look4Sat</string>
-    <string name="pass_whatsnew_message" translatable="false">
-        * BARU: Status satelit AMSAT kini menggunakan API resmi AMSAT (v1 JSON, lebih cepat dan andal)
-        * Halaman status AMSAT kini mendukung layar penuh (tombol refresh dan waktu selalu dapat diakses)
-        * WaveLog: pencarian grid lawan QRZ (dialog ⚙ tempel Cookie + uji query)
-        * WaveLog: tombol perbarui daftar satelit LoTW (112 satelit bawaan)
-        * WaveLog: laporan sinyal RST 59/59 untuk QSO (v1 dan v2)
-    </string>
-    <string name="radar_back">Kembali</string>
-    <string name="radar_notify">Beri tahu</string>
-    <string name="radar_az_text">Azimuth</string>
-    <string name="radar_az_value" translatable="false">%.1f°</string>
-    <string name="radar_el_text">Elevasi</string>
-    <string name="radar_el_value" translatable="false">%.1f°</string>
-    <string name="radar_alt_text">Ketinggian</string>
-    <string name="radar_alt_value" translatable="false">%.0f km</string>
-    <string name="radar_dist_text">Jarak</string>
-    <string name="radar_dist_value" translatable="false">%.0f km</string>
-    <string name="radar_eclipsed">Gerhana</string>
-    <string name="radar_downlink">Downlink</string>
-    <string name="radar_uplink">Uplink</string>
-    <string name="radar_link_low" translatable="false">%.4f</string>
-    <string name="radar_link_lowHigh" translatable="false">%.4f - %.4f</string>
-    <string name="radar_no_link" translatable="false">- - . - -</string>
-    <string name="radar_no_data">Satelit ini tidak memiliki transceiver</string>
-    <string name="radar_add">Tambah</string>
-    <string name="radar_data">Transceiver satelit:</string>
-    <string name="radar_inverted">Terbalik: %s</string>
-    <string name="radar_mode">Mode: %s</string>
-    <string name="radar_string_no">Tidak</string>
-    <string name="radar_string_yes">Ya</string>
-    <string name="radar_visible">Terlihat</string>
-    <string name="radar_doppler_calc">Kalkulator Frekuensi Doppler</string>
-    <string name="radar_doppler_tx_hint">Masukkan frekuensi TX (MHz)</string>
-    <string name="radar_doppler_rx_hint">Masukkan frekuensi RX (MHz)</string>
-    <string name="radar_doppler_offset_hint">Offset (kHz)</string>
-    <string name="radar_doppler_info">Untuk transponder linier, ketik satu frekuensi untuk melihat frekuensi lainnya</string>
-    <string name="radar_cw_decoder">Dekoder CW</string>
-    <string name="radar_cw_start">Mulai</string>
-    <string name="radar_cw_stop">Berhenti</string>
-    <string name="radar_cw_reset">Bersihkan</string>
-    <string name="map_prev">Sebelumnya</string>
-    <string name="map_next">Berikutnya</string>
-    <string name="map_copyright" translatable="false">© Kontributor OpenStreetMap</string>
-    <string name="map_azimuth">Azimuth: %.1f°</string>
-    <string name="map_elevation">Elevasi: %.1f°</string>
-    <string name="map_altitude">Ketinggian: %.0f km</string>
-    <string name="map_distance">Jarak: %.0f km</string>
-    <string name="map_latitude">Lintang: %.1f°</string>
-    <string name="map_longitude">Bujur: %.1f°</string>
-    <string name="map_qth" translatable="false">QTH: %s</string>
-    <string name="map_phase">Fase: %.1f°</string>
-    <string name="map_eclipsed">Gerhana</string>
-    <string name="map_period">Periode: %.0f mnt</string>
-    <string name="map_velocity">Kecepatan: %.2f km/d</string>
-    <string name="map_visibility">Visibilitas: %s</string>
-    <string name="map_visible">Terlihat</string>
-    <string name="prefs_app_title" translatable="false">Look4Sat Pro v%s</string>
-    <string name="prefs_app_url" translatable="false">https://play.google.com/store/apps/details?id=com.rtbishop.look4sat</string>
-    <string name="prefs_donate_title">Donasi</string>
-    <string name="prefs_donate_url" translatable="false">https://ko-fi.com/rt_bishop</string>
-    <string name="prefs_fdroid_title" translatable="false">F-Droid</string>
-    <string name="prefs_fdroid_url" translatable="false">https://f-droid.org/en/packages/com.rtbishop.look4sat/</string>
-    <string name="prefs_github_title" translatable="false">GitHub</string>
-    <string name="prefs_github_url" translatable="false">https://github.com/rt-bishop/Look4Sat/</string>
-    <string name="prefs_license_title" translatable="false">GPLv3</string>
-    <string name="prefs_license_url" translatable="false">https://www.gnu.org/licenses/gpl-3.0.html</string>
-    <string name="prefs_privacy_title">Kebijakan Privasi</string>
-    <string name="prefs_privacy_url" translatable="false">https://sites.google.com/view/look4sat-privacy-policy/home</string>
-    <string name="prefs_updated_title">Diperbarui: %s</string>
-    <string name="prefs_updated_time">d MMM yyyy - HH:mm:ss</string>
-    <string name="prefs_loc_title">Posisi stasiun</string>
-    <string name="prefs_loc_gps_title">GPS</string>
-    <string name="prefs_loc_gps_error">Tidak dapat mengambil lokasi - periksa izin dan sinyal GPS/jaringan</string>
-    <string name="prefs_loc_input_title">Input</string>
-    <string name="prefs_loc_input_error">Lokasi yang dimasukkan tidak valid</string>
-    <string name="prefs_loc_qth_title">QTH</string>
-    <string name="prefs_loc_qth_error">Lokator QTH tidak valid</string>
-    <string name="prefs_loc_success">Posisi berhasil diperbarui</string>
-    <string name="prefs_station_title">Pengaturan posisi stasiun</string>
-    <string name="prefs_station_lat_text">Atur garis lintang stasiun Anda</string>
-    <string name="prefs_station_lon_text">Atur garis bujur stasiun Anda</string>
-    <string name="prefs_locator_title">Pengaturan lokator QTH</string>
-    <string name="prefs_locator_text">Atur posisi stasiun menggunakan lokator</string>
-    <string name="prefs_data_title">Data satelit</string>
-    <string name="prefs_data_entries">Satelit: %s</string>
-    <string name="prefs_data_radios">Transceiver: %s</string>
-    <string name="prefs_data_update">Perbarui</string>
-    <string name="prefs_data_import">URL Kustom</string>
-    <string name="prefs_data_clear">Bersihkan</string>
-    <string name="prefs_data_clear_success">Data berhasil dibersihkan</string>
-    <string name="prefs_data_update_success">Pembaruan berhasil diselesaikan</string>
-    <string name="prefs_data_update_failed">Pembaruan gagal - periksa jaringan Anda</string>
-    <string name="prefs_data_import_satellites_error">Tidak ada satelit yang diimpor. Pilih file TLE/3LE (.txt) atau OMM (.csv) yang valid.</string>
-    <string name="prefs_data_import_transceivers_error">Tidak ada transceiver yang diimpor. Pilih file SatNOGS (.json) yang valid.</string>
-    <string name="prefs_data_sources_title">Sumber data kustom</string>
-    <string name="prefs_data_sources_tle_switch">URL TLE Kustom</string>
-    <string name="prefs_data_sources_transceivers_switch">URL transceiver kustom</string>
-    <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>
-    <string name="prefs_data_reset_url">Setel ulang ke URL bawaan</string>
-    <string name="prefs_data_output_title">Keluaran data</string>
-    <string name="prefs_net_output">Jaringan</string>
-    <string name="prefs_bt_output">Bluetooth</string>
-    <string name="prefs_cat_output">CAT</string>
-    <string name="nav_radiocontrol">Kontrol Radio</string>
-    <string name="rc_settings_title">Kontrol Radio CAT</string>
-    <string name="rc_radio_model">Model Radio</string>
-    <string name="rc_tx_device_hint">Alamat BT Radio TX</string>
-    <string name="rc_rx_device_hint">Alamat BT Radio RX</string>
-    <string name="rc_tx_name_hint">Nama Radio TX</string>
-    <string name="rc_rx_name_hint">Nama Radio RX</string>
-    <string name="rc_enable_switch">Aktifkan Kontrol CAT</string>
-    <string name="prefs_net_title">Keluaran data jaringan</string>
-    <string name="prefs_net_rotator_switch">Aktifkan keluaran rotator</string>
-    <string name="prefs_net_rotator_address_hint">IP:Port</string>
-    <string name="prefs_net_rotator_format_hint">Format</string>
-    <string name="prefs_net_frequency_switch">Aktifkan keluaran frekuensi</string>
-    <string name="prefs_net_frequency_address_hint">IP:Port</string>
-    <string name="prefs_net_frequency_format_hint">Format</string>
-    <string name="prefs_bt_title">Keluaran data Bluetooth</string>
-    <string name="prefs_bt_rotator_switch">Aktifkan keluaran rotator</string>
-    <string name="prefs_bt_rotator_device_hint">Id perangkat</string>
-    <string name="prefs_bt_rotator_output_hint">Format data</string>
-    <string name="prefs_bt_frequency_switch">Aktifkan keluaran frekuensi</string>
-    <string name="prefs_bt_frequency_device_hint">Id perangkat</string>
-    <string name="prefs_bt_frequency_output_hint">Format data</string>
-    <string name="prefs_bt_perm_error">Periksa izin bluetooth Anda</string>
-    <string name="prefs_net_perm_error">Periksa izin jaringan Anda</string>
-    <string name="tracking_status">Melacak: %s</string>
-    <string name="loc_lat_text">Lintang: %s°</string>
-    <string name="loc_lon_text">Bujur: %s°</string>
-    <string name="loc_qth_text">QTH: %s</string>
-    <string name="connect_radio">Hubungkan</string>
-    <string name="disconnect_radio">Putuskan</string>
-    <string name="track_radio">Lacak</string>
-    <string name="stop_radio">Berhenti</string>
-    <string name="prefs_wavelog_title">Server log WaveLog</string>
-    <string name="prefs_wavelog_url_hint">Alamat server</string>
-    <string name="prefs_wavelog_key_hint">Kunci API</string>
-    <string name="prefs_wavelog_station_hint">ID stasiun</string>
-    <string name="prefs_wavelog_auto">Unggah otomatis</string>
-    <string name="prefs_wavelog_test">Uji koneksi</string>
-    <string name="prefs_wavelog_update_sats">Perbarui satelit</string>
-    <string name="prefs_wavelog_upload">Unggah sekarang</string>
-    <string name="wavelog_title">Log</string>
-    <string name="wavelog_select_transponder">Pilih transponder</string>
-    <string name="wavelog_call_hint">Tanda panggil</string>
-    <string name="wavelog_mode_hint">Mode</string>
-    <string name="wavelog_saved">Tersimpan ke log lokal</string>
-    <string name="wavelog_need_config">Konfigurasikan WaveLog di Pengaturan terlebih dahulu</string>
-    <string name="wavelog_empty">Belum ada entri log</string>
-    <string name="wavelog_grid_mismatch">Grid QTH (%1$s) tidak cocok dengan grid stasiun (%2$s). Tetap unggah?</string>
-    <string name="wavelog_ignore">Abaikan dan unggah</string>
-    <string name="wavelog_cancel">Batal</string>
-    <string name="prefs_wavelog_qrz_title">QRZ Cookie</string>
-    <string name="prefs_wavelog_qrz_hint">Tempel cookie login QRZ Anda di sini (ekspor EditThisCookie atau string "k=v; k=v"). Digunakan untuk mengambil grid square stasiun lawan saat unggah.</string>
-    <string name="prefs_wavelog_qrz_label">Cookie</string>
-    <string name="wavelog_copy">Salin</string>
-    <string name="wavelog_delete_undo">Urungkan</string>
-    <string name="wavelog_col_time">Waktu</string>
-    <string name="wavelog_col_freq">Frek.</string>
-    <string name="wavelog_col_sat">Satelit</string>
-    <string name="wavelog_col_call">Panggilan</string>
-    <string name="wavelog_col_uploaded">Terkirim</string>
-    <string name="wavelog_ungrouped">Tidak dikelompokkan</string>
-    <string name="prefs_other_title">Pengaturan lainnya</string>
-    <string name="prefs_ui_title">Pengaturan UI</string>
-    <string name="prefs_ui_order_title">Urutan halaman</string>
-    <string name="prefs_ui_main_title">Menu utama (bilah bawah)</string>
-    <string name="prefs_ui_sub_title">Menu lainnya</string>
-    <string name="prefs_ui_move_out">Pindah ke menu lainnya</string>
-    <string name="prefs_ui_move_back">Kembalikan ke menu utama</string>
-    <string name="prefs_ui_order_locked">Tetap (tidak dapat dipindahkan)</string>
-    <string name="prefs_ui_order_reset">Setel ulang urutan</string>
-    <string name="prefs_other_switch_utc">Tampilkan waktu lintasan dalam UTC</string>
-    <string name="prefs_other_switch_update">Aktifkan pembaruan data otomatis</string>
-    <string name="prefs_other_switch_sweep">Aktifkan animasi sapuan radar</string>
-    <string name="prefs_other_switch_sensors">Gunakan sensor untuk memutar tampilan radar</string>
-    <string name="prefs_other_switch_night_mode">Aktifkan filter mode malam merah</string>
-    <string name="prefs_highlight_title">Sorotan elevasi</string>
-    <string name="prefs_highlight_low">Rendah &lt; %1$d°</string>
-    <string name="prefs_highlight_mid">Sedang %1$d–%2$d°</string>
-    <string name="prefs_highlight_high">Tinggi &gt; %1$d°</string>
-    <string name="prefs_outro_title">BG7NTA &amp; penulis asli mengucapkan terima kasih</string>
-    <string name="prefs_outro_thanks" translatable="false">
-        * Pengguna dan kontributor Look4Sat!
-        \n* David A. B. Johnson (predict4java)
-        \n* Dave Moten (predict4java)
-        \n* Alexandru Csete (Gpredict)
-        \n* Dr T.S. Kelso (Celestrak)
-        \n* Libre Space Foundation (SatNOGS)
-        \n* xdsopl dan kontributor Robot36!
-        \n* BA7OPF (fitur pencocokan lintasan)
-        \n* BG7NTA</string>
-    <string name="prefs_outro_license">Aplikasi ini hadir tanpa jaminan</string>
-</resources>

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

@@ -13,19 +13,23 @@
     <string name="nav_prefs">Настройки</string>
 
     <!-- Satellites screen -->
-    <string name="sat_type_hint">Тип: %s</string>
-    <string name="sat_type_title">Выберите тип спутника</string>
+    <string name="sat_type_hint">Режимы: %s</string>
+    <string name="sat_type_title">Выберите режимы</string>
     <string name="sat_search_hint">Id - Название</string>
     <string name="sat_search_clear">Очистить</string>
     <string name="sat_clear_all">Очистить</string>
     <string name="sat_select_all">Выбрать</string>
+    <string name="sat_group_selected">Выбранные</string>
+    <string name="sat_group_available">Доступные</string>
+    <string name="sat_group_selected_count">Выбранные (%1$d)</string>
+    <string name="sat_group_available_count">Доступные (%1$d)</string>
     <string name="sat_empty_list_message">Убедитесь, что ваш поисковый запрос верен и база данных обновлена</string>
     <string name="sat_warning_title">Внимание\!</string>
     <string name="sat_warning_message">
         В этом приложении перечислено более 9000 спутников.
         Отслеживать их все одновременно бессмысленно.
         \n\nВсегда старайтесь сузить список до тех,
-        которые вас интересуют, используя поиск и селектор типов.</string>
+        которые вас интересуют, используя поиск и выбор режимов.</string>
 
     <!-- Passes screen -->
     <string name="pass_filter_title">Фильтровать пролеты</string>
@@ -34,7 +38,7 @@
     <string name="pass_filter_aos_time">Окно AOS</string>
     <string name="pass_filter_invert_time">Инвертировать окно AOS</string>
     <string name="pass_filter_deep_space">DeepSpace (период &gt;225мин)</string>
-    <string name="pass_modes_title">Выберите тип модуляции</string>
+    <string name="pass_modes_title">Выберите режимы</string>
     <string name="pass_elevation">Элевация: %.1f°</string>
     <string name="pass_altitude">Высота: %d км</string>
     <string name="pass_empty_list_message">
@@ -95,11 +99,11 @@
     <string name="prefs_loc_qth_title">QTH</string>
     <string name="prefs_loc_qth_error">Неправильный локатор QTH</string>
     <string name="prefs_loc_success">Позиция успешно обновлена</string>
-    <string name="prefs_station_title">Настройки местоположения</string>
-    <string name="prefs_station_lat_text">Введите широту наземной станции</string>
-    <string name="prefs_station_lon_text">Введите долготу наземной станции</string>
-    <string name="prefs_locator_title">Настройки локатора QTH</string>
-    <string name="prefs_locator_text">Введите позицию через локатор</string>
+    <string name="prefs_station_title">Положение станции</string>
+    <string name="prefs_station_lat_text">Широта станции</string>
+    <string name="prefs_station_lon_text">Долгота станции</string>
+    <string name="prefs_locator_title">Локатор QTH</string>
+    <string name="prefs_locator_text">Позиция по локатору</string>
 
     <string name="prefs_data_title">Данные спутников</string>
     <string name="prefs_data_entries">Спутников: %s</string>
@@ -109,16 +113,30 @@
     <string name="prefs_data_clear">Очистить</string>
     <string name="prefs_data_clear_success">Очистка прошла успешно</string>
     <string name="prefs_data_update_success">Обновление прошло успешно</string>
+    <string name="prefs_data_import_satellites_error">Спутники не импортированы. Нужен TLE/3LE (.txt) или OMM (.csv).</string>
+    <string name="prefs_data_import_transceivers_error">Трансиверы не импортированы. Нужен SatNOGS (.json).</string>
 
-    <string name="prefs_data_sources_title">Свои источники данных</string>
-    <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>
-    <string name="prefs_data_sources_transceivers_switch">Custom Transceivers URL</string>
+    <string name="prefs_data_sources_title">Свои источники</string>
+    <string name="prefs_data_sources_tle_switch">URL TLE</string>
+    <string name="prefs_data_sources_transceivers_switch">URL трансиверов</string>
+    <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>
 
-    <string name="prefs_data_output_title">Вывод данных</string>
+    <string name="prefs_data_output_title">Вывод</string>
     <string name="prefs_net_output">Сеть</string>
     <string name="prefs_bt_output">Bluetooth</string>
+    <string name="prefs_cat_output">CAT</string>
 
-    <string name="prefs_net_title">Вывод сетевых данных</string>
+    <string name="nav_radiocontrol">Управление радио</string>
+
+    <string name="rc_settings_title">CAT управление</string>
+    <string name="rc_radio_model">Модель радио</string>
+    <string name="rc_tx_device_hint">BT адрес TX</string>
+    <string name="rc_rx_device_hint">BT адрес RX</string>
+    <string name="rc_tx_name_hint">Имя радио TX</string>
+    <string name="rc_rx_name_hint">Имя радио RX</string>
+    <string name="rc_enable_switch">Включить CAT</string>
+
+    <string name="prefs_net_title">Сетевой вывод</string>
     <string name="prefs_net_rotator_switch">Включить вывод ротатора</string>
     <string name="prefs_net_rotator_address_hint">IP:Порт</string>
     <string name="prefs_net_rotator_format_hint">Формат</string>
@@ -126,22 +144,22 @@
     <string name="prefs_net_frequency_address_hint">IP:Порт</string>
     <string name="prefs_net_frequency_format_hint">Формат</string>
 
-    <string name="prefs_bt_title">Вывод данных Bluetooth</string>
+    <string name="prefs_bt_title">Вывод Bluetooth</string>
     <string name="prefs_bt_rotator_switch">Включить вывод ротатора</string>
-    <string name="prefs_bt_rotator_device_hint">Id устройства</string>
+    <string name="prefs_bt_rotator_device_hint">ID устройства</string>
     <string name="prefs_bt_rotator_output_hint">Формат</string>
     <string name="prefs_bt_frequency_switch">Включить вывод частоты</string>
-    <string name="prefs_bt_frequency_device_hint">Id устройства</string>
+    <string name="prefs_bt_frequency_device_hint">ID устройства</string>
     <string name="prefs_bt_frequency_output_hint">Формат</string>
     <string name="prefs_bt_perm_error">Нет разрешения использовать bluetooth</string>
     <string name="prefs_net_perm_error">Нет разрешения использовать сеть</string>
 
-    <string name="prefs_other_title">Другие настройки</string>
-    <string name="prefs_other_switch_utc">Показывать время по UTC</string>
-    <string name="prefs_other_switch_update">Обновлять данные автоматически</string>
-    <string name="prefs_other_switch_sweep">Показывать анимацию радара</string>
-    <string name="prefs_other_switch_sensors">Использовать сенсоры устройства</string>
-    <string name="prefs_other_switch_night_mode">Включить красный ночной фильтр</string>
+    <string name="prefs_other_title">Прочее</string>
+    <string name="prefs_other_switch_utc">Время в UTC</string>
+    <string name="prefs_other_switch_update">Автообновление данных</string>
+    <string name="prefs_other_switch_sweep">Анимация радара</string>
+    <string name="prefs_other_switch_sensors">Сенсоры</string>
+    <string name="prefs_other_switch_night_mode">Ночной фильтр</string>
 
     <string name="prefs_highlight_title">Подсветка высоты</string>
     <string name="prefs_highlight_low">Низко &lt; %1$d°</string>

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

@@ -13,19 +13,23 @@
     <string name="nav_prefs">පසුතල</string>
 
     <!-- Satellites screen -->
-    <string name="sat_type_hint">වර්ගය: %s</string>
-    <string name="sat_type_title">චන්ද්‍රිකා ආකාරය තෝරන්න</string>
+    <string name="sat_type_hint">මාදිලි: %s</string>
+    <string name="sat_type_title">මාදිලි තෝරන්න</string>
     <string name="sat_search_hint">Id - නම</string>
     <string name="sat_search_clear">පිරිසිදු ක°</string>
     <string name="sat_clear_all">සියල්ල පිරිසිදු ක°</string>
     <string name="sat_select_all">සියල්ල තෝරන්න</string>
+    <string name="sat_group_selected">තෝරාගත්</string>
+    <string name="sat_group_available">තිබෙන</string>
+    <string name="sat_group_selected_count">තෝරාගත් (%1$d)</string>
+    <string name="sat_group_available_count">තිබෙන (%1$d)</string>
     <string name="sat_empty_list_message">
         ඔබගේ සෙවුම් විමසුම නිවැරදි බවත් දත්ත සමුදාය යාවත්කාලීන කර ඇති බවත් සහතික කර ගන්න</string>
     <string name="sat_warning_title">අවවාදයයි\!</string>
     <string name="sat_warning_message">
         මෙම යෙදුමේ ලැයිස්තුගත කර ඇති චන්ද්‍රිකා 9000 කට වඩා තිබේ.
         ඒවා සියල්ලම එකවර නිරීක්ෂණය කිරීම තේරුමක් නැති දෙයක්.
-        \n\nසෙවීම සහ වර්ග තේරීම හරහා ඔබ උනන්දුවක් දක්වන
+        \n\nසෙවීම සහ මාදිලි තේරීම හරහා ඔබ උනන්දුවක් දක්වන
         ඒවාට පමණක් ලැයිස්තුව පටු කිරීමට සැමවිටම උත්සාහ කරන්න.</string>
 
     <!-- Passes screen -->
@@ -35,7 +39,7 @@
     <string name="pass_filter_aos_time">AOS කවුළුව</string>
     <string name="pass_filter_invert_time">AOS කවුළුව ප්‍රතිවිරුද්ධ කරන්න</string>
     <string name="pass_filter_deep_space">DeepSpace (කාලය &gt;225min)</string>
-    <string name="pass_modes_title">මූර්ජන ආකාරය තෝරන්න</string>
+    <string name="pass_modes_title">මූර්ජන තෝරන්න</string>
     <string name="pass_elevation">උත්තෝලනය: %.1f°</string>
     <string name="pass_altitude">උන්නතාශය: %d km</string>
     <string name="pass_empty_list_message">
@@ -96,11 +100,11 @@
     <string name="prefs_loc_qth_title">QTH</string>
     <string name="prefs_loc_qth_error">QTH locator වලංගු නොවේ</string>
     <string name="prefs_loc_success">පිහිටීම යාවත්කාලීනය සාර්ථකයි</string>
-    <string name="prefs_station_title">පොළෙහි පිහිටීම් පසුතල</string>
-    <string name="prefs_station_lat_text">ඔබගේ පොළෙහි අක්‍ෂාංශය සකසන්න</string>
-    <string name="prefs_station_lon_text">ඔබගේ පොළෙහි දේශාංශය සකසන්න</string>
-    <string name="prefs_locator_title">QTH locator පසුතල</string>
-    <string name="prefs_locator_text"> ඔබගේ locator භාවිතා කර පොළහි පිහිටීම සකසන්න</string>
+    <string name="prefs_station_title">පොළ පිහිටීම</string>
+    <string name="prefs_station_lat_text">පොළ අක්‍ෂාංශය</string>
+    <string name="prefs_station_lon_text">පොළ දේශාංශය</string>
+    <string name="prefs_locator_title">QTH locator</string>
+    <string name="prefs_locator_text">locator මඟින් පොළ පිහිටීම සකසන්න</string>
 
     <string name="prefs_data_title">චන්ද්‍රිකා දත්ත</string>
     <string name="prefs_data_entries">චන්ද්‍රිකා: %s</string>
@@ -110,39 +114,52 @@
     <string name="prefs_data_clear">පිරිසිදු ක°</string>
     <string name="prefs_data_clear_success">දත්ත ඉවත් කිරීම සාර්ථකයි</string>
     <string name="prefs_data_update_success">යාවත්කාලීනය සම්පූර්ණ කිරීම සාර්ථකයි</string>
+    <string name="prefs_data_import_satellites_error">චන්ද්‍රිකා ආයාත නොවීය. වලංගු TLE/3LE (.txt) හෝ OMM (.csv) ගොනුවක් තෝරන්න.</string>
+    <string name="prefs_data_import_transceivers_error">සම්ප්‍රේෂක ආයාත නොවීය. වලංගු SatNOGS (.json) ගොනුවක් තෝරන්න.</string>
 
-    <string name="prefs_data_sources_title">Custom data sources</string>
-    <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>
-    <string name="prefs_data_sources_transceivers_switch">Custom transceivers URL</string>
+    <string name="prefs_data_sources_title">අභිරුචි මූලාශ්‍ර</string>
+    <string name="prefs_data_sources_tle_switch">TLE URL</string>
+    <string name="prefs_data_sources_transceivers_switch">Transceivers URL</string>
+    <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>
 
-    <string name="prefs_data_output_title">Data output</string>
-    <string name="prefs_net_output">Network</string>
+    <string name="prefs_data_output_title">දත්ත ප්‍රතිදානය</string>
+    <string name="prefs_net_output">ජාලය</string>
     <string name="prefs_bt_output">Bluetooth</string>
+    <string name="prefs_cat_output">CAT</string>
+
+    <string name="nav_radiocontrol">රේඩියෝ පාලනය</string>
+    <string name="rc_settings_title">CAT පාලනය</string>
+    <string name="rc_radio_model">රේඩියෝ මාදිලිය</string>
+    <string name="rc_tx_device_hint">TX BT ලිපිනය</string>
+    <string name="rc_rx_device_hint">RX BT ලිපිනය</string>
+    <string name="rc_tx_name_hint">TX රේඩියෝ නම</string>
+    <string name="rc_rx_name_hint">RX රේඩියෝ නම</string>
+    <string name="rc_enable_switch">CAT සබල කරන්න</string>
 
     <string name="prefs_net_title">ජාල ප්‍රතිදානය</string>
-    <string name="prefs_net_rotator_switch">Enable rotation output</string>
+    <string name="prefs_net_rotator_switch">Rotation ප්‍රතිදානය සබල කරන්න</string>
     <string name="prefs_net_rotator_address_hint">IP:Port</string>
-    <string name="prefs_net_rotator_format_hint">දත්ත අකාරය</string>
-    <string name="prefs_net_frequency_switch">Enable frequency output</string>
+    <string name="prefs_net_rotator_format_hint">දත්ත ආකෘතිය</string>
+    <string name="prefs_net_frequency_switch">Frequency ප්‍රතිදානය සබල කරන්න</string>
     <string name="prefs_net_frequency_address_hint">IP:Port</string>
-    <string name="prefs_net_frequency_format_hint">දත්ත අකාරය</string>
+    <string name="prefs_net_frequency_format_hint">දත්ත ආකෘතිය</string>
 
-    <string name="prefs_bt_title">Bluetooth දත්ත ප්‍රතිදානය</string>
-    <string name="prefs_bt_rotator_switch">Enable rotation output</string>
-    <string name="prefs_bt_rotator_device_hint">උපාංග id</string>
-    <string name="prefs_bt_rotator_output_hint">දත්ත අකාරය</string>
-    <string name="prefs_bt_frequency_switch">Enable frequency output</string>
-    <string name="prefs_bt_frequency_device_hint">උපාංග id</string>
-    <string name="prefs_bt_frequency_output_hint">දත්ත අකාරය</string>
+    <string name="prefs_bt_title">Bluetooth ප්‍රතිදානය</string>
+    <string name="prefs_bt_rotator_switch">Rotation ප්‍රතිදානය සබල කරන්න</string>
+    <string name="prefs_bt_rotator_device_hint">උපාංග ID</string>
+    <string name="prefs_bt_rotator_output_hint">දත්ත ආකෘතිය</string>
+    <string name="prefs_bt_frequency_switch">Frequency ප්‍රතිදානය සබල කරන්න</string>
+    <string name="prefs_bt_frequency_device_hint">උපාංග ID</string>
+    <string name="prefs_bt_frequency_output_hint">දත්ත ආකෘතිය</string>
     <string name="prefs_bt_perm_error">Bluetooth අවසර පරික්‍ෂා ක°</string>
     <string name="prefs_net_perm_error">Network අවසර පරික්‍ෂා කරන්න</string>
 
-    <string name="prefs_other_title">වෙනත් සැකසුම්</string>
-    <string name="prefs_other_switch_utc">පසුකර වේලාවන් UTC මගින්</string>
-    <string name="prefs_other_switch_update">ස්වයං දත්ත යාවත්කාලීනය</string>
-    <string name="prefs_other_switch_sweep">radar sweep සජීවිකරණය සබල කරන්න</string>
-    <string name="prefs_other_switch_sensors">Radar දර්ශනය කරකැවීමට සංවේදක භාවිතා කරන්න </string>
-    <string name="prefs_other_switch_night_mode">රතු රාත්‍රී පෙරහන සබල කරන්න</string>
+    <string name="prefs_other_title">වෙනත්</string>
+    <string name="prefs_other_switch_utc">UTC වේලාව</string>
+    <string name="prefs_other_switch_update">දත්ත ස්වයං යාවත්කාලීන</string>
+    <string name="prefs_other_switch_sweep">Radar sweep</string>
+    <string name="prefs_other_switch_sensors">සංවේදක</string>
+    <string name="prefs_other_switch_night_mode">රාත්‍රී පෙරහන</string>
 
     <string name="prefs_highlight_title">උස් උද්දීපනය</string>
     <string name="prefs_highlight_low">අඩු &lt; %1$d°</string>

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

@@ -10,69 +10,27 @@
     <string name="nav_sat">Uydular</string>
     <string name="nav_pass">Geçişler</string>
     <string name="nav_radar">Radar</string>
-    <string name="nav_cw">CW Dekoder</string>
     <string name="nav_map">Harita</string>
     <string name="nav_prefs">Ayarlar</string>
-    <string name="prefs_aprs_title">APRS Raporlama</string>
-    <string name="prefs_aprs_enable">APRS raporlamayı etkinleştir</string>
-    <string name="prefs_aprs_summary">Sunucu: %1$s:%2$d  Çağrı: %3$s</string>
-    <string name="prefs_aprs_report_now">Şimdi Raporla</string>
-    <string name="prefs_aprs_settings_title">APRS Ayarları</string>
-    <string name="prefs_aprs_server">Sunucu</string>
-    <string name="prefs_aprs_port">Port</string>
-    <string name="prefs_aprs_callsign">Çağrı işareti</string>
-    <string name="prefs_aprs_ssid">SSID</string>
-    <string name="prefs_aprs_passcode">Parola</string>
-    <string name="prefs_aprs_passcode_hint">Parola boş = çağrıdan otomatik hesaplanır</string>
-    <string name="prefs_aprs_interval">Aralık (dakika)</string>
-    <string name="prefs_aprs_status">Durum metni</string>
-    <string name="prefs_aprs_symbol_table">Sembol tablosu</string>
-    <string name="prefs_aprs_symbol_code">Sembol kodu</string>
-    <string name="prefs_aprs_save">Kaydet</string>
-    <string name="prefs_aprs_cancel">İptal</string>
-    <string name="aprs_notif_channel">APRS hizmeti</string>
-    <string name="aprs_notif_title">APRS: %1$s</string>
-    <string name="aprs_notif_running">Raporlama çalışıyor</string>
-    <string name="aprs_notif_connected">APRS-IS bağlı</string>
-    <string name="aprs_notif_error">Bağlantı hatası</string>
-    <string name="aprs_notif_stop">Durdur</string>
-    <string name="prefs_aprs_calc_passcode">Parolayı hesapla</string>
-    <string name="aprs_toast_ok">APRS: rapor gönderildi</string>
-    <string name="aprs_toast_fail">APRS: rapor başarısız - %1$s</string>
-    <string name="aprs_toast_not_configured">APRS yapılandırılmadı - önce çağrı girin</string>
-    <string name="prefs_aprs_last_report">Son rapor: %1$s %2$s</string>
-    <string name="prefs_aprs_last_ok">OK</string>
-    <string name="prefs_aprs_last_fail">başarısız - %1$s</string>
-    <string name="nav_more">Daha Fazla</string>
-    <string name="nav_log">Günlük</string>
-    <string name="nav_amsat">AMSAT</string>
-    <string name="amsat_title">AMSAT Uydu Durumu</string>
-    <string name="amsat_refresh">Yenile</string>
-    <string name="amsat_retry">Tekrar dene</string>
-    <string name="amsat_updated">Güncellendi:</string>
-    <string name="amsat_active">Aktif</string>
-    <string name="amsat_tlm">TLM/işaret</string>
-    <string name="amsat_not_heard">Duyulmadı</string>
-    <string name="amsat_conflict">Çelişkili</string>
-    <string name="amsat_name">Name</string>
-    <string name="amsat_load_failed">Yükleme başarısız - ağı kontrol edip tekrar deneyin</string>
-    <string name="amsat_no_reports">Bu dönem için rapor yok</string>
-    <string name="amsat_close">Kapat</string>
 
     <!-- Satellites screen -->
-    <string name="sat_type_hint">Uydu türü: %s</string>
-    <string name="sat_type_title">Uydu türü seçin</string>
+    <string name="sat_type_hint">Modlar: %s</string>
+    <string name="sat_type_title">Modları seçin</string>
     <string name="sat_search_hint">Id - Ad</string>
     <string name="sat_search_clear">Temizle</string>
     <string name="sat_clear_all">Tümünü temizle</string>
     <string name="sat_select_all">Tümünü seç</string>
+    <string name="sat_group_selected">Seçilenler</string>
+    <string name="sat_group_available">Kullanılabilir</string>
+    <string name="sat_group_selected_count">Seçilenler (%1$d)</string>
+    <string name="sat_group_available_count">Kullanılabilir (%1$d)</string>
     <string name="sat_empty_list_message">"Arama sorgunuzun doğru olduğundan ve veritabanının güncellendiğinden emin olun"</string>
     <string name="sat_warning_title">Uyarı\!</string>
     <string name="sat_warning_message">
         Bu uygulamada 9000\'den fazla uydu listelenmiştir.
         Hepsini aynı anda takip etmek anlamsızdır.
         \n\nListeyi yalnızca ilgilendiğiniz uydularla
-        daraltmak için arama ve tür seçiciyi kullanın.</string>
+        daraltmak için arama ve mod seçiciyi kullanın.</string>
 
     <!-- Passes screen -->
     <string name="pass_filter_title">Geçişleri filtrele</string>
@@ -82,7 +40,7 @@
     <string name="pass_filter_invert_time">AOS aralığını tersine çevir</string>
     <string name="pass_filter_deep_space">DeepSpace (periyot &gt;225dk)</string>
     <string name="pass_time_placeholder" translatable="false"> -- : -- : -- </string>
-    <string name="pass_modes_title">Modulasyon türü seçin</string>
+    <string name="pass_modes_title">Modları seçin</string>
     <string name="pass_satId" translatable="false">%05d</string>
     <string name="pass_elevation">Yükseklik açısı: %.1f°</string>
     <string name="pass_deep_space" translatable="false">DeepSpace</string>
@@ -96,12 +54,12 @@
         Ayarlar\'dan GPS, Enlem/Boylam veya QTH kullanarak konumunuzu belirlediğinizden emin olun.
         \n\nDoğru tahminler alabilmek için veritabanını en az haftada bir güncelleyin.</string>
     <string name="pass_whatsnew_title" translatable="false">What\'s new in Look4Sat</string>
-        <string name="pass_whatsnew_message" translatable="false">
-        * YENİ: AMSAT uydu durumu resmi AMSAT API kullanıyor (v1 JSON, daha hızlı ve güvenilir)
-        * AMSAT durum sayfası tam ekran cihazlara uyumlu (yenileme düğmesi ve saat her zaman erişilebilir)
-        * WaveLog: QRZ karşı grid sorgulama (⚙ diyalogda Cookie yapıştır + test sorgusu)
-        * WaveLog: LoTW uydu listesi güncelleme düğmesi (112 uydu yerleşik)
-        * WaveLog: RST 59/59 sinyal raporu (v1 ve v2)
+    <string name="pass_whatsnew_message" translatable="false">
+        * Switched to short-form commands in NetworkReporter, by theojalba
+        \n* Added CAT radio control for full-duplex SAT operation, by jcmerg
+        \n* Added normalized time for passes AOS/LOS, fixed refresh state bug
+        \n* Added multiple performance tweaks, improved passes calculation
+        \n* Fixed UTC pass time problem mentioned in issue #201
     </string>
 
     <!-- Radar screen -->
@@ -149,7 +107,7 @@
     <string name="map_visible">Görünür</string>
 
     <!-- Settings screen -->
-    <string name="prefs_app_title" translatable="false">Look4Sat Pro v%s</string>
+    <string name="prefs_app_title" translatable="false">Look4Sat v%s</string>
     <string name="prefs_app_url" translatable="false">https://play.google.com/store/apps/details?id=com.rtbishop.look4sat</string>
     <string name="prefs_donate_title">Bağış yap</string>
     <string name="prefs_donate_url" translatable="false">https://ko-fi.com/rt_bishop</string>
@@ -167,50 +125,50 @@
 
     <string name="prefs_loc_title">İstasyon konumu</string>
     <string name="prefs_loc_gps_title">GPS</string>
-    <string name="prefs_loc_gps_error">Konum alınamıyor - izinleri ve GPS/ağ sinyalini kontrol edin</string>
+    <string name="prefs_loc_gps_error">Konum izinlerinizi kontrol edin</string>
     <string name="prefs_loc_input_title">Manuel giriş</string>
     <string name="prefs_loc_input_error">Geçersiz konum girildi</string>
     <string name="prefs_loc_qth_title">QTH</string>
     <string name="prefs_loc_qth_error">Geçersiz QTH konumlandırıcısı</string>
     <string name="prefs_loc_success">Konum başarıyla güncellendi</string>
-    <string name="prefs_station_title">İstasyon konumu ayarları</string>
-    <string name="prefs_station_lat_text">Yer istasyonunuzun enlemini girin</string>
-    <string name="prefs_station_lon_text">Yer istasyonunuzun boylamını girin</string>
-    <string name="prefs_locator_title">QTH konumlandırıcı ayarları</string>
-    <string name="prefs_locator_text">İstasyon konumunu konumlandırıcı ile ayarlayın</string>
+    <string name="prefs_station_title">İstasyon konumu</string>
+    <string name="prefs_station_lat_text">İstasyon enlemi</string>
+    <string name="prefs_station_lon_text">İstasyon boylamı</string>
+    <string name="prefs_locator_title">QTH konumlandırıcı</string>
+    <string name="prefs_locator_text">Konumu lokatörle ayarla</string>
 
     <string name="prefs_data_title">Uydu verisi</string>
     <string name="prefs_data_entries">Uydular: %s</string>
     <string name="prefs_data_radios">Transceiver\'lar: %s</string>
     <string name="prefs_data_update">Güncelle</string>
-    <string name="prefs_data_import">Özel URL</string>
+    <string name="prefs_data_import">İçe aktar</string>
     <string name="prefs_data_clear">Temizle</string>
     <string name="prefs_data_clear_success">Veriler başarıyla temizlendi</string>
     <string name="prefs_data_update_success">Güncelleme başarıyla tamamlandı</string>
-    <string name="prefs_data_update_failed">Güncelleme başarısız - ağınızı kontrol edin</string>
+    <string name="prefs_data_import_satellites_error">Uydu içe aktarılmadı. Geçerli bir TLE/3LE (.txt) veya OMM (.csv) dosyası seçin.</string>
+    <string name="prefs_data_import_transceivers_error">Transceiver içe aktarılmadı. Geçerli bir SatNOGS (.json) dosyası seçin.</string>
 
-    <string name="prefs_data_sources_title">Özel veri kaynakları</string>
-    <string name="prefs_data_sources_tle_switch">Özel TLE URL</string>
-    <string name="prefs_data_sources_transceivers_switch">Özel transceiver URL</string>
+    <string name="prefs_data_sources_title">Özel kaynaklar</string>
+    <string name="prefs_data_sources_tle_switch">TLE URL</string>
+    <string name="prefs_data_sources_transceivers_switch">Transceiver URL</string>
     <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>
-    <string name="prefs_data_reset_url">Varsayılan URL\'ye sıfırla</string>
 
-    <string name="prefs_data_output_title">Veri aktarımı</string>
+    <string name="prefs_data_output_title">Veri çıkışı</string>
     <string name="prefs_net_output">Ağ</string>
     <string name="prefs_bt_output">Bluetooth</string>
     <string name="prefs_cat_output">CAT</string>
 
     <!-- Radio Control -->
     <string name="nav_radiocontrol">Radyo Kontrolü</string>
-    <string name="rc_settings_title">CAT Radyo Kontrolü</string>
+    <string name="rc_settings_title">CAT kontrolü</string>
     <string name="rc_radio_model">Radyo Modeli</string>
-    <string name="rc_tx_device_hint">TX Radyo BT Adresi</string>
-    <string name="rc_rx_device_hint">RX Radyo BT Adresi</string>
+    <string name="rc_tx_device_hint">TX BT adresi</string>
+    <string name="rc_rx_device_hint">RX BT adresi</string>
     <string name="rc_tx_name_hint">TX Radyo Adı</string>
     <string name="rc_rx_name_hint">RX Radyo Adı</string>
-    <string name="rc_enable_switch">CAT Kontrolünü Etkinleştir</string>
+    <string name="rc_enable_switch">CAT\'i etkinleştir</string>
 
-    <string name="prefs_net_title">Ağ veri çıkışı</string>
+    <string name="prefs_net_title">Ağ çıkışı</string>
     <string name="prefs_net_rotator_switch">Döndürme çıkışını etkinleştir</string>
     <string name="prefs_net_rotator_address_hint">IP:Port</string>
     <string name="prefs_net_rotator_format_hint">Biçim</string>
@@ -218,83 +176,36 @@
     <string name="prefs_net_frequency_address_hint">IP:Port</string>
     <string name="prefs_net_frequency_format_hint">Biçim</string>
 
-    <string name="prefs_bt_title">Bluetooth veri çıkışı</string>
+    <string name="prefs_bt_title">Bluetooth çıkışı</string>
     <string name="prefs_bt_rotator_switch">Döndürme çıkışını etkinleştir</string>
     <string name="prefs_bt_rotator_device_hint">Cihaz kimliği</string>
-    <string name="prefs_bt_rotator_output_hint">Veri biçimi</string>
+    <string name="prefs_bt_rotator_output_hint">Biçim</string>
     <string name="prefs_bt_frequency_switch">Frekans çıkışını etkinleştir</string>
     <string name="prefs_bt_frequency_device_hint">Cihaz kimliği</string>
-    <string name="prefs_bt_frequency_output_hint">Veri biçimi</string>
+    <string name="prefs_bt_frequency_output_hint">Biçim</string>
     <string name="prefs_bt_perm_error">Bluetooth izninizi kontrol edin</string>
     <string name="prefs_net_perm_error">Ağ izninizi kontrol edin</string>
 
-    <string name="tracking_status">İzleniyor: %s</string>
-    <string name="loc_lat_text">Enlem: %s°</string>
-    <string name="loc_lon_text">Boylam: %s°</string>
-    <string name="loc_qth_text">QTH: %s</string>
-    <string name="connect_radio">Bağlan</string>
-    <string name="disconnect_radio">Bağlantıyı Kes</string>
-    <string name="track_radio">Takip</string>
-    <string name="stop_radio">Dur</string>
-    <string name="prefs_wavelog_title">WaveLog günlük sunucusu</string>
-    <string name="prefs_wavelog_url_hint">Sunucu adresi</string>
-    <string name="prefs_wavelog_key_hint">API anahtarı</string>
-    <string name="prefs_wavelog_station_hint">İstasyon kimliği</string>
-    <string name="prefs_wavelog_auto">Otomatik yükleme</string>
-    <string name="prefs_wavelog_test">Bağlantıyı test et</string>
-    <string name="prefs_wavelog_update_sats">Uydu güncelle</string>
-    <string name="prefs_wavelog_upload">Şimdi yükle</string>
-    <string name="wavelog_title">Günlük</string>
-    <string name="wavelog_select_transponder">Transponder seç</string>
-    <string name="wavelog_call_hint">Çağrı işareti</string>
-    <string name="wavelog_mode_hint">Mod</string>
-    <string name="wavelog_saved">Yerel günlüğe kaydedildi</string>
-    <string name="wavelog_need_config">Önce Ayarlar\'da WaveLog\'u yapılandırın</string>
-    <string name="wavelog_empty">Henüz günlük kaydı yok</string>
-    <string name="wavelog_grid_mismatch">QTH ızgarası (%1$s) istasyon ızgarasıyla (%2$s) eşleşmiyor. Yine de yüklensin mi?</string>
-    <string name="wavelog_ignore">Yoksay ve yükle</string>
-    <string name="wavelog_cancel">İptal</string>
-    <string name="prefs_wavelog_qrz_title">QRZ Cookie</string>
-    <string name="prefs_wavelog_qrz_hint">QRZ giriş çerezlerinizi buraya yapıştırın (EditThisCookie dışa aktarımı veya "k=v; k=v" biçimi). Yükleme için karşı istasyonun grid karesini getirmekte kullanılır.</string>
-    <string name="prefs_wavelog_qrz_label">Çerez</string>
-    <string name="wavelog_copy">Kopyala</string>
-    <string name="wavelog_delete_undo">Geri al</string>
-    <string name="wavelog_col_time">Zaman</string>
-    <string name="wavelog_col_freq">Frekans</string>
-    <string name="wavelog_col_sat">Uydu</string>
-    <string name="wavelog_col_call">Çağrı</string>
-    <string name="wavelog_col_uploaded">Gönderildi</string>
-    <string name="wavelog_ungrouped">Gruplanmamış</string>
-    <string name="prefs_other_title">Diğer ayarlar</string>
-    <string name="prefs_ui_title">UI Ayarları</string>
-    <string name="prefs_ui_order_title">Sayfa sırası</string>
-    <string name="prefs_ui_main_title">Ana menü (alt çubuk)</string>
-    <string name="prefs_ui_sub_title">Daha fazla menü</string>
-    <string name="prefs_ui_move_out">Daha fazla menüye taşı</string>
-    <string name="prefs_ui_move_back">Ana menüye geri taşı</string>
-    <string name="prefs_ui_order_locked">Sabit (taşınamaz)</string>
-    <string name="prefs_ui_order_reset">Sıralamayı sıfırla</string>
-    <string name="prefs_other_switch_utc">Geçiş saatini UTC olarak göster</string>
-    <string name="prefs_other_switch_update">Otomatik veri güncellemeyi etkinleştir</string>
-    <string name="prefs_other_switch_sweep">Radar taramasını etkinleştir</string>
-    <string name="prefs_other_switch_sensors">Radar görünümünü döndürmek için sensörleri kullan</string>
-    <string name="prefs_other_switch_night_mode">Kırmızı gece filtresini etkinleştir</string>
+    <string name="prefs_other_title">Diğer</string>
+    <string name="prefs_other_switch_utc">UTC saati</string>
+    <string name="prefs_other_switch_update">Veriyi otomatik güncelle</string>
+    <string name="prefs_other_switch_sweep">Radar taraması</string>
+    <string name="prefs_other_switch_sensors">Sensör</string>
+    <string name="prefs_other_switch_night_mode">Gece filtresi</string>
 
     <string name="prefs_highlight_title">Elevasyon vurgusu</string>
     <string name="prefs_highlight_low">Düşük &lt; %1$d°</string>
     <string name="prefs_highlight_mid">Orta %1$d-%2$d°</string>
     <string name="prefs_highlight_high">Yüksek &gt; %1$d°</string>
 
-    <string name="prefs_outro_title">BG7NTA ve orijinal yazar teşekkür eder</string>
+    <string name="prefs_outro_title">Teşekkürler</string>
     <string name="prefs_outro_thanks" translatable="false">
         • Look4Sat users and contributors!
         \n• David A. B. Johnson (predict4java)
         \n• Dave Moten (predict4java)
         \n• Alexandru Csete (Gpredict)
         \n• Dr T.S. Kelso (Celestrak)
-        \n• Libre Space Foundation (SatNOGS)
-        \n• BA7OPF (pass matching feature)
-        \n• BG7NTA</string>
+        \n• Libre Space Foundation (SatNOGS)</string>
     <string name="prefs_outro_license">Bu uygulama herhangi bir garanti sunmaz</string>
 
 </resources>

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

@@ -13,12 +13,16 @@
     <string name="nav_prefs">Налаштування</string>
 
     <!-- Satellites screen -->
-    <string name="sat_type_hint">Тип: %s</string>
-    <string name="sat_type_title">Виберіть тип супутника</string>
+    <string name="sat_type_hint">Режими: %s</string>
+    <string name="sat_type_title">Виберіть режими</string>
     <string name="sat_search_hint">Id - Назва</string>
     <string name="sat_search_clear">Очистити</string>
     <string name="sat_clear_all">Очистити всі</string>
     <string name="sat_select_all">Вибрати всі</string>
+    <string name="sat_group_selected">Обрані</string>
+    <string name="sat_group_available">Доступні</string>
+    <string name="sat_group_selected_count">Обрані (%1$d)</string>
+    <string name="sat_group_available_count">Доступні (%1$d)</string>
     <string name="sat_empty_list_message">
         Переконайтеся, що ваш пошуковий запит правильний, а база даних оновлена</string>
     <string name="sat_warning_title">Увага\!</string>
@@ -26,7 +30,7 @@
         У цьому додатку перелічено понад 9000 супутників.
         Немає сенсу відстежувати їх усі одночасно.
         \n\nЗавжди намагайтеся звузити список лише до тих,
-        які вас цікавлять, за допомогою пошуку та селектора типів.</string>
+        які вас цікавлять, за допомогою пошуку та вибору режимів.</string>
 
     <!-- Passes screen -->
     <string name="pass_filter_title">Фільтр прольотів</string>
@@ -35,7 +39,7 @@
     <string name="pass_filter_aos_time">Вікно AOS</string>
     <string name="pass_filter_invert_time">Інвертувати вікно AOS</string>
     <string name="pass_filter_deep_space">DeepSpace (період &gt;225хв)</string>
-    <string name="pass_modes_title">Виберіть тип модуляції</string>
+    <string name="pass_modes_title">Виберіть режими</string>
     <string name="pass_elevation">Піднес.: %.1f°</string>
     <string name="pass_altitude">Висота: %.0f км</string>
     <string name="pass_empty_list_message">
@@ -96,11 +100,11 @@
     <string name="prefs_loc_qth_title">QTH</string>
     <string name="prefs_loc_qth_error">Некоректний локатор QTH</string>
     <string name="prefs_loc_success">Позицію успішно оновлено</string>
-    <string name="prefs_station_title">Налаштування місцезнаходження станції</string>
-    <string name="prefs_station_lat_text">Широта місцезнаходження станції</string>
-    <string name="prefs_station_lon_text">Довгота місцезнаходження станції</string>
-    <string name="prefs_locator_title">Налаштування QTH локатора</string>
-    <string name="prefs_locator_text">Задати позицію за QTH локатором</string>
+    <string name="prefs_station_title">Позиція станції</string>
+    <string name="prefs_station_lat_text">Широта станції</string>
+    <string name="prefs_station_lon_text">Довгота станції</string>
+    <string name="prefs_locator_title">Локатор QTH</string>
+    <string name="prefs_locator_text">Позиція за локатором</string>
 
     <string name="prefs_data_title">Супутникові дані</string>
     <string name="prefs_data_entries">Супутників: %s</string>
@@ -110,39 +114,52 @@
     <string name="prefs_data_clear">Очистити</string>
     <string name="prefs_data_clear_success">Дані успішно очищено</string>
     <string name="prefs_data_update_success">Оновлення успішне</string>
+    <string name="prefs_data_import_satellites_error">Супутники не імпортовано. Потрібен TLE/3LE (.txt) або OMM (.csv).</string>
+    <string name="prefs_data_import_transceivers_error">Трансивери не імпортовано. Потрібен SatNOGS (.json).</string>
 
-    <string name="prefs_data_sources_title">Custom data sources</string>
-    <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>
-    <string name="prefs_data_sources_transceivers_switch">Custom transceivers URL</string>
+    <string name="prefs_data_sources_title">Власні джерела</string>
+    <string name="prefs_data_sources_tle_switch">URL TLE</string>
+    <string name="prefs_data_sources_transceivers_switch">URL трансиверів</string>
+    <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>
 
-    <string name="prefs_data_output_title">Data output</string>
-    <string name="prefs_net_output">Network</string>
+    <string name="prefs_data_output_title">Вивід даних</string>
+    <string name="prefs_net_output">Мережа</string>
     <string name="prefs_bt_output">Bluetooth</string>
+    <string name="prefs_cat_output">CAT</string>
 
-    <string name="prefs_net_title">Вивід мережевих даних</string>
-    <string name="prefs_net_rotator_switch">Enable rotation output</string>
+    <string name="nav_radiocontrol">Керування радіо</string>
+    <string name="rc_settings_title">CAT керування</string>
+    <string name="rc_radio_model">Модель радіо</string>
+    <string name="rc_tx_device_hint">BT адреса TX</string>
+    <string name="rc_rx_device_hint">BT адреса RX</string>
+    <string name="rc_tx_name_hint">Назва радіо TX</string>
+    <string name="rc_rx_name_hint">Назва радіо RX</string>
+    <string name="rc_enable_switch">Увімкнути CAT</string>
+
+    <string name="prefs_net_title">Мережевий вивід</string>
+    <string name="prefs_net_rotator_switch">Увімкнути вивід повороту</string>
     <string name="prefs_net_rotator_address_hint">IP:Порт</string>
     <string name="prefs_net_rotator_format_hint">Формат даних</string>
-    <string name="prefs_net_frequency_switch">Enable frequency output</string>
+    <string name="prefs_net_frequency_switch">Увімкнути вивід частоти</string>
     <string name="prefs_net_frequency_address_hint">IP:Порт</string>
     <string name="prefs_net_frequency_format_hint">Формат даних</string>
 
-    <string name="prefs_bt_title">Вивід даних Bluetooth</string>
-    <string name="prefs_bt_rotator_switch">Enable rotation output</string>
-    <string name="prefs_bt_rotator_device_hint">Id пристрою</string>
+    <string name="prefs_bt_title">Вивід Bluetooth</string>
+    <string name="prefs_bt_rotator_switch">Увімкнути вивід повороту</string>
+    <string name="prefs_bt_rotator_device_hint">ID пристрою</string>
     <string name="prefs_bt_rotator_output_hint">Формат даних</string>
-    <string name="prefs_bt_frequency_switch">Enable frequency output</string>
-    <string name="prefs_bt_frequency_device_hint">Id пристрою</string>
+    <string name="prefs_bt_frequency_switch">Увімкнути вивід частоти</string>
+    <string name="prefs_bt_frequency_device_hint">ID пристрою</string>
     <string name="prefs_bt_frequency_output_hint">Формат даних</string>
     <string name="prefs_bt_perm_error">Перевірте дозвіл Bluetooth</string>
     <string name="prefs_net_perm_error">Перевірте дозвіл мережі</string>
 
-    <string name="prefs_other_title">Інші налаштування</string>
-    <string name="prefs_other_switch_utc">Показувати час в UTC</string>
-    <string name="prefs_other_switch_update">Автоматичне оновлення даних</string>
-    <string name="prefs_other_switch_sweep">Показувати анімацію радара</string>
-    <string name="prefs_other_switch_sensors">Використовувати сенсори пристрою</string>
-    <string name="prefs_other_switch_night_mode">Увімкнути червоний нічний фільтр</string>
+    <string name="prefs_other_title">Інше</string>
+    <string name="prefs_other_switch_utc">Час в UTC</string>
+    <string name="prefs_other_switch_update">Автооновлення даних</string>
+    <string name="prefs_other_switch_sweep">Анімація радара</string>
+    <string name="prefs_other_switch_sensors">Сенсори</string>
+    <string name="prefs_other_switch_night_mode">Нічний фільтр</string>
 
     <string name="prefs_highlight_title">Підсвічування висоти</string>
     <string name="prefs_highlight_low">Низько &lt; %1$d°</string>

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

@@ -9,67 +9,23 @@
     <string name="nav_sat">卫星</string>
     <string name="nav_pass">过境</string>
     <string name="nav_radar">雷达</string>
-    <string name="nav_mutual">匹配</string>
-    <string name="nav_roaming">漫游</string>
-    <string name="nav_cw">CW解码</string>
     <string name="nav_map">地图</string>
     <string name="nav_prefs">设置</string>
-    <string name="prefs_aprs_title">APRS 上报</string>
-    <string name="prefs_aprs_enable">启用 APRS 上报</string>
-    <string name="prefs_aprs_summary">服务器: %1$s:%2$d  呼号: %3$s</string>
-    <string name="prefs_aprs_report_now">立即上报</string>
-    <string name="prefs_aprs_settings_title">APRS 设置</string>
-    <string name="prefs_aprs_server">服务器</string>
-    <string name="prefs_aprs_port">端口</string>
-    <string name="prefs_aprs_callsign">呼号</string>
-    <string name="prefs_aprs_ssid">SSID</string>
-    <string name="prefs_aprs_passcode">验证码</string>
-    <string name="prefs_aprs_passcode_hint">验证码留空 = 按呼号自动计算</string>
-    <string name="prefs_aprs_interval">周期(分钟)</string>
-    <string name="prefs_aprs_status">状态文本</string>
-    <string name="prefs_aprs_symbol_table">符号表</string>
-    <string name="prefs_aprs_symbol_code">符号码</string>
-    <string name="prefs_aprs_save">保存</string>
-    <string name="prefs_aprs_cancel">取消</string>
-    <string name="aprs_notif_channel">APRS 服务</string>
-    <string name="aprs_notif_title">APRS: %1$s</string>
-    <string name="aprs_notif_running">上报运行中</string>
-    <string name="aprs_notif_connected">已连接 APRS-IS</string>
-    <string name="aprs_notif_error">连接错误</string>
-    <string name="aprs_notif_stop">停止</string>
-    <string name="prefs_aprs_calc_passcode">计算验证码</string>
-    <string name="aprs_toast_ok">APRS: 上报成功</string>
-    <string name="aprs_toast_fail">APRS: 上报失败 - %1$s</string>
-    <string name="aprs_toast_not_configured">APRS 未配置,请先填呼号</string>
-    <string name="prefs_aprs_last_report">上次上报: %1$s %2$s</string>
-    <string name="prefs_aprs_last_ok">成功</string>
-    <string name="prefs_aprs_last_fail">失败 - %1$s</string>
-    <string name="nav_more">更多</string>
-    <string name="nav_log">日志</string>
-    <string name="nav_amsat">AMSAT</string>
-    <string name="amsat_title">AMSAT 卫星状态</string>
-    <string name="amsat_refresh">刷新</string>
-    <string name="amsat_retry">重试</string>
-    <string name="amsat_updated">更新:</string>
-    <string name="amsat_active">活跃</string>
-    <string name="amsat_tlm">仅遥测</string>
-    <string name="amsat_not_heard">未听到</string>
-    <string name="amsat_conflict">矛盾</string>
-    <string name="amsat_name">Name</string>
-    <string name="amsat_load_failed">加载失败,请检查网络后重试</string>
-    <string name="amsat_no_reports">该时段无报告</string>
-    <string name="amsat_close">关闭</string>
 
     <!-- Satellites screen -->
-    <string name="sat_type_hint">类型：%s</string>
-    <string name="sat_type_title">选择卫星类型</string>
+    <string name="sat_type_hint">模式：%s</string>
+    <string name="sat_type_title">选择模式</string>
     <string name="sat_search_hint">Id - 名称</string>
     <string name="sat_search_clear">清空</string>
     <string name="sat_clear_all">全部清空</string>
     <string name="sat_select_all">全选</string>
+    <string name="sat_group_selected">已选择</string>
+    <string name="sat_group_available">可用</string>
+    <string name="sat_group_selected_count">已选择（%1$d）</string>
+    <string name="sat_group_available_count">可用（%1$d）</string>
     <string name="sat_empty_list_message">请确保您的搜索查询正确且数据库已更新</string>
     <string name="sat_warning_title">警告\!</string>
-    <string name="sat_warning_message">此应用收录了超过9000颗卫星信息\n同时追踪所有卫星并不现实\n建议始终通过搜索和分类筛选功能仅勾选您感兴趣的卫星</string>
+    <string name="sat_warning_message">此应用收录了超过9000颗卫星信息\n同时追踪所有卫星并不现实\n建议始终通过搜索和模式筛选功能仅勾选您感兴趣的卫星</string>
 
     <!-- Passes screen -->
     <string name="pass_filter_title">筛选过境</string>
@@ -78,21 +34,13 @@
     <string name="pass_filter_aos_time">AOS 时间段</string>
     <string name="pass_filter_invert_time">反选 AOS 时间段</string>
     <string name="pass_filter_deep_space">DeepSpace（周期 &gt;225分钟）</string>
-    <string name="pass_modes_title">选择调制类型</string>
+    <string name="pass_modes_title">选择模式</string>
     <string name="pass_elevation">仰角：%.1f°</string>
     <string name="pass_altitude">高度：%d km</string>
     <string name="pass_empty_list_message">请确保您的过滤器设置正确，并且已选择卫星</string>
     <string name="pass_error_message">没有即将过境的卫星</string>
     <string name="pass_welcome_title">欢迎来到 Look4Sat\!</string>
     <string name="pass_welcome_message">请务必在设置中通过GPS、经纬度或QTH定位您的位置\n建议至少每周更新一次数据库，以确保预测结果的准确性</string>
-    <string name="pass_whatsnew_title">Look4Sat Pro 更新内容</string>
-        <string name="pass_whatsnew_message" translatable="false">
-        * 新: AMSAT 卫星状态改用官方 AMSAT API(v1 JSON,更快更稳)
-        * AMSAT 状态页适配全面屏(刷新按钮和更新时间始终可点)
-        * WaveLog: QRZ 对方网格查询(⚙ 弹窗粘贴 Cookie + 测试查询)
-        * WaveLog: LoTW 卫星列表更新按钮(内置 112 颗卫星)
-        * WaveLog: 信号报告 59/59(v1 和 v2)
-    </string>
 
     <!-- Radar screen -->
     <string name="radar_back">后退</string>
@@ -112,17 +60,9 @@
     <string name="radar_string_no">否</string>
     <string name="radar_string_yes">是</string>
     <string name="radar_visible">日照中</string>
-
-    <string name="radar_doppler_calc">多普勒频率计算器</string>
     <string name="radar_doppler_tx_hint">输入上行频率 (MHz)</string>
     <string name="radar_doppler_rx_hint">输入下行频率 (MHz)</string>
     <string name="radar_doppler_offset_hint">偏移 (kHz)</string>
-    <string name="radar_doppler_info">线性转发器：输入一个频率即可算出另一个</string>
-
-    <string name="radar_cw_decoder">CW 解码器</string>
-    <string name="radar_cw_start">开始</string>
-    <string name="radar_cw_stop">停止</string>
-    <string name="radar_cw_reset">清空</string>
 
     <!-- Map screen -->
     <string name="map_prev">上一个</string>
@@ -147,43 +87,51 @@
     <string name="prefs_updated_title">更新：%s</string>
     <string name="prefs_updated_time">yyyy MMM d - HH:mm:ss</string>
 
-    <string name="prefs_loc_title">站点位置</string>
+    <string name="prefs_loc_title">站位</string>
     <string name="prefs_loc_gps_title">GPS 定位</string>
-    <string name="prefs_loc_gps_error">无法获取位置,请检查定位权限和GPS/网络信号</string>
+    <string name="prefs_loc_gps_error">检查您的位置权限</string>
     <string name="prefs_loc_input_title">输入位置</string>
     <string name="prefs_loc_input_error">输入的位置无效</string>
     <string name="prefs_loc_qth_title">QTH 网格</string>
     <string name="prefs_loc_qth_error">无效的 QTH 网格</string>
     <string name="prefs_loc_success">位置更新成功</string>
-    <string name="prefs_station_title">站点位置设置</string>
-    <string name="prefs_station_lat_text">输入站点的纬度</string>
-    <string name="prefs_station_lon_text">输入站点的经度</string>
-    <string name="prefs_locator_title">QTH 网格</string>
-    <string name="prefs_locator_text">使用梅登黑德网格设置站点位置</string>
+    <string name="prefs_station_title">站位</string>
+    <string name="prefs_station_lat_text">站位纬度</string>
+    <string name="prefs_station_lon_text">站位经度</string>
+    <string name="prefs_locator_title">QTH 定位</string>
+    <string name="prefs_locator_text">通过 QTH 设置站位</string>
 
     <string name="prefs_data_title">卫星数据更新</string>
     <string name="prefs_data_entries">卫星：%s</string>
     <string name="prefs_data_radios">收发器：%s</string>
     <string name="prefs_data_update">在线更新</string>
-    <string name="prefs_data_import">自定义URL</string>
+    <string name="prefs_data_import">导入文件</string>
     <string name="prefs_data_clear">清空</string>
     <string name="prefs_data_clear_success">数据清空成功</string>
     <string name="prefs_data_update_success">更新成功</string>
-    <string name="prefs_data_update_failed">更新失败,请检查网络</string>
-
     <string name="prefs_data_import_satellites_error">未导入卫星。请选择有效的 TLE/3LE (.txt) 或 OMM (.csv) 文件。</string>
     <string name="prefs_data_import_transceivers_error">未导入收发器。请选择有效的 SatNOGS (.json) 文件。</string>
 
-    <string name="prefs_data_sources_title">自定义数据源</string>
-    <string name="prefs_data_sources_tle_switch">自定义TLE URL</string>
-    <string name="prefs_data_sources_transceivers_switch">自定义收发器URL</string>
+    <string name="prefs_data_sources_title">自定义源</string>
+    <string name="prefs_data_sources_tle_switch">TLE URL</string>
+    <string name="prefs_data_sources_transceivers_switch">收发器 URL</string>
+    <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>
 
     <string name="prefs_data_output_title">数据输出</string>
     <string name="prefs_net_output">网络</string>
     <string name="prefs_bt_output">蓝牙</string>
     <string name="prefs_cat_output">CAT</string>
 
-    <string name="prefs_net_title">网络数据输出</string>
+    <string name="nav_radiocontrol">电台控制</string>
+    <string name="rc_settings_title">CAT 控制</string>
+    <string name="rc_radio_model">电台型号</string>
+    <string name="rc_tx_device_hint">TX 电台蓝牙地址</string>
+    <string name="rc_rx_device_hint">RX 电台蓝牙地址</string>
+    <string name="rc_tx_name_hint">TX 电台名称</string>
+    <string name="rc_rx_name_hint">RX 电台名称</string>
+    <string name="rc_enable_switch">启用 CAT</string>
+
+    <string name="prefs_net_title">网络输出</string>
     <string name="prefs_net_rotator_switch">启用方位俯仰角输出</string>
     <string name="prefs_net_rotator_address_hint">IP:端口</string>
     <string name="prefs_net_rotator_format_hint">数据格式</string>
@@ -191,7 +139,7 @@
     <string name="prefs_net_frequency_address_hint">IP:端口</string>
     <string name="prefs_net_frequency_format_hint">数据格式</string>
 
-    <string name="prefs_bt_title">蓝牙数据输出</string>
+    <string name="prefs_bt_title">蓝牙输出</string>
     <string name="prefs_bt_rotator_switch">启用方位俯仰角输出</string>
     <string name="prefs_bt_rotator_device_hint">蓝牙设备 ID</string>
     <string name="prefs_bt_rotator_output_hint">数据格式</string>
@@ -201,84 +149,26 @@
     <string name="prefs_bt_perm_error">请检查蓝牙权限</string>
     <string name="prefs_net_perm_error">请检查网络权限</string>
 
-    <!-- Radio Control -->
-    <string name="nav_radiocontrol">电台控制</string>
-    <string name="rc_settings_title">CAT 电台控制</string>
-    <string name="rc_radio_model">电台型号</string>
-    <string name="rc_tx_device_hint">发射电台蓝牙地址</string>
-    <string name="rc_rx_device_hint">接收电台蓝牙地址</string>
-    <string name="rc_tx_name_hint">发射电台名称</string>
-    <string name="rc_rx_name_hint">接收电台名称</string>
-    <string name="rc_enable_switch">启用 CAT 控制</string>
-
-    <string name="tracking_status">跟踪: %s</string>
-    <string name="loc_lat_text">纬度: %s°</string>
-    <string name="loc_lon_text">经度: %s°</string>
-    <string name="loc_qth_text">QTH: %s</string>
-    <string name="connect_radio">连接</string>
-    <string name="disconnect_radio">断开</string>
-    <string name="track_radio">跟踪</string>
-    <string name="stop_radio">停止</string>
-    <string name="prefs_wavelog_title">WaveLog 日志服务器</string>
-    <string name="prefs_wavelog_url_hint">服务器地址</string>
-    <string name="prefs_wavelog_key_hint">API 密钥</string>
-    <string name="prefs_wavelog_station_hint">站点 ID</string>
-    <string name="prefs_wavelog_auto">自动上传</string>
-    <string name="prefs_wavelog_test">测试连接</string>
-    <string name="prefs_wavelog_update_sats">更新卫星列表</string>
-    <string name="prefs_wavelog_upload">手动上传</string>
-    <string name="wavelog_title">日志</string>
-    <string name="wavelog_select_transponder">选择转发器</string>
-    <string name="wavelog_call_hint">对方呼号</string>
-    <string name="wavelog_mode_hint">模式</string>
-    <string name="wavelog_saved">已存入本地日志</string>
-    <string name="wavelog_need_config">请先在设置中配置 WaveLog</string>
-    <string name="wavelog_empty">暂无日志记录</string>
-    <string name="wavelog_grid_mismatch">当前 QTH 网格(%1$s)与站点网格(%2$s)不一致,仍要上传?</string>
-    <string name="wavelog_ignore">忽略并上传</string>
-    <string name="wavelog_cancel">取消</string>
-    <string name="prefs_wavelog_qrz_title">QRZ Cookie</string>
-    <string name="prefs_wavelog_qrz_hint">在此粘贴 QRZ 登录 Cookie(EditThisCookie 导出 或 "k=v; k=v" 格式)。用于上传时查询对方网格。</string>
-    <string name="prefs_wavelog_qrz_label">Cookie</string>
-    <string name="wavelog_copy">复制</string>
-    <string name="wavelog_delete_undo">撤销</string>
-    <string name="wavelog_col_time">时间</string>
-    <string name="wavelog_col_freq">频率</string>
-    <string name="wavelog_col_sat">卫星</string>
-    <string name="wavelog_col_call">呼号</string>
-    <string name="wavelog_col_uploaded">已传</string>
-    <string name="wavelog_ungrouped">未分组</string>
-    <string name="prefs_other_title">其他设置</string>
-    <string name="prefs_ui_title">UI设置</string>
-    <string name="prefs_ui_order_title">页面顺序</string>
-    <string name="prefs_ui_main_title">主菜单(底部栏)</string>
-    <string name="prefs_ui_sub_title">更多菜单</string>
-    <string name="prefs_ui_move_out">移入更多菜单</string>
-    <string name="prefs_ui_move_back">移回主菜单</string>
-    <string name="prefs_ui_order_locked">固定(不可移动)</string>
-    <string name="prefs_ui_order_reset">重置顺序</string>
-    <string name="prefs_other_switch_utc">以 UTC 时间显示</string>
-    <string name="prefs_other_switch_update">启用卫星数据自动更新</string>
-    <string name="prefs_other_switch_sweep">启用雷达扫描动画</string>
-    <string name="prefs_other_switch_sensors">使用传感器旋转雷达视图</string>
-    <string name="prefs_other_switch_night_mode">启用红色夜间模式</string>
+    <string name="prefs_other_title">其他</string>
+    <string name="prefs_other_switch_utc">UTC 时间</string>
+    <string name="prefs_other_switch_update">自动更新数据</string>
+    <string name="prefs_other_switch_sweep">雷达扫描动画</string>
+    <string name="prefs_other_switch_sensors">传感器控制雷达</string>
+    <string name="prefs_other_switch_night_mode">红色夜间模式</string>
 
     <string name="prefs_highlight_title">仰角高亮</string>
     <string name="prefs_highlight_low">低 &lt; %1$d°</string>
     <string name="prefs_highlight_mid">中 %1$d-%2$d°</string>
     <string name="prefs_highlight_high">高 &gt; %1$d°</string>
 
-    <string name="prefs_outro_title">BG7NTA 与原作者感谢：</string>
+    <string name="prefs_outro_title">我要感谢：</string>
     <string name="prefs_outro_thanks" translatable="false">
         • Look4Sat 所有用户及贡献者!
         \n• David A. B. Johnson (predict4java)
         \n• Dave Moten (predict4java)
         \n• Alexandru Csete (Gpredict)
         \n• Dr T.S. Kelso (Celestrak)
-        \n• Libre Space Foundation (SatNOGS)
-        \n• xdsopl 和 Robot36 贡献者!
-        \n• BA7OPF(过境匹配功能)
-        \n• BG7NTA</string>
+        \n• Libre Space Foundation (SatNOGS)</string>
     <string name="prefs_outro_license">该应用程序不提供任何保修.</string>
 
 </resources>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Commmon -->
-    <string name="app_name" translatable="false">Look4Sat Pro</string>
+    <string name="app_name" translatable="false">Look4Sat</string>
     <string name="btn_accept">Accept</string>
     <string name="btn_cancel">Cancel</string>
     <string name="empty_list_message">No data to show</string>
@@ -10,71 +10,27 @@
     <string name="nav_sat">Satellites</string>
     <string name="nav_pass">Passes</string>
     <string name="nav_radar">Radar</string>
-    <string name="nav_mutual">Match</string>
-    <string name="nav_roaming">Roaming</string>
-    <string name="nav_cw">CW Decoder</string>
     <string name="nav_map">Map</string>
     <string name="nav_prefs">Settings</string>
-    <string name="prefs_aprs_title">APRS Reporting</string>
-    <string name="prefs_aprs_enable">Enable APRS reporting</string>
-    <string name="prefs_aprs_summary">Server: %1$s:%2$d  Callsign: %3$s</string>
-    <string name="prefs_aprs_report_now">Report Now</string>
-    <string name="prefs_aprs_settings_title">APRS Settings</string>
-    <string name="prefs_aprs_server">Server</string>
-    <string name="prefs_aprs_port">Port</string>
-    <string name="prefs_aprs_callsign">Callsign</string>
-    <string name="prefs_aprs_ssid">SSID</string>
-    <string name="prefs_aprs_passcode">Passcode</string>
-    <string name="prefs_aprs_passcode_hint">Passcode empty = auto-computed from callsign</string>
-    <string name="prefs_aprs_interval">Interval (min)</string>
-    <string name="prefs_aprs_status">Status text</string>
-    <string name="prefs_aprs_symbol_table">Symbol table</string>
-    <string name="prefs_aprs_symbol_code">Symbol code</string>
-    <string name="prefs_aprs_save">Save</string>
-    <string name="prefs_aprs_cancel">Cancel</string>
-    <string name="aprs_notif_channel">APRS service</string>
-    <string name="aprs_notif_title">APRS: %1$s</string>
-    <string name="aprs_notif_running">Reporting running</string>
-    <string name="aprs_notif_connected">Connected to APRS-IS</string>
-    <string name="aprs_notif_error">Connection error</string>
-    <string name="aprs_notif_stop">Stop</string>
-    <string name="prefs_aprs_calc_passcode">Compute passcode</string>
-    <string name="aprs_toast_ok">APRS: report sent OK</string>
-    <string name="aprs_toast_fail">APRS: report failed - %1$s</string>
-    <string name="aprs_toast_not_configured">APRS not configured - set callsign first</string>
-    <string name="prefs_aprs_last_report">Last report: %1$s %2$s</string>
-    <string name="prefs_aprs_last_ok">OK</string>
-    <string name="prefs_aprs_last_fail">failed - %1$s</string>
-    <string name="nav_more">More</string>
-    <string name="nav_log">Log</string>
-    <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>
 
     <!-- Satellites screen -->
-    <string name="sat_type_hint">Type: %s</string>
-    <string name="sat_type_title">Select satellite type</string>
+    <string name="sat_type_hint">Modes: %s</string>
+    <string name="sat_type_title">Select modes</string>
     <string name="sat_search_hint">Id - Name</string>
     <string name="sat_search_clear">Clear</string>
     <string name="sat_clear_all">Clear all</string>
     <string name="sat_select_all">Select all</string>
+    <string name="sat_group_selected">Selected</string>
+    <string name="sat_group_available">Available</string>
+    <string name="sat_group_selected_count">Selected (%1$d)</string>
+    <string name="sat_group_available_count">Available (%1$d)</string>
     <string name="sat_empty_list_message">"Make sure your search query is correct and the DB is updated"</string>
     <string name="sat_warning_title">Warning\!</string>
     <string name="sat_warning_message">
         There are over 9000 satellites listed in this app.
         It makes no sense to track them all at the same time.
         \n\nAlways try to narrow down the list to only the ones
-        you\'re interested in via search and types selector.</string>
+        you\'re interested in via search and the modes selector.</string>
 
     <!-- Passes screen -->
     <string name="pass_filter_title">Filter passes</string>
@@ -84,7 +40,7 @@
     <string name="pass_filter_invert_time">Invert AOS window</string>
     <string name="pass_filter_deep_space">DeepSpace (period >225min)</string>
     <string name="pass_time_placeholder" translatable="false"> -- : -- : -- </string>
-    <string name="pass_modes_title">Select modulation type</string>
+    <string name="pass_modes_title">Select modes</string>
     <string name="pass_satId" translatable="false">%05d</string>
     <string name="pass_elevation">Elevation: %.1f°</string>
     <string name="pass_deep_space" translatable="false">DeepSpace</string>
@@ -98,14 +54,34 @@
         Make sure to set your position via GPS, Lat/Lon or QTH in Settings.
         \n\nPlease update the database at least weekly to get accurate predictions.</string>
     <string name="pass_whatsnew_title" translatable="false">What\'s new in Look4Sat</string>
-        <string name="pass_whatsnew_message" translatable="false">
-        * NEW: AMSAT satellite status now uses the official AMSAT API (v1 JSON, faster and more reliable)
-        * AMSAT status page fits edge-to-edge screens (refresh button and update time always reachable)
-        * WaveLog: QRZ counterpart grid lookup (gear dialog > paste QRZ cookies > test query)
-        * WaveLog: LoTW satellite list refresh button (112 satellites built in)
-        * WaveLog: RST 59/59 signal reports for QSOs (v1 and v2)
+    <string name="pass_whatsnew_message" translatable="false">
+        * Added small tweaks to Sources and strings. Added official ISS source (#225)
+        \n* Implemented AOS window and elevation highlight filters (#226)
+        \n* Added cleartext traffic support for custom TLE URLs (#227)
+        \n* Fixed manual OMM (.csv) data import, tweaked error messaging (#228)
+        \n* Added support for Icom IC-705 CAT by ruilvo (#229)
+        \n* Added configurable Radar offset to the sensors output by qwqtoday (#230)
+        \n* Localized pass date and time formats for Chinese by atsunatsu (#231)
+        \n* Added linear transponder Doppler calculator by atsunatsu (#232)
+        \n* Added a few tweaks to SSTV sensitivity and reception, similar to Robot36
+        \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>
@@ -131,16 +107,9 @@
     <string name="radar_string_no">No</string>
     <string name="radar_string_yes">Yes</string>
     <string name="radar_visible">Visible</string>
-    <string name="radar_doppler_calc">Doppler Frequency Calculator</string>
     <string name="radar_doppler_tx_hint">Enter TX freq (MHz)</string>
     <string name="radar_doppler_rx_hint">Enter RX freq (MHz)</string>
     <string name="radar_doppler_offset_hint">Offset (kHz)</string>
-    <string name="radar_doppler_info">For linear transponders, type one frequency to see the other</string>
-
-    <string name="radar_cw_decoder">CW Decoder</string>
-    <string name="radar_cw_start">Start</string>
-    <string name="radar_cw_stop">Stop</string>
-    <string name="radar_cw_reset">Clear</string>
 
     <!-- Map screen -->
     <string name="map_prev">Prev</string>
@@ -161,7 +130,7 @@
     <string name="map_visible">Visible</string>
 
     <!-- Settings screen -->
-    <string name="prefs_app_title" translatable="false">Look4Sat Pro v%s</string>
+    <string name="prefs_app_title" translatable="false">Look4Sat v%s</string>
     <string name="prefs_app_url" translatable="false">https://play.google.com/store/apps/details?id=com.rtbishop.look4sat</string>
     <string name="prefs_donate_title">Donate</string>
     <string name="prefs_donate_url" translatable="false">https://ko-fi.com/rt_bishop</string>
@@ -179,35 +148,33 @@
 
     <string name="prefs_loc_title">Station position</string>
     <string name="prefs_loc_gps_title">GPS</string>
-    <string name="prefs_loc_gps_error">Unable to get location - check permission and GPS/network signal</string>
+    <string name="prefs_loc_gps_error">Check your location permissions</string>
     <string name="prefs_loc_input_title">Input</string>
     <string name="prefs_loc_input_error">Invalid location entered</string>
     <string name="prefs_loc_qth_title">QTH</string>
     <string name="prefs_loc_qth_error">Invalid QTH locator</string>
     <string name="prefs_loc_success">Position updated successfully</string>
-    <string name="prefs_station_title">Station position settings</string>
-    <string name="prefs_station_lat_text">Set your ground station\'s latitude</string>
-    <string name="prefs_station_lon_text">Set your ground station\'s longitude</string>
-    <string name="prefs_locator_title">QTH locator settings</string>
-    <string name="prefs_locator_text">Set station\'s position using locator</string>
+    <string name="prefs_station_title">Station position</string>
+    <string name="prefs_station_lat_text">Station latitude</string>
+    <string name="prefs_station_lon_text">Station longitude</string>
+    <string name="prefs_locator_title">QTH locator</string>
+    <string name="prefs_locator_text">Set position via locator</string>
 
     <string name="prefs_data_title">Satellite data</string>
     <string name="prefs_data_entries">Satellites: %s</string>
     <string name="prefs_data_radios">Transceivers: %s</string>
     <string name="prefs_data_update">Update</string>
-    <string name="prefs_data_import">Custom URL</string>
+    <string name="prefs_data_import">Import</string>
     <string name="prefs_data_clear">Clear</string>
     <string name="prefs_data_clear_success">Data was cleared successfully</string>
     <string name="prefs_data_update_success">Update completed successfully</string>
-    <string name="prefs_data_update_failed">Update failed - check your network</string>
     <string name="prefs_data_import_satellites_error">No satellites imported. Select a valid TLE/3LE (.txt) or OMM (.csv) file.</string>
     <string name="prefs_data_import_transceivers_error">No transceivers imported. Select a valid SatNOGS (.json) file.</string>
 
-    <string name="prefs_data_sources_title">Custom data sources</string>
-    <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>
-    <string name="prefs_data_sources_transceivers_switch">Custom transceivers URL</string>
+    <string name="prefs_data_sources_title">Custom sources</string>
+    <string name="prefs_data_sources_tle_switch">TLE URL</string>
+    <string name="prefs_data_sources_transceivers_switch">Transceivers URL</string>
     <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>
-    <string name="prefs_data_reset_url">Reset to default URL</string>
 
     <string name="prefs_data_output_title">Data output</string>
     <string name="prefs_net_output">Network</string>
@@ -216,15 +183,15 @@
 
     <!-- Radio Control -->
     <string name="nav_radiocontrol">Radio Control</string>
-    <string name="rc_settings_title">CAT Radio Control</string>
+    <string name="rc_settings_title">CAT control</string>
     <string name="rc_radio_model">Radio Model</string>
-    <string name="rc_tx_device_hint">TX Radio BT Address</string>
-    <string name="rc_rx_device_hint">RX Radio BT Address</string>
+    <string name="rc_tx_device_hint">TX BT address</string>
+    <string name="rc_rx_device_hint">RX BT address</string>
     <string name="rc_tx_name_hint">TX Radio Name</string>
     <string name="rc_rx_name_hint">RX Radio Name</string>
-    <string name="rc_enable_switch">Enable CAT Control</string>
+    <string name="rc_enable_switch">Enable CAT</string>
 
-    <string name="prefs_net_title">Network data output</string>
+    <string name="prefs_net_title">Network output</string>
     <string name="prefs_net_rotator_switch">Enable rotation output</string>
     <string name="prefs_net_rotator_address_hint">IP:Port</string>
     <string name="prefs_net_rotator_format_hint">Format</string>
@@ -232,74 +199,31 @@
     <string name="prefs_net_frequency_address_hint">IP:Port</string>
     <string name="prefs_net_frequency_format_hint">Format</string>
 
-    <string name="prefs_bt_title">Bluetooth data output</string>
+    <string name="prefs_bt_title">Bluetooth output</string>
     <string name="prefs_bt_rotator_switch">Enable rotation output</string>
-    <string name="prefs_bt_rotator_device_hint">Device id</string>
-    <string name="prefs_bt_rotator_output_hint">Data format</string>
+    <string name="prefs_bt_rotator_device_hint">Device ID</string>
+    <string name="prefs_bt_rotator_output_hint">Format</string>
     <string name="prefs_bt_frequency_switch">Enable frequency output</string>
-    <string name="prefs_bt_frequency_device_hint">Device id</string>
-    <string name="prefs_bt_frequency_output_hint">Data format</string>
+    <string name="prefs_bt_frequency_device_hint">Device ID</string>
+    <string name="prefs_bt_frequency_output_hint">Format</string>
     <string name="prefs_bt_perm_error">Check your bluetooth permission</string>
     <string name="prefs_net_perm_error">Check your network permission</string>
 
-    <string name="tracking_status">Tracking: %s</string>
-    <string name="loc_lat_text">Lat: %s°</string>
-    <string name="loc_lon_text">Lon: %s°</string>
-    <string name="loc_qth_text">Qth: %s</string>
-    <string name="connect_radio">Connect</string>
-    <string name="disconnect_radio">Disconnect</string>
-    <string name="track_radio">Track</string>
-    <string name="stop_radio">Stop</string>
-    <string name="prefs_wavelog_title">WaveLog log server</string>
-    <string name="prefs_wavelog_url_hint">Server address</string>
-    <string name="prefs_wavelog_key_hint">API key</string>
-    <string name="prefs_wavelog_station_hint">Station ID</string>
-    <string name="prefs_wavelog_auto">Auto upload</string>
-    <string name="prefs_wavelog_test">Test connection</string>
-    <string name="prefs_wavelog_update_sats">Update sats</string>
-    <string name="prefs_wavelog_upload">Upload now</string>
-    <string name="wavelog_title">Log</string>
-    <string name="wavelog_select_transponder">Select transponder</string>
-    <string name="wavelog_call_hint">Callsign</string>
-    <string name="wavelog_mode_hint">Mode</string>
-    <string name="wavelog_saved">Saved to local log</string>
-    <string name="wavelog_need_config">Configure WaveLog in Settings first</string>
-    <string name="wavelog_empty">No log entries yet</string>
-    <string name="wavelog_grid_mismatch">QTH grid (%1$s) does not match station grid (%2$s). Upload anyway?</string>
-    <string name="wavelog_ignore">Ignore and upload</string>
-    <string name="wavelog_cancel">Cancel</string>
-    <string name="prefs_wavelog_qrz_title">QRZ Cookie</string>
-    <string name="prefs_wavelog_qrz_hint">Paste your QRZ login cookies here (EditThisCookie export or "k=v; k=v" string). Used to fetch the other station grid square for uploads.</string>
-    <string name="prefs_wavelog_qrz_label">Cookie</string>
-    <string name="wavelog_copy">Copy</string>
-    <string name="wavelog_delete_undo">Undo</string>
-    <string name="wavelog_col_time">Time</string>
-    <string name="wavelog_col_freq">Freq</string>
-    <string name="wavelog_col_sat">Satellite</string>
-    <string name="wavelog_col_call">Call</string>
-    <string name="wavelog_col_uploaded">Sent</string>
-    <string name="wavelog_ungrouped">Ungrouped</string>
-    <string name="prefs_other_title">Other settings</string>
-    <string name="prefs_ui_title">UI Settings</string>
-    <string name="prefs_ui_order_title">Page order</string>
-    <string name="prefs_ui_main_title">Main menu (bottom bar)</string>
-    <string name="prefs_ui_sub_title">More menu</string>
-    <string name="prefs_ui_move_out">Move to more menu</string>
-    <string name="prefs_ui_move_back">Move back to main menu</string>
-    <string name="prefs_ui_order_locked">Fixed (cannot be moved)</string>
-    <string name="prefs_ui_order_reset">Reset order</string>
-    <string name="prefs_other_switch_utc">Show pass time in UTC</string>
-    <string name="prefs_other_switch_update">Enable automatic data update</string>
-    <string name="prefs_other_switch_sweep">Enable radar sweep animation</string>
-    <string name="prefs_other_switch_sensors">Use sensors to rotate radar view</string>
-    <string name="prefs_other_switch_night_mode">Enable red night mode filter</string>
+    <string name="prefs_other_title">Other</string>
+    <string name="prefs_other_switch_utc">UTC time</string>
+    <string name="prefs_other_switch_update">Auto-update data</string>
+    <string name="prefs_other_switch_sweep">Radar sweep</string>
+    <string name="prefs_other_switch_sensors">Use sensors</string>
+    <string name="prefs_other_switch_night_mode">Night filter</string>
+    <string name="prefs_other_compass_offset">Radar compass offset</string>
+    <string name="prefs_other_compass_offset_elev">Radar compass offset (elev)</string>
 
     <string name="prefs_highlight_title">Elevation highlight</string>
     <string name="prefs_highlight_low">Low &lt; %1$d°</string>
     <string name="prefs_highlight_mid">Mid %1$d–%2$d°</string>
     <string name="prefs_highlight_high">High &gt; %1$d°</string>
 
-    <string name="prefs_outro_title">BG7NTA &amp; the original author would like to thank</string>
+    <string name="prefs_outro_title">I would like to say thanks to</string>
     <string name="prefs_outro_thanks" translatable="false">
         * Look4Sat users and contributors!
         \n* David A. B. Johnson (predict4java)
@@ -308,8 +232,6 @@
         \n* Dr T.S. Kelso (Celestrak)
         \n* Libre Space Foundation (SatNOGS)
         \n* xdsopl and Robot36 contributors!
-        \n* BA7OPF (pass matching feature)
-        \n* BG7NTA
     </string>
     <string name="prefs_outro_license">The app comes with no warranty</string>
 

fastlane/metadata/android/en-US/changelogs/default.txt

@@ -1,2 +1,8 @@
-* Added required tweaks to support Android 17 (API 37)
-* Added ACCESS_LOCAL_NETWORK permission check to support network data output
+* Added ARISS source, tweaked SSTV sensitivity #225
+* Implemented AOS window and elev filter #226
+* Added cleartext traffic support for TLEs #227
+* Fixed OMM import, tweaked error messages #228
+* Added support for Icom CAT by ruilvo #229
+* Added tweakable Radar offset by qwqtoday #230
+* Localized date/time formats by atsunatsu #231
+* Added linear radio Doppler calc by atsunatsu #232

feature/cw/build.gradle.kts

@@ -1,26 +0,0 @@
-import com.android.build.api.variant.CanProduceConsumerProguardFiles
-
-plugins {
-    alias(libs.plugins.convention.featurePlugin)
-}
-
-android {
-    namespace = "com.rtbishop.look4sat.feature.cw"
-    compileOptions {
-        encoding = "UTF-8"
-    }
-}
-
-// R8 consumer rules (kept for compatibility; the fldigi port has no native code)
-androidComponents {
-    onVariants(selector().all()) { variant ->
-        (variant as? CanProduceConsumerProguardFiles)?.consumerProguardFiles?.add(
-            project.layout.projectDirectory.file("proguard-rules.pro")
-        )
-    }
-}
-
-dependencies {
-    implementation(project(":core:domain"))
-    implementation(project(":core:data"))
-}

feature/cw/proguard-rules.pro

@@ -1,31 +0,0 @@
-# Look4Sat Pro — CW 解码模块(照搬 Morse Expert 1.15)混淆规则
-# 所有 CW 类保持原名: pas.* 通过 RegisterNatives 按类名注册 JNI(混淆即崩);
-# 其余为照搬的混淆名类(命名已无混淆意义, 保持以保逻辑完整)。
-
-# JNI 引擎(RegisterNatives 按类名/方法名查表)
--keep class pas.** { *; }
-
-# 照搬的解码/UI 类(全部保持)
--keep class com.ve3nea.morse_expert.** { *; }
--keep class H2.** { *; }
--keep class I2.b { *; }
--keep class J2.** { *; }
--keep class k3.** { *; }
--keep class i3.** { *; }
--keep class g3.** { *; }
--keep class j3.** { *; }
--keep class s.** { *; }
--keep class d1.AbstractC1518b { *; }
--keep class B0.b { *; }
--keep class B.RunnableC0001b { *; }
--keep class D.n { *; }
--keep class E2.g { *; }
--keep class F2.a { *; }
--keep class I0.d { *; }
--keep class K1.a { *; }
--keep class j1.C1646n { *; }
-
-# sun.misc stub(Android 无此类, 仅编译期; 防止 R8 异常处理)
--dontwarn sun.misc.**
--keep class sun.misc.Unsafe { *; }
--keep class sun.misc.Cleaner { *; }

feature/cw/src/main/java/com/rtbishop/look4sat/feature/cw/CwDecodeScreen.kt

@@ -1,501 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.feature.cw
-
-import android.Manifest
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.media.AudioFormat
-import android.media.AudioRecord
-import android.media.MediaRecorder
-import android.net.Uri
-import android.provider.Settings
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-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.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.systemBarsPadding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Button
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.FontFamily
-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 com.rtbishop.look4sat.core.domain.cw.CwFldigiDecoder
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
-import kotlin.math.roundToInt
-
-/**
- * CW decode page — pure Compose, fldigi decoding engine.
- *
- * Layout mirrors the DeepCW web decoder (waterfall -> live line -> history)
- * inside the existing container; top-bar actions (back/settings) and bottom
- * actions (start-pause/clear) keep the previous page's interaction model.
- * The old Morse Expert (ve3nea) controller and layouts are fully removed.
- */
-@Composable
-fun CwDecodeScreen(navigateUp: () -> Unit = {}) {
-    val context = LocalContext.current
-    val scope = rememberCoroutineScope()
-    val decoder = remember { CwFldigiDecoder(initialWpm = 18) }
-    val waterfall = remember { CwWaterfallState() }
-
-    var permissionGranted by remember {
-        mutableStateOf(
-            context.checkSelfPermission(Manifest.permission.RECORD_AUDIO) ==
-                PackageManager.PERMISSION_GRANTED
-        )
-    }
-    var permanentlyDenied by remember { mutableStateOf(false) }
-    var isListening by remember { mutableStateOf(false) }
-    var showSettings by remember { mutableStateOf(false) }
-    var captureJob by remember { mutableStateOf<Job?>(null) }
-
-    val decodedText by decoder.decodedTextFlow.collectAsState()
-    val signalStrength by decoder.signalStrength.collectAsState()
-    val estimatedSpeed by decoder.estimatedSpeed.collectAsState()
-
-    val permissionLauncher = rememberLauncherForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { granted ->
-        permissionGranted = granted
-        permanentlyDenied = !granted && (
-            (context as? android.app.Activity)?.shouldShowRequestPermissionRationale(
-                Manifest.permission.RECORD_AUDIO
-            ) ?: false
-        ).not()
-    }
-
-    fun startCapture() {
-        if (!permissionGranted) {
-            permissionLauncher.launch(Manifest.permission.RECORD_AUDIO)
-            return
-        }
-        captureJob?.cancel()
-        captureJob = scope.launch(Dispatchers.IO) {
-            val capture = CwMicCapture()
-            capture.audioFlow().collect { chunk ->
-                if (!isActive) return@collect
-                decoder.processBuffer(chunk)
-                waterfall.pushSamples(chunk)
-            }
-        }
-        isListening = true
-    }
-
-    fun stopCapture() {
-        captureJob?.cancel()
-        captureJob = null
-        isListening = false
-    }
-
-    DisposableEffect(Unit) {
-        onDispose { stopCapture() }
-    }
-
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .systemBarsPadding()
-    ) {
-        // Top bar
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 4.dp, vertical = 2.dp),
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            IconButton(onClick = { stopCapture(); navigateUp() }) {
-                Icon(painter = androidx.compose.ui.res.painterResource(com.rtbishop.look4sat.core.presentation.R.drawable.ic_back), contentDescription = "Back")
-            }
-            Text(
-                text = "CW Decoder",
-                style = MaterialTheme.typography.titleMedium,
-                modifier = Modifier.weight(1f)
-            )
-            IconButton(onClick = { showSettings = true }) {
-                Icon(painter = androidx.compose.ui.res.painterResource(com.rtbishop.look4sat.core.presentation.R.drawable.ic_cw), contentDescription = "Settings")
-            }
-        }
-
-        // Waterfall
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(150.dp)
-                .padding(horizontal = 8.dp)
-                .clip(RoundedCornerShape(8.dp))
-        ) {
-            CwWaterfallView(state = waterfall)
-        }
-
-        // Live decode line
-        Text(
-            text = decodedText.takeLast(80),
-            fontSize = 18.sp,
-            fontFamily = FontFamily.Monospace,
-            color = MaterialTheme.colorScheme.onSurface,
-            maxLines = 1,
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 12.dp, vertical = 4.dp)
-        )
-
-        // History
-        Box(
-            modifier = Modifier
-                .weight(1f)
-                .fillMaxWidth()
-                .padding(horizontal = 8.dp)
-                .border(1.dp, MaterialTheme.colorScheme.outlineVariant, RoundedCornerShape(8.dp))
-                .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.4f))
-        ) {
-            Text(
-                text = decodedText,
-                modifier = Modifier
-                    .fillMaxSize()
-                    .verticalScroll(rememberScrollState())
-                    .padding(8.dp),
-                fontSize = 16.sp,
-                fontFamily = FontFamily.Monospace,
-                color = MaterialTheme.colorScheme.onSurface
-            )
-        }
-
-        // Status cards
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 8.dp, vertical = 6.dp),
-            horizontalArrangement = Arrangement.spacedBy(8.dp)
-        ) {
-            StatusCard("DECODER", if (isListening) "ACTIVE" else "IDLE",
-                if (isListening) Color(0xFF4CAF50) else MaterialTheme.colorScheme.outline,
-                Modifier.weight(1f))
-            StatusCard("SPEED", if (estimatedSpeed != null) "${estimatedSpeed?.roundToInt()} WPM" else "--",
-                MaterialTheme.colorScheme.primary, Modifier.weight(1f))
-            StatusCard("LEVEL", "${(signalStrength * 100).roundToInt()}%",
-                MaterialTheme.colorScheme.tertiary, Modifier.weight(1f))
-        }
-
-        // Bottom actions
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 8.dp, vertical = 6.dp),
-            horizontalArrangement = Arrangement.spacedBy(8.dp)
-        ) {
-            Button(
-                onClick = { if (isListening) stopCapture() else startCapture() },
-                modifier = Modifier.weight(1f)
-            ) {
-                Icon(
-                    painter = if (isListening) androidx.compose.ui.res.painterResource(com.rtbishop.look4sat.core.presentation.R.drawable.ic_close)
-                    else androidx.compose.ui.res.painterResource(com.rtbishop.look4sat.core.presentation.R.drawable.ic_arrow),
-                    contentDescription = null,
-                    modifier = Modifier.size(18.dp)
-                )
-                Spacer(Modifier.size(4.dp))
-                Text(if (isListening) "Pause" else "Start")
-            }
-            Button(
-                onClick = { decoder.resetDecoder(); waterfall.reset() },
-                modifier = Modifier.weight(1f)
-            ) {
-                Icon(painter = androidx.compose.ui.res.painterResource(com.rtbishop.look4sat.core.presentation.R.drawable.ic_delete), contentDescription = null, modifier = Modifier.size(18.dp))
-                Spacer(Modifier.size(4.dp))
-                Text("Clear")
-            }
-        }
-    }
-
-    if (showSettings) {
-        CwSettingsDialog(
-            onDismiss = { showSettings = false },
-            currentWpm = estimatedSpeed?.roundToInt() ?: 18
-        )
-    }
-
-    if (!permissionGranted) {
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(Color(0x99000000)),
-            contentAlignment = Alignment.Center
-        ) {
-            Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                Text(
-                    text = "Microphone permission is required for CW decoding",
-                    color = Color.White,
-                    textAlign = TextAlign.Center,
-                    modifier = Modifier.padding(horizontal = 24.dp)
-                )
-                Spacer(Modifier.height(12.dp))
-                Button(onClick = { permissionLauncher.launch(Manifest.permission.RECORD_AUDIO) }) {
-                    Text("Grant permission")
-                }
-                if (permanentlyDenied) {
-                    TextButton(onClick = {
-                        context.startActivity(
-                            Intent(
-                                Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
-                                Uri.parse("package:${context.packageName}")
-                            )
-                        )
-                    }) {
-                        Text("Open app settings")
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun StatusCard(label: String, value: String, accent: Color, modifier: Modifier = Modifier) {
-    Column(
-        modifier = modifier
-            .border(1.dp, accent.copy(alpha = 0.6f), RoundedCornerShape(8.dp))
-            .padding(horizontal = 8.dp, vertical = 6.dp),
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-        Text(text = label, fontSize = 10.sp, color = MaterialTheme.colorScheme.onSurfaceVariant)
-        Text(
-            text = value,
-            fontSize = 14.sp,
-            fontWeight = FontWeight.Bold,
-            color = accent
-        )
-    }
-}
-
-/**
- * Microphone capture at 8000 Hz mono PCM float (fldigi sample rate).
- */
-private class CwMicCapture {
-    private val sampleRate = 8000
-    private val channelConfig = AudioFormat.CHANNEL_IN_MONO
-    private val audioFormat = AudioFormat.ENCODING_PCM_FLOAT
-
-    fun audioFlow(): kotlinx.coroutines.flow.Flow<FloatArray> =
-        kotlinx.coroutines.flow.flow {
-            val bufferSize = AudioRecord.getMinBufferSize(sampleRate, channelConfig, audioFormat)
-                .coerceAtLeast(sampleRate / 5)
-            val recorder = AudioRecord(
-                MediaRecorder.AudioSource.MIC,
-                sampleRate,
-                channelConfig,
-                audioFormat,
-                bufferSize * 4
-            )
-            try {
-                recorder.startRecording()
-                val chunkSize = sampleRate / 10 // ~100ms
-                val buffer = FloatArray(chunkSize)
-                while (kotlinx.coroutines.currentCoroutineContext().isActive) {
-                    val read = recorder.read(buffer, 0, chunkSize, AudioRecord.READ_BLOCKING)
-                    if (read > 0) {
-                        emit(if (read == chunkSize) buffer.copyOf() else buffer.copyOfRange(0, read))
-                    }
-                }
-            } finally {
-                recorder.stop()
-                recorder.release()
-            }
-        }.flowOn(Dispatchers.IO)
-}
-
-// --- Waterfall (lightweight sliding spectrogram) ---
-
-class CwWaterfallState {
-    private val columns = 160
-    private val rows = 64
-    private val data = FloatArray(columns * rows)
-    private var colCount = 0
-    private val pending = ArrayList<Float>(4096)
-    private val fftWindow = 512
-
-    /** Monotonic frame counter — reading this in composition triggers redraw. */
-    private val _version = androidx.compose.runtime.mutableIntStateOf(0)
-    val version: androidx.compose.runtime.State<Int> = _version
-
-    @Synchronized
-    fun pushSamples(samples: FloatArray) {
-        pending.addAll(samples.toList())
-        var frames = 0
-        while (pending.size >= fftWindow) {
-            val window = FloatArray(fftWindow) { pending[it] }
-            repeat(fftWindow) { pending.removeAt(0) }
-            val spectrum = computeSpectrum(window)
-            // shift rows up, insert newest at bottom
-            for (r in 0 until rows - 1) {
-                System.arraycopy(data, (r + 1) * columns, data, r * columns, columns)
-            }
-            for (c in 0 until columns) {
-                val bin = c * spectrum.size / columns
-                data[(rows - 1) * columns + c] = spectrum[bin.coerceAtMost(spectrum.size - 1)]
-            }
-            if (colCount < rows) colCount++
-            frames++
-        }
-        if (frames > 0) _version.intValue++
-    }
-
-    /** Magnitude spectrum via radix-2 FFT on a Hann-windowed frame. */
-    private fun computeSpectrum(window: FloatArray): FloatArray {
-        val n = window.size
-        val re = FloatArray(n)
-        val im = FloatArray(n)
-        for (i in 0 until n) {
-            val w = 0.5 - 0.5 * kotlin.math.cos(2.0 * Math.PI * i / (n - 1))
-            re[i] = window[i] * w.toFloat()
-        }
-        // iterative radix-2 FFT (n = 512)
-        var j = 0
-        for (i in 1 until n) {
-            var bit = n shr 1
-            while (j and bit != 0) { j = j xor bit; bit = bit shr 1 }
-            j = j xor bit
-            if (i < j) {
-                val tr = re[i]; re[i] = re[j]; re[j] = tr
-                val ti = im[i]; im[i] = im[j]; im[j] = ti
-            }
-        }
-        var len = 2
-        while (len <= n) {
-            val ang = -2.0 * Math.PI / len
-            val wRe = kotlin.math.cos(ang).toFloat()
-            val wIm = kotlin.math.sin(ang).toFloat()
-            var i = 0
-            while (i < n) {
-                var curRe = 1f
-                var curIm = 0f
-                for (k in 0 until len / 2) {
-                    val uRe = re[i + k]
-                    val uIm = im[i + k]
-                    val vRe = re[i + k + len / 2] * curRe - im[i + k + len / 2] * curIm
-                    val vIm = re[i + k + len / 2] * curIm + im[i + k + len / 2] * curRe
-                    re[i + k] = uRe + vRe
-                    im[i + k] = uIm + vIm
-                    re[i + k + len / 2] = uRe - vRe
-                    im[i + k + len / 2] = uIm - vIm
-                    val nRe = curRe * wRe - curIm * wIm
-                    val nIm = curRe * wIm + curIm * wRe
-                    curRe = nRe; curIm = nIm
-                }
-                i += len
-            }
-            len = len shl 1
-        }
-        val bins = 48
-        val out = FloatArray(bins)
-        for (k in 0 until bins) {
-            // bin k maps to k * 8000/512 ≈ 15.6 Hz steps; show 0..750 Hz region
-            out[k] = kotlin.math.sqrt(re[k] * re[k] + im[k] * im[k]) / n
-        }
-        return out
-    }
-
-    @Synchronized
-    fun getColumn(c: Int): FloatArray {
-        val col = FloatArray(rows)
-        for (r in 0 until rows) {
-            col[r] = data[r * columns + c.coerceIn(0, columns - 1)]
-        }
-        return col
-    }
-
-    @Synchronized
-    fun reset() {
-        data.fill(0f)
-        pending.clear()
-        colCount = 0
-    }
-}
-
-@Composable
-private fun CwWaterfallView(state: CwWaterfallState) {
-    val columns = 160
-    val rows = 64
-    // Read the frame counter so the canvas redraws as new spectra arrive.
-    state.version.value
-    Canvas(
-        modifier = Modifier
-            .fillMaxSize()
-            .background(Color(0xFF0D1B2A))
-            .clip(RoundedCornerShape(8.dp))
-    ) {
-        val cellW = size.width / columns
-        val cellH = size.height / rows
-        for (c in 0 until columns) {
-            val col = state.getColumn(c)
-            for (r in 0 until rows) {
-                val v = col[r]
-                // log-ish scaling: quiet bins stay dark, strong CW tones pop
-                val intensity = (kotlin.math.ln1p(v * 600f) * 55f).coerceIn(0f, 255f)
-                if (intensity > 4f) {
-                    val green = (intensity * 1.25f).coerceAtMost(255f)
-                    drawRect(
-                        color = Color(0f, green / 255f, 0f, 1f),
-                        topLeft = Offset(c * cellW, r * cellH),
-                        size = Size(cellW + 0.5f, cellH + 0.5f)
-                    )
-                }
-            }
-        }
-    }
-}

feature/cw/src/main/java/com/rtbishop/look4sat/feature/cw/CwSettingsDialog.kt

@@ -1,155 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.feature.cw
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-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.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.RadioButton
-import androidx.compose.material3.Slider
-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.graphics.Color
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import kotlin.math.roundToInt
-
-/**
- * CW decoder settings (fldigi engine).
- *
- * Options ported from fldigi progdefaults: speed (WPM), SOM codebook
- * decoding on/off, filter bandwidth. Persisted in SharedPreferences.
- */
-@Composable
-fun CwSettingsDialog(
-    onDismiss: () -> Unit,
-    currentWpm: Int,
-    onSpeedChange: (Int) -> Unit = {},
-    onSomChange: (Boolean) -> Unit = {},
-    onBandwidthChange: (Int) -> Unit = {}
-) {
-    var wpm by remember { mutableStateOf(currentWpm.coerceIn(5, 50)) }
-    var useSom by remember { mutableStateOf(true) }
-    var bandwidth by remember { mutableStateOf(150) }
-
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text("CW Settings") },
-        text = {
-            Column(
-                modifier = Modifier
-                    .verticalScroll(rememberScrollState())
-                    .padding(top = 4.dp)
-            ) {
-                Text("Speed (WPM)", style = MaterialTheme.typography.titleSmall)
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Slider(
-                        value = wpm.toFloat(),
-                        onValueChange = { wpm = it.roundToInt() },
-                        valueRange = 5f..50f,
-                        modifier = Modifier.weight(1f)
-                    )
-                    Text(
-                        text = "$wpm",
-                        style = MaterialTheme.typography.titleMedium,
-                        textAlign = TextAlign.End,
-                        modifier = Modifier.width(44.dp)
-                    )
-                }
-                HorizontalDivider(Modifier.padding(vertical = 8.dp))
-
-                Text("Filter bandwidth (Hz)", style = MaterialTheme.typography.titleSmall)
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Slider(
-                        value = bandwidth.toFloat(),
-                        onValueChange = { bandwidth = it.roundToInt() },
-                        valueRange = 50f..500f,
-                        steps = 8,
-                        modifier = Modifier.weight(1f)
-                    )
-                    Text(
-                        text = "$bandwidth",
-                        style = MaterialTheme.typography.titleMedium,
-                        textAlign = TextAlign.End,
-                        modifier = Modifier.width(44.dp)
-                    )
-                }
-                HorizontalDivider(Modifier.padding(vertical = 8.dp))
-
-                Text("SOM codebook decoding", style = MaterialTheme.typography.titleSmall)
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .clip(RoundedCornerShape(6.dp))
-                        .clickable { useSom = true }
-                        .padding(vertical = 2.dp),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    RadioButton(selected = useSom, onClick = { useSom = true })
-                    Text("On (recommended, higher accuracy)")
-                }
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .clip(RoundedCornerShape(6.dp))
-                        .clickable { useSom = false }
-                        .padding(vertical = 2.dp),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    RadioButton(selected = !useSom, onClick = { useSom = false })
-                    Text("Off (plain table lookup)")
-                }
-            }
-        },
-        confirmButton = {
-            TextButton(onClick = {
-                onSpeedChange(wpm)
-                onSomChange(useSom)
-                onBandwidthChange(bandwidth)
-                onDismiss()
-            }) { Text("OK") }
-        },
-        dismissButton = {
-            TextButton(onClick = onDismiss) { Text("Cancel") }
-        },
-    )
-}

feature/cw/src/main/res/values-id/app_values.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_500">#ff6200ee</color>
-    <integer name="default_font_size">18</integer>
-    <string name="idle">Diam</string>
-    <string name="waterfall_display">Tampilan waterfall</string>
-    <string name="frequency_scale">Skala frekuensi</string>
-    <string name="decoded_text">Teks terdekode</string>
-    <string name="clear">Bersihkan</string>
-    <string name="pause">Jeda Dekode</string>
-    <string name="save_text">Simpan Teks</string>
-    <string name="record_signals">Rekam Sinyal</string>
-    <string name="settings">Pengaturan</string>
-    <string name="help">Bantuan Daring</string>
-    <string name="rate">Nilai Aplikasi Ini</string>
-    <string name="premium">Dapatkan Versi Premium</string>
-    <string name="tap_back_again_to_close">Ketuk Kembali lagi untuk menutup aplikasi</string>
-    <string name="message_type">Tipe Pesan</string>
-    <string name="cw_mic_permission">Izin mikrofon diperlukan untuk dekode CW</string>
-    <string name="cw_grant_permission">Beri izin</string>
-    <string name="cw_open_settings">Buka pengaturan aplikasi</string>
-</resources>

feature/cw/src/main/res/values-in/app_values.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_500">#ff6200ee</color>
-    <integer name="default_font_size">18</integer>
-    <string name="idle">Diam</string>
-    <string name="waterfall_display">Tampilan waterfall</string>
-    <string name="frequency_scale">Skala frekuensi</string>
-    <string name="decoded_text">Teks terdekode</string>
-    <string name="clear">Bersihkan</string>
-    <string name="pause">Jeda Dekode</string>
-    <string name="save_text">Simpan Teks</string>
-    <string name="record_signals">Rekam Sinyal</string>
-    <string name="settings">Pengaturan</string>
-    <string name="help">Bantuan Daring</string>
-    <string name="rate">Nilai Aplikasi Ini</string>
-    <string name="premium">Dapatkan Versi Premium</string>
-    <string name="tap_back_again_to_close">Ketuk Kembali lagi untuk menutup aplikasi</string>
-    <string name="message_type">Tipe Pesan</string>
-    <string name="cw_mic_permission">Izin mikrofon diperlukan untuk dekode CW</string>
-    <string name="cw_grant_permission">Beri izin</string>
-    <string name="cw_open_settings">Buka pengaturan aplikasi</string>
-</resources>

feature/cw/src/main/res/values-tr/app_values.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_500">#ff6200ee</color>
-    <integer name="default_font_size">18</integer>
-    <string name="idle">Beklemede</string>
-    <string name="waterfall_display">Şelale görüntüsü</string>
-    <string name="frequency_scale">Frekans ölçeği</string>
-    <string name="decoded_text">Çözülen metin</string>
-    <string name="clear">Temizle</string>
-    <string name="pause">Çözmeyi Duraklat</string>
-    <string name="save_text">Metni Kaydet</string>
-    <string name="record_signals">Sinyalleri Kaydet</string>
-    <string name="settings">Ayarlar</string>
-    <string name="help">Çevrimiçi Yardım</string>
-    <string name="rate">Bu Uygulamayı Değerlendir</string>
-    <string name="premium">Premium Sürümü Al</string>
-    <string name="tap_back_again_to_close">Kapatmak için Geriye tekrar dokunun</string>
-    <string name="message_type">Mesaj Türü</string>
-    <string name="cw_mic_permission">CW çözme için mikrofon izni gereklidir</string>
-    <string name="cw_grant_permission">İzin ver</string>
-    <string name="cw_open_settings">Uygulama ayarlarını aç</string>
-</resources>

feature/cw/src/main/res/values-zh/app_values.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_500">#ff6200ee</color>
-    <integer name="default_font_size">18</integer>
-    <string name="idle">空闲</string>
-    <string name="waterfall_display">瀑布图</string>
-    <string name="frequency_scale">频率刻度</string>
-    <string name="decoded_text">解码文本</string>
-    <string name="clear">清除</string>
-    <string name="pause">暂停解码</string>
-    <string name="save_text">保存文本</string>
-    <string name="record_signals">录音信号</string>
-    <string name="settings">设置</string>
-    <string name="help">在线帮助</string>
-    <string name="rate">评价此应用</string>
-    <string name="premium">获取高级版</string>
-    <string name="tap_back_again_to_close">再次按返回键退出应用</string>
-    <string name="message_type">消息类型</string>
-    <string name="cw_mic_permission">CW 解码需要麦克风权限</string>
-    <string name="cw_grant_permission">授予权限</string>
-    <string name="cw_open_settings">打开应用设置</string>
-</resources>

feature/cw/src/main/res/values/app_values.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_500">#ff6200ee</color>
-    <integer name="default_font_size">18</integer>
-    <string name="idle">Idle</string>
-    <string name="waterfall_display">Waterfall display</string>
-    <string name="frequency_scale">Frequency scale</string>
-    <string name="decoded_text">Decoded text</string>
-    <string name="clear">Clear</string>
-    <string name="pause">Pause Decoding</string>
-    <string name="save_text">Save Text</string>
-    <string name="record_signals">Record Signals</string>
-    <string name="settings">Settings</string>
-    <string name="help">Online Help</string>
-    <string name="rate">Rate this App</string>
-    <string name="premium">Get Premium Version</string>
-    <string name="tap_back_again_to_close">Tap Back again to close the app</string>
-    <string name="message_type">Message Type</string>
-    <string name="cw_mic_permission">Microphone permission is required for CW decoding</string>
-    <string name="cw_grant_permission">Grant permission</string>
-    <string name="cw_open_settings">Open app settings</string>
-</resources>

feature/mutual/build.gradle.kts

@@ -1,7 +0,0 @@
-plugins {
-    alias(libs.plugins.convention.featurePlugin)
-}
-
-android {
-    namespace = "com.rtbishop.look4sat.feature.mutual"
-}