Add TianDiTu

.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

app/build.gradle.kts

@@ -1,36 +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 解码 native 库仅 armeabi-v7a(照搬 Morse Expert 1.15): 全 ABI 打包会在
-    // arm64 设备 loadLibrary 失败, 强制 32 位兼容(用户设备为 32 位软件)
-    defaultConfig {
-        ndk {
-            abiFilters += listOf("armeabi-v7a")
-        }
-    }
-    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/proguard-rules.pro

@@ -0,0 +1,3 @@
+-keep class org.osmdroid.** { *; }
+-keep class com.rtbishop.look4sat.feature.map.*TiandituTileSource* { *; }
+-dontwarn org.osmdroid.**

app/src/main/AndroidManifest.xml

@@ -15,7 +15,7 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
-        android:name=".MainApplication"
+        android:name="cn.bh2vsq.look4sat.MainApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -23,9 +23,8 @@
         android:roundIcon="@mipmap/ic_launcher_round">
 
         <activity
-            android:name=".MainActivity"
+            android:name="cn.bh2vsq.look4sat.MainActivity"
             android:exported="true"
-            android:screenOrientation="portrait"
             android:theme="@style/Theme.Look4Sat.SplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -43,7 +42,7 @@
 
         <meta-data
             android:name="android.telephony.PROPERTY_SATELLITE_DATA_OPTIMIZED"
-            android:value="com.rtbishop.look4sat.bg7nta" />
+            android:value="cn.bh2vsq.look4sat" />
 
     </application>
 </manifest>

app/src/main/java/cn/bh2vsq/look4sat/MainActivity.kt

@@ -15,7 +15,7 @@
  * 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
+package cn.bh2vsq.look4sat
 
 import android.content.Context
 import android.content.res.Configuration

app/src/main/java/cn/bh2vsq/look4sat/MainApplication.kt

@@ -15,7 +15,7 @@
  * 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
+package cn.bh2vsq.look4sat
 
 import android.app.Application
 import com.rtbishop.look4sat.core.data.injection.MainContainer

app/src/main/java/cn/bh2vsq/look4sat/MainScreen.kt

@@ -0,0 +1,248 @@
+/*
+ * 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 cn.bh2vsq.look4sat
+
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
+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.CircleShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults
+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+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.platform.LocalContext
+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.lifecycle.compose.collectAsStateWithLifecycle
+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.presentation.DeeplinkResolver
+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.map.MapDestination
+import com.rtbishop.look4sat.feature.passes.PassesDestination
+import com.rtbishop.look4sat.feature.radar.RadarDestination
+import com.rtbishop.look4sat.feature.satellites.SatellitesDestination
+import com.rtbishop.look4sat.feature.settings.SettingsDestination
+
+@Composable
+fun NavRoot(deeplink: String? = null) {
+    val rootBackStack = rememberNavBackStack(Screen.Passes)
+    val deeplinkResolver = DeeplinkResolver()
+    LaunchedEffect(deeplink) {
+        deeplink?.let {
+            val destination = deeplinkResolver.resolve(it) // rootBackStack.clear()
+            rootBackStack.add(destination)
+        }
+    }
+    val navigateBack: () -> Unit = { rootBackStack.removeLastOrNull() }
+    val slideInTransition = slideInHorizontally(initialOffsetX = { it }) togetherWith scaleOut(targetScale = 0.9f)
+    val slideOutTransition = scaleIn(initialScale = 0.9f) togetherWith slideOutHorizontally(targetOffsetX = { it })
+    NavDisplay(
+        modifier = Modifier.fillMaxSize(),
+        backStack = rootBackStack,
+        onBack = navigateBack,
+        transitionSpec = { slideInTransition },
+        popTransitionSpec = { slideOutTransition },
+        predictivePopTransitionSpec = { slideOutTransition },
+        entryDecorators = listOf(
+            rememberSaveableStateHolderNavEntryDecorator(), // Required for saving Compose state per entry
+            rememberViewModelStoreNavEntryDecorator() // Required for ViewModel scoping per entry
+        ),
+        entryProvider = entryProvider {
+            entry<Screen.Passes> { MainScreen(navigateToRadar = { rootBackStack.add(RadarDestination) }) }
+            entry<RadarDestination> {
+                Scaffold { innerPadding ->
+                    RadarDestination(navigateUp = navigateBack)
+                    innerPadding.calculateTopPadding()
+                }
+            }
+        }
+    )
+}
+
+@Composable
+fun MainScreen(navigateToRadar: () -> Unit = {}) {
+    val backStack = rememberNavBackStack(Screen.Passes)
+    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()
+
+    NavigationSuiteScaffold(
+        navigationSuiteItems = {
+            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.Map -> screen is Screen.Map
+                    is Screen.Settings -> screen is Screen.Settings
+                    else -> false
+                }
+                item(
+                    icon = { Icon(painterResource(screen.iconResId), stringResource(screen.titleResId)) },
+                    label = { Text(stringResource(screen.titleResId)) },
+                    selected = isSelected,
+                    onClick = {
+                        if (isSelected) return@item
+                        while (backStack.size > 1) backStack.removeAt(backStack.size - 1)
+                        if (screen !is Screen.Passes) backStack.add(screen)
+                    }
+                )
+            }
+        },
+        navigationSuiteColors = NavigationSuiteDefaults.colors(
+            navigationRailContainerColor = MaterialTheme.colorScheme.surfaceContainer
+        ),
+        layoutType = when {
+            !hasEnoughHeight() && hasEnoughWidth() -> NavigationSuiteType.NavigationRail
+            !hasEnoughWidth() -> NavigationSuiteType.ShortNavigationBarCompact
+            else -> NavigationSuiteType.ShortNavigationBarMedium
+        }
+    ) {
+        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()
+                        }
+                    }
+                    entry<Screen.Radar> {
+                        RadarDestination(navigateUp = navigateBack)
+                    }
+                    entry<Screen.Map> {
+                        MapDestination()
+                    }
+                    entry<Screen.Settings> {
+                        SettingsDestination()
+                    }
+                }
+            )
+            // 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/MainScreen.kt

@@ -1,372 +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
-
-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
-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.CircleShape
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults
-import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
-import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType
-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
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-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.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
-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
-
-@Composable
-fun NavRoot(deeplink: String? = null) {
-    val rootBackStack = rememberNavBackStack(Screen.Passes)
-    val deeplinkResolver = DeeplinkResolver()
-    LaunchedEffect(deeplink) {
-        deeplink?.let {
-            val destination = deeplinkResolver.resolve(it) // rootBackStack.clear()
-            rootBackStack.add(destination)
-        }
-    }
-    val navigateBack: () -> Unit = { rootBackStack.removeLastOrNull() }
-    val slideInTransition = slideInHorizontally(initialOffsetX = { it }) togetherWith scaleOut(targetScale = 0.9f)
-    val slideOutTransition = scaleIn(initialScale = 0.9f) togetherWith slideOutHorizontally(targetOffsetX = { it })
-    NavDisplay(
-        modifier = Modifier.fillMaxSize(),
-        backStack = rootBackStack,
-        onBack = navigateBack,
-        transitionSpec = { slideInTransition },
-        popTransitionSpec = { slideOutTransition },
-        predictivePopTransitionSpec = { slideOutTransition },
-        entryDecorators = listOf(
-            rememberSaveableStateHolderNavEntryDecorator(), // Required for saving Compose state per entry
-            rememberViewModelStoreNavEntryDecorator() // Required for ViewModel scoping per entry
-        ),
-        entryProvider = entryProvider {
-            entry<Screen.Passes> { MainScreen(navigateToRadar = { rootBackStack.add(RadarDestination) }) }
-            entry<RadarDestination> {
-                Scaffold { innerPadding ->
-                    RadarDestination(navigateUp = navigateBack)
-                    innerPadding.calculateTopPadding()
-                }
-            }
-        }
-    )
-}
-
-@Composable
-fun MainScreen(navigateToRadar: () -> Unit = {}) {
-    val backStack = rememberNavBackStack(Screen.Passes)
-    val currentKey = backStack.lastOrNull()
-    val navigateBack: () -> Unit = { backStack.removeLastOrNull() }
-    val fadeTransition = fadeIn(animationSpec = tween(350)) togetherWith fadeOut(animationSpec = tween(350))
-    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 设置: 按 screenOrder 排序(空 = 默认顺序), 再按 hiddenScreens 过滤(设置页固定保留)
-    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 ->
-            // 未知(新页面如 CwDecode 不在旧持久化顺序里): 用默认顺序位置(漫游↔地图), 再兜底最后
-            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 折叠菜单: 主菜单(底部栏 5 槽) + 更多菜单(溢出页面)
-    // 老用户迁移: 已持久化的 subMenuOrder 不含新页面 WavelogLog → 追加到子菜单尾部
-    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) }
-    // 更多菜单打开时拦截返回: 先关菜单
-    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(
-            low = otherSettings.lowElevation,
-            high = otherSettings.highElevation
-        )
-    ) {
-        NavigationSuiteScaffold(
-            navigationSuiteItems = {
-                mainNavItems.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
-                    }
-                    item(
-                        icon = { Icon(painterResource(screen.iconResId), stringResource(screen.titleResId)) },
-                        label = { Text(stringResource(screen.titleResId)) },
-                        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)
-                        }
-                    )
-                }
-                // 更多菜单按钮(固定第 6 槽, 子菜单非空才显示)
-                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
-            ),
-            layoutType = when {
-                !hasEnoughHeight() && hasEnoughWidth() -> NavigationSuiteType.NavigationRail
-                !hasEnoughWidth() -> NavigationSuiteType.ShortNavigationBarCompact
-                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()
-                            }
-                        }
-                    )
-                    // 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
-                            )
-                        }
-                    }
-                }
-                // 更多菜单弹出面板(覆盖在内容上, 底部栏上方; spring 弹跳)
-                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)
-                        }
-                    )
-                }
-            }
-        }
-    }
-}

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

@@ -1,106 +0,0 @@
-/*
- * MoreMenuPopup.kt — 底部导航「更多」二级菜单弹出面板(4.5.1)。
- *
- * 覆盖在内容区上(底部栏上方, 右对齐), 竖排菜单项(图标+文本+箭头),
- * 当前页高亮; 点击遮罩关闭, 点击项跳转。弹出/收起动画由调用处
- * (MainScreen 的 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>

app/src/main/res/xml/network_security_config.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <base-config cleartextTrafficPermitted="true" />
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">tianditu.gov.cn</domain>
+    </domain-config>
 </network-security-config>

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()
@@ -69,7 +69,7 @@ internal fun Project.setupAndroidApp() {
             release {
                 isMinifyEnabled = true
                 isShrinkResources = true
-                proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
+                proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
             }
         }
         androidResources {

core/data/src/main/java/com/rtbishop/look4sat/core/data/framework/Ic705Controller.kt

@@ -1,364 +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.data.framework
-
-import android.bluetooth.BluetoothManager
-import android.bluetooth.BluetoothSocket
-import android.util.Log
-import com.rtbishop.look4sat.core.domain.repository.IRadioController
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-import java.io.InputStream
-import java.io.OutputStream
-import java.util.UUID
-
-/**
- * Icom IC-705 CI-V controller over Bluetooth SPP.
- *
- * The IC-705 emits broadcast frames continuously (band scope, UTC, signal
- * level, …).  A reply to any command we send may therefore be buried in
- * that noise.  All response reads drain up to [ACK_TIMEOUT_MS] and scan the
- * entire accumulated buffer for the frame we expect rather than assuming
- * the very next byte is the response.
- */
-class Ic705Controller(
-    private val bluetoothManager: BluetoothManager,
-    private val deviceAddress: String
-) : IRadioController {
-
-    private val tag = "IC705"
-    private val sppId: UUID = UUID.fromString("00001101-0000-1000-8000-00805f9b34fb")
-    private val ioMutex = Mutex()
-
-    /** Time budget (ms) to wait for a response amid broadcast noise. */
-    private val ACK_TIMEOUT_MS = 500L
-    /** Polling interval while draining the input buffer. */
-    private val POLL_INTERVAL_MS = 20L
-    /** Small pause after writing a command before reading the response. */
-    private val WRITE_SETTLE_MS = 50L
-
-    private var socket: BluetoothSocket? = null
-    private var outputStream: OutputStream? = null
-    private var inputStream: InputStream? = null
-
-    override var isConnected: Boolean = false
-        private set
-
-    // ── Connection ──────────────────────────────────────────────────────────
-
-    override suspend fun connect(): Boolean = withContext(Dispatchers.IO) {
-        if (isConnected) return@withContext true
-        if (deviceAddress.isBlank()) return@withContext false
-        try {
-            val device  = bluetoothManager.adapter.getRemoteDevice(deviceAddress)
-            val btSocket = device.createInsecureRfcommSocketToServiceRecord(sppId)
-            btSocket.connect()
-            socket       = btSocket
-            outputStream = btSocket.outputStream
-            inputStream  = btSocket.inputStream
-            isConnected  = true
-            // Enter VFO mode — frequency/mode commands return FA if the radio
-            // is in memory-channel mode. Safe to send regardless of current state.
-            Log.i(tag, "Connected to $deviceAddress — entering VFO mode")
-            val vfoCmd = IcomCivProtocol.buildEnterVfoModeCommand()
-            Log.d(tag, "CMD enterVfoMode → ${IcomCivProtocol.toHex(vfoCmd)}")
-            ioMutex.withLock { sendAndWaitAck(vfoCmd) }
-            true
-        } catch (e: Exception) {
-            Log.e(tag, "Connect error: ${e.message}")
-            isConnected = false
-            false
-        }
-    }
-
-    override suspend fun disconnect() {
-        withContext(Dispatchers.IO) {
-            try {
-                inputStream?.close()
-                outputStream?.close()
-                socket?.close()
-            } catch (e: Exception) {
-                Log.e(tag, "Disconnect error: ${e.message}")
-            } finally {
-                inputStream  = null
-                outputStream = null
-                socket       = null
-                isConnected  = false
-                Log.i(tag, "Disconnected from $deviceAddress")
-            }
-        }
-    }
-
-    // ── IRadioController – standard operations ──────────────────────────────
-
-    override suspend fun setFrequency(frequencyHz: Long): Boolean = withContext(Dispatchers.IO) {
-        Log.d(tag, "setFrequency: ${frequencyHz}Hz")
-        ioMutex.withLock {
-            val cmd = IcomCivProtocol.buildSetFreqCommand(frequencyHz)
-            Log.d(tag, "CMD setFreq → ${IcomCivProtocol.toHex(cmd)}")
-            sendAndWaitAck(cmd)
-        }
-    }
-
-    override suspend fun setMode(mode: String): Boolean = withContext(Dispatchers.IO) {
-        val cmd = IcomCivProtocol.buildSetModeCommand(mode) ?: run {
-            Log.w(tag, "setMode: unknown mode '$mode'")
-            return@withContext false
-        }
-        Log.d(tag, "setMode: $mode")
-        Log.d(tag, "CMD setMode → ${IcomCivProtocol.toHex(cmd)}")
-        ioMutex.withLock { sendAndWaitAck(cmd) }
-    }
-
-    override suspend fun setCtcssMode(enabled: Boolean): Boolean = withContext(Dispatchers.IO) {
-        Log.d(tag, "setCtcssMode: $enabled")
-        val cmd = IcomCivProtocol.buildCtcssModeCommand(enabled)
-        Log.d(tag, "CMD ctcssMode → ${IcomCivProtocol.toHex(cmd)}")
-        ioMutex.withLock { sendAndWaitAck(cmd) }
-    }
-
-    override suspend fun setCtcssTone(toneHz: Double): Boolean = withContext(Dispatchers.IO) {
-        Log.d(tag, "setCtcssTone: ${toneHz}Hz")
-        val cmd = IcomCivProtocol.buildSetCtcssToneCommand(toneHz)
-        Log.d(tag, "CMD ctcssTone → ${IcomCivProtocol.toHex(cmd)}")
-        ioMutex.withLock { sendAndWaitAck(cmd) }
-    }
-
-    override suspend fun readFrequencyAndMode(): Pair<Long, String>? = withContext(Dispatchers.IO) {
-        ioMutex.withLock {
-            val cmd = IcomCivProtocol.buildReadFreqCommand()
-            Log.d(tag, "CMD readFreq → ${IcomCivProtocol.toHex(cmd)}")
-            val payload = sendAndReadResponse(cmd, IcomCivProtocol.CMD_READ_FREQ) ?: return@withContext null
-            // Read-freq reply payload: [cmd byte already stripped by parseResponse] [5 freq bytes] [mode] [filter]
-            IcomCivProtocol.parseFreqModePayload(payload).also {
-                if (it != null) Log.d(tag, "readFreqMode: ${it.first}Hz, ${it.second}")
-                else Log.w(tag, "readFreqMode: parse failed, payload=${IcomCivProtocol.toHex(payload)}")
-            }
-        }
-    }
-
-    override suspend fun pttOn(): Boolean = withContext(Dispatchers.IO) {
-        Log.w(tag, "pttOn: not used for IC-705")
-        true
-    }
-
-    override suspend fun pttOff(): Boolean = withContext(Dispatchers.IO) {
-        Log.w(tag, "pttOff: not used for IC-705")
-        true
-    }
-
-    // ── IRadioController – IC-705 extended operations ───────────────────────
-
-    /** Select the band for [frequencyHz] via CMD 0x1A sub 0x00 (band stacking register). */
-    override suspend fun setBand(frequencyHz: Long): Boolean = withContext(Dispatchers.IO) {
-        val cmd = IcomCivProtocol.buildBandSelectCommand(frequencyHz) ?: run {
-            Log.w(tag, "setBand: no band code for ${frequencyHz}Hz — skipping")
-            return@withContext false
-        }
-        Log.d(tag, "CMD setBand (${frequencyHz}Hz) → ${IcomCivProtocol.toHex(cmd)}")
-        ioMutex.withLock { sendAndWaitAck(cmd) }
-    }
-
-    /** Select VFO-A (main/RX) or VFO-B (sub/TX). */
-    override suspend fun setVfo(vfoA: Boolean): Boolean = withContext(Dispatchers.IO) {
-        val cmd = if (vfoA) IcomCivProtocol.buildSelectVfoACommand()
-                  else      IcomCivProtocol.buildSelectVfoBCommand()
-        Log.d(tag, "CMD selectVFO${if (vfoA) "A" else "B"} → ${IcomCivProtocol.toHex(cmd)}")
-        ioMutex.withLock { sendAndWaitAck(cmd) }
-    }
-
-    /**
-     * Enable or disable SPLIT mode (TX on sub-VFO while listening on main VFO).
-     */
-    override suspend fun setSplitMode(enabled: Boolean): Boolean = withContext(Dispatchers.IO) {
-        val cmd = IcomCivProtocol.buildSplitModeCommand(enabled)
-        Log.d(tag, "CMD split ${if (enabled) "ON" else "OFF"} → ${IcomCivProtocol.toHex(cmd)}")
-        ioMutex.withLock { sendAndWaitAck(cmd) }
-    }
-
-    /**
-     * Set the frequency of the **currently active** VFO (CMD 0x25 sub 0x00).
-     * In split mode the radio automatically switches active VFO on PTT, so
-     * always writing to the active VFO is the correct strategy.
-     */
-    override suspend fun setWorkingFrequency(frequencyHz: Long): Boolean = withContext(Dispatchers.IO) {
-        Log.d(tag, "setWorkingFrequency (0x25/00): ${frequencyHz}Hz")
-        val cmd = IcomCivProtocol.buildSetWorkingFreqCommand(frequencyHz)
-        Log.d(tag, "CMD setWorkingFreq → ${IcomCivProtocol.toHex(cmd)}")
-        ioMutex.withLock { sendAndWaitAck(cmd) }
-    }
-
-    /**
-     * Set TX VFO frequency via CMD 0x25 sub 0x01 (unselected VFO).
-     * Sent every tracking cycle in split mode alongside [setWorkingFrequency].
-     */
-    override suspend fun setTxVfoFrequency(frequencyHz: Long): Boolean = withContext(Dispatchers.IO) {
-        Log.d(tag, "setTxVfoFrequency (0x25/01): ${frequencyHz}Hz")
-        val cmd = IcomCivProtocol.buildSetUnselectedVfoFreqCommand(frequencyHz)
-        Log.d(tag, "CMD setTxVfoFreq → ${IcomCivProtocol.toHex(cmd)}")
-        ioMutex.withLock { sendAndWaitAck(cmd) }
-    }
-
-    /**
-     * Read the frequency of the currently active VFO (CMD 0x25 sub 0x00).
-     * Used for tuning detection in split mode.
-     */
-    override suspend fun readWorkingFrequency(): Long? = withContext(Dispatchers.IO) {
-        ioMutex.withLock {
-            val cmd = IcomCivProtocol.buildReadWorkingFreqCommand()
-            Log.d(tag, "CMD readWorkingFreq → ${IcomCivProtocol.toHex(cmd)}")
-            val payload = sendAndReadResponse(cmd, IcomCivProtocol.CMD_SELECTED_VFO_FREQ) ?: return@withContext null
-            // Response payload: [sub] [5 freq bytes] — CMD byte already stripped by parseResponse
-            Log.d(tag, "readWorkingFreq: got ${payload.size} bytes: ${IcomCivProtocol.toHex(payload)}")
-            if (payload.size < 6) {
-                Log.w(tag, "readWorkingFreq: payload too short (${payload.size} bytes)")
-                return@withContext null
-            }
-            val freqBcd = payload.sliceArray(1..5)
-            val freq = IcomCivProtocol.decodeFrequencyBcd(freqBcd)
-            Log.d(tag, "readWorkingFreq: ${freq}Hz")
-            freq
-        }
-    }
-
-    /**
-     * Read the frequency of the inactive/TX VFO (CMD 0x25 sub 0x01).
-     * Used for tuning detection in split mode.
-     */
-    override suspend fun readTxVfoFrequency(): Long? = withContext(Dispatchers.IO) {
-        ioMutex.withLock {
-            val cmd = IcomCivProtocol.buildReadTxVfoFreqCommand()
-            Log.d(tag, "CMD readTxVfoFreq → ${IcomCivProtocol.toHex(cmd)}")
-            val payload = sendAndReadResponse(cmd, IcomCivProtocol.CMD_SELECTED_VFO_FREQ) ?: return@withContext null
-            // Response payload: [sub] [5 freq bytes] — CMD byte already stripped by parseResponse
-            Log.d(tag, "readTxVfoFreq: got ${payload.size} bytes: ${IcomCivProtocol.toHex(payload)}")
-            if (payload.size < 6) {
-                Log.w(tag, "readTxVfoFreq: payload too short (${payload.size} bytes)")
-                return@withContext null
-            }
-            val freqBcd = payload.sliceArray(1..5)
-            val freq = IcomCivProtocol.decodeFrequencyBcd(freqBcd)
-            Log.d(tag, "readTxVfoFreq: ${freq}Hz")
-            freq
-        }
-    }
-
-    // ── Internal I/O helpers ────────────────────────────────────────────────
-
-    /**
-     * Write [cmd] to the radio and drain the input stream for up to
-     * [ACK_TIMEOUT_MS], looking for an OK/NG acknowledgement frame.
-     */
-    private suspend fun sendAndWaitAck(cmd: ByteArray): Boolean {
-        if (!write(cmd)) return false
-        delay(WRITE_SETTLE_MS)
-        val buf = drainWithTimeout(ACK_TIMEOUT_MS)
-        val ok  = IcomCivProtocol.containsAck(buf)
-        if (!ok) Log.w(tag, "ACK not found in ${buf.size} bytes: ${IcomCivProtocol.toHex(buf)}")
-        return ok
-    }
-
-    /**
-     * Write [cmd] to the radio and drain the input stream for up to
-     * [ACK_TIMEOUT_MS], scanning for a response frame carrying [expectCmd].
-     * Returns the payload bytes of that frame, or null on timeout/error.
-     */
-    private suspend fun sendAndReadResponse(cmd: ByteArray, expectCmd: Byte): ByteArray? {
-        if (!write(cmd)) return null
-        delay(WRITE_SETTLE_MS)
-        val buf      = drainWithTimeout(ACK_TIMEOUT_MS)
-        val response = IcomCivProtocol.parseResponse(buf, expectCmd)
-        if (response == null) {
-            Log.w(tag, "No response for cmd 0x${String.format("%02X", expectCmd.toInt() and 0xFF)} " +
-                    "in ${buf.size} bytes: ${IcomCivProtocol.toHex(buf)}")
-        }
-        return response?.payload
-    }
-
-    /**
-     * Drain whatever bytes the radio has buffered within a [timeoutMs] window.
-     * Exits early as soon as a complete CI-V frame addressed to us is present
-     * in the buffer (i.e., FE FE E0 A4 … FD), so we don't waste the remaining
-     * timeout on responses that already arrived.
-     */
-    private suspend fun drainWithTimeout(timeoutMs: Long): ByteArray {
-        val result   = mutableListOf<Byte>()
-        val deadline = System.currentTimeMillis() + timeoutMs
-        val stream   = inputStream ?: return ByteArray(0)
-        while (System.currentTimeMillis() < deadline) {
-            try {
-                val available = stream.available()
-                if (available > 0) {
-                    val chunk = ByteArray(available)
-                    val read  = stream.read(chunk)
-                    if (read > 0) {
-                        result.addAll(chunk.take(read))
-                        // Exit early once we have a complete frame for us
-                        if (hasCompleteFrameForUs(result)) break
-                    }
-                } else {
-                    delay(POLL_INTERVAL_MS)
-                }
-            } catch (e: Exception) {
-                Log.e(tag, "Drain error: ${e.message}")
-                isConnected = false
-                break
-            }
-        }
-        return result.toByteArray()
-    }
-
-    /**
-     * Returns true if [buf] contains a complete CI-V frame addressed to the
-     * controller (FE FE [ADDR_CTRL] [ADDR_IC705] … FD).
-     * CI-V data bytes cannot be 0xFD, so the first 0xFD after the header is
-     * always the frame terminator.
-     */
-    private fun hasCompleteFrameForUs(buf: List<Byte>): Boolean {
-        var i = 0
-        while (i < buf.size - 4) {
-            if (buf[i]     == IcomCivProtocol.PREAMBLE    &&
-                buf[i + 1] == IcomCivProtocol.PREAMBLE    &&
-                buf[i + 2] == IcomCivProtocol.ADDR_CTRL   &&
-                buf[i + 3] == IcomCivProtocol.ADDR_IC705
-            ) {
-                for (k in i + 4 until buf.size) {
-                    if (buf[k] == IcomCivProtocol.END_OF_MSG) return true
-                }
-                return false  // header found but no FD yet
-            }
-            i++
-        }
-        return false
-    }
-
-    private fun write(bytes: ByteArray): Boolean {
-        return try {
-            outputStream?.write(bytes)
-            outputStream?.flush()
-            true
-        } catch (e: Exception) {
-            Log.e(tag, "Write error: ${e.message}")
-            isConnected = false
-            false
-        }
-    }
-}

core/data/src/main/java/com/rtbishop/look4sat/core/data/framework/IcomCivProtocol.kt

@@ -1,352 +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.data.framework
-
-import java.util.Locale
-
-/**
- * Icom CI-V protocol encoder/decoder for the IC-705.
- *
- * Frame structure:
- *   FE FE <DEST> <SRC> <CMD> [<SUB>] [<DATA...>] FD
- *
- * IC-705 default CI-V address : 0xA4
- * Controller (us) address     : 0xE0
- */
-object IcomCivProtocol {
-
-    // ── Framing constants ──────────────────────────────────────────────────
-    const val PREAMBLE: Byte      = 0xFE.toByte()
-    const val END_OF_MSG: Byte    = 0xFD.toByte()
-    const val ACK_OK: Byte        = 0xFB.toByte()
-    const val ACK_NG: Byte        = 0xFA.toByte()
-
-    // ── Address constants ──────────────────────────────────────────────────
-    /** Default CI-V address of the IC-705. */
-    const val ADDR_IC705: Byte    = 0xA4.toByte()
-    /** Default CI-V address of the controller (us). */
-    const val ADDR_CTRL: Byte     = 0xE0.toByte()
-
-    // ── Command bytes ──────────────────────────────────────────────────────
-    /** Read operating frequency (main VFO). */
-    const val CMD_READ_FREQ: Byte           = 0x03
-    /** Set operating frequency (main VFO). */
-    const val CMD_SET_FREQ: Byte            = 0x05
-    /** Set operating mode. */
-    const val CMD_SET_MODE: Byte            = 0x06
-    /** Select VFO / memory. */
-    const val CMD_SELECT_VFO: Byte          = 0x07
-    /**
-     * Select operating mode (VFO vs memory-channel).
-     * Sub 0x00 = VFO mode. Must be sent after connect if the radio is in
-     * memory-channel mode — frequency/mode commands return FA until it is.
-     */
-    const val CMD_SELECT_OP_MODE: Byte      = 0x08
-    /** Set repeater duplex / SPLIT. */
-    const val CMD_DUPLEX_SPLIT: Byte        = 0x0F
-    /** Band stacking register / band select (sub 0x00 = select, data = BCD band number). */
-    const val CMD_BAND_SELECT: Byte         = 0x1A
-    /** Read/write CTCSS tone frequency. */
-    const val CMD_CTCSS_TONE: Byte          = 0x1B
-    /** Read/write misc settings (used for enabling CTCSS encode). */
-    const val CMD_MISC_SETTING: Byte        = 0x16
-    /** Read/write selected-VFO frequency (cmd 0x25). */
-    const val CMD_SELECTED_VFO_FREQ: Byte   = 0x25
-
-    // ── Sub-command bytes ──────────────────────────────────────────────────
-    /** Sub for CMD_SELECT_VFO: select VFO-A (main). */
-    const val SUB_VFO_A: Byte   = 0x00
-    /** Sub for CMD_SELECT_VFO: select VFO-B (sub). */
-    const val SUB_VFO_B: Byte   = 0x01
-    /** Sub for CMD_DUPLEX_SPLIT: simplex / split OFF. */
-    const val SUB_SPLIT_OFF: Byte = 0x00
-    /** Sub for CMD_DUPLEX_SPLIT: SPLIT ON. */
-    const val SUB_SPLIT_ON: Byte  = 0x01
-    /** Sub for CMD_SELECTED_VFO_FREQ: selected (active) VFO frequency. */
-    const val SUB_SELECTED_VFO: Byte = 0x00
-    /** Sub for CMD_SELECTED_VFO_FREQ: unselected (inactive / TX in split) VFO frequency. */
-    const val SUB_UNSELECTED_VFO: Byte = 0x01
-    /** Sub for CMD_MISC_SETTING: CTCSS/DTCS tone squelch. */
-    const val SUB_CTCSS_SETTING: Byte = 0x42.toByte()
-
-    // ── Mode bytes ────────────────────────────────────────────────────────
-    /** Maps mode strings (upper-case) → IC-705 mode bytes. */
-    val MODE_TO_BYTE: Map<String, Byte> = mapOf(
-        "LSB"    to 0x00,
-        "USB"    to 0x01,
-        "AM"     to 0x02,
-        "CW"     to 0x03,
-        "RTTY"   to 0x04,
-        "FM"     to 0x05,
-        "WFM"    to 0x06,
-        "CW-R"   to 0x07,
-        "RTTY-R" to 0x08,
-        "DV"     to 0x12,
-        "AFSK"   to 0x05  // AFSK uses FM modulation
-    )
-
-    val BYTE_TO_MODE: Map<Byte, String> = MODE_TO_BYTE.entries.associate { it.value to it.key }
-
-    // ── Frequency BCD encoding ─────────────────────────────────────────────
-
-    /**
-     * Encode a frequency in Hz to the IC-705's 5-byte BCD format.
-     *
-     * The IC-705 uses 5 bytes, LSB pair first, with 1 Hz resolution.
-     * Example: 145,500,000 Hz → "0145500000" → pairs LSB→MSB:
-     *   [00, 00, 50, 45, 01]
-     */
-    fun encodeFrequencyBcd(frequencyHz: Long): ByteArray {
-        val digits = String.format(Locale.US, "%010d", frequencyHz)
-        val bcd = ByteArray(5)
-        for (i in 0 until 5) {
-            // digits are MSB first; we want pair index 0 = LSB pair
-            val pairIndex = 4 - i
-            val high = digits[pairIndex * 2] - '0'
-            val low  = digits[pairIndex * 2 + 1] - '0'
-            bcd[i] = ((high shl 4) or low).toByte()
-        }
-        return bcd
-    }
-
-    /**
-     * Decode 5-byte BCD frequency (LSB pair first) to Hz.
-     */
-    fun decodeFrequencyBcd(bcd: ByteArray): Long {
-        // Build digit string MSB→LSB by reversing the byte order
-        var freqHz = 0L
-        for (i in 4 downTo 0) {
-            val b    = bcd[i].toInt() and 0xFF
-            val high = b shr 4
-            val low  = b and 0x0F
-            freqHz   = freqHz * 100 + high * 10 + low
-        }
-        return freqHz
-    }
-
-    /**
-     * Encode a CTCSS tone (Hz, e.g. 67.0) to 2-byte BCD (0.1 Hz resolution).
-     * 67.0 → 670 (tenths of Hz) → BCD bytes [0x06, 0x70].
-     */
-    fun encodeCtcssToneBcd(toneHz: Double): ByteArray {
-        val tone01 = (toneHz * 10).toLong()
-        val digits = String.format(Locale.US, "%04d", tone01)
-        return byteArrayOf(
-            ((digits[0] - '0') shl 4 or (digits[1] - '0')).toByte(),
-            ((digits[2] - '0') shl 4 or (digits[3] - '0')).toByte()
-        )
-    }
-
-    // ── Message builders ───────────────────────────────────────────────────
-
-    /** Wrap payload bytes in a CI-V frame: FE FE DEST SRC ... FD. */
-    private fun frame(vararg payload: Byte): ByteArray {
-        return byteArrayOf(PREAMBLE, PREAMBLE, ADDR_IC705, ADDR_CTRL) +
-                payload +
-                byteArrayOf(END_OF_MSG)
-    }
-
-    /** Set operating frequency via CMD 0x05 (main VFO). */
-    fun buildSetFreqCommand(frequencyHz: Long): ByteArray {
-        return frame(CMD_SET_FREQ, *encodeFrequencyBcd(frequencyHz))
-    }
-
-    /**
-     * Set selected-VFO frequency via CMD 0x25 sub 0x00.
-     * This updates whichever VFO is currently active (RX or TX after split).
-     */
-    fun buildSetWorkingFreqCommand(frequencyHz: Long): ByteArray {
-        return frame(CMD_SELECTED_VFO_FREQ, SUB_SELECTED_VFO, *encodeFrequencyBcd(frequencyHz))
-    }
-
-    /**
-     * Set unselected-VFO frequency via CMD 0x25 sub 0x01.
-     * In split mode while PTT is pressed the IC-705 makes VFO-B active, so
-     * this command targets VFO-A (the RX VFO) — and vice-versa when in RX.
-     * Use this to update the TX VFO when PTT is on.
-     */
-    fun buildSetUnselectedVfoFreqCommand(frequencyHz: Long): ByteArray {
-        return frame(CMD_SELECTED_VFO_FREQ, SUB_UNSELECTED_VFO, *encodeFrequencyBcd(frequencyHz))
-    }
-
-    /** Read operating frequency (CMD 0x03). */
-    fun buildReadFreqCommand(): ByteArray = frame(CMD_READ_FREQ)
-
-    /** Read selected (active) VFO frequency (CMD 0x25 sub 0x00). */
-    fun buildReadWorkingFreqCommand(): ByteArray = frame(CMD_SELECTED_VFO_FREQ, SUB_SELECTED_VFO)
-
-    /** Read unselected (inactive/TX in split) VFO frequency (CMD 0x25 sub 0x01). */
-    fun buildReadTxVfoFreqCommand(): ByteArray = frame(CMD_SELECTED_VFO_FREQ, SUB_UNSELECTED_VFO)
-
-    /**
-     * Select band via CMD 0x1A sub 0x00.
-     * Band codes are BCD-numbered: 1=160m, 2=80m, …, 9=10m, 0x10=6m, 0x11=2m, 0x12=70cm, 0x13=23cm.
-     * Returns null if [frequencyHz] doesn't fall in a known amateur band.
-     */
-    fun buildBandSelectCommand(frequencyHz: Long): ByteArray? {
-        val code = bandCodeForFrequency(frequencyHz) ?: return null
-        return frame(CMD_BAND_SELECT, 0x00, code)
-    }
-
-    /**
-     * Map a frequency in Hz to the IC-705 band stacking register code.
-     * Codes are BCD (band number in decimal expressed as hex nibbles).
-     */
-    fun bandCodeForFrequency(frequencyHz: Long): Byte? = when {
-        frequencyHz in 1_800_000L     ..1_999_999L     -> 0x01 // 160 m
-        frequencyHz in 3_500_000L     ..3_999_999L     -> 0x02 // 80 m
-        frequencyHz in 7_000_000L     ..7_299_999L     -> 0x03 // 40 m
-        frequencyHz in 10_100_000L    ..10_149_999L    -> 0x04 // 30 m
-        frequencyHz in 14_000_000L    ..14_349_999L    -> 0x05 // 20 m
-        frequencyHz in 18_068_000L    ..18_167_999L    -> 0x06 // 17 m
-        frequencyHz in 21_000_000L    ..21_449_999L    -> 0x07 // 15 m
-        frequencyHz in 24_890_000L    ..24_989_999L    -> 0x08 // 12 m
-        frequencyHz in 28_000_000L    ..29_699_999L    -> 0x09 // 10 m
-        frequencyHz in 50_000_000L    ..53_999_999L    -> 0x10 // 6 m  (BCD 10)
-        frequencyHz in 144_000_000L   ..147_999_999L   -> 0x11 // 2 m  (BCD 11)
-        frequencyHz in 420_000_000L   ..449_999_999L   -> 0x12 // 70 cm (BCD 12)
-        frequencyHz in 1_240_000_000L ..1_299_999_999L -> 0x13 // 23 cm (BCD 13)
-        else -> null
-    }
-
-    /** Set operating mode (CMD 0x06). Filter byte is omitted — radio uses its default filter for the mode. */
-    fun buildSetModeCommand(mode: String): ByteArray? {
-        val modeByte = MODE_TO_BYTE[mode.uppercase(Locale.US)] ?: return null
-        return frame(CMD_SET_MODE, modeByte)
-    }
-
-    /** Select VFO-A (CMD 0x07 sub 0x00). */
-    fun buildSelectVfoACommand(): ByteArray = frame(CMD_SELECT_VFO, SUB_VFO_A)
-
-    /** Select VFO-B (CMD 0x07 sub 0x01). */
-    fun buildSelectVfoBCommand(): ByteArray = frame(CMD_SELECT_VFO, SUB_VFO_B)
-
-    /**
-     * Enter VFO operating mode (CMD 0x08 sub 0x00).
-     * Sent after connect — if the radio is in memory-channel mode frequency
-     * and mode commands return FA until this is issued.
-     */
-    fun buildEnterVfoModeCommand(): ByteArray = frame(CMD_SELECT_OP_MODE, 0x00)
-
-    /** Enable or disable SPLIT mode (CMD 0x0F). */
-    fun buildSplitModeCommand(enable: Boolean): ByteArray {
-        val sub = if (enable) SUB_SPLIT_ON else SUB_SPLIT_OFF
-        return frame(CMD_DUPLEX_SPLIT, sub)
-    }
-
-    /**
-     * Enable/disable CTCSS encode (CMD 0x16 sub 0x42).
-     * 0x01 = CTCSS encoder ON, 0x00 = OFF.
-     */
-    fun buildCtcssModeCommand(enabled: Boolean): ByteArray {
-        val value: Byte = if (enabled) 0x01 else 0x00
-        return frame(CMD_MISC_SETTING, SUB_CTCSS_SETTING, value)
-    }
-
-    /**
-     * Set CTCSS tone frequency (CMD 0x1B sub 0x00).
-     */
-    fun buildSetCtcssToneCommand(toneHz: Double): ByteArray {
-        val bcd = encodeCtcssToneBcd(toneHz)
-        return frame(CMD_CTCSS_TONE, 0x00, *bcd)
-    }
-
-    // ── Response parsing ───────────────────────────────────────────────────
-
-    /**
-     * Find and parse a complete CI-V response frame from a buffer.
-     *
-     * Returns the bytes between "FE FE E0 A4 <CMD>" and FD, or null if no
-     * complete frame was found. The search is tolerant of interleaved
-     * broadcast traffic.
-     *
-     * @param buf       bytes accumulated from the radio
-     * @param expectCmd the command byte we are looking for in the reply, or
-     *                  null to accept any command response from the radio
-     */
-    fun parseResponse(buf: ByteArray, expectCmd: Byte?): ParsedResponse? {
-        var i = 0
-        while (i < buf.size - 5) {
-            // Look for FE FE preamble
-            if (buf[i] != PREAMBLE || buf[i + 1] != PREAMBLE) { i++; continue }
-            val dest = buf[i + 2]
-            val src  = buf[i + 3]
-            val cmd  = buf[i + 4]
-            // We only care about frames addressed to us from the radio
-            if (dest != ADDR_CTRL || src != ADDR_IC705) { i++; continue }
-            // Find the terminating FD
-            val fdIdx = buf.indexOf(END_OF_MSG, startIndex = i + 5)
-            if (fdIdx < 0) break  // incomplete frame, wait for more data
-            val payload = buf.copyOfRange(i + 5, fdIdx)
-            if (expectCmd == null || cmd == expectCmd) {
-                return ParsedResponse(cmd, payload, fdIdx + 1)
-            }
-            i = fdIdx + 1
-        }
-        return null
-    }
-
-    private fun ByteArray.indexOf(b: Byte, startIndex: Int): Int {
-        for (k in startIndex until size) if (this[k] == b) return k
-        return -1
-    }
-
-    /**
-     * Check whether a buffer contains an OK acknowledgement (FB FD) from
-     * the radio. Tolerates broadcast noise before the ACK.
-     */
-    fun containsAck(buf: ByteArray): Boolean {
-        var i = 0
-        while (i < buf.size - 5) {
-            if (buf[i] != PREAMBLE || buf[i + 1] != PREAMBLE) { i++; continue }
-            val dest = buf[i + 2]
-            val src  = buf[i + 3]
-            val cmd  = buf[i + 4]
-            if (dest != ADDR_CTRL || src != ADDR_IC705) { i++; continue }
-            // Skip to FD
-            val fdIdx = buf.indexOf(END_OF_MSG, startIndex = i + 5)
-            if (fdIdx < 0) break
-            if (cmd == ACK_OK) return true
-            if (cmd == ACK_NG) return false
-            i = fdIdx + 1
-        }
-        return false
-    }
-
-    /**
-     * Parse frequency + mode from a CMD_READ_FREQ reply payload.
-     * Payload layout after stripping command byte: [5 freq bytes] [mode byte] [filter byte]
-     */
-    fun parseFreqModePayload(payload: ByteArray): Pair<Long, String>? {
-        if (payload.size < 6) return null
-        val freqHz = decodeFrequencyBcd(payload.copyOfRange(0, 5))
-        val mode   = BYTE_TO_MODE[payload[5]] ?: return null
-        return freqHz to mode
-    }
-
-    /** Hex dump of bytes, useful for debug logging. */
-    fun toHex(bytes: ByteArray): String =
-        bytes.joinToString(" ") { String.format(Locale.US, "%02X", it.toInt() and 0xFF) }
-
-    data class ParsedResponse(
-        val cmd: Byte,
-        val payload: ByteArray,
-        /** Index in the source buffer immediately after the FD terminator. */
-        val nextOffset: Int
-    )
-}

core/data/src/main/java/com/rtbishop/look4sat/core/data/framework/RadioTrackingService.kt

@@ -19,10 +19,8 @@ package com.rtbishop.look4sat.core.data.framework
 
 import android.bluetooth.BluetoothManager
 import android.util.Log
-import com.rtbishop.look4sat.core.domain.model.RadioControlSettings
 import com.rtbishop.look4sat.core.domain.model.SatRadio
 import com.rtbishop.look4sat.core.domain.predict.OrbitalPass
-import com.rtbishop.look4sat.core.domain.predict.SPEED_OF_LIGHT
 import com.rtbishop.look4sat.core.domain.repository.IRadioController
 import com.rtbishop.look4sat.core.domain.repository.IRadioTrackingService
 import com.rtbishop.look4sat.core.domain.repository.ISatelliteRepo
@@ -31,7 +29,6 @@ import com.rtbishop.look4sat.core.domain.repository.RadioTrackingState
 import com.rtbishop.look4sat.core.domain.utility.TransponderMapper
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -47,8 +44,6 @@ class RadioTrackingService(
 ) : IRadioTrackingService {
 
     private val tag = "RadioTracking"
-    /** Delay between each step of the split-mode init sequence (ms). */
-    private val INIT_STEP_DELAY_MS = 200L
     private val _state = MutableStateFlow(RadioTrackingState())
     override val state: StateFlow<RadioTrackingState> = _state
 
@@ -56,427 +51,227 @@ class RadioTrackingService(
     private var rxController: IRadioController? = null
     private var trackingJob: Job? = null
 
-    // ── Connection ──────────────────────────────────────────────────────────
-
     override suspend fun connectRadios() {
+        // Disconnect old controllers if any
         txController?.disconnect()
         rxController?.disconnect()
 
+        // Read current addresses from settings
         val rcSettings = settingsRepo.radioControlSettings.value
-        val txAddr     = rcSettings.txRadioAddress
-        val rxAddr     = rcSettings.rxRadioAddress
-        val isIcom     = rcSettings.radioModel == RadioControlSettings.MODEL_ICOM_IC705
-        val isSplit    = isIcom && rcSettings.splitMode
+        val txAddr = rcSettings.txRadioAddress
+        val rxAddr = rcSettings.rxRadioAddress
 
-        Log.i(tag, "connectRadios model=${rcSettings.radioModel} split=$isSplit TX=$txAddr RX=$rxAddr")
+        Log.i(tag, "Connecting TX=$txAddr RX=$rxAddr")
 
-        if (isSplit) {
-            // Single-radio split mode: only TX slot is used
-            if (txAddr.isBlank()) {
-                _state.update { it.copy(errorMessage = "No radio address configured in Settings") }
-                return
-            }
-            val tx = makeController(isIcom, txAddr)
-            txController = tx
-            rxController = null
-            _state.update { it.copy(errorMessage = null) }
-            val txOk = tx.connect()
-            _state.update {
-                it.copy(
-                    txConnected = txOk,
-                    rxConnected = false,
-                    errorMessage = if (!txOk) "Could not connect to radio ($txAddr)" else null
-                )
-            }
-            Log.i(tag, "IC-705 split mode connected: txOk=$txOk")
-        } else {
-            if (txAddr.isBlank() && rxAddr.isBlank()) {
-                _state.update { it.copy(errorMessage = "No radio addresses configured in Settings") }
-                return
-            }
-            val tx = makeController(isIcom, txAddr)
-            val rx = makeController(isIcom, rxAddr)
-            txController = tx
-            rxController = rx
-            _state.update { it.copy(errorMessage = null) }
-            val txOk = if (txAddr.isNotBlank()) tx.connect() else false
-            val rxOk = if (rxAddr.isNotBlank()) rx.connect() else false
-            _state.update {
-                it.copy(
-                    txConnected = txOk,
-                    rxConnected = rxOk,
-                    errorMessage = when {
-                        !txOk && !rxOk -> "Could not connect to TX and RX radios"
-                        !txOk          -> "Could not connect to TX radio ($txAddr)"
-                        !rxOk          -> "Could not connect to RX radio ($rxAddr)"
-                        else           -> null
-                    }
-                )
-            }
-            Log.i(tag, "Dual-radio connected: txOk=$txOk rxOk=$rxOk")
+        if (txAddr.isBlank() && rxAddr.isBlank()) {
+            _state.update { it.copy(errorMessage = "No radio addresses configured in Settings") }
+            return
+        }
+
+        val tx = Ft817Controller(bluetoothManager, txAddr)
+        val rx = Ft817Controller(bluetoothManager, rxAddr)
+        txController = tx
+        rxController = rx
+
+        _state.update { it.copy(errorMessage = null) }
+        val txOk = if (txAddr.isNotBlank()) tx.connect() else false
+        val rxOk = if (rxAddr.isNotBlank()) rx.connect() else false
+        _state.update {
+            it.copy(
+                txConnected = txOk,
+                rxConnected = rxOk,
+                errorMessage = when {
+                    !txOk && !rxOk -> "Could not connect to TX and RX radios"
+                    !txOk -> "Could not connect to TX radio ($txAddr)"
+                    !rxOk -> "Could not connect to RX radio ($rxAddr)"
+                    else -> null
+                }
+            )
         }
     }
 
-    private fun makeController(isIcom: Boolean, address: String): IRadioController =
-        if (isIcom) Ic705Controller(bluetoothManager, address)
-        else        Ft817Controller(bluetoothManager, address)
-
     override suspend fun disconnectRadios() {
         stopTracking()
         txController?.disconnect()
         rxController?.disconnect()
         txController = null
         rxController = null
-        _state.update { it.copy(txConnected = false, rxConnected = false, isActive = false) }
+        _state.update {
+            it.copy(
+                txConnected = false,
+                rxConnected = false,
+                isActive = false
+            )
+        }
     }
 
-    // ── Tracking ────────────────────────────────────────────────────────────
-
     override fun startTracking(pass: OrbitalPass, transponder: SatRadio, txBaseFreqHz: Long?) {
         _state.update {
             it.copy(
-                isActive             = true,
-                currentPass          = pass,
-                selectedTransponder  = transponder,
-                txBaseFrequencyHz    = txBaseFreqHz
+                isActive = true,
+                currentPass = pass,
+                selectedTransponder = transponder,
+                txBaseFrequencyHz = txBaseFreqHz
             )
         }
         trackingJob?.cancel()
-
-        val rcSettings = settingsRepo.radioControlSettings.value
-        val isIcom     = rcSettings.radioModel == RadioControlSettings.MODEL_ICOM_IC705
-        val isSplit    = isIcom && rcSettings.splitMode
-
-        if (isSplit) {
-            trackingJob = appScope.launch { runSplitTracking(transponder, txBaseFreqHz) }
-        } else {
-            trackingJob = appScope.launch { runDualRadioTracking(transponder, txBaseFreqHz) }
-        }
-    }
-
-    // ── Dual-radio tracking (Yaesu or two IC-705s) ──────────────────────────
-
-    private suspend fun runDualRadioTracking(transponder: SatRadio, initialTxBaseFreqHz: Long?) {
-        val tx = txController
-        val rx = rxController
-
-        // Initial setup: set band/mode/CTCSS on both radios
-        val txMode = transponder.uplinkMode
-        val rxMode = transponder.downlinkMode
-            ?: transponder.uplinkMode?.let {
-                TransponderMapper.mapUplinkModeToDownlinkMode(it, transponder.isInverted)
+        trackingJob = appScope.launch {
+            // Set modes on both radios at tracking start
+            val tx = txController
+            val rx = rxController
+            val txMode = transponder.uplinkMode
+            val rxMode = transponder.downlinkMode
+                ?: transponder.uplinkMode?.let {
+                    TransponderMapper.mapUplinkModeToDownlinkMode(it, transponder.isInverted)
+                }
+            if (tx != null && tx.isConnected && txMode != null) {
+                tx.setMode(txMode)
+                Log.i(tag, "TX mode set to $txMode")
             }
-
-        Log.i(tag, "DualRadio start: txMode=$txMode rxMode=$rxMode")
-
-        if (tx != null && tx.isConnected && txMode != null) {
-            Log.d(tag, "Setting TX mode: $txMode")
-            tx.setMode(txMode)
-        }
-        if (rx != null && rx.isConnected && rxMode != null) {
-            Log.d(tag, "Setting RX mode: $rxMode")
-            rx.setMode(rxMode)
-        }
-        if (txMode?.uppercase() == "FM") {
-            _state.value.ctcssTone?.let { tone ->
-                Log.d(tag, "Setting CTCSS: ${tone}Hz")
-                tx?.setCtcssTone(tone)
-                tx?.setCtcssMode(true)
+            if (rx != null && rx.isConnected && rxMode != null) {
+                rx.setMode(rxMode)
+                Log.i(tag, "RX mode set to $rxMode")
             }
-        }
-        _state.update { it.copy(txMode = txMode, rxMode = rxMode) }
+            // Set CTCSS if FM
+            if (txMode?.uppercase() == "FM") {
+                _state.value.ctcssTone?.let { tone ->
+                    tx?.setCtcssTone(tone)
+                    tx?.setCtcssMode(true)
+                }
+            }
+            _state.update { it.copy(txMode = txMode, rxMode = rxMode) }
 
-        var lastSetTxFreq = 0.0
-        var lastSetRxFreq = 0.0
-        var tuningRadio   = ""
-        var lastReadFreq  = 0L
-        var stableCount   = 0
+            var lastSetTxFreq = 0.0
+            var lastSetRxFreq = 0.0
+            var tuningRadio = "" // "", "tx", or "rx" - which radio the user is tuning
+            var lastReadFreq = 0L
+            var stableCount = 0
 
-        while (currentCoroutineContext().isActive) {
-            val currentState = _state.value
-            if (!currentState.isActive) break
+            while (isActive) {
+                val currentState = _state.value
+                if (!currentState.isActive) break
 
-            val satPass = currentState.currentPass ?: break
-            val xpdr    = currentState.selectedTransponder ?: break
-            var txBaseFreq = currentState.txBaseFrequencyHz
-            val stationPos = settingsRepo.stationPosition.value
-            val pos = satelliteRepo.getPosition(satPass.orbitalObject, stationPos, System.currentTimeMillis())
-            val txNow = txController
-            val rxNow = rxController
-            val v = pos.distanceRate * 1000.0
+                val satPass = currentState.currentPass ?: break
+                val xpdr = currentState.selectedTransponder ?: break
+                var txBaseFreq = currentState.txBaseFrequencyHz
+                val stationPos = settingsRepo.stationPosition.value
+                val timeNow = System.currentTimeMillis()
 
-            if (tuningRadio.isNotEmpty()) {
-                val radio = if (tuningRadio == "tx") txNow else rxNow
-                if (radio != null && radio.isConnected) {
-                    val read = radio.readFrequencyAndMode()
-                    if (read != null) {
-                        val (freq, _) = read
-                        if (kotlin.math.abs(freq - lastReadFreq) <= 20) stableCount++
-                        else { stableCount = 0; lastReadFreq = freq }
-                        if (stableCount >= 2) {
-                            if (tuningRadio == "tx" && txBaseFreq != null) {
-                                val newBase = (freq.toDouble() * SPEED_OF_LIGHT / (SPEED_OF_LIGHT + v)).toLong()
-                                if (newBase > 0) {
-                                    txBaseFreq = newBase
-                                    _state.update { it.copy(txBaseFrequencyHz = newBase) }
-                                    Log.i(tag, "TX tuning done → base=$newBase")
-                                }
-                            } else if (tuningRadio == "rx") {
-                                val rxNominal = (freq.toDouble() * SPEED_OF_LIGHT / (SPEED_OF_LIGHT - v)).toLong()
-                                val newTxBase = TransponderMapper.mapDownlinkToUplink(rxNominal, xpdr)
-                                if (newTxBase != null && newTxBase > 0) {
-                                    txBaseFreq = newTxBase
-                                    _state.update { it.copy(txBaseFrequencyHz = newTxBase) }
-                                    Log.i(tag, "RX tuning done → txBase=$newTxBase")
-                                }
+                val pos = satelliteRepo.getPosition(satPass.orbitalObject, stationPos, timeNow)
+                val tx = txController
+                val rx = rxController
+                val hasUplink = txBaseFreq != null
+                val c = com.rtbishop.look4sat.core.domain.predict.SPEED_OF_LIGHT
+                val v = pos.distanceRate * 1000.0
+
+                if (tuningRadio.isNotEmpty()) {
+                    // --- User is tuning: keep reading, wait for stabilization ---
+                    val radio = if (tuningRadio == "tx") tx else rx
+                    if (radio != null && radio.isConnected) {
+                        val readResult = radio.readFrequencyAndMode()
+                        if (readResult != null) {
+                            val (freq, _) = readResult
+                            if (kotlin.math.abs(freq - lastReadFreq) <= 20) {
+                                stableCount++
+                            } else {
+                                stableCount = 0
+                                lastReadFreq = freq
+                            }
+                            // Stable for 2 reads → user stopped turning
+                            if (stableCount >= 2) {
+                                if (tuningRadio == "tx" && txBaseFreq != null) {
+                                    val newBase = (freq.toDouble() * c / (c + v)).toLong()
+                                    if (newBase > 0) {
+                                        txBaseFreq = newBase
+                                        _state.update { it.copy(txBaseFrequencyHz = newBase) }
+                                        Log.i(tag, "TX tuning done → base=$newBase")
+                                    }
+                                } else if (tuningRadio == "rx") {
+                                    val rxNominal = (freq.toDouble() * c / (c - v)).toLong()
+                                    val newTxBase = TransponderMapper.mapDownlinkToUplink(rxNominal, xpdr)
+                                    if (newTxBase != null && newTxBase > 0) {
+                                        txBaseFreq = newTxBase
+                                        _state.update { it.copy(txBaseFrequencyHz = newTxBase) }
+                                        Log.i(tag, "RX tuning done → txBase=$newTxBase")
+                                    }
+                                }
+                                tuningRadio = ""
+                                stableCount = 0
+                                lastSetTxFreq = 0.0
+                                lastSetRxFreq = 0.0
+                            }
+                        }
+                    }
+                } else {
+                    // --- Normal tracking: read, detect changes, command ---
+
+                    // TX dial feedback
+                    if (hasUplink && tx != null && tx.isConnected && lastSetTxFreq > 0.0) {
+                        val readResult = tx.readFrequencyAndMode()
+                        if (readResult != null) {
+                            val (actualTxFreq, _) = readResult
+                            if (kotlin.math.abs(actualTxFreq - lastSetTxFreq) >= 20.0) {
+                                tuningRadio = "tx"
+                                lastReadFreq = actualTxFreq
+                                stableCount = 0
+                                Log.i(tag, "TX tuning detected (read=$actualTxFreq, lastSet=$lastSetTxFreq)")
+                            }
+                        }
+                    }
+
+                    // RX dial feedback (only if TX not tuning)
+                    if (tuningRadio.isEmpty() && rx != null && rx.isConnected && lastSetRxFreq > 0.0) {
+                        val readResult = rx.readFrequencyAndMode()
+                        if (readResult != null) {
+                            val (actualRxFreq, _) = readResult
+                            if (kotlin.math.abs(actualRxFreq - lastSetRxFreq) >= 20.0) {
+                                tuningRadio = "rx"
+                                lastReadFreq = actualRxFreq
+                                stableCount = 0
+                                Log.i(tag, "RX tuning detected (read=$actualRxFreq, lastSet=$lastSetRxFreq)")
                             }
-                            tuningRadio   = ""
-                            stableCount   = 0
-                            lastSetTxFreq = 0.0
-                            lastSetRxFreq = 0.0
                         }
                     }
                 }
-            } else {
-                // Detect manual dial changes
-                if (txBaseFreq != null && txNow != null && txNow.isConnected && lastSetTxFreq > 0.0) {
-                    val read = txNow.readFrequencyAndMode()
-                    if (read != null && kotlin.math.abs(read.first - lastSetTxFreq) >= 20.0) {
-                        tuningRadio  = "tx"
-                        lastReadFreq = read.first
-                        stableCount  = 0
-                        Log.i(tag, "TX tuning detected (read=${read.first}, lastSet=$lastSetTxFreq)")
+
+                // Compute Doppler-corrected frequencies
+                val txRadioFreq = txBaseFreq?.let { pos.getUplinkFreq(it) }
+                val rxBaseFreq = if (txBaseFreq != null) {
+                    TransponderMapper.mapUplinkToDownlink(txBaseFreq, xpdr)
+                } else {
+                    xpdr.downlinkLow
+                }
+                val rxRadioFreq = rxBaseFreq?.let { pos.getDownlinkFreq(it) }
+
+                // Command radios (only when not tuning)
+                if (tuningRadio.isEmpty()) {
+                    if (tx != null && tx.isConnected && txRadioFreq != null) {
+                        tx.setFrequency(txRadioFreq)
+                        lastSetTxFreq = txRadioFreq.toDouble()
+                    }
+                    if (rx != null && rx.isConnected && rxRadioFreq != null) {
+                        rx.setFrequency(rxRadioFreq)
+                        lastSetRxFreq = rxRadioFreq.toDouble()
                     }
                 }
-                if (tuningRadio.isEmpty() && rxNow != null && rxNow.isConnected && lastSetRxFreq > 0.0) {
-                    val read = rxNow.readFrequencyAndMode()
-                    if (read != null && kotlin.math.abs(read.first - lastSetRxFreq) >= 20.0) {
-                        tuningRadio  = "rx"
-                        lastReadFreq = read.first
-                        stableCount  = 0
-                        Log.i(tag, "RX tuning detected (read=${read.first}, lastSet=$lastSetRxFreq)")
-                    }
-                }
-            }
 
-            val txRadioFreq = txBaseFreq?.let { pos.getUplinkFreq(it) }
-            val rxBaseFreq  = if (txBaseFreq != null) {
-                TransponderMapper.mapUplinkToDownlink(txBaseFreq, xpdr)
-            } else xpdr.downlinkLow
-            val rxRadioFreq = rxBaseFreq?.let { pos.getDownlinkFreq(it) }
-
-            if (tuningRadio.isEmpty()) {
-                if (txNow != null && txNow.isConnected && txRadioFreq != null) {
-                    txNow.setFrequency(txRadioFreq)
-                    lastSetTxFreq = txRadioFreq.toDouble()
+                _state.update {
+                    it.copy(
+                        txConnected = tx?.isConnected ?: false,
+                        rxConnected = rx?.isConnected ?: false,
+                        txFrequencyHz = txRadioFreq,
+                        rxFrequencyHz = rxRadioFreq,
+                        azimuth = Math.toDegrees(pos.azimuth),
+                        elevation = Math.toDegrees(pos.elevation),
+                        distance = pos.distance
+                    )
                 }
-                if (rxNow != null && rxNow.isConnected && rxRadioFreq != null) {
-                    rxNow.setFrequency(rxRadioFreq)
-                    lastSetRxFreq = rxRadioFreq.toDouble()
-                }
-            }
 
-            _state.update {
-                it.copy(
-                    txConnected  = txNow?.isConnected ?: false,
-                    rxConnected  = rxNow?.isConnected ?: false,
-                    txFrequencyHz = txRadioFreq,
-                    rxFrequencyHz = rxRadioFreq,
-                    azimuth      = Math.toDegrees(pos.azimuth),
-                    elevation    = Math.toDegrees(pos.elevation),
-                    distance     = pos.distance
-                )
+                delay(1000)
             }
-            delay(1000)
         }
     }
 
-    // ── IC-705 split-radio tracking ─────────────────────────────────────────
-
-    private suspend fun runSplitTracking(transponder: SatRadio, initialTxBaseFreqHz: Long?) {
-        val radio = txController ?: return
-        if (!radio.isConnected) return
-
-        val txMode = transponder.uplinkMode
-        val rxMode = transponder.downlinkMode
-            ?: transponder.uplinkMode?.let {
-                TransponderMapper.mapUplinkModeToDownlinkMode(it, transponder.isInverted)
-            }
-
-        // Compute nominal base frequencies
-        val txCenter = when {
-            transponder.uplinkLow != null && transponder.uplinkHigh != null ->
-                (transponder.uplinkLow!! + transponder.uplinkHigh!!) / 2
-            transponder.uplinkLow != null -> transponder.uplinkLow!!
-            else -> null
-        }
-        val rxNominal = if (txCenter != null) {
-            TransponderMapper.mapUplinkToDownlink(txCenter, transponder)
-        } else transponder.downlinkLow
-
-        val txBase = initialTxBaseFreqHz ?: txCenter
-        Log.i(tag, "IC-705 split setup: txBase=${txBase}Hz rxNominal=${rxNominal}Hz txMode=$txMode rxMode=$rxMode")
-
-        // ── Initial setup sequence ──────────────────────────────────────────
-        // Sequence per IC-705: explicitly select VFO, then band → freq → mode.
-        // ACK from each command gates the next — no fixed delays needed.
-
-        // VFO-A = RX (downlink)
-        Log.d(tag, "Split init: selecting VFO-A for RX (downlink)")
-        radio.setVfo(vfoA = true)
-        if (rxNominal != null) {
-            Log.d(tag, "Split init: VFO-A band for ${rxNominal}Hz")
-            radio.setBand(rxNominal)
-            Log.d(tag, "Split init: VFO-A freq=${rxNominal}Hz")
-            radio.setFrequency(rxNominal)
-        }
-        if (rxMode != null) {
-            Log.d(tag, "Split init: VFO-A mode=$rxMode")
-            radio.setMode(rxMode)
-        }
-
-        // VFO-B = TX (uplink)
-        Log.d(tag, "Split init: selecting VFO-B for TX (uplink)")
-        radio.setVfo(vfoA = false)
-        if (txBase != null) {
-            Log.d(tag, "Split init: VFO-B band for ${txBase}Hz")
-            radio.setBand(txBase)
-            Log.d(tag, "Split init: VFO-B freq=${txBase}Hz")
-            radio.setFrequency(txBase)
-        }
-        if (txMode != null) {
-            Log.d(tag, "Split init: VFO-B mode=$txMode")
-            radio.setMode(txMode)
-        }
-        if (txMode?.uppercase() == "FM") {
-            val tone = _state.value.ctcssTone
-            if (tone != null) {
-                Log.d(tag, "Split init: CTCSS=${tone}Hz")
-                radio.setCtcssTone(tone)
-                radio.setCtcssMode(true)
-            } else {
-                radio.setCtcssMode(false)
-            }
-        }
-
-        // Enable SPLIT on VFO-A (return display to RX VFO first)
-        Log.d(tag, "Split init: returning to VFO-A, then enabling SPLIT mode")
-        radio.setVfo(vfoA = true)
-        radio.setSplitMode(enabled = true)
-
-        _state.update { it.copy(txMode = txMode, rxMode = rxMode, txBaseFrequencyHz = txBase) }
-        Log.i(tag, "IC-705 split init done — entering tracking loop")
-
-        // ── Tracking loop with tuning detection ─────────────────────────────
-        var lastSetTxFreq = 0.0
-        var lastSetRxFreq = 0.0
-        var tuningRadio   = ""  // "tx" or "rx" when manual tuning detected
-        var lastReadFreq  = 0L
-        var stableCount   = 0
-
-        while (currentCoroutineContext().isActive) {
-            val currentState = _state.value
-            if (!currentState.isActive) break
-
-            val satPass = currentState.currentPass ?: break
-            val xpdr    = currentState.selectedTransponder ?: break
-            var txBaseFreq = currentState.txBaseFrequencyHz
-            val stationPos = settingsRepo.stationPosition.value
-            val pos = satelliteRepo.getPosition(satPass.orbitalObject, stationPos, System.currentTimeMillis())
-            val v = pos.distanceRate * 1000.0
-
-            if (tuningRadio.isNotEmpty()) {
-                // User is tuning — wait for frequency to stabilize
-                val readFreq = if (tuningRadio == "tx") radio.readTxVfoFrequency() else radio.readWorkingFrequency()
-                if (readFreq != null) {
-                    if (kotlin.math.abs(readFreq - lastReadFreq) <= 20) stableCount++
-                    else { stableCount = 0; lastReadFreq = readFreq }
-
-                    if (stableCount >= 2) {
-                        // Frequency stable — reverse-calculate base frequency
-                        if (tuningRadio == "tx" && txBaseFreq != null) {
-                            val newBase = (readFreq.toDouble() * SPEED_OF_LIGHT / (SPEED_OF_LIGHT + v)).toLong()
-                            if (newBase > 0) {
-                                txBaseFreq = newBase
-                                _state.update { it.copy(txBaseFrequencyHz = newBase) }
-                                Log.i(tag, "Split TX tuning done → base=$newBase")
-                            }
-                        } else if (tuningRadio == "rx") {
-                            val rxNominal = (readFreq.toDouble() * SPEED_OF_LIGHT / (SPEED_OF_LIGHT - v)).toLong()
-                            val newTxBase = TransponderMapper.mapDownlinkToUplink(rxNominal, xpdr)
-                            if (newTxBase != null && newTxBase > 0) {
-                                txBaseFreq = newTxBase
-                                _state.update { it.copy(txBaseFrequencyHz = newTxBase) }
-                                Log.i(tag, "Split RX tuning done → txBase=$newTxBase")
-                            }
-                        }
-                        tuningRadio   = ""
-                        stableCount   = 0
-                        lastSetTxFreq = 0.0
-                        lastSetRxFreq = 0.0
-                    }
-                }
-            } else {
-                // Detect manual dial changes
-                if (txBaseFreq != null && lastSetTxFreq > 0.0) {
-                    val readTx = radio.readTxVfoFrequency()
-                    if (readTx != null && kotlin.math.abs(readTx - lastSetTxFreq) >= 20.0) {
-                        tuningRadio  = "tx"
-                        lastReadFreq = readTx
-                        stableCount  = 0
-                        Log.i(tag, "Split TX tuning detected (read=${readTx}, lastSet=$lastSetTxFreq)")
-                    }
-                }
-                if (tuningRadio.isEmpty() && lastSetRxFreq > 0.0) {
-                    val readRx = radio.readWorkingFrequency()
-                    if (readRx != null && kotlin.math.abs(readRx - lastSetRxFreq) >= 20.0) {
-                        tuningRadio  = "rx"
-                        lastReadFreq = readRx
-                        stableCount  = 0
-                        Log.i(tag, "Split RX tuning detected (read=${readRx}, lastSet=$lastSetRxFreq)")
-                    }
-                }
-            }
-
-            // Determine Doppler-corrected frequencies
-            val txRadioFreq = txBaseFreq?.let { pos.getUplinkFreq(it) }
-            val rxBaseCalc  = if (txBaseFreq != null) {
-                TransponderMapper.mapUplinkToDownlink(txBaseFreq, xpdr)
-            } else xpdr.downlinkLow
-            val rxRadioFreq = rxBaseCalc?.let { pos.getDownlinkFreq(it) }
-
-            if (radio.isConnected && tuningRadio.isEmpty()) {
-                // Update both VFOs every cycle — no PTT polling needed.
-                // 0x25/00 = active (RX) VFO, 0x25/01 = inactive (TX) VFO.
-                if (rxRadioFreq != null) {
-                    Log.d(tag, "Split loop RX (0x25/00): ${rxRadioFreq}Hz")
-                    radio.setWorkingFrequency(rxRadioFreq)
-                    lastSetRxFreq = rxRadioFreq.toDouble()
-                }
-                if (txRadioFreq != null) {
-                    Log.d(tag, "Split loop TX (0x25/01): ${txRadioFreq}Hz")
-                    radio.setTxVfoFrequency(txRadioFreq)
-                    lastSetTxFreq = txRadioFreq.toDouble()
-                }
-            }
-
-            _state.update {
-                it.copy(
-                    txConnected   = radio.isConnected,
-                    rxConnected   = false,  // single radio
-                    txFrequencyHz = txRadioFreq,
-                    rxFrequencyHz = rxRadioFreq,
-                    azimuth       = Math.toDegrees(pos.azimuth),
-                    elevation     = Math.toDegrees(pos.elevation),
-                    distance      = pos.distance
-                )
-            }
-            delay(1000)
-        }
-    }
-
-    // ── Other IRadioTrackingService methods ─────────────────────────────────
-
     override fun stopTracking() {
         trackingJob?.cancel()
         trackingJob = null
@@ -493,6 +288,7 @@ class RadioTrackingService(
                     TransponderMapper.mapUplinkModeToDownlinkMode(it, transponder.isInverted)
                 }
             rxMode?.let { rx?.setMode(it) }
+
             if (transponder.uplinkMode?.uppercase() == "FM") {
                 _state.value.ctcssTone?.let { tone ->
                     tx?.setCtcssTone(tone)
@@ -506,17 +302,21 @@ class RadioTrackingService(
             transponder.uplinkLow != null -> transponder.uplinkLow!!
             else -> null
         }
+        // Show nominal frequencies immediately
         val rxNominal = if (txCenter != null) {
             TransponderMapper.mapUplinkToDownlink(txCenter, transponder)
-        } else transponder.downlinkLow
+        } else {
+            // Downlink-only transponder (beacon etc.) - use downlink directly
+            transponder.downlinkLow
+        }
         _state.update {
             it.copy(
                 selectedTransponder = transponder,
-                txBaseFrequencyHz   = txCenter,
-                txFrequencyHz       = txCenter,
-                rxFrequencyHz       = rxNominal,
-                txMode              = transponder.uplinkMode,
-                rxMode              = transponder.downlinkMode
+                txBaseFrequencyHz = txCenter,
+                txFrequencyHz = txCenter,
+                rxFrequencyHz = rxNominal,
+                txMode = transponder.uplinkMode,
+                rxMode = transponder.downlinkMode
                     ?: transponder.uplinkMode?.let { m ->
                         TransponderMapper.mapUplinkModeToDownlinkMode(m, transponder.isInverted)
                     }
@@ -553,4 +353,5 @@ class RadioTrackingService(
         }
         _state.update { it.copy(txMode = txMode, rxMode = rxMode) }
     }
+
 }

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

@@ -26,10 +26,8 @@ import androidx.room.Room
 import com.rtbishop.look4sat.core.data.database.Look4SatDb
 import com.rtbishop.look4sat.core.data.framework.BluetoothReporter
 import com.rtbishop.look4sat.core.data.framework.Ft817Controller
-import com.rtbishop.look4sat.core.data.framework.Ic705Controller
 import com.rtbishop.look4sat.core.data.framework.NetworkReporter
 import com.rtbishop.look4sat.core.data.framework.RadioTrackingService
-import com.rtbishop.look4sat.core.data.repository.AmSatRepository
 import com.rtbishop.look4sat.core.data.repository.DatabaseRepo
 import com.rtbishop.look4sat.core.data.repository.SatelliteRepo
 import com.rtbishop.look4sat.core.data.repository.SelectionRepo
@@ -41,10 +39,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
 import com.rtbishop.look4sat.core.domain.repository.IRadioController
@@ -54,7 +48,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
@@ -66,34 +59,22 @@ 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
 
 class MainContainer(private val context: Context) : IMainContainer {
 
     private val localSource = provideLocalSource()
-    private val remoteSource by lazy { 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(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)
@@ -102,16 +83,6 @@ class MainContainer(private val context: Context) : IMainContainer {
 
     override fun provideSaveImage(): ISaveImage = SaveImage(context)
 
-    // WaveLog 日志(4.5.2): 本地队列 + 上传器(共享实例)
-    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)
-
     override fun provideBluetoothReporter(): IReporter {
         val manager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
         val rc = settingsRepo.rcSettings.value
@@ -135,25 +106,15 @@ class MainContainer(private val context: Context) : IMainContainer {
     }
 
     override fun provideTxRadioController(): IRadioController {
-        val manager  = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
-        val settings = settingsRepo.radioControlSettings.value
-        val address  = settings.txRadioAddress
-        return if (settings.radioModel == RadioControlSettings.MODEL_ICOM_IC705) {
-            Ic705Controller(manager, address)
-        } else {
-            Ft817Controller(manager, address)
-        }
+        val manager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
+        val address = settingsRepo.radioControlSettings.value.txRadioAddress
+        return Ft817Controller(manager, address)
     }
 
     override fun provideRxRadioController(): IRadioController {
-        val manager  = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
-        val settings = settingsRepo.radioControlSettings.value
-        val address  = settings.rxRadioAddress
-        return if (settings.radioModel == RadioControlSettings.MODEL_ICOM_IC705) {
-            Ic705Controller(manager, address)
-        } else {
-            Ft817Controller(manager, address)
-        }
+        val manager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
+        val address = settingsRepo.radioControlSettings.value.rxRadioAddress
+        return Ft817Controller(manager, address)
     }
 
     override fun provideSensorsRepo(): ISensorsRepo {
@@ -165,6 +126,7 @@ class MainContainer(private val context: Context) : IMainContainer {
     private fun provideDatabaseRepo(): IDatabaseRepo {
         val dbDispatcher = Dispatchers.Default
         val dataParser = DataParser(dbDispatcher)
+        val remoteSource = provideRemoteSource()
         return DatabaseRepo(dbDispatcher, dataParser, localSource, remoteSource, settingsRepo)
     }
 
@@ -175,14 +137,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 {
@@ -198,6 +153,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,21 +0,0 @@
-package com.rtbishop.look4sat.core.data.repository
-
-import com.rtbishop.look4sat.core.data.source.AmSatParser
-import com.rtbishop.look4sat.core.domain.model.SatStatusPage
-import com.rtbishop.look4sat.core.domain.repository.IAmSatRepository
-import com.rtbishop.look4sat.core.domain.source.IRemoteSource
-
-/** AMSAT 状态仓库: 抓 HTML → 解析 → SatStatusPage */
-class AmSatRepository(private val remoteSource: IRemoteSource) : IAmSatRepository {
-
-    override suspend fun fetchStatus(): SatStatusPage? {
-        val html = remoteSource.getStatusHtml() ?: return null
-        if (html.isBlank()) return null
-        return try {
-            AmSatParser.parse(html, System.currentTimeMillis())
-        } catch (exception: Exception) {
-            println("AmSatRepository parse exception: $exception")
-            null
-        }
-    }
-}

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

@@ -42,60 +42,44 @@ class DatabaseRepo(
 
     private val customSourceType = "Other"
 
-    override suspend fun updateTLEFromFile(uri: String): Int = withContext(dispatcher) {
-        var importedCount = 0
+    override suspend fun updateTLEFromFile(uri: String) = withContext(dispatcher) {
         remoteSource.getFileStream(uri)?.let { stream ->
-            val entries = parseSatelliteStream(uri, unwrapIfZipped(uri, stream))
+            val entries = dataParser.parseTLEStream(unwrapIfZipped(uri, stream))
             localSource.insertEntries(entries)
             settingsRepo.setSatelliteTypeIds(customSourceType, entries.map { it.catnum })
-            importedCount = entries.size
         }
         setUpdateSuccessful(System.currentTimeMillis())
-        importedCount
     }
 
-    override suspend fun updateTransceiversFromFile(uri: String): Int = withContext(dispatcher) {
-        var importedCount = 0
+    override suspend fun updateTransceiversFromFile(uri: String) = withContext(dispatcher) {
         remoteSource.getFileStream(uri)?.let { stream ->
             val transceivers = dataParser.parseJSONStream(unwrapIfZipped(uri, stream))
             localSource.insertRadios(transceivers)
-            importedCount = transceivers.size
         }
         setUpdateSuccessful(System.currentTimeMillis())
-        importedCount
     }
 
     override suspend fun updateFromRemote() = withContext(dispatcher) {
         val dataSourcesSettings = settingsRepo.dataSourcesSettings.value
         val tleUrls = buildMap {
             putAll(Sources.satelliteDataUrls)
-            // 开关开且 URL 非空 -> All 用自定义 URL;否则用默认 URL(在线更新默认源)
-            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) } }
-        // 统计成功源数: 0 成功视为更新失败(不刷时间戳, 抛异常让 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 and associate with types
-        val importedEntries = tleResults.flatMap { (url, stream) ->
+        val importedEntries = tleJobs.awaitAll().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
@@ -110,31 +94,9 @@ class DatabaseRepo(
         setUpdateSuccessful(0L)
     }
 
-    private suspend fun parseSatelliteStream(url: String, stream: InputStream): List<OrbitalData> {
-        val bufferedStream = stream.buffered()
-        return when {
-            hasCsvHint(url) || looksLikeCsv(bufferedStream) -> dataParser.parseCSVStream(bufferedStream)
-            else -> dataParser.parseTLEStream(bufferedStream)
-        }
-    }
-
-    private fun hasCsvHint(url: String): Boolean {
-        return url.contains("FORMAT=csv", ignoreCase = true) ||
-            url.endsWith(".csv", ignoreCase = true) ||
-            url.endsWith(".csv.zip", ignoreCase = true)
-    }
-
-    private fun looksLikeCsv(stream: InputStream): Boolean {
-        if (!stream.markSupported()) return false
-        stream.mark(4096)
-        val preview = ByteArray(4096)
-        val length = stream.read(preview)
-        stream.reset()
-        if (length <= 0) return false
-        val line = preview.decodeToString(0, length).lineSequence().firstOrNull()?.trim().orEmpty()
-        return line.contains("OBJECT_NAME", ignoreCase = true) ||
-            line.contains("NORAD_CAT_ID", ignoreCase = true) ||
-            line.count { it == ',' } >= 4
+    private suspend fun parseSatelliteStream(url: String, stream: InputStream): List<OrbitalData> = when {
+        url.contains("FORMAT=csv", ignoreCase = true) -> dataParser.parseCSVStream(stream)
+        else -> dataParser.parseTLEStream(stream)
     }
 
     private suspend fun setUpdateSuccessful(timestamp: Long) {

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

@@ -36,7 +36,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.withContext
-import java.util.TimeZone
 
 class SatelliteRepo(
     private val dispatcher: CoroutineDispatcher,
@@ -65,16 +64,8 @@ class SatelliteRepo(
     override suspend fun initRepository() = withContext(dispatcher) {
         settingsRepo.selectedIds.collect { selectedIds ->
             _satellites.update { localStorage.getEntriesWithIds(selectedIds) }
-            val settings = settingsRepo.passesSettings.value
-            calculatePasses(
-                time = System.currentTimeMillis(),
-                hoursAhead = settings.hoursAhead,
-                minElevation = settings.minElevation,
-                aosStartMinute = settings.aosStartMinute,
-                aosEndMinute = settings.aosEndMinute,
-                invertAosTimeWindow = settings.invertAosTimeWindow,
-                modes = settings.selectedModes
-            )
+            val (_, hoursAhead, minElevation, modes) = settingsRepo.passesSettings.value
+            calculatePasses(System.currentTimeMillis(), hoursAhead, minElevation, modes)
         }
     }
 
@@ -95,8 +86,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) },
@@ -108,15 +105,7 @@ class SatelliteRepo(
         }
     }
 
-    override suspend fun calculatePasses(
-        time: Long,
-        hoursAhead: Int,
-        minElevation: Double,
-        aosStartMinute: Int,
-        aosEndMinute: Int,
-        invertAosTimeWindow: Boolean,
-        modes: List<String>
-    ) {
+    override suspend fun calculatePasses(time: Long, hoursAhead: Int, minElevation: Double, modes: List<String>) {
         _isCalculating.value = true
         // Normalize to the start of the current minute so that coarse 60-second stepping
         // in getLeoPass always begins from the same phase, producing stable AOS/LOS times
@@ -141,12 +130,7 @@ class SatelliteRepo(
             val newPasses = ArrayList<OrbitalPass>()
             for (list in passLists) {
                 for (pass in list) {
-                    if (
-                        pass.losTime > time
-                        && pass.aosTime < timeFuture
-                        && pass.maxElevation > minElevation
-                        && (pass.isDeepSpace || isAosInRange(pass.aosTime, aosStartMinute, aosEndMinute, invertAosTimeWindow))
-                    ) {
+                    if (pass.losTime > time && pass.aosTime < timeFuture && pass.maxElevation > minElevation) {
                         newPasses.add(pass)
                     }
                 }
@@ -158,23 +142,6 @@ class SatelliteRepo(
         _isCalculating.value = false
     }
 
-    private fun isAosInRange(
-        aosTime: Long,
-        aosStartMinute: Int,
-        aosEndMinute: Int,
-        invertAosTimeWindow: Boolean
-    ): Boolean {
-        val offsetMillis = TimeZone.getDefault().getOffset(aosTime).toLong()
-        val localMillis = Math.floorMod(aosTime + offsetMillis, 24L * 60L * 60L * 1000L)
-        val aosMinute = (localMillis / 60_000L).toInt()
-        val inRange = if (aosStartMinute <= aosEndMinute) {
-            aosMinute in aosStartMinute..aosEndMinute
-        } else {
-            aosMinute >= aosStartMinute || aosMinute <= aosEndMinute
-        }
-        return if (invertAosTimeWindow) !inRange else inRange
-    }
-
     private fun OrbitalObject.getPasses(pos: GeoPos, time: Long, hours: Int): List<OrbitalPass> {
         val passes = mutableListOf<OrbitalPass>()
         val endDate = time + hours * 60L * 60L * 1000L
@@ -236,16 +203,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 +223,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/SettingsRepo.kt

@@ -25,11 +25,11 @@ import androidx.core.location.LocationListenerCompat
 import androidx.core.location.LocationManagerCompat
 import com.rtbishop.look4sat.core.domain.model.DataSourcesSettings
 import com.rtbishop.look4sat.core.domain.model.DatabaseState
+import com.rtbishop.look4sat.core.domain.model.MapSource
 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 +40,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
@@ -56,9 +55,6 @@ class SettingsRepo(
     private val keyFilterShowDeepSpace = "filterShowDeepSpace"
     private val keyFilterHoursAhead = "filterHoursAhead"
     private val keyFilterMinElevation = "filterMinElevation"
-    private val keyFilterAosStartMinute = "filterAosStartMinute"
-    private val keyFilterAosEndMinute = "filterAosEndMinute"
-    private val keyFilterAosInvert = "filterAosInvert"
     private val keyNumberOfRadios = "numberOfRadios"
     private val keyNumberOfSatellites = "numberOfSatellites"
     private val keyRotatorAddress = "rotatorAddress"
@@ -78,8 +74,6 @@ class SettingsRepo(
     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"
@@ -89,17 +83,12 @@ class SettingsRepo(
     private val keyShouldSeeWarning = "shouldSeeWarning"
     private val keyShouldSeeWhatsNew = "shouldSeeWhatsNew_v$appVersionName"
     private val keySstvMode = "sstvMode"
-    private val keyLowElevation = "lowElevation"
-    private val keyHighElevation = "highElevation"
+    private val keyMapSource = "mapSource"
+    private val keyTiandituKey = "tiandituKey"
     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
@@ -141,9 +130,6 @@ class SettingsRepo(
         putBoolean(keyFilterShowDeepSpace, settings.showDeepSpace)
         putInt(keyFilterHoursAhead, settings.hoursAhead)
         putLong(keyFilterMinElevation, settings.minElevation.toRawBits())
-        putInt(keyFilterAosStartMinute, settings.aosStartMinute)
-        putInt(keyFilterAosEndMinute, settings.aosEndMinute)
-        putBoolean(keyFilterAosInvert, settings.invertAosTimeWindow)
         putString(keySelectedModes, settings.selectedModes.joinToString(separatorComma))
         _passesSettings.value = settings
     }
@@ -152,20 +138,9 @@ class SettingsRepo(
         val showDeepSpace = preferences.getBoolean(keyFilterShowDeepSpace, true)
         val hoursAhead = preferences.getInt(keyFilterHoursAhead, 24)
         val minElevation = Double.fromBits(preferences.getLong(keyFilterMinElevation, 16.0.toRawBits()))
-        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
-        )
+        return PassesSettings(showDeepSpace, hoursAhead, minElevation, selectedModes)
     }
     //endregion
 
@@ -187,41 +162,23 @@ class SettingsRepo(
         return true
     }
 
-    /** GPS 定位: 一次性 getCurrentLocation(GPS 优先, 15 秒超时), 拿到位置才返回 true */
-    override suspend fun setStationPosition(): Boolean {
-        // 权限前置: 无定位权限直接失败(不吞异常)
-        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 秒超时
-            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 +197,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")
@@ -381,15 +338,8 @@ class SettingsRepo(
                 putBoolean(keyShouldSeeWarning, new.shouldSeeWarning)
                 putBoolean(keyShouldSeeWhatsNew, new.shouldSeeWhatsNew)
                 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)
+                putString(keyMapSource, MapSource.normalize(new.mapSource))
+                putString(keyTiandituKey, new.tiandituKey)
             }
             new
         }
@@ -405,15 +355,8 @@ 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)
+        mapSource = MapSource.normalize(preferences.getString(keyMapSource, null) ?: MapSource.TIANDITU_VECTOR),
+        tiandituKey = preferences.getString(keyTiandituKey, null) ?: ""
     )
     //endregion
 
@@ -431,20 +374,12 @@ class SettingsRepo(
         _dataSourcesSettings.value = settings
     }
 
-    private fun getDataSourcesSettings(): DataSourcesSettings {
-        // 4.4.8 修复: 旧版 example.com 占位 URL 视为未配置 -> 替换为真实默认 URL 且开关强制关闭,
-        // 否则在线更新的 All/SatNOGS 源会指向错误地址导致更新失败
-        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
@@ -455,7 +390,6 @@ class SettingsRepo(
     private val keyTxRadioName = "txRadioName"
     private val keyRxRadioName = "rxRadioName"
     private val keyRadioBaudRate = "radioBaudRate"
-    private val keyRadioSplitMode = "radioSplitMode"
 
     private val _radioControlSettings = MutableStateFlow(getRadioControlSettings())
     override val radioControlSettings: StateFlow<RadioControlSettings> = _radioControlSettings
@@ -469,20 +403,18 @@ class SettingsRepo(
             putString(keyTxRadioName, settings.txRadioName)
             putString(keyRxRadioName, settings.rxRadioName)
             putInt(keyRadioBaudRate, settings.baudRate)
-            putBoolean(keyRadioSplitMode, settings.splitMode)
         }
         _radioControlSettings.value = settings
     }
 
     private fun getRadioControlSettings(): RadioControlSettings = RadioControlSettings(
         enabled = preferences.getBoolean(keyRadioControlEnabled, false),
-        radioModel = preferences.getString(keyRadioModel, null) ?: RadioControlSettings.MODEL_YAESU_FT817,
+        radioModel = preferences.getString(keyRadioModel, null) ?: "Yaesu FT-817/818",
         txRadioAddress = preferences.getString(keyTxRadioAddress, null) ?: "",
         rxRadioAddress = preferences.getString(keyRxRadioAddress, null) ?: "",
         txRadioName = preferences.getString(keyTxRadioName, null) ?: "TX Radio",
         rxRadioName = preferences.getString(keyRxRadioName, null) ?: "RX Radio",
-        baudRate = preferences.getInt(keyRadioBaudRate, 4800),
-        splitMode = preferences.getBoolean(keyRadioSplitMode, false)
+        baudRate = preferences.getInt(keyRadioBaudRate, 4800)
     )
     //endregion
 }

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 卫星状态页解析器(https://amsat.org/status/)
- *
- * 页面结构(静态 HTML, 2026-08 实测):
- * - 状态表: <table> 内 48 行, 表头 = Name + 6 天(每个 colspan=12)
- *   数据行 73 格: [0]=卫星名, [1..72] = 6 天 × 12 个 2 小时槽(新→旧)
- *   每格 <td width=9 bgcolor="颜色">数字</td>, 有报告时数字带
- *   docTips.show('id') 链接
- * - 报告详情在页面内嵌 JS:
- *   tips.a885153 = new Array(5,5,120,'状态<br>呼号<br>网格<br>日期<br>时间段 UTC')
- *
- * 状态色: #648fff=活跃, #ffb000=仅遥测, #dc267f=未听到, #fe6100=矛盾
- */
-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*'([^']*)'"
-    )
-
-    /** 解析完整页面 */
-    fun parse(html: String, fetchedAtUtcMs: Long): SatStatusPage {
-        val reports = parseReports(html)
-        val statuses = parseStatusTable(html, reports)
-        return SatStatusPage(fetchedAtUtcMs, statuses, reports)
-    }
-
-    /** 提取全部报告(tips.* JS 数组) */
-    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
-    }
-
-    /** 解析状态表(48 行卫星) */
-    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) {
-                    // 表头: Name + 6 天(每个 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

@@ -43,22 +43,6 @@ 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()

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/test/java/com/rtbishop/look4sat/core/data/Ft817CatProtocolTest.kt

@@ -1,29 +1,30 @@
-package com.rtbishop.look4sat.core.data.framework
+package com.rtbishop.look4sat.core.data
 
-import org.junit.Assert.assertArrayEquals
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotNull
-import org.junit.Assert.assertNull
+import com.rtbishop.look4sat.core.data.framework.Ft817CatProtocol
 import org.junit.Test
+import kotlin.test.assertContentEquals
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
 
 class Ft817CatProtocolTest {
 
     @Test
     fun encodeFrequencyBcd_145500000() {
         val bcd = Ft817CatProtocol.encodeFrequencyBcd(145500000L)
-        assertArrayEquals(byteArrayOf(0x14, 0x55, 0x00, 0x00), bcd)
+        assertContentEquals(byteArrayOf(0x14, 0x55, 0x00, 0x00), bcd)
     }
 
     @Test
     fun encodeFrequencyBcd_435100000() {
         val bcd = Ft817CatProtocol.encodeFrequencyBcd(435100000L)
-        assertArrayEquals(byteArrayOf(0x43, 0x51, 0x00, 0x00), bcd)
+        assertContentEquals(byteArrayOf(0x43, 0x51, 0x00, 0x00), bcd)
     }
 
     @Test
     fun encodeFrequencyBcd_7074000() {
         val bcd = Ft817CatProtocol.encodeFrequencyBcd(7074000L)
-        assertArrayEquals(byteArrayOf(0x00, 0x70, 0x74, 0x00), bcd)
+        assertContentEquals(byteArrayOf(0x00, 0x70, 0x74, 0x00), bcd)
     }
 
     @Test
@@ -41,21 +42,21 @@ class Ft817CatProtocolTest {
         val cmd = Ft817CatProtocol.buildSetFreqCommand(145500000L)
         assertEquals(5, cmd.size)
         assertEquals(0x01.toByte(), cmd[4])
-        assertArrayEquals(byteArrayOf(0x14, 0x55, 0x00, 0x00, 0x01), cmd)
+        assertContentEquals(byteArrayOf(0x14, 0x55, 0x00, 0x00, 0x01), cmd)
     }
 
     @Test
     fun buildSetModeCommand_usb() {
         val cmd = Ft817CatProtocol.buildSetModeCommand("USB")
         assertNotNull(cmd)
-        assertArrayEquals(byteArrayOf(0x01, 0x00, 0x00, 0x00, 0x07), cmd)
+        assertContentEquals(byteArrayOf(0x01, 0x00, 0x00, 0x00, 0x07), cmd)
     }
 
     @Test
     fun buildSetModeCommand_fm() {
         val cmd = Ft817CatProtocol.buildSetModeCommand("FM")
         assertNotNull(cmd)
-        assertArrayEquals(byteArrayOf(0x08, 0x00, 0x00, 0x00, 0x07), cmd)
+        assertContentEquals(byteArrayOf(0x08, 0x00, 0x00, 0x00, 0x07), cmd)
     }
 
     @Test
@@ -66,19 +67,19 @@ class Ft817CatProtocolTest {
     @Test
     fun encodeCtcssTone_67_0() {
         val bcd = Ft817CatProtocol.encodeCtcssToneBcd(67.0)
-        assertArrayEquals(byteArrayOf(0x06, 0x70), bcd)
+        assertContentEquals(byteArrayOf(0x06, 0x70), bcd)
     }
 
     @Test
     fun encodeCtcssTone_74_4() {
         val bcd = Ft817CatProtocol.encodeCtcssToneBcd(74.4)
-        assertArrayEquals(byteArrayOf(0x07, 0x44), bcd)
+        assertContentEquals(byteArrayOf(0x07, 0x44), bcd)
     }
 
     @Test
     fun encodeCtcssTone_141_3() {
         val bcd = Ft817CatProtocol.encodeCtcssToneBcd(141.3)
-        assertArrayEquals(byteArrayOf(0x14, 0x13), bcd)
+        assertContentEquals(byteArrayOf(0x14, 0x13), bcd)
     }
 
     @Test
@@ -86,13 +87,13 @@ class Ft817CatProtocolTest {
         val cmd = Ft817CatProtocol.buildSetCtcssToneCommand(67.0)
         assertEquals(5, cmd.size)
         assertEquals(0x0B.toByte(), cmd[4])
-        assertArrayEquals(byteArrayOf(0x06, 0x70, 0x00, 0x00, 0x0B), cmd)
+        assertContentEquals(byteArrayOf(0x06, 0x70, 0x00, 0x00, 0x0B), cmd)
     }
 
     @Test
     fun buildCtcssModeCommand_enable() {
         val cmd = Ft817CatProtocol.buildCtcssModeCommand(true)
-        assertArrayEquals(byteArrayOf(0x2A, 0x00, 0x00, 0x00, 0x0A), cmd)
+        assertContentEquals(byteArrayOf(0x2A, 0x00, 0x00, 0x00, 0x0A), cmd)
     }
 
     @Test
@@ -107,7 +108,6 @@ class Ft817CatProtocolTest {
         val response = byteArrayOf(0x14, 0x55, 0x00, 0x00, 0x01)
         val result = Ft817CatProtocol.parseReadResponse(response)
         assertNotNull(result)
-        result ?: return
         assertEquals(145500000L, result.first)
         assertEquals("USB", result.second)
     }
@@ -117,7 +117,6 @@ class Ft817CatProtocolTest {
         val response = byteArrayOf(0x14, 0x60, 0x00, 0x00, 0x08)
         val result = Ft817CatProtocol.parseReadResponse(response)
         assertNotNull(result)
-        result ?: return
         assertEquals(146000000L, result.first)
         assertEquals("FM", result.second)
     }
@@ -136,7 +135,7 @@ class Ft817CatProtocolTest {
     @Test
     fun buildPttCommands() {
         val on = Ft817CatProtocol.buildPttOnCommand()
-        assertArrayEquals(byteArrayOf(0x00, 0x00, 0x00, 0x00, 0x08), on)
+        assertContentEquals(byteArrayOf(0x00, 0x00, 0x00, 0x00, 0x08), on)
 
         val off = Ft817CatProtocol.buildPttOffCommand()
         assertEquals(0x88.toByte(), off[4])
@@ -145,6 +144,6 @@ class Ft817CatProtocolTest {
     @Test
     fun buildReadCommand() {
         val cmd = Ft817CatProtocol.buildReadFreqModeCommand()
-        assertArrayEquals(byteArrayOf(0x00, 0x00, 0x00, 0x00, 0x03), cmd)
+        assertContentEquals(byteArrayOf(0x00, 0x00, 0x00, 0x00, 0x03), cmd)
     }
 }

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

@@ -1,235 +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.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.OrbitalData
-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 com.rtbishop.look4sat.core.domain.source.IRemoteSource
-import com.rtbishop.look4sat.core.domain.utility.DataParser
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.test.StandardTestDispatcher
-import kotlinx.coroutines.test.runTest
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import java.io.InputStream
-
-@OptIn(ExperimentalCoroutinesApi::class)
-class DatabaseRepoTest {
-
-    private val dispatcher = StandardTestDispatcher()
-    private val dataParser = DataParser(dispatcher)
-
-    @Test
-    fun `manual satellite import parses csv stream from content uri`() = runTest(dispatcher) {
-        val uri = "content://look4sat/import/satellites"
-        val localSource = FakeLocalSource()
-        val remoteSource = FakeRemoteSource().apply {
-            fileStreams[uri] = { validCsvStream() }
-        }
-        val settingsRepo = FakeSettingsRepo()
-        val repository = DatabaseRepo(dispatcher, dataParser, localSource, remoteSource, settingsRepo)
-
-        repository.updateTLEFromFile(uri)
-
-        assertEquals(1, localSource.insertedEntries.size)
-        assertEquals(25544, localSource.insertedEntries.first().catnum)
-        assertEquals(listOf(25544), settingsRepo.satelliteTypeIdsByType["Other"])
-        assertTrue(settingsRepo.databaseState.value.numberOfSatellites > 0)
-    }
-
-    @Test
-    fun `manual satellite import keeps tle support`() = runTest(dispatcher) {
-        val uri = "content://look4sat/import/legacy"
-        val localSource = FakeLocalSource()
-        val remoteSource = FakeRemoteSource().apply {
-            fileStreams[uri] = { validTleStream() }
-        }
-        val settingsRepo = FakeSettingsRepo()
-        val repository = DatabaseRepo(dispatcher, dataParser, localSource, remoteSource, settingsRepo)
-
-        repository.updateTLEFromFile(uri)
-
-        assertEquals(1, localSource.insertedEntries.size)
-        assertEquals(25544, localSource.insertedEntries.first().catnum)
-    }
-
-    @Test
-    fun `custom data source imports omm csv from web`() = runTest(dispatcher) {
-        val customCsvUrl = "https://example.com/custom-omm.csv"
-        val localSource = FakeLocalSource()
-        val remoteSource = FakeRemoteSource().apply {
-            networkStreams[customCsvUrl] = { validCsvStream() }
-        }
-        val settingsRepo = FakeSettingsRepo(
-            dataSources = DataSourcesSettings(
-                useCustomTLE = true,
-                useCustomTransceivers = false,
-                tleUrl = customCsvUrl,
-                transceiversUrl = ""
-            )
-        )
-        val repository = DatabaseRepo(dispatcher, dataParser, localSource, remoteSource, settingsRepo)
-
-        repository.updateFromRemote()
-
-        assertTrue(localSource.insertedEntries.any { it.catnum == 25544 })
-        // 新语义: 开关开 + URL 非空 -> All 源用自定义 URL, 数据归入 All 类型
-        assertEquals(listOf(25544), settingsRepo.satelliteTypeIdsByType["All"])
-    }
-
-    private fun validCsvStream(): InputStream = """
-        OBJECT_NAME,OBJECT_ID,EPOCH,MEAN_MOTION,ECCENTRICITY,INCLINATION,RA_OF_ASC_NODE,ARG_OF_PERICENTER,MEAN_ANOMALY,EPHEMERIS_TYPE,CLASSIFICATION_TYPE,NORAD_CAT_ID,ELEMENT_SET_NO,REV_AT_EPOCH,BSTAR,MEAN_MOTION_DOT,MEAN_MOTION_DDOT
-        ISS (ZARYA),1998-067A,2021-11-16T12:28:09.322176,15.48582035,.0004694,51.6447,309.4881,203.6966,299.8876,0,U,25544,999,31220,.31985E-4,.1288E-4,0
-    """.trimIndent().byteInputStream()
-
-    private fun validTleStream(): InputStream = """
-        ISS (ZARYA)
-        1 25544U 98067A   21320.51955234  .00001288  00000+0  31985-4 0  9990
-        2 25544  51.6447 309.4881 0004694 203.6966 299.8876 15.48582035312205
-    """.trimIndent().byteInputStream()
-}
-
-private class FakeRemoteSource : IRemoteSource {
-    val fileStreams: MutableMap<String, () -> InputStream> = mutableMapOf()
-    val networkStreams: MutableMap<String, () -> InputStream> = mutableMapOf()
-
-    override suspend fun getFileStream(uri: String): InputStream? = fileStreams[uri]?.invoke()
-
-    override suspend fun getNetworkStream(url: String): InputStream? = networkStreams[url]?.invoke()
-}
-
-private class FakeLocalSource : ILocalSource {
-    val insertedEntries = mutableListOf<OrbitalData>()
-    private val insertedRadios = mutableListOf<SatRadio>()
-
-    override suspend fun getEntriesTotal(): Int = insertedEntries.size
-
-    override suspend fun getEntriesList(): List<SatItem> = emptyList()
-
-    override suspend fun getEntriesWithIds(ids: List<Int>): List<OrbitalObject> = emptyList()
-
-    override suspend fun insertEntries(entries: List<OrbitalData>) {
-        insertedEntries += entries
-    }
-
-    override suspend fun deleteEntries() {
-        insertedEntries.clear()
-    }
-
-    override suspend fun getIdsWithModes(modes: List<String>): List<Int> = emptyList()
-
-    override suspend fun getRadiosTotal(): Int = insertedRadios.size
-
-    override suspend fun getRadiosWithId(id: Int): List<SatRadio> = emptyList()
-
-    override suspend fun insertRadios(radios: List<SatRadio>) {
-        insertedRadios += radios
-    }
-
-    override suspend fun deleteRadios() {
-        insertedRadios.clear()
-    }
-}
-
-private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSourcesSettings()) : ISettingsRepo {
-
-    override val appVersionName: String = "test"
-
-    override val selectedIds: StateFlow<List<Int>> = MutableStateFlow(emptyList())
-
-    override val selectedTypes: StateFlow<List<String>> = MutableStateFlow(emptyList())
-
-    override val passesSettings: StateFlow<PassesSettings> = MutableStateFlow(
-        PassesSettings(hoursAhead = 24, minElevation = 0.0, selectedModes = emptyList())
-    )
-
-    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: MutableStateFlow<DataSourcesSettings> = MutableStateFlow(dataSources)
-
-    override val radioControlSettings: StateFlow<RadioControlSettings> = MutableStateFlow(
-        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 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 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
-    }
-
-    override fun updateRCSettings(settings: RCSettings) = Unit
-
-    override fun updateOtherSettings(transform: (OtherSettings) -> OtherSettings) = Unit
-
-    override fun updateDataSourcesSettings(settings: DataSourcesSettings) {
-        dataSourcesSettings.value = settings
-    }
-
-    override fun updateRadioControlSettings(settings: RadioControlSettings) = Unit
-}
-
-private fun defaultDataSourcesSettings(): DataSourcesSettings {
-    return DataSourcesSettings(
-        useCustomTLE = false,
-        useCustomTransceivers = false,
-        tleUrl = "",
-        transceiversUrl = ""
-    )
-}

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/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/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/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/model/SatStatus.kt

@@ -1,37 +0,0 @@
-package com.rtbishop.look4sat.core.domain.model
-
-/** 单条卫星状态报告(AMSAT 网站 tooltip 数据) */
-data class SatReport(
-    val id: String,          // 报告 ID(a885153)
-    val statusText: String,  // Heard / Telemetry Only / Not Heard ...
-    val call: String,        // 呼号
-    val grid: String,        // 网格坐标(可为空)
-    val dateUtc: String,     // 2026-08-04
-    val timeUtc: String      // 2:46-:59 UTC
-)
-
-/** 单个 2 小时槽的状态 */
-data class SatSlot(
-    val statusColor: Long,   // ARGB 状态色(-1 = 无报告)
-    val count: Int,          // 报告数量(0 = 无)
-    val reportIds: List<String> = emptyList() // 该槽报告 ID 列表
-)
-
-/** 卫星一天的状态(12 个 2 小时槽) */
-data class SatDay(
-    val dateLabel: String,   // "Aug 4"
-    val slots: List<SatSlot> // 12 槽(00-02 ... 22-24)
-)
-
-/** 单个卫星 6 天状态 */
-data class SatStatus(
-    val name: String,        // "AO-123_[FM]"
-    val days: List<SatDay>   // 6 天(新→旧)
-)
-
-/** 页面整体解析结果 */
-data class SatStatusPage(
-    val fetchedAtUtcMs: Long,
-    val statuses: List<SatStatus>,
-    val reports: Map<String, SatReport> // id → 报告
-)

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

@@ -27,9 +27,6 @@ data class PassesSettings(
     val showDeepSpace: Boolean = true,
     val hoursAhead: Int,
     val minElevation: Double,
-    val aosStartMinute: Int = 0,
-    val aosEndMinute: Int = 23 * 60 + 59,
-    val invertAosTimeWindow: Boolean = false,
     val selectedModes: List<String>
 )
 
@@ -61,21 +58,23 @@ data class OtherSettings(
     val shouldSeeWarning: Boolean,
     val shouldSeeWhatsNew: Boolean,
     val sstvMode: String = "Auto",
-    val lowElevation: Double = 15.0,
-    val highElevation: Double = 45.0,
-    // UI 设置: 底部导航栏隐藏的页面(Screen simpleName 列表, 默认空 = 全部显示)
-    val hiddenScreens: List<String> = emptyList(),
-    // UI 设置: 页面顺序(空 = 默认顺序: 卫星/过境/雷达/地图/设置)
-    val screenOrder: List<String> = emptyList(),
-    // UI 设置: 更多菜单顺序(空 = 默认: 匹配/漫游/CW解码)
-    val subMenuOrder: List<String> = emptyList(),
-    // WaveLog 日志系统(4.5.2): 服务器配置
-    val wavelogUrl: String = "",
-    val wavelogApiKey: String = "",
-    val wavelogStationId: String = "",
-    val wavelogAutoUpload: Boolean = false
+    val mapSource: String = MapSource.TIANDITU_VECTOR,
+    val tiandituKey: String = ""
 )
 
+object MapSource {
+    const val OSM = "osm"
+    const val TIANDITU = "tianditu"
+    const val TIANDITU_VECTOR = "tianditu_vector"
+    const val TIANDITU_IMAGE = "tianditu_image"
+
+    fun normalize(source: String): String = when (source) {
+        TIANDITU -> TIANDITU_VECTOR
+        OSM, TIANDITU_VECTOR, TIANDITU_IMAGE -> source
+        else -> TIANDITU_VECTOR
+    }
+}
+
 data class DataSourcesSettings(
     val useCustomTLE: Boolean,
     val useCustomTransceivers: Boolean,
@@ -90,20 +89,12 @@ data class RadioControlSettings(
     val rxRadioAddress: String,
     val txRadioName: String,
     val rxRadioName: String,
-    val baudRate: Int,
-    /** IC-705 only: use single-radio split-VFO mode instead of two radios. */
-    val splitMode: Boolean = false
+    val baudRate: Int
 ) {
     companion object {
-        const val MODEL_YAESU_FT817   = "Yaesu FT-817/818"
-        const val MODEL_YAESU_FT857   = "Yaesu FT-857/897"
-        const val MODEL_ICOM_IC705    = "Icom IC-705"
-
-        val SUPPORTED_RADIOS = listOf(MODEL_YAESU_FT817, MODEL_YAESU_FT857, MODEL_ICOM_IC705)
-
-        /** Baud rates available for Yaesu radios. */
-        val BAUD_RATES_YAESU = listOf(4800, 9600, 38400)
-        /** Baud rates available for Icom IC-705 (higher speeds supported via CI-V USB/BT). */
-        val BAUD_RATES_ICOM  = listOf(4800, 9600, 19200, 38400, 57600, 115200)
+        val SUPPORTED_RADIOS = listOf(
+            "Yaesu FT-817/818",
+            "Yaesu FT-857/897"
+        )
     }
 }

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

@@ -1,9 +0,0 @@
-package com.rtbishop.look4sat.core.domain.repository
-
-import com.rtbishop.look4sat.core.domain.model.SatStatusPage
-
-/** AMSAT 卫星状态数据源 */
-interface IAmSatRepository {
-    /** 抓取并解析 AMSAT 状态页; 失败返回 null */
-    suspend fun fetchStatus(): SatStatusPage?
-}

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

@@ -18,8 +18,8 @@
 package com.rtbishop.look4sat.core.domain.repository
 
 interface IDatabaseRepo {
-    suspend fun updateTLEFromFile(uri: String): Int
-    suspend fun updateTransceiversFromFile(uri: String): Int
+    suspend fun updateTLEFromFile(uri: String)
+    suspend fun updateTransceiversFromFile(uri: String)
     suspend fun updateFromRemote()
     suspend fun clearAllData()
 }

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,7 @@ interface IMainContainer {
     val selectionRepo: ISelectionRepo
     val satelliteRepo: ISatelliteRepo
     val databaseRepo: IDatabaseRepo
-  val amSatRepo: IAmSatRepository
     val radioTrackingService: IRadioTrackingService
-    val mutualPassData: StateFlow<MutualPassData>
-    fun setMutualPassData(data: MutualPassData)
     fun provideAddToCalendar(): IAddToCalendar
     fun provideShowToast(): IShowToast
     fun provideBluetoothReporter(): IReporter
@@ -43,30 +39,8 @@ interface IMainContainer {
     fun provideRxRadioController(): IRadioController
     fun provideAudioCapture(): IAudioCapture
     fun provideSaveImage(): ISaveImage
-    // WaveLog 日志(4.5.2)
-    val wavelogQueue: com.rtbishop.look4sat.core.domain.wavelog.WavelogQueue
-    fun provideWavelogUploader(): com.rtbishop.look4sat.core.domain.wavelog.WavelogUploader
 }
 
-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/IRadioController.kt

@@ -38,51 +38,4 @@ interface IRadioController {
     suspend fun pttOn(): Boolean
 
     suspend fun pttOff(): Boolean
-
-    // ── Extended operations (IC-705 / CI-V) ──────────────────────────────
-
-    /**
-     * Select the band matching [frequencyHz] via the band stacking register.
-     * Must be called before [setFrequency] and [setMode] when first tracking.
-     * Default: no-op (Yaesu radios auto-switch band via frequency).
-     */
-    suspend fun setBand(frequencyHz: Long): Boolean = false
-
-    /**
-     * Select the active VFO.
-     * @param vfoA true → VFO-A (main/RX), false → VFO-B (sub/TX in split).
-     */
-    suspend fun setVfo(vfoA: Boolean): Boolean = false
-
-    /**
-     * Enable or disable SPLIT mode (TX on sub-VFO, RX on main VFO).
-     * Default: not supported.
-     */
-    suspend fun setSplitMode(enabled: Boolean): Boolean = false
-
-    /**
-     * Set the frequency of the currently active VFO (IC-705: CMD 0x25 sub 0x00).
-     * Default: delegates to [setFrequency].
-     */
-    suspend fun setWorkingFrequency(frequencyHz: Long): Boolean = setFrequency(frequencyHz)
-
-    /**
-     * Set the frequency of the inactive/TX VFO (IC-705: CMD 0x25 sub 0x01).
-     * Sent every tracking cycle alongside [setWorkingFrequency] in split mode.
-     * Default: delegates to [setWorkingFrequency].
-     */
-    suspend fun setTxVfoFrequency(frequencyHz: Long): Boolean = setWorkingFrequency(frequencyHz)
-
-    /**
-     * Read the frequency of the currently active VFO (IC-705: CMD 0x25 sub 0x00).
-     * Default: delegates to [readFrequencyAndMode].
-     */
-    suspend fun readWorkingFrequency(): Long? = readFrequencyAndMode()?.first
-
-    /**
-     * Read the frequency of the inactive/TX VFO (IC-705: CMD 0x25 sub 0x01).
-     * Used for tuning detection in split mode.
-     * Default: delegates to [readWorkingFrequency].
-     */
-    suspend fun readTxVfoFrequency(): Long? = readWorkingFrequency()
 }

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

@@ -44,15 +44,7 @@ interface ISatelliteRepo {
     suspend fun initRepository()
 
     /** Recalculate passes with the given filter parameters. */
-    suspend fun calculatePasses(
-        time: Long,
-        hoursAhead: Int,
-        minElevation: Double,
-        aosStartMinute: Int,
-        aosEndMinute: Int,
-        invertAosTimeWindow: Boolean,
-        modes: List<String>
-    )
+    suspend fun calculatePasses(time: Long, hoursAhead: Int, minElevation: Double, modes: List<String>)
 
     /** Get the current position of a single satellite. */
     suspend fun getPosition(sat: OrbitalObject, pos: GeoPos, time: Long): OrbitalPos
@@ -61,7 +53,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/ISettingsRepo.kt

@@ -45,8 +45,7 @@ interface ISettingsRepo {
     //region # Station position settings
     val stationPosition: StateFlow<GeoPos>
     fun setStationPosition(latitude: Double, longitude: Double, altitude: Double): Boolean
-    /** GPS 定位(挂起): 拿到位置才返回 true; 权限缺失/超时/无信号返回 false */
-    suspend fun setStationPosition(): Boolean
+    fun setStationPosition(): Boolean
     fun setStationPosition(locator: String): Boolean
     //endregion
 

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

@@ -22,7 +22,4 @@ import java.io.InputStream
 interface IRemoteSource {
     suspend fun getFileStream(uri: String): InputStream?
     suspend fun getNetworkStream(url: String): InputStream?
-
-    /** 抓取 AMSAT 状态页 HTML(带 UA, 返回 null = 失败) */
-    suspend fun getStatusHtml(): String?
 }

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

@@ -18,10 +18,6 @@
 package com.rtbishop.look4sat.core.domain.source
 
 object Sources {
-    // 在线更新的默认 URL(用户可通过"自定义URL"对话框修改/重置)
-    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",

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/sstv/SstvDecoder.kt

@@ -20,94 +20,39 @@ package com.rtbishop.look4sat.core.domain.sstv
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.withContext
-import kotlin.math.PI
 import kotlin.math.abs
 import kotlin.math.round
 import kotlin.math.sqrt
 
 class SstvFrame(
-    val scopePixels: IntArray?,
-    val scopeWidth: Int,
-    val scopeHeight: Int,
     val imagePixels: IntArray?,
     val imageWidth: Int,
     val imageHeight: Int,
-    val modeName: String,
-    val imageComplete: Boolean,
-    val inputRms: Float,
-    val appliedGain: Float,
-    val syncHitRate: Float,
-    val predictedLineBursts: Int,
-    val maxPredictedStreak: Int,
-    val timingErrorSamples: Int
-)
-
-/**
- * Decoder quality metrics for diagnostics and logging. Useful for profiling decode
- * performance on noisy recordings.
- */
-data class SstvQualityMetrics(
-    val syncHitRate: Float,
-    val predictedLineBursts: Int,
-    val maxPredictedStreak: Int,
-    val timingErrorSamples: Int
-)
-
-enum class LineRecoveryStrategy {
-    Look4SatLimited,
-    Robot36Compatible
-}
-
-class SstvDiagnosticsHandle internal constructor(
-    val enabled: Boolean,
-    val metrics: StateFlow<SstvQualityMetrics?>
+    val modeName: String
 )
 
 class SstvDecoder(
     sampleRate: Int = 44100,
     scopeWidth: Int = 320,
     scopeHeight: Int = 256,
-    private val channelSelect: Int = 0,
-    targetRmsLevel: Float = 0.25f,
-    private val includeScopeData: Boolean = false,
-    private val enableRmsNormalization: Boolean = true,
-    preFilterCutoffHz: Double = 500.0,
-    enablePreFilter: Boolean = true,
-    private val enableDiagnosticsHandle: Boolean = false,
-    lineRecoveryStrategy: LineRecoveryStrategy = LineRecoveryStrategy.Look4SatLimited
+    private val channelSelect: Int = 0
 ) {
     private val scopeBuffer = PixelBuffer(scopeWidth, scopeHeight * 2)
     private val imageBuffer = PixelBuffer(scopeWidth, scopeHeight)
-    private val decoder = DecoderEngine(scopeBuffer, imageBuffer, "Raw", sampleRate, lineRecoveryStrategy)
+    private val decoder = DecoderEngine(scopeBuffer, imageBuffer, "Raw", sampleRate)
     private val _frames = MutableSharedFlow<SstvFrame>(
         replay = 1,
         onBufferOverflow = BufferOverflow.DROP_OLDEST
     )
-    private var lastInputRms = 0f
-    private var lastAppliedGain = 1f
-    private val _qualityMetrics = MutableStateFlow<SstvQualityMetrics?>(null)
-    private val preFilter = if (enablePreFilter) HighPassFilter(preFilterCutoffHz, sampleRate.toDouble()) else null
-    private val diagnosticsHandle = SstvDiagnosticsHandle(enableDiagnosticsHandle, _qualityMetrics)
     val frames: SharedFlow<SstvFrame> = _frames
     val supportedModes: List<String> = decoder.allModes.map { it.name }
 
     suspend fun feedSamples(samples: FloatArray) = withContext(Dispatchers.Default) {
-        // Optional pre-filtering: remove DC offset and subsonic noise that can mask
-        // weak signals and corrupt the RMS normalization baseline.
-        preFilter?.apply(samples)
-
-        // Optional RMS normalization: bring input to a consistent level so the
-        // FM demodulator operates in a predictable region. However, this amplifies
-        // noise proportionally. Aggressive RMS targets (e.g., 0.25) can hurt weak
-        // signals by boosting noise floor. Safer defaults: 0.35-0.50 for noisy inputs.
-        // Disable entirely for direct line-level inputs (e.g., receiver discriminator).
-        val gain = if (enableRmsNormalization) normalise(samples) else GainInfo(0f, 1f)
-        lastInputRms = gain.inputRms
-        lastAppliedGain = gain.appliedGain
+        // Normalize to a fixed RMS before processing so that both direct audio
+        // coupling and air-coupled microphone input decode with equal reliability.
+        normalise(samples)
         val hasNewLines = decoder.process(samples, channelSelect)
         if (hasNewLines) emitFrame()
     }
@@ -117,134 +62,36 @@ class SstvDecoder(
     fun clearPixels() {
         imageBuffer.line = -1
         imageBuffer.pixels.fill(0)
-        decoder.resetQuality()
-        if (enableDiagnosticsHandle) _qualityMetrics.value = null
-    }
-
-    fun getDiagnosticsHandle(): SstvDiagnosticsHandle? = diagnosticsHandle.takeIf { it.enabled }
-
-    /**
-     * Export quality metrics for logging/diagnostics. Useful for profiling decode
-     * performance on noisy recordings. Returns null before first frame is emitted.
-     */
-    @Suppress("unused")
-    fun getQualityMetrics(): SstvQualityMetrics? {
-        if (enableDiagnosticsHandle) return _qualityMetrics.value
-        val q = decoder.quality()
-        return SstvQualityMetrics(
-            syncHitRate = q.syncHitRate,
-            predictedLineBursts = q.predictedLineBursts,
-            maxPredictedStreak = q.maxPredictedStreak,
-            timingErrorSamples = q.timingErrorSamples
-        )
     }
 
     private fun emitFrame() {
         val imageWidth = imageBuffer.width
         val imageHeight = imageBuffer.height
-        val quality = decoder.quality()
-        if (enableDiagnosticsHandle) {
-            _qualityMetrics.value = SstvQualityMetrics(
-                syncHitRate = quality.syncHitRate,
-                predictedLineBursts = quality.predictedLineBursts,
-                maxPredictedStreak = quality.maxPredictedStreak,
-                timingErrorSamples = quality.timingErrorSamples
-            )
-        }
-        val imageComplete = imageBuffer.line >= imageHeight && imageBuffer.line > 0
         // Copy only the active image region — imageBuffer.pixels is pre-allocated
         // at the maximum possible size (PD-290: 800×616), so we must not copyOf()
         // the entire array and send padding pixels to the observer.
         val imagePixels = if (imageBuffer.line > 0) imageBuffer.pixels.copyOf(imageWidth * imageHeight) else null
         val modeName = decoder.currentMode.name
-        val scopePixels = if (includeScopeData) scopeBuffer.pixels.copyOf() else null
-        val scopeWidth = if (includeScopeData) scopeBuffer.width else 0
-        val scopeHeight = if (includeScopeData) scopeBuffer.height else 0
-        _frames.tryEmit(
-            SstvFrame(
-                scopePixels = scopePixels,
-                scopeWidth = scopeWidth,
-                scopeHeight = scopeHeight,
-                imagePixels = imagePixels,
-                imageWidth = imageWidth,
-                imageHeight = imageHeight,
-                modeName = modeName,
-                imageComplete = imageComplete,
-                inputRms = lastInputRms,
-                appliedGain = lastAppliedGain,
-                syncHitRate = quality.syncHitRate,
-                predictedLineBursts = quality.predictedLineBursts,
-                maxPredictedStreak = quality.maxPredictedStreak,
-                timingErrorSamples = quality.timingErrorSamples
-            )
-        )
+        _frames.tryEmit(SstvFrame(imagePixels, imageWidth, imageHeight, modeName))
     }
 
     // Target RMS level for the normalizer. 0.25 leaves headroom while keeping the
     // FM demodulator well above its noise floor regardless of input gain.
-    // TUNING GUIDE:
-    //   - 0.20-0.25: Aggressive, best for clean direct-coupled inputs, worst for mic noise
-    //   - 0.35-0.40: Moderate, good balance for typical phone/mic inputs (RECOMMENDED)
-    //   - 0.50-0.60: Conservative, best for noisy environments, reduces amplitude resolution
-    // Disable RMS normalization entirely if using a professional receiver discriminator output.
-    private val targetRms = targetRmsLevel.coerceIn(0.05f, 0.8f)
-
-    private class GainInfo(
-        val inputRms: Float,
-        val appliedGain: Float
-    )
+    private val targetRms = 0.25f
 
     // Bring the buffer to a fixed RMS so that microphone and direct-coupled inputs
     // both decode reliably. The guard prevents amplifying pure silence into noise.
-    private fun normalise(buffer: FloatArray): GainInfo {
+    private fun normalise(buffer: FloatArray) {
         var sumSq = 0f
         for (s in buffer) sumSq += s * s
         val rms = sqrt(sumSq / buffer.size)
         if (rms > 1e-6f) {
             val gain = targetRms / rms
             for (i in buffer.indices) buffer[i] *= gain
-            return GainInfo(rms, gain)
-        }
-        return GainInfo(rms, 1f)
-    }
-}
-
-/**
- * Simple high-pass filter to remove DC offset and subsonic interference before RMS
- * normalization. Improves noise floor estimation and prevents low-freq noise from
- * corrupting the gain calculation.
- *
- * Design: First-order butterworth (pole at cutoff frequency). Fast, minimal latency,
- * suitable for real-time preprocessing.
- */
-internal class HighPassFilter(cutoffHz: Double, sampleRateHz: Double) {
-    private val alpha: Float
-    private var prevInput = 0f
-    private var prevOutput = 0f
-
-    init {
-        // First-order pole placement: alpha = wc / (wc + ws) where wc = 2*pi*fc, ws = 2*pi*fs
-        val omega = 2f * PI.toFloat() * (cutoffHz / sampleRateHz).toFloat()
-        alpha = omega / (omega + 1f)
-    }
-
-    fun apply(buffer: FloatArray) {
-        for (i in buffer.indices) {
-            val input = buffer[i]
-            prevOutput = alpha * (prevOutput + input - prevInput)
-            buffer[i] = prevOutput
-            prevInput = input
         }
     }
 }
 
-internal class DecoderQuality(
-    val syncHitRate: Float,
-    val predictedLineBursts: Int,
-    val maxPredictedStreak: Int,
-    val timingErrorSamples: Int
-)
-
 internal enum class SyncPulseWidth { FiveMs, NineMs, TwentyMs }
 
 internal class SyncPulseDetector(sampleRate: Int) {
@@ -350,8 +197,7 @@ internal class DecoderEngine(
     private val scopeBuffer: PixelBuffer,
     private val imageBuffer: PixelBuffer,
     rawName: String,
-    sampleRate: Int,
-    lineRecoveryStrategy: LineRecoveryStrategy
+    sampleRate: Int
 ) {
     private val pixelBuffer = PixelBuffer(800, 2)
     private val detector = SyncPulseDetector(sampleRate)
@@ -391,19 +237,6 @@ internal class DecoderEngine(
     private var lastSync = 0
     private var curLineSamples: Int
     private var lastOffset = 0f
-    private var syncChecks = 0
-    private var syncHits = 0
-    private var predictedLineBursts = 0
-    private var predictedStreak = 0
-    private var maxPredictedStreak = 0
-    private var timingErrorSamples = 0
-
-    // Look4Sat strategy limits synthetic lines to avoid visible vertical collapse.
-    // Robot36 strategy preserves legacy behavior by allowing unlimited synthesis.
-    private val maxConsecutivePredictedLines = when (lineRecoveryStrategy) {
-        LineRecoveryStrategy.Look4SatLimited -> 2
-        LineRecoveryStrategy.Robot36Compatible -> Int.MAX_VALUE
-    }
 
     init {
         imageBuffer.line = -1
@@ -453,11 +286,6 @@ internal class DecoderEngine(
     fun process(recordBuffer: FloatArray, channelSelect: Int): Boolean {
         var newLines = false
         val detected = detector.process(recordBuffer, channelSelect)
-        syncChecks++
-        if (detected) {
-            syncHits++
-            predictedStreak = 0
-        }
         var syncIdx = sample + detector.pulseOffset
         val channels = if (channelSelect > 0) 2 else 1
         for (j in 0 until recordBuffer.size / channels) {
@@ -480,10 +308,20 @@ internal class DecoderEngine(
                 }
             }
         } else if (handleHeader()) {
-            predictedStreak = 0
             newLines = true
         } else if (sample > lastSync + (curLineSamples * 5) / 4) {
-            newLines = decodePredictedLine()
+            copyLines(
+                currentMode.decodeScanLine(
+                    pixelBuffer,
+                    scratch,
+                    scanLineBuffer,
+                    scopeBuffer.width,
+                    lastSync,
+                    curLineSamples,
+                    lastOffset
+                )
+            )
+            lastSync += curLineSamples; newLines = true
         }
         return newLines
     }
@@ -499,25 +337,6 @@ internal class DecoderEngine(
         lockMode = false
     }
 
-    fun quality(): DecoderQuality {
-        val hitRate = if (syncChecks > 0) syncHits.toFloat() / syncChecks else 0f
-        return DecoderQuality(
-            syncHitRate = hitRate,
-            predictedLineBursts = predictedLineBursts,
-            maxPredictedStreak = maxPredictedStreak,
-            timingErrorSamples = timingErrorSamples
-        )
-    }
-
-    fun resetQuality() {
-        syncChecks = 0
-        syncHits = 0
-        predictedLineBursts = 0
-        predictedStreak = 0
-        maxPredictedStreak = 0
-        timingErrorSamples = 0
-    }
-
     private fun mean(a: IntArray): Double = a.sumOf { it.toDouble() } / a.size
     private fun stdDev(a: IntArray, m: Double): Double {
         var s = 0.0; for (v in a) s += (v - m) * (v - m); return sqrt(s / a.size)
@@ -607,29 +426,6 @@ internal class DecoderEngine(
         if (finish) drawLines(0xff000000.toInt(), 10)
     }
 
-    private fun decodePredictedLine(): Boolean {
-        // Avoid long streaks of synthetic lines; once we exceed the cap we wait for
-        // real sync to reduce visible vertical compression on weak/noisy signals.
-        if (predictedStreak >= maxConsecutivePredictedLines) return false
-        val expectedSync = lastSync + curLineSamples
-        timingErrorSamples = sample - expectedSync
-        val decoded = currentMode.decodeScanLine(
-            pixelBuffer,
-            scratch,
-            scanLineBuffer,
-            scopeBuffer.width,
-            lastSync,
-            curLineSamples,
-            lastOffset
-        )
-        copyLines(decoded)
-        lastSync = expectedSync
-        predictedLineBursts++
-        predictedStreak++
-        if (predictedStreak > maxPredictedStreak) maxPredictedStreak = predictedStreak
-        return decoded
-    }
-
     private fun drawLines(color: Int, count: Int) {
         repeat(count) {
             scopeBuffer.pixels.fill(
@@ -746,7 +542,6 @@ internal class DecoderEngine(
         lineLen: IntArray,
         latest: Int
     ): Boolean {
-        predictedStreak = 0
         for (i in 1 until syncPulses.size) syncPulses[i - 1] = syncPulses[i]
         syncPulses[syncPulses.size - 1] = latest
         for (i in 1 until lineLen.size) lineLen[i - 1] = lineLen[i]

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)
-
-    /** 按资源 ID 显示(四语文案) */
-    operator fun invoke(resId: Int)
 }

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

@@ -1,124 +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.
- */
-package com.rtbishop.look4sat.core.domain.utility
-
-import com.rtbishop.look4sat.core.domain.model.SatRadio
-import com.rtbishop.look4sat.core.domain.predict.OrbitalPos
-import java.util.Locale
-
-/**
- * Computes Doppler-corrected reciprocal frequencies for linear transponders.
- *
- * 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:
- *
- *   downlink → uplink: mapDownlinkToUplink (passband) → getUplinkFreq (Doppler)
- *   uplink → downlink: mapUplinkToDownlink (passband) → getDownlinkFreq (Doppler)
- *
- * Addresses GitHub issue #91 (Custom frequency Doppler correction).
- */
-object DopplerFrequencyCalculator {
-
-    /**
-     * Given a downlink frequency, compute the Doppler-corrected uplink frequency.
-     * Returns null if the transponder is not a linear passband type.
-     */
-    fun computeUplinkFromDownlink(
-        downlinkHz: Long,
-        transponder: SatRadio,
-        orbitalPos: OrbitalPos
-    ): Long? {
-        if (!isLinearTransponder(transponder)) return null
-        val baseUplink = TransponderMapper.mapDownlinkToUplink(downlinkHz, transponder) ?: return null
-        return orbitalPos.getUplinkFreq(baseUplink)
-    }
-
-    /**
-     * Given a downlink frequency, compute the Doppler-corrected uplink frequency
-     * with an offset applied to the downlink (in Hz).
-     * Returns null if the transponder is not a linear passband type.
-     *
-     * The user-entered downlink frequency already includes the offset, so subtract
-     * it before mapping the downlink passband position back to the uplink.
-     */
-    fun computeUplinkFromDownlinkWithOffset(
-        downlinkHz: Long,
-        transponder: SatRadio,
-        orbitalPos: OrbitalPos,
-        offsetHz: Long
-    ): Long? {
-        if (!isLinearTransponder(transponder)) return null
-        val baseUplink = TransponderMapper.mapDownlinkToUplink(downlinkHz - offsetHz, transponder) ?: return null
-        return orbitalPos.getUplinkFreq(baseUplink)
-    }
-
-    /**
-     * Given an uplink frequency, compute the Doppler-corrected downlink frequency.
-     * Returns null if the transponder is not a linear passband type.
-     */
-    fun computeDownlinkFromUplink(
-        uplinkHz: Long,
-        transponder: SatRadio,
-        orbitalPos: OrbitalPos
-    ): Long? {
-        if (!isLinearTransponder(transponder)) return null
-        val baseDownlink = TransponderMapper.mapUplinkToDownlink(uplinkHz, transponder) ?: return null
-        return orbitalPos.getDownlinkFreq(baseDownlink)
-    }
-
-    /**
-     * Given an uplink frequency, compute the Doppler-corrected downlink frequency
-     * with an offset applied to the downlink (in Hz).
-     * Returns null if the transponder is not a linear passband type.
-     */
-    fun computeDownlinkFromUplinkWithOffset(
-        uplinkHz: Long,
-        transponder: SatRadio,
-        orbitalPos: OrbitalPos,
-        offsetHz: Long
-    ): Long? {
-        if (!isLinearTransponder(transponder)) return null
-        val baseDownlink = TransponderMapper.mapUplinkToDownlink(uplinkHz, transponder) ?: return null
-        return orbitalPos.getDownlinkFreq(baseDownlink + offsetHz)
-    }
-
-    /** True if this transponder supports linear passband mapping. */
-    fun isLinearTransponder(transponder: SatRadio): Boolean {
-        val upLow = transponder.uplinkLow
-        val upHigh = transponder.uplinkHigh
-        val downLow = transponder.downlinkLow
-        val downHigh = transponder.downlinkHigh
-        return upLow != null && upHigh != null && downLow != null && downHigh != null
-                && upLow != upHigh && downLow != downHigh
-    }
-
-    /**
-     * 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".
-     */
-    fun isNamedLinearTransponder(transponder: SatRadio): Boolean {
-        if (!isLinearTransponder(transponder)) return false
-
-        val info = transponder.info.lowercase(Locale.ENGLISH)
-        val modes = listOfNotNull(transponder.downlinkMode, transponder.uplinkMode)
-            .joinToString(separator = " ")
-            .lowercase(Locale.ENGLISH)
-        val hasLinearName = info.contains("linear")
-        val hasTransponderName = info.contains("transponder") || info.contains("transp") ||
-                info.contains("xponder") || info.contains("xpdr")
-        val hasLinearMode = listOf("ssb", "usb", "lsb", "cw").any { modes.contains(it) }
-
-        return (hasLinearName && hasTransponderName) || (hasTransponderName && hasLinearMode)
-    }
-}

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定位器 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/WaveLogApi.kt

@@ -1,266 +0,0 @@
-/*
- * WaveLogApi.kt — WaveLog 日志服务器 API 客户端(4.5.2 覆盖修复 2)。
- *
- * 同时支持 v1 与 v2(用户服务器实测只有 v1, v2 返回 404):
- *   v2: POST {base}/api/v2/qso            (Authorization: Bearer + JSON 字段)
- *   v1: POST {base}/index.php/api/qso     (key 在 JSON body + ADIF 字符串)
- * 策略: 优先 v2, 404 自动降级 v1。
- * 测试连接: v2 GET api/v2/token → 404 时 v1 POST api/get_contacts_adif。
- * 站点网格: 仅 v2 有 GET api/v2/station/{id}; v1 无此端点 → 降级用用户 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
-
-/** 站点信息(GET /api/v2/station/{id} 结果) */
-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
-
-    /** 规范化服务器地址: 去尾斜杠/去尾部 index.php; 无协议前缀时补 https:// */
-    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
-    }
-
-    /** 测试连接: v2 GET api/v2/token → 404 时 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 在 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)")
-        }
-        // 无 index.php 的 v1 尝试
-        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} — 请确认服务器地址/密钥正确")
-    }
-
-    /** 站点信息: 仅 v2; v1 无此端点返回 null 标记(网格检测降级用用户 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 无 station 端点 → 返回 Success 空(调用方降级用用户 QTH)
-        WavelogResult.Success("")
-    }
-
-    /** LoTW 认可的卫星名: 取括号前主名 + 大写(ISS 特判) */
-    fun normalizeSatName(raw: String): String {
-        val main = raw.substringBefore('(').trim()
-            .ifBlank { raw.trim() }
-            .uppercase(Locale.ENGLISH)
-        // ISS 特判: 主名是 ISS/ZARYA/ARISS 变体 → ISS(LoTW 认可名)
-        return when {
-            main == "ZARYA" || main.startsWith("ISS") -> "ISS"
-            main == "ARISS" -> "ISS"
-            else -> main
-        }
-    }
-
-    /** 创建 QSO: 优先 v2, 404 降级 v1(ADIF) */
-    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 字段)
-        val v2Body = JSONObject().apply {
-            put("station_profile_id", stationProfileId.toIntOrNull() ?: 0)
-            put("call", qso.call)
-            put("band", "SAT")
-            put("mode", qso.mode)
-            put("qso_date", utcDate(qso.timeUtcMs))
-            put("time_on", utcTime(qso.timeUtcMs))
-            put("freq", qso.freqTxHz)
-            put("freq_rx", qso.freqRxHz)
-            put("gridsquare", gridsquare)
-            put("sat_name", satName)
-        }
-        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 在 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)")
-
-        // 无 index.php 的 v1
-        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 字符串(频率 MHz, 长度=UTF-8 字节数, sat_name 已规范化) */
-    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"
-        }
-        return buildString {
-            append(field("call", qso.call))
-            append(field("band", "SAT"))
-            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)))
-            if (gridsquare.isNotBlank()) append(field("gridsquare", gridsquare.take(4)))
-            if (satName.isNotBlank()) {
-                append(field("sat_name", satName))
-                append(field("prop_mode", "SAT"))
-            }
-            append("<eor>")
-        }
-    }
-
-    /** 通用 HTTP 请求(返回 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 错误页
-        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,100 +0,0 @@
-/*
- * WavelogQueue.kt — WaveLog 本地日志队列(4.5.2)。
- *
- * 纯 Kotlin(不依赖 Android): 存储走 IWavelogQueueStore 接口,
- * 由 core/data 用 SharedPreferences 实现。
- * 队列上限 500 条(超出丢最旧)。
- */
-package com.rtbishop.look4sat.core.domain.wavelog
-
-import org.json.JSONArray
-import org.json.JSONObject
-
-/** 存储抽象(SharedPreferences 实现见 core/data) */
-interface IWavelogQueueStore {
-    fun load(): String
-    fun save(json: String)
-}
-
-/** 待上传的 QSO 条目(本地队列元素,与 POST /api/v2/qso 字段对应) */
-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 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"),
-                    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 })
-    }
-
-    /** 标记为已上传(保留在队列, 表格打勾) */
-    @Synchronized
-    fun markUploaded(id: String) {
-        save(all().map { if (it.id == id) it.copy(uploaded = true) else it })
-    }
-
-    /** 移除所有已上传条目(可选项, 保持队列精简) */
-    @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("uploaded", q.uploaded)
-            })
-        }
-        store.save(arr.toString())
-    }
-}

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

@@ -1,91 +0,0 @@
-/*
- * WavelogUploader.kt — WaveLog 队列上传调度(4.5.2)。
- *
- * 手动/周期上传共用: 逐条网格检测(用户 QTH 前 4 位 vs 台站网格前 4 位)
- * → POST /api/v2/qso → 成功移出队列。
- * 网格不一致: 返回 NeedConfirm(由 UI 弹窗「忽略并上传/取消」),
- * 确认后带 force=true 重试本批。
- */
-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
-) {
-
-    // 台站网格缓存(每次上传前刷新; 失败用旧值)
-    private var cachedStationGrid: String? = null
-
-    /** 上传整个队列。force=true 跳过网格确认(用户已选「忽略并上传」) */
-    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. 拉站点信息(拿台站网格); v1 无此端点时降级用用户 QTH
-        val stationGrid = getStationGrid(url, apiKey, stationId) ?: userQthGrid()
-        if (stationGrid.isNullOrBlank()) {
-            return UploadOutcome.Done(0, queue.all().size, "无法获取站点信息(检查站点 ID/密钥权限)")
-        }
-
-        // 2. 网格检测: 用户当前 QTH 前 4 位 vs 台站网格前 4 位(v1 降级时网格相同, 跳过)
-        if (!force) {
-            val userGrid = userQthGrid()
-            if (userGrid != null && stationGrid.take(4).lowercase() != userGrid.take(4).lowercase()) {
-                return UploadOutcome.NeedConfirm(stationGrid, userGrid)
-            }
-        }
-
-        // 3. 逐条上传(成功后标记 uploaded, 保留在本地供日志页打勾)
-        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, stationGrid)
-            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
-    }
-
-    /** 用户当前 QTH 网格(前 4 位; 无 QTH 返回 null = 跳过检测) */
-    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

@@ -1,192 +0,0 @@
-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.Test
-
-class DopplerFrequencyCalculatorTest {
-
-    private fun linearTransponder(
-        upLow: Long = 145_000_000L,
-        upHigh: Long = 145_500_000L,
-        downLow: Long = 435_000_000L,
-        downHigh: Long? = 435_500_000L,
-        inverted: Boolean = false,
-        info: String = "Linear Transponder",
-        downlinkMode: String? = "USB",
-        uplinkMode: String? = "LSB"
-    ) = SatRadio(
-        uuid = "linear", info = info, isAlive = true,
-        downlinkLow = downLow, downlinkHigh = downHigh,
-        downlinkMode = downlinkMode, uplinkLow = upLow, uplinkHigh = upHigh,
-        uplinkMode = uplinkMode, isInverted = inverted, catnum = 12345
-    )
-
-    private fun fmTransponder() = SatRadio(
-        uuid = "fm", info = "FM Repeater", isAlive = true,
-        downlinkLow = 435_600_000L, downlinkHigh = null,
-        downlinkMode = "FM", uplinkLow = 145_900_000L, uplinkHigh = null,
-        uplinkMode = "FM", isInverted = false, catnum = 99999
-    )
-
-    private fun pos(distanceRateKmS: Double = 0.0) = OrbitalPos().apply {
-        this.distanceRate = distanceRateKmS
-    }
-
-    @Test
-    fun isLinearTransponder_returnsTrueForLinear() {
-        assertTrue(DopplerFrequencyCalculator.isLinearTransponder(linearTransponder()))
-    }
-
-    @Test
-    fun isLinearTransponder_returnsFalseForFM() {
-        assertFalse(DopplerFrequencyCalculator.isLinearTransponder(fmTransponder()))
-    }
-
-    @Test
-    fun isLinearTransponder_returnsFalseForNullDownlinkHigh() {
-        val xpdr = linearTransponder(downHigh = null)
-        assertFalse(DopplerFrequencyCalculator.isLinearTransponder(xpdr))
-    }
-
-    @Test
-    fun isNamedLinearTransponder_returnsTrueForLinearTransponderName() {
-        assertTrue(DopplerFrequencyCalculator.isNamedLinearTransponder(linearTransponder()))
-    }
-
-    @Test
-    fun isNamedLinearTransponder_returnsTrueForSsbTransponderName() {
-        val xpdr = linearTransponder(info = "Mode V/U SSB Transponder", downlinkMode = "USB", uplinkMode = "LSB")
-        assertTrue(DopplerFrequencyCalculator.isNamedLinearTransponder(xpdr))
-    }
-
-    @Test
-    fun isNamedLinearTransponder_returnsFalseForRangeEntryWithoutTransponderName() {
-        val driftingRangeEntry = linearTransponder(info = "Upper side band (drifting)")
-        assertFalse(DopplerFrequencyCalculator.isNamedLinearTransponder(driftingRangeEntry))
-    }
-
-    @Test
-    fun isNamedLinearTransponder_returnsFalseForFmRepeater() {
-        assertFalse(DopplerFrequencyCalculator.isNamedLinearTransponder(fmTransponder()))
-    }
-
-    @Test
-    fun computeUplinkFromDownlink_linear_noDoppler() {
-        val xpdr = linearTransponder()
-        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)
-    }
-
-    @Test
-    fun computeDownlinkFromUplink_linear_noDoppler() {
-        val xpdr = linearTransponder()
-        val orbitalPos = pos(0.0)
-        val downlink = DopplerFrequencyCalculator.computeDownlinkFromUplink(145_200_000L, xpdr, orbitalPos)
-        assertNotNull(downlink)
-        assertEquals(435_200_000L, downlink)
-    }
-
-    @Test
-    fun computeUplinkFromDownlink_withDoppler_positiveRangeRate() {
-        // 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 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() {
-        val orbitalPos = pos()
-        val result = DopplerFrequencyCalculator.computeUplinkFromDownlink(435_600_000L, fmTransponder(), orbitalPos)
-        assertNull(result)
-    }
-
-    @Test
-    fun computeDownlinkFromUplink_fm_transponder_returnsNull() {
-        val orbitalPos = pos()
-        val result = DopplerFrequencyCalculator.computeDownlinkFromUplink(145_900_000L, fmTransponder(), orbitalPos)
-        assertNull(result)
-    }
-
-    @Test
-    fun computeDownlinkFromUplink_withPositiveOffset_addsOffsetToDownlink() {
-        val xpdr = linearTransponder()
-        val orbitalPos = pos(0.0)
-        val downlink = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
-            uplinkHz = 145_200_000L,
-            transponder = xpdr,
-            orbitalPos = orbitalPos,
-            offsetHz = 2_500L
-        )
-        assertEquals(435_202_500L, downlink)
-    }
-
-    @Test
-    fun computeUplinkFromDownlink_withPositiveOffset_subtractsOffsetBeforeMapping() {
-        val xpdr = linearTransponder()
-        val orbitalPos = pos(0.0)
-        val uplink = DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset(
-            downlinkHz = 435_202_500L,
-            transponder = xpdr,
-            orbitalPos = orbitalPos,
-            offsetHz = 2_500L
-        )
-        assertEquals(145_200_000L, uplink)
-    }
-
-    @Test
-    fun computeOffsetRoundTrip_handlesNegativeOffset() {
-        val xpdr = linearTransponder()
-        val orbitalPos = pos(0.0)
-        val downlink = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
-            uplinkHz = 145_200_000L,
-            transponder = xpdr,
-            orbitalPos = orbitalPos,
-            offsetHz = -2_500L
-        )
-        assertEquals(435_197_500L, downlink)
-
-        val uplink = DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset(
-            downlinkHz = downlink!!,
-            transponder = xpdr,
-            orbitalPos = orbitalPos,
-            offsetHz = -2_500L
-        )
-        assertEquals(145_200_000L, uplink)
-    }
-
-    @Test
-    fun computeUplinkFromDownlink_invertedTransponder() {
-        val xpdr = linearTransponder(inverted = true, downHigh = 435_500_000L)
-        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
-        val uplink = DopplerFrequencyCalculator.computeUplinkFromDownlink(originalDownlink, xpdr, orbitalPos)
-        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定位器 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/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/Components.kt

@@ -39,26 +39,18 @@ import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ElevatedButton
 import androidx.compose.material3.ElevatedCard
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.drawscope.Stroke
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource
-import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.hideFromAccessibility
@@ -72,11 +64,10 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
-import androidx.compose.ui.unit.Velocity
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
 import com.rtbishop.look4sat.core.domain.predict.NearEarthObject
 import com.rtbishop.look4sat.core.domain.predict.OrbitalData
 import com.rtbishop.look4sat.core.domain.predict.OrbitalPass
@@ -157,13 +148,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
@@ -284,87 +278,55 @@ fun getDefaultPass(): OrbitalPass = OrbitalPass(
 fun SharedDialog(
     title: String, onCancel: () -> Unit, onAccept: () -> Unit, content: @Composable () -> Unit
 ) {
-    SharedDialog(title = title, onDismissRequest = onCancel, onCancel = onCancel, onAccept = onAccept) { _ ->
+    DialogShell(title = title, titleFontSize = 16, onDismissRequest = onCancel) {
         content()
+        Row(modifier = Modifier.padding(start = it, bottom = it, end = it)) {
+            CardButton(onClick = onCancel, text = stringResource(R.string.btn_cancel))
+            Spacer(modifier = Modifier.weight(1f))
+            CardButton(onClick = onAccept, text = stringResource(R.string.btn_accept))
+        }
     }
 }
 
 @Composable
-fun SharedDialog(
-    title: String,
-    onDismissRequest: () -> Unit,
-    onCancel: (() -> Unit)? = null,
-    onAccept: (() -> Unit)? = null,
-    titleFontSize: Int = 16,
-    titleTextAlign: TextAlign = if (onCancel != null && onAccept != null) TextAlign.Center else TextAlign.Start,
-    content: @Composable (padding: Dp) -> Unit
-) {
-    DialogShell(onDismissRequest = onDismissRequest) { padding ->
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(start = padding, top = padding, end = padding)
-        ) {
-            if (onCancel != null) {
-                CardButton(onClick = onCancel, text = stringResource(R.string.btn_cancel))
-            }
-            Text(
-                text = title,
-                fontSize = titleFontSize.sp,
-                fontWeight = FontWeight.Medium,
-                color = MaterialTheme.colorScheme.primary,
-                textAlign = titleTextAlign,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-                modifier = Modifier
-                    .weight(1f)
-                    .padding(horizontal = if (onCancel != null && onAccept != null) padding else 0.dp)
-            )
-            if (onAccept != null) {
-                CardButton(onClick = onAccept, text = stringResource(R.string.btn_accept))
-            }
+fun InfoDialog(title: String, text: String, onDismiss: () -> Unit) {
+    DialogShell(title = title, titleFontSize = 18, onDismissRequest = {}) {
+        Text(
+            text = text,
+            fontSize = 16.sp,
+            color = MaterialTheme.colorScheme.onSurface,
+            modifier = Modifier.padding(horizontal = it)
+        )
+        Row(modifier = Modifier.padding(start = it, bottom = it, end = it)) {
+            Spacer(modifier = Modifier.weight(1f))
+            CardButton(onClick = onDismiss, text = stringResource(R.string.btn_accept))
         }
-        content(padding)
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun DialogShell(
+    title: String,
+    titleFontSize: Int,
     onDismissRequest: () -> Unit,
-    content: @Composable (padding: Dp) -> Unit
+    content: @Composable (padding: androidx.compose.ui.unit.Dp) -> Unit
 ) {
     val padding = LocalSpacing.current.large
-    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
-    val stopSheetFling = remember {
-        object : NestedScrollConnection {
-            override suspend fun onPostFling(consumed: Velocity, available: Velocity): Velocity {
-                return available
+    Dialog(onDismissRequest = onDismissRequest) {
+        ElevatedCard {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(padding)
+            ) {
+                Text(
+                    text = title,
+                    fontSize = titleFontSize.sp,
+                    fontWeight = FontWeight.Medium,
+                    color = MaterialTheme.colorScheme.primary,
+                    modifier = Modifier.padding(start = padding, top = padding, end = padding)
+                )
+                content(padding)
             }
-
-            override fun onPostScroll(
-                consumed: Offset,
-                available: Offset,
-                source: NestedScrollSource
-            ): Offset = Offset.Zero
-        }
-    }
-    ModalBottomSheet(
-        onDismissRequest = onDismissRequest,
-        sheetState = sheetState,
-        dragHandle = null,
-        shape = MaterialTheme.shapes.medium,
-        scrimColor = Color.Black.copy(alpha = 0.64f)
-    ) {
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.spacedBy(padding),
-            modifier = Modifier
-                .fillMaxWidth()
-                .nestedScroll(stopSheetFling)
-        ) {
-            content(padding)
         }
     }
 }
@@ -429,26 +391,13 @@ fun TopBar(
 
 @Composable
 fun elevationColor(elevation: Double): Color {
-    val thresholds = LocalElevationThresholds.current
     return when {
-        elevation < thresholds.low -> ElevationLowColor // soft red for low elevation
-        elevation < thresholds.high -> MaterialTheme.colorScheme.primary // accent yellow for normal
-        else -> ElevationHighColor // soft green for high elevation
+        elevation < 15.0 -> Color(0xFFEF5350) // soft red for low elevation
+        elevation < 45.0 -> MaterialTheme.colorScheme.primary // accent yellow for normal
+        else -> Color(0xFF66BB6A) // soft green for high elevation
     }
 }
 
-/** User-configurable elevation highlight thresholds (in degrees). */
-data class ElevationThresholds(val low: Double = 15.0, val high: Double = 45.0)
-
-/** Provided at the app root from settings; defaults keep the original 15°/45° behavior. */
-val LocalElevationThresholds = compositionLocalOf { ElevationThresholds() }
-
-/** Soft red used for elevations below the low threshold. */
-val ElevationLowColor = Color(0xFFEF5350)
-
-/** Soft green used for elevations above the high threshold. */
-val ElevationHighColor = Color(0xFF66BB6A)
-
 @Composable
 fun OutlinedText(
     text: String,
@@ -518,5 +467,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/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 设置: 默认主菜单页面顺序(底部栏 5 槽)
-val defaultScreenOrder = listOf("Satellites", "Passes", "Radar", "Map", "Settings")
-
-// UI 设置: 默认更多菜单顺序(进「更多」的页面)
-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_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_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/values-es/strings.xml

@@ -31,17 +31,14 @@
     <!-- Passes screen -->
     <string name="pass_filter_title">Filtrar pases</string>
     <string name="pass_filter_elev">Elevación mínima</string>
-    <string name="pass_filter_hours">Tiempo por delante</string>
-    <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_filter_hours">Horas por delante</string>
     <string name="pass_modes_title">Tipo de modulación</string>
     <string name="pass_elevation">Elevación: %.1f°</string>
     <string name="pass_altitude">Altitud: %.0f km</string>
     <string name="pass_empty_list_message">
         Asegúrate de que tus filtros sean correctos y hayas seleccionado satélites</string>
     <string name="pass_error_message">No hay pases de satélite próximos para mostrar</string>
-    <string name="pass_welcome_title">Bienvenido a Look4Sat\!</string>
+    <string name="pass_welcome_title">Bienvenido a Look4Sat-CNMap\!</string>
     <string name="pass_welcome_message">
         Asegúrate de configurar tu posición mediante GPS, Latitud/Longitud o QTH en Configuración.
         \n\nActualiza la base de datos al menos una vez por semana para obtener predicciones precisas.</string>
@@ -142,12 +139,6 @@
     <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_highlight_title">Resaltado de elevación</string>
-    <string name="prefs_highlight_low">Baja &lt; %1$d°</string>
-    <string name="prefs_highlight_mid">Media %1$d-%2$d°</string>
-    <string name="prefs_highlight_high">Alta &gt; %1$d°</string>
 
     <string name="prefs_outro_title">Me gustaría dar las gracias a:</string>
     <string name="prefs_outro_license">La app viene sin garantías de ningún tipo.</string>

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

@@ -1,252 +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="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_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: Halaman status satelit AMSAT - tabel status langsung (warna resmi), jumlah laporan, laporan detail per satelit/hari
-        * Log dikelompokkan per lintasan satelit (sesi = satelit + waktu AOS), garis pemisah antar sesi
-        * GPS kini hanya menampilkan sukses saat posisi benar-benar didapat (timeout 15 dtk, cek izin)
-        * Pesan kegagalan jelas saat database satelit gagal diunduh
-        * Frekuensi log mengikuti panel Doppler secara real-time; visual hapus geser dipulihkan
-        * Perbaikan bahasa Indonesia (values-id)</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_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="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-rID/strings.xml

@@ -1,252 +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="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_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: Halaman status satelit AMSAT - tabel status langsung (warna resmi), jumlah laporan, laporan detail per satelit/hari
-        * Log dikelompokkan per lintasan satelit (sesi = satelit + waktu AOS), garis pemisah antar sesi
-        * GPS kini hanya menampilkan sukses saat posisi benar-benar didapat (timeout 15 dtk, cek izin)
-        * Pesan kegagalan jelas saat database satelit gagal diunduh
-        * Frekuensi log mengikuti panel Doppler secara real-time; visual hapus geser dipulihkan
-        * Perbaikan bahasa Indonesia (values-id)</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_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="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-in/strings.xml

@@ -1,252 +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="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_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: Halaman status satelit AMSAT - tabel status langsung (warna resmi), jumlah laporan, laporan detail per satelit/hari
-        * Log dikelompokkan per lintasan satelit (sesi = satelit + waktu AOS), garis pemisah antar sesi
-        * GPS kini hanya menampilkan sukses saat posisi benar-benar didapat (timeout 15 dtk, cek izin)
-        * Pesan kegagalan jelas saat database satelit gagal diunduh
-        * Frekuensi log mengikuti panel Doppler secara real-time; visual hapus geser dipulihkan
-        * Perbaikan bahasa Indonesia (values-id)</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_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="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

@@ -30,17 +30,14 @@
     <!-- Passes screen -->
     <string name="pass_filter_title">Фильтровать пролеты</string>
     <string name="pass_filter_elev">Минимальная элевация</string>
-    <string name="pass_filter_hours">Период расчёта</string>
-    <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_filter_hours">Количество часов</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">
         Убедитесь, что ваши фильтры настроены правильно и вы выбрали спутники</string>
     <string name="pass_error_message">Нет предстоящих пролётов спутников</string>
-    <string name="pass_welcome_title">Добро пожаловать в Look4Sat\!</string>
+    <string name="pass_welcome_title">Добро пожаловать в Look4Sat-CNMap\!</string>
     <string name="pass_welcome_message">
         Обязательно укажите свое местоположение по GPS, широте/долготе или QTH в настройках.
         \n\nПожалуйста, обновляйте базу данных как минимум раз в неделю, чтобы получать точные прогнозы.</string>
@@ -141,12 +138,6 @@
     <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">Я хотел бы сказать спасибо:</string>
     <string name="prefs_outro_license">Это ПО поставляется без гарантий.</string>

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

@@ -31,17 +31,14 @@
     <!-- Passes screen -->
     <string name="pass_filter_title">පසුකිරිම් පිරිපහදුව</string>
     <string name="pass_filter_elev">අවම උත්තෝලනය</string>
-    <string name="pass_filter_hours">ඉදිරි කාලය</string>
-    <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_filter_hours">ඉදිරි පැය</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_title">Look4Sat-CNMap වෙත සාදරයෙන් පිළිගනිමු\!</string>
     <string name="pass_welcome_message">
         සැකසුම් තුළ GPS, Lat/Lon හෝ QTH හරහා ඔබේ ස්ථානය සැකසීමට වග බලා ගන්න.
         \n\nනිවැරදි අනාවැකි ලබා ගැනීම සඳහා අවම වශයෙන් සතිපතා දත්ත සමුදාය යාවත්කාලීන කරන්න.</string>
@@ -142,12 +139,6 @@
     <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_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">මම ස්තුති කිරීමට කැමති:</string>
     <string name="prefs_outro_license">මෘදුකාංගය වගකීමක් සමග නොලැබේ</string>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Commmon -->
-    <string name="app_name" translatable="false">Look4Sat</string>
+    <string name="app_name" translatable="false">Look4Sat-CNMap</string>
     <string name="btn_accept">Kabul et</string>
     <string name="btn_cancel">İptal</string>
     <string name="empty_list_message">Gösterilecek veri bulunamadı</string>
@@ -10,22 +10,8 @@
     <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="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_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>
@@ -45,10 +31,7 @@
     <!-- Passes screen -->
     <string name="pass_filter_title">Geçişleri filtrele</string>
     <string name="pass_filter_elev">Minimum yükseklik açısı</string>
-    <string name="pass_filter_hours">Gösterilecek zaman</string>
-    <string name="pass_filter_aos_time">AOS aralığı</string>
-    <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_filter_hours">Gösterilecek saat aralığı</string>
     <string name="pass_time_placeholder" translatable="false"> -- : -- : -- </string>
     <string name="pass_modes_title">Modulasyon türü seçin</string>
     <string name="pass_satId" translatable="false">%05d</string>
@@ -59,18 +42,18 @@
     <string name="pass_empty_list_message">
         Filtrelerinizin doğru olduğundan ve uydu seçtiğinizden emin olun</string>
     <string name="pass_error_message">Gösterilecek yaklaşan uydu geçişi bulunmuyor</string>
-    <string name="pass_welcome_title">Look4Sat\'a hoş geldiniz\!</string>
+    <string name="pass_welcome_title">Look4Sat-CNMap\'a hoş geldiniz\!</string>
     <string name="pass_welcome_message">
         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 durum sayfası - canlı durum tablosu (resmi renkler), rapor sayıları, uydu/gün bazında detaylı raporlar
-        * Günlükler uydu geçişine göre gruplanır (oturum = uydu + AOS zamanı), oturumlar arasında ayırıcı çizgi
-        * GPS artık yalnızca gerçek konum alındığında başarı gösterir (15 sn zaman aşımı, izin kontrolü)
-        * Uydu veritabanı indirilemediğinde net hata mesajı gösterilir
-        * Günlük frekansları Doppler panelini gerçek zamanlı takip eder; kaydırarak silme görselleri düzeltildi
-        * Endonezya dili düzeltmesi (values-id)</string>
+    <string name="pass_whatsnew_title" translatable="false">What\'s new in Look4Sat-CNMap</string>
+    <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 -->
     <string name="radar_back">Geri</string>
@@ -101,7 +84,8 @@
     <!-- Map screen -->
     <string name="map_prev">Önceki</string>
     <string name="map_next">Sonraki</string>
-    <string name="map_copyright" translatable="false">© OpenStreetMap contributors</string>
+    <string name="map_copyright_osm" translatable="false">© OpenStreetMap contributors</string>
+    <string name="map_copyright_tianditu" translatable="false">© Tianditu</string>
     <string name="map_azimuth">Azimut: %.1f°</string>
     <string name="map_elevation">Yükseklik açısı: %.1f°</string>
     <string name="map_altitude">İrtifa: %.0f km</string>
@@ -117,12 +101,12 @@
     <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_url" translatable="false">https://play.google.com/store/apps/details?id=com.rtbishop.look4sat</string>
+    <string name="prefs_app_title" translatable="false">Look4Sat-CNMap v%s</string>
+    <string name="prefs_app_url" translatable="false">https://play.google.com/store/apps/details?id=cn.bh2vsq.look4sat</string>
     <string name="prefs_donate_title">Bağış yap</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_fdroid_url" translatable="false">https://f-droid.org/en/packages/cn.bh2vsq.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>
@@ -135,7 +119,7 @@
 
     <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>
@@ -151,17 +135,15 @@
     <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_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_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_net_output">Ağ</string>
@@ -196,69 +178,20 @@
     <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_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="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_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

@@ -30,18 +30,15 @@
 
     <!-- Passes screen -->
     <string name="pass_filter_title">Фільтр прольотів</string>
-    <string name="pass_filter_elev">Мінімальне піднесень</string>
-    <string name="pass_filter_hours">Час вперед</string>
-    <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_filter_elev">Мінімальне піднесення</string>
+    <string name="pass_filter_hours">Кількість годин</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">
         Переконайтеся, що ваші фільтри правильні, і ви вибрали супутники</string>
     <string name="pass_error_message">Немає майбутніх прольотів супутників</string>
-    <string name="pass_welcome_title">Ласкаво просимо до Look4Sat\!</string>
+    <string name="pass_welcome_title">Ласкаво просимо до Look4Sat-CNMap\!</string>
     <string name="pass_welcome_message">
         Обов’язково встановіть своє місцезнаходження за допомогою GPS, широти/довготи або QTH у налаштуваннях.
         \n\nБудь ласка, оновлюйте базу даних принаймні раз на тиждень, щоб отримувати точні прогнози.</string>
@@ -69,7 +66,7 @@
     <string name="map_prev">Попередній</string>
     <string name="map_next">Наступний</string>
     <string name="map_azimuth">Азимут: %.1f°</string>
-    <string name="map_elevation">Піднесень: %.1f°</string>
+    <string name="map_elevation">Піднесення: %.1f°</string>
     <string name="map_altitude">Висота: %.0f км</string>
     <string name="map_distance">Дистанція: %.0f км</string>
     <string name="map_latitude">Широта: %.1f°</string>
@@ -142,12 +139,6 @@
     <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">Я хотів би подякувати:</string>
     <string name="prefs_outro_license">Ця програма поставляється без жодних гарантій</string>

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

@@ -9,24 +9,8 @@
     <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="nav_more">更多</string>
-    <string name="nav_log">日志</string>
-    <string name="nav_amsat">AMSAT</string>
-    <string name="amsat_title">AMSAT 卫星状态</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>
@@ -42,25 +26,14 @@
     <!-- Passes screen -->
     <string name="pass_filter_title">筛选过境</string>
     <string name="pass_filter_elev">仰角值</string>
-    <string name="pass_filter_hours">提前时间</string>
-    <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_filter_hours">小时数</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_title">欢迎来到 Look4Sat-CNMap\!</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 卫星状态页 - 实时状态表格(官网配色)、报告数量、逐卫星/逐日详细报告
-        * 日志按场次分组(场次 = 卫星 + AOS 时间), 组间横线分隔
-        * GPS 真正定位成功才会提示成功(15 秒超时, 权限检查)
-        * 卫星数据库下载失败时有明确失败提示
-        * 日志频率实时跟随多普勒面板; 左滑删除视觉恢复
-        * 印尼语识别修复(values-id)</string>
 
     <!-- Radar screen -->
     <string name="radar_back">后退</string>
@@ -81,17 +54,6 @@
     <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>
     <string name="map_next">下一个</string>
@@ -117,7 +79,7 @@
 
     <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>
@@ -133,14 +95,10 @@
     <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>
@@ -149,7 +107,6 @@
     <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="prefs_net_rotator_switch">启用方位俯仰角输出</string>
@@ -169,80 +126,21 @@
     <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_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="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_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-CNMap</string>
     <string name="btn_accept">Accept</string>
     <string name="btn_cancel">Cancel</string>
     <string name="empty_list_message">No data to show</string>
@@ -10,24 +10,8 @@
     <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="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_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>
@@ -47,9 +31,7 @@
     <!-- Passes screen -->
     <string name="pass_filter_title">Filter passes</string>
     <string name="pass_filter_elev">Minimal elevation</string>
-    <string name="pass_filter_hours">Time ahead</string>
-    <string name="pass_filter_aos_time">AOS window</string>
-    <string name="pass_filter_invert_time">Invert AOS window</string>
+    <string name="pass_filter_hours">Hours ahead</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>
@@ -61,18 +43,15 @@
     <string name="pass_empty_list_message">
         Make sure your filters are correct and you have selected satellites</string>
     <string name="pass_error_message">There are no upcoming satellite passes to display</string>
-    <string name="pass_welcome_title">Welcome to Look4Sat\!</string>
+    <string name="pass_welcome_title">Welcome to Look4Sat-CNMap\!</string>
     <string name="pass_welcome_message">
         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 page - live status grid (official colors), report counts, detailed reports per satellite/day
-        * Log entries grouped by satellite pass (session ID = satellite + AOS time), divider lines between sessions
-        * GPS now only reports success when a real fix is acquired (15s timeout, permission check)
-        * Data update shows a clear failure message when the satellite database cannot be downloaded
-        * Log frequencies follow the Doppler panel in real time; swipe-to-delete visuals restored
-        * Indonesian locale fix (values-id)</string>
+    <string name="pass_whatsnew_title" translatable="false">What\'s new in Look4Sat-CNMap</string>
+    <string name="pass_whatsnew_message" translatable="false">
+        * Added required tweaks to support Android 17 (API 37)
+        \n\n* Added ACCESS_LOCAL_NETWORK permission check to support network data output
+    </string>
 
     <!-- Radar screen -->
     <string name="radar_back">Back</string>
@@ -99,21 +78,12 @@
     <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>
     <string name="map_next">Next</string>
-    <string name="map_copyright" translatable="false">© OpenStreetMap contributors</string>
+    <string name="map_copyright_osm" translatable="false">© OpenStreetMap contributors</string>
+    <string name="map_copyright_tianditu" translatable="false">© Tianditu</string>
     <string name="map_azimuth">Azimuth: %.1f°</string>
     <string name="map_elevation">Elevation: %.1f°</string>
     <string name="map_altitude">Altitude: %.0f km</string>
@@ -129,12 +99,12 @@
     <string name="map_visible">Visible</string>
 
     <!-- Settings screen -->
-    <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_app_title" translatable="false">Look4Sat-CNMap v%s</string>
+    <string name="prefs_app_url" translatable="false">https://play.google.com/store/apps/details?id=cn.bh2vsq.look4sat</string>
     <string name="prefs_donate_title">Donate</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_fdroid_url" translatable="false">https://f-droid.org/en/packages/cn.bh2vsq.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>
@@ -147,7 +117,7 @@
 
     <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>
@@ -163,25 +133,28 @@
     <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_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>
     <string name="prefs_bt_output">Bluetooth</string>
     <string name="prefs_cat_output">CAT</string>
 
+    <string name="prefs_map_title">Map settings</string>
+    <string name="prefs_map_source_osm" translatable="false">OSM</string>
+    <string name="prefs_map_source_tianditu_vector" translatable="false">天地图-矢量</string>
+    <string name="prefs_map_source_tianditu_image" translatable="false">天地图-影像</string>
+    <string name="prefs_map_tianditu_key" translatable="false">天地图密钥</string>
+    <string name="prefs_map_save_key">保存密钥</string>
+
     <!-- Radio Control -->
     <string name="nav_radiocontrol">Radio Control</string>
     <string name="rc_settings_title">CAT Radio Control</string>
@@ -210,60 +183,14 @@
     <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_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="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_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)
@@ -272,8 +199,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>
 

feature/cw/build.gradle.kts

@@ -1,38 +0,0 @@
-import com.android.build.api.dsl.LibraryExtension
-import com.android.build.api.variant.CanProduceConsumerProguardFiles
-
-plugins {
-    alias(libs.plugins.convention.featurePlugin)
-}
-
-android {
-    namespace = "com.rtbishop.look4sat.feature.cw"
-    compileOptions {
-        encoding = "UTF-8"
-    }
-    // 照搬 Morse Expert 1.15: native 解码器仅 armeabi-v7a
-    defaultConfig {
-        ndk {
-            abiFilters += listOf("armeabi-v7a")
-        }
-    }
-}
-
-// CW 类保持规则(JNI 按类名注册 + 照搬混淆类保逻辑), 由 app 的 R8 消费
-// AGP 9: consumer 规则走 variant 级 CanProduceConsumerProguardFiles
-androidComponents {
-    onVariants(selector().all()) { variant ->
-        (variant as? CanProduceConsumerProguardFiles)?.consumerProguardFiles?.add(
-            project.layout.projectDirectory.file("proguard-rules.pro")
-        )
-    }
-}
-
-dependencies {
-    implementation("androidx.constraintlayout:constraintlayout:2.2.1")
-}
-
-// 照搬的 Java 源码含中文注释, 强制 UTF-8 编译(compileOptions 在部分 AGP 版本不生效)
-tasks.withType<JavaCompile>().configureEach {
-    options.encoding = "UTF-8"
-}

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/B/RunnableC0001b.java

@@ -1,63 +0,0 @@
-package B;
-
-import android.text.SpannableStringBuilder;
-import com.ve3nea.morse_expert.DecodedTextView;
-import com.ve3nea.morse_expert.MainActivity;
-import H2.b;
-
-/**
- * 照搬自 Morse Expert 1.15 B.RunnableC0001b, 类名保持混淆原名。
- * R8 合并 Runnable 手术: 构造按 smali 真实签名 5 参 (Object,Object,int,int,boolean),
- * 字段 = i(Object)/h(Object)/g(int)/f(int); run() 仅保留 case 4(f==2 对应 pswitch_4:
- * 解码文本 UI 更新, H2.b 调用), 其余 case(权限/Intent/通知等库代码)已裁剪。
- * 注: jadx 4 参构造为错误还原, 已按 smali 修正。
- */
-public final class RunnableC0001b implements Runnable {
-    public final /* synthetic */ int f;
-
-    /* renamed from: g, reason: collision with root package name */
-    public final int g;
-
-    /* renamed from: h, reason: collision with root package name */
-    public final Object h;
-
-    /* renamed from: i, reason: collision with root package name */
-    public final Object i;
-
-    public /* synthetic */ RunnableC0001b(Object obj, Object obj2, int i4, int i5, boolean z) {
-        this.i = obj;
-        this.h = obj2;
-        this.g = i4;
-        this.f = i5;
-    }
-
-    @Override // java.lang.Runnable
-    public final void run() {
-        if (this.f == 2) {
-            MainActivity mainActivity = ((b) this.i).f620p;
-            if (mainActivity != null) {
-                SpannableStringBuilder spannableStringBuilder = (SpannableStringBuilder) this.h;
-                int i5 = this.g;
-                DecodedTextView decodedTextView = (DecodedTextView) mainActivity.f11035D.f11888g;
-                if (!decodedTextView.f11032n && !decodedTextView.f11033o.get()) {
-                    decodedTextView.beginBatchEdit();
-                    try {
-                        int length2 = decodedTextView.length();
-                        int min = Math.min(length2, i5);
-                        if (min > 0) {
-                            decodedTextView.getEditableText().delete(length2 - min, length2);
-                        }
-                        decodedTextView.q(spannableStringBuilder);
-                        decodedTextView.endBatchEdit();
-                        return;
-                    } catch (Throwable th) {
-                        decodedTextView.endBatchEdit();
-                        throw th;
-                    }
-                }
-                return;
-            }
-            return;
-        }
-    }
-}

feature/cw/src/main/java/B0/b.java

@@ -1,61 +0,0 @@
-package B0;
-
-import android.widget.TextView;
-import com.ve3nea.morse_expert.MainActivity;
-import com.ve3nea.morse_expert.ScaleView;
-import java.util.Locale;
-import d1.AbstractC1518b;
-
-/**
- * 照搬自 Morse Expert 1.15 B0.b, 类名保持混淆原名。
- * R8 合并 Runnable 手术: 构造按 smali 真实签名 (H2/b, String, [I) -> f=4;
- * 只保留 case 4(状态栏更新: dBFS/Hz/dB/WPM + ScaleView 频率标记, H2.b 调用),
- * 其余 case(WorkManager/动画等库代码)已裁剪。
- * r3 = scaleView.getHeight()(smali 证实, jadx 寄存器未展开)。
- */
-public final class b implements Runnable {
-    public final /* synthetic */ int f;
-
-    /* renamed from: g, reason: collision with root package name */
-    public final Object g;
-
-    /* renamed from: h, reason: collision with root package name */
-    public final Object h;
-
-    /* renamed from: i, reason: collision with root package name */
-    public final Object i;
-
-    public b(H2.b bVar, String str, int[] iArr) {
-        this.f = 4;
-        this.g = bVar;
-        this.h = iArr;
-        this.i = str;
-    }
-
-    @Override // java.lang.Runnable
-    public final void run() {
-        if (this.f == 4) {
-            MainActivity mainActivity = ((H2.b) this.g).f621q;
-            if (mainActivity != null) {
-                String str2 = (String) this.i;
-                int[] iArr = (int[]) this.h;
-                String concat;
-                String format = String.format(Locale.US, " %3d dBFS", Integer.valueOf(iArr[0]));
-                if (iArr[5] == 0) {
-                    concat = format.concat("  Idle    ");
-                } else {
-                    concat = format.concat(String.format(Locale.US, "    %4d Hz    %2d dB    %2d WPM    ", Integer.valueOf(iArr[1]), Integer.valueOf(iArr[2]), Integer.valueOf(iArr[3])));
-                }
-                ((TextView) mainActivity.f11035D.f11890i).setText(AbstractC1518b.e(concat, str2));
-                ScaleView scaleView = (ScaleView) mainActivity.f11035D.f11889h;
-                int i4 = iArr[1];
-                scaleView.f11041g = iArr[5];
-                // r3 = scaleView.getHeight()(smali 证实)
-                scaleView.f = (scaleView.getHeight() - 1) - Math.round(((Math.round(i4 * 0.128f) - H2.b.f606z) * scaleView.getHeight()) / H2.b.f603B);
-                scaleView.invalidate();
-                return;
-            }
-            return;
-        }
-    }
-}

feature/cw/src/main/java/D/n.java

@@ -1,69 +0,0 @@
-package D;
-
-import android.graphics.Bitmap;
-import android.opengl.GLES20;
-import android.opengl.GLUtils;
-import com.ve3nea.morse_expert.WaterfallSurfaceView;
-
-/**
- * 照搬自 Morse Expert 1.15, 类名保持混淆原名。
- * R8 合并 Runnable 手术: 只保留 case 1(瀑布图频谱->OpenGL 纹理, H2.b 调用),
- * 其余 case(库/广告)已裁剪。
- */
-public final /* synthetic */ class n implements Runnable {
-    public final /* synthetic */ int f;
-
-    /* renamed from: g, reason: collision with root package name */
-    public final /* synthetic */ Object f224g;
-
-    /* renamed from: h, reason: collision with root package name */
-    public final /* synthetic */ Object f225h;
-
-    public /* synthetic */ n(Object obj, int i4, Object obj2) {
-        this.f = i4;
-        this.f224g = obj;
-        this.f225h = obj2;
-    }
-
-    @Override // java.lang.Runnable
-    public final void run() {
-        int i4 = this.f;
-        Object obj = this.f225h;
-        Object obj2 = this.f224g;
-        if (i4 == 1) {
-            float[] fArr = (float[]) obj;
-            J2.b bVar = ((WaterfallSurfaceView) obj2).f;
-            Bitmap bitmap = bVar.f733h;
-            int width = bVar.f730d.getWidth();
-            double d4 = width;
-            double b4 = (bVar.b() + 4.0d) % d4;
-            double d5 = bVar.f737l - b4;
-            if (d5 > d4 / 2.0d) {
-                d5 -= d4;
-            } else if (d5 < (-width) / 2.0d) {
-                d5 += d4;
-            }
-            if (Math.abs(d5) > 8.0d) {
-                bVar.f737l = (int) Math.floor(b4);
-            } else {
-                bVar.f732g = (d5 * 1.0E-5d) + bVar.f732g;
-            }
-            int height = bitmap.getHeight() - 1;
-            for (int i5 = 0; i5 <= height; i5++) {
-                J2.a aVar = bVar.f734i;
-                int round = Math.round((fArr[i5] * 4.0f) + 30.0f);
-                aVar.getClass();
-                bitmap.setPixel(0, height - i5, aVar.f727a[Math.max(0, Math.min(255, round))]);
-            }
-            int i6 = bVar.f737l;
-            GLES20.glBindTexture(3553, bVar.f728a[0]);
-            J2.b.a();
-            GLUtils.texSubImage2D(3553, 0, i6, 0, bitmap);
-            J2.b.a();
-            int i7 = bVar.f737l + 1;
-            bVar.f737l = i7;
-            bVar.f737l = i7 % width;
-            return;
-        }
-    }
-}

feature/cw/src/main/java/E2/g.java

@@ -1,44 +0,0 @@
-package E2;
-
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
-import com.ve3nea.morse_expert.MainActivity;
-import com.ve3nea.morse_expert.ScaleView;
-
-/**
- * 照搬自 Morse Expert 1.15 (com.ve3nea.morse_expert), 类名保持混淆原名。
- * R8 合并类手术: 只保留 case 1(瀑布图触摸选频率=应用逻辑),
- * 其余 case(广告 P4 / appcompat 焦点 / 弹窗)为库代码, 已裁剪。
- */
-public final class g implements View.OnTouchListener {
-    public final /* synthetic */ int f;
-
-    /* renamed from: g, reason: collision with root package name */
-    public final /* synthetic */ Object f411g;
-
-    public /* synthetic */ g(Object obj, int i4) {
-        this.f = i4;
-        this.f411g = obj;
-    }
-
-    @Override // android.view.View.OnTouchListener
-    public final boolean onTouch(View view, MotionEvent motionEvent) {
-        int i4 = this.f;
-        Object obj = this.f411g;
-        if (i4 == 1) {
-            MainActivity mainActivity = (MainActivity) obj;
-            if (motionEvent.getActionMasked() == 0 && mainActivity.f11037F != null) {
-                // smali 证实: p1 先被重赋值为 f11035D.h(ScaleView)再 getHeight;
-                // 公式 = round((f606z + ((scaleH-1-y)*f603B/scaleH)) / 0.128f)
-                ScaleView scaleView = (ScaleView) mainActivity.f11035D.f11889h;
-                float y3 = motionEvent.getY();
-                int round = Math.round((H2.b.f606z + ((((scaleView.getHeight() - 1) - y3) * H2.b.f603B) / scaleView.getHeight())) / 0.128f);
-                mainActivity.f11037F.f622r.set(round);
-                Log.i("Waterfall", String.format("Touch at %d Hz`", Integer.valueOf(round)));
-            }
-            return false;
-        }
-        return false;
-    }
-}

feature/cw/src/main/java/F2/a.java

@@ -1,53 +0,0 @@
-package F2;
-
-import com.rtbishop.look4sat.feature.cw.R;
-import android.view.ActionMode;
-import android.view.Menu;
-import android.view.MenuItem;
-import com.ve3nea.morse_expert.DecodedTextView;
-
-/* loaded from: classes.dex */
-public final class a implements ActionMode.Callback {
-
-    /* renamed from: a, reason: collision with root package name */
-    public final /* synthetic */ DecodedTextView f564a;
-
-    public a(DecodedTextView decodedTextView) {
-        this.f564a = decodedTextView;
-    }
-
-    @Override // android.view.ActionMode.Callback
-    public final boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) {
-        int itemId = menuItem.getItemId();
-        DecodedTextView decodedTextView = this.f564a;
-        if (itemId != 73) {
-            if (itemId != 74) {
-                return false;
-            }
-            decodedTextView.s();
-            return true;
-        }
-        decodedTextView.r();
-        actionMode.finish();
-        return true;
-    }
-
-    @Override // android.view.ActionMode.Callback
-    public final boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
-        this.f564a.f11032n = true;
-        // 原: if (menu.findItem(R.id.shareText) == null) 检查(shareText 为原 APK 资源, 简化后始终添加)
-        menu.add(0, 74, 0, "Share").setIcon(R.drawable.ic_baseline_share_24);
-        menu.add(0, 73, 0, "Save").setIcon(R.drawable.ic_baseline_save_24);
-        return true;
-    }
-
-    @Override // android.view.ActionMode.Callback
-    public final void onDestroyActionMode(ActionMode actionMode) {
-        this.f564a.f11032n = false;
-    }
-
-    @Override // android.view.ActionMode.Callback
-    public final boolean onPrepareActionMode(ActionMode actionMode, Menu menu) {
-        return false;
-    }
-}

feature/cw/src/main/java/H2/a.java

@@ -1,82 +0,0 @@
-package H2;
-
-import android.media.AudioRecord;
-import android.util.Log;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/* loaded from: classes.dex */
-public final class a implements Runnable {
-    public final int f;
-
-    /* renamed from: g, reason: collision with root package name */
-    public final AudioRecord f596g;
-
-    /* renamed from: h, reason: collision with root package name */
-    public final ExecutorService f597h;
-
-    /* renamed from: i, reason: collision with root package name */
-    public final AtomicBoolean f598i;
-
-    /* renamed from: j, reason: collision with root package name */
-    public final short[] f599j;
-
-    /* renamed from: k, reason: collision with root package name */
-    public final float[] f600k;
-
-    /* renamed from: l, reason: collision with root package name */
-    public b f601l;
-
-    public a() {
-        int minBufferSize = AudioRecord.getMinBufferSize(8000, 16, 2);
-        int i4 = b.f604C;
-        this.f = i4;
-        ExecutorService newSingleThreadExecutor = Executors.newSingleThreadExecutor();
-        this.f597h = newSingleThreadExecutor;
-        AtomicBoolean atomicBoolean = new AtomicBoolean(false);
-        this.f598i = atomicBoolean;
-        this.f599j = new short[i4];
-        this.f600k = new float[i4];
-        AudioRecord audioRecord = new AudioRecord(1, 8000, 16, 2, minBufferSize * 4);
-        this.f596g = audioRecord;
-        if (audioRecord.getState() == 1) {
-            audioRecord.startRecording();
-            if (audioRecord.getState() != 1) {
-                Log.e("AudioRecord", "cannot start");
-            }
-            atomicBoolean.set(true);
-            newSingleThreadExecutor.execute(this);
-            return;
-        }
-        Log.e("AudioInput", "Failed to initialize");
-    }
-
-    @Override // java.lang.Runnable
-    public final void run() {
-        while (true) {
-            try {
-                if (this.f598i.get()) {
-                    float[] fArr = this.f600k;
-                    AudioRecord audioRecord = this.f596g;
-                    short[] sArr = this.f599j;
-                    int i4 = this.f;
-                    if (audioRecord.read(sArr, 0, i4) == i4) {
-                        for (int i5 = 0; i5 < i4; i5++) {
-                            fArr[i5] = sArr[i5] / 32768.0f;
-                        }
-                        b bVar = this.f601l;
-                        if (bVar != null) {
-                            bVar.a(fArr);
-                        }
-                    }
-                } else {
-                    TimeUnit.MILLISECONDS.sleep(100L);
-                }
-            } catch (Exception e4) {
-                Log.e("Audio thread", "Exception: ", e4);
-            }
-        }
-    }
-}

feature/cw/src/main/java/H2/b.java

@@ -1,582 +0,0 @@
-package H2;
-
-import B.RunnableC0001b;
-import D.n;
-import android.content.Context;
-import android.media.MediaScannerConnection;
-import android.os.Handler;
-import android.os.Looper;
-import android.text.SpannableStringBuilder;
-import android.text.format.DateFormat;
-import android.text.style.ForegroundColorSpan;
-import android.util.Log;
-import com.ve3nea.morse_expert.MainActivity;
-import com.ve3nea.morse_expert.WaterfallSurfaceView;
-import i3.d;
-import java.io.BufferedOutputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import k3.s;
-import pas.decoder;
-import pas.nativedecoder;
-
-/* loaded from: classes.dex */
-public final class b {
-
-    /* renamed from: A, reason: collision with root package name */
-    public static final int f602A;
-
-    /* renamed from: B, reason: collision with root package name */
-    public static final int f603B;
-
-    /* renamed from: C, reason: collision with root package name */
-    public static final int f604C;
-
-    /* renamed from: D, reason: collision with root package name */
-    public static final d f605D;
-
-    /* renamed from: z, reason: collision with root package name */
-    public static final int f606z;
-
-    /* renamed from: a, reason: collision with root package name */
-    public final float[] f607a;
-
-    /* renamed from: b, reason: collision with root package name */
-    public final float[] f608b;
-    public final float[] c;
-
-    /* renamed from: d, reason: collision with root package name */
-    public final float[] f609d;
-
-    /* renamed from: e, reason: collision with root package name */
-    public final nativedecoder.TNativeDecoder f610e;
-    public int f;
-
-    /* renamed from: g, reason: collision with root package name */
-    public int f611g;
-
-    /* renamed from: h, reason: collision with root package name */
-    public int f612h;
-
-    /* renamed from: i, reason: collision with root package name */
-    public decoder.TDecoderState f613i;
-
-    /* renamed from: j, reason: collision with root package name */
-    public String f614j;
-
-    /* renamed from: k, reason: collision with root package name */
-    public final c f615k;
-
-    /* renamed from: l, reason: collision with root package name */
-    public int f616l;
-
-    /* renamed from: m, reason: collision with root package name */
-    public final I2.b f617m;
-
-    /* renamed from: n, reason: collision with root package name */
-    public final Handler f618n;
-
-    /* renamed from: o, reason: collision with root package name */
-    public WaterfallSurfaceView f619o;
-
-    /* renamed from: p, reason: collision with root package name */
-    public MainActivity f620p;
-
-    /* renamed from: q, reason: collision with root package name */
-    public MainActivity f621q;
-
-    /* renamed from: r, reason: collision with root package name */
-    public final AtomicInteger f622r;
-
-    /* renamed from: s, reason: collision with root package name */
-    public final AtomicBoolean f623s;
-
-    /* renamed from: t, reason: collision with root package name */
-    public final Context f624t;
-
-    /* renamed from: u, reason: collision with root package name */
-    public int f625u;
-
-    /* renamed from: v, reason: collision with root package name */
-    public final AtomicBoolean f626v;
-
-    /* renamed from: w, reason: collision with root package name */
-    public DataOutputStream f627w;
-
-    /* renamed from: x, reason: collision with root package name */
-    public int f628x;
-
-    /* renamed from: y, reason: collision with root package name */
-    public String f629y;
-
-    /* JADX WARN: Removed duplicated region for block: B:14:0x012d  */
-    /* JADX WARN: Type inference failed for: r0v4, types: [i3.d, java.lang.Object] */
-    static {
-        boolean z3;
-        float f;
-        float f4;
-        float f5;
-        int round = Math.round(25.6f);
-        f606z = round;
-        int round2 = Math.round(153.6f);
-        f602A = round2;
-        f603B = round2 - round;
-        f604C = Math.round(85.333336f);
-        i3.d obj = new i3.d();
-        if (2048 > 1073741824) {
-            z3 = true;
-        } else {
-            z3 = false;
-        }
-        obj.f11709l = z3;
-        int i4 = (int) 1024;
-        obj.f11700a = i4;
-        obj.f11701b = 1024L;
-        if (!z3) {
-            obj.f11708k = 1;
-            int[] iArr = new int[((int) g3.c.a((1 << (((int) (g3.c.d(((float) 1024) + 0.5f) / g3.c.d(2.0d))) / 2)) + 2)) + 2];
-            obj.c = iArr;
-            float[] fArr = new float[i4];
-            obj.f11703e = fArr;
-            int i5 = (i4 * 2) >> 2;
-            obj.f11704g = i5;
-            iArr[0] = i5;
-            iArr[1] = 1;
-            if (i5 > 2) {
-                int i6 = i5 >> 1;
-                float f6 = 0.7853982f / i6;
-                float f7 = 2.0f * f6;
-                float b4 = (float) g3.c.b(i6 * f6);  // r9 = i6 (smali)
-                fArr[0] = 1.0f;
-                fArr[1] = b4;
-                if (i6 == 4) {
-                    double d4 = f7;
-                    f4 = 0.5f;
-                    fArr[2] = (float) g3.c.b(d4);
-                    fArr[3] = (float) g3.c.f(d4);
-                } else {
-                    f4 = 0.5f;
-                    if (i6 > 4) {
-                        iArr[2] = 0;
-                        iArr[3] = 16;
-                        int i7 = i5;
-                        int i8 = 2;
-                        f5 = 1.0f;
-                        while (i7 > 32) {
-                            int i9 = i8 << 1;
-                            int i10 = i8 << 4;
-                            for (int i11 = i8; i11 < i9; i11++) {
-                                int i12 = iArr[i11] << 2;
-                                iArr[i8 + i11] = i12;
-                                iArr[i9 + i11] = i12 + i10;
-                            }
-                            i7 >>= 2;
-                            i8 = i9;
-                        }
-                        fArr[2] = 0.5f / ((float) g3.c.b(f7));
-                        fArr[3] = 0.5f / ((float) g3.c.b(6.0f * f6));
-                        for (int i13 = 4; i13 < i6; i13 += 4) {
-                            float f8 = i13 * f6;
-                            double d5 = f8;
-                            fArr[i13] = (float) g3.c.b(d5);
-                            fArr[i13 + 1] = (float) g3.c.f(d5);
-                            double d6 = 3.0f * f8;
-                            fArr[i13 + 2] = (float) g3.c.b(d6);
-                            fArr[i13 + 3] = -((float) g3.c.f(d6));
-                        }
-                        int i14 = 0;
-                        while (i6 > 2) {
-                            int i15 = i14 + i6;
-                            i6 >>= 1;
-                            fArr[i15] = f5;
-                            fArr[i15 + 1] = b4;
-                            if (i6 == 4) {
-                                float f9 = fArr[i14 + 4];
-                                float f10 = fArr[i14 + 5];
-                                fArr[i15 + 2] = f9;
-                                fArr[i15 + 3] = f10;
-                            } else if (i6 > 4) {
-                                float f11 = fArr[i14 + 4];
-                                float f12 = fArr[i14 + 6];
-                                fArr[i15 + 2] = f4 / f11;
-                                fArr[i15 + 3] = f4 / f12;
-                                for (int i16 = 4; i16 < i6; i16 += 4) {
-                                    int i17 = (i16 * 2) + i14;
-                                    int i18 = i15 + i16;
-                                    float f13 = fArr[i17];
-                                    float f14 = fArr[i17 + 1];
-                                    float f15 = fArr[i17 + 2];
-                                    float f16 = fArr[i17 + 3];
-                                    fArr[i18] = f13;
-                                    fArr[i18 + 1] = f14;
-                                    fArr[i18 + 2] = f15;
-                                    fArr[i18 + 3] = f16;
-                                }
-                            }
-                            i14 = i15;
-                        }
-                    }
-                }
-                f5 = 1.0f;
-                int i142 = 0;
-                while (i6 > 2) {
-                }
-            }
-            int i19 = i4 >> 2;
-            obj.f11706i = i19;
-            iArr[1] = i19;
-            if (i19 > 1) {
-                int i20 = i19 >> 1;
-                float f17 = 0.7853982f / i20;
-                float b5 = (float) g3.c.b(i20 * f17);  // r6 = i20 (smali)
-                fArr[i5] = b5;
-                fArr[i5 + i20] = b5 * 0.5f;
-                for (int i21 = 1; i21 < i20; i21++) {
-                    double d7 = i21 * f17;
-                    fArr[i5 + i21] = ((float) g3.c.b(d7)) * 0.5f;
-                    fArr[(i5 + i19) - i21] = ((float) g3.c.f(d7)) * 0.5f;
-                }
-            }
-        } else {
-            obj.f11708k = 1;
-            s sVar = new s(((long) g3.c.a((1 << ((int) (((long) (g3.c.d(((float) 1024) + 0.5f) / g3.c.d(2.0d))) / 2))) + 2)) + 2, true);
-            obj.f11702d = sVar;
-            k3.d dVar = new k3.d(1024L, true);
-            obj.f = dVar;
-            obj.f11705h = 512L;
-            sVar.c(0L, 512L);
-            sVar.c(1L, 1L);
-            if (512 > 2) {
-                long j4 = 512 >> 1;
-                float f18 = 0.7853982f / ((float) j4);
-                float f19 = f18 * 2.0f;
-                float b6 = (float) g3.c.b(j4 * f18);  // r14 = j4 (smali 同模式)
-                dVar.c(0L, 1.0f);
-                dVar.c(1L, b6);
-                if (j4 == 4) {
-                    f = 0.5f;
-                    double d8 = f19;
-                    dVar.c(2L, (float) g3.c.b(d8));
-                    dVar.c(3L, (float) g3.c.f(d8));
-                } else {
-                    f = 0.5f;
-                    if (j4 > 4) {
-                        sVar.c(2L, 0L);
-                        sVar.c(3L, 16L);
-                        long j5 = 2;
-                        long j6 = 512;
-                        while (j6 > 32) {
-                            long j7 = j5 << 1;
-                            long j8 = j5 << 4;
-                            long j9 = j5;
-                            while (j9 < j7) {
-                                long b7 = sVar.b(j9) << 2;
-                                sVar.c(j5 + j9, b7);
-                                sVar.c(j7 + j9, b7 + j8);
-                                j9++;
-                                f19 = f19;
-                            }
-                            j6 >>= 2;
-                            j5 = j7;
-                        }
-                        dVar.c(2L, 0.5f / ((float) g3.c.b(f19)));
-                        dVar.c(3L, 0.5f / ((float) g3.c.b(6.0f * f18)));
-                        long j10 = 4;
-                        while (j10 < j4) {
-                            float f20 = ((float) j10) * f18;
-                            double d9 = f20;
-                            dVar.c(j10, (float) g3.c.b(d9));
-                            dVar.c(j10 + 1, (float) g3.c.f(d9));
-                            double d10 = 3.0f * f20;
-                            long j11 = j10;
-                            dVar.c(j10 + 2, (float) g3.c.b(d10));
-                            dVar.c(j11 + 3, -((float) g3.c.f(d10)));
-                            j10 = j11 + 4;
-                        }
-                    }
-                }
-                long j12 = 0;
-                long j13 = 2;
-                while (j4 > j13) {
-                    long j14 = j12 + j4;
-                    j4 >>= 1;
-                    dVar.c(j14, 1.0f);
-                    dVar.c(j14 + 1, b6);
-                    if (j4 == 4) {
-                        float b8 = dVar.b(j12 + 4);
-                        float b9 = dVar.b(j12 + 5);
-                        j13 = 2;
-                        dVar.c(j14 + 2, b8);
-                        dVar.c(j14 + 3, b9);
-                    } else {
-                        j13 = 2;
-                        if (j4 > 4) {
-                            float b10 = dVar.b(j12 + 4);
-                            float b11 = dVar.b(6 + j12);
-                            dVar.c(j14 + 2, f / b10);
-                            dVar.c(j14 + 3, f / b11);
-                            long j15 = 4;
-                            while (j15 < j4) {
-                                long j16 = (j15 * 2) + j12;
-                                float f21 = b6;
-                                long j17 = j14 + j15;
-                                long j18 = j12;
-                                float b12 = dVar.b(j16);
-                                long j19 = j14;
-                                float b13 = dVar.b(j16 + 1);
-                                float b14 = dVar.b(j16 + 2);
-                                float b15 = dVar.b(j16 + 3);
-                                dVar.c(j17, b12);
-                                dVar.c(j17 + 1, b13);
-                                dVar.c(j17 + 2, b14);
-                                dVar.c(j17 + 3, b15);
-                                j15 += 4;
-                                b6 = f21;
-                                j12 = j18;
-                                j14 = j19;
-                            }
-                        }
-                    }
-                    b6 = b6;
-                    j12 = j14;
-                }
-            }
-            long j20 = 256;
-            obj.f11707j = 256L;
-            long j21 = 1;
-            sVar.c(1L, 256L);
-            if (256 > 1) {
-                long j22 = 256 >> 1;
-                float f22 = 0.7853982f / ((float) j22);
-                long j23 = 512;
-                dVar.c(512L, (float) g3.c.b(j22 * f22));  // r1 = j22 (smali)
-                dVar.c(512 + j22, dVar.b(512L) * 0.5f);
-                long j24 = 1;
-                while (j24 < j22) {
-                    long j25 = j20;
-                    long j26 = j21;
-                    double d11 = ((float) j24) * f22;
-                    long j27 = j23;
-                    dVar.c(j23 + j24, ((float) g3.c.b(d11)) * 0.5f);
-                    dVar.c((j27 + j25) - j24, ((float) g3.c.f(d11)) * 0.5f);
-                    j24 += j26;
-                    j20 = j25;
-                    j21 = j26;
-                    j23 = j27;
-                }
-            }
-        }
-        f605D = obj;
-    }
-
-    public b(Context context) {
-        float[] fArr = new float[1024];
-        fArr[512] = 1.0f;
-        for (int i4 = 1; i4 < 512; i4++) {
-            double d4 = (i4 * 6.283185307179586d) / 1024;
-            float cos = (float) ((Math.cos(d4 * 2.0d) * 0.08d) + (0.42d - (Math.cos(d4) * 0.5d)));
-            fArr[i4] = cos;
-            double d5 = 0.003125f * 6.283185307179586d * (i4 - 512);
-            float sin = (float) ((Math.sin(d5) / d5) * cos);
-            fArr[i4] = sin;
-            fArr[1024 - i4] = sin;
-        }
-        this.f607a = fArr;
-        this.f608b = new float[1024];
-        this.c = new float[1024];
-        this.f609d = new float[f603B];
-        this.f610e = nativedecoder.TNativeDecoder.Create();
-        this.f614j = "";
-        this.f615k = new c(4000, 0);
-        I2.b bVar = new I2.b();
-        this.f617m = bVar;
-        this.f618n = new Handler(Looper.getMainLooper());
-        this.f622r = new AtomicInteger();
-        this.f623s = new AtomicBoolean(false);
-        this.f625u = 0;
-        this.f626v = new AtomicBoolean(false);
-        this.f628x = 0;
-        this.f624t = context;
-        bVar.b(context);
-    }
-
-    /* JADX WARN: Removed duplicated region for block: B:57:0x01e2  */
-    /* JADX WARN: Removed duplicated region for block: B:63:0x020a A[LOOP:6: B:62:0x0208->B:63:0x020a, LOOP_END] */
-    /* JADX WARN: Removed duplicated region for block: B:66:0x0216 A[LOOP:7: B:65:0x0214->B:66:0x0216, LOOP_END] */
-    /* JADX WARN: Removed duplicated region for block: B:70:0x0232  */
-    /* JADX WARN: Removed duplicated region for block: B:73:? A[RETURN, SYNTHETIC] */
-    /*
-        Code decompiled incorrectly, please refer to instructions dump.
-    */
-    public final void a(float[] fArr) {
-        c cVar;
-        float[] fArr2;
-        float[] fArr3;
-        b bVar;
-        Exception exc;
-        int i4;
-        float f;
-        int i5;
-        WaterfallSurfaceView waterfallSurfaceView;
-        int length = fArr.length;
-        int i6 = 0;
-        while (true) {
-            cVar = this.f615k;
-            if (i6 >= length) {
-                break;
-            }
-            cVar.c(Math.abs(fArr[i6]));
-            i6++;
-        }
-        this.f616l = Math.round(((float) Math.log10(Math.max(-0.5d, cVar.f633e))) * 20.0f);
-        int i7 = f604C;
-        int i8 = 1024 - i7;
-        float[] fArr4 = this.f608b;
-        System.arraycopy(fArr4, i7, fArr4, 0, i8);
-        System.arraycopy(fArr, 0, fArr4, i8, i7);
-        int i9 = 0;
-        while (true) {
-            fArr2 = this.c;
-            if (i9 >= 1024) {
-                break;
-            }
-            fArr2[i9] = fArr4[i9] * this.f607a[i9];
-            i9++;
-        }
-        f605D.k(fArr2, 0);
-        int i10 = f606z;
-        int i11 = i10;
-        while (true) {
-            int i12 = f602A;
-            float f4 = 0.0f;
-            fArr3 = this.f609d;
-            if (i11 < i12) {
-                int i13 = i11 * 2;
-                float f5 = fArr2[i13];
-                float f6 = fArr2[i13 + 1];
-                float f7 = ((f6 * f6) + (f5 * f5)) * 0.001f;
-                if (!Float.isNaN(f7)) {
-                    f4 = f7;
-                }
-                fArr3[i11 - i10] = f4;
-                i11++;
-            } else {
-                // smali: 循环内无 try; 录音写入 try 在循环后(见下)
-                break;
-            }
-        }
-        DataOutputStream dataOutputStream = this.f627w;
-        Context context = this.f624t;
-        AtomicBoolean atomicBoolean = this.f626v;
-        try { // smali try_start_0: 录音写入整块(原 jadx 误把 try 放 break 处)
-            if (dataOutputStream == null && atomicBoolean.get()) {
-                File file = new File(context.getExternalFilesDir(null), ((String) DateFormat.format("yyyy-MM-dd_HH_mm_ss", new Date())) + "_spectra.bin");
-                this.f629y = file.getAbsoluteFile().toString();
-                this.f627w = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file, false)));
-                this.f628x = 0;
-                this.f614j = " Recording...";
-            }
-            if (this.f627w != null) {
-                for (float f8 : fArr3) {
-                    this.f627w.writeFloat(f8);
-                }
-            }
-            if (atomicBoolean.get()) {
-                int i14 = this.f628x + 1;
-                this.f628x = i14;
-                if (i14 >= 2048) {
-                    atomicBoolean.set(false);
-                    this.f627w.close();
-                    this.f627w = null;
-                    this.f614j = "";
-                    MediaScannerConnection.scanFile(context, new String[]{this.f629y}, new String[]{"application/x-binary"}, null);
-                }
-            }
-        } catch (IOException e4) {
-            Log.e("File write", "Exception: ", e4);
-        }
-        nativedecoder.TNativeDecoder tNativeDecoder = this.f610e;
-        try {
-            this.f613i = tNativeDecoder.ProcessSpectrum(fArr3);
-            int i15 = this.f625u + 1;
-            this.f625u = i15;
-            Handler handler = this.f618n;
-            if (i15 == 15) {
-                try {
-                    this.f625u = 0;
-                    this.f = tNativeDecoder.getPitch();
-                    this.f611g = tNativeDecoder.getSnr();
-                    this.f612h = tNativeDecoder.getWpm();
-                    handler.post(new B0.b(this, this.f614j, new int[]{this.f616l, this.f, this.f611g, this.f612h, tNativeDecoder.getSignalCount(), this.f613i.Value}));
-                    AtomicInteger atomicInteger = this.f622r;
-                    int i16 = atomicInteger.get();
-                    if (i16 != 0) {
-                        tNativeDecoder.LockToPitch(i16);
-                        atomicInteger.set(0);
-                    }
-                    tNativeDecoder.setHamMode(this.f623s.get());
-                } catch (Exception e5) {
-                    // jadx 幻觉区(空循环/空 if 为 catch 错位还原)已裁剪; 原 smali: 记录异常后跳回正常流程尾部
-                    exc = e5;
-                    bVar = this;
-                    Log.e("Audio Processor", "Exception", exc);
-                }
-            }
-            int charCount = tNativeDecoder.getCharCount();
-            if (charCount > 0) {
-                SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder();
-                int i18 = 0;
-                while (i18 < charCount) {
-                    decoder.TCharInfo GetChar = tNativeDecoder.GetChar(i18);
-                    spannableStringBuilder.append(GetChar.getChar());
-                    ForegroundColorSpan foregroundColorSpan = new ForegroundColorSpan(this.f617m.a(GetChar));
-                    int i19 = i18 + 1;
-                    spannableStringBuilder.setSpan(foregroundColorSpan, i18, i19, 33);
-                    i18 = i19;
-                }
-                bVar = this;
-                try {
-                    handler.post(new RunnableC0001b(bVar, spannableStringBuilder, tNativeDecoder.getDeleteCount(), 2, false));
-                } catch (Exception e6) {
-                    // jadx 幻觉区已裁剪(同 catch e5); 原 smali: 记录异常后跳回正常流程尾部
-                    exc = e6;
-                    Log.e("Audio Processor", "Exception", exc);
-                }
-            } else {
-                bVar = this;
-            }
-        } catch (Exception e7) {
-            // jadx 幻觉(e 变量)已裁剪
-            bVar = this;
-        }
-        i4 = f603B;
-        int i1722 = i4 / 2;
-        float[] copyOfRange22 = Arrays.copyOfRange(fArr3, i1722 - 20, i1722 + 20);
-        Arrays.sort(copyOfRange22);
-        f = copyOfRange22[20];
-        if (f > 0.0f) {
-            for (int i20 = 0; i20 < i4; i20++) {
-                fArr3[i20] = fArr3[i20] / f;
-            }
-        }
-        float[] fArr522 = (float[]) fArr3.clone();
-        new c(12, 1).a(fArr522);
-        new c(12, 0).a(fArr522);
-        for (i5 = 0; i5 < i4; i5++) {
-            fArr3[i5] = fArr3[i5] - fArr522[i5];
-        }
-        for (int i21 = 0; i21 < i4; i21++) {
-            fArr3[i21] = ((float) Math.log10(Math.max(-0.5d, fArr3[i21]) + 1.0d)) * 10.0f;
-        }
-        waterfallSurfaceView = bVar.f619o;
-        if (waterfallSurfaceView != null) {
-            waterfallSurfaceView.queueEvent(new n(waterfallSurfaceView, 1, (float[]) fArr3.clone()));
-        }
-    }
-}

feature/cw/src/main/java/H2/c.java

@@ -1,89 +0,0 @@
-package H2;
-
-/* loaded from: classes.dex */
-public final class c {
-
-    /* renamed from: a, reason: collision with root package name */
-    public final int f630a;
-
-    /* renamed from: b, reason: collision with root package name */
-    public float[] f631b;
-    public int c;
-
-    /* renamed from: d, reason: collision with root package name */
-    public float f632d;
-
-    /* renamed from: e, reason: collision with root package name */
-    public float f633e;
-    public final /* synthetic */ int f;
-
-    public c(int i4, int i5) {
-        this.f = i5;
-        this.f630a = i4 - 1;
-    }
-
-    public final void a(float[] fArr) {
-        int i4 = this.f630a / 2;
-        int length = fArr.length;
-        if (length > i4) {
-            this.f631b = null;
-            for (int i5 = 0; i5 < i4; i5++) {
-                c(fArr[i5]);
-            }
-            for (int i6 = i4; i6 < length; i6++) {
-                fArr[i6 - i4] = c(fArr[i6]);
-            }
-            for (int i7 = length; i7 < length + i4; i7++) {
-                fArr[i7 - i4] = c(fArr[length - 1]);
-            }
-            return;
-        }
-        throw new IllegalArgumentException("Sliding Filter error: input too short");
-    }
-
-    public final float b(float f, float f4) {
-        switch (this.f) {
-            case 0:
-                return Math.max(f, f4);
-            default:
-                return Math.min(f, f4);
-        }
-    }
-
-    public final float c(float f) {
-        float[] fArr = this.f631b;
-        int i4 = this.f630a;
-        if (fArr == null) {
-            this.f631b = new float[i4];
-            for (int i5 = 0; i5 < i4; i5++) {
-                this.f631b[i5] = f;
-            }
-            this.f632d = f;
-            return f;
-        }
-        float b4 = b(this.f632d, f);
-        this.f632d = b4;
-        this.f633e = b(this.f631b[this.c], b4);
-        float[] fArr2 = this.f631b;
-        int i6 = this.c;
-        int i7 = i6 + 1;
-        this.c = i7;
-        fArr2[i6] = f;
-        if (i7 == i4) {
-            int length = fArr2.length;
-            while (true) {
-                this.c = length - 1;
-                int i8 = this.c;
-                if (i8 <= 0) {
-                    break;
-                }
-                float[] fArr3 = this.f631b;
-                fArr3[i8 - 1] = b(fArr3[i8 - 1], fArr3[i8]);
-                length = this.c;
-            }
-            this.c = 0;
-            this.f632d = f;
-        }
-        return this.f633e;
-    }
-}

feature/cw/src/main/java/I0/d.java

@@ -1,42 +0,0 @@
-package I0;
-
-/**
- * 照搬自 Morse Expert 1.15 I0.d, 类名保持混淆原名。
- * R8 合并类手术: 只保留 (i3.d, int, int, float[]) FFT 任务构造;
- * run() 按 smali 原样还原: R8 已将任务体优化为死代码(aget 后 throw null,
- * 永不执行), 保留原语义(行为与原 APK 完全一致)。
- * SystemForegroundService(work 库)case 已裁剪。
- */
-public final class d implements Runnable {
-    public final /* synthetic */ int f = 0;
-
-    /* renamed from: g, reason: collision with root package name */
-    public final /* synthetic */ int f653g;
-
-    /* renamed from: h, reason: collision with root package name */
-    public final /* synthetic */ int f654h;
-
-    /* renamed from: i, reason: collision with root package name */
-    public final /* synthetic */ Object f655i;
-
-    /* renamed from: j, reason: collision with root package name */
-    public final /* synthetic */ Object f656j;
-
-    public d(i3.d dVar, int i4, int i5, float[] fArr) {
-        this.f656j = dVar;
-        this.f653g = i4;
-        this.f654h = i5;
-        this.f655i = fArr;
-    }
-
-    @Override // java.lang.Runnable
-    public final void run() {
-        int i6 = this.f654h;
-        int i7 = this.f653g;
-        if (i7 >= i6) {
-            return;
-        }
-        float f = ((float[]) this.f655i)[i7 * 2];
-        // R8 原代码: aget 后 throw null(死代码, 永不执行) —— 照搬语义, 不执行任何计算
-    }
-}

feature/cw/src/main/java/I2/b.java

@@ -1,73 +0,0 @@
-package I2;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import pas.decoder;
-
-/* loaded from: classes.dex */
-public final class b {
-
-    /* renamed from: b, reason: collision with root package name */
-    public static final String[] f663b = {"bg_color", "text_color", "text_color_weak", "call_color", "call_color_weak", "cq_color", "cq_color_weak", "rst_color", "rst_color_weak"};
-    public static final String[] c = {"Background color", "Text color", "Text color, weak", "Callsign color", "Callsign color, weak", "CQ color", "CQ color, weak", "RST color", "RST color, weak"};
-
-    /* renamed from: d, reason: collision with root package name */
-    public static final int[] f664d = {-3084048, -16777216, -5592406, -65536, -30584, -16776961, -7829249, -65281, -30465};
-
-    /* renamed from: a, reason: collision with root package name */
-    public final int[] f665a = (int[]) f664d.clone();
-
-    public final int a(decoder.TCharInfo tCharInfo) {
-        boolean lowSnr = tCharInfo.getLowSnr();
-        int[] iArr = this.f665a;
-        if (lowSnr) {
-            int i4 = tCharInfo.getWordType().Value;
-            if (i4 != 0) {
-                if (i4 != 1) {
-                    if (i4 != 2) {
-                        if (i4 != 3) {
-                            if (i4 != 4) {
-                                if (i4 == 5) {
-                                    return iArr[4];
-                                }
-                                return -16777216;
-                            }
-                            return iArr[2];
-                        }
-                        return iArr[6];
-                    }
-                    return iArr[8];
-                }
-                return iArr[2];
-            }
-            return iArr[2];
-        }
-        int i5 = tCharInfo.getWordType().Value;
-        if (i5 != 0) {
-            if (i5 != 1) {
-                if (i5 != 2) {
-                    if (i5 != 3) {
-                        if (i5 != 4) {
-                            if (i5 != 5) {
-                                return -16777216;
-                            }
-                            return iArr[3];
-                        }
-                        return iArr[1];
-                    }
-                    return iArr[5];
-                }
-                return iArr[7];
-            }
-            return iArr[1];
-        }
-        return iArr[1];
-    }
-
-    public final void b(Context context) {
-        SharedPreferences sharedPreferences = context.getSharedPreferences(context.getPackageName() + "_preferences", 0);  // 原 c0.x.a(context)
-        for (int i4 = 0; i4 < 9; i4++) {
-            this.f665a[i4] = sharedPreferences.getInt(f663b[i4], f664d[i4]);
-        }
-    }
-}

feature/cw/src/main/java/J2/a.java

@@ -1,45 +0,0 @@
-package J2;
-
-/* loaded from: classes.dex */
-public final class a {
-
-    /* renamed from: b, reason: collision with root package name */
-    public static final int[] f726b = {16, 17749, 65535, 16776960, 16711680};
-
-    /* renamed from: a, reason: collision with root package name */
-    public final int[] f727a;
-
-    public a() {
-        int[] iArr = new int[256];
-        this.f727a = iArr;
-        int i4 = 4;
-        float f = 255.0f / 4;
-        int[] iArr2 = f726b;
-        int i5 = 0;
-        int i6 = -16777216;
-        iArr[0] = iArr2[0] | (-16777216);
-        int i7 = 1;
-        while (i7 <= i4) {
-            int round = Math.round(i7 * f);
-            iArr[round] = iArr2[i7] | i6;
-            int i8 = round - i5;
-            int i9 = iArr[i5];
-            int i10 = (i9 >> 16) & 255;
-            int i11 = (i9 >> 8) & 255;
-            int i12 = i9 & 255;
-            float f4 = i8;
-            // r10 = iArr2[i7] (下一个锚点色, smali: aget v10, v4, v8)
-            float f5 = (((iArr2[i7] >> 16) & 255) - i10) / f4;
-            float f6 = (((iArr2[i7] >> 8) & 255) - i11) / f4;
-            float f7 = ((iArr2[i7] & 255) - i12) / f4;
-            for (int i13 = 1; i13 < i8; i13++) {
-                float f8 = i13;
-                iArr[i5 + i13] = ((Math.round(f5 * f8) + i10) << 16) | (-16777216) | ((Math.round(f6 * f8) + i11) << 8) | (Math.round(f8 * f7) + i12);
-            }
-            i7++;
-            i5 = round;
-            i4 = 4;
-            i6 = -16777216;
-        }
-    }
-}

feature/cw/src/main/java/J2/b.java

@@ -1,183 +0,0 @@
-package J2;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.opengl.GLES20;
-import android.opengl.GLSurfaceView;
-import android.opengl.GLUtils;
-import android.os.SystemClock;
-import android.util.Log;
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-
-/* loaded from: classes.dex */
-public final class b implements GLSurfaceView.Renderer {
-
-    /* renamed from: b, reason: collision with root package name */
-    public FloatBuffer f729b;
-    public int c;
-
-    /* renamed from: d, reason: collision with root package name */
-    public final Bitmap f730d;
-    public final Context f;
-
-    /* renamed from: g, reason: collision with root package name */
-    public double f732g;
-
-    /* renamed from: h, reason: collision with root package name */
-    public final Bitmap f733h;
-
-    /* renamed from: i, reason: collision with root package name */
-    public final a f734i;
-
-    /* renamed from: j, reason: collision with root package name */
-    public long f735j;
-
-    /* renamed from: k, reason: collision with root package name */
-    public double f736k;
-
-    /* renamed from: l, reason: collision with root package name */
-    public int f737l;
-
-    /* renamed from: a, reason: collision with root package name */
-    public final int[] f728a = new int[1];
-
-    /* renamed from: e, reason: collision with root package name */
-    public final float[] f731e = {-1.0f, -1.0f, 0.0f, 1.0f, -1.0f, 1.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f};
-
-    public b(Context context, int i4) {
-        Bitmap.Config config = Bitmap.Config.ARGB_8888;
-        Bitmap createBitmap = Bitmap.createBitmap(2048, i4, config);
-        this.f730d = createBitmap;
-        createBitmap.eraseColor(16);
-        this.f732g = 0.09375d;
-        this.f734i = new a();
-        this.f735j = 0L;
-        this.f736k = 0.0d;
-        this.f737l = -1;
-        this.f = context;
-        this.f733h = Bitmap.createBitmap(1, i4, config);
-    }
-
-    public static void a() {
-        int glGetError = GLES20.glGetError();
-        if (glGetError != 0) {
-            StackTraceElement stackTraceElement = Thread.currentThread().getStackTrace()[3];
-            Log.e(stackTraceElement.getFileName() + ":" + stackTraceElement.getLineNumber(), ", GLES20 error: " + glGetError);
-        }
-    }
-
-    public final double b() {
-        long uptimeMillis = SystemClock.uptimeMillis();
-        double width = (((uptimeMillis - this.f735j) * this.f732g) + this.f736k) % this.f730d.getWidth();
-        this.f735j = uptimeMillis;
-        this.f736k = width;
-        return width;
-    }
-
-    public final void c(GL10 gl10) {
-        GLES20.glUseProgram(this.c);
-        a();
-        GLES20.glActiveTexture(33984);
-        a();
-        GLES20.glBindTexture(3553, this.f728a[0]);
-        a();
-        GLES20.glUniform1i(GLES20.glGetUniformLocation(this.c, "uTexture"), 0);
-        a();
-        int glGetAttribLocation = GLES20.glGetAttribLocation(this.c, "aPosition");
-        a();
-        int glGetAttribLocation2 = GLES20.glGetAttribLocation(this.c, "aTexPos");
-        a();
-        this.f729b.position(0);
-        a();
-        GLES20.glVertexAttribPointer(glGetAttribLocation, 2, 5126, false, 16, (Buffer) this.f729b);
-        a();
-        GLES20.glEnableVertexAttribArray(glGetAttribLocation);
-        a();
-        this.f729b.position(2);
-        a();
-        GLES20.glVertexAttribPointer(glGetAttribLocation2, 2, 5126, false, 16, (Buffer) this.f729b);
-        a();
-        GLES20.glEnableVertexAttribArray(glGetAttribLocation2);
-        a();
-        GLES20.glDrawArrays(5, 0, 4);
-        a();
-    }
-
-    public final void d(GL10 gl10, int i4, int i5) {
-        GLES20.glViewport(0, 0, i4, i5);
-        a();
-    }
-
-    @Override // android.opengl.GLSurfaceView.Renderer
-    public final void onDrawFrame(GL10 gl10) {
-        float b4 = (float) (b() / this.f730d.getWidth());
-        float f = 0.5f + b4;
-        float[] fArr = this.f731e;
-        fArr[6] = f;
-        fArr[2] = f;
-        float f4 = b4 + 1.0f;
-        fArr[14] = f4;
-        fArr[10] = f4;
-        this.f729b.position(0);
-        this.f729b.put(this.f731e);
-        c(gl10);
-    }
-
-    @Override // android.opengl.GLSurfaceView.Renderer
-    public final void onSurfaceChanged(GL10 gl10, int i4, int i5) {
-        d(gl10, i4, i5);
-        float width = 1.0f - (((this.f730d.getWidth() * 0.7f) / (i4 / this.f.getResources().getDisplayMetrics().density)) * 2.0f);
-        float[] fArr = this.f731e;
-        fArr[4] = width;
-        fArr[0] = width;
-        this.f729b.position(0);
-        this.f729b.put(this.f731e);
-    }
-
-    @Override // android.opengl.GLSurfaceView.Renderer
-    public final void onSurfaceCreated(GL10 gl10, EGLConfig eGLConfig) {
-        int glCreateShader = GLES20.glCreateShader(35633);
-        a();
-        GLES20.glShaderSource(glCreateShader, "attribute vec2 aPosition;\nattribute vec2 aTexPos;\nvarying vec2 vTexPos;\nvoid main() {\n  vTexPos = aTexPos;\n  gl_Position = vec4(aPosition.xy, 0.0, 1.0);\n}");
-        a();
-        GLES20.glCompileShader(glCreateShader);
-        a();
-        int glCreateShader2 = GLES20.glCreateShader(35632);
-        a();
-        GLES20.glShaderSource(glCreateShader2, "precision mediump float;\nuniform sampler2D uTexture;\nvarying vec2 vTexPos;\nvoid main(void)\n{\n  gl_FragColor = texture2D(uTexture, vTexPos);\n}");
-        a();
-        GLES20.glCompileShader(glCreateShader2);
-        a();
-        this.c = GLES20.glCreateProgram();
-        a();
-        GLES20.glAttachShader(this.c, glCreateShader);
-        a();
-        GLES20.glAttachShader(this.c, glCreateShader2);
-        a();
-        GLES20.glLinkProgram(this.c);
-        a();
-        int[] iArr = this.f728a;
-        GLES20.glGenTextures(1, iArr, 0);
-        a();
-        GLES20.glBindTexture(3553, iArr[0]);
-        a();
-        GLES20.glTexParameteri(3553, 10240, 9729);
-        GLES20.glTexParameteri(3553, 10242, 10497);
-        GLES20.glTexParameteri(3553, 10241, 9729);
-        GLES20.glTexParameteri(3553, 10243, 10497);
-        a();
-        GLUtils.texImage2D(3553, 0, this.f730d, 0);
-        a();
-        float[] fArr = this.f731e;
-        ByteBuffer allocateDirect = ByteBuffer.allocateDirect(fArr.length * 4);
-        allocateDirect.order(ByteOrder.nativeOrder());
-        FloatBuffer asFloatBuffer = allocateDirect.asFloatBuffer();
-        this.f729b = asFloatBuffer;
-        asFloatBuffer.put(fArr);
-    }
-}

feature/cw/src/main/java/K1/a.java

@@ -1,10 +0,0 @@
-package K1;
-
-/**
- * 照搬自 Morse Expert 1.15 K1.a 精简版: 仅保留 k3 FFT 库引用的内存统计静态字段
- * (K1.a.c 长整型记账)。原 K1.a(828 行)的其余方法为状态栏/库代码, 已裁剪
- * (状态栏逻辑已在 MainActivity 内联)。
- */
-public class a {
-    public static long c = 0;
-}

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

@@ -1,213 +0,0 @@
-/*
- * CwDecodeScreen.kt — Look4Sat 的 CW 解码页面(Compose 外壳)。
- *
- * 照搬自 Morse Expert 1.15 的 com.ve3nea.morse_expert.MainActivity(已改为普通控制器类):
- * - AndroidView 嵌入原版 activity_main.xml(ConstraintLayout 根, 含 decodedTextView/scaleView/
- *   statusTextView/verticalLayout/waterfallView);
- * - 生命周期 onCreate/onResume/onPause/onDestroy 全部委托给控制器, 顺序与原 Activity 一致
- *   (onCreate 必须在 onResume 前, onDispose 先 onPause 再 onDestroy);
- * - 麦克风权限(RECORD_AUDIO)由 Compose 侧管理, 授予后调用 onPermissionGranted()(= v()),
- *   用 initialized 标记保证只调一次(v() 会 new a() 覆盖 f11036E);
- * - 原 options_menu 的 清除/暂停/保存/录音/设置 改为顶部一行按钮(图标用模块内原版 drawable)。
- *
- * 注意: 控制器 onCreate 内的 setImmersive(window, false) 会把宿主窗口恢复为
- * decorFitsSystemWindows(true)(原版行为照搬, 会对整个宿主 Activity 生效)。
- */
-package com.rtbishop.look4sat.feature.cw
-
-import android.Manifest
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.provider.Settings
-import android.view.LayoutInflater
-import androidx.activity.compose.BackHandler
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.background
-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.systemBarsPadding
-import androidx.compose.material3.Button
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-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.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.viewinterop.AndroidView
-import androidx.constraintlayout.widget.ConstraintLayout
-import com.ve3nea.morse_expert.MainActivity
-
-@Composable
-fun CwDecodeScreen(navigateUp: () -> Unit = {}) {
-    val context = LocalContext.current
-    val activity = remember(context) {
-        context as? Activity ?: error("CwDecodeScreen must be hosted in an Activity")
-    }
-    // 照搬的控制器(普通类, 非 Activity); 每次进入页面新建实例
-    val controller = remember { MainActivity() }
-    // 提前 inflate 原版布局, 供 AndroidView 与控制器 onCreate 共用同一根视图
-    val rootView = remember(context) {
-        LayoutInflater.from(context).inflate(R.layout.activity_main, null) as ConstraintLayout
-    }
-
-    var permissionGranted by remember {
-        mutableStateOf(
-            context.checkSelfPermission(Manifest.permission.RECORD_AUDIO) ==
-                PackageManager.PERMISSION_GRANTED
-        )
-    }
-    var permanentlyDenied by remember { mutableStateOf(false) }
-    // v() 会 new a() 覆盖 f11036E, 必须保证只初始化一次
-    var initialized by remember { mutableStateOf(false) }
-    var showSettings by remember { mutableStateOf(false) }
-
-    // 生命周期: onCreate 必须在 onResume 前; onDispose 先 onPause 再 onDestroy
-    DisposableEffect(Unit) {
-        controller.onCreate(activity, rootView)
-        controller.onResume()
-        onDispose {
-            controller.onPause()
-            controller.onDestroy()
-        }
-    }
-
-    // 权限授予后启动解码核心; "首次进入已授权" 与 "弹窗回调授权" 两条路径统一走这里
-    LaunchedEffect(permissionGranted) {
-        if (permissionGranted && !initialized) {
-            controller.onPermissionGranted() // = v(): 创建音频采集 + 解码核心
-            // v() 只创建核心; 页面此刻已处于 resumed, 需再走一次 onResume 立即启动录音
-            // (AudioRecord 是新建的, startRecording 不会重复; GLSurfaceView.onResume 幂等)
-            controller.onResume()
-            initialized = true
-        }
-    }
-
-    val permissionLauncher = rememberLauncherForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { granted ->
-        permissionGranted = granted
-        permanentlyDenied = !granted &&
-            !activity.shouldShowRequestPermissionRationale(Manifest.permission.RECORD_AUDIO)
-    }
-
-    // 原版 tap_back_again_to_close: 单击返回只提示, 2 秒内再按才退出
-    BackHandler {
-        if (!controller.handleBackPress()) navigateUp()
-    }
-
-    if (showSettings) {
-        CwSettingsDialog(controller = controller, onDismiss = { showSettings = false })
-    }
-
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .systemBarsPadding()
-    ) {
-        // 原 options_menu: 暂停/清除/保存(原版图标) + 录音/设置(文字按钮)
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 4.dp),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceEvenly
-        ) {
-            IconButton(onClick = { controller.togglePause() }) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_baseline_pause_24),
-                    contentDescription = stringResource(R.string.pause)
-                )
-            }
-            IconButton(onClick = { controller.clearDecoded() }) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_baseline_delete_24),
-                    contentDescription = stringResource(R.string.clear)
-                )
-            }
-            IconButton(onClick = { controller.saveText() }) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_baseline_save_24),
-                    contentDescription = stringResource(R.string.save_text)
-                )
-            }
-            // recordSignals 需要解码核心(f11037F), 未初始化时禁用
-            TextButton(
-                onClick = { if (initialized) controller.recordSignals() },
-                enabled = initialized
-            ) {
-                Text(stringResource(R.string.record_signals))
-            }
-            TextButton(onClick = { showSettings = true }) {
-                Text(stringResource(R.string.settings))
-            }
-        }
-
-        Box(modifier = Modifier.weight(1f).fillMaxWidth()) {
-            AndroidView(
-                factory = { rootView },
-                modifier = Modifier.fillMaxSize()
-            )
-            if (!permissionGranted) {
-                // 未授予麦克风权限: 遮罩 + 提示文字 + 请求按钮
-                Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .background(Color(0x99000000)),
-                    contentAlignment = Alignment.Center
-                ) {
-                    Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                        Text(
-                            text = stringResource(R.string.cw_mic_permission),
-                            color = Color.White,
-                            textAlign = TextAlign.Center,
-                            modifier = Modifier.padding(horizontal = 24.dp)
-                        )
-                        Spacer(modifier = Modifier.height(12.dp))
-                        Button(onClick = {
-                            permissionLauncher.launch(Manifest.permission.RECORD_AUDIO)
-                        }) {
-                            Text(stringResource(R.string.cw_grant_permission))
-                        }
-                        if (permanentlyDenied) {
-                            // 勾选了"不再询问": 引导去系统设置开启
-                            TextButton(onClick = {
-                                activity.startActivity(
-                                    Intent(
-                                        Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
-                                        Uri.parse("package:${activity.packageName}")
-                                    )
-                                )
-                            }) {
-                                Text(stringResource(R.string.cw_open_settings))
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -1,218 +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.
- */
-package com.rtbishop.look4sat.feature.cw
-
-import android.content.Context
-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 com.ve3nea.morse_expert.MainActivity
-import kotlin.math.roundToInt
-
-/** 键名/默认值照搬原 Morse Expert(root_preferences.xml + SettingsActivity 逻辑)。 */
-private const val KEY_MESSAGE_TYPE = "message_type"
-private const val KEY_TEXT_FONT_SIZE = "text_font_size"
-private const val DEFAULT_MESSAGE_TYPE = "general_text"
-private const val DEFAULT_TEXT_FONT_SIZE = 18
-private const val MIN_FONT_SIZE = 7
-private const val MAX_FONT_SIZE = 99
-
-/** 预置色板(9 色, 3x3 网格);原 ColorPreferenceCompat 用第三方 colorpicker, 不引入。 */
-private val PaletteColors = listOf(
-    0xFFD0F0F0.toInt(), 0xFF000000.toInt(), 0xFFFFFFFF.toInt(),
-    0xFFAAAAAA.toInt(), 0xFFFF0000.toInt(), 0xFF00FF00.toInt(),
-    0xFF0000FF.toInt(), 0xFFFFFF00.toInt(), 0xFFFF00FF.toInt(),
-)
-
-/**
- * CW 设置弹窗(替代原 Morse Expert 的 SettingsActivity)。
- * 设置项与键名照搬原 APK: message_type / text_font_size / 9 个颜色
- * (I2.b.f663b 键名, I2.b.f664d 默认值, I2.b.c 英文标题)。
- * 存储: SharedPreferences(getPackageName() + "_preferences")。
- * 点击 OK 保存并调用 controller.onResume() 立即生效; Cancel/点外部仅关闭不保存。
- */
-@Composable
-fun CwSettingsDialog(controller: MainActivity, onDismiss: () -> Unit) {
-    val activity = controller.mActivity ?: return
-    val prefs = remember(activity) {
-        activity.getSharedPreferences(activity.packageName + "_preferences", Context.MODE_PRIVATE)
-    }
-
-    var messageType by remember {
-        mutableStateOf(prefs.getString(KEY_MESSAGE_TYPE, DEFAULT_MESSAGE_TYPE) ?: DEFAULT_MESSAGE_TYPE)
-    }
-    var fontSize by remember {
-        mutableStateOf(
-            prefs.getInt(KEY_TEXT_FONT_SIZE, DEFAULT_TEXT_FONT_SIZE)
-                .toFloat().coerceIn(MIN_FONT_SIZE.toFloat(), MAX_FONT_SIZE.toFloat())
-        )
-    }
-    var colorValues by remember {
-        mutableStateOf(IntArray(9) { i -> prefs.getInt(I2.b.f663b[i], I2.b.f664d[i]) })
-    }
-
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text("CW Settings") },
-        text = {
-            Column(
-                modifier = Modifier
-                    .verticalScroll(rememberScrollState())
-                    .padding(top = 4.dp)
-            ) {
-                Text("Message type", style = MaterialTheme.typography.titleSmall)
-                MessageTypeRow("general_text", "General Text", messageType) { messageType = it }
-                MessageTypeRow("ham_radio_qso", "Ham Radio QSO", messageType) { messageType = it }
-                HorizontalDivider(Modifier.padding(vertical = 8.dp))
-
-                Text("Text font size", style = MaterialTheme.typography.titleSmall)
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Slider(
-                        value = fontSize,
-                        onValueChange = { fontSize = it },
-                        valueRange = MIN_FONT_SIZE.toFloat()..MAX_FONT_SIZE.toFloat(),
-                        steps = MAX_FONT_SIZE - MIN_FONT_SIZE - 1,
-                        modifier = Modifier.weight(1f),
-                    )
-                    Text(
-                        text = "${fontSize.roundToInt()}",
-                        style = MaterialTheme.typography.titleMedium,
-                        textAlign = TextAlign.End,
-                        modifier = Modifier.width(44.dp),
-                    )
-                }
-                HorizontalDivider(Modifier.padding(vertical = 8.dp))
-
-                Text("Colors", style = MaterialTheme.typography.titleSmall)
-                for (i in 0 until 9) {
-                    ColorSettingRow(
-                        title = I2.b.c[i],
-                        value = colorValues[i],
-                        onSelect = { selected ->
-                            colorValues = colorValues.copyOf().also { it[i] = selected }
-                        },
-                    )
-                }
-            }
-        },
-        confirmButton = {
-            TextButton(onClick = {
-                val editor = prefs.edit()
-                editor.putString(KEY_MESSAGE_TYPE, messageType)
-                editor.putInt(KEY_TEXT_FONT_SIZE, fontSize.roundToInt())
-                for (i in 0 until 9) {
-                    editor.putInt(I2.b.f663b[i], colorValues[i])
-                }
-                editor.apply()
-                // 原 SettingsActivity 返回时由 MainActivity.onResume() 重新读取全部设置; 照搬逻辑已就位
-                controller.onResume()
-                onDismiss()
-            }) { Text("OK") }
-        },
-        dismissButton = {
-            TextButton(onClick = onDismiss) { Text("Cancel") }
-        },
-    )
-}
-
-@Composable
-private fun MessageTypeRow(option: String, label: String, selected: String, onSelect: (String) -> Unit) {
-    Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .clip(RoundedCornerShape(6.dp))
-            .clickable { onSelect(option) }
-            .padding(vertical = 2.dp),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        RadioButton(selected = option == selected, onClick = { onSelect(option) })
-        Text(label, style = MaterialTheme.typography.bodyMedium)
-    }
-}
-
-@Composable
-private fun ColorSettingRow(title: String, value: Int, onSelect: (Int) -> Unit) {
-    Column(Modifier.fillMaxWidth().padding(vertical = 6.dp)) {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            Text(title, style = MaterialTheme.typography.bodyMedium, modifier = Modifier.weight(1f))
-            Box(
-                Modifier
-                    .size(20.dp)
-                    .clip(RoundedCornerShape(4.dp))
-                    .background(Color(value)),
-            )
-            Spacer(Modifier.width(6.dp))
-            Text(
-                text = String.format("#%06X", value and 0xFFFFFF),
-                style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-            )
-        }
-        Spacer(Modifier.height(6.dp))
-        PaletteGrid(selected = value, onSelect = onSelect)
-    }
-}
-
-@Composable
-private fun PaletteGrid(selected: Int, onSelect: (Int) -> Unit) {
-    Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
-        PaletteColors.chunked(3).forEach { rowColors ->
-            Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
-                rowColors.forEach { color ->
-                    val isSelected = color == selected
-                    Box(
-                        modifier = Modifier
-                            .size(36.dp)
-                            .border(
-                                width = if (isSelected) 3.dp else 1.dp,
-                                color = if (isSelected) MaterialTheme.colorScheme.primary
-                                else MaterialTheme.colorScheme.outlineVariant,
-                                shape = RoundedCornerShape(6.dp),
-                            )
-                            .clip(RoundedCornerShape(6.dp))
-                            .background(Color(color))
-                            .clickable { onSelect(color) },
-                    )
-                }
-            }
-        }
-    }
-}

feature/cw/src/main/java/com/rtbishop/look4sat/feature/cw/suncompat/Cleaner.java

@@ -1,14 +0,0 @@
-package com.rtbishop.look4sat.feature.cw.suncompat;
-
-/**
- * 编译期 stub:Android 无 sun.misc.Cleaner(照搬 Morse Expert 1.15 k3 FFT 库的清理回调,
- * 实际 FFT 1024 点不触发 native 路径)。
- */
-public class Cleaner {
-    public static Cleaner create(Object referent, Runnable thunk) {
-        return null;
-    }
-
-    public void clean() {
-    }
-}

feature/cw/src/main/java/com/rtbishop/look4sat/feature/cw/suncompat/Unsafe.java

@@ -1,83 +0,0 @@
-package com.rtbishop.look4sat.feature.cw.suncompat;
-
-/**
- * 编译期 stub:Android 无 sun.misc.Unsafe(运行时通过反射获取,失败时 k3.r.f12109a 为 null)。
- * 照搬自 Morse Expert 1.15(k3 FFT 库的大数组 native 路径 >1GB 不触发,实际 FFT 走 float[] 分支)。
- */
-public class Unsafe {
-    public long allocateMemory(long bytes) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public void freeMemory(long address) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public byte getByte(long address) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public void putByte(long address, byte value) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public short getShort(long address) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public void putShort(long address, short value) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public int getInt(long address) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public void putInt(long address, int value) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public long getLong(long address) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public void putLong(long address, long value) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public float getFloat(long address) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public void putFloat(long address, float value) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public double getDouble(long address) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public void putDouble(long address, double value) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public void setMemory(long address, long bytes, byte value) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public void copyMemory(long src, long dst, long len) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public Object getObject(Object o, long offset) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public void putObject(Object o, long offset, Object value) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-
-    public long objectFieldOffset(java.lang.reflect.Field field) {
-        throw new UnsupportedOperationException("sun.misc.Unsafe not available on Android");
-    }
-}

feature/cw/src/main/java/com/ve3nea/morse_expert/DecodedTextView.java

@@ -1,138 +0,0 @@
-package com.ve3nea.morse_expert;
-
-import F2.a;
-import android.content.Context;
-import android.content.Intent;
-import android.media.MediaScannerConnection;
-import android.text.Layout;
-import android.text.Selection;
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
-import android.text.TextUtils;
-import android.text.format.DateFormat;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.ActionMode;
-import android.widget.TextView;
-import android.widget.Toast;
-import java.io.File;
-import java.io.PrintWriter;
-import java.util.Date;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * 照搬自 Morse Expert 1.15 DecodedTextView, 类名保持混淆原名。
- * 适配: 原 extends l.C1702e0(appcompat 混淆类) -> 直接 extends TextView
- * (C1702e0 仅提供 TextView 兼容功能, 本类未使用其特有方法)。
- */
-public class DecodedTextView extends TextView {
-
-    /* renamed from: m, reason: collision with root package name */
-    public final Context f11031m;
-
-    /* renamed from: n, reason: collision with root package name */
-    public boolean f11032n;
-
-    /* renamed from: o, reason: collision with root package name */
-    public final AtomicBoolean f11033o;
-
-    public DecodedTextView(Context context, AttributeSet attributeSet) {
-        super(context, attributeSet);
-        this.f11032n = false;
-        this.f11033o = new AtomicBoolean(false);
-        this.f11031m = context;
-        setCustomSelectionActionModeCallback(getActionModeCallback());
-    }
-
-    private ActionMode.Callback getActionModeCallback() {
-        return new a(this);
-    }
-
-    private String getDecodedText() {
-        int selectionStart = getSelectionStart();
-        int selectionEnd = getSelectionEnd();
-        int max = Math.max(0, Math.min(selectionStart, selectionEnd));
-        int max2 = Math.max(0, Math.max(selectionStart, selectionEnd));
-        if (max2 > max) {
-            return getText().subSequence(max, max2).toString();
-        }
-        return getText().toString();
-    }
-
-    @Override // android.widget.TextView
-    public final void onSelectionChanged(int i4, int i5) {
-        super.onSelectionChanged(i4, i5);
-        if (hasSelection()) {
-            this.f11032n = true;
-        }
-    }
-
-    public final void q(SpannableStringBuilder spannableStringBuilder) {
-        boolean z3;
-        try {
-            CharSequence text = getText();
-            Layout layout = getLayout();
-            int lineCount = getLineCount();
-            int length = text.length();
-            int lineHeight = getLineHeight();
-            int scrollY = getScrollY();
-            if (layout.getLineBottom(lineCount - 1) == getHeight() + scrollY) {
-                z3 = true;
-            } else {
-                z3 = false;
-            }
-            getSelectionStart();
-            getSelectionEnd();
-            hasSelection();
-            if (z3) {
-                Selection.setSelection((Spannable) text, length, length);
-            }
-            append(spannableStringBuilder);
-            int i4 = lineCount - 50;
-            if (i4 > 0) {
-                int i5 = lineHeight * i4;
-                getEditableText().delete(0, layout.getLineEnd(lineCount - 51));
-                if (scrollY >= i5) {
-                    scrollBy(0, -i5);
-                }
-            }
-        } catch (Exception e4) {
-            Log.e("printChars()", "Exception: ", e4);
-        }
-    }
-
-    public final void r() {
-        String decodedText = getDecodedText();
-        boolean isEmpty = TextUtils.isEmpty(decodedText);
-        Context context = this.f11031m;
-        if (isEmpty) {
-            Toast.makeText(context, "No text to save", 0).show();
-            return;
-        }
-        try {
-            File file = new File(getContext().getExternalFilesDir(null), ((String) DateFormat.format("yyyy-MM-dd_HH_mm_ss", new Date())) + ".txt");
-            String absolutePath = file.getAbsolutePath();
-            PrintWriter printWriter = new PrintWriter(file);
-            try {
-                printWriter.println(decodedText);
-                printWriter.close();
-                MediaScannerConnection.scanFile(context, new String[]{absolutePath}, new String[]{"text/plain"}, null);
-                Toast.makeText(context, "Text saved to " + absolutePath, 1).show();
-            } catch (Throwable th) {
-                printWriter.close();
-                throw th;
-            }
-        } catch (Exception e4) {
-            Log.e("File Save", "Failed", e4);
-            Toast.makeText(context, "Unable to save: " + e4.getMessage(), 1).show();
-        }
-    }
-
-    public final void s() {
-        Intent intent = new Intent("android.intent.action.SEND");
-        intent.setFlags(268435456);
-        intent.putExtra("android.intent.extra.TEXT", getDecodedText());
-        intent.setType("text/plain");
-        this.f11031m.startActivity(Intent.createChooser(intent, "Share Decoded Text"));
-    }
-}

feature/cw/src/main/java/com/ve3nea/morse_expert/MainActivity.java

@@ -1,232 +0,0 @@
-
-package com.ve3nea.morse_expert;
-
-import android.content.Context;
-import android.os.Build;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import com.rtbishop.look4sat.feature.cw.R;
-import E2.g;
-import H2.a;
-import H2.b;
-import j1.C1646n;
-
-/**
- * Ported verbatim from Morse Expert 1.15 MainActivity (com.ve3nea.morse_expert); obfuscated
- * class/field names kept as-is. Surgery notes: originally extends e.AbstractActivityC1557l
- * (obfuscated AppCompat base) -> now a plain controller class, Activity injected via
- * onCreate(Activity, ConstraintLayout) for Compose AndroidView integration. Ads (d1.*),
- * billing (I2.a), premium/rate menu removed per user. h3.b.r (recursive findViewById),
- * K1.a.M (immersive status bar), B.i (permissions) replaced with equivalent standard APIs.
- * Decoder logic (H2.a audio, H2.b core, pas engine) untouched.
- */
-public class MainActivity {
-
-    public static final /* synthetic */ int f11034K = 0;
-
-    /* renamed from: D, reason: collision with root package name */
-    public C1646n f11035D;
-
-    /* renamed from: E, reason: collision with root package name */
-    public a f11036E;
-
-    /* renamed from: F, reason: collision with root package name */
-    public b f11037F;
-
-    /* renamed from: G, reason: collision with root package name */
-    public long f11038G = 0;
-
-    /* renamed from: J, reason: collision with root package name */
-    public final g f11040J = new g(this, 1);
-
-    /** Injected Activity context (replaces the original this Activity capabilities) */
-    public android.app.Activity mActivity;
-
-    public void onCreate(android.app.Activity activity, ConstraintLayout constraintLayout) {
-        onCreate(activity, constraintLayout, true);
-    }
-
-    /**
-     * applyImmersive=false 用于嵌入小容器(如转发器 CW 面板):
-     * 不触碰宿主窗口的系统栏标志(避免影响整个 Activity)。
-     */
-    public void onCreate(android.app.Activity activity, ConstraintLayout constraintLayout, boolean applyImmersive) {
-        this.mActivity = activity;
-        if (applyImmersive) {
-            // K1.a.M(getWindow(), false): immersive status bar (nav/fullscreen flags, ported as-is)
-            setImmersive(activity.getWindow(), false);
-        }
-        View inflate = constraintLayout;
-        int i4 = R.id.decodedTextView;
-        DecodedTextView decodedTextView = (DecodedTextView) findViewRecursive(inflate, R.id.decodedTextView);
-        if (decodedTextView != null) {
-            i4 = R.id.scaleView;
-            ScaleView scaleView = (ScaleView) findViewRecursive(inflate, R.id.scaleView);
-            if (scaleView != null) {
-                i4 = R.id.statusTextView;
-                TextView textView = (TextView) findViewRecursive(inflate, R.id.statusTextView);
-                if (textView != null) {
-                    i4 = R.id.verticalLayout;
-                    LinearLayout linearLayout = (LinearLayout) findViewRecursive(inflate, R.id.verticalLayout);
-                    if (linearLayout != null) {
-                        i4 = R.id.waterfallView;
-                        WaterfallSurfaceView waterfallSurfaceView = (WaterfallSurfaceView) findViewRecursive(inflate, R.id.waterfallView);
-                        if (waterfallSurfaceView != null) {
-                            this.f11035D = new C1646n(constraintLayout, decodedTextView, scaleView, textView, linearLayout, waterfallSurfaceView);
-                            ((WaterfallSurfaceView) this.f11035D.f11892k).setOnTouchListener(this.f11040J);
-                            // Originally: permission check then v(); permission flow handled by the Compose page
-                            // Originally: ad banner mounting (removed)
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-        throw new NullPointerException("Missing required view with ID: " + inflate.getResources().getResourceName(i4));
-    }
-
-    /** Original h3.b.r: recursive findViewById (ported behavior) */
-    private static View findViewRecursive(View view, int id) {
-        if (view instanceof ViewGroup) {
-            ViewGroup viewGroup = (ViewGroup) view;
-            int childCount = viewGroup.getChildCount();
-            for (int i = 0; i < childCount; i++) {
-                View found = viewGroup.getChildAt(i).findViewById(id);
-                if (found != null) {
-                    return found;
-                }
-            }
-            return null;
-        }
-        return null;
-    }
-
-    /** Original K1.a.M(window, false): immersive (hide nav/fullscreen flags, ported as-is) */
-    private static void setImmersive(Window window, boolean immersive) {
-        if (Build.VERSION.SDK_INT >= 30) {
-            window.setDecorFitsSystemWindows(!immersive);
-            if (immersive) {
-                window.getDecorView().setSystemUiVisibility(
-                    View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN);
-            } else {
-                window.getDecorView().setSystemUiVisibility(
-                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
-            }
-        } else {
-            View decorView = window.getDecorView();
-            int systemUiVisibility = decorView.getSystemUiVisibility();
-            decorView.setSystemUiVisibility(immersive ? (systemUiVisibility & (-1793)) : (systemUiVisibility | 1792));
-        }
-    }
-
-    /** Original v(): audio capture + decoder core init (logic unchanged) */
-    public void v() {
-        this.f11036E = new a();
-        b bVar = new b(mActivity.getApplicationContext());
-        this.f11037F = bVar;
-        this.f11036E.f601l = bVar;
-        bVar.f619o = (WaterfallSurfaceView) this.f11035D.f11892k;
-        bVar.f620p = this;
-        bVar.f621q = this;
-    }
-
-    /** Original onResume: restore decoding (message type/font/background/record start/waterfall) */
-    public void onResume() {
-        android.content.SharedPreferences prefs = mActivity.getSharedPreferences(
-            mActivity.getPackageName() + "_preferences", Context.MODE_PRIVATE);
-        String messageType = prefs.getString("message_type", "general_text");
-        b bVar = this.f11037F;
-        if (bVar != null) {
-            bVar.f623s.set(messageType.equals("ham_radio_qso"));
-        }
-        ((DecodedTextView) this.f11035D.f11888g).setTextSize(Math.max(7, prefs.getInt("text_font_size", 18)));
-        b bVar2 = this.f11037F;
-        if (bVar2 != null) {
-            bVar2.f617m.b(mActivity);
-            ((DecodedTextView) this.f11035D.f11888g).setBackgroundColor(this.f11037F.f617m.f665a[0]);
-        }
-        a aVar = this.f11036E;
-        if (aVar != null) {
-            android.media.AudioRecord audioRecord = aVar.f596g;
-            audioRecord.startRecording();
-            if (audioRecord.getState() != 1) {
-                android.util.Log.e("AudioRecord", "cannot start");
-            }
-            aVar.f598i.set(true);
-        }
-        ((WaterfallSurfaceView) this.f11035D.f11892k).onResume();
-        // Originally: ad lifecycle (removed)
-    }
-
-    /** Original onPause: stop recording + waterfall pause */
-    public void onPause() {
-        a aVar = this.f11036E;
-        if (aVar != null) {
-            aVar.f598i.set(false);
-            android.media.AudioRecord audioRecord = aVar.f596g;
-            audioRecord.stop();
-            if (audioRecord.getState() != 1) {
-                android.util.Log.e("AudioRecord", "cannot stop");
-            }
-        }
-        ((WaterfallSurfaceView) this.f11035D.f11892k).onPause();
-    }
-
-    /** Original onDestroy: release audio/decoder (billing cleanup removed) */
-    public void onDestroy() {
-        a aVar = this.f11036E;
-        if (aVar != null) {
-            aVar.f598i.set(false);
-            try {
-                aVar.f596g.stop();
-                aVar.f596g.release();
-            } catch (Exception ignored) {
-            }
-            aVar.f597h.shutdownNow();
-        }
-        this.f11036E = null;
-        this.f11037F = null;
-    }
-
-    /** Menu: clear decoded text (original clear_mnu) */
-    public void clearDecoded() {
-        ((DecodedTextView) this.f11035D.f11888g).setText("");
-    }
-
-    /** Menu: pause/resume decoding (original pause_mnu, red/white icon toggle logic) */
-    public boolean togglePause() {
-        java.util.concurrent.atomic.AtomicBoolean atomicBoolean = ((DecodedTextView) this.f11035D.f11888g).f11033o;
-        atomicBoolean.set(!atomicBoolean.get());
-        return atomicBoolean.get();
-    }
-
-    /** Menu: save text (original save_mnu -> DecodedTextView.r()) */
-    public void saveText() {
-        ((DecodedTextView) this.f11035D.f11888g).r();
-    }
-
-    /** Menu: record signals (original record_signals_mnu) */
-    public void recordSignals() {
-        this.f11037F.f626v.set(true);
-    }
-
-    /** Original tap_back_again_to_close hint */
-    public boolean handleBackPress() {
-        if (System.currentTimeMillis() < this.f11038G + 2000) {
-            return true; // double-back: exit
-        }
-        this.f11038G = System.currentTimeMillis();
-        Toast.makeText(mActivity, R.string.tap_back_again_to_close, 0).show();
-        return false;
-    }
-
-    /** Start decoding after permission granted (original onRequestPermissionsResult success) */
-    public void onPermissionGranted() {
-        v();
-    }
-}

feature/cw/src/main/java/com/ve3nea/morse_expert/ScaleView.java

@@ -1,76 +0,0 @@
-package com.ve3nea.morse_expert;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.util.AttributeSet;
-import android.view.View;
-
-/* loaded from: classes.dex */
-public class ScaleView extends View {
-    public int f;
-
-    /* renamed from: g, reason: collision with root package name */
-    public int f11041g;
-
-    /* renamed from: h, reason: collision with root package name */
-    public final Paint f11042h;
-
-    /* renamed from: i, reason: collision with root package name */
-    public final Paint f11043i;
-
-    /* renamed from: j, reason: collision with root package name */
-    public final Paint f11044j;
-
-    /* renamed from: k, reason: collision with root package name */
-    public final Paint f11045k;
-
-    public ScaleView(Context context, AttributeSet attributeSet) {
-        super(context, attributeSet);
-        Paint paint = new Paint();
-        this.f11042h = paint;
-        paint.setColor(-16711936);
-        Paint paint2 = new Paint();
-        this.f11043i = paint2;
-        paint2.setColor(-16744448);
-        Paint paint3 = new Paint();
-        this.f11044j = paint3;
-        paint3.setColor(-256);
-        Paint paint4 = new Paint();
-        this.f11045k = paint4;
-        paint4.setColor(-8355840);
-    }
-
-    @Override // android.view.View
-    public final void onDraw(Canvas canvas) {
-        Paint paint;
-        super.onDraw(canvas);
-        int i4 = this.f11041g;
-        if (i4 != 1) {
-            if (i4 != 2) {
-                if (i4 != 3) {
-                    if (i4 != 4) {
-                        return;
-                    } else {
-                        paint = this.f11044j;
-                    }
-                } else {
-                    paint = this.f11045k;
-                }
-            } else {
-                paint = this.f11042h;
-            }
-        } else {
-            paint = this.f11043i;
-        }
-        int round = (int) Math.round(getWidth() * 0.7d);
-        Path path = new Path();
-        path.moveTo(0.0f, this.f);
-        float f = round;
-        path.lineTo(f, this.f - round);
-        path.lineTo(f, this.f + round);
-        path.close();
-        canvas.drawPath(path, paint);
-    }
-}

feature/cw/src/main/java/com/ve3nea/morse_expert/WaterfallSurfaceView.java

@@ -1,19 +0,0 @@
-package com.ve3nea.morse_expert;
-
-import J2.b;
-import android.content.Context;
-import android.opengl.GLSurfaceView;
-import android.util.AttributeSet;
-
-/* loaded from: classes.dex */
-public class WaterfallSurfaceView extends GLSurfaceView {
-    public final b f;
-
-    public WaterfallSurfaceView(Context context, AttributeSet attributeSet) {
-        super(context, attributeSet);
-        setEGLContextClientVersion(2);
-        b bVar = new b(context, H2.b.f603B);
-        this.f = bVar;
-        setRenderer(bVar);
-    }
-}

feature/cw/src/main/java/d1/AbstractC1518b.java

@@ -1,82 +0,0 @@
-package d1;
-
-/* renamed from: d1.b, reason: case insensitive filesystem */
-/* 照搬自 Morse Expert 1.15, 混淆名保持。b(Parcel)/c(y2.d) 为库工具已裁剪(L1/y2 库依赖)。 */
-public abstract /* synthetic */ class AbstractC1518b {
-    public static float a(float f, float f4, k3.d dVar, long j4, float f5, float f6) {
-        dVar.c(j4, f - f4);
-        return f5 + f6;
-    }
-
-    public static String d(String str, int i4) {
-        return str + i4;
-    }
-
-    public static String e(String str, String str2) {
-        return str + str2;
-    }
-
-    public static String f(String str, String str2, String str3) {
-        return str + str2 + str3;
-    }
-
-    public static String g(StringBuilder sb, int i4, String str) {
-        sb.append(i4);
-        sb.append(str);
-        return sb.toString();
-    }
-
-    public static String h(StringBuilder sb, String str, String str2) {
-        sb.append(str);
-        sb.append(str2);
-        return sb.toString();
-    }
-
-    public static /* synthetic */ boolean i(Object obj) {
-        return obj != null;
-    }
-
-    public static float j(float f, float f4, k3.d dVar, long j4, float f5, float f6) {
-        dVar.c(j4, f + f4);
-        return f5 + f6;
-    }
-
-    public static String k(String str, String str2) {
-        return str + str2;
-    }
-
-    public static float l(float f, float f4, k3.d dVar, long j4, float f5, float f6) {
-        dVar.c(j4, f - f4);
-        return f5 - f6;
-    }
-
-    public static float m(float f, float f4, k3.d dVar, long j4, float f5, float f6) {
-        dVar.c(j4, f + f4);
-        return f5 - f6;
-    }
-
-    public static /* synthetic */ String n(int i4) {
-        switch (i4) {
-            case 1:
-                return "NONE";
-            case 2:
-                return "LEFT";
-            case 3:
-                return "TOP";
-            case 4:
-                return "RIGHT";
-            case 5:
-                return "BOTTOM";
-            case 6:
-                return "BASELINE";
-            case 7:
-                return "CENTER";
-            case 8:
-                return "CENTER_X";
-            case 9:
-                return "CENTER_Y";
-            default:
-                throw null;
-        }
-    }
-}

feature/cw/src/main/java/g3/a.java

@@ -1,34 +0,0 @@
-package g3;
-
-/* loaded from: classes.dex */
-public final class a {
-
-    /* renamed from: a, reason: collision with root package name */
-    public final int f11582a;
-
-    /* renamed from: b, reason: collision with root package name */
-    public final double f11583b;
-    public final double c;
-
-    public a(double d4) {
-        int i4 = (int) (0.6366197723675814d * d4);
-        while (true) {
-            double d5 = -i4;
-            double d6 = 1.570796251296997d * d5;
-            double d7 = d4 + d6;
-            double d8 = 7.549789948768648E-8d * d5;
-            double d9 = d8 + d7;
-            double d10 = (-((d7 - d4) - d6)) + (-((d9 - d7) - d8));
-            double d11 = d5 * 6.123233995736766E-17d;
-            double d12 = d11 + d9;
-            double d13 = d10 + (-((d12 - d9) - d11));
-            if (d12 > 0.0d) {
-                this.f11582a = i4;
-                this.f11583b = d12;
-                this.c = d13;
-                return;
-            }
-            i4--;
-        }
-    }
-}