chore: remove dist/ from tracking, add to .gitignore

When adjusting RX in passband mode (via +/- buttons or slider), the old
code used TransponderMapper.mapDownlinkToUplink (pure passband mapping
without Doppler compensation), producing ~10kHz error at LEO velocities.

Fix: use DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset
for the full TX-from-RX round-trip, matching the RX→PASSBAND button
onClick logic. Also fixed frame mismatch: position now uses txLow/txRange
(Doppler-shifted frame) consistently.

.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

@@ -18,6 +18,7 @@ out/
 # Gradle files
 .gradle/
 build/
+.cxx/
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -39,7 +40,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
@@ -66,3 +68,4 @@ fastlane/readme.md
 /app/release/output-metadata.json
 /app/release/
 /.kotlin/sessions/
+dist/

README.md

@@ -1,45 +1,36 @@
-# Look4Sat: Satellite tracker
+# Look4Sat-BA7OPF
 
-[![Look4Sat CI](https://github.com/rt-bishop/Look4Sat/actions/workflows/release.yml/badge.svg)](https://github.com/rt-bishop/Look4Sat/actions/workflows/release.yml)
+[![Release](https://img.shields.io/github/v/release/atsunatsu/Look4Sat)](https://github.com/atsunatsu/Look4Sat/releases)
 
-[<img src="https://play.google.com/intl/en_gb/badges/static/images/badges/en_badge_web_generic.png" alt="Get it on Google Play" height="80">](https://play.google.com/store/apps/details?id=com.rtbishop.look4sat)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/packages/com.rtbishop.look4sat/)
+**BA7OPF 定制版** — 基于 [rt-bishop/Look4Sat](https://github.com/rt-bishop/Look4Sat) 的业余无线电卫星追踪器，增加了线性卫星频率计算器等功能。
 
-### Radio satellite tracker and pass predictor for Android, inspired by Gpredict
+## 本仓库特色功能
 
-<p float="left">
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="192"/>
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="192"/>
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="192"/>
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" width="192">
-</p>
+- **线性卫星转发器频率计算器** — 在雷达页的 Calculator 标签页中，支持 TX/RX 双向多普勒频率计算，以及下行频率偏移（offset）输入，方便操作带偏移的线性卫星
+- **CW 解码器** — 集成 Morse Expert 解码引擎，支持瀑布图、实时解码文本
+- **Passband 模式** — 支持通过位置滑块（Passband）自动计算 TX/RX 频率，避免切换时跳变
+- **中文界面优化** — 翻译修正、UI 布局调整
 
-### Track satellite passes with ease!
+## 上游仓库
 
-Thanks to [Celestrak](https://celestrak.com/) and [SatNOGS](https://satnogs.org/) you have access to over 9000 active satellites.\
-You can search the entire database by NORAD Catalog Number or the satellite's name.
+本仓库是 [rt-bishop/Look4Sat](https://github.com/rt-bishop/Look4Sat) 的分支，上游仓库的原始功能包括：
 
-Orbital positions and passes are calculated relative to your location.\
-To get reliable data make sure to set the station position via the app Settings.
+- 基于 Celestrak / SatNOGS 数据的 9000+ 活跃卫星追踪
+- SGP4/SDP4 轨道预测，10 天过境预报
+- 极坐标雷达图、地面轨迹图
+- SSTV 图像解码
+- 无广告、无跟踪、完全离线
 
-The application is built using Kotlin, Coroutines, Jetpack Compose and Navigation.\
-It is now and always will be completely ad-free and open-source.
+## 许可证
 
-## Main features:
-
-*  Predicting satellite positions and passes for up to 10 days
-*  Showing the list of currently active and upcoming satellite passes
-*  Showing the active pass progress, polar trajectory and transceivers info
-*  Showing the satellite positional data, footprint and ground track on the map
-*  Custom TLE satellite data import is available via Three Line Element .txt files
-*  Offline first: calculations are made offline. Weekly TLE data update is recommended.
+GNU General Public License v3.0。详见 [LICENSE](LICENSE)。
 
 ## Star History
 
-<a href="https://www.star-history.com/?repos=rt-bishop%2FLook4Sat&type=timeline&legend=top-left">
+<a href="https://star-history.dera.page/#atsunatsu/Look4Sat&type=timeline&legend=top-left">
  <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/chart?repos=rt-bishop/Look4Sat&type=timeline&theme=dark&legend=top-left" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/chart?repos=rt-bishop/Look4Sat&type=timeline&legend=top-left" />
-   <img alt="Star History Chart" src="https://api.star-history.com/chart?repos=rt-bishop/Look4Sat&type=timeline&legend=top-left" />
+   <source media="(prefers-color-scheme: dark)" srcset="https://star-history.dera.page/svg?repos=atsunatsu/Look4Sat&type=timeline&theme=dark&legend=top-left" />
+   <source media="(prefers-color-scheme: light)" srcset="https://star-history.dera.page/svg?repos=atsunatsu/Look4Sat&type=timeline&legend=top-left" />
+   <img alt="Star History Chart" src="https://star-history.dera.page/svg?repos=atsunatsu/Look4Sat&type=timeline&legend=top-left" />
  </picture>
 </a>

app/build.gradle.kts

@@ -1,36 +1,24 @@
-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 位软件)
+    namespace = libs.versions.packageName.get()
     defaultConfig {
-        ndk {
-            abiFilters += listOf("armeabi-v7a")
-        }
+        applicationId = "cn.ba7opf.look4sat"
+        ndk { abiFilters.add("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
-            }
+        create("release") {
+            storeFile = file(System.getProperty("user.home") + "/my-release-key.jks")
+            storePassword = "look4sat123"
+            keyAlias = "look4sat"
+            keyPassword = "look4sat123"
         }
     }
     buildTypes {
         release {
-            signingConfig = signingConfigs.findByName("release")
+            signingConfig = signingConfigs.getByName("release")
         }
     }
-}
+}

app/src/main/AndroidManifest.xml

@@ -43,7 +43,7 @@
 
         <meta-data
             android:name="android.telephony.PROPERTY_SATELLITE_DATA_OPTIMIZED"
-            android:value="com.rtbishop.look4sat.bg7nta" />
+            android:value="com.rtbishop.look4sat" />
 
     </application>
 </manifest>

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

@@ -49,7 +49,7 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         observeNightFilterState()
         setContent {
-            MainTheme(isDarkTheme = true) { MainScreen() }
+            MainTheme(isDarkTheme = true) { NavRoot() }
         }
     }
 

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

@@ -17,23 +17,14 @@
  */
 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
@@ -51,7 +42,7 @@ 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.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
@@ -60,9 +51,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -90,48 +78,49 @@ 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
+import com.rtbishop.look4sat.feature.status.SatStatusDestination
 
 @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)
-        }
+        deeplink?.let { rootBackStack.add(deeplinkResolver.resolve(it)) }
     }
     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 })
+    val navigateToRadar: () -> Unit = { rootBackStack.add(RadarDestination) }
+    // Incoming screen slides in from the right, outgoing drifts left at 1/3 speed (API35+ style)
+    val pushTransition = slideInHorizontally(tween(300)) { it } togetherWith
+        slideOutHorizontally(tween(300)) { -it / 3 }
+    // Reverse: outgoing slides out to the right, incoming drifts in from the left
+    val popTransition = slideInHorizontally(tween(300)) { -it / 3 } togetherWith
+        slideOutHorizontally(tween(300)) { it }
     NavDisplay(
         modifier = Modifier.fillMaxSize(),
         backStack = rootBackStack,
         onBack = navigateBack,
-        transitionSpec = { slideInTransition },
-        popTransitionSpec = { slideOutTransition },
-        predictivePopTransitionSpec = { slideOutTransition },
+        transitionSpec = { pushTransition },
+        popTransitionSpec = { popTransition },
+        predictivePopTransitionSpec = { popTransition },
         entryDecorators = listOf(
-            rememberSaveableStateHolderNavEntryDecorator(), // Required for saving Compose state per entry
-            rememberViewModelStoreNavEntryDecorator() // Required for ViewModel scoping per entry
+            rememberSaveableStateHolderNavEntryDecorator(),
+            rememberViewModelStoreNavEntryDecorator()
         ),
         entryProvider = entryProvider {
-            entry<Screen.Passes> { MainScreen(navigateToRadar = { rootBackStack.add(RadarDestination) }) }
+            entry<Screen.Passes> { MainScreen(navigateToRadar = navigateToRadar) }
             entry<RadarDestination> {
-                Scaffold { innerPadding ->
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colorScheme.background
+                ) {
                     RadarDestination(navigateUp = navigateBack)
-                    innerPadding.calculateTopPadding()
                 }
             }
         }
@@ -144,35 +133,12 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
     val currentKey = backStack.lastOrNull()
     val navigateBack: () -> Unit = { backStack.removeLastOrNull() }
     val fadeTransition = fadeIn(animationSpec = tween(350)) togetherWith fadeOut(animationSpec = tween(350))
+    val navItems = listOf(Screen.Satellites, Screen.Passes, Screen.Mutual, Screen.Map, Screen.AMSAT, Screen.Settings)
+
     val context = LocalContext.current
     val container = (context.applicationContext as IContainerProvider).getMainContainer()
     val trackingState by container.radioTrackingService.state.collectAsStateWithLifecycle()
     val otherSettings by container.settingsRepo.otherSettings.collectAsStateWithLifecycle()
-    // UI 设置: 按 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,
@@ -187,16 +153,13 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
     ) {
         NavigationSuiteScaffold(
             navigationSuiteItems = {
-                mainNavItems.forEach { screen ->
+                navItems.forEach { screen ->
                     val isSelected = when (currentKey) {
                         is Screen.Satellites -> screen is Screen.Satellites
                         is Screen.Passes -> screen is Screen.Passes
-                        is Screen.Radar -> screen is Screen.Radar
                         is Screen.Mutual -> screen is Screen.Mutual
-                        is Screen.CwDecode -> screen is Screen.CwDecode
-                        is Screen.WavelogLog -> screen is Screen.WavelogLog
-                        is Screen.AmSat -> screen is Screen.AmSat
                         is Screen.Map -> screen is Screen.Map
+                        is Screen.AMSAT -> screen is Screen.AMSAT
                         is Screen.Settings -> screen is Screen.Settings
                         else -> false
                     }
@@ -206,26 +169,11 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
                         selected = isSelected,
                         onClick = {
                             if (isSelected) return@item
-                            moreExpanded = false
                             while (backStack.size > 1) backStack.removeAt(backStack.size - 1)
                             if (screen !is Screen.Passes) backStack.add(screen)
                         }
                     )
                 }
-                // 更多菜单按钮(固定第 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
@@ -236,137 +184,100 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
                 else -> NavigationSuiteType.ShortNavigationBarMedium
             }
         ) {
-            Box {
-                Column(modifier = Modifier.fillMaxSize()) {
-                    NavDisplay(
-                        backStack = backStack,
-                        modifier = Modifier.weight(1f).fillMaxWidth(),
-                        onBack = navigateBack,
-                        transitionSpec = { fadeTransition },
-                        popTransitionSpec = { fadeTransition },
-                        predictivePopTransitionSpec = { fadeTransition },
-                        entryDecorators = listOf(
-                            // Required for saving Compose state per entry
-                            rememberSaveableStateHolderNavEntryDecorator(),
-                            // Required for ViewModel scoping per entry
-                            rememberViewModelStoreNavEntryDecorator()
-                        ),
-                        entryProvider = entryProvider {
-                            entry<Screen.Satellites> {
-                                SatellitesDestination(navigateUp = navigateBack)
-                            }
-                            entry<Screen.Passes> {
-                                PassesDestination { catNum, aosTime ->
-                                    container.setMutualPassData(MutualPassData())
-                                    container.satelliteRepo.selectPass(catNum, aosTime)
-                                    backStack.add(Screen.Radar)
-    //                            navigateToRadar()
-                                }
-                            }
-                            entry<Screen.Radar> {
-                                RadarDestination(navigateUp = navigateBack)
-                            }
-                            entry<Screen.Map> {
-                                MapDestination()
-                            }
-                            entry<Screen.Mutual> {
-                                MutualScreen(
-                                    viewModel = mutualViewModel,
-                                    navigateUp = navigateBack,
-                                    navigateToRadar = { catNum, aosTime, pass ->
-                                        container.setMutualPassData(pass ?: MutualPassData())
-                                        container.satelliteRepo.selectPass(catNum, aosTime)
-                                        backStack.add(Screen.Radar)
-                                    }
-                                )
-                            }
-                            entry<Screen.Roaming> {
-                                RoamingScreen()
-                            }
-                            entry<Screen.CwDecode> {
-                                CwDecodeScreen()
-                            }
-                            entry<Screen.AmSat> {
-                                SatStatusScreen(container = container)
-                            }
-                            entry<Screen.WavelogLog> {
-                                WavelogLogScreen(queue = container.wavelogQueue)
-                            }
-                            entry<Screen.Settings> {
-                                SettingsDestination()
+            Column {
+                NavDisplay(
+                    backStack = backStack,
+                    modifier = Modifier.weight(1f),
+                    onBack = navigateBack,
+                    transitionSpec = { fadeTransition },
+                    popTransitionSpec = { fadeTransition },
+                    predictivePopTransitionSpec = { fadeTransition },
+                    entryDecorators = listOf(
+                        // Required for saving Compose state per entry
+                        rememberSaveableStateHolderNavEntryDecorator(),
+                        // Required for ViewModel scoping per entry
+                        rememberViewModelStoreNavEntryDecorator()
+                    ),
+                    entryProvider = entryProvider {
+                        entry<Screen.Satellites> {
+                            SatellitesDestination(navigateUp = navigateBack)
+                        }
+                        entry<Screen.Passes> {
+                            PassesDestination { catNum, aosTime ->
+                                container.setMutualPassData(MutualPassData())
+                                container.satelliteRepo.selectPass(catNum, aosTime)
+                                navigateToRadar()
                             }
                         }
-                    )
-                    // Radio tracking status banner
-                    if (trackingState.isActive) {
-                        val infiniteTransition = rememberInfiniteTransition(label = "trackingPulse")
-                        val alpha by infiniteTransition.animateFloat(
-                            initialValue = 1f, targetValue = 0.4f,
-                            animationSpec = infiniteRepeatable(
-                                animation = tween(1000, easing = LinearEasing),
-                                repeatMode = RepeatMode.Reverse
-                            ), label = "pulseAlpha"
-                        )
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .background(MaterialTheme.colorScheme.primaryContainer)
-                                .clickable {
-                                    val pass = trackingState.currentPass
-                                    if (pass != null) {
-                                        container.setMutualPassData(MutualPassData())
-                                        container.satelliteRepo.selectPass(pass.catNum, pass.aosTime)
-                                        backStack.add(Screen.Radar)
-                                    }
+                        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)
+                                    navigateToRadar()
                                 }
-                                .padding(horizontal = 12.dp, vertical = 6.dp)
-                        ) {
-                            Box(
-                                modifier = Modifier
-                                    .size(8.dp)
-                                    .clip(CircleShape)
-                                    .background(Color(0xFF4CAF50).copy(alpha = alpha))
-                            )
-                            Spacer(modifier = Modifier.width(8.dp))
-                            Text(
-                                text = stringResource(com.rtbishop.look4sat.core.presentation.R.string.tracking_status, trackingState.currentPass?.name ?: ""),
-                                fontSize = 13.sp,
-                                fontWeight = FontWeight.Medium,
-                                color = MaterialTheme.colorScheme.onPrimaryContainer,
-                                modifier = Modifier.weight(1f)
-                            )
-                            val txOk = if (trackingState.txConnected) "TX" else ""
-                            val rxOk = if (trackingState.rxConnected) "RX" else ""
-                            Text(
-                                text = listOf(txOk, rxOk).filter { it.isNotBlank() }.joinToString("/"),
-                                fontSize = 12.sp,
-                                color = MaterialTheme.colorScheme.onPrimaryContainer
                             )
                         }
+                        entry<Screen.AMSAT> { SatStatusDestination() }
+                        entry<Screen.Settings> {
+                            SettingsDestination()
+                        }
                     }
-                }
-                // 更多菜单弹出面板(覆盖在内容上, 底部栏上方; 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)
-                        }
+                )
+                // 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)
+                                    navigateToRadar()
+                                }
+                            }
+                            .padding(horizontal = 12.dp, vertical = 6.dp)
+                    ) {
+                        Box(
+                            modifier = Modifier
+                                .size(8.dp)
+                                .clip(CircleShape)
+                                .background(Color(0xFF4CAF50).copy(alpha = alpha))
+                        )
+                        Spacer(modifier = Modifier.width(8.dp))
+                        Text(
+                            text = "Tracking: ${trackingState.currentPass?.name ?: ""}",
+                            fontSize = 13.sp,
+                            fontWeight = FontWeight.Medium,
+                            color = MaterialTheme.colorScheme.onPrimaryContainer,
+                            modifier = Modifier.weight(1f)
+                        )
+                        val txOk = if (trackingState.txConnected) "TX" else ""
+                        val rxOk = if (trackingState.rxConnected) "RX" else ""
+                        Text(
+                            text = listOf(txOk, rxOk).filter { it.isNotBlank() }.joinToString("/"),
+                            fontSize = 12.sp,
+                            color = MaterialTheme.colorScheme.onPrimaryContainer
+                        )
+                    }
                 }
             }
         }
     }
-}
+}

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

@@ -1,106 +0,0 @@
-/*
- * MoreMenuPopup.kt — 底部导航「更多」二级菜单弹出面板(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>

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

@@ -31,12 +31,10 @@ 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"))

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

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

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

@@ -17,8 +17,10 @@
  */
 package com.rtbishop.look4sat.core.data.framework
 
+import com.rtbishop.look4sat.core.domain.model.Constants
 import com.rtbishop.look4sat.core.domain.repository.IReporter
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -31,18 +33,30 @@ class NetworkReporter(
     private val rotatorServer: String,
     private val rotatorPort: Int,
     private val frequencyServer: String,
-    private val frequencyPort: Int
+    private val frequencyPort: Int,
+    private val frequencyOffsetHz: Long = 0L
 ) : IReporter {
 
     private val writeMutex = Mutex()
+    private val connectionMutex = Mutex()
+    private val frequencyCommands = Channel<String>(Channel.CONFLATED)
 
     private var rotatorSocket: SocketChannel? = null
     private var rotatorConnected = false
-    private var rotatorConnecting = false
 
     private var frequencySocket: SocketChannel? = null
     private var frequencyConnected = false
-    private var frequencyConnecting = false
+
+    init {
+        // Keep only the latest frequency command to avoid stale backlog and effective lag.
+        reporterScope.launch {
+            for (command in frequencyCommands) {
+                ensureFrequencyConnected()
+                if (!frequencyConnected) continue
+                write(frequencySocket, command) { resetFrequencyConnection() }
+            }
+        }
+    }
 
     override fun reportRotation(format: String, azimuth: Double, elevation: Double) {
         reporterScope.launch {
@@ -53,51 +67,48 @@ class NetworkReporter(
                 .replace($$"$AZ", azimuth.toString())
                 .replace($$"$EL", el.toString())
                 .unescapeControlChars()
-            write(rotatorSocket, command) { rotatorConnected = false }
+            write(rotatorSocket, command) { resetRotatorConnection() }
         }
     }
 
     override fun reportFrequency(format: String, frequency: Long) {
-        reporterScope.launch {
-            ensureFrequencyConnected()
-            if (!frequencyConnected) return@launch
-            val command = format
-                .replace($$"$FREQ", frequency.toString())
-                .unescapeControlChars()
-            write(frequencySocket, command) { frequencyConnected = false }
-        }
+        val clampedOffset = frequencyOffsetHz.coerceIn(
+            Constants.FREQ_OFFSET_MIN_HZ,
+            Constants.FREQ_OFFSET_MAX_HZ
+        )
+        val correctedFreq = frequency.coerceAtLeast(0L).safeAdd(clampedOffset).coerceAtLeast(0L)
+        val command = format
+            .replace($$"$FREQ", correctedFreq.toString())
+            .unescapeControlChars()
+        frequencyCommands.trySend(command)
     }
 
-    private fun ensureRotatorConnected() {
-        if (rotatorConnected || rotatorConnecting || rotatorServer.isBlank()) return
-        reporterScope.launch {
+    private suspend fun ensureRotatorConnected() {
+        connectionMutex.withLock {
+            if (rotatorConnected || rotatorServer.isBlank()) return
             try {
-                rotatorConnecting = true
+                resetRotatorConnection()
                 rotatorSocket = SocketChannel.open(InetSocketAddress(rotatorServer, rotatorPort))
                 rotatorConnected = true
                 println("NetworkReporter: Rotator connected to $rotatorServer:$rotatorPort")
             } catch (e: Exception) {
                 println("NetworkReporter rotator connect error: ${e.message}")
-                rotatorConnected = false
-            } finally {
-                rotatorConnecting = false
+                resetRotatorConnection()
             }
         }
     }
 
-    private fun ensureFrequencyConnected() {
-        if (frequencyConnected || frequencyConnecting || frequencyServer.isBlank()) return
-        reporterScope.launch {
+    private suspend fun ensureFrequencyConnected() {
+        connectionMutex.withLock {
+            if (frequencyConnected || frequencyServer.isBlank()) return
             try {
-                frequencyConnecting = true
+                resetFrequencyConnection()
                 frequencySocket = SocketChannel.open(InetSocketAddress(frequencyServer, frequencyPort))
                 frequencyConnected = true
                 println("NetworkReporter: Frequency connected to $frequencyServer:$frequencyPort")
             } catch (e: Exception) {
                 println("NetworkReporter frequency connect error: ${e.message}")
-                frequencyConnected = false
-            } finally {
-                frequencyConnecting = false
+                resetFrequencyConnection()
             }
         }
     }
@@ -106,7 +117,9 @@ class NetworkReporter(
         try {
             writeMutex.withLock {
                 val buffer = ByteBuffer.wrap("$command\n".toByteArray())
-                socket?.write(buffer)
+                while (buffer.hasRemaining()) {
+                    socket?.write(buffer)
+                }
             }
         } catch (e: Exception) {
             println("NetworkReporter write error: ${e.message}")
@@ -114,6 +127,34 @@ class NetworkReporter(
         }
     }
 
+    private fun resetRotatorConnection() {
+        rotatorConnected = false
+        closeQuietly(rotatorSocket)
+        rotatorSocket = null
+    }
+
+    private fun resetFrequencyConnection() {
+        frequencyConnected = false
+        closeQuietly(frequencySocket)
+        frequencySocket = null
+    }
+
+    private fun closeQuietly(socket: SocketChannel?) {
+        try {
+            socket?.close()
+        } catch (_: Exception) {}
+    }
+
+    private fun Long.safeAdd(delta: Long): Long {
+        return when {
+            delta > 0 && this > Long.MAX_VALUE - delta -> Long.MAX_VALUE
+            delta < 0 && this < Long.MIN_VALUE - delta -> Long.MIN_VALUE
+            else -> this + delta
+        }
+    }
+
     private fun String.unescapeControlChars(): String =
-        replace("\\r", "\r").replace("\\n", "\n").replace("\\t", "\t")
+        replace("""\r""", 13.toChar().toString())
+            .replace("""\n""", 10.toChar().toString())
+            .replace("""\t""", 9.toChar().toString())
 }

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

@@ -41,9 +41,6 @@ import com.rtbishop.look4sat.core.data.usecase.AddToCalendar
 import com.rtbishop.look4sat.core.data.usecase.AudioCapture
 import com.rtbishop.look4sat.core.data.usecase.SaveImage
 import com.rtbishop.look4sat.core.data.usecase.ShowToast
-import com.rtbishop.look4sat.core.domain.wavelog.IWavelogQueueStore
-import com.rtbishop.look4sat.core.domain.wavelog.WavelogQueue
-import com.rtbishop.look4sat.core.domain.wavelog.WavelogUploader
 import com.rtbishop.look4sat.core.domain.model.RadioControlSettings
 import com.rtbishop.look4sat.core.domain.repository.IDatabaseRepo
 import com.rtbishop.look4sat.core.domain.repository.IMainContainer
@@ -74,14 +71,14 @@ import okhttp3.OkHttpClient
 class MainContainer(private val context: Context) : IMainContainer {
 
     private val localSource = provideLocalSource()
-    private val remoteSource by lazy { provideRemoteSource() }
+    private val remoteSource = provideRemoteSource()
     private val mainHandler = CoroutineExceptionHandler { _, error -> println("MainHandler: $error") }
     override val appScope = CoroutineScope(SupervisorJob() + Dispatchers.Default + mainHandler)
     override val settingsRepo = provideSettingsRepo()
     override val selectionRepo = provideSelectionRepo()
     override val satelliteRepo = provideSatelliteRepo()
     override val databaseRepo = provideDatabaseRepo()
-    override val amSatRepo = AmSatRepository(remoteSource)
+    override val amSatRepo by lazy { AmSatRepository(remoteSource) }
     override val radioTrackingService: IRadioTrackingService by lazy {
         val manager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
         RadioTrackingService(appScope, manager, satelliteRepo, settingsRepo)
@@ -102,16 +99,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
@@ -130,7 +117,8 @@ class MainContainer(private val context: Context) : IMainContainer {
             rc.rotatorAddress,
             rc.rotatorPort.toIntOrNull() ?: 0,
             rc.frequencyAddress,
-            rc.frequencyPort.toIntOrNull() ?: 0
+            rc.frequencyPort.toIntOrNull() ?: 0,
+            rc.frequencyOffsetHz
         )
     }
 
@@ -165,6 +153,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 +164,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 +180,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 +1,159 @@
 package com.rtbishop.look4sat.core.data.repository
 
-import com.rtbishop.look4sat.core.data.source.AmSatParser
+import com.rtbishop.look4sat.core.domain.model.SatDay
+import com.rtbishop.look4sat.core.domain.model.SatReport
+import com.rtbishop.look4sat.core.domain.model.SatSlot
+import com.rtbishop.look4sat.core.domain.model.SatStatus
 import com.rtbishop.look4sat.core.domain.model.SatStatusPage
 import com.rtbishop.look4sat.core.domain.repository.IAmSatRepository
 import com.rtbishop.look4sat.core.domain.source.IRemoteSource
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.json.JSONObject
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Locale
+import java.util.TimeZone
 
-/** AMSAT 状态仓库: 抓 HTML → 解析 → SatStatusPage */
+/** One report from the AMSAT API (data layer model). */
+private data class ApiReport(
+    val id: String,
+    val name: String,
+    val callsign: String,
+    val report: String,
+    val gridSquare: String,
+    val reportedTimeUtcSec: Long
+)
+
+/** AMSAT status repository using RemoteSource (Clean Architecture: data layer handles HTTP). */
 class AmSatRepository(private val remoteSource: IRemoteSource) : IAmSatRepository {
 
-    override suspend fun fetchStatus(): SatStatusPage? {
-        val html = remoteSource.getStatusHtml() ?: return null
-        if (html.isBlank()) return null
+    private val isoUtcFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US).apply {
+        timeZone = TimeZone.getTimeZone("UTC")
+    }
+
+    override suspend fun fetchStatus(): SatStatusPage? = withContext(Dispatchers.IO) {
+        val nowSec = System.currentTimeMillis() / 1000
+        val catalogJson = remoteSource.getAmSatCatalog() ?: return@withContext null
+        // 72h = 3 days; API hard cap is limit=500 regardless of what we send.
+        // 500 records across ~100 catalog satellites ≈ ~1-5 reports/satellite/day — enough for 3 days.
+        // Upgrade path: paginate or request AMSAT to raise the cap if catalog grows beyond ~200 sats.
+        val reportsJson = remoteSource.getAmSatReports(hours = 72, limit = 500) ?: return@withContext null
+        
+        val names = parseCatalog(catalogJson)
+        val reports = parseReports(reportsJson)
+        
+        if (names.isEmpty() && reports.isEmpty()) return@withContext null
+        
+        val statuses = buildStatuses(names, reports, nowSec)
+        val reportMap = reports.associate { it.id to toSatReport(it) }
+        SatStatusPage(System.currentTimeMillis(), statuses, reportMap)
+    }
+
+    /** Parse catalog JSON to list of satellite names */
+    private fun parseCatalog(json: String): List<String> {
         return try {
-            AmSatParser.parse(html, System.currentTimeMillis())
-        } catch (exception: Exception) {
-            println("AmSatRepository parse exception: $exception")
-            null
+            val arr = JSONObject(json).getJSONArray("data")
+            (0 until arr.length()).map { arr.getJSONObject(it).getString("name") }
+        } catch (_: Exception) {
+            emptyList()
         }
     }
+
+    /** Parse reports JSON to list of ApiReport domain objects */
+    private fun parseReports(json: String): List<ApiReport> {
+        return try {
+            val arr = JSONObject(json).getJSONArray("data")
+            (0 until arr.length()).mapNotNull { i ->
+                val o = arr.getJSONObject(i)
+                val iso = o.optString("reported_time", "")
+                if (iso.isEmpty()) null else ApiReport(
+                    id = o.optString("id", ""),
+                    name = o.optString("name", ""),
+                    callsign = o.optString("callsign", ""),
+                    report = o.optString("report", ""),
+                    gridSquare = o.optString("grid_square", ""),
+                    reportedTimeUtcSec = parseIsoUtcSec(iso)
+                )
+            }
+        } catch (_: Exception) {
+            emptyList()
+        }
+    }
+
+    /** Parse ISO 8601 UTC timestamp to epoch seconds (e.g., "2026-08-05T07:30:00Z") */
+    private fun parseIsoUtcSec(iso: String): Long {
+        return try {
+            (isoUtcFormat.parse(iso)?.time ?: 0L) / 1000
+        } catch (_: Exception) {
+            0L
+        }
+    }
+
+    /** Build one SatStatus (3 days x 12 slots) per catalog satellite, slotting reports by age. */
+    private fun buildStatuses(names: List<String>, reports: List<ApiReport>, nowSec: Long): List<SatStatus> {
+        val byName = reports.groupBy { it.name }
+        val monthAbbr = arrayOf("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec")
+        val utc = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
+        val labels = (0 until 3).map { d ->
+            utc.timeInMillis = (nowSec - d * 86400L) * 1000
+            "${monthAbbr[utc.get(Calendar.MONTH)]} ${utc.get(Calendar.DAY_OF_MONTH)}"
+        }
+        return names.map { name ->
+            val slots = (0 until 36).map { slotIdx ->
+                val slotStart = nowSec - (slotIdx + 1) * 7200L
+                val slotEnd = nowSec - slotIdx * 7200L
+                val inSlot = byName[name].orEmpty().filter { it.reportedTimeUtcSec in slotStart until slotEnd }
+                if (inSlot.isEmpty()) {
+                    SatSlot(statusColor = NO_REPORT_GRAY, count = 0)
+                } else {
+                    val newest = inSlot.maxByOrNull { it.reportedTimeUtcSec }!!
+                    SatSlot(
+                        statusColor = statusColorOf(newest.report),
+                        count = inSlot.size,
+                        reportIds = inSlot.map { it.id }
+                    )
+                }
+            }
+            val days = (0 until 3).map { d ->
+                SatDay(dateLabel = labels[d], slots = slots.subList(d * 12, (d + 1) * 12))
+            }
+            SatStatus(name = name, days = days)
+        }
+    }
+
+    private fun toSatReport(r: ApiReport): SatReport {
+        val cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
+        cal.timeInMillis = r.reportedTimeUtcSec * 1000
+        val hh = cal.get(Calendar.HOUR_OF_DAY).toString().padStart(2, '0')
+        val mm = cal.get(Calendar.MINUTE).toString().padStart(2, '0')
+        val y = cal.get(Calendar.YEAR)
+        val mo = (cal.get(Calendar.MONTH) + 1).toString().padStart(2, '0')
+        val d = cal.get(Calendar.DAY_OF_MONTH).toString().padStart(2, '0')
+        return SatReport(
+            id = r.id,
+            statusText = r.report,
+            call = r.callsign,
+            grid = r.gridSquare,
+            dateUtc = "$y-$mo-$d",
+            timeUtc = "$hh:$mm UTC"
+        )
+    }
+
+    /** Map status text to color value (for UI rendering). */
+    private fun statusColorOf(report: String): Long = when (report.lowercase()) {
+        "heard", "crew active" -> ACTIVE_BLUE
+        "telemetry only" -> TLM_ORANGE
+        "not heard" -> NOT_HEARD_PINK
+        else -> CONFLICT_DEEP_ORANGE
+    }
+
+    companion object {
+        // AMSAT official status colors (from amsat.org/status)
+        private const val ACTIVE_BLUE = 0xFF648FFF
+        private const val TLM_ORANGE = 0xFFFFB000
+        private const val NOT_HEARD_PINK = 0xFFDC267F
+        private const val CONFLICT_DEEP_ORANGE = 0xFFFE6100
+        private const val NO_REPORT_GRAY = 0xFFC0C0C0
+    }
 }

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

@@ -66,36 +66,27 @@ class DatabaseRepo(
     }
 
     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)
-        }.filterValues { it.isNotBlank() }
-        val radioUrls = buildMap {
-            putAll(Sources.transceiversDataUrls)
-            put("SatNOGS", if (dataSourcesSettings.useCustomTransceivers && dataSourcesSettings.transceiversUrl.isNotBlank())
-                dataSourcesSettings.transceiversUrl else Sources.defaultTransceiversUrl)
-        }.filterValues { it.isNotBlank() }
+        val settings = settingsRepo.dataSourcesSettings.value
+        val tleUrls = settings.satelliteUrls.filter { it.isNotBlank() }.map(::normalizeUrl).distinct()
+        val radioUrls = settings.transceiversUrls.filter { it.isNotBlank() }.map(::normalizeUrl).distinct()
+        val builtinTypesByUrl = Sources.satelliteDataUrls
+            .filterValues { it.isNotBlank() }
+            .mapValues { normalizeUrl(it.value) }
+            .entries
+            .associate { (type, url) -> url to type }
+        val importedTypeIds = mutableMapOf<String, MutableList<Int>>()
         // 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")
+        val tleJobs = tleUrls.map { url -> async { url to remoteSource.getNetworkStream(url) } }
+        val radioJobs = radioUrls.map { url -> async { url to remoteSource.getNetworkStream(url) } }
+        // parse fetched data concurrently and associate known built-in URLs with existing type filters.
+        val importedEntries = tleJobs.awaitAll().flatMap { (url, stream) ->
+            val entries = stream?.let { parseSatelliteStream(url, unwrapIfZipped(url, it)) }.orEmpty()
+            val type = builtinTypesByUrl[url] ?: customSourceType
+            importedTypeIds.getOrPut(type) { mutableListOf() }.addAll(entries.map { it.catnum })
+            entries
         }
-        // parse fetched data concurrently and associate with types
-        val importedEntries = tleResults.flatMap { (url, stream) ->
-            val type = tleUrls.entries.find { it.value == url }?.key ?: customSourceType
-            stream?.let { parseSatelliteStream(url, unwrapIfZipped(url, it)) }.orEmpty().also { entries ->
-                settingsRepo.setSatelliteTypeIds(type, entries.map { it.catnum })
-            }
-        }
-        val importedRadios = radioResults.flatMap { (url, stream) ->
+        importedTypeIds.forEach { (type, ids) -> settingsRepo.setSatelliteTypeIds(type, ids.distinct()) }
+        val importedRadios = radioJobs.awaitAll().flatMap { (url, stream) ->
             stream?.let { dataParser.parseJSONStream(unwrapIfZipped(url, it)) }.orEmpty()
         }
         // insert parsed data into the database
@@ -110,6 +101,9 @@ class DatabaseRepo(
         setUpdateSuccessful(0L)
     }
 
+    private fun normalizeUrl(url: String): String =
+        if (url.startsWith("http", ignoreCase = true)) url else "https://$url"
+
     private suspend fun parseSatelliteStream(url: String, stream: InputStream): List<OrbitalData> {
         val bufferedStream = stream.buffered()
         return when {

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

@@ -34,6 +34,7 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.withContext
 import java.util.TimeZone
@@ -63,19 +64,23 @@ class SatelliteRepo(
     override suspend fun getRadiosWithId(id: Int) = localStorage.getRadiosWithId(id)
 
     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
-            )
-        }
+        combine(
+            settingsRepo.selectedIds,
+            settingsRepo.stationPosition
+        ) { selectedIds, _ -> selectedIds }
+            .collect { selectedIds ->
+                _satellites.update { localStorage.getEntriesWithIds(selectedIds) }
+                val settings = settingsRepo.passesSettings.value
+                calculatePasses(
+                    time = System.currentTimeMillis(),
+                    hoursAhead = settings.hoursAhead,
+                    minElevation = settings.minElevation,
+                    aosStartMinute = settings.aosStartMinute,
+                    aosEndMinute = settings.aosEndMinute,
+                    invertAosTimeWindow = settings.invertAosTimeWindow,
+                    modes = settings.selectedModes
+                )
+            }
     }
 
     override suspend fun getPosition(sat: OrbitalObject, pos: GeoPos, time: Long): OrbitalPos {
@@ -95,8 +100,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) },
@@ -236,16 +247,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 +267,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

@@ -29,7 +29,6 @@ import com.rtbishop.look4sat.core.domain.model.OtherSettings
 import com.rtbishop.look4sat.core.domain.model.PassesSettings
 import com.rtbishop.look4sat.core.domain.model.RCSettings
 import com.rtbishop.look4sat.core.domain.model.RadioControlSettings
-import com.rtbishop.look4sat.core.domain.source.Sources
 import com.rtbishop.look4sat.core.domain.predict.GeoPos
 import com.rtbishop.look4sat.core.domain.repository.ISettingsRepo
 import com.rtbishop.look4sat.core.domain.utility.positionToQth
@@ -38,9 +37,10 @@ import com.rtbishop.look4sat.core.domain.utility.round
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
+import com.rtbishop.look4sat.core.domain.model.Constants
+import com.rtbishop.look4sat.core.domain.source.Sources
 
 class SettingsRepo(
-    private val context: android.content.Context,
     private val locationManager: LocationManager,
     private val preferences: SharedPreferences,
     override val appVersionName: String
@@ -69,6 +69,7 @@ class SettingsRepo(
     private val keyFrequencyAddress = "frequencyAddress"
     private val keyFrequencyPort = "frequencyPort"
     private val keyFrequencyFormat = "frequencyFormat"
+    private val keyFrequencyOffsetHz = "frequencyOffsetHz"
     private val keySelectedIds = "selectedIds"
     private val keySelectedTypes = "selectedTypes"
     private val keySelectedModes = "selectedModes"
@@ -78,8 +79,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"
@@ -95,12 +94,10 @@ class SettingsRepo(
     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 keySatelliteUrls = "satelliteUrls"
+    private val keyTransceiversUrls = "transceiversUrls"
     private val separatorComma = ","
+    private val separatorUrl = "\n"
 
     //region # Satellites selection settings
     private val _satelliteSelection = MutableStateFlow(getSelectedIds())
@@ -187,41 +184,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 +219,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")
@@ -325,6 +304,10 @@ class SettingsRepo(
     override val rcSettings: StateFlow<RCSettings> = _rcSettings
 
     override fun updateRCSettings(settings: RCSettings) {
+        val clampedFreqOffsetHz = settings.frequencyOffsetHz.coerceIn(
+            Constants.FREQ_OFFSET_MIN_HZ,
+            Constants.FREQ_OFFSET_MAX_HZ
+        )
         preferences.edit {
             putBoolean(keyRotatorState, settings.rotatorState)
             putString(keyRotatorAddress, settings.rotatorAddress)
@@ -334,6 +317,7 @@ class SettingsRepo(
             putString(keyFrequencyAddress, settings.frequencyAddress)
             putString(keyFrequencyPort, settings.frequencyPort)
             putString(keyFrequencyFormat, settings.frequencyFormat)
+            putLong(keyFrequencyOffsetHz, clampedFreqOffsetHz)
             putBoolean(keyBluetoothRotatorState, settings.bluetoothRotatorState)
             putString(keyBluetoothRotatorFormat, settings.bluetoothRotatorFormat)
             putString(keyBluetoothRotatorName, settings.bluetoothRotatorName)
@@ -342,7 +326,7 @@ class SettingsRepo(
             putString(keyBluetoothFrequencyFormat, settings.bluetoothFrequencyFormat)
             putString(keyBluetoothFrequencyAddress, settings.bluetoothFrequencyAddress)
         }
-        _rcSettings.value = settings
+        _rcSettings.value = settings.copy(frequencyOffsetHz = clampedFreqOffsetHz)
     }
 
     private fun getRCSettings(): RCSettings = RCSettings(
@@ -354,6 +338,8 @@ class SettingsRepo(
         frequencyAddress = preferences.getString(keyFrequencyAddress, null) ?: "127.0.0.1",
         frequencyPort = preferences.getString(keyFrequencyPort, null) ?: "4532",
         frequencyFormat = preferences.getString(keyFrequencyFormat, null) ?: $$"F $FREQ",
+        frequencyOffsetHz = preferences.getLong(keyFrequencyOffsetHz, 0L)
+            .coerceIn(Constants.FREQ_OFFSET_MIN_HZ, Constants.FREQ_OFFSET_MAX_HZ),
         bluetoothRotatorState = preferences.getBoolean(keyBluetoothRotatorState, false),
         bluetoothRotatorFormat = preferences.getString(keyBluetoothRotatorFormat, null) ?: $$"P $AZ $EL",
         bluetoothRotatorName = preferences.getString(keyBluetoothRotatorName, null) ?: "Default",
@@ -383,13 +369,6 @@ class SettingsRepo(
                 putString(keySstvMode, new.sstvMode)
                 putLong(keyLowElevation, new.lowElevation.toRawBits())
                 putLong(keyHighElevation, new.highElevation.toRawBits())
-                putStringSet(keyHiddenScreens, new.hiddenScreens.toSet())
-                putString(keyScreenOrder, new.screenOrder.joinToString(","))
-                putString(keySubMenuOrder, new.subMenuOrder.joinToString(","))
-                putString(keyWavelogUrl, new.wavelogUrl)
-                putString(keyWavelogApiKey, new.wavelogApiKey)
-                putString(keyWavelogStationId, new.wavelogStationId)
-                putBoolean(keyWavelogAutoUpload, new.wavelogAutoUpload)
             }
             new
         }
@@ -405,15 +384,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)
+        highElevation = Double.fromBits(preferences.getLong(keyHighElevation, 45.0.toRawBits()))
     )
     //endregion
 
@@ -423,27 +395,44 @@ class SettingsRepo(
 
     override fun updateDataSourcesSettings(settings: DataSourcesSettings) {
         preferences.edit {
-            putBoolean(keyUseCustomTle, settings.useCustomTLE)
-            putBoolean(keyUseCustomTransceivers, settings.useCustomTransceivers)
-            putString(keyTleUrl, settings.tleUrl)
-            putString(keyTransceiversUrl, settings.transceiversUrl)
+            putString(keySatelliteUrls, settings.satelliteUrls.joinToString(separatorUrl))
+            putString(keyTransceiversUrls, settings.transceiversUrls.joinToString(separatorUrl))
         }
         _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(
+        satelliteUrls = getDataSourceUrls(
+            key = keySatelliteUrls,
+            defaultUrls = Sources.satelliteDataUrls.values.filter { it.isNotBlank() },
+            legacyEnabledKey = keyUseCustomTle,
+            legacyUrlKey = keyTleUrl
+        ),
+        transceiversUrls = getDataSourceUrls(
+            key = keyTransceiversUrls,
+            defaultUrls = Sources.transceiversDataUrls.values.filter { it.isNotBlank() },
+            legacyEnabledKey = keyUseCustomTransceivers,
+            legacyUrlKey = keyTransceiversUrl
         )
+    )
+
+    private fun getDataSourceUrls(
+        key: String,
+        defaultUrls: List<String>,
+        legacyEnabledKey: String,
+        legacyUrlKey: String
+    ): List<String> {
+        val stored = preferences.getString(key, null)
+            ?.split(separatorUrl)
+            ?.map { it.trim() }
+            ?.filter { it.isNotBlank() }
+        if (stored != null) return stored
+        val legacyCustomUrl = preferences.getString(legacyUrlKey, null)?.trim().orEmpty()
+        return if (preferences.getBoolean(legacyEnabledKey, false) && legacyCustomUrl.isNotBlank()) {
+            (defaultUrls + legacyCustomUrl).distinct()
+        } else {
+            defaultUrls
+        }
     }
     //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

@@ -24,7 +24,6 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import java.io.ByteArrayInputStream
 import java.io.InputStream
 
 class RemoteSource(
@@ -43,32 +42,52 @@ class RemoteSource(
         }
     }
 
-    override suspend fun getStatusHtml(): String? = withContext(dispatcher) {
-        try {
-            val request = Request.Builder()
-                .url("https://amsat.org/status/")
-                .header("User-Agent", "Mozilla/5.0 (Linux; Android 13) Look4Sat/4.5")
-                .build()
-            httpClient.newCall(request).execute().use { response ->
-                if (!response.isSuccessful) return@use null
-                response.body?.string()
-            }
-        } catch (exception: Exception) {
-            println("RemoteSource amsat status exception: $exception")
-            null
-        }
-    }
-
     override suspend fun getNetworkStream(url: String): InputStream? = withContext(dispatcher) {
         try {
             val networkRequest = Request.Builder().url(url).build()
-            httpClient.newCall(networkRequest).execute().use { response ->
-                if (!response.isSuccessful) return@withContext null
-                ByteArrayInputStream(response.body.bytes())
+            val response = httpClient.newCall(networkRequest).execute()
+            if (!response.isSuccessful) {
+                response.close()
+                return@withContext null
             }
+            // Return the body stream directly as the caller is responsible for closing it.
+            // Closing the stream returns the connection to OkHttp's pool.
+            response.body.byteStream().buffered()
         } catch (exception: Exception) {
             println("RemoteSource network stream exception: $exception")
             null
         }
     }
+
+    override suspend fun getAmSatCatalog(): String? = withContext(dispatcher) {
+        try {
+            val request = Request.Builder()
+                .url("https://www.amsat.org/status/api/v1/catalog.php")
+                .header("User-Agent", "Look4Sat")
+                .build()
+            httpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) return@use null
+                response.body.string()
+            }
+        } catch (exception: Exception) {
+            println("RemoteSource getAmSatCatalog exception: $exception")
+            null
+        }
+    }
+
+    override suspend fun getAmSatReports(hours: Int, limit: Int): String? = withContext(dispatcher) {
+        try {
+            val request = Request.Builder()
+                .url("https://www.amsat.org/status/api/v1/reports.php?hours=$hours&limit=$limit")
+                .header("User-Agent", "Look4Sat")
+                .build()
+            httpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) return@use null
+                response.body.string()
+            }
+        } catch (exception: Exception) {
+            println("RemoteSource getAmSatReports exception: $exception")
+            null
+        }
+    }
 }

core/data/src/main/java/com/rtbishop/look4sat/core/data/usecase/ShowToast.kt

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

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

@@ -91,10 +91,8 @@ class DatabaseRepoTest {
         }
         val settingsRepo = FakeSettingsRepo(
             dataSources = DataSourcesSettings(
-                useCustomTLE = true,
-                useCustomTransceivers = false,
-                tleUrl = customCsvUrl,
-                transceiversUrl = ""
+                satelliteUrls = listOf(customCsvUrl),
+                transceiversUrls = emptyList()
             )
         )
         val repository = DatabaseRepo(dispatcher, dataParser, localSource, remoteSource, settingsRepo)
@@ -102,8 +100,7 @@ class DatabaseRepoTest {
         repository.updateFromRemote()
 
         assertTrue(localSource.insertedEntries.any { it.catnum == 25544 })
-        // 新语义: 开关开 + URL 非空 -> All 源用自定义 URL, 数据归入 All 类型
-        assertEquals(listOf(25544), settingsRepo.satelliteTypeIdsByType["All"])
+        assertEquals(listOf(25544), settingsRepo.satelliteTypeIdsByType["Other"])
     }
 
     private fun validCsvStream(): InputStream = """
@@ -125,6 +122,10 @@ private class FakeRemoteSource : IRemoteSource {
     override suspend fun getFileStream(uri: String): InputStream? = fileStreams[uri]?.invoke()
 
     override suspend fun getNetworkStream(url: String): InputStream? = networkStreams[url]?.invoke()
+
+    override suspend fun getAmSatCatalog(): String? = null
+
+    override suspend fun getAmSatReports(hours: Int, limit: Int): String? = null
 }
 
 private class FakeLocalSource : ILocalSource {
@@ -177,7 +178,7 @@ private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSou
     override val databaseState: MutableStateFlow<DatabaseState> = MutableStateFlow(DatabaseState(0, 0, 0L))
 
     override val rcSettings: StateFlow<RCSettings> = MutableStateFlow(
-        RCSettings(false, "", "", "", false, "", "", "", false, "", "", "", false, "", "")
+        RCSettings(false, "", "", "", false, "", "", "", 0L, false, "", "", "", false, "", "")
     )
 
     override val otherSettings: StateFlow<OtherSettings> = MutableStateFlow(
@@ -227,9 +228,7 @@ private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSou
 
 private fun defaultDataSourcesSettings(): DataSourcesSettings {
     return DataSourcesSettings(
-        useCustomTLE = false,
-        useCustomTransceivers = false,
-        tleUrl = "",
-        transceiversUrl = ""
+        satelliteUrls = emptyList(),
+        transceiversUrls = emptyList()
     )
 }

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

@@ -0,0 +1,23 @@
+/*
+ * 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.model
+
+object Constants {
+    const val FREQ_OFFSET_MIN_HZ = -50_000L
+    const val FREQ_OFFSET_MAX_HZ = 50_000L
+}

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

@@ -1,6 +1,6 @@
 package com.rtbishop.look4sat.core.domain.model
 
-/** 单条卫星状态报告(AMSAT 网站 tooltip 数据) */
+/** One satellite status report (AMSAT site tooltip data) */
 data class SatReport(
     val id: String,          // 报告 ID(a885153)
     val statusText: String,  // Heard / Telemetry Only / Not Heard ...
@@ -10,26 +10,26 @@ data class SatReport(
     val timeUtc: String      // 2:46-:59 UTC
 )
 
-/** 单个 2 小时槽的状态 */
+/** State of one 2-hour slot */
 data class SatSlot(
     val statusColor: Long,   // ARGB 状态色(-1 = 无报告)
     val count: Int,          // 报告数量(0 = 无)
     val reportIds: List<String> = emptyList() // 该槽报告 ID 列表
 )
 
-/** 卫星一天的状态(12 个 2 小时槽) */
+/** One satellite day (12 two-hour slots) */
 data class SatDay(
     val dateLabel: String,   // "Aug 4"
     val slots: List<SatSlot> // 12 槽(00-02 ... 22-24)
 )
 
-/** 单个卫星 6 天状态 */
+/** One satellite, 3 days of state */
 data class SatStatus(
     val name: String,        // "AO-123_[FM]"
-    val days: List<SatDay>   // 6 天(新→旧)
+    val days: List<SatDay>   // 3 days (newest first)
 )
 
-/** 页面整体解析结果 */
+/** Overall page parse result */
 data class SatStatusPage(
     val fetchedAtUtcMs: Long,
     val statuses: List<SatStatus>,

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

@@ -42,6 +42,7 @@ data class RCSettings(
     val frequencyAddress: String,
     val frequencyPort: String,
     val frequencyFormat: String,
+    val frequencyOffsetHz: Long = 0L,
     val bluetoothRotatorState: Boolean,
     val bluetoothRotatorFormat: String,
     val bluetoothRotatorName: String,
@@ -62,25 +63,12 @@ data class OtherSettings(
     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 highElevation: Double = 45.0
 )
 
 data class DataSourcesSettings(
-    val useCustomTLE: Boolean,
-    val useCustomTransceivers: Boolean,
-    val tleUrl: String,
-    val transceiversUrl: String
+    val satelliteUrls: List<String>,
+    val transceiversUrls: List<String>
 )
 
 data class RadioControlSettings(

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/predict/CelestialComputer.kt

@@ -424,11 +424,15 @@ object CelestialComputer {
         }
         if (sunrise == 0.0) sunrise = daynum
 
-        // Phase 4: fast-forward through the day until sun drops back below threshold
-        daynum = sunrise
+        // Phase 4: fast-forward through the day until sun drops back below threshold.
+        // Start from just after sunrise (small offset) so the sun is clearly above
+        // the threshold. This prevents a bug where Phase 3 converges to a point
+        // slightly below -threshold, causing Phase 4 to skip and Phase 5 to converge
+        // to the same time as sunrise, producing identical sunrise/sunset times.
+        daynum = sunrise + 0.001
         sunPos = getSunPosition(observer, daynumToMillis(daynum))
         guard = 0
-        while (sunPos.elevation > -threshold && guard++ < 500) {
+        while (sunPos.elevation >= -threshold && guard++ < 500) {
             daynum += 0.008
             sunPos = getSunPosition(observer, daynumToMillis(daynum))
         }

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

@@ -2,8 +2,8 @@ package com.rtbishop.look4sat.core.domain.repository
 
 import com.rtbishop.look4sat.core.domain.model.SatStatusPage
 
-/** AMSAT 卫星状态数据源 */
+/** AMSAT satellite status data source */
 interface IAmSatRepository {
-    /** 抓取并解析 AMSAT 状态页; 失败返回 null */
+    /** Fetch and parse the AMSAT status page; null on failure */
     suspend fun fetchStatus(): SatStatusPage?
 }

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

@@ -30,7 +30,7 @@ interface IMainContainer {
     val selectionRepo: ISelectionRepo
     val satelliteRepo: ISatelliteRepo
     val databaseRepo: IDatabaseRepo
-  val amSatRepo: IAmSatRepository
+    val amSatRepo: IAmSatRepository
     val radioTrackingService: IRadioTrackingService
     val mutualPassData: StateFlow<MutualPassData>
     fun setMutualPassData(data: MutualPassData)
@@ -43,9 +43,6 @@ 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(

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

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

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/repository/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,6 @@ 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?
+    suspend fun getAmSatCatalog(): String?
+    suspend fun getAmSatReports(hours: Int, limit: Int): String?
 }

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

@@ -18,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",
@@ -50,9 +46,11 @@ object Sources {
         "Classified" to "https://www.mmccants.org/tles/classfd.zip",
         "McCants" to "https://www.mmccants.org/tles/inttles.zip",
         "R4UAB" to "https://r4uab.ru/satonline.txt",
+        "ARISS" to "https://live.ariss.org/iss.txt",
         "Other" to "" // key for sats filter
     )
     val transceiversDataUrls = mapOf(
-        "SatNOGS" to "https://db.satnogs.org/api/transmitters/?format=json&status=active"
+        "SatNOGS" to "https://db.satnogs.org/api/transmitters/?format=json&status=active",
+        "R4UAB" to "https://r4uab.ru/transmitters.json"
     )
 }

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

@@ -16,20 +16,28 @@ 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:
+ * The full physical path:
  *
- *   downlink → uplink: mapDownlinkToUplink (passband) → getUplinkFreq (Doppler)
- *   uplink → downlink: mapUplinkToDownlink (passband) → getDownlinkFreq (Doppler)
+ * TX→RX (uplink → downlink):
+ *   ① 地面发射 f_tx
+ *   ② 卫星收到 f_tx × (c - v) / c  （上行多普勒）
+ *   ③ 卫星转发 = passband映射(②)    （在卫星上做映射）
+ *   ④ 地面听到 ③ × (c - v) / c     （下行多普勒）
+ *
+ * RX→TX (downlink → uplink):
+ *   ④ 地面听到 f_rx
+ *   ③ 卫星转发 = f_rx × (c + v) / c  （逆下行多普勒）
+ *   ② 卫星收到 = 逆passband映射(③)
+ *   ① 地面应发射 = ② × (c + v) / c   （逆上行多普勒）
  *
  * 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.
+     * Given a downlink frequency (what the user hears), compute the
+     * uplink frequency the user should transmit.
+     * Full path: ④→③→②→①
      */
     fun computeUplinkFromDownlink(
         downlinkHz: Long,
@@ -37,17 +45,22 @@ object DopplerFrequencyCalculator {
         orbitalPos: OrbitalPos
     ): Long? {
         if (!isLinearTransponder(transponder)) return null
-        val baseUplink = TransponderMapper.mapDownlinkToUplink(downlinkHz, transponder) ?: return null
-        return orbitalPos.getUplinkFreq(baseUplink)
+        // ④→③ 逆下行多普勒：卫星转发的频率
+        val satTx = orbitalPos.getUplinkFreq(downlinkHz)
+        // ③→② 逆 passband 映射
+        val satRx = TransponderMapper.mapDownlinkToUplink(satTx, transponder) ?: return null
+        // ②→① 逆上行多普勒：地面应发射的频率
+        return orbitalPos.getUplinkFreq(satRx)
     }
 
     /**
-     * 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.
+     * Given a downlink frequency (what the user hears), compute the
+     * uplink frequency the user should transmit, with an offset applied
+     * to the downlink (in Hz).
+     * Full path: ④→③→②→①
      *
      * The user-entered downlink frequency already includes the offset, so subtract
-     * it before mapping the downlink passband position back to the uplink.
+     * it before the inverse downlink Doppler.
      */
     fun computeUplinkFromDownlinkWithOffset(
         downlinkHz: Long,
@@ -56,13 +69,20 @@ object DopplerFrequencyCalculator {
         offsetHz: Long
     ): Long? {
         if (!isLinearTransponder(transponder)) return null
-        val baseUplink = TransponderMapper.mapDownlinkToUplink(downlinkHz - offsetHz, transponder) ?: return null
-        return orbitalPos.getUplinkFreq(baseUplink)
+        // ④→③ 逆下行多普勒：卫星转发的频率（含 offset）
+        val satTxWithOffset = orbitalPos.getUplinkFreq(downlinkHz)
+        // ③ 去掉 offset（offset 在卫星本地频率域）
+        val satTx = satTxWithOffset - offsetHz
+        // ③→② 逆 passband 映射
+        val satRx = TransponderMapper.mapDownlinkToUplink(satTx, transponder) ?: return null
+        // ②→① 逆上行多普勒：地面应发射的频率
+        return orbitalPos.getUplinkFreq(satRx)
     }
 
     /**
-     * Given an uplink frequency, compute the Doppler-corrected downlink frequency.
-     * Returns null if the transponder is not a linear passband type.
+     * Given an uplink frequency (what the user transmits), compute the
+     * downlink frequency the user will hear.
+     * Full path: ①→②→③→④
      */
     fun computeDownlinkFromUplink(
         uplinkHz: Long,
@@ -70,14 +90,19 @@ object DopplerFrequencyCalculator {
         orbitalPos: OrbitalPos
     ): Long? {
         if (!isLinearTransponder(transponder)) return null
-        val baseDownlink = TransponderMapper.mapUplinkToDownlink(uplinkHz, transponder) ?: return null
-        return orbitalPos.getDownlinkFreq(baseDownlink)
+        // ①→② 上行多普勒：卫星收到的频率
+        val satRx = orbitalPos.getDownlinkFreq(uplinkHz)
+        // ②→③ passband 映射
+        val satTx = TransponderMapper.mapUplinkToDownlink(satRx, transponder) ?: return null
+        // ③→④ 下行多普勒：地面听到的
+        return orbitalPos.getDownlinkFreq(satTx)
     }
 
     /**
-     * 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.
+     * Given an uplink frequency (what the user transmits), compute the
+     * downlink frequency the user will hear, with an offset applied
+     * to the downlink (in Hz).
+     * Full path: ①→②→③→④
      */
     fun computeDownlinkFromUplinkWithOffset(
         uplinkHz: Long,
@@ -86,8 +111,13 @@ object DopplerFrequencyCalculator {
         offsetHz: Long
     ): Long? {
         if (!isLinearTransponder(transponder)) return null
-        val baseDownlink = TransponderMapper.mapUplinkToDownlink(uplinkHz, transponder) ?: return null
-        return orbitalPos.getDownlinkFreq(baseDownlink + offsetHz)
+        // ①→② 上行多普勒：卫星收到的频率
+        val satRx = orbitalPos.getDownlinkFreq(uplinkHz)
+        // ②→③ passband 映射
+        val satTx = TransponderMapper.mapUplinkToDownlink(satRx, transponder) ?: return null
+        // ③ 加上 offset（offset 在卫星本地频率域）
+        // ③→④ 下行多普勒：地面听到的
+        return orbitalPos.getDownlinkFreq(satTx + offsetHz)
     }
 
     /** True if this transponder supports linear passband mapping. */
@@ -114,11 +144,30 @@ object DopplerFrequencyCalculator {
         val modes = listOfNotNull(transponder.downlinkMode, transponder.uplinkMode)
             .joinToString(separator = " ")
             .lowercase(Locale.ENGLISH)
-        val hasLinearName = info.contains("linear")
+        val hasLinearName = info.contains("linear") || info.contains(" lin") || info.startsWith("lin")
         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)
+        return (hasLinearName && hasTransponderName) || (hasTransponderName && hasLinearMode) ||
+                (hasLinearName && hasLinearMode)
+    }
+
+    /**
+     * Removes duplicate transponder entries that describe the same physical
+     * transponder with different mode labels (e.g. SatNOGS lists AO-7's Mode A
+     * as both "Lin SSB" and "Lin CW", and JO-97's U/V transponder as both
+     * "CW Transponder" and "SSB Transponder").
+     *
+     * Entries sharing the same uplink/downlink frequency range are considered
+     * the same transponder. The non-CW entry is preferred because its invert
+     * flag is more reliable (e.g. JO-97's CW entry wrongly has invert=false).
+     */
+    fun deduplicateTransponders(radios: List<SatRadio>): List<SatRadio> {
+        return radios.groupBy { radio ->
+            listOf(radio.uplinkLow, radio.uplinkHigh, radio.downlinkLow, radio.downlinkHigh)
+        }.values.map { group ->
+            group.firstOrNull { it.downlinkMode?.equals("CW", ignoreCase = true) != true } ?: group.first()
+        }
     }
 }

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

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

core/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/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/Components.kt

@@ -280,6 +280,35 @@ fun getDefaultPass(): OrbitalPass = OrbitalPass(
     altitude = 0, maxElevation = 0.0, orbitalObject = NearEarthObject(defaultOrbitalData), progress = 0f
 )
 
+@Composable
+fun InfoDialog(
+    title: String,
+    onDismiss: () -> Unit,
+    onAccept: () -> Unit,
+    content: @Composable () -> Unit
+) {
+    DialogShell(onDismissRequest = onDismiss) { padding ->
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(start = padding, top = padding, end = padding)
+        ) {
+            Text(
+                text = title,
+                fontSize = 16.sp,
+                fontWeight = FontWeight.Medium,
+                color = MaterialTheme.colorScheme.primary,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier.weight(1f)
+            )
+            CardButton(onClick = onAccept, text = stringResource(R.string.btn_accept))
+        }
+        content()
+    }
+}
+
 @Composable
 fun SharedDialog(
     title: String, onCancel: () -> Unit, onAccept: () -> Unit, content: @Composable () -> Unit
@@ -518,5 +547,6 @@ fun formatFrequency(frequencyHz: Long): String {
     if (frequencyHz <= 0) return "---"
     val mhz = frequencyHz / 1_000_000
     val khz = (frequencyHz % 1_000_000) / 1_000
-    return String.format(Locale.ENGLISH, "%d.%03d", mhz, khz)
+    val hz = frequencyHz % 1_000
+    return String.format(Locale.ENGLISH, "%d.%03d.%03d", mhz, khz, hz)
 }

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

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

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

@@ -21,45 +21,27 @@ 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 Map : Screen(R.drawable.ic_map, R.string.nav_map)
 
     @Serializable
-    data object Map : Screen(R.drawable.ic_map, R.string.nav_map, "Map")
+    data object Mutual : Screen(R.drawable.ic_radio_tower, R.string.nav_mutual)
 
     @Serializable
-    data object Mutual : Screen(R.drawable.ic_match, R.string.nav_mutual, "Mutual")
+    data object AMSAT : Screen(R.drawable.ic_satellite_alt, R.string.nav_amsat)
 
     @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 +70,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_add.xml

@@ -0,0 +1,3 @@
+<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="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
+</vector>

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_radio_tower.xml

@@ -0,0 +1,8 @@
+<?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="#FF000000" android:pathData="M12,10A2,2 0 0,1 14,12C14,12.5 13.82,12.94 13.53,13.29L16.7,22H14.57L12,14.93L9.43,22H7.3L10.47,13.29C10.18,12.94 10,12.5 10,12A2,2 0 0,1 12,10M12,8A4,4 0 0,0 8,12C8,12.5 8.1,13 8.28,13.46L7.4,15.86C6.53,14.81 6,13.47 6,12A6,6 0 0,1 12,6A6,6 0 0,1 18,12C18,13.47 17.47,14.81 16.6,15.86L15.72,13.46C15.9,13 16,12.5 16,12A4,4 0 0,0 12,8M12,4A8,8 0 0,0 4,12C4,14.36 5,16.5 6.64,17.94L5.92,19.94C3.54,18.11 2,15.23 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12C22,15.23 20.46,18.11 18.08,19.94L17.36,17.94C19,16.5 20,14.36 20,12A8,8 0 0,0 12,4Z" />
+</vector>

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

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

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,6v3l4,-4 -4,-4v3c-4.42,0 -8,3.58 -8,8 0,1.57 0.46,3.03 1.24,4.26L6.7,14.8c-0.45,-0.83 -0.7,-1.79 -0.7,-2.8 0,-3.31 2.69,-6 6,-6zM18.76,7.74L17.3,9.2c0.44,0.84 0.7,1.79 0.7,2.8 0,3.31 -2.69,6 -6,6v-3l-4,4 4,4v-3c4.42,0 8,-3.58 8,-8 0,-1.57 -0.46,-3.03 -1.24,-4.26z" />
-</vector>

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

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

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- AMSAT tab icon provided by rt-bishop (upstream author), original SVG asset -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.242"
+        android:scaleY="0.242"
+        android:translateX="0.3"
+        android:translateY="-230.5">
+        <path android:fillColor="#FF000000" android:pathData="m 21.275553,967.35933 a 2.0000048,2.0000048 0 0 0 -1.1875,0.59375 l -13.5000003,13.5 a 2.0000048,2.0000048 0 0 0 0,2.8125 l 18.5625003,18.59382 a 2.0000048,2.0000048 0 0 0 1.2813,0.5625 l 5.5312,0.4375 -4.0312,4.0312 a 2.0000048,2.0000048 0 0 0 0,2.8126 l 13.6874,13.7187 a 2.0000048,2.0000048 0 0 0 2.8438,0 l 4.0312,-4.0312 0.4376,5.5312 a 2.0000048,2.0000048 0 0 0 0.5624,1.2813 l 18.5938,18.5625 a 2.0000048,2.0000048 0 0 0 2.8438,0 l 13.468705,-13.4688 a 2.0000048,2.0000048 0 0 0 0,-2.8437 l -18.562505,-18.5938 a 2.0000048,2.0000048 0 0 0 -1.2812,-0.5625 l -5.5313,-0.4375 4.0313,-4.0313 a 2.0000048,2.0000048 0 0 0 0,-2.8437 l -13.6876,-13.68757 a 2.0000048,2.0000048 0 0 0 -2.8437,0 l -4.0313,4.03125 -0.4374,-5.53125 a 2.0000048,2.0000048 0 0 0 -0.5626,-1.28125 l -18.5937,-18.5625 a 2.0000048,2.0000048 0 0 0 -1.4375,-0.59375 2.0000048,2.0000048 0 0 0 -0.1875,0 z m 0.2187,4.8125 16.6563,16.65625 0.5625,7.46875 -3.7812,3.78127 -7.4688,-0.59377 -16.6562,-16.625 z m 34.5626,41.46887 7.4687,0.5937 16.656305,16.625 -10.687605,10.6875 -16.625,-16.6562 -0.5937,-7.4688 z" />
+        <path android:fillColor="#FF000000" android:pathData="m 50.940553,966.18283 a 2.000005,2.000005 0 1 0 0,3.99969 c 7.9999,0 15.9734,3.03851 22.0884,9.15344 6.103605,6.10359 9.143805,14.08909 9.143805,22.07844 a 2.000005,2.000005 0 1 0 3.9994,0 c 0,-9.00692 -3.4462,-18.03775 -10.315,-24.90657 -6.877605,-6.8775 -15.900305,-10.325 -24.916605,-10.325 z" />
+        <path android:fillColor="#FF000000" android:pathData="m 50.940553,958.36533 a 2.000005,2.000005 0 1 0 0,3.99969 c 10.0021,0 19.9781,3.79987 27.613705,11.43562 7.6352,7.63517 11.4357,17.62207 11.4357,27.61376 a 2.000005,2.000005 0 1 0 3.9997,0 c 0,-11.00842 -4.207,-22.04171 -12.6072,-30.44188 -8.399505,-8.3996 -19.424005,-12.60719 -30.441905,-12.60719 z" />
+        <path android:fillColor="#FF000000" android:pathData="m 50.940553,973.94033 a 2.000005,2.000005 0 1 0 0,3.99938 c 6.0191,0 12.0105,2.279 16.6031,6.87156 4.5926,4.59255 6.881605,10.59683 6.881605,16.60313 a 2.000005,2.000005 0 1 0 3.9997,0 c 0,-7.02618 -2.6961,-14.07429 -8.053105,-19.43126 -5.3571,-5.35696 -12.398,-8.04281 -19.4313,-8.04281 z" />
+        <path android:fillColor="#FF000000" android:pathData="m 50.940553,981.77783 a 2.000005,2.000005 0 1 0 0,3.99938 c 4.0058,0 7.9968,1.51836 11.0578,4.57937 3.061,3.06099 4.5794,7.05193 4.5794,11.05782 a 2.000005,2.000005 0 1 0 3.9994,0 c 0,-5.02276 -1.9251,-10.06035 -5.7507,-13.88594 -3.8256,-3.82559 -8.8631,-5.75063 -13.8859,-5.75063 z" />
+    </group>
+</vector>

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

@@ -112,6 +112,13 @@
     <string name="prefs_data_update_success">Actualización completada con éxito</string>
 
     <string name="prefs_data_sources_title">Custom data sources</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_url_title" translatable="false">URL</string>
+    <string name="prefs_data_sources_satellites_label" translatable="false">Satellites data</string>
+    <string name="prefs_data_sources_transceivers_label" translatable="false">Transceivers data</string>
+    <string name="prefs_net_frequency_offset_hint" translatable="false">Frequency offset (Hz)</string>
+    <string name="prefs_net_frequency_offset_help" translatable="false">Range: -50000 to 50000 Hz. Positive values increase reported frequency; negative values decrease it.</string>
     <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>
     <string name="prefs_data_sources_transceivers_switch">Custom transceivers URL</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

@@ -111,6 +111,13 @@
     <string name="prefs_data_update_success">Обновление прошло успешно</string>
 
     <string name="prefs_data_sources_title">Свои источники данных</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_url_title" translatable="false">URL</string>
+    <string name="prefs_data_sources_satellites_label" translatable="false">Satellites data</string>
+    <string name="prefs_data_sources_transceivers_label" translatable="false">Transceivers data</string>
+    <string name="prefs_net_frequency_offset_hint" translatable="false">Frequency offset (Hz)</string>
+    <string name="prefs_net_frequency_offset_help" translatable="false">Range: -50000 to 50000 Hz. Positive values increase reported frequency; negative values decrease it.</string>
     <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>
     <string name="prefs_data_sources_transceivers_switch">Custom Transceivers URL</string>
 

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

@@ -112,6 +112,13 @@
     <string name="prefs_data_update_success">යාවත්කාලීනය සම්පූර්ණ කිරීම සාර්ථකයි</string>
 
     <string name="prefs_data_sources_title">Custom data sources</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_url_title" translatable="false">URL</string>
+    <string name="prefs_data_sources_satellites_label" translatable="false">Satellites data</string>
+    <string name="prefs_data_sources_transceivers_label" translatable="false">Transceivers data</string>
+    <string name="prefs_net_frequency_offset_hint" translatable="false">Frequency offset (Hz)</string>
+    <string name="prefs_net_frequency_offset_help" translatable="false">Range: -50000 to 50000 Hz. Positive values increase reported frequency; negative values decrease it.</string>
     <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>
     <string name="prefs_data_sources_transceivers_switch">Custom transceivers URL</string>
 

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

@@ -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>
@@ -64,13 +50,13 @@
         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_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>
@@ -117,7 +103,7 @@
     <string name="map_visible">Görünür</string>
 
     <!-- Settings screen -->
-    <string name="prefs_app_title" translatable="false">Look4Sat Pro v%s</string>
+    <string name="prefs_app_title" translatable="false">Look4Sat v%s</string>
     <string name="prefs_app_url" translatable="false">https://play.google.com/store/apps/details?id=com.rtbishop.look4sat</string>
     <string name="prefs_donate_title">Bağış yap</string>
     <string name="prefs_donate_url" translatable="false">https://ko-fi.com/rt_bishop</string>
@@ -135,7 +121,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 +137,21 @@
     <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_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_satellites_label" translatable="false">Satellites data</string>
+    <string name="prefs_data_sources_transceivers_label" translatable="false">Transceivers data</string>
+    <string name="prefs_net_frequency_offset_hint" translatable="false">Frequency offset (Hz)</string>
+    <string name="prefs_net_frequency_offset_help" translatable="false">Range: -50000 to 50000 Hz. Positive values increase reported frequency; negative values decrease it.</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,48 +186,7 @@
     <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>
@@ -249,7 +198,7 @@
     <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)
@@ -257,8 +206,7 @@
         \n• Alexandru Csete (Gpredict)
         \n• Dr T.S. Kelso (Celestrak)
         \n• Libre Space Foundation (SatNOGS)
-        \n• BA7OPF (pass matching feature)
-        \n• BG7NTA</string>
+        \n• BG7NTA (CW decoding feature)</string>
     <string name="prefs_outro_license">Bu uygulama herhangi bir garanti sunmaz</string>
 
 </resources>

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

@@ -112,6 +112,13 @@
     <string name="prefs_data_update_success">Оновлення успішне</string>
 
     <string name="prefs_data_sources_title">Custom data sources</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_url_title" translatable="false">URL</string>
+    <string name="prefs_data_sources_satellites_label" translatable="false">Satellites data</string>
+    <string name="prefs_data_sources_transceivers_label" translatable="false">Transceivers data</string>
+    <string name="prefs_net_frequency_offset_hint" translatable="false">Frequency offset (Hz)</string>
+    <string name="prefs_net_frequency_offset_help" translatable="false">Range: -50000 to 50000 Hz. Positive values increase reported frequency; negative values decrease it.</string>
     <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>
     <string name="prefs_data_sources_transceivers_switch">Custom transceivers URL</string>
 

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

@@ -10,23 +10,8 @@
     <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>
@@ -53,14 +38,21 @@
     <string name="pass_error_message">没有即将过境的卫星</string>
     <string name="pass_welcome_title">欢迎来到 Look4Sat\!</string>
     <string name="pass_welcome_message">请务必在设置中通过GPS、经纬度或QTH定位您的位置\n建议至少每周更新一次数据库，以确保预测结果的准确性</string>
-    <string name="pass_whatsnew_title">Look4Sat Pro 更新内容</string>
-        <string name="pass_whatsnew_message" translatable="false">
-        * 新增: AMSAT 卫星状态页 - 实时状态表格(官网配色)、报告数量、逐卫星/逐日详细报告
-        * 日志按场次分组(场次 = 卫星 + AOS 时间), 组间横线分隔
-        * GPS 真正定位成功才会提示成功(15 秒超时, 权限检查)
-        * 卫星数据库下载失败时有明确失败提示
-        * 日志频率实时跟随多普勒面板; 左滑删除视觉恢复
-        * 印尼语识别修复(values-id)</string>
+
+    <!-- AMSAT Status screen -->
+    <string name="nav_amsat">AMSAT</string>
+    <string name="amsat_title">AMSAT 卫星状态</string>
+    <string name="amsat_refresh">刷新</string>
+    <string name="amsat_retry">重试</string>
+    <string name="amsat_updated">更新于：</string>
+    <string name="amsat_active">活跃</string>
+    <string name="amsat_tlm">遥测/信标</string>
+    <string name="amsat_not_heard">未听到</string>
+    <string name="amsat_conflict">冲突</string>
+    <string name="amsat_name">名称</string>
+    <string name="amsat_load_failed">加载失败 - 检查网络后重试</string>
+    <string name="amsat_no_reports">此时间段无报告</string>
+    <string name="amsat_close">关闭</string>
 
     <!-- Radar screen -->
     <string name="radar_back">后退</string>
@@ -115,29 +107,28 @@
     <string name="prefs_updated_title">更新：%s</string>
     <string name="prefs_updated_time">yyyy MMM d - HH:mm:ss</string>
 
-    <string name="prefs_loc_title">站位</string>
+    <string name="prefs_loc_title">站点位置</string>
     <string name="prefs_loc_gps_title">GPS 定位</string>
-    <string name="prefs_loc_gps_error">无法获取位置,请检查定位权限和GPS/网络信号</string>
+    <string name="prefs_loc_gps_error">检查您的位置权限</string>
     <string name="prefs_loc_input_title">输入位置</string>
     <string name="prefs_loc_input_error">输入的位置无效</string>
     <string name="prefs_loc_qth_title">QTH 网格</string>
     <string name="prefs_loc_qth_error">无效的 QTH 网格</string>
     <string name="prefs_loc_success">位置更新成功</string>
-    <string name="prefs_station_title">站位设置</string>
-    <string name="prefs_station_lat_text">输入站位的纬度</string>
-    <string name="prefs_station_lon_text">输入站位的经度</string>
+    <string name="prefs_station_title">站点位置设置</string>
+    <string name="prefs_station_lat_text">输入站点的纬度</string>
+    <string name="prefs_station_lon_text">输入站点的经度</string>
     <string name="prefs_locator_title">QTH 网格</string>
-    <string name="prefs_locator_text">使用梅登黑德网格设置站位</string>
+    <string name="prefs_locator_text">使用梅登黑德网格设置站点位置</string>
 
     <string name="prefs_data_title">卫星数据更新</string>
     <string name="prefs_data_entries">卫星：%s</string>
     <string name="prefs_data_radios">收发器：%s</string>
     <string name="prefs_data_update">在线更新</string>
-    <string name="prefs_data_import">自定义URL</string>
+    <string name="prefs_data_import">导入文件</string>
     <string name="prefs_data_clear">清空</string>
     <string name="prefs_data_clear_success">数据清空成功</string>
     <string name="prefs_data_update_success">更新成功</string>
-    <string name="prefs_data_update_failed">更新失败,请检查网络</string>
 
     <string name="prefs_data_import_satellites_error">未导入卫星。请选择有效的 TLE/3LE (.txt) 或 OMM (.csv) 文件。</string>
     <string name="prefs_data_import_transceivers_error">未导入收发器。请选择有效的 SatNOGS (.json) 文件。</string>
@@ -145,6 +136,9 @@
     <string name="prefs_data_sources_title">自定义数据源</string>
     <string name="prefs_data_sources_tle_switch">自定义TLE URL</string>
     <string name="prefs_data_sources_transceivers_switch">自定义收发器URL</string>
+    <string name="prefs_data_sources_url_title" translatable="false">URL</string>
+    <string name="prefs_data_sources_satellites_label">卫星数据</string>
+    <string name="prefs_data_sources_transceivers_label">收发器数据</string>
 
     <string name="prefs_data_output_title">数据输出</string>
     <string name="prefs_net_output">网络</string>
@@ -158,6 +152,8 @@
     <string name="prefs_net_frequency_switch">启用多普勒频率输出</string>
     <string name="prefs_net_frequency_address_hint">IP:端口</string>
     <string name="prefs_net_frequency_format_hint">数据格式</string>
+    <string name="prefs_net_frequency_offset_hint" translatable="false">频率偏移 (Hz)</string>
+    <string name="prefs_net_frequency_offset_help" translatable="false">范围：-50000 到 50000 Hz。正值提高上报频率，负值降低上报频率。</string>
 
     <string name="prefs_bt_title">蓝牙数据输出</string>
     <string name="prefs_bt_rotator_switch">启用方位俯仰角输出</string>
@@ -179,48 +175,7 @@
     <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>
@@ -232,7 +187,7 @@
     <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)
@@ -241,8 +196,39 @@
         \n• Dr T.S. Kelso (Celestrak)
         \n• Libre Space Foundation (SatNOGS)
         \n• xdsopl 和 Robot36 贡献者!
-        \n• BA7OPF(过境匹配功能)
-        \n• BG7NTA</string>
+        \n• BG7NTA（CW解码功能）</string>
     <string name="prefs_outro_license">该应用程序不提供任何保修.</string>
 
+    <!-- 匹配页 Mutual match page -->
+    <string name="mutual_title">过境匹配</string>
+    <string name="mutual_station_you">你的位置</string>
+    <string name="mutual_station_opposite">友台位置</string>
+    <string name="mutual_label_you">你</string>
+    <string name="mutual_label_opposite">友台</string>
+    <string name="mutual_status_calculating">正在计算双方共同可见窗口…</string>
+    <string name="mutual_status_error">请修正提示后重新查询</string>
+    <string name="mutual_status_matches">找到 %d 个匹配 · 点击卡片展开曲线</string>
+    <string name="mutual_status_none">未找到共同可见窗口，调整时间或仰角后重试</string>
+    <string name="mutual_status_idle">输入双方位置后点击查询</string>
+    <string name="mutual_chip_calculating">计算中</string>
+    <string name="mutual_chip_error">有错误</string>
+    <string name="mutual_chip_matches">%d 个匹配</string>
+    <string name="mutual_chip_none">无匹配</string>
+    <string name="mutual_chip_idle">待查询</string>
+    <string name="mutual_use_current">填入当前位置</string>
+    <string name="mutual_lat">纬度</string>
+    <string name="mutual_lon">经度</string>
+    <string name="mutual_grid">网格</string>
+    <string name="mutual_grid_hint">支持 4/6/8 位 Maidenhead 网格；也可直接输入经纬度</string>
+    <string name="mutual_min_elevation">最小仰角：%d°</string>
+    <string name="mutual_time_range">时间范围</string>
+    <string name="mutual_calculating">计算中…</string>
+    <string name="mutual_query">查询匹配</string>
+    <string name="mutual_elevation_you">你：%d°</string>
+    <string name="mutual_elevation_opposite">友台：%d°</string>
+    <string name="mutual_both_tracks">双方轨迹</string>
+    <string name="mutual_open_radar">查看雷达</string>
+    <string name="mutual_station_a">站点A</string>
+    <string name="mutual_station_b">站点B</string>
+
 </resources>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Commmon -->
-    <string name="app_name" translatable="false">Look4Sat Pro</string>
+    <string name="app_name" translatable="false">Look4Sat</string>
     <string name="btn_accept">Accept</string>
     <string name="btn_cancel">Cancel</string>
     <string name="empty_list_message">No data to show</string>
@@ -11,23 +11,8 @@
     <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>
@@ -66,13 +51,25 @@
         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_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>
+
+    <!-- AMSAT Status screen -->
+    <string name="nav_amsat">AMSAT</string>
+    <string name="amsat_title">AMSAT Satellite Status</string>
+    <string name="amsat_refresh">Refresh</string>
+    <string name="amsat_retry">Retry</string>
+    <string name="amsat_updated">Updated:</string>
+    <string name="amsat_active">Active</string>
+    <string name="amsat_tlm">TLM/Beacon</string>
+    <string name="amsat_not_heard">Not Heard</string>
+    <string name="amsat_conflict">Conflicting</string>
+    <string name="amsat_name">Name</string>
+    <string name="amsat_load_failed">Load failed - check network and retry</string>
+    <string name="amsat_no_reports">No reports for this period</string>
+    <string name="amsat_close">Close</string>
 
     <!-- Radar screen -->
     <string name="radar_back">Back</string>
@@ -129,7 +126,7 @@
     <string name="map_visible">Visible</string>
 
     <!-- Settings screen -->
-    <string name="prefs_app_title" translatable="false">Look4Sat Pro v%s</string>
+    <string name="prefs_app_title" translatable="false">Look4Sat v%s</string>
     <string name="prefs_app_url" translatable="false">https://play.google.com/store/apps/details?id=com.rtbishop.look4sat</string>
     <string name="prefs_donate_title">Donate</string>
     <string name="prefs_donate_url" translatable="false">https://ko-fi.com/rt_bishop</string>
@@ -147,7 +144,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,11 +160,10 @@
     <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>
 
@@ -175,7 +171,8 @@
     <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_sources_satellites_label">Satellites data</string>
+    <string name="prefs_data_sources_transceivers_label">Transceivers data</string>
 
     <string name="prefs_data_output_title">Data output</string>
     <string name="prefs_net_output">Network</string>
@@ -199,6 +196,8 @@
     <string name="prefs_net_frequency_switch">Enable frequency output</string>
     <string name="prefs_net_frequency_address_hint">IP:Port</string>
     <string name="prefs_net_frequency_format_hint">Format</string>
+    <string name="prefs_net_frequency_offset_hint" translatable="false">Frequency offset (Hz)</string>
+    <string name="prefs_net_frequency_offset_help" translatable="false">Range: -50000 to 50000 Hz. Positive values increase reported frequency; negative values decrease it.</string>
 
     <string name="prefs_bt_title">Bluetooth data output</string>
     <string name="prefs_bt_rotator_switch">Enable rotation output</string>
@@ -210,48 +209,7 @@
     <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>
@@ -263,7 +221,7 @@
     <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,9 +230,40 @@
         \n* Dr T.S. Kelso (Celestrak)
         \n* Libre Space Foundation (SatNOGS)
         \n* xdsopl and Robot36 contributors!
-        \n* BA7OPF (pass matching feature)
-        \n* BG7NTA
+        \n* BG7NTA (CW decoding feature)
     </string>
     <string name="prefs_outro_license">The app comes with no warranty</string>
 
+    <!-- Mutual match page -->
+    <string name="mutual_title">Pass Match</string>
+    <string name="mutual_station_you">Your Station</string>
+    <string name="mutual_station_opposite">Opposite Station</string>
+    <string name="mutual_label_you">You</string>
+    <string name="mutual_label_opposite">Opposite</string>
+    <string name="mutual_status_calculating">Calculating mutual visibility windows…</string>
+    <string name="mutual_status_error">Fix the reported issues and retry</string>
+    <string name="mutual_status_matches">%d matches found · tap a card to expand</string>
+    <string name="mutual_status_none">No mutual windows found. Adjust time or min elevation and retry</string>
+    <string name="mutual_status_idle">Enter both stations, then tap Query</string>
+    <string name="mutual_chip_calculating">Calculating</string>
+    <string name="mutual_chip_error">Error</string>
+    <string name="mutual_chip_matches">%d matches</string>
+    <string name="mutual_chip_none">No matches</string>
+    <string name="mutual_chip_idle">Idle</string>
+    <string name="mutual_use_current">Use current</string>
+    <string name="mutual_lat">Lat</string>
+    <string name="mutual_lon">Lon</string>
+    <string name="mutual_grid">Grid</string>
+    <string name="mutual_grid_hint">Supports 4/6/8-char Maidenhead grid; or enter lat/lon directly</string>
+    <string name="mutual_min_elevation">Min elevation: %d°</string>
+    <string name="mutual_time_range">Time range</string>
+    <string name="mutual_calculating">Calculating…</string>
+    <string name="mutual_query">Query Match</string>
+    <string name="mutual_elevation_you">You: %d°</string>
+    <string name="mutual_elevation_opposite">Opposite: %d°</string>
+    <string name="mutual_both_tracks">Both tracks</string>
+    <string name="mutual_open_radar">Open Radar</string>
+    <string name="mutual_station_a">Station A</string>
+    <string name="mutual_station_b">Station B</string>
+
 </resources>

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

@@ -181,7 +181,7 @@ fun CwDecodeScreen(navigateUp: () -> Unit = {}) {
                 ) {
                     Column(horizontalAlignment = Alignment.CenterHorizontally) {
                         Text(
-                            text = stringResource(R.string.cw_mic_permission),
+                            text = "Microphone permission is required for CW decoding",
                             color = Color.White,
                             textAlign = TextAlign.Center,
                             modifier = Modifier.padding(horizontal = 24.dp)
@@ -190,7 +190,7 @@ fun CwDecodeScreen(navigateUp: () -> Unit = {}) {
                         Button(onClick = {
                             permissionLauncher.launch(Manifest.permission.RECORD_AUDIO)
                         }) {
-                            Text(stringResource(R.string.cw_grant_permission))
+                            Text("Grant permission")
                         }
                         if (permanentlyDenied) {
                             // 勾选了"不再询问": 引导去系统设置开启
@@ -202,7 +202,7 @@ fun CwDecodeScreen(navigateUp: () -> Unit = {}) {
                                     )
                                 )
                             }) {
-                                Text(stringResource(R.string.cw_open_settings))
+                                Text("Open app settings")
                             }
                         }
                     }

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

@@ -139,7 +139,7 @@ public class MainActivity {
     public void onResume() {
         android.content.SharedPreferences prefs = mActivity.getSharedPreferences(
             mActivity.getPackageName() + "_preferences", Context.MODE_PRIVATE);
-        String messageType = prefs.getString("message_type", "general_text");
+        String messageType = prefs.getString("message_type", "ham_radio_qso");
         b bVar = this.f11037F;
         if (bVar != null) {
             bVar.f623s.set(messageType.equals("ham_radio_qso"));

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

@@ -4,6 +4,6 @@ package g3;
 public abstract class d {
 
     /* renamed from: a, reason: collision with root package name */
-    public static final double[][] f11591a = {new double[]{0.0d, 0.0d}, new double[]{9.760860120877624E-4d, -3.903230345984362E-11d}, new double[]{0.0019512202125042677d, -8.124251825289188E-11d}, new double[]{0.0029254043474793434d, -1.8374207360194882E-11d}, new double[]{0.0038986406289041042d, -2.1324678121885073E-10d}, new double[]{0.004870930686593056d, -4.5199654318611534E-10d}, new double[]{0.00584227591753006d, -2.933016992001806E-10d}, new double[]{0.006812678650021553d, -2.325147219074669E-10d}, new double[]{0.007782140746712685d, -3.046577356838847E-10d}, new double[]{0.008750664070248604d, -5.500631513861575E-10d}, new double[]{0.00971824862062931d, 8.48292035519895E-10d}, new double[]{0.010684899985790253d, 1.1422610134013436E-10d}, new double[]{0.01165061630308628d, 9.168889933128375E-10d}, new double[]{0.012615403160452843d, -5.303786078838E-10d}, new double[]{0.013579258695244789d, -5.688639355498786E-10d}, new double[]{0.01454218477010727d, 7.296670293275653E-10d}, new double[]{0.015504186972975731d, -4.370104767451421E-10d}, new double[]{0.016465261578559875d, 1.43695591408832E-9d}, new double[]{0.01742541790008545d, -1.1862263158849434E-9d}, new double[]{0.018384650349617004d, -9.482976524690715E-10d}, new double[]{0.01934296265244484d, 1.9068609515836638E-10d}, new double[]{0.020300358533859253d, 2.655990315697216E-10d}, new double[]{0.021256837993860245d, 1.0315548713040775E-9d}, new double[]{0.022212404757738113d, 5.13345647019085E-10d}, new double[]{0.02316705882549286d, 4.5604151934208014E-10d}, new double[]{0.02412080392241478d, -1.1255706987475148E-9d}, new double[]{0.025073636323213577d, 1.2289023836765196E-9d}, new double[]{0.02602556347846985d, 1.7990281828096504E-9d}, new double[]{0.026976589113473892d, -1.4152718164638451E-9d}, new double[]{0.02792670577764511d, 7.568772963781632E-10d}, new double[]{0.0288759246468544d, -1.1449998592111558E-9d}, new double[]{0.029824241995811462d, -1.6850976862319495E-9d}, new double[]{0.030771657824516296d, 8.422373919843096E-10d}, new double[]{0.0317181795835495d, 6.872350402175489E-10d}, new double[]{0.03266380727291107d, -4.541194749189272E-10d}, new double[]{0.03360854089260101d, -8.9064764856495E-10d}, new double[]{0.034552380442619324d, 1.0640404096769032E-9d}, new double[]{0.0354953333735466d, -3.5901655945224663E-10d}, new double[]{0.03643739968538284d, -3.4829517943661266E-9d}, new double[]{0.037378571927547455d, 8.149473794244232E-10d}, new double[]{0.03831886500120163d, -6.990650304449166E-10d}, new double[]{0.03925827145576477d, 1.0883076226453258E-9d}, new double[]{0.040196798741817474d, 3.845192807999274E-10d}, new double[]{0.04113444685935974d, -1.1570594692045927E-9d}, new double[]{0.04207121580839157d, -1.8877045166697178E-9d}, new double[]{0.043007105588912964d, -1.6332083257987747E-10d}, new double[]{0.04394212365150452d, -1.7950057534514933E-9d}, new double[]{0.04487626254558563d, 2.302710041648838E-9d}, new double[]{0.045809537172317505d, -1.1410233017161343E-9d}, new double[]{0.04674194008111954d, -3.0498741599744685E-9d}, new double[]{0.04767347127199173d, -1.8026348269183678E-9d}, new double[]{0.04860413819551468d, -3.233204600453039E-9d}, new double[]{0.04953393340110779d, 1.7211688427961583E-9d}, new double[]{0.05046287178993225d, -2.329967807055457E-10d}, new double[]{0.05139094591140747d, -4.191810118556531E-11d}, new double[]{0.052318163216114044d, -3.5574324788328143E-9d}, new double[]{0.053244516253471375d, -1.7346590916458485E-9d}, new double[]{0.05417001247406006d, -4.343048751383674E-10d}, new double[]{0.055094651877880096d, 1.92909364037955E-9d}, new double[]{0.056018441915512085d, -5.139745677199588E-10d}, new double[]{0.05694137513637543d, 1.2637629975129189E-9d}, new double[]{0.05786345899105072d, 1.3840561112481119E-9d}, new double[]{0.058784693479537964d, 1.414889689612056E-9d}, new double[]{0.05970507860183716d, 2.9199191907666474E-9d}, new double[]{0.0606246218085289d, 7.90594243412116E-12d}, new double[]{0.06154331564903259d, 1.6844747839686189E-9d}, new double[]{0.06246116757392883d, 2.0498074572151747E-9d}, new double[]{0.06337818503379822d, -4.800180493433863E-9d}, new double[]{0.06429435312747955d, -2.4220822960064277E-9d}, new double[]{0.06520968675613403d, -4.179048566709334E-9d}, new double[]{0.06612417101860046d, 6.363872957010456E-9d}, new double[]{0.06703783571720123d, 9.339468680056365E-10d}, new double[]{0.06795066595077515d, -4.04226739708981E-9d}, new double[]{0.0688626617193222d, -7.043545052852817E-9d}, new double[]{0.06977382302284241d, -6.552819560439773E-9d}, new double[]{0.07068414986133575d, -1.0571674860370546E-9d}, new double[]{0.07159365713596344d, -3.948954622015801E-9d}, new double[]{0.07250232994556427d, 1.1776625988228244E-9d}, new double[]{0.07341018319129944d, 9.221072639606492E-10d}, new double[]{0.07431721687316895d, -3.219119568928366E-9d}, new double[]{0.0752234160900116d, 5.147575929018918E-9d}, new double[]{0.07612881064414978d, -2.291749683541979E-9d}, new doubleLine truncated
+    public static final double[][] f11591a = {new double[]{0.0d, 0.0d}, new double[]{9.760860120877624E-4d, -3.903230345984362E-11d}, new double[]{0.0019512202125042677d, -8.124251825289188E-11d}, new double[]{0.0029254043474793434d, -1.8374207360194882E-11d}, new double[]{0.0038986406289041042d, -2.1324678121885073E-10d}, new double[]{0.004870930686593056d, -4.5199654318611534E-10d}, new double[]{0.00584227591753006d, -2.933016992001806E-10d}, new double[]{0.006812678650021553d, -2.325147219074669E-10d}, new double[]{0.007782140746712685d, -3.046577356838847E-10d}, new double[]{0.008750664070248604d, -5.500631513861575E-10d}, new double[]{0.00971824862062931d, 8.48292035519895E-10d}, new double[]{0.010684899985790253d, 1.1422610134013436E-10d}, new double[]{0.01165061630308628d, 9.168889933128375E-10d}, new double[]{0.012615403160452843d, -5.303786078838E-10d}, new double[]{0.013579258695244789d, -5.688639355498786E-10d}, new double[]{0.01454218477010727d, 7.296670293275653E-10d}, new double[]{0.015504186972975731d, -4.370104767451421E-10d}, new double[]{0.016465261578559875d, 1.43695591408832E-9d}, new double[]{0.01742541790008545d, -1.1862263158849434E-9d}, new double[]{0.018384650349617004d, -9.482976524690715E-10d}, new double[]{0.01934296265244484d, 1.9068609515836638E-10d}, new double[]{0.020300358533859253d, 2.655990315697216E-10d}, new double[]{0.021256837993860245d, 1.0315548713040775E-9d}, new double[]{0.022212404757738113d, 5.13345647019085E-10d}, new double[]{0.02316705882549286d, 4.5604151934208014E-10d}, new double[]{0.02412080392241478d, -1.1255706987475148E-9d}, new double[]{0.025073636323213577d, 1.2289023836765196E-9d}, new double[]{0.02602556347846985d, 1.7990281828096504E-9d}, new double[]{0.026976589113473892d, -1.4152718164638451E-9d}, new double[]{0.02792670577764511d, 7.568772963781632E-10d}, new double[]{0.0288759246468544d, -1.1449998592111558E-9d}, new double[]{0.029824241995811462d, -1.6850976862319495E-9d}, new double[]{0.030771657824516296d, 8.422373919843096E-10d}, new double[]{0.0317181795835495d, 6.872350402175489E-10d}, new double[]{0.03266380727291107d, -4.541194749189272E-10d}, new double[]{0.03360854089260101d, -8.9064764856495E-10d}, new double[]{0.034552380442619324d, 1.0640404096769032E-9d}, new double[]{0.0354953333735466d, -3.5901655945224663E-10d}, new double[]{0.03643739968538284d, -3.4829517943661266E-9d}, new double[]{0.037378571927547455d, 8.149473794244232E-10d}, new double[]{0.03831886500120163d, -6.990650304449166E-10d}, new double[]{0.03925827145576477d, 1.0883076226453258E-9d}, new double[]{0.040196798741817474d, 3.845192807999274E-10d}, new double[]{0.04113444685935974d, -1.1570594692045927E-9d}, new double[]{0.04207121580839157d, -1.8877045166697178E-9d}, new double[]{0.043007105588912964d, -1.6332083257987747E-10d}, new double[]{0.04394212365150452d, -1.7950057534514933E-9d}, new double[]{0.04487626254558563d, 2.302710041648838E-9d}, new double[]{0.045809537172317505d, -1.1410233017161343E-9d}, new double[]{0.04674194008111954d, -3.0498741599744685E-9d}, new double[]{0.04767347127199173d, -1.8026348269183678E-9d}, new double[]{0.04860413819551468d, -3.233204600453039E-9d}, new double[]{0.04953393340110779d, 1.7211688427961583E-9d}, new double[]{0.05046287178993225d, -2.329967807055457E-10d}, new double[]{0.05139094591140747d, -4.191810118556531E-11d}, new double[]{0.052318163216114044d, -3.5574324788328143E-9d}, new double[]{0.053244516253471375d, -1.7346590916458485E-9d}, new double[]{0.05417001247406006d, -4.343048751383674E-10d}, new double[]{0.055094651877880096d, 1.92909364037955E-9d}, new double[]{0.056018441915512085d, -5.139745677199588E-10d}, new double[]{0.05694137513637543d, 1.2637629975129189E-9d}, new double[]{0.05786345899105072d, 1.3840561112481119E-9d}, new double[]{0.058784693479537964d, 1.414889689612056E-9d}, new double[]{0.05970507860183716d, 2.9199191907666474E-9d}, new double[]{0.0606246218085289d, 7.90594243412116E-12d}, new double[]{0.06154331564903259d, 1.6844747839686189E-9d}, new double[]{0.06246116757392883d, 2.0498074572151747E-9d}, new double[]{0.06337818503379822d, -4.800180493433863E-9d}, new double[]{0.06429435312747955d, -2.4220822960064277E-9d}, new double[]{0.06520968675613403d, -4.179048566709334E-9d}, new double[]{0.06612417101860046d, 6.363872957010456E-9d}, new double[]{0.06703783571720123d, 9.339468680056365E-10d}, new double[]{0.06795066595077515d, -4.04226739708981E-9d}, new double[]{0.0688626617193222d, -7.043545052852817E-9d}, new double[]{0.06977382302284241d, -6.552819560439773E-9d}, new double[]{0.07068414986133575d, -1.0571674860370546E-9d}, new double[]{0.07159365713596344d, -3.948954622015801E-9d}, new double[]{0.07250232994556427d, 1.1776625988228244E-9d}, new double[]{0.07341018319129944d, 9.221072639606492E-10d}, new double[]{0.07431721687316895d, -3.219119568928366E-9d}, new double[]{0.0752234160900116d, 5.147575929018918E-9d}, new double[]{0.07612881064414978d, -2.291749683541979E-9d}, new doubleLine truncated
     new double[]{0.6813591718673706d, 5.294053246347931E-8d}, new double[]{0.681853175163269d, -1.2220826223585654E-9d}, new double[]{0.6823468208312988d, 5.8377876767612725E-8d}, new double[]{0.6828403472900391d, -6.437492120743254E-9d}, new double[]{0.6833335161209106d, 4.2990710043633113E-8d}, new double[]{0.6838265657424927d, -3.1516131027023284E-8d}, new double[]{0.684319257736206d, 8.70017386744679E-9d}, new double[]{0.6848117113113403d, 4.466959125843237E-8d}, new double[]{0.6853040456771851d, -4.25782656420497E-8d}, new double[]{0.6857960224151611d, -1.4386267593671393E-8d}, new double[]{0.6862877607345581d, 1.0274494061148778E-8d}, new double[]{0.686779260635376d, 3.164186629229597E-8d}, new double[]{0.6872705221176147d, 4.995334552140326E-8d}, new double[]{0.687761664390564d, -5.3763211240398744E-8d}, new double[]{0.6882524490356445d, -4.0852427502515625E-8d}, new double[]{0.688742995262146d, -3.0287143914420064E-8d}, new double[]{0.6892333030700684d, -2.183125937905008E-8d}, new double[]{0.6897233724594116d, -1.524901992178814E-8d}, new double[]{0.6902132034301758d, -1.0305018010328949E-8d}, new double[]{0.6907027959823608d, -6.764191876212205E-9d}, new double[]{0.6911921501159668d, -4.391824838015402E-9d}, new double[]{0.6916812658309937d, -2.9535446262017846E-9d}, new double[]{0.6921701431274414d, -2.2153227096187463E-9d}, new double[]{0.6926587820053101d, -1.943473623641502E-9d}};
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -16,7 +16,4 @@
     <string name="premium">Get Premium Version</string>
     <string name="tap_back_again_to_close">Tap Back again to close the app</string>
     <string name="message_type">Message Type</string>
-    <string name="cw_mic_permission">Microphone permission is required for CW decoding</string>
-    <string name="cw_grant_permission">Grant permission</string>
-    <string name="cw_open_settings">Open app settings</string>
 </resources>

feature/mutual/src/main/java/com/rtbishop/look4sat/feature/mutual/ElevationCurveChart.kt

@@ -24,6 +24,7 @@ import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.ui.res.stringResource
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -40,6 +41,7 @@ import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.rtbishop.look4sat.core.presentation.R
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -226,8 +228,8 @@ fun ElevationCurveChart(
             modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 4.dp),
             horizontalArrangement = Arrangement.SpaceEvenly
         ) {
-            Text("● 站点A", color = colorA, fontSize = 12.sp)
-            Text("● 站点B", color = colorB, fontSize = 12.sp)
+            Text(stringResource(R.string.mutual_station_a), color = colorA, fontSize = 12.sp)
+            Text(stringResource(R.string.mutual_station_b), color = colorB, fontSize = 12.sp)
         }
     }
 }

feature/mutual/src/main/java/com/rtbishop/look4sat/feature/mutual/MutualRadarView.kt

@@ -57,8 +57,8 @@ private const val STROKE_WIDTH = 2.5f
 fun MutualRadarView(
     trackSamples: List<TrackSample>,
     progress: Float = 0.5f,
-    labelA: String = "站点A",
-    labelB: String = "站点B",
+    labelA: String = "Station A",
+    labelB: String = "Station B",
     modifier: Modifier = Modifier
 ) {
     if (trackSamples.isEmpty()) return

feature/mutual/src/main/java/com/rtbishop/look4sat/feature/mutual/MutualScreen.kt

@@ -90,7 +90,7 @@ fun MutualScreen(
                 },
                 topInfo = {
                     Text(
-                        text = "过境匹配",
+                        text = stringResource(R.string.mutual_title),
                         style = MaterialTheme.typography.titleMedium,
                         fontWeight = FontWeight.Bold
                     )
@@ -198,7 +198,7 @@ private fun MutualContent(
             ) {
                 if (isVertical) {
                     StationInputCard(
-                        title = "你的位置",
+                        title = stringResource(R.string.mutual_station_you),
                         titleColor = MaterialTheme.colorScheme.primary,
                         lat = state.stationALat,
                         lon = state.stationALon,
@@ -214,7 +214,7 @@ private fun MutualContent(
                         currentPositionAction = onUseCurrentPosition
                     )
                     StationInputCard(
-                        title = "友台位置",
+                        title = stringResource(R.string.mutual_station_opposite),
                         titleColor = MaterialTheme.colorScheme.tertiary,
                         lat = state.stationBLat,
                         lon = state.stationBLon,
@@ -234,7 +234,7 @@ private fun MutualContent(
                         horizontalArrangement = Arrangement.spacedBy(6.dp)
                     ) {
                         StationInputCard(
-                            title = "你的位置",
+                            title = stringResource(R.string.mutual_station_you),
                             titleColor = MaterialTheme.colorScheme.primary,
                             lat = state.stationALat,
                             lon = state.stationALon,
@@ -251,7 +251,7 @@ private fun MutualContent(
                             modifier = Modifier.weight(1f)
                         )
                         StationInputCard(
-                            title = "友台位置",
+                            title = stringResource(R.string.mutual_station_opposite),
                             titleColor = MaterialTheme.colorScheme.tertiary,
                             lat = state.stationBLat,
                             lon = state.stationBLon,
@@ -294,8 +294,8 @@ private fun MutualContent(
                 startTime = pass.startTime,
                 endTime = pass.endTime,
                 maxElev = maxOf(pass.maxElevationA, pass.maxElevationB, 10.0),
-                labelA = "你",
-                labelB = "友台"
+                labelA = stringResource(R.string.mutual_label_you),
+                labelB = stringResource(R.string.mutual_label_opposite)
             )
             MutualPassCard(
                 pass = pass,
@@ -341,20 +341,22 @@ private fun MutualStatusChip(state: MutualUiState) {
     }
 }
 
+@Composable
 private fun mutualStatusText(state: MutualUiState): String = when {
-    state.isCalculating -> "正在计算双方共同可见窗口…"
-    state.errorMessage != null -> "请修正提示后重新查询"
-    state.mutualPasses.isNotEmpty() -> "找到 ${state.mutualPasses.size} 个匹配 · 点击卡片展开曲线"
-    state.hasSearched -> "未找到共同可见窗口，调整时间或仰角后重试"
-    else -> "输入双方位置后点击查询"
+    state.isCalculating -> stringResource(R.string.mutual_status_calculating)
+    state.errorMessage != null -> stringResource(R.string.mutual_status_error)
+    state.mutualPasses.isNotEmpty() -> stringResource(R.string.mutual_status_matches, state.mutualPasses.size)
+    state.hasSearched -> stringResource(R.string.mutual_status_none)
+    else -> stringResource(R.string.mutual_status_idle)
 }
 
+@Composable
 private fun mutualStatusChipText(state: MutualUiState): String = when {
-    state.isCalculating -> "计算中"
-    state.errorMessage != null -> "有错误"
-    state.mutualPasses.isNotEmpty() -> "${state.mutualPasses.size}个匹配"
-    state.hasSearched -> "无匹配"
-    else -> "待查询"
+    state.isCalculating -> stringResource(R.string.mutual_chip_calculating)
+    state.errorMessage != null -> stringResource(R.string.mutual_chip_error)
+    state.mutualPasses.isNotEmpty() -> stringResource(R.string.mutual_chip_matches, state.mutualPasses.size)
+    state.hasSearched -> stringResource(R.string.mutual_chip_none)
+    else -> stringResource(R.string.mutual_chip_idle)
 }
 
 @Composable
@@ -393,7 +395,7 @@ private fun StationInputCard(
                 )
                 if (currentPositionAction != null) {
                     OutlinedButton(onClick = currentPositionAction) {
-                        Text("填入当前位置", style = MaterialTheme.typography.bodySmall)
+                        Text(stringResource(R.string.mutual_use_current), style = MaterialTheme.typography.bodySmall)
                     }
                 }
             }
@@ -405,7 +407,7 @@ private fun StationInputCard(
                 OutlinedTextField(
                     value = lat,
                     onValueChange = onLatChange,
-                    label = { Text("纬度") },
+                    label = { Text(stringResource(R.string.mutual_lat)) },
                     placeholder = { Text(latPlaceholder) },
                     keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal),
                     singleLine = true,
@@ -414,7 +416,7 @@ private fun StationInputCard(
                 OutlinedTextField(
                     value = lon,
                     onValueChange = onLonChange,
-                    label = { Text("经度") },
+                    label = { Text(stringResource(R.string.mutual_lon)) },
                     placeholder = { Text(lonPlaceholder) },
                     keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal),
                     singleLine = true,
@@ -425,15 +427,15 @@ private fun StationInputCard(
             OutlinedTextField(
                 value = grid,
                 onValueChange = onGridChange,
-                label = { Text("网格") },
+                label = { Text(stringResource(R.string.mutual_grid)) },
                 placeholder = { Text(gridPlaceholder) },
-                supportingText = { Text("支持 4/6/8 位 Maidenhead 网格；也可直接输入经纬度") },
+                supportingText = { Text(stringResource(R.string.mutual_grid_hint)) },
                 singleLine = true,
                 modifier = Modifier.fillMaxWidth()
             )
 
             Text(
-                text = "最小仰角：${minElev.toInt()}°",
+                text = stringResource(R.string.mutual_min_elevation, minElev.toInt()),
                 style = MaterialTheme.typography.bodySmall,
                 color = MaterialTheme.colorScheme.onSurfaceVariant
             )
@@ -461,7 +463,7 @@ private fun MatchSearchCard(
             verticalArrangement = Arrangement.spacedBy(10.dp)
         ) {
             Text(
-                text = "时间范围",
+                text = stringResource(R.string.mutual_time_range),
                 style = MaterialTheme.typography.titleSmall,
                 fontWeight = FontWeight.Medium
             )
@@ -492,7 +494,7 @@ private fun MatchSearchCard(
                     )
                     Spacer(Modifier.width(8.dp))
                 }
-                Text(if (isCalculating) "计算中..." else "查询匹配")
+                Text(if (isCalculating) stringResource(R.string.mutual_calculating) else stringResource(R.string.mutual_query))
             }
         }
     }
@@ -558,12 +560,12 @@ private fun MutualPassCard(
                 horizontalArrangement = Arrangement.SpaceBetween
             ) {
                 Text(
-                    text = "你: ${pass.maxElevationA}°",
+                    text = stringResource(R.string.mutual_elevation_you, pass.maxElevationA.toInt()),
                     style = MaterialTheme.typography.bodySmall,
                     color = MaterialTheme.colorScheme.primary
                 )
                 Text(
-                    text = "友台: ${pass.maxElevationB}°",
+                    text = stringResource(R.string.mutual_elevation_opposite, pass.maxElevationB.toInt()),
                     style = MaterialTheme.typography.bodySmall,
                     color = MaterialTheme.colorScheme.tertiary
                 )
@@ -579,7 +581,7 @@ private fun MutualPassCard(
                     // Dual-station radar track (polar plot)
                     if (visibleTracks.isNotEmpty()) {
                         Text(
-                            text = "双方轨迹",
+                            text = stringResource(R.string.mutual_both_tracks),
                             style = MaterialTheme.typography.titleSmall,
                             fontWeight = FontWeight.Medium,
                             color = MaterialTheme.colorScheme.onSurfaceVariant
@@ -587,8 +589,8 @@ private fun MutualPassCard(
                         MutualRadarView(
                             trackSamples = visibleTracks,
                             progress = dragProgress,
-                            labelA = "你",
-                            labelB = "友台"
+                            labelA = stringResource(R.string.mutual_label_you),
+                            labelB = stringResource(R.string.mutual_label_opposite)
                         )
                         Spacer(Modifier.height(8.dp))
                     }
@@ -613,7 +615,7 @@ private fun MutualPassCard(
                             modifier = Modifier.height(16.dp).width(16.dp)
                         )
                         Spacer(Modifier.width(6.dp))
-                        Text("查看雷达")
+                        Text(stringResource(R.string.mutual_open_radar))
                     }
                 }
             }

feature/mutual/src/main/java/com/rtbishop/look4sat/feature/mutual/MutualViewModel.kt

@@ -158,13 +158,13 @@ class MutualViewModel(
         var posB = resolvePosition(state.stationBLat, state.stationBLon, state.stationBGrid)
 
         if (posA == null || posB == null) {
-            _uiState.update { it.copy(errorMessage = "请输入有效的位置坐标或网格（4/6/8位）") }
+            _uiState.update { it.copy(errorMessage = "Please enter valid coordinates or a Maidenhead grid (4/6/8 chars)") }
             return
         }
 
         val satellites = satelliteRepo.satellites.value
         if (satellites.isEmpty()) {
-            _uiState.update { it.copy(errorMessage = "没有卫星数据，请先在卫星列表中选择卫星") }
+            _uiState.update { it.copy(errorMessage = "No satellite data. Select satellites from the list first.") }
             return
         }
 
@@ -193,9 +193,9 @@ class MutualViewModel(
                 val passCount = satelliteRepo.passes.value.size
                 val satCount = satellites.size
                 when {
-                    passCount == 0 -> "过境列表为空，请先在卫星列表中选择卫星"
-                    satCount == 0 -> "没有已选中的卫星"
-                    else -> "未找到共同过境（${passCount}个过境，${satCount}颗卫星）"
+                    passCount == 0 -> "Pass list is empty. Select satellites from the list first."
+                    satCount == 0 -> "No satellites selected."
+                    else -> "No mutual passes found (${passCount} passes, ${satCount} satellites)."
                 }
             } else null
 

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

@@ -23,6 +23,7 @@ import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
 import com.rtbishop.look4sat.core.domain.model.PassesSettings
 import com.rtbishop.look4sat.core.domain.predict.CelestialComputer
+import com.rtbishop.look4sat.core.domain.predict.GeoPos
 import com.rtbishop.look4sat.core.domain.predict.OrbitalPass
 import com.rtbishop.look4sat.core.domain.repository.IMainContainer
 import com.rtbishop.look4sat.core.domain.repository.ISatelliteRepo
@@ -167,6 +168,7 @@ class PassesViewModel(
     // CelestialComputer.findSunRiseSet() returns the next rise/set after the supplied time, so pass
     // the calendar day's 00:00 in the same timezone used by the visible date group. Passing a pass's
     // AOS time can jump to the following day's sunrise/sunset when that AOS is after the local event.
+    // For white nights / polar day edge cases, we fall back to searching from the previous day.
     private fun computeSunTimes(passes: List<OrbitalPass>, isUtc: Boolean): Map<String, Pair<String, String>> {
         val stationPos = settingsRepo.stationPosition.value
         val tz = if (isUtc) TimeZone.getTimeZone("UTC") else TimeZone.getDefault()
@@ -175,7 +177,7 @@ class PassesViewModel(
         val result = LinkedHashMap<String, Pair<String, String>>()
         // DeepSpace group always shows today's sun times
         if (passes.any { it.isDeepSpace }) {
-            val riseSet = CelestialComputer.findSunRiseSet(stationPos, startOfDayMillis(System.currentTimeMillis(), tz))
+            val riseSet = findTodaySunRiseSet(stationPos, startOfDayMillis(System.currentTimeMillis(), tz))
             val rise = if (riseSet.riseTimeMillis > 0) sdfTime.format(Date(riseSet.riseTimeMillis)) else "--:--"
             val set = if (riseSet.setTimeMillis > 0) sdfTime.format(Date(riseSet.setTimeMillis)) else "--:--"
             result["DeepSpace (period >225min)"] = rise to set
@@ -184,7 +186,7 @@ class PassesViewModel(
             if (pass.isDeepSpace) continue
             val label = sdfDate.format(Date(pass.aosTime))
             if (label in result) continue
-            val riseSet = CelestialComputer.findSunRiseSet(stationPos, startOfDayMillis(pass.aosTime, tz))
+            val riseSet = findTodaySunRiseSet(stationPos, startOfDayMillis(pass.aosTime, tz))
             val rise = if (riseSet.riseTimeMillis > 0) sdfTime.format(Date(riseSet.riseTimeMillis)) else "--:--"
             val set = if (riseSet.setTimeMillis > 0) sdfTime.format(Date(riseSet.setTimeMillis)) else "--:--"
             result[label] = rise to set
@@ -192,6 +194,33 @@ class PassesViewModel(
         return result
     }
 
+    /**
+     * Find today's sunrise and sunset by starting from local midnight.
+     * Handles the white nights / polar day edge case where the sun is still above
+     * the -0.8333° threshold at midnight: in that case we search from the previous
+     * day's midnight to find a valid sunrise/sunset pair within the target day.
+     */
+    private fun findTodaySunRiseSet(observer: GeoPos, localMidnightMillis: Long): CelestialComputer.RiseSetTimes {
+        val threshold = 0.8333
+        val sunPos = CelestialComputer.getSunPosition(observer, localMidnightMillis)
+        if (sunPos.elevation > -threshold) {
+            // White nights / polar day: the sun is too high at midnight.
+            // Search from earlier days so the algorithm goes through a full
+            // sunset → sunrise → sunset cycle, landing in the target day.
+            val dayEnd = localMidnightMillis + 86400000L
+            for (offset in 1..3) {
+                val result = CelestialComputer.findSunRiseSet(observer, localMidnightMillis - offset * 86400000L)
+                if (result.riseTimeMillis in localMidnightMillis..dayEnd &&
+                    result.setTimeMillis in localMidnightMillis..dayEnd) {
+                    return result
+                }
+            }
+            // No valid pair found (midnight sun / polar day)
+            return CelestialComputer.RiseSetTimes(0L, 0L)
+        }
+        return CelestialComputer.findSunRiseSet(observer, localMidnightMillis)
+    }
+
     private fun startOfDayMillis(timeMillis: Long, tz: TimeZone): Long {
         return Calendar.getInstance(tz, Locale.getDefault()).apply {
             timeInMillis = timeMillis

feature/radar/build.gradle.kts

@@ -8,8 +8,6 @@ android {
 
 dependencies {
     implementation(project(":feature:mutual"))
-    // CW 解码面板: 复用 feature:cw 的 Morse Expert 引擎(布局 cw_panel_main + MainActivity 控制器)
     implementation(project(":feature:cw"))
-    // 与 feature:cw 一致(控制器按 ID 递归查找 ConstraintLayout 视图)
     implementation("androidx.constraintlayout:constraintlayout:2.2.1")
 }

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

@@ -1,479 +0,0 @@
-/*
- * LogTab.kt — 雷达页「Log」标签(4.5.2 WaveLog 日志)。
- *
- * 布局: 转发器列表(点开选一个, 边看频率边填) → 呼号输入回车存本地 →
- * 下方本地记录列表(时间/频率/呼号)。记录支持自绘左滑删除:
- * 滑动中显示黄色垃圾桶, 滑过 75% 变撤销键, 5 秒内不点撤销则删除。
- *
- * 回车只存本地(WavelogQueue), 上传由 10 分钟周期/手动触发(防抄收错误)。
- */
-package com.rtbishop.look4sat.feature.radar
-
-import androidx.compose.animation.core.Spring
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.spring
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.gestures.detectHorizontalDragGestures
-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.ui.layout.onSizeChanged
-import androidx.compose.foundation.layout.offset
-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.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExposedDropdownMenuBox
-import androidx.compose.material3.ExposedDropdownMenuDefaults
-import androidx.compose.material3.MenuAnchorType
-import androidx.compose.material3.Icon
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-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.input.pointer.pointerInput
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.rtbishop.look4sat.core.domain.model.SatRadio
-import com.rtbishop.look4sat.core.domain.predict.OrbitalPos
-import com.rtbishop.look4sat.core.domain.utility.DopplerFrequencyCalculator
-import com.rtbishop.look4sat.core.domain.wavelog.WavelogQso
-import com.rtbishop.look4sat.core.domain.wavelog.WavelogQueue
-import com.rtbishop.look4sat.core.presentation.R
-import com.rtbishop.look4sat.core.presentation.formatFrequency
-import kotlinx.coroutines.delay
-import java.util.Calendar
-import java.util.TimeZone
-import java.util.UUID
-import kotlin.math.roundToInt
-
-private val WaveLogYellow = Color(0xFFFFC107)
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun LogTab(
-    transceivers: List<SatRadio>,
-    orbitalPos: OrbitalPos?,
-    satelliteName: String,
-    queue: WavelogQueue,
-    wavelogConfigured: Boolean,
-    showToast: (String) -> Unit,
-    txBaseFrequencyHz: Long? = null,
-    aosTimeMs: Long = 0L,
-    modifier: Modifier = Modifier
-) {
-    var selectedUuid by remember { mutableStateOf<String?>(null) }
-    var refreshTick by remember { mutableIntStateOf(0) }
-    val entries = remember(refreshTick) { queue.all() }
-
-    Column(
-        modifier = modifier
-            .fillMaxSize()
-            .verticalScroll(rememberScrollState())
-            .padding(8.dp),
-        verticalArrangement = Arrangement.spacedBy(6.dp)
-    ) {
-        if (!wavelogConfigured) {
-            Text(
-                text = stringResource(id = R.string.wavelog_need_config),
-                fontSize = 13.sp,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
-            )
-        }
-
-        // 转发器选择(下拉选择框): 选中后底下出现输入区
-        // 选中项按 uuid 从 transceivers 实时派生(多普勒频率每秒更新, 频率显示随之刷新)
-        var menuExpanded by remember { mutableStateOf(false) }
-        val selectedRadio = transceivers.firstOrNull { it.uuid == selectedUuid }
-        ExposedDropdownMenuBox(
-            expanded = menuExpanded,
-            onExpandedChange = { menuExpanded = it }
-        ) {
-            OutlinedTextField(
-                value = selectedRadio?.info ?: "",
-                onValueChange = {},
-                readOnly = true,
-                label = { Text(stringResource(id = R.string.wavelog_select_transponder)) },
-                trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = menuExpanded) },
-                textStyle = MaterialTheme.typography.bodyMedium,
-                modifier = Modifier
-                    .menuAnchor(MenuAnchorType.PrimaryNotEditable)
-                    .fillMaxWidth()
-            )
-            ExposedDropdownMenu(
-                expanded = menuExpanded,
-                onDismissRequest = { menuExpanded = false }
-            ) {
-                transceivers.forEach { radio ->
-                    DropdownMenuItem(
-                        text = {
-                            Text(
-                                text = radio.info,
-                                maxLines = 1,
-                                overflow = TextOverflow.Ellipsis
-                            )
-                        },
-                        onClick = {
-                            selectedUuid = radio.uuid
-                            menuExpanded = false
-                        }
-                    )
-                }
-            }
-        }
-
-        // 选中转发器后: 输入区(实时频率 + 呼号 + 模式)
-        selectedRadio?.let { radio ->
-            ExpandedLogInput(
-                radio = radio,
-                orbitalPos = orbitalPos,
-                satelliteName = satelliteName,
-                queue = queue,
-                showToast = showToast,
-                txBaseFrequencyHz = txBaseFrequencyHz,
-                aosTimeMs = aosTimeMs,
-                onSaved = { refreshTick++ }
-            )
-        }
-
-        // 本地记录列表(时间/频率/呼号)
-        Text(
-            text = stringResource(id = R.string.wavelog_saved),
-            fontSize = 12.sp,
-            color = MaterialTheme.colorScheme.onSurfaceVariant
-        )
-        if (entries.isEmpty()) {
-            Text(
-                text = stringResource(id = R.string.wavelog_empty),
-                fontSize = 13.sp,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                modifier = Modifier.padding(vertical = 8.dp)
-            )
-        } else {
-            // 按场次分组(sessionId = 卫星名-AOS 时间戳), 组间粗线分隔
-            entries.groupBy { it.sessionId.ifBlank { "un" } }.forEach { (sessionId, groupEntries) ->
-                // 组标题 + 分隔线
-                HorizontalDivider(thickness = 2.dp, color = MaterialTheme.colorScheme.primary)
-                Text(
-                    text = if (sessionId == "un") stringResource(id = R.string.wavelog_ungrouped)
-                    else sessionId.substringBeforeLast('-'),
-                    fontSize = 11.sp,
-                    fontWeight = FontWeight.Bold,
-                    color = MaterialTheme.colorScheme.primary,
-                    modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp)
-                )
-                groupEntries.forEach { entry ->
-                SwipeDeleteRow(
-                    onDelete = {
-                        queue.remove(entry.id)
-                        refreshTick++
-                    }
-                ) {
-                    Row(
-                        verticalAlignment = Alignment.CenterVertically,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .background(MaterialTheme.colorScheme.surfaceContainer)
-                            .padding(horizontal = 10.dp, vertical = 8.dp)
-                    ) {
-                        Text(
-                            text = formatLocalTime(entry.timeUtcMs),
-                            fontSize = 12.sp,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            modifier = Modifier.width(64.dp)
-                        )
-                        Text(
-                            text = formatFrequency(entry.freqTxHz),
-                            fontSize = 12.sp,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            modifier = Modifier.width(76.dp)
-                        )
-                        Text(
-                            text = entry.call,
-                            fontSize = 14.sp,
-                            fontWeight = FontWeight.Medium,
-                            modifier = Modifier.weight(1f)
-                        )
-                    }
-                }
-                }
-            }
-        }
-    }
-}
-
-/** 转发器展开输入区: 实时频率 + 呼号(回车存本地) + 模式修正 */
-@Composable
-private fun ExpandedLogInput(
-    radio: SatRadio,
-    orbitalPos: OrbitalPos?,
-    satelliteName: String,
-    queue: WavelogQueue,
-    showToast: (String) -> Unit,
-    txBaseFrequencyHz: Long? = null,
-    aosTimeMs: Long = 0L,
-    onSaved: () -> Unit
-) {
-    var callsign by remember { mutableStateOf("") }
-    var mode by remember { mutableStateOf(radio.uplinkMode ?: "FM") }
-
-    val savedMsg = stringResource(id = R.string.wavelog_saved)
-
-    fun submit() {
-        val call = callsign.trim().uppercase()
-        if (call.length < 3) return
-        // 频率直接取转发器栏的数字(radio 每秒多普勒修正, 回车那一秒的值)
-        val tx = radio.uplinkLow ?: radio.downlinkLow ?: 0L
-        val rx = radio.downlinkLow ?: radio.uplinkLow ?: 0L
-        queue.add(
-            WavelogQso(
-                id = UUID.randomUUID().toString(),
-                timeUtcMs = System.currentTimeMillis(),
-                call = call,
-                mode = mode.trim().ifBlank { "FM" }.uppercase(),
-                freqTxHz = tx,
-                freqRxHz = rx,
-                satName = satelliteName,
-                sessionId = buildSessionId(satelliteName, aosTimeMs)
-            )
-        )
-        callsign = ""
-        onSaved()
-        showToast(savedMsg)
-    }
-
-    // 频率显示与转发器栏完全一致: TX 行 + RX 行(radio 来自每秒多普勒重算, 实时刷新)
-    val txForDisplay = radio.uplinkLow ?: radio.downlinkLow ?: 0L
-    val rxForDisplay = radio.downlinkLow ?: radio.uplinkLow ?: 0L
-    val upLow = radio.uplinkLow
-    val upHigh = radio.uplinkHigh
-    val downLow = radio.downlinkLow
-    val downHigh = radio.downlinkHigh
-    val isLinearRange = upLow != null && upHigh != null && upLow != upHigh
-    Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
-        // TX 行
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            Text(
-                text = "TX: ",
-                fontSize = 12.sp,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
-            )
-            Text(
-                text = "${formatFrequency(txForDisplay)} MHz",
-                fontSize = 14.sp,
-                fontWeight = FontWeight.Bold,
-                color = MaterialTheme.colorScheme.primary
-            )
-            if (isLinearRange) {
-                Text(
-                    text = "  (${formatFrequency(upLow)} – ${formatFrequency(upHigh)})",
-                    fontSize = 11.sp,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
-                )
-            }
-        }
-        // RX 行(与转发器栏 RX 一致)
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            Text(
-                text = "RX: ",
-                fontSize = 12.sp,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
-            )
-            Text(
-                text = "${formatFrequency(rxForDisplay)} MHz",
-                fontSize = 14.sp,
-                fontWeight = FontWeight.Bold,
-                color = MaterialTheme.colorScheme.primary
-            )
-            if (downLow != null && downHigh != null && downLow != downHigh) {
-                Text(
-                    text = "  (${formatFrequency(downLow)} – ${formatFrequency(downHigh)})",
-                    fontSize = 11.sp,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
-                )
-            }
-        }
-        OutlinedTextField(
-            value = callsign,
-            onValueChange = { callsign = it.take(12) },
-            label = { Text(stringResource(id = R.string.wavelog_call_hint)) },
-            singleLine = true,
-            keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
-            keyboardActions = KeyboardActions(onDone = { submit() }),
-            textStyle = MaterialTheme.typography.bodyMedium,
-            modifier = Modifier.fillMaxWidth()
-        )
-        OutlinedTextField(
-            value = mode,
-            onValueChange = { mode = it.take(8) },
-            label = { Text(stringResource(id = R.string.wavelog_mode_hint)) },
-            singleLine = true,
-            textStyle = MaterialTheme.typography.bodyMedium,
-            modifier = Modifier.fillMaxWidth()
-        )
-    }
-}
-
-/**
- * 自绘左滑删除行(用户定制交互):
- * 左滑 → 右侧黄色垃圾桶; 滑过 75% → 变撤销键(待删除, 不立即删);
- * 5 秒倒计时内点撤销恢复, 不点自动删除。
- */
-@Composable
-internal fun SwipeDeleteRow(
-    onDelete: () -> Unit,
-    content: @Composable () -> Unit
-) {
-    var offsetX by remember { mutableStateOf(0f) }
-    var pending by remember { mutableStateOf(false) }
-    var countdown by remember { mutableIntStateOf(5) }
-    var rowWidth by remember { mutableIntStateOf(0) }
-    val threshold = rowWidth * 0.75f
-
-    // 平滑弹回/滑入(动画)
-    val animatedOffset by animateFloatAsState(
-        targetValue = offsetX,
-        animationSpec = if (pending) tween(200) else spring(dampingRatio = Spring.DampingRatioNoBouncy),
-        label = "swipeOffset"
-    )
-
-    // 倒计时: 进入待删除后 5 秒自动删
-    LaunchedEffect(pending) {
-        if (pending) {
-            countdown = 5
-            while (countdown > 0) {
-                delay(1000)
-                countdown--
-            }
-            if (pending) {
-                onDelete()
-                pending = false
-                offsetX = 0f
-            }
-        }
-    }
-
-    Box(
-        modifier = Modifier
-            .fillMaxWidth()
-            .onSizeChanged { rowWidth = it.width }
-    ) {
-        // 背景层(右侧图标: 垃圾桶 / 撤销+倒计时)
-        Box(
-            modifier = Modifier
-                .matchParentSize()
-                .background(WaveLogYellow.copy(alpha = 0.25f)),
-            contentAlignment = Alignment.CenterEnd
-        ) {
-            if (pending) {
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.padding(end = 12.dp),
-                    horizontalArrangement = Arrangement.spacedBy(4.dp)
-                ) {
-                    Text(
-                        text = "$countdown",
-                        fontSize = 14.sp,
-                        fontWeight = FontWeight.Bold,
-                        color = WaveLogYellow
-                    )
-                    Text(
-                        text = stringResource(id = R.string.wavelog_delete_undo),
-                        fontSize = 13.sp,
-                        fontWeight = FontWeight.Bold,
-                        color = WaveLogYellow,
-                        modifier = Modifier
-                            .clip(RoundedCornerShape(8.dp))
-                            .background(WaveLogYellow.copy(alpha = 0.15f))
-                            .clickable {
-                                pending = false
-                                offsetX = 0f
-                            }
-                            .padding(horizontal = 10.dp, vertical = 6.dp)
-                    )
-                }
-            } else {
-                // 垃圾桶(滑动过程中一直显示, 黄色)
-                Text(
-                    text = "🗑",
-                    fontSize = 20.sp,
-                    modifier = Modifier.padding(end = 16.dp)
-                )
-            }
-        }
-        // 内容层(跟手滑动): 背景在 offset 内侧(随内容移动)!
-        // 平时盖住垃圾桶, 左滑时内容带背景移开 → 右侧露出黄色垃圾桶/撤销倒计时
-        Box(
-            modifier = Modifier
-                .offset { IntOffset(animatedOffset.roundToInt(), 0) }
-                .background(MaterialTheme.colorScheme.surfaceContainer)
-                .pointerInput(Unit) {
-                    detectHorizontalDragGestures(
-                        onDragStart = { if (pending) { pending = false } },
-                        onHorizontalDrag = { change, dragAmount ->
-                            change.consume()
-                            offsetX = (offsetX + dragAmount).coerceIn(-rowWidth.toFloat(), 0f)
-                        },
-                        onDragEnd = {
-                            if (offsetX <= -threshold) {
-                                pending = true
-                                countdown = 5
-                            } else {
-                                offsetX = 0f
-                            }
-                        },
-                        onDragCancel = { offsetX = 0f }
-                    )
-                }
-        ) {
-            content()
-        }
-    }
-}
-
-private fun formatLocalTime(utcMs: Long): String {
-    val cal = Calendar.getInstance(TimeZone.getDefault())
-    cal.timeInMillis = utcMs
-    return "%02d:%02d".format(cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE))
-}
-
-/** 场次 ID: 卫星名-AOS 时间戳(UTC yyyyMMdd-HHmm); 无 AOS 时用回车时刻 */
-private fun buildSessionId(satName: String, aosTimeMs: Long): String {
-    val cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
-    cal.timeInMillis = if (aosTimeMs > 0) aosTimeMs else System.currentTimeMillis()
-    val stamp = "%04d%02d%02d-%02d%02d".format(
-        cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH),
-        cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE)
-    )
-    return "$satName-$stamp"
-}

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

@@ -61,8 +61,6 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.rtbishop.look4sat.core.domain.predict.OrbitalPos
 import com.rtbishop.look4sat.core.domain.repository.IContainerProvider
 import com.rtbishop.look4sat.core.domain.repository.MutualPassData
-import com.rtbishop.look4sat.core.domain.wavelog.UploadOutcome
-import com.rtbishop.look4sat.core.domain.wavelog.WavelogQueue
 import com.rtbishop.look4sat.core.domain.utility.DopplerFrequencyCalculator
 import com.rtbishop.look4sat.core.domain.utility.toDegrees
 import com.rtbishop.look4sat.core.presentation.EmptyListCard
@@ -81,7 +79,6 @@ import kotlin.math.PI
 
 private enum class RadarPage(val title: String) {
     Transceivers("Transceivers"),
-    Log("Log"),
     Calculator("Calculator"),
     Sstv("SSTV")
 }
@@ -124,33 +121,9 @@ fun RadarDestination(navigateUp: () -> Unit) {
         viewModel.onAction(RadarAction.SstvPermissionResult(granted))
         viewModel.onAction(RadarAction.CwPermissionResult(granted))
     }
-    // WaveLog(4.5.2): 自动上传 — 每 10 分钟重试本地队列(开关开启时)
-    val wavelogUploader = remember { container.provideWavelogUploader() }
-    LaunchedEffect(Unit) {
-        while (true) {
-            delay(10 * 60 * 1000L)
-            val s = container.settingsRepo.otherSettings.value
-            if (s.wavelogAutoUpload && s.wavelogUrl.isNotBlank()) {
-                // 网格不一致时静默跳过(留给手动上传确认), 其余失败自动下次重试
-                val outcome = wavelogUploader.uploadQueue()
-                if (outcome is UploadOutcome.NeedConfirm) {
-                    // 跳过本次; 用户可在设置页手动上传并确认
-                }
-            }
-        }
-    }
-    RadarScreen(
-        uiState,
-        viewModel::onAction,
-        navigateUpAndClearMutual,
-        mutualData,
-        { permissionLauncher.launch(Manifest.permission.RECORD_AUDIO) },
-        wavelogQueue = container.wavelogQueue,
-        wavelogConfigured = container.settingsRepo.otherSettings.value.let {
-            it.wavelogUrl.isNotBlank() && it.wavelogApiKey.isNotBlank() && it.wavelogStationId.isNotBlank()
-        },
-        showToast = { msg -> container.provideShowToast()(msg) }
-    )
+    RadarScreen(uiState, viewModel::onAction, navigateUpAndClearMutual, mutualData, requestMicPermission = {
+        permissionLauncher.launch(Manifest.permission.RECORD_AUDIO)
+    })
 }
 
 @Composable
@@ -159,10 +132,7 @@ private fun RadarScreen(
     onAction: (RadarAction) -> Unit,
     navigateUp: () -> Unit,
     mutualData: MutualPassData,
-    requestMicPermission: () -> Unit,
-    wavelogQueue: WavelogQueue,
-    wavelogConfigured: Boolean,
-    showToast: (String) -> Unit
+    requestMicPermission: () -> Unit
 ) {
     val upcomingPass = uiState.currentPass ?: getDefaultPass()
     val addToCalendar: () -> Unit = {
@@ -216,11 +186,11 @@ private fun RadarScreen(
         }
         if (isVertical) {
             RadarCard(uiState, trackB, trackBPosition, Modifier.weight(1f))
-            PagerCard(uiState, onAction, requestMicPermission, wavelogQueue, wavelogConfigured, showToast, Modifier.weight(1f))
+            PagerCard(uiState, onAction, requestMicPermission, Modifier.weight(1f))
         } else {
             Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
                 RadarCard(uiState, trackB, trackBPosition, Modifier.weight(1f))
-                PagerCard(uiState, onAction, requestMicPermission, wavelogQueue, wavelogConfigured, showToast, Modifier.weight(1f))
+                PagerCard(uiState, onAction, requestMicPermission, Modifier.weight(1f))
             }
         }
     }
@@ -231,9 +201,6 @@ private fun PagerCard(
     uiState: RadarState,
     onAction: (RadarAction) -> Unit,
     requestMicPermission: () -> Unit,
-    wavelogQueue: WavelogQueue,
-    wavelogConfigured: Boolean,
-    showToast: (String) -> Unit,
     modifier: Modifier = Modifier
 ) {
     val hasCalculatorPage = remember(uiState.transceivers.transmitters) {
@@ -242,7 +209,6 @@ private fun PagerCard(
     val pages = remember(hasCalculatorPage) {
         buildList {
             add(RadarPage.Transceivers)
-            add(RadarPage.Log)
             if (hasCalculatorPage) add(RadarPage.Calculator)
             add(RadarPage.Sstv)
         }
@@ -292,16 +258,6 @@ private fun PagerCard(
                         onAction = onAction,
                         requestMicPermission = requestMicPermission
                     )
-                    RadarPage.Log -> LogTab(
-                        transceivers = uiState.transceivers.transmitters,
-                        orbitalPos = uiState.orbitalPos,
-                        satelliteName = uiState.currentPass?.name ?: "",
-                        queue = wavelogQueue,
-                        wavelogConfigured = wavelogConfigured,
-                        showToast = showToast,
-                        txBaseFrequencyHz = uiState.radioControl.txBaseFrequencyHz,
-                        aosTimeMs = uiState.currentPass?.aosTime ?: 0L
-                    )
                 }
             }
         }

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

@@ -94,21 +94,14 @@ fun RadarViewCompose(
         animationSpec = infiniteRepeatable(tween(1000)),
         label = "animScale"
     )
-    // Drive the sweep from the animation framework to eliminate state mutation inside the draw block.
-    // Only create the infinite transition when the sweep is enabled — otherwise the canvas would
-    // be invalidated every frame for an effect that isn't visible, wasting GPU and battery.
-    val sweepDegrees = if (shouldShowSweep) {
-        val sweepTransition = rememberInfiniteTransition(label = "sweep")
-        val animatedSweep by sweepTransition.animateFloat(
-            initialValue = 0f,
-            targetValue = 360f,
-            animationSpec = infiniteRepeatable(tween(SWEEP_DURATION_MS, easing = LinearEasing)),
-            label = "sweepDegrees"
-        )
-        animatedSweep
-    } else {
-        0f
-    }
+    // Drive the sweep from the animation framework to eliminate state mutation inside the draw block
+    val sweepTransition = rememberInfiniteTransition(label = "sweep")
+    val sweepDegrees by sweepTransition.animateFloat(
+        initialValue = 0f,
+        targetValue = 360f,
+        animationSpec = infiniteRepeatable(tween(SWEEP_DURATION_MS, easing = LinearEasing)),
+        label = "sweepDegrees"
+    )
     val measurer = rememberTextMeasurer()
     val sunPainter = painterResource(R.drawable.ic_sun)
     val moonPainter = painterResource(R.drawable.ic_moon)

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

@@ -181,7 +181,7 @@ class RadarViewModel(
                 orbitalPos = pos, sunPosition = cachedSunPos, moonPosition = cachedMoonPos
             )
         }
-        processRadios(allRadios, pos)
+        processRadios(allRadios, pass.orbitalObject, timeNow)
         sendPassData(pos)
     }
 
@@ -342,8 +342,8 @@ class RadarViewModel(
         }
     }
 
-    private suspend fun processRadios(radios: List<SatRadio>, satPos: OrbitalPos) {
-        val transmitters = satelliteRepo.getRadios(satPos, radios)
+    private suspend fun processRadios(radios: List<SatRadio>, orbitalObject: OrbitalObject, time: Long) {
+        val transmitters = satelliteRepo.getRadios(orbitalObject, stationPos, radios, time)
         _uiState.update { state ->
             val freq = if (state.transceivers.selectedUuid != null) {
                 val selectedRadio = transmitters.firstOrNull { it.uuid == state.transceivers.selectedUuid }

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

@@ -18,19 +18,26 @@
 package com.rtbishop.look4sat.feature.radar
 
 import android.app.Activity
+import android.content.Context
 import android.view.LayoutInflater
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.expandVertically
 import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -41,6 +48,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Button
 import androidx.compose.material3.FilterChip
@@ -49,22 +57,31 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Slider
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.ElevatedCard
+import androidx.compose.material3.CardDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.geometry.Offset
 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.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
@@ -134,6 +151,7 @@ fun CalculatorPage(
 ) {
     val calculatorTransceivers = remember(transceivers) {
         transceivers.filter(DopplerFrequencyCalculator::isNamedLinearTransponder)
+            .let(DopplerFrequencyCalculator::deduplicateTransponders)
     }
     val selectedTransceiver = remember(calculatorTransceivers, selectedUuid) {
         calculatorTransceivers.firstOrNull { it.uuid == selectedUuid }
@@ -145,61 +163,53 @@ fun CalculatorPage(
         return
     }
 
-    LazyColumn(
+    Column(
         modifier = modifier
             .fillMaxSize()
-            .padding(8.dp),
+            .verticalScroll(rememberScrollState()),
         verticalArrangement = Arrangement.spacedBy(10.dp)
     ) {
         if (calculatorTransceivers.size > 1) {
-            item {
-                FlowRow(
-                    horizontalArrangement = Arrangement.spacedBy(6.dp),
-                    verticalArrangement = Arrangement.spacedBy(4.dp),
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    calculatorTransceivers.forEach { radio ->
-                        FilterChip(
-                            selected = radio.uuid == selectedTransceiver.uuid,
-                            onClick = {
-                                if (radio.uuid != selectedUuid) onAction(RadarAction.SelectTransmitter(radio.uuid))
-                            },
-                            label = {
-                                Text(
-                                    text = transceiverTitle(radio),
-                                    maxLines = 1,
-                                    overflow = TextOverflow.Ellipsis
-                                )
-                            }
-                        )
-                    }
+            FlowRow(
+                horizontalArrangement = Arrangement.spacedBy(6.dp),
+                verticalArrangement = Arrangement.spacedBy(4.dp),
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                calculatorTransceivers.forEach { radio ->
+                    FilterChip(
+                        selected = radio.uuid == selectedTransceiver.uuid,
+                        onClick = {
+                            if (radio.uuid != selectedUuid) onAction(RadarAction.SelectTransmitter(radio.uuid))
+                        },
+                        label = {
+                            Text(
+                                text = transceiverTitle(radio),
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis
+                            )
+                        }
+                    )
                 }
             }
         }
 
-        item {
-            DopplerFrequencyCalculator(
-                transponder = selectedTransceiver,
-                orbitalPos = orbitalPos,
-                modifier = Modifier.fillMaxWidth()
-            )
-        }
+        DopplerFrequencyCalculator(
+            transponder = selectedTransceiver,
+            orbitalPos = orbitalPos,
+            modifier = Modifier.fillMaxWidth()
+        )
 
-        item {
-            HorizontalDivider(
-                thickness = 1.dp,
-                color = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f)
-            )
-        }
+        HorizontalDivider(
+            thickness = 1.dp,
+            color = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f)
+        )
 
-        item {
-            CwDecoderPanel(
-                cw = cw,
-                onAction = onAction,
-                requestMicPermission = requestMicPermission,
-                modifier = Modifier.fillMaxWidth()
-            )
-        }
+        CwDecoderPanel(
+            cw = cw,
+            onAction = onAction,
+            requestMicPermission = requestMicPermission,
+            modifier = Modifier.fillMaxWidth()
+        )
     }
 }
 
@@ -532,6 +542,8 @@ private fun ExpandedRadioControl(
     }
 }
 
+private enum class EditedField { TX, PASSBAND, RX }
+
 @Composable
 private fun DopplerFrequencyCalculator(
     transponder: SatRadio,
@@ -540,144 +552,372 @@ private fun DopplerFrequencyCalculator(
 ) {
     if (orbitalPos == null || !DopplerFrequencyCalculator.isLinearTransponder(transponder)) return
 
-    var txInputMHz by remember { mutableStateOf("") }
-    var rxInputMHz by remember { mutableStateOf("") }
-    var offsetKHz by remember { mutableStateOf("") }
-    var lastEditedBy by remember { mutableStateOf(EditedField.TX) }
+    var lastEditedField by rememberSaveable(transponder.uuid) { mutableStateOf(EditedField.TX) }
+    var txFrequencyHz by rememberSaveable(transponder.uuid) { mutableStateOf(0L) }
+    var rxFrequencyHz by rememberSaveable(transponder.uuid) { mutableStateOf(0L) }
+    var passbandPosition by rememberSaveable(transponder.uuid) { mutableStateOf(0.5f) }
+    // 每个卫星独立记忆 offset：以 NORAD 编号为 key，存到应用 SharedPreferences
+    val context = LocalContext.current
+    val catnum = transponder.catnum
+    var offsetKHz by remember(catnum) {
+        mutableStateOf(
+            catnum?.let { cn ->
+                context.getSharedPreferences(context.packageName + "_preferences", Context.MODE_PRIVATE)
+                    .getString("offset_khz_$cn", "") ?: ""
+            } ?: ""
+        )
+    }
+    var stepSizeKHz by remember { mutableIntStateOf(1) }
 
     val offsetHz = offsetKHz.toDoubleOrNull()?.let { it * 1000 }?.toLong() ?: 0L
 
-    // Real-time refresh: when orbitalPos changes (1Hz), recompute the opposite field
+    val txLow = transponder.uplinkLow ?: return
+    val txHigh = transponder.uplinkHigh ?: return
+    val rxLow = transponder.downlinkLow ?: return
+    val rxHigh = transponder.downlinkHigh ?: return
+    val txRange = txHigh - txLow
+    val rxRange = rxHigh - rxLow
+    if (txRange <= 0L || rxRange <= 0L) return
+
+    // 原始转发器值（逆转多普勒），用于 passband 映射计算
+    val rawTxLow = orbitalPos.getDownlinkFreq(txLow)
+    val rawTxHigh = orbitalPos.getDownlinkFreq(txHigh)
+    val rawRxLow = orbitalPos.getUplinkFreq(rxLow)
+    val rawRxHigh = orbitalPos.getUplinkFreq(rxHigh)
+    val rawTxRange = rawTxHigh - rawTxLow
+    val rawRxRange = rawRxHigh - rawRxLow
+    val rawTransponder = transponder.copy(
+        uplinkLow = rawTxLow, uplinkHigh = rawTxHigh,
+        downlinkLow = rawRxLow, downlinkHigh = rawRxHigh
+    )
+
+    // 初始化
+    LaunchedEffect(Unit) {
+        if (txFrequencyHz == 0L) {
+            txFrequencyHz = txLow + txRange / 2
+            rxFrequencyHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
+                txFrequencyHz, rawTransponder, orbitalPos, offsetHz
+            ) ?: (rxLow + rxRange / 2)
+        }
+    }
+
+    // 实时重算：卫星移动时，锚点侧不变，重算另一侧
     LaunchedEffect(orbitalPos) {
-        if (lastEditedBy == EditedField.TX) {
-            val txMHz = txInputMHz.toDoubleOrNull()
-            if (txMHz != null && txMHz > 0) {
-                val txHz = (txMHz * 1_000_000).toLong()
-                val rxHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
-                    txHz, transponder, orbitalPos, offsetHz
-                )
-                if (rxHz != null) {
-                    rxInputMHz = String.format(Locale.ENGLISH, "%.6f", rxHz / 1_000_000.0)
-                }
+        if (lastEditedField == EditedField.TX) {
+            // TX 是锚点，不变；重算 RX
+            rxFrequencyHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
+                txFrequencyHz, rawTransponder, orbitalPos, offsetHz
+            ) ?: rxFrequencyHz
+        } else if (lastEditedField == EditedField.RX) {
+            // RX 是锚点，不变；重算 TX
+            txFrequencyHz = DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset(
+                rxFrequencyHz, rawTransponder, orbitalPos, offsetHz
+            ) ?: txFrequencyHz
+        } else if (lastEditedField == EditedField.PASSBAND) {
+            // 相对位置不变（passbandPosition），TX 用地面频率，RX 经 Transceiver 完整路径计算
+            txFrequencyHz = txLow + (passbandPosition * txRange).toLong()
+            rxFrequencyHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
+                txFrequencyHz, rawTransponder, orbitalPos, offsetHz
+            ) ?: rxFrequencyHz
+        }
+    }
+
+    val txSliderValue = if (lastEditedField == EditedField.PASSBAND) {
+        passbandPosition
+    } else {
+        ((txFrequencyHz - txLow).toFloat() / txRange).coerceIn(0f, 1f)
+    }
+    val rxSliderValue = if (lastEditedField == EditedField.PASSBAND) {
+        ((rxFrequencyHz - rxLow).toFloat() / rxRange).coerceIn(0f, 1f)
+    } else {
+        ((rxFrequencyHz - rxLow).toFloat() / rxRange).coerceIn(0f, 1f)
+    }
+
+    fun updateTx(newTxHz: Long) {
+        when (lastEditedField) {
+            EditedField.PASSBAND -> {
+                // Passband 模式：滑块位置 → passbandPosition → 地面频率，RX 经 Transceiver 计算
+                val pos = ((newTxHz - txLow).toFloat() / txRange).coerceIn(0f, 1f)
+                passbandPosition = pos
+                txFrequencyHz = txLow + (pos * txRange).toLong()
+                rxFrequencyHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
+                    txFrequencyHz, rawTransponder, orbitalPos, offsetHz
+                ) ?: rxFrequencyHz
             }
-        } else {
-            val rxMHz = rxInputMHz.toDoubleOrNull()
-            if (rxMHz != null && rxMHz > 0) {
-                val rxHz = (rxMHz * 1_000_000).toLong()
-                val txHz = DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset(
-                    rxHz, transponder, orbitalPos, offsetHz
+            else -> {
+                txFrequencyHz = newTxHz.coerceIn(txLow, txHigh)
+                rxFrequencyHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
+                    txFrequencyHz, rawTransponder, orbitalPos, offsetHz
+                ) ?: rxFrequencyHz
+            }
+        }
+    }
+
+    fun updateRx(newRxHz: Long) {
+        when (lastEditedField) {
+            EditedField.PASSBAND -> {
+                // Passband 模式：从 RX 经完整往返路径（含多普勒补偿）反推 TX 位置
+                val txFromRx = DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset(
+                    newRxHz, rawTransponder, orbitalPos, offsetHz
                 )
-                if (txHz != null) {
-                    txInputMHz = String.format(Locale.ENGLISH, "%.6f", txHz / 1_000_000.0)
+                passbandPosition = if (txFromRx != null) {
+                    ((txFromRx - txLow).toFloat() / txRange).coerceIn(0f, 1f)
+                } else {
+                    ((rxFrequencyHz - rxLow).toFloat() / rxRange).coerceIn(0f, 1f)
                 }
+                txFrequencyHz = txLow + (passbandPosition * txRange).toLong()
+                rxFrequencyHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
+                    txFrequencyHz, rawTransponder, orbitalPos, offsetHz
+                ) ?: rxFrequencyHz
+            }
+            else -> {
+                rxFrequencyHz = newRxHz.coerceIn(rxLow, rxHigh)
+                txFrequencyHz = DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset(
+                    rxFrequencyHz, rawTransponder, orbitalPos, offsetHz
+                ) ?: txFrequencyHz
             }
         }
     }
 
     Column(
-        modifier = modifier,
-        verticalArrangement = Arrangement.spacedBy(4.dp)
+        modifier = modifier.fillMaxWidth().padding(top = 16.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp)
     ) {
-        Text(
-            text = stringResource(R.string.radar_doppler_calc),
-            fontSize = 14.sp,
-            fontWeight = FontWeight.Medium,
-            color = MaterialTheme.colorScheme.primary
-        )
-        Text(
-            text = stringResource(R.string.radar_doppler_info),
-            fontSize = 12.sp,
-            color = MaterialTheme.colorScheme.onSurfaceVariant
-        )
-
-        // Offset input
-        OutlinedTextField(
-            value = offsetKHz,
-            onValueChange = { newVal ->
-                offsetKHz = newVal
-                // Trigger recompute based on last edited field
-                if (lastEditedBy == EditedField.TX) {
-                    val txMHz = txInputMHz.toDoubleOrNull()
-                    if (txMHz != null && txMHz > 0) {
-                        val txHz = (txMHz * 1_000_000).toLong()
-                        val rxHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
-                            txHz, transponder, orbitalPos, offsetHz
-                        )
-                        rxInputMHz = if (rxHz != null) String.format(Locale.ENGLISH, "%.6f", rxHz / 1_000_000.0) else ""
-                    }
-                } else {
-                    val rxMHz = rxInputMHz.toDoubleOrNull()
-                    if (rxMHz != null && rxMHz > 0) {
-                        val rxHz = (rxMHz * 1_000_000).toLong()
-                        val txHz = DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset(
-                            rxHz, transponder, orbitalPos, offsetHz
-                        )
-                        txInputMHz = if (txHz != null) String.format(Locale.ENGLISH, "%.6f", txHz / 1_000_000.0) else ""
-                    }
+            Row(
+                modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(6.dp)
+            ) {
+                // 左半边: TX + RX 按钮
+                Row(
+                    modifier = Modifier.weight(1f),
+                    horizontalArrangement = Arrangement.spacedBy(4.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    FilterChip(
+                        selected = lastEditedField == EditedField.TX,
+                        onClick = {
+                            when (lastEditedField) {
+                                EditedField.TX -> {
+                                    passbandPosition = ((txFrequencyHz - txLow).toFloat() / txRange).coerceIn(0f, 1f)
+                                    lastEditedField = EditedField.PASSBAND
+                                    rxFrequencyHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
+                                        txFrequencyHz, rawTransponder, orbitalPos, offsetHz
+                                    ) ?: rxFrequencyHz
+                                }
+                                EditedField.PASSBAND -> { lastEditedField = EditedField.TX }
+                                else -> { lastEditedField = EditedField.TX }
+                            }
+                        },
+                        label = {
+                            Text("TX", fontSize = 13.sp, textAlign = TextAlign.Center,
+                                modifier = Modifier.fillMaxWidth())
+                        },
+                        modifier = Modifier.weight(1f).fillMaxHeight()
+                    )
+                    FilterChip(
+                        selected = lastEditedField == EditedField.RX,
+                        onClick = {
+                            when (lastEditedField) {
+                                EditedField.RX -> {
+                                    txFrequencyHz = DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset(
+                                        rxFrequencyHz, rawTransponder, orbitalPos, offsetHz
+                                    ) ?: txFrequencyHz
+                                    passbandPosition = ((txFrequencyHz - txLow).toFloat() / txRange).coerceIn(0f, 1f)
+                                    lastEditedField = EditedField.PASSBAND
+                                }
+                                EditedField.PASSBAND -> {
+                                    lastEditedField = EditedField.RX
+                                    txFrequencyHz = DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset(
+                                        rxFrequencyHz, rawTransponder, orbitalPos, offsetHz
+                                    ) ?: txFrequencyHz
+                                }
+                                else -> { lastEditedField = EditedField.RX }
+                            }
+                        },
+                        label = {
+                            Text("RX", fontSize = 13.sp, textAlign = TextAlign.Center,
+                                modifier = Modifier.fillMaxWidth())
+                        },
+                        modifier = Modifier.weight(1f).fillMaxHeight()
+                    )
                 }
-            },
-            label = { Text(stringResource(R.string.radar_doppler_offset_hint)) },
-            singleLine = true,
-            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text),
-            modifier = Modifier.fillMaxWidth()
-        )
+                // 右半边: Offset 输入框（带细线边框）
+                Box(
+                    modifier = Modifier
+                        .weight(1f)
+                        .height(48.dp)
+                        .border(1.dp, MaterialTheme.colorScheme.outline, MaterialTheme.shapes.small),
+                    contentAlignment = Alignment.Center
+                ) {
+                    BasicTextField(
+                        value = offsetKHz,
+                        onValueChange = { newValue ->
+                            offsetKHz = newValue
+                            catnum?.let { cn ->
+                                context.getSharedPreferences(
+                                    context.packageName + "_preferences",
+                                    Context.MODE_PRIVATE
+                                ).edit().putString("offset_khz_$cn", newValue).apply()
+                            }
+                        },
+                        singleLine = true,
+                        textStyle = TextStyle(
+                            fontSize = 16.sp,
+                            textAlign = TextAlign.Center,
+                            color = MaterialTheme.colorScheme.onSurface
+                        ),
+                        decorationBox = { innerTextField ->
+                            if (offsetKHz.isEmpty()) {
+                                Text(
+                                    text = "Offset (kHz)",
+                                    fontSize = 16.sp,
+                                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                                )
+                            }
+                            innerTextField()
+                        }
+                    )
+                }
+            }
 
-        // TX and RX inputs on the same row
-        Row(
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
-            modifier = Modifier.fillMaxWidth()
-        ) {
-            // TX input → compute RX
-            OutlinedTextField(
-                value = txInputMHz,
-                onValueChange = { newVal ->
-                    txInputMHz = newVal
-                    lastEditedBy = EditedField.TX
-                    val mhz = newVal.toDoubleOrNull()
-                    if (mhz != null && mhz > 0) {
-                        val txHz = (mhz * 1_000_000).toLong()
-                        val rxHz = DopplerFrequencyCalculator.computeDownlinkFromUplinkWithOffset(
-                            txHz, transponder, orbitalPos, offsetHz
+            // TX 行
+            Column(modifier = Modifier.fillMaxWidth()) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    OutlinedButton(
+                        onClick = { updateTx(txFrequencyHz - stepSizeKHz * 1000L) },
+                        modifier = Modifier.width(32.dp).height(28.dp),
+                        contentPadding = PaddingValues(0.dp),
+                        shape = MaterialTheme.shapes.extraSmall
+                    ) { Text("−", fontSize = 14.sp) }
+
+                    Slider(
+                        value = txSliderValue,
+                        onValueChange = { norm ->
+                            val rawFreq = txLow + (txRange * norm).toLong()
+                            val snapped = ((rawFreq + 500) / 1000L) * 1000L
+                            updateTx(snapped.coerceIn(txLow, txHigh))
+                        },
+                        valueRange = 0f..1f,
+                        modifier = Modifier.weight(1f).height(20.dp).padding(horizontal = 4.dp)
+                    )
+
+                    OutlinedButton(
+                        onClick = { updateTx(txFrequencyHz + stepSizeKHz * 1000L) },
+                        modifier = Modifier.width(32.dp).height(28.dp),
+                        contentPadding = PaddingValues(0.dp),
+                        shape = MaterialTheme.shapes.extraSmall
+                    ) { Text("+", fontSize = 14.sp) }
+                }
+                Row(
+                    modifier = Modifier.fillMaxWidth().padding(horizontal = 4.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Text(
+                        text = String.format(Locale.ENGLISH, "%.4f", txLow / 1_000_000.0),
+                        fontSize = 12.sp,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        modifier = Modifier.weight(1f)
+                    )
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.Center
+                    ) {
+                        Text(
+                            text = String.format(Locale.ENGLISH, "%.6f", txFrequencyHz / 1_000_000.0),
+                            fontSize = 20.sp,
+                            fontWeight = FontWeight.Bold,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                        Text(
+                            text = " MHz",
+                            fontSize = 20.sp,
+                            fontWeight = FontWeight.Bold,
+                            color = MaterialTheme.colorScheme.primary
                         )
-                        rxInputMHz = if (rxHz != null) String.format(Locale.ENGLISH, "%.6f", rxHz / 1_000_000.0) else ""
-                    } else if (newVal.isEmpty()) {
-                        rxInputMHz = ""
                     }
-                },
-                label = { Text(stringResource(R.string.radar_doppler_tx_hint)) },
-                singleLine = true,
-                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal),
-                modifier = Modifier.weight(1f)
+                    Text(
+                        text = String.format(Locale.ENGLISH, "%.4f", txHigh / 1_000_000.0),
+                        fontSize = 12.sp,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        modifier = Modifier.weight(1f),
+                        textAlign = TextAlign.End
+                    )
+                }
+            }
+
+            HorizontalDivider(
+                thickness = 0.5.dp,
+                color = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f)
             )
 
-            // RX input → compute TX
-            OutlinedTextField(
-                value = rxInputMHz,
-                onValueChange = { newVal ->
-                    rxInputMHz = newVal
-                    lastEditedBy = EditedField.RX
-                    val mhz = newVal.toDoubleOrNull()
-                    if (mhz != null && mhz > 0) {
-                        val rxHz = (mhz * 1_000_000).toLong()
-                        val txHz = DopplerFrequencyCalculator.computeUplinkFromDownlinkWithOffset(
-                            rxHz, transponder, orbitalPos, offsetHz
+            // RX 行
+            Column(modifier = Modifier.fillMaxWidth()) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    OutlinedButton(
+                        onClick = { updateRx(rxFrequencyHz - stepSizeKHz * 1000L) },
+                        modifier = Modifier.width(32.dp).height(28.dp),
+                        contentPadding = PaddingValues(0.dp),
+                        shape = MaterialTheme.shapes.extraSmall
+                    ) { Text("−", fontSize = 14.sp) }
+
+                    Slider(
+                        value = rxSliderValue,
+                        onValueChange = { norm ->
+                            val rawFreq = rxLow + (rxRange * norm).toLong()
+                            val snapped = ((rawFreq + 500) / 1000L) * 1000L
+                            updateRx(snapped.coerceIn(rxLow, rxHigh))
+                        },
+                        valueRange = 0f..1f,
+                        modifier = Modifier.weight(1f).height(20.dp).padding(horizontal = 4.dp)
+                    )
+
+                    OutlinedButton(
+                        onClick = { updateRx(rxFrequencyHz + stepSizeKHz * 1000L) },
+                        modifier = Modifier.width(32.dp).height(28.dp),
+                        contentPadding = PaddingValues(0.dp),
+                        shape = MaterialTheme.shapes.extraSmall
+                    ) { Text("+", fontSize = 14.sp) }
+                }
+                Row(
+                    modifier = Modifier.fillMaxWidth().padding(horizontal = 4.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Text(
+                        text = String.format(Locale.ENGLISH, "%.4f", rxLow / 1_000_000.0),
+                        fontSize = 12.sp,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        modifier = Modifier.weight(1f)
+                    )
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.Center
+                    ) {
+                        Text(
+                            text = String.format(Locale.ENGLISH, "%.6f", rxFrequencyHz / 1_000_000.0),
+                            fontSize = 20.sp,
+                            fontWeight = FontWeight.Bold,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                        Text(
+                            text = " MHz",
+                            fontSize = 20.sp,
+                            fontWeight = FontWeight.Bold,
+                            color = MaterialTheme.colorScheme.primary
                         )
-                        txInputMHz = if (txHz != null) String.format(Locale.ENGLISH, "%.6f", txHz / 1_000_000.0) else ""
-                    } else if (newVal.isEmpty()) {
-                        txInputMHz = ""
                     }
-                },
-                label = { Text(stringResource(R.string.radar_doppler_rx_hint)) },
-                singleLine = true,
-                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal),
-                modifier = Modifier.weight(1f)
-            )
+                    Text(
+                        text = String.format(Locale.ENGLISH, "%.4f", rxHigh / 1_000_000.0),
+                        fontSize = 12.sp,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        modifier = Modifier.weight(1f),
+                        textAlign = TextAlign.End
+                    )
+                }
+            }
         }
-    }
 }
 
-private enum class EditedField { TX, RX }
-
 @Composable
 private fun CwDecoderPanel(
     cw: CwSubState,
@@ -717,30 +957,36 @@ private fun CwDecoderPanel(
             // PR #1 Morse Expert engine: mini layout with waterfall + decoded text.
             // Keep the old Kotlin decoder state/actions as fallback code, but this panel no longer feeds it.
             val context = LocalContext.current
-            val activity = remember { context as? Activity }
+            val activity = remember(context) {
+                context as? Activity ?: error("CwDecoderPanel must be hosted in an Activity")
+            }
             val controller = remember { MainActivity() }
-            val rootView = remember {
-                LayoutInflater.from(context).inflate(CwR.layout.cw_panel_main, null) as ConstraintLayout
+            val rootView = remember(context) {
+                LayoutInflater.from(context).inflate(CwR.layout.activity_main, null) as ConstraintLayout
             }
             var initialized by remember { mutableStateOf(false) }
             var listening by remember { mutableStateOf(false) }
 
-            DisposableEffect(Unit) {
-                if (activity != null) {
-                    controller.onCreate(activity, rootView, false)
-                }
-                onDispose {
-                    controller.onPause()
-                    controller.onDestroy()
-                }
-            }
-
-            LaunchedEffect(cw.hasPermission) {
-                if (cw.hasPermission && !initialized) {
+            // 重要: 不在展开时初始化控制器(避免"一展开就崩溃")。
+            // controller.onCreate/onResume/onPermissionGranted 全部推迟到用户点 Start 才执行。
+            fun startDecoding() {
+                if (!initialized) {
+                    controller.onCreate(activity, rootView)
                     controller.onPermissionGranted()
                     controller.onResume()
                     initialized = true
-                    listening = true
+                } else {
+                    controller.onResume()
+                }
+                listening = true
+            }
+
+            DisposableEffect(Unit) {
+                onDispose {
+                    if (initialized) {
+                        controller.onPause()
+                        controller.onDestroy()
+                    }
                 }
             }
 
@@ -754,14 +1000,8 @@ private fun CwDecoderPanel(
                             onClick = {
                                 if (!cw.hasPermission) {
                                     requestMicPermission()
-                                } else if (!initialized) {
-                                    controller.onPermissionGranted()
-                                    controller.onResume()
-                                    initialized = true
-                                    listening = true
                                 } else {
-                                    controller.onResume()
-                                    listening = true
+                                    startDecoding()
                                 }
                             },
                             modifier = Modifier.weight(1f)
@@ -780,19 +1020,23 @@ private fun CwDecoderPanel(
                         }
                     }
                     OutlinedButton(
-                        onClick = { controller.clearDecoded() },
+                        onClick = { if (initialized) controller.clearDecoded() },
                         modifier = Modifier.weight(1f)
                     ) {
                         Text(stringResource(R.string.radar_cw_reset))
                     }
                 }
 
-                AndroidView(
-                    factory = { rootView },
+                Box(
                     modifier = Modifier
                         .fillMaxWidth()
                         .height(150.dp)
-                )
+                ) {
+                    AndroidView(
+                        factory = { rootView },
+                        modifier = Modifier.fillMaxSize()
+                    )
+                }
             }
         }
     }

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

@@ -1,236 +0,0 @@
-/*
- * WavelogLogScreen.kt — 「日志」页面(更多菜单, 4.5.2 修复)。
- *
- * 表格形式展示本地存储的日志: 时间 | 频率 | 卫星 | 呼号 | 已上传(✓)。
- * 完整格子线(表头横线 + 行横线 + 列竖线 + 外边框); 行复用左滑删除。
- */
-package com.rtbishop.look4sat.feature.radar
-
-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.RowScope
-import androidx.compose.foundation.layout.fillMaxHeight
-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.width
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-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.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.rtbishop.look4sat.core.domain.wavelog.WavelogQueue
-import com.rtbishop.look4sat.core.presentation.R
-import com.rtbishop.look4sat.core.presentation.formatFrequency
-import java.util.Calendar
-import java.util.TimeZone
-
-private val CheckGreen = Color(0xFF4CAF50)
-private val GridLineColor = Color(0xFF3A3A3A)
-
-@Composable
-fun WavelogLogScreen(
-    queue: WavelogQueue,
-    modifier: Modifier = Modifier
-) {
-    var refreshTick by remember { mutableIntStateOf(0) }
-    val entries = remember(refreshTick) { queue.all() }
-
-    Column(
-        modifier = modifier
-            .fillMaxSize()
-            .verticalScroll(rememberScrollState())
-            .padding(8.dp)
-    ) {
-        // 表格外边框(左右 + 上下由表头/行底线构成)
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .background(MaterialTheme.colorScheme.surfaceContainer)
-        ) {
-            // 表头
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(38.dp)
-            ) {
-                HeaderCell(stringResource(id = R.string.wavelog_col_time), 72.dp)
-                GridVLine()
-                HeaderCell(stringResource(id = R.string.wavelog_col_freq), 64.dp)
-                GridVLine()
-                HeaderCell(stringResource(id = R.string.wavelog_col_sat), 0.dp, weight = 1.2f)
-                GridVLine()
-                HeaderCell(stringResource(id = R.string.wavelog_col_call), 0.dp, weight = 1f)
-                GridVLine()
-                HeaderCell(stringResource(id = R.string.wavelog_col_uploaded), 44.dp)
-            }
-            // 表头横线
-            HorizontalDivider(thickness = 1.5.dp, color = GridLineColor)
-            // 表头与数据区留白
-            Box(modifier = Modifier.height(8.dp))
-
-            if (entries.isEmpty()) {
-                Text(
-                    text = stringResource(id = R.string.wavelog_empty),
-                    fontSize = 13.sp,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    modifier = Modifier.padding(horizontal = 10.dp, vertical = 12.dp)
-                )
-            } else {
-                // 按场次分组(sessionId = 卫星名-AOS 时间戳); 空 sessionId 归"未分组"放最后
-                val groups = entries.groupBy { it.sessionId.ifBlank { UNGROUPED } }
-                    .toSortedMap(compareByDescending<String> { id ->
-                        entries.filter { it.sessionId.ifBlank { UNGROUPED } == id }.minOfOrNull { it.timeUtcMs } ?: 0L
-                    }.thenByDescending { it })
-                groups.forEach { (sessionId, groupEntries) ->
-                    // 组标题(场次名 + 本地时间)
-                    val (satPart, timePart) = parseSession(sessionId)
-                    Row(verticalAlignment = Alignment.CenterVertically) {
-                        Text(
-                            text = if (sessionId == UNGROUPED) stringResource(id = R.string.wavelog_ungrouped)
-                            else "$satPart - ${formatSessionTime(timePart)}",
-                            fontSize = 12.sp,
-                            fontWeight = FontWeight.Bold,
-                            color = MaterialTheme.colorScheme.primary,
-                            modifier = Modifier.padding(horizontal = 10.dp, vertical = 6.dp)
-                        )
-                    }
-                    // 组间横线(md --- 效果)
-                    HorizontalDivider(thickness = 1.5.dp, color = GridLineColor)
-                    groupEntries.forEach { entry ->
-                    SwipeDeleteRow(
-                        onDelete = {
-                            queue.remove(entry.id)
-                            refreshTick++
-                        }
-                    ) {
-                        Column(modifier = Modifier.fillMaxWidth()) {
-                            Row(
-                                verticalAlignment = Alignment.CenterVertically,
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .height(36.dp)
-                            ) {
-                                Cell(formatLocalTime(entry.timeUtcMs), 72.dp)
-                                GridVLine()
-                                Cell(formatFrequency(entry.freqTxHz), 64.dp)
-                                GridVLine()
-                                Cell(entry.satName, 0.dp, weight = 1.2f)
-                                GridVLine()
-                                Cell(entry.call, 0.dp, weight = 1f)
-                                GridVLine()
-                                Box(modifier = Modifier.width(44.dp)) {
-                                    if (entry.uploaded) {
-                                        Text(
-                                            text = "✓",
-                                            fontSize = 15.sp,
-                                            fontWeight = FontWeight.Bold,
-                                            color = CheckGreen
-                                        )
-                                    }
-                                }
-                            }
-                            // 行分隔线
-                            HorizontalDivider(thickness = 1.dp, color = GridLineColor)
-                        }
-                    }
-                }
-                }
-            }
-        }
-    }
-}
-
-/** 列竖线 */
-@Composable
-private fun GridVLine() {
-    Box(
-        modifier = Modifier
-            .width(1.dp)
-            .fillMaxHeight()
-            .background(GridLineColor)
-    )
-}
-
-@Composable
-private fun RowScope.HeaderCell(text: String, width: Dp, weight: Float = 0f) {
-    val mod = if (weight > 0f) Modifier.weight(weight) else Modifier.width(width)
-    Text(
-        text = text,
-        fontSize = 12.sp,
-        fontWeight = FontWeight.Bold,
-        color = MaterialTheme.colorScheme.primary,
-        maxLines = 1,
-        modifier = mod.padding(horizontal = 6.dp)
-    )
-}
-
-@Composable
-private fun RowScope.Cell(text: String, width: Dp, weight: Float = 0f) {
-    val mod = if (weight > 0f) Modifier.weight(weight) else Modifier.width(width)
-    Text(
-        text = text,
-        fontSize = 12.sp,
-        maxLines = 1,
-        modifier = mod.padding(horizontal = 6.dp)
-    )
-}
-
-private const val UNGROUPED = "__ungrouped__"
-
-/** 解析场次 ID: "ASRTU-1-20260804-2014" → (卫星名, "20260804-2014") */
-private fun parseSession(sessionId: String): Pair<String, String> {
-    val parts = sessionId.split('-')
-    if (parts.size < 3) return sessionId to ""
-    val timePart = parts.takeLast(2).joinToString("-")
-    val satPart = parts.dropLast(2).joinToString("-")
-    return satPart to timePart
-}
-
-/** 场次时间(UTC "20260804-2014") → 本地 "MM-dd HH:mm" */
-private fun formatSessionTime(timePart: String): String {
-    if (timePart.length != 13 || timePart[8] != '-') return timePart
-    return try {
-        val year = timePart.substring(0, 4).toInt()
-        val month = timePart.substring(4, 6).toInt()
-        val day = timePart.substring(6, 8).toInt()
-        val hour = timePart.substring(9, 11).toInt()
-        val minute = timePart.substring(11, 13).toInt()
-        val cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
-        cal.set(year, month - 1, day, hour, minute, 0)
-        cal.timeInMillis = cal.timeInMillis + TimeZone.getDefault().getOffset(cal.timeInMillis)
-        "%02d-%02d %02d:%02d".format(
-            cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH),
-            cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE)
-        )
-    } catch (_: Exception) {
-        timePart
-    }
-}
-
-private fun formatLocalTime(utcMs: Long): String {
-    val cal = Calendar.getInstance(TimeZone.getDefault())
-    cal.timeInMillis = utcMs
-    return "%02d-%02d %02d:%02d".format(
-        cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH),
-        cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE)
-    )
-}

feature/roaming/build.gradle.kts

@@ -1,11 +0,0 @@
-plugins {
-    alias(libs.plugins.convention.featurePlugin)
-}
-
-android {
-    namespace = "com.rtbishop.look4sat.feature.roaming"
-}
-
-dependencies {
-    implementation(project(":core:data"))
-}

feature/roaming/src/main/java/com/rtbishop/look4sat/feature/roaming/RoamingScreen.kt

@@ -1,791 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.feature.roaming
-
-import android.Manifest
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.location.Location
-import android.location.LocationListener
-import android.location.LocationManager
-import android.os.Bundle
-import android.provider.Settings
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.shape.CircleShape
-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.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.windowInsetsPadding
-import androidx.compose.foundation.layout.systemBars
-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.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.core.content.ContextCompat
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-
-/**
- * 漫游页 —— 原样照搬自 QTH定位器 2.0 (com.us1pm.gridsquarelocator)。
- * UI: res/layout/main.xml (结构/尺寸/颜色逐项照搬, 不做任何更改)
- * 逻辑: MainActivity.showLocation() / checkEnabled() / GPS 实时监听
- * 红线: UI 与逻辑均不更改, 与成品截图逐像素对齐。
- */
-@Composable
-fun RoamingScreen() {
-    val context = LocalContext.current
-    var state by remember { mutableStateOf(RoamingState()) }
-    // 照搬 onCreate: 日期固定文本 + 小时前缀(定位时拼接分钟)
-    val dateText = remember { SimpleDateFormat("dd MMM yyyy", Locale.getDefault()).format(Date()) }
-    var hourPrefix by remember { mutableStateOf("") }
-    // 照搬 onCreate: 初始 checkEnabled() -> 红点+设置按钮, 日期隐藏
-    var hasPermission by remember { mutableStateOf(false) }
-    val permissionLauncher = rememberLauncherForActivityResult(
-        ActivityResultContracts.RequestMultiplePermissions()
-    ) { }
-    LaunchedEffect(Unit) {
-        hourPrefix = SimpleDateFormat("HH:mm", Locale.getDefault()).format(Date()).substring(0, 3)
-        val fine = ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) ==
-            PackageManager.PERMISSION_GRANTED
-        val coarse = ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) ==
-            PackageManager.PERMISSION_GRANTED
-        hasPermission = fine || coarse
-        if (!hasPermission) {
-            permissionLauncher.launch(
-                arrayOf(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION)
-            )
-        } else {
-            // 照搬 onResume: 绿点+进度条+提示+日期显示, 红点/按钮隐藏
-            state = state.copy(gpsOn = true, gpsOff = false, showSettings = false, showProgress = true, showNotice = true, showDate = true)
-        }
-    }
-    // 照搬 onResume/onPause: GPS + network 监听, 10 秒 / 10 米
-    val locationManager = remember { context.getSystemService(Context.LOCATION_SERVICE) as LocationManager }
-    DisposableEffect(locationManager, hasPermission) {
-        if (hasPermission) {
-            @SuppressLint("MissingPermission")
-            val listener = object : LocationListener {
-                override fun onLocationChanged(location: Location) {
-                    // 照搬 showLocation 开头: 只接受 gps / network provider
-                    if (location.provider != "gps" && location.provider != "network") return
-                    state = roamingStateFromLocation(location.latitude, location.longitude, location.time, hourPrefix)
-                        .copy(date = dateText)
-                }
-
-                override fun onProviderDisabled(provider: String) {
-                    // 照搬 checkEnabled: 红点+按钮, 日期隐藏
-                    state = state.copy(gpsOn = false, gpsOff = true, showSettings = true, showProgress = false, showNotice = false, showDate = false)
-                }
-
-                override fun onProviderEnabled(provider: String) {
-                    state = state.copy(gpsOn = true, gpsOff = false, showSettings = false, showProgress = true, showNotice = true, showDate = true)
-                }
-
-                @Deprecated("Deprecated in Java")
-                override fun onStatusChanged(provider: String?, status: Int, extras: Bundle?) = Unit
-            }
-            try {
-                locationManager.requestLocationUpdates("gps", 10_000L, 10f, listener)
-                locationManager.requestLocationUpdates("network", 10_000L, 10f, listener)
-            } catch (_: SecurityException) {
-            }
-            onDispose { locationManager.removeUpdates(listener) }
-        } else {
-            onDispose { }
-        }
-    }
-    // 照搬 res/layout/main.xml: 浅色页面, 蓝色信息区, 43sp 定位码, 3x3 九宫格, 底部版权
-    // 按用户要求: 上下往内缩进系统栏安全区, 避免内容被状态栏/导航栏遮挡
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .background(MaterialTheme.colorScheme.background)
-            .windowInsetsPadding(WindowInsets.systemBars)
-    ) {
-        // relativeLayout7: 顶部 GPS 状态条, 25dp 高, holo_blue_bright
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(2.dp)
-                .height(25.dp)
-                .background(MaterialTheme.colorScheme.surfaceVariant)
-        ) {
-            Row(modifier = Modifier.fillMaxSize(), verticalAlignment = Alignment.CenterVertically) {
-                // tvTitleGPS: "GPS" 14sp 黑, 左 8dp
-                Text(
-                    text = "GPS",
-                    fontSize = 14.sp,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    modifier = Modifier.padding(start = 8.dp)
-                )
-                // imGps: toRightOf tvTitleGPS + marginLeft 15dp (成品 main.xml)
-                Spacer(modifier = Modifier.width(15.dp))
-                // imGps: 绿点 (15dp, 主题色 primary -> 夜间滤镜下可见)
-                if (state.gpsOn) {
-                    Box(
-                        modifier = Modifier
-                            .size(15.dp)
-                            .background(MaterialTheme.colorScheme.primary, CircleShape)
-                    )
-                }
-                // imGpsOff: 红点叠层 (15dp, 主题色 error)
-                if (state.gpsOff) {
-                    Box(
-                        modifier = Modifier
-                            .size(15.dp)
-                            .background(MaterialTheme.colorScheme.error, CircleShape)
-                    )
-                }
-                Spacer(modifier = Modifier.weight(1f))
-                // tvDate: 14sp 黑, 居中
-                if (state.showDate) {
-                    Text(text = state.date.ifEmpty { dateText }, fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurfaceVariant)
-                }
-                Spacer(modifier = Modifier.weight(1f))
-                // tvTime: 14sp 黑, 右对齐
-                Text(
-                    text = state.time,
-                    fontSize = 14.sp,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    modifier = Modifier.padding(end = 8.dp)
-                )
-            }
-            // btnLocationSettings: 黄色按钮, 居中
-            // btnLocationSettings: 成品 #faf8f54a 半透明黄, 14sp 黑字, 居中
-            if (state.showSettings) {
-                Box(
-                    modifier = Modifier
-                        .align(Alignment.Center)
-                        .background(MaterialTheme.colorScheme.primary)
-                        .clickable { context.startActivity(Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)) }
-                        .padding(horizontal = 5.dp),
-                    contentAlignment = Alignment.Center
-                ) {
-                    Text(text = "设置启用GPS", fontSize = 14.sp, color = MaterialTheme.colorScheme.onPrimary)
-                }
-            }
-        }
-        // linearLayout4: 经纬度区, holo_blue_bright
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 2.dp)
-                .background(MaterialTheme.colorScheme.surfaceVariant)
-        ) {
-            // 纬度行: tvLati 16sp 黑 左 8dp | tvLat 右对齐 3dp
-            Row(modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp), verticalAlignment = Alignment.CenterVertically) {
-                Text(text = state.latLabel, fontSize = 16.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(start = 8.dp))
-                Spacer(modifier = Modifier.weight(1f))
-                Text(text = state.latValue, fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(end = 3.dp))
-            }
-            // 经度行
-            Row(modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp), verticalAlignment = Alignment.CenterVertically) {
-                Text(text = state.lonLabel, fontSize = 16.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(start = 8.dp))
-                Spacer(modifier = Modifier.weight(1f))
-                Text(text = state.lonValue, fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(end = 3.dp))
-            }
-        }
-        // relativeLayout6: 定位码区, 43sp bold 黑居中
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(2.dp)
-                .background(MaterialTheme.colorScheme.surfaceVariant)
-        ) {
-            Text(
-                text = state.loc,
-                fontSize = 43.sp,
-                fontWeight = FontWeight.Bold,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                textAlign = TextAlign.Center,
-                modifier = Modifier.fillMaxWidth()
-            )
-            // progressBar: 加载中, 居中
-            if (state.showProgress) {
-                CircularProgressIndicator(
-                    modifier = Modifier.size(24.dp).align(Alignment.Center),
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    strokeWidth = 2.dp
-                )
-            }
-            // tvNotice: 提示文字, 居中顶部
-            if (state.showNotice) {
-                Text(
-                    text = "请稍等，加载可能需要几分钟的时间。",
-                    fontSize = 16.sp,
-                    fontStyle = androidx.compose.ui.text.font.FontStyle.Italic,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    modifier = Modifier.align(Alignment.TopCenter).padding(top = 2.dp)
-                )
-            }
-        }
-        // relativeLayout: 九宫格, 占满剩余, 底部 15dp
-        // 用 Box 等价 RelativeLayout 布局: 左格贴左 / 中格水平居中 / 右格贴右 (成品 main.xml)
-        Column(modifier = Modifier.fillMaxWidth().weight(1f).padding(bottom = 15.dp)) {
-            // 行1: relativeLayout5 (上排: 纬度 +1)
-            Box(modifier = Modifier.fillMaxWidth().weight(1f)) {
-                GridCell(text = state.grids[0], modifier = Modifier.width(80.dp).fillMaxHeight().align(Alignment.CenterStart))
-                GridCell(text = state.grids[1], modifier = Modifier.width(200.dp).fillMaxHeight().align(Alignment.Center))
-                GridCell(text = state.grids[2], modifier = Modifier.width(80.dp).fillMaxHeight().align(Alignment.CenterEnd))
-            }
-            // 行2: relativeLayout4, 205dp 高 (中排: 中央)
-            Box(modifier = Modifier.fillMaxWidth().height(205.dp)) {
-                GridCell(text = state.grids[3], modifier = Modifier.width(80.dp).fillMaxHeight().align(Alignment.CenterStart))
-                // 中央列: tv22 (100x80dp centerInParent) 叠在 linearLayout3 (200x200dp) 之上
-                Box(modifier = Modifier.width(200.dp).fillMaxHeight().align(Alignment.Center)) {
-                    // linearLayout3: 200x200dp, marginTop 2dp, holo_blue_bright
-                    Box(
-                        modifier = Modifier
-                            .align(Alignment.TopCenter)
-                            .offset(y = 2.dp)
-                            .size(width = 200.dp, height = 200.dp)
-                            .background(MaterialTheme.colorScheme.surfaceVariant)
-                    ) {
-                        // iv: 红点 10x10dp, top|left, leftMargin/topMargin 查表绝对定位
-                        Image(
-                            painter = painterResource(R.drawable.roam_pnt),
-                            contentDescription = null,
-                            modifier = Modifier
-                                .size(10.dp)
-                                .offset(x = state.markerLeft.dp, y = state.markerTop.dp)
-                        )
-                    }
-                    // tv22: 100x80dp centerInParent, 30sp bold, textColorHighlight(白)
-                    Text(
-                        text = state.grids[4],
-                        fontSize = 30.sp,
-                        fontWeight = FontWeight.Bold,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                        textAlign = TextAlign.Center,
-                        modifier = Modifier
-                            .size(width = 100.dp, height = 80.dp)
-                            .align(Alignment.Center)
-                    )
-                }
-                GridCell(text = state.grids[5], modifier = Modifier.width(80.dp).fillMaxHeight().align(Alignment.CenterEnd))
-            }
-            // 行3: relativeLayout3 (下排: 纬度 -1)
-            Box(modifier = Modifier.fillMaxWidth().weight(1f)) {
-                GridCell(text = state.grids[6], modifier = Modifier.width(80.dp).fillMaxHeight().align(Alignment.CenterStart))
-                GridCell(text = state.grids[7], modifier = Modifier.width(200.dp).fillMaxHeight().align(Alignment.Center))
-                GridCell(text = state.grids[8], modifier = Modifier.width(80.dp).fillMaxHeight().align(Alignment.CenterEnd))
-            }
-        }
-        // tv4: 底部版权, 10sp 黑 (往上拉, 底部预留空间避免被导航栏遮挡)
-        Text(
-            text = "制作：US1PM  汉化：BA7LCE",
-            fontSize = 10.sp,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
-            textAlign = TextAlign.Center,
-            modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp)
-        )
-    }
-}
-
-// 周边格: 60/200/60dp, #0BACF1, bold 居中, 2dp margin (照搬 tv11/tv13/tv21/tv23/tv31/tv33)
-@Composable
-private fun GridCell(text: String, modifier: Modifier) {
-    Box(
-        modifier = modifier
-            .padding(2.dp)
-            .background(MaterialTheme.colorScheme.surface),
-        contentAlignment = Alignment.Center
-    ) {
-        Text(
-            text = text,
-            fontSize = 14.sp,
-            fontWeight = FontWeight.Bold,
-            color = MaterialTheme.colorScheme.onSurface,
-            textAlign = TextAlign.Center
-        )
-    }
-}
-
-/**
- * 照搬 MainActivity.showLocation() 的状态。
- * 网格/九宫格/红点查表与成品逐行一致。
- */
-data class RoamingState(
-    val date: String = "",
-    val time: String = "",
-    val latLabel: String = "纬度",
-    val latValue: String = "",
-    val lonLabel: String = "经度",
-    val lonValue: String = "",
-    val loc: String = "",
-    val grids: List<String> = List(9) { "" },
-    /** 红点 leftMargin(dp), 经度第 3 对字符查表 */
-    val markerLeft: Int = 0,
-    /** 红点 topMargin(dp), 纬度第 3 对字符查表(屏幕 Y 反转) */
-    val markerTop: Int = 0,
-    val gpsOn: Boolean = false,
-    val gpsOff: Boolean = true,
-    val showSettings: Boolean = true,
-    val showProgress: Boolean = false,
-    val showNotice: Boolean = false,
-    val showDate: Boolean = false
-)
-
-/**
- * 照搬 showLocation() 的完整计算: 时间/经纬度 DMS/8 位网格/九宫格/红点查表。
- */
-fun roamingStateFromLocation(lat: Double, lon: Double, fixTime: Long, hourPrefix: String): RoamingState {
-    // 照搬: tvTime = 缓存小时前缀 + 定位时间分钟
-    val minute = SimpleDateFormat("mm", Locale.getDefault()).format(Date(fixTime))
-    val time = hourPrefix + minute
-    // 方向字符
-    val ew = if (lon >= 0.0) "E" else "W"
-    val ns = if (lat >= 0.0) "N" else "S"
-    // 照搬: 纬度 DMS (String.valueOf 无补零)
-    val latAbs = if (lat < 0.0) -lat else lat
-    val latDeg = latAbs.toInt()
-    val latMinFull = (latAbs - latDeg) * 60.0
-    val latMin = latMinFull.toInt()
-    val latSec = ((latMinFull - latMin) * 60.0).toInt()
-    val latLabel = "纬度  $latDeg° $latMin' $latSec\" $ns"
-    val latValue = "$lat° "
-    // 照搬: 经度 DMS
-    val lonAbs = if (lon < 0.0) -lon else lon
-    val lonDeg = lonAbs.toInt()
-    val lonMinFull = (lonAbs - lonDeg) * 60.0
-    val lonMin = lonMinFull.toInt()
-    val lonSec = ((lonMinFull - lonMin) * 60.0).toInt()
-    val lonLabel = "经度 $lonDeg° $lonMin' $lonSec\" $ew"
-    val lonValue = "$lon° "
-    // 照搬: 8 位网格编码 (区间查表)
-    val (str, str2, str3, str4) = encodeLon(lon)
-    val (str5, str6, str38, str9) = encodeLat(lat)
-    val loc = str + str5 + str2 + str6 + str3 + str38 + str4 + str9
-    // 照搬: 九宫格 parseInt3 五分支
-    val grids = buildGrids(str, str5, str2, str6, str3, str38)
-    // 照搬: 红点查表 (第 3 对字符)
-    val markerLeft = lonMargin[str3.firstOrNull()] ?: 0
-    val markerTop = latMargin[str38.firstOrNull()] ?: 0
-    return RoamingState(
-        time = time,
-        latLabel = latLabel,
-        latValue = latValue,
-        lonLabel = lonLabel,
-        lonValue = lonValue,
-        loc = loc,
-        grids = grids,
-        markerLeft = markerLeft,
-        markerTop = markerTop,
-        gpsOn = true,
-        gpsOff = false,
-        showSettings = false,
-        showProgress = false,
-        showNotice = false,
-        showDate = true
-    )
-}
-
-// 红点 leftMargin 查表 (MainActivity 1286-1386 行): 经度第 3 对 a..x -> -2..190 dp
-private val lonMargin = mapOf(
-    'a' to -2, 'b' to 8, 'c' to 16, 'd' to 24, 'e' to 32, 'f' to 40, 'g' to 48, 'h' to 56,
-    'i' to 65, 'j' to 74, 'k' to 83, 'l' to 92, 'm' to 101, 'n' to 110, 'o' to 119, 'p' to 128,
-    'q' to 137, 'r' to 146, 's' to 155, 't' to 163, 'u' to 171, 'v' to 179, 'w' to 184, 'x' to 190
-)
-
-// 红点 topMargin 查表 (MainActivity 1315-1363 行): 纬度第 3 对 a..x -> 190..-2 dp (屏幕 Y 反转)
-private val latMargin = mapOf(
-    'a' to 190, 'b' to 182, 'c' to 174, 'd' to 169, 'e' to 163, 'f' to 155, 'g' to 146, 'h' to 137,
-    'i' to 128, 'j' to 119, 'k' to 110, 'l' to 101, 'm' to 92, 'n' to 83, 'o' to 74, 'p' to 65,
-    'q' to 56, 'r' to 48, 's' to 40, 't' to 32, 'u' to 24, 'v' to 16, 'w' to 8, 'x' to -2
-)
-
-// 照搬 311-611 行: 经度 -> (20°区字母, 2°数字, 2'字母, 30"数字)
-private fun encodeLon(inputLon: Double): List<String> {
-    var longitude = inputLon
-    var d = 0.0
-    val str = when {
-        (longitude >= -180.0) && (longitude <= -160.0) -> { longitude += 180.0; "A" }
-        (longitude >= -160.0) && (longitude <= -140.0) -> { longitude += 160.0; "B" }
-        (longitude >= -140.0) && (longitude <= -120.0) -> { longitude += 140.0; "C" }
-        (longitude >= -120.0) && (longitude <= -100.0) -> { longitude += 120.0; "D" }
-        (longitude >= -100.0) && (longitude <= -80.0) -> { longitude += 100.0; "E" }
-        (longitude >= -80.0) && (longitude <= -60.0) -> { longitude += 80.0; "F" }
-        (longitude >= -60.0) && (longitude <= -40.0) -> { longitude += 60.0; "G" }
-        (longitude >= -40.0) && (longitude <= -20.0) -> { longitude += 40.0; "H" }
-        (longitude >= -20.0) && (longitude <= 0.0) -> { longitude += 20.0; "I" }
-        (longitude >= 0.0) && (longitude <= 20.0) -> "J"
-        (longitude >= 20.0) && (longitude <= 40.0) -> { longitude -= 20.0; "K" }
-        (longitude >= 40.0) && (longitude <= 60.0) -> { longitude -= 40.0; "L" }
-        (longitude >= 60.0) && (longitude <= 80.0) -> { longitude -= 60.0; "M" }
-        (longitude >= 80.0) && (longitude <= 100.0) -> { longitude -= 80.0; "N" }
-        (longitude >= 100.0) && (longitude <= 120.0) -> { longitude -= 100.0; "O" }
-        (longitude >= 120.0) && (longitude <= 140.0) -> { longitude -= 120.0; "P" }
-        (longitude >= 140.0) && (longitude <= 160.0) -> { longitude -= 140.0; "Q" }
-        (longitude >= 160.0) && (longitude <= 180.0) -> { longitude -= 160.0; "R" }
-        else -> { longitude = 0.0; " " }
-    }
-    val str2 = when {
-        ((longitude >= 0.0) && (longitude <= 2.0)) || ((longitude >= -20.0) && (longitude <= -18.0)) -> { d = longitude * 60.0; "0" }
-        ((longitude >= 2.0) && (longitude <= 4.0)) || ((longitude >= -18.0) && (longitude <= -16.0)) -> { d = (longitude - 2.0) * 60.0; "1" }
-        ((longitude >= 4.0) && (longitude <= 6.0)) || ((longitude >= -16.0) && (longitude <= -14.0)) -> { d = (longitude - 4.0) * 60.0; "2" }
-        ((longitude >= 6.0) && (longitude <= 8.0)) || ((longitude >= -14.0) && (longitude <= -12.0)) -> { d = (longitude - 6.0) * 60.0; "3" }
-        ((longitude >= 8.0) && (longitude <= 10.0)) || ((longitude >= -12.0) && (longitude <= -10.0)) -> { d = (longitude - 8.0) * 60.0; "4" }
-        ((longitude >= 10.0) && (longitude <= 12.0)) || ((longitude >= -10.0) && (longitude <= -8.0)) -> { d = (longitude - 10.0) * 60.0; "5" }
-        ((longitude >= 12.0) && (longitude <= 14.0)) || ((longitude >= -8.0) && (longitude <= -6.0)) -> { d = (longitude - 12.0) * 60.0; "6" }
-        ((longitude >= 14.0) && (longitude <= 16.0)) || ((longitude >= -6.0) && (longitude <= -4.0)) -> { d = (longitude - 14.0) * 60.0; "7" }
-        ((longitude >= 16.0) && (longitude <= 18.0)) || ((longitude >= -4.0) && (longitude <= -2.0)) -> { d = (longitude - 16.0) * 60.0; "8" }
-        ((longitude >= 18.0) && (longitude <= 20.0)) || ((longitude >= -2.0) && (longitude <= 0.0)) -> { d = (longitude - 18.0) * 60.0; "9" }
-        else -> { d = 0.0; " " }
-    }
-    val str3 = when {
-        ((d >= 0.0) && (d <= 5.0)) || ((d >= -120.0) && (d <= -115.0)) -> { longitude = d * 60.0; "a" }
-        ((d >= 5.0) && (d <= 10.0)) || ((d >= -115.0) && (d <= -110.0)) -> { longitude = (d - 5.0) * 60.0; "b" }
-        ((d >= 10.0) && (d <= 15.0)) || ((d >= -110.0) && (d <= -105.0)) -> { longitude = (d - 10.0) * 60.0; "c" }
-        ((d >= 15.0) && (d <= 20.0)) || ((d >= -105.0) && (d <= -100.0)) -> { longitude = (d - 15.0) * 60.0; "d" }
-        ((d >= 20.0) && (d <= 25.0)) || ((d >= -100.0) && (d <= -95.0)) -> { longitude = (d - 20.0) * 60.0; "e" }
-        ((d >= 25.0) && (d <= 30.0)) || ((d >= -95.0) && (d <= -90.0)) -> { longitude = (d - 25.0) * 60.0; "f" }
-        ((d >= 30.0) && (d <= 35.0)) || ((d >= -90.0) && (d <= -85.0)) -> { longitude = (d - 30.0) * 60.0; "g" }
-        ((d >= 35.0) && (d <= 40.0)) || ((d >= -85.0) && (d <= -80.0)) -> { longitude = (d - 35.0) * 60.0; "h" }
-        ((d >= 40.0) && (d <= 45.0)) || ((d >= -80.0) && (d <= -75.0)) -> { longitude = (d - 40.0) * 60.0; "i" }
-        ((d >= 45.0) && (d <= 50.0)) || ((d >= -75.0) && (d <= -70.0)) -> { longitude = (d - 45.0) * 60.0; "j" }
-        ((d >= 50.0) && (d <= 55.0)) || ((d >= -70.0) && (d <= -65.0)) -> { longitude = (d - 50.0) * 60.0; "k" }
-        ((d >= 55.0) && (d <= 60.0)) || ((d >= -65.0) && (d <= -60.0)) -> { longitude = (d - 55.0) * 60.0; "l" }
-        ((d >= 60.0) && (d <= 65.0)) || ((d >= -60.0) && (d <= -55.0)) -> { longitude = (d - 60.0) * 60.0; "m" }
-        ((d >= 65.0) && (d <= 70.0)) || ((d >= -55.0) && (d <= -50.0)) -> { longitude = (d - 65.0) * 60.0; "n" }
-        ((d >= 70.0) && (d <= 75.0)) || ((d >= -50.0) && (d <= -45.0)) -> { longitude = (d - 70.0) * 60.0; "o" }
-        ((d >= 75.0) && (d <= 80.0)) || ((d >= -45.0) && (d <= -40.0)) -> { longitude = (d - 75.0) * 60.0; "p" }
-        ((d >= 80.0) && (d <= 85.0)) || ((d >= -40.0) && (d <= -35.0)) -> { longitude = (d - 80.0) * 60.0; "q" }
-        ((d >= 85.0) && (d <= 90.0)) || ((d >= -35.0) && (d <= -30.0)) -> { longitude = (d - 85.0) * 60.0; "r" }
-        ((d >= 90.0) && (d <= 95.0)) || ((d >= -30.0) && (d <= -25.0)) -> { longitude = (d - 90.0) * 60.0; "s" }
-        ((d >= 95.0) && (d <= 100.0)) || ((d >= -25.0) && (d <= -20.0)) -> { longitude = (d - 95.0) * 60.0; "t" }
-        ((d >= 100.0) && (d <= 105.0)) || ((d >= -20.0) && (d <= -15.0)) -> { longitude = (d - 100.0) * 60.0; "u" }
-        ((d >= 105.0) && (d <= 110.0)) || ((d >= -15.0) && (d <= -10.0)) -> { longitude = (d - 105.0) * 60.0; "v" }
-        ((d >= 110.0) && (d <= 115.0)) || ((d >= -10.0) && (d <= -5.0)) -> { longitude = (d - 110.0) * 60.0; "w" }
-        ((d >= 115.0) && (d <= 120.0)) || ((d >= -5.0) && (d <= 0.0)) -> { longitude = (d - 115.0) * 60.0; "x" }
-        else -> { longitude = 0.0; " " }
-    }
-    val str4 = when {
-        ((longitude >= 0.0) && (longitude <= 30.0)) || ((longitude >= -300.0) && (longitude <= -270.0)) -> "0"
-        ((longitude >= 30.0) && (longitude <= 60.0)) || ((longitude >= -270.0) && (longitude <= -240.0)) -> "1"
-        ((longitude >= 60.0) && (longitude <= 90.0)) || ((longitude >= -240.0) && (longitude <= -210.0)) -> "2"
-        ((longitude >= 90.0) && (longitude <= 120.0)) || ((longitude >= -210.0) && (longitude <= -180.0)) -> "3"
-        ((longitude >= 120.0) && (longitude <= 150.0)) || ((longitude >= -180.0) && (longitude <= -150.0)) -> "4"
-        ((longitude >= 150.0) && (longitude <= 180.0)) || ((longitude >= -150.0) && (longitude <= -120.0)) -> "5"
-        ((longitude >= 180.0) && (longitude <= 210.0)) || ((longitude >= -120.0) && (longitude <= -90.0)) -> "6"
-        ((longitude >= 210.0) && (longitude <= 240.0)) || ((longitude >= -90.0) && (longitude <= -60.0)) -> "7"
-        ((longitude >= 240.0) && (longitude <= 270.0)) || ((longitude >= -60.0) && (longitude <= -30.0)) -> "8"
-        ((longitude >= 270.0) && (longitude <= 300.0)) || ((longitude >= -30.0) && (longitude <= 0.0)) -> "9"
-        else -> " "
-    }
-    return listOf(str, str2, str3, str4)
-}
-
-// 照搬 612-914 行: 纬度 -> (10°区字母, 1°数字, 1'字母, 15"数字)
-private fun encodeLat(inputLat: Double): List<String> {
-    var latitude = inputLat
-    var d2 = 0.0
-    var d3 = 0.0
-    val str5 = when {
-        (latitude >= -90.0) && (latitude <= -80.0) -> { d2 = latitude + 90.0; "A" }
-        (latitude >= -80.0) && (latitude <= -70.0) -> { d2 = latitude + 80.0; "B" }
-        (latitude >= -70.0) && (latitude <= -60.0) -> { d2 = latitude + 70.0; "C" }
-        (latitude >= -60.0) && (latitude <= -50.0) -> { d2 = latitude + 60.0; "D" }
-        (latitude >= -50.0) && (latitude <= -40.0) -> { d2 = latitude + 50.0; "E" }
-        (latitude >= -40.0) && (latitude <= -30.0) -> { d2 = latitude + 40.0; "F" }
-        (latitude >= -30.0) && (latitude <= -20.0) -> { d2 = latitude + 30.0; "G" }
-        (latitude >= -20.0) && (latitude <= -10.0) -> { d2 = latitude + 20.0; "H" }
-        (latitude >= -10.0) && (latitude <= 0.0) -> { d2 = latitude + 10.0; "I" }
-        (latitude >= 0.0) && (latitude <= 10.0) -> { d2 = latitude; "J" }
-        (latitude >= 10.0) && (latitude <= 20.0) -> { d2 = latitude - 10.0; "K" }
-        (latitude >= 20.0) && (latitude <= 30.0) -> { d2 = latitude - 20.0; "L" }
-        (latitude >= 30.0) && (latitude <= 40.0) -> { d2 = latitude - 30.0; "M" }
-        (latitude >= 40.0) && (latitude <= 50.0) -> { d2 = latitude - 40.0; "N" }
-        (latitude >= 50.0) && (latitude <= 60.0) -> { d2 = latitude - 50.0; "O" }
-        (latitude >= 60.0) && (latitude <= 70.0) -> { d2 = latitude - 60.0; "P" }
-        (latitude >= 70.0) && (latitude <= 80.0) -> { d2 = latitude - 70.0; "Q" }
-        (latitude >= 80.0) && (latitude <= 90.0) -> { d2 = latitude - 80.0; "R" }
-        else -> { d2 = 0.0; " " }
-    }
-    var str6 = " "
-    when {
-        ((d2 >= 0.0) && (d2 <= 1.0)) || ((d2 >= -10.0) && (d2 <= -9.0)) -> { d3 = d2 * 60.0; str6 = "0" }
-        ((d2 >= 1.0) && (d2 <= 2.0)) || ((d2 >= -9.0) && (d2 <= -8.0)) -> { d3 = (d2 - 1.0) * 60.0; str6 = "1" }
-        ((d2 >= 2.0) && (d2 <= 3.0)) || ((d2 >= -8.0) && (d2 <= -7.0)) -> { d3 = (d2 - 2.0) * 60.0; str6 = "2" }
-        ((d2 >= 3.0) && (d2 <= 4.0)) || ((d2 >= -7.0) && (d2 <= -6.0)) -> { d3 = (d2 - 3.0) * 60.0; str6 = "3" }
-        ((d2 >= 4.0) && (d2 <= 5.0)) || ((d2 >= -6.0) && (d2 <= -5.0)) -> { d3 = (d2 - 4.0) * 60.0; str6 = "4" }
-        ((d2 >= 5.0) && (d2 <= 6.0)) || ((d2 >= -5.0) && (d2 <= -4.0)) -> { d3 = (d2 - 5.0) * 60.0; str6 = "5" }
-        ((d2 >= 6.0) && (d2 <= 7.0)) || ((d2 >= -4.0) && (d2 <= -3.0)) -> { d3 = (d2 - 6.0) * 60.0; str6 = "6" }
-        ((d2 >= 7.0) && (d2 <= 8.0)) || ((d2 >= -3.0) && (d2 <= -2.0)) -> { d3 = (d2 - 7.0) * 60.0; str6 = "7" }
-        ((d2 >= 8.0) && (d2 <= 9.0)) || ((d2 >= -2.0) && (d2 <= -1.0)) -> { d3 = (d2 - 8.0) * 60.0; str6 = "8" }
-        ((d2 >= 9.0) && (d2 <= 10.0)) || ((d2 >= -1.0) && (d2 <= 0.0)) -> { d3 = (d2 - 9.0) * 60.0; str6 = "9" }
-    }
-    val str38 = when {
-        ((d3 >= 0.0) && (d3 <= 2.5)) || ((d3 >= -60.0) && (d3 <= -57.5)) -> { d2 = d3 * 60.0; "a" }
-        ((d3 >= 2.5) && (d3 <= 5.0)) || ((d3 >= -57.5) && (d3 <= -55.0)) -> { d2 = (d3 - 2.5) * 60.0; "b" }
-        ((d3 >= 5.0) && (d3 <= 7.5)) || ((d3 >= -55.0) && (d3 <= -52.5)) -> { d2 = (d3 - 5.0) * 60.0; "c" }
-        ((d3 >= 7.5) && (d3 <= 10.0)) || ((d3 >= -52.5) && (d3 <= -50.0)) -> { d2 = (d3 - 7.5) * 60.0; "d" }
-        ((d3 >= 10.0) && (d3 <= 12.5)) || ((d3 >= -50.0) && (d3 <= -47.5)) -> { d2 = (d3 - 10.0) * 60.0; "e" }
-        ((d3 >= 12.5) && (d3 <= 15.0)) || ((d3 >= -47.5) && (d3 <= -45.0)) -> { d2 = (d3 - 12.5) * 60.0; "f" }
-        ((d3 >= 15.0) && (d3 <= 17.5)) || ((d3 >= -45.0) && (d3 <= -42.5)) -> { d2 = (d3 - 15.0) * 60.0; "g" }
-        ((d3 >= 17.5) && (d3 <= 20.0)) || ((d3 >= -42.5) && (d3 <= -40.0)) -> { d2 = (d3 - 17.5) * 60.0; "h" }
-        ((d3 >= 20.0) && (d3 <= 22.5)) || ((d3 >= -40.0) && (d3 <= -37.5)) -> { d2 = (d3 - 20.0) * 60.0; "i" }
-        ((d3 >= 22.5) && (d3 <= 25.0)) || ((d3 >= -37.5) && (d3 <= -35.0)) -> { d2 = (d3 - 22.5) * 60.0; "j" }
-        ((d3 >= 25.0) && (d3 <= 27.5)) || ((d3 >= -35.0) && (d3 <= -32.5)) -> { d2 = (d3 - 25.0) * 60.0; "k" }
-        ((d3 >= 27.5) && (d3 <= 30.0)) || ((d3 >= -32.5) && (d3 <= -30.0)) -> { d2 = (d3 - 27.5) * 60.0; "l" }
-        ((d3 >= 30.0) && (d3 <= 32.5)) || ((d3 >= -30.0) && (d3 <= -27.5)) -> { d2 = (d3 - 30.0) * 60.0; "m" }
-        ((d3 >= 32.5) && (d3 <= 35.0)) || ((d3 >= -27.5) && (d3 <= -25.0)) -> { d2 = (d3 - 32.5) * 60.0; "n" }
-        ((d3 >= 35.0) && (d3 <= 37.5)) || ((d3 >= -25.0) && (d3 <= -22.5)) -> { d2 = (d3 - 35.0) * 60.0; "o" }
-        ((d3 >= 37.5) && (d3 <= 40.0)) || ((d3 >= -22.5) && (d3 <= -20.0)) -> { d2 = (d3 - 37.5) * 60.0; "p" }
-        ((d3 >= 40.0) && (d3 <= 42.5)) || ((d3 >= -20.0) && (d3 <= -17.5)) -> { d2 = (d3 - 40.0) * 60.0; "q" }
-        ((d3 >= 42.5) && (d3 <= 45.0)) || ((d3 >= -17.5) && (d3 <= -15.0)) -> { d2 = (d3 - 42.5) * 60.0; "r" }
-        ((d3 >= 45.0) && (d3 <= 47.5)) || ((d3 >= -15.0) && (d3 <= -12.5)) -> { d2 = (d3 - 45.0) * 60.0; "s" }
-        ((d3 >= 47.5) && (d3 <= 50.0)) || ((d3 >= -12.5) && (d3 <= -10.0)) -> { d2 = (d3 - 47.5) * 60.0; "t" }
-        ((d3 >= 50.0) && (d3 <= 52.5)) || ((d3 >= -10.0) && (d3 <= -7.5)) -> { d2 = (d3 - 50.0) * 60.0; "u" }
-        ((d3 >= 52.5) && (d3 <= 55.0)) || ((d3 >= -7.5) && (d3 <= -5.0)) -> { d2 = (d3 - 52.5) * 60.0; "v" }
-        ((d3 >= 55.0) && (d3 <= 57.5)) || ((d3 >= -5.0) && (d3 <= -2.5)) -> { d2 = (d3 - 55.0) * 60.0; "w" }
-        ((d3 >= 57.5) && (d3 <= 60.0)) || ((d3 >= -2.5) && (d3 <= 0.0)) -> { d2 = (d3 - 57.5) * 60.0; "x" }
-        else -> { d2 = 0.0; " " }
-    }
-    val str9 = when {
-        ((d2 >= 0.0) && (d2 <= 15.0)) || ((d2 >= -150.0) && (d2 <= -135.0)) -> "0"
-        ((d2 >= 15.0) && (d2 <= 30.0)) || ((d2 >= -135.0) && (d2 <= -120.0)) -> "1"
-        ((d2 >= 30.0) && (d2 <= 45.0)) || ((d2 >= -120.0) && (d2 <= -105.0)) -> "2"
-        ((d2 >= 45.0) && (d2 <= 60.0)) || ((d2 >= -105.0) && (d2 <= -90.0)) -> "3"
-        ((d2 >= 60.0) && (d2 <= 75.0)) || ((d2 >= -90.0) && (d2 <= -75.0)) -> "4"
-        ((d2 >= 75.0) && (d2 <= 90.0)) || ((d2 >= -75.0) && (d2 <= -60.0)) -> "5"
-        ((d2 >= 90.0) && (d2 <= 105.0)) || ((d2 >= -60.0) && (d2 <= -45.0)) -> "6"
-        ((d2 >= 105.0) && (d2 <= 120.0)) || ((d2 >= -45.0) && (d2 <= -30.0)) -> "7"
-        ((d2 >= 120.0) && (d2 <= 135.0)) || ((d2 >= -30.0) && (d2 <= -15.0)) -> "8"
-        ((d2 >= 135.0) && (d2 <= 150.0)) || ((d2 >= -15.0) && (d2 <= 0.0)) -> "9"
-        else -> " "
-    }
-    return listOf(str5, str6, str38, str9)
-}
-
-/**
- * 照搬 917-1283 行: 九宫格 parseInt3 五分支(内部/西界/东界/北界/南界 + 四角)。
- * 返回 9 格文本: [上左, 上中, 上右, 左中, 中央, 右中, 下左, 下中, 下右]。
- */
-private fun buildGrids(str: String, str5: String, str2: String, str6: String, str3: String, str38: String): List<String> {
-    val parseInt = str2.toInt()
-    val parseInt2 = str6.toInt()
-    val str39 = str + str5
-    val str40 = str2 + str6
-    val parseInt3 = str40.toInt()
-    val str41 = str39 + str40
-    val g = MutableList(9) { "" }
-    fun fmt2(n: Int) = if (n <= 9) "0$n" else n.toString()
-    if ((parseInt > 0) && (parseInt < 9) && (parseInt2 > 0) && (parseInt2 < 9)) {
-        // 内部: 数字对 ±1
-        val i7 = parseInt3 + 1
-        val i8 = i7 - 10
-        val valueOf9 = fmt2(i8)
-        val str11 = i7.toString()
-        val valueOf18 = (i7 + 10).toString()
-        val i9 = parseInt3 - 10
-        val valueOf10 = fmt2(i9)
-        val valueOf19 = (parseInt3 + 10).toString()
-        val i10 = parseInt3 - 1
-        val i11 = i10 - 10
-        val valueOf11 = fmt2(i11)
-        val str14 = i10.toString()
-        val str15 = (i10 + 10).toString()
-        g[0] = str39 + valueOf9
-        g[1] = str39 + str11
-        g[2] = str39 + valueOf18
-        g[3] = str39 + valueOf10
-        g[4] = str41
-        g[5] = str39 + valueOf19
-        g[6] = str39 + valueOf11
-        g[7] = str39 + str14
-        g[8] = str39 + str15
-    } else if ((parseInt == 0) && (parseInt2 > 0) && (parseInt2 < 9)) {
-        // 西边界: 经度 0 -> 9, 经度字母 -1
-        val str43 = (str[0] - 1).toString() + str5
-        val str44 = "9" + (parseInt2 + 1)
-        val i12 = parseInt3 + 1
-        val valueOf7 = fmt2(i12)
-        val str12 = (i12 + 10).toString()
-        val sb4 = "9" + parseInt2
-        val valueOf20 = (parseInt3 + 10).toString()
-        val str46 = "9" + (parseInt2 - 1)
-        val i13 = parseInt3 - 1
-        val valueOf8 = fmt2(i13)
-        val str15 = (i13 + 10).toString()
-        g[0] = str43 + str44
-        g[1] = str39 + valueOf7
-        g[2] = str39 + str12
-        g[3] = str43 + sb4
-        g[4] = str41
-        g[5] = str39 + valueOf20
-        g[6] = str43 + str46
-        g[7] = str39 + valueOf8
-        g[8] = str39 + str15
-    } else if ((parseInt == 9) && (parseInt2 > 0) && (parseInt2 < 9)) {
-        // 东边界: 经度 9 -> 0, 经度字母 +1
-        val str47 = (str[0] + 1).toString() + str5
-        val i14 = parseInt3 + 1
-        val valueOf21 = (i14 - 10).toString()
-        val valueOf22 = i14.toString()
-        val str48 = "0" + (parseInt2 + 1)
-        val valueOf23 = (parseInt3 - 10).toString()
-        val str49 = "0" + parseInt2
-        val i15 = parseInt3 - 1
-        val valueOf24 = (i15 - 10).toString()
-        val valueOf25 = i15.toString()
-        val str15 = "0" + (parseInt2 - 1)
-        g[0] = str39 + valueOf21
-        g[1] = str39 + valueOf22
-        g[2] = str47 + str48
-        g[3] = str39 + valueOf23
-        g[4] = str41
-        g[5] = str47 + str49
-        g[6] = str39 + valueOf24
-        g[7] = str39 + valueOf25
-        g[8] = str47 + str15
-    } else if ((parseInt < 9) && (parseInt > 0) && (parseInt2 == 9)) {
-        // 北边界: 纬度 9 -> 0, 纬度字母 +1
-        val str50 = str + (str5[0] + 1).toString()
-        val i16 = parseInt3 - 9
-        val i17 = i16 - 10
-        val valueOf4 = fmt2(i17)
-        val valueOf26 = i16.toString()
-        val valueOf27 = (i16 + 10).toString()
-        val i18 = parseInt3 - 10
-        val valueOf5 = fmt2(i18)
-        val valueOf28 = (parseInt3 + 10).toString()
-        val i19 = parseInt3 - 1
-        val i20 = i19 - 10
-        val valueOf6 = fmt2(i20)
-        val str14 = i19.toString()
-        val str15 = (i19 + 10).toString()
-        g[0] = str39 + valueOf4
-        g[1] = str50 + valueOf26
-        g[2] = str39 + valueOf27
-        g[3] = str39 + valueOf5
-        g[4] = str41
-        g[5] = str39 + valueOf28
-        g[6] = str39 + valueOf6
-        g[7] = str39 + str14
-        g[8] = str39 + str15
-    } else if ((parseInt < 9) && (parseInt > 0) && (parseInt2 == 0)) {
-        // 南边界: 纬度 0 -> 9, 纬度字母 -1
-        val str52 = str + (str5[0] - 1).toString()
-        val i21 = parseInt3 + 1
-        val i22 = i21 - 10
-        val valueOf = fmt2(i22)
-        val valueOf29 = i21.toString()
-        val valueOf30 = (i21 + 10).toString()
-        val i23 = parseInt3 - 10
-        val valueOf2 = fmt2(i23)
-        val valueOf31 = (parseInt3 + 10).toString()
-        val i24 = parseInt3 - 1
-        val valueOf3 = fmt2(i24)
-        val str14 = (i24 + 10).toString()
-        val str15 = (i24 + 20).toString()
-        g[0] = str39 + valueOf
-        g[1] = str39 + valueOf29
-        g[2] = str39 + valueOf30
-        g[3] = str39 + valueOf2
-        g[4] = str41
-        g[5] = str39 + valueOf31
-        g[6] = str52 + valueOf3
-        g[7] = str52 + str14
-        g[8] = str52 + str15
-    } else if (parseInt3 == 0) {
-        // 四角 00: 经纬度数字均 -1 进位
-        val v32 = (str[0] - 1).toString()
-        val v33 = (str5[0] - 1).toString()
-        g[0] = v32 + str5 + "91"
-        g[1] = str39 + "01"
-        g[2] = str39 + "11"
-        g[3] = v32 + str5 + "90"
-        g[4] = str41
-        g[5] = v32 + str5 + "10"
-        g[6] = v32 + v33 + "99"
-        g[7] = str + v33 + "09"
-        g[8] = str + v33 + "19"
-    } else if (parseInt3 == 9) {
-        // 四角 09: 经度 -1, 纬度 +1
-        val v34 = (str[0] - 1).toString()
-        val v35 = (str5[0] + 1).toString()
-        g[0] = v34 + v35 + "90"
-        g[1] = str + v35 + "00"
-        g[2] = str + v35 + "10"
-        g[3] = v34 + str5 + "99"
-        g[4] = str41
-        g[5] = v34 + str5 + "19"
-        g[6] = v34 + str5 + "98"
-        g[7] = v34 + str5 + "08"
-        g[8] = v34 + str5 + "18"
-    } else if (parseInt3 == 99) {
-        // 四角 99: 经纬度数字均 +1 进位
-        val v36 = (str[0] + 1).toString()
-        val v37 = (str5[0] + 1).toString()
-        g[0] = str + v37 + "80"
-        g[1] = str + v37 + "90"
-        g[2] = v36 + v37 + "00"
-        g[3] = str39 + "89"
-        g[4] = str41
-        g[5] = v36 + str5 + "09"
-        g[6] = str39 + "88"
-        g[7] = str39 + "98"
-        g[8] = v36 + str5 + "08"
-    } else if (parseInt3 == 90) {
-        // 四角 90: 经度 +1, 纬度 -1
-        val v38 = (str[0] + 1).toString()
-        val v39 = (str5[0] - 1).toString()
-        g[0] = str39 + "81"
-        g[1] = str39 + "91"
-        g[2] = v38 + str5 + "01"
-        g[3] = str39 + "80"
-        g[4] = str41
-        g[5] = v38 + str5 + "00"
-        g[6] = str + v39 + "89"
-        g[7] = str + v39 + "99"
-        g[8] = v38 + v39 + "09"
-    }
-    return g
-}

feature/roaming/src/test/java/com/rtbishop/look4sat/feature/roaming/RoamingStateTest.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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.feature.roaming
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-class RoamingStateTest {
-
-    // 用户实测坐标 (QTH定位器 2.0 成品截图): 22.314066 / 108.706575
-    private fun stateOf(lat: Double, lon: Double) =
-        roamingStateFromLocation(lat, lon, System.currentTimeMillis(), "21:")
-
-    @Test
-    fun `user coordinates produce OL42ih45`() {
-        val state = stateOf(22.314066, 108.706575)
-        assertEquals("OL42ih45", state.loc)
-    }
-
-    @Test
-    fun `red marker from ih pair matches reference lookup`() {
-        val state = stateOf(22.314066, 108.706575)
-        // 成品查表: 经度第3对 'i' -> leftMargin 65dp, 纬度第3对 'h' -> topMargin 137dp
-        assertEquals(65, state.markerLeft)
-        assertEquals(137, state.markerTop)
-    }
-
-    @Test
-    fun `grid nine from OL42 matches reference`() {
-        val state = stateOf(22.314066, 108.706575)
-        val expected = listOf(
-            "OL33", "OL43", "OL53",
-            "OL32", "OL42", "OL52",
-            "OL31", "OL41", "OL51"
-        )
-        assertEquals(expected, state.grids)
-    }
-
-    @Test
-    fun `latitude dms formatting matches reference`() {
-        val state = stateOf(22.314066, 108.706575)
-        assertEquals("纬度  22° 18' 50\" N", state.latLabel)
-        assertEquals("22.314066° ", state.latValue)
-        assertEquals("经度 108° 42' 23\" E", state.lonLabel)
-        assertEquals("108.706575° ", state.lonValue)
-    }
-
-    @Test
-    fun `time is hour prefix plus fix minutes`() {
-        // fixTime = 2026-08-03 21:12:13 UTC+8 -> minutes 12
-        val fix = 1785820333000L // 2026-08-03 21:12:13 +0800
-        val state = roamingStateFromLocation(22.314066, 108.706575, fix, "21:")
-        assertEquals("21:12", state.time)
-    }
-
-    @Test
-    fun `west edge borrows lon letter`() {
-        // 经度 0.5 纬度 22.314066: 数字对 02, 西边界 parseInt==0
-        val state = stateOf(22.314066, 0.5)
-        assertEquals(8, state.loc.length)
-        // 左列经度 0->9, 经度字母 J-1=I: IL92
-        assertEquals("IL92", state.grids[3])
-    }
-
-    @Test
-    fun `north edge carries lat letter`() {
-        // 纬度 29.5 经度 108.706575: 数字对 49? -> 纬度数字 9 -> 北边界
-        val state = stateOf(29.5, 108.706575)
-        assertEquals(8, state.loc.length)
-        // 上排纬度 +1 -> 0, 纬度字母 +1 (M)
-        assertEquals("OM40", state.grids[1])
-    }
-
-    @Test
-    fun `east edge carries lon letter`() {
-        // 经度 119.5 纬度 22.314066: 经度数字 9 -> 东边界
-        val state = stateOf(22.314066, 119.5)
-        assertEquals(8, state.loc.length)
-        // 右上 经度 9->0, 经度字母 O+1=P, 纬度 2+1=3: PL03
-        assertEquals("PL03", state.grids[2])
-    }
-
-    @Test
-    fun `south edge borrows lat letter`() {
-        // 纬度 0.5 经度 108.706575: 纬度数字 0 -> 南边界
-        val state = stateOf(0.5, 108.706575)
-        assertEquals(8, state.loc.length)
-        // 下中 纬度 0->9, 纬度字母 J-1=I: OI49
-        assertEquals("OI49", state.grids[7])
-    }
-
-    @Test
-    fun `boundary values wrap like reference`() {
-        // (90, 180) -> RR99xx99 (成品区间查表行为)
-        val state = stateOf(90.0, 180.0)
-        assertEquals("RR99xx99", state.loc)
-    }
-
-    @Test
-    fun `gps state after fix matches showLocation`() {
-        val state = stateOf(22.314066, 108.706575)
-        assertEquals(true, state.gpsOn)
-        assertEquals(false, state.gpsOff)
-        assertEquals(false, state.showSettings)
-        assertEquals(false, state.showProgress)
-        assertEquals(false, state.showNotice)
-        assertEquals(true, state.showDate)
-    }
-}

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

@@ -30,8 +30,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.FilterChip
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
@@ -43,19 +41,32 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.rtbishop.look4sat.core.domain.model.RCSettings
-import com.rtbishop.look4sat.core.domain.source.Sources
 import com.rtbishop.look4sat.core.domain.model.RadioControlSettings
 import com.rtbishop.look4sat.core.presentation.CardButton
 import com.rtbishop.look4sat.core.presentation.LocalSpacing
 import com.rtbishop.look4sat.core.presentation.MainTheme
 import com.rtbishop.look4sat.core.presentation.R
 import com.rtbishop.look4sat.core.presentation.SharedDialog
+import androidx.compose.animation.core.spring
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.mutableLongStateOf
+import androidx.compose.runtime.toMutableStateList
+import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.res.painterResource
+import com.rtbishop.look4sat.core.domain.model.Constants
+import com.rtbishop.look4sat.core.presentation.IconCard
 
 @Preview(showBackground = true)
 @Composable
@@ -120,150 +131,150 @@ fun LocatorDialog(qthLocator: String, dismiss: () -> Unit, save: (String) -> Uni
 private fun TransceiversDialogPreview() {
     MainTheme {
         DataSourcesDialog(
-            useCustomTle = true,
-            useCustomTransceivers = true,
-            tleUrl = "https://example.com/tle.txt",
-            transceiversUrl = "https://example.com/tx.json",
-            requestCustomSourcesPermission = { onGranted, _ -> onGranted() },
+            satelliteUrls = listOf(
+                "celestrak.org/NORAD/elements/gp.php?GROUP=active&FORMAT=csv",
+                "amsat.org/tle/current/nasabare.txt"
+            ),
+            transceiversUrls = listOf(
+                "db.satnogs.org/api/transmitters/?format=json&status=active"
+            ),
             onImportTle = {},
             onImportTransceivers = {},
             onDismiss = {},
-            onSave = { _, _, _, _ -> }
+            onSave = { _, _ -> }
         )
     }
 }
 
 @Composable
 fun DataSourcesDialog(
-    useCustomTle: Boolean,
-    useCustomTransceivers: Boolean,
-    tleUrl: String,
-    transceiversUrl: String,
-    requestCustomSourcesPermission: (onGranted: () -> Unit, onDenied: () -> Unit) -> Unit,
+    satelliteUrls: List<String>,
+    transceiversUrls: List<String>,
     onImportTle: () -> Unit,
     onImportTransceivers: () -> Unit,
     onDismiss: () -> Unit,
-    onSave: (Boolean, Boolean, String, String) -> Unit
+    onSave: (List<String>, List<String>) -> Unit
 ) {
     val padding = LocalSpacing.current.large
-    val isEnabledCustomTle = rememberSaveable { mutableStateOf(useCustomTle) }
-    val isEnabledCustomTransceivers = rememberSaveable { mutableStateOf(useCustomTransceivers) }
-    val urlTle = rememberSaveable { mutableStateOf(tleUrl) }
-    val urlTransceivers = rememberSaveable { mutableStateOf(transceiversUrl) }
+    // Stable Long IDs avoid key collisions when several entries are empty or duplicated.
+    val nextId = remember { mutableLongStateOf((satelliteUrls.size + transceiversUrls.size).toLong()) }
+    val satUrls = remember {
+        satelliteUrls.mapIndexed { i, url -> i.toLong() to url }.toMutableStateList()
+    }
+    val txUrls = remember {
+        transceiversUrls.mapIndexed { i, url -> (satelliteUrls.size + i).toLong() to url }.toMutableStateList()
+    }
     val onAccept = {
-        onSave(isEnabledCustomTle.value, isEnabledCustomTransceivers.value, urlTle.value, urlTransceivers.value)
+        onSave(
+            satUrls.map { it.second.trim() }.filter { it.isNotBlank() },
+            txUrls.map { it.second.trim() }.filter { it.isNotBlank() }
+        )
         onDismiss()
     }
-    val onCancel = { onDismiss() }
     SharedDialog(
         title = stringResource(id = R.string.prefs_data_sources_title),
-        onCancel = onCancel,
+        onCancel = onDismiss,
         onAccept = onAccept,
     ) {
-        Column(modifier = Modifier.padding(horizontal = padding)) {
-            Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
-                CardButton(
-                    onClick = {
-                        onImportTle()
-                        onDismiss()
-                    },
-                    text = "TLE/3LE (.txt)\nOMM (.csv)",
-                    modifier = Modifier.weight(1f)
-                )
-                CardButton(
-                    onClick = {
-                        onImportTransceivers()
-                        onDismiss()
-                    },
-                    text = "Transceivers\nSatNOGS (.json)",
-                    modifier = Modifier.weight(1f)
-                )
+        LazyColumn(
+            modifier = Modifier
+                .fillMaxHeight(0.84f)
+                .padding(horizontal = padding),
+            verticalArrangement = Arrangement.spacedBy(4.dp),
+            contentPadding = PaddingValues(vertical = 6.dp)
+        ) {
+            item {
+                Row(
+                    horizontalArrangement = Arrangement.spacedBy(6.dp),
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    CardButton(
+                        onClick = { onImportTle(); onDismiss() },
+                        text = "TLE/3LE (.txt)\nOMM (.csv)",
+                        modifier = Modifier.weight(1f)
+                    )
+                    CardButton(
+                        onClick = { onImportTransceivers(); onDismiss() },
+                        text = "Transceivers\nSatNOGS (.json)",
+                        modifier = Modifier.weight(1f)
+                    )
+                }
             }
-            Spacer(modifier = Modifier.height(6.dp))
-            Row(
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier.fillMaxWidth()
-            ) {
-                Text(text = stringResource(id = R.string.prefs_data_sources_tle_switch))
-                Switch(
-                    checked = isEnabledCustomTle.value,
-                    onCheckedChange = { enabled ->
-                        if (!enabled) {
-                            isEnabledCustomTle.value = false
-                        } else {
-                            requestCustomSourcesPermission(
-                                { isEnabledCustomTle.value = true },
-                                { isEnabledCustomTle.value = false }
-                            )
-                        }
-                    }
-                )
-            }
-            OutlinedTextField(
-                value = urlTle.value,
-                onValueChange = { urlTle.value = it },
-                label = { Text(text = stringResource(id = R.string.prefs_data_sources_url_title)) },
-                singleLine = true,
-                modifier = Modifier.fillMaxWidth(),
-                enabled = isEnabledCustomTle.value,
-                trailingIcon = {
-                    IconButton(
-                        onClick = { urlTle.value = Sources.defaultTleUrl },
-                        enabled = isEnabledCustomTle.value
-                    ) {
-                        Icon(
-                            painter = painterResource(id = R.drawable.ic_reset),
-                            contentDescription = stringResource(id = R.string.prefs_data_reset_url)
-                        )
-                    }
-                },
+            sourceSection(
+                sectionKey = "sat",
+                labelResId = R.string.prefs_data_sources_satellites_label,
+                urls = satUrls,
+                onAdd = { satUrls.add(nextId.longValue++ to "") },
+                onMoveUp = { i -> if (i > 0) satUrls.add(i - 1, satUrls.removeAt(i)) },
+                onRemove = { i -> satUrls.removeAt(i) },
+                onUrlChange = { i, v -> satUrls[i] = satUrls[i].first to v }
             )
-            Spacer(modifier = Modifier.height(6.dp))
-            Row(
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier.fillMaxWidth()
-            ) {
-                Text(text = stringResource(id = R.string.prefs_data_sources_transceivers_switch))
-                Switch(
-                    checked = isEnabledCustomTransceivers.value,
-                    onCheckedChange = { enabled ->
-                        if (!enabled) {
-                            isEnabledCustomTransceivers.value = false
-                        } else {
-                            requestCustomSourcesPermission(
-                                { isEnabledCustomTransceivers.value = true },
-                                { isEnabledCustomTransceivers.value = false }
-                            )
-                        }
-                    }
-                )
-            }
-            OutlinedTextField(
-                value = urlTransceivers.value,
-                onValueChange = { urlTransceivers.value = it },
-                label = { Text(text = stringResource(id = R.string.prefs_data_sources_url_title)) },
-                singleLine = true,
-                modifier = Modifier.fillMaxWidth(),
-                enabled = isEnabledCustomTransceivers.value,
-                trailingIcon = {
-                    IconButton(
-                        onClick = { urlTransceivers.value = Sources.defaultTransceiversUrl },
-                        enabled = isEnabledCustomTransceivers.value
-                    ) {
-                        Icon(
-                            painter = painterResource(id = R.drawable.ic_reset),
-                            contentDescription = stringResource(id = R.string.prefs_data_reset_url)
-                        )
-                    }
-                },
+            sourceSection(
+                sectionKey = "tx",
+                labelResId = R.string.prefs_data_sources_transceivers_label,
+                urls = txUrls,
+                onAdd = { txUrls.add(nextId.longValue++ to "") },
+                onMoveUp = { i -> if (i > 0) txUrls.add(i - 1, txUrls.removeAt(i)) },
+                onRemove = { i -> txUrls.removeAt(i) },
+                onUrlChange = { i, v -> txUrls[i] = txUrls[i].first to v }
             )
-            Spacer(modifier = Modifier.height(12.dp))
         }
     }
 }
 
+private fun LazyListScope.sourceSection(
+    sectionKey: String,
+    labelResId: Int,
+    urls: List<Pair<Long, String>>,
+    onAdd: () -> Unit,
+    onMoveUp: (Int) -> Unit,
+    onRemove: (Int) -> Unit,
+    onUrlChange: (Int, String) -> Unit
+) {
+    item {
+        Spacer(modifier = Modifier.height(6.dp))
+        Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
+            Text(
+                text = stringResource(labelResId),
+                fontWeight = FontWeight.Medium,
+                color = MaterialTheme.colorScheme.primary,
+                modifier = Modifier.weight(1f)
+            )
+            IconCard(action = onAdd, resId = R.drawable.ic_add)
+        }
+    }
+    itemsIndexed(urls, key = { _, entry -> "$sectionKey-${entry.first}" }) { index, (_, url) ->
+        val enabledTint = MaterialTheme.colorScheme.onSurfaceVariant
+        OutlinedTextField(
+            value = url,
+            onValueChange = { onUrlChange(index, it) },
+            label = { Text(stringResource(R.string.prefs_data_sources_url_title)) },
+            leadingIcon = {
+                IconButton(onClick = { onMoveUp(index) }, enabled = index > 0) {
+                    Icon(
+                        painter = painterResource(R.drawable.ic_arrow),
+                        contentDescription = null,
+                        tint = if (index > 0) enabledTint else enabledTint.copy(alpha = 0.32f),
+                        modifier = Modifier.rotate(270f)
+                    )
+                }
+            },
+            trailingIcon = {
+                IconButton(onClick = { onRemove(index) }) {
+                    Icon(
+                        painter = painterResource(R.drawable.ic_delete),
+                        contentDescription = null
+                    )
+                }
+            },
+            singleLine = true,
+            modifier = Modifier
+                .fillMaxWidth()
+                .animateItem(fadeInSpec = spring(), fadeOutSpec = spring())
+        )
+    }
+}
+
 @Preview(showBackground = true)
 @Composable
 fun PreviewNetworkOutputDialog() {
@@ -278,6 +289,7 @@ fun PreviewNetworkOutputDialog() {
                 frequencyAddress = "127.0.0.1",
                 frequencyPort = "4532",
                 frequencyFormat = $$"F $FREQ",
+                frequencyOffsetHz = 0L,
                 bluetoothRotatorState = false,
                 bluetoothRotatorFormat = $$"P $AZ $EL",
                 bluetoothRotatorName = "Default",
@@ -287,7 +299,7 @@ fun PreviewNetworkOutputDialog() {
                 bluetoothFrequencyFormat = $$"F $FREQ"
             ),
             onDismiss = {},
-            onSave = { _, _, _, _, _, _, _, _ -> }
+            onSave = { _, _, _, _, _, _, _, _, _ -> }
         )
     }
 }
@@ -298,7 +310,7 @@ fun NetworkOutputDialog(
     onDismiss: () -> Unit,
     onSave: (
         Boolean, String, String, String,
-        Boolean, String, String, String
+        Boolean, String, String, String, Long
     ) -> Unit
 ) {
     val padding = LocalSpacing.current.large
@@ -312,12 +324,15 @@ fun NetworkOutputDialog(
         mutableStateOf("${initialSettings.frequencyAddress}:${initialSettings.frequencyPort}")
     }
     val frequencyFormat = rememberSaveable { mutableStateOf(initialSettings.frequencyFormat) }
+    val frequencyOffsetHz = rememberSaveable { mutableStateOf(initialSettings.frequencyOffsetHz.toString()) }
     val onAccept = {
         val (rotIp, rotPort) = splitAddress(rotatorAddress.value)
         val (freqIp, freqPort) = splitAddress(frequencyAddress.value)
+        val offsetHz = (frequencyOffsetHz.value.trim().toLongOrNull() ?: 0L)
+            .coerceIn(Constants.FREQ_OFFSET_MIN_HZ, Constants.FREQ_OFFSET_MAX_HZ)
         onSave(
             rotatorState.value, rotIp, rotPort, rotatorFormat.value,
-            frequencyState.value, freqIp, freqPort, frequencyFormat.value
+            frequencyState.value, freqIp, freqPort, frequencyFormat.value, offsetHz
         )
         onDismiss()
     }
@@ -350,6 +365,24 @@ fun NetworkOutputDialog(
                 onFormatChange = { frequencyFormat.value = it },
                 formatLabel = stringResource(R.string.prefs_net_frequency_format_hint)
             )
+            Spacer(modifier = Modifier.height(6.dp))
+            OutlinedTextField(
+                value = frequencyOffsetHz.value,
+                onValueChange = { frequencyOffsetHz.value = it },
+                singleLine = true,
+                label = { Text(stringResource(R.string.prefs_net_frequency_offset_hint)) },
+                supportingText = { Text(stringResource(R.string.prefs_net_frequency_offset_help)) },
+                trailingIcon = {
+                    IconButton(
+                        onClick = { frequencyOffsetHz.value = "0" },
+                        enabled = frequencyState.value && frequencyOffsetHz.value != "0"
+                    ) {
+                        Icon(painter = painterResource(R.drawable.ic_close), contentDescription = null)
+                    }
+                },
+                modifier = Modifier.fillMaxWidth(),
+                enabled = frequencyState.value
+            )
             Spacer(modifier = Modifier.height(12.dp))
         }
     }
@@ -378,6 +411,7 @@ fun PreviewBluetoothOutputDialog() {
                 frequencyAddress = "127.0.0.1",
                 frequencyPort = "4532",
                 frequencyFormat = $$"F $FREQ",
+                frequencyOffsetHz = 0L,
                 bluetoothRotatorState = false,
                 bluetoothRotatorFormat = $$"P $AZ $EL",
                 bluetoothRotatorName = "Default",

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

@@ -22,76 +22,46 @@ import android.os.Build
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.clickable
-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.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.gestures.detectDragGestures
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.grid.GridCells
-import android.content.Context
 import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Switch
-import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
-import kotlin.math.roundToInt
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.zIndex
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
+import com.rtbishop.look4sat.core.domain.model.DataSourcesSettings
 import com.rtbishop.look4sat.core.domain.model.OtherSettings
 import com.rtbishop.look4sat.core.domain.predict.GeoPos
 import com.rtbishop.look4sat.core.domain.repository.IContainerProvider
@@ -103,8 +73,6 @@ import com.rtbishop.look4sat.core.presentation.R
 import com.rtbishop.look4sat.core.presentation.ScreenColumn
 import com.rtbishop.look4sat.core.presentation.TopBar
 import com.rtbishop.look4sat.core.presentation.infiniteMarquee
-import com.rtbishop.look4sat.core.presentation.defaultScreenOrder
-import com.rtbishop.look4sat.core.presentation.defaultSubMenuOrder
 import com.rtbishop.look4sat.core.presentation.isVerticalLayout
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -117,63 +85,6 @@ fun SettingsDestination() {
     val viewModel: SettingsViewModel = viewModel(factory = SettingsViewModel.factory(container))
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     SettingsScreen(uiState, viewModel::onAction)
-
-    // WaveLog 网格不一致确认弹窗(4.5.2)
-    val gridConfirm = viewModel.gridConfirm
-    if (gridConfirm != null) {
-        AlertDialog(
-            onDismissRequest = { viewModel.resolveGridConfirm(false) },
-            title = { Text(text = stringResource(id = R.string.wavelog_title)) },
-            text = {
-                Text(
-                    text = stringResource(
-                        id = R.string.wavelog_grid_mismatch,
-                        gridConfirm.userGrid.take(4),
-                        gridConfirm.stationGrid.take(4)
-                    )
-                )
-            },
-            confirmButton = {
-                TextButton(onClick = { viewModel.resolveGridConfirm(true) }) {
-                    Text(text = stringResource(id = R.string.wavelog_ignore))
-                }
-            },
-            dismissButton = {
-                TextButton(onClick = { viewModel.resolveGridConfirm(false) }) {
-                    Text(text = stringResource(id = R.string.wavelog_cancel))
-                }
-            }
-        )
-    }
-
-    // WaveLog 错误详情弹窗(可一键复制)
-    val wavelogError = viewModel.wavelogError
-    if (wavelogError != null) {
-        AlertDialog(
-            onDismissRequest = { viewModel.wavelogError = null },
-            title = { Text(text = stringResource(id = R.string.wavelog_title)) },
-            text = {
-                Text(
-                    text = wavelogError,
-                    fontSize = 13.sp
-                )
-            },
-            confirmButton = {
-                TextButton(onClick = {
-                    val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager
-                    clipboard.setPrimaryClip(android.content.ClipData.newPlainText("WaveLog error", wavelogError))
-                    viewModel.wavelogError = null
-                }) {
-                    Text(text = stringResource(id = R.string.wavelog_copy))
-                }
-            },
-            dismissButton = {
-                TextButton(onClick = { viewModel.wavelogError = null }) {
-                    Text(text = stringResource(id = R.string.btn_cancel))
-                }
-            }
-        )
-    }
 }
 
 @Composable
@@ -215,30 +126,15 @@ private fun SettingsScreen(uiState: SettingsState, onAction: (SettingsAction) ->
     }
     if (dialogs.dataSources) {
         DataSourcesDialog(
-            useCustomTle = uiState.dataSourcesSettings.useCustomTLE,
-            useCustomTransceivers = uiState.dataSourcesSettings.useCustomTransceivers,
-            tleUrl = uiState.dataSourcesSettings.tleUrl,
-            transceiversUrl = uiState.dataSourcesSettings.transceiversUrl,
-            requestCustomSourcesPermission = { onGranted, onDenied ->
-                pendingCustomSourcesGrant.value = onGranted
-                pendingCustomSourcesDeny.value = onDenied
-                permissions.launchCustomSourcesPermission()
-            },
+            satelliteUrls = uiState.dataSourcesSettings.satelliteUrls,
+            transceiversUrls = uiState.dataSourcesSettings.transceiversUrls,
             onImportTle = { permissions.launchTleImport(); dialogs.dataSources = false },
             onImportTransceivers = { permissions.launchTransceiverImport(); dialogs.dataSources = false },
             onDismiss = { dialogs.dataSources = false },
-            onSave = { useCustomTle, useCustomTransceivers, tleUrl, transceiversUrl ->
-                val current = uiState.dataSourcesSettings
-                val newSettings = current.copy(
-                    useCustomTLE = if (!useCustomTle || tleUrl.isNotBlank()) useCustomTle else current.useCustomTLE,
-                    tleUrl = if (!useCustomTle || tleUrl.isNotBlank()) tleUrl else current.tleUrl,
-                    useCustomTransceivers = if (!useCustomTransceivers || transceiversUrl.isNotBlank()) useCustomTransceivers else current.useCustomTransceivers,
-                    transceiversUrl = if (!useCustomTransceivers || transceiversUrl.isNotBlank()) transceiversUrl else current.transceiversUrl
-                )
-                if (newSettings != current) onAction(SettingsAction.UpdateDataSources(newSettings))
-                if (newSettings.useCustomTLE || newSettings.useCustomTransceivers) {
-                    onAction(SettingsAction.UpdateFromWeb)
-                }
+            onSave = { satUrls, txUrls ->
+                val newSettings = DataSourcesSettings(satelliteUrls = satUrls, transceiversUrls = txUrls)
+                if (newSettings != uiState.dataSourcesSettings) onAction(SettingsAction.UpdateDataSources(newSettings))
+                onAction(SettingsAction.UpdateFromWeb)
             }
         )
     }
@@ -246,14 +142,15 @@ private fun SettingsScreen(uiState: SettingsState, onAction: (SettingsAction) ->
         NetworkOutputDialog(
             initialSettings = uiState.rcSettings,
             onDismiss = { dialogs.network = false },
-            onSave = { rotState, rotAddr, rotPort, rotFmt, freqState, freqAddr, freqPort, freqFmt ->
+            onSave = { rotState, rotAddr, rotPort, rotFmt, freqState, freqAddr, freqPort, freqFmt, freqOffsetHz ->
                 onAction(
                     SettingsAction.UpdateRC(
                         uiState.rcSettings.copy(
                             rotatorState = rotState, rotatorAddress = rotAddr,
                             rotatorPort = rotPort, rotatorFormat = rotFmt,
                             frequencyState = freqState, frequencyAddress = freqAddr,
-                            frequencyPort = freqPort, frequencyFormat = freqFmt
+                            frequencyPort = freqPort, frequencyFormat = freqFmt,
+                            frequencyOffsetHz = freqOffsetHz
                         )
                     )
                 )
@@ -389,18 +286,6 @@ private fun SettingsScreen(uiState: SettingsState, onAction: (SettingsAction) ->
                 )
             }
             item { OtherCard(uiState.otherSettings, onAction) }
-            item { WavelogCard(uiState.otherSettings, onAction) }
-            item {
-                UiSettingsCard(
-                    hiddenScreens = uiState.otherSettings.hiddenScreens,
-                    screenOrder = uiState.otherSettings.screenOrder,
-                    subMenuOrder = uiState.otherSettings.subMenuOrder,
-                    onToggle = { name -> onAction(SettingsAction.ToggleScreen(name)) },
-                    onReorder = { order -> onAction(SettingsAction.ReorderScreens(order)) },
-                    onResetOrder = { onAction(SettingsAction.ResetMenuOrder) },
-                    onUpdateMenu = { main, sub -> onAction(SettingsAction.UpdateMenuOrder(main, sub)) }
-                )
-            }
             item { CardCredits() }
         }
     }
@@ -439,11 +324,9 @@ private fun LocationCard(
             Text(text = formatUpdateTime(updateTime = settings.stationPos.timestamp))
             Spacer(modifier = Modifier.height(2.dp))
             Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
-                Text(text = stringResource(R.string.loc_lat_text, settings.stationPos.latitude))
-                Text(text = stringResource(R.string.loc_lon_text, settings.stationPos.longitude))
-            }
-            Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
-                Text(text = stringResource(R.string.loc_qth_text, settings.stationPos.qthLocator))
+                Text(text = "Lat: ${settings.stationPos.latitude}°")
+                Text(text = "Lon: ${settings.stationPos.longitude}°")
+                Text(text = "Qth: ${settings.stationPos.qthLocator}")
             }
             Spacer(modifier = Modifier.height(1.dp))
             Row(horizontalArrangement = Arrangement.SpaceEvenly) {
@@ -588,12 +471,11 @@ private fun OtherCardPreview() = MainTheme {
 @Composable
 private fun OtherCard(settings: OtherSettings, onAction: (SettingsAction) -> Unit) {
     ElevatedCard(
-        modifier = Modifier.fillMaxWidth()
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(268.dp)
     ) {
-        Column(
-            modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp),
-            verticalArrangement = Arrangement.spacedBy(4.dp)
-        ) {
+        Column(modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp)) {
             Text(
                 text = stringResource(id = R.string.prefs_other_title),
                 color = MaterialTheme.colorScheme.primary
@@ -617,295 +499,8 @@ private fun OtherCard(settings: OtherSettings, onAction: (SettingsAction) -> Uni
     }
 }
 
-/**
- * UI 设置卡片: 控制底部菜单栏各页面显示/隐藏。
- * 顺序固定(卫星/过境/雷达/匹配/漫游/地图/设置), 关闭后其余自动靠拢;
- * "设置"页固定显示(防止失去设置入口)。
- */
-/** WaveLog 日志服务器设置卡片(4.5.2): 照用户截图布局(深色卡片/标签左输入右/按钮行) */
 @Composable
-private fun WavelogCard(
-    settings: OtherSettings,
-    onAction: (SettingsAction) -> Unit
-) {
-    ElevatedCard(modifier = Modifier.fillMaxWidth()) {
-        Column(
-            modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp),
-            verticalArrangement = Arrangement.spacedBy(4.dp)
-        ) {
-            Text(
-                text = stringResource(id = R.string.prefs_wavelog_title),
-                color = MaterialTheme.colorScheme.primary
-            )
-            OutlinedTextField(
-                value = settings.wavelogUrl,
-                onValueChange = {
-                    onAction(SettingsAction.UpdateWavelogSettings(it, settings.wavelogApiKey, settings.wavelogStationId, settings.wavelogAutoUpload))
-                },
-                label = { Text(stringResource(id = R.string.prefs_wavelog_url_hint)) },
-                singleLine = true,
-                textStyle = LocalTextStyle.current.copy(fontSize = 14.sp),
-                modifier = Modifier.fillMaxWidth()
-            )
-            OutlinedTextField(
-                value = settings.wavelogApiKey,
-                onValueChange = {
-                    onAction(SettingsAction.UpdateWavelogSettings(settings.wavelogUrl, it, settings.wavelogStationId, settings.wavelogAutoUpload))
-                },
-                label = { Text(stringResource(id = R.string.prefs_wavelog_key_hint)) },
-                singleLine = true,
-                textStyle = LocalTextStyle.current.copy(fontSize = 14.sp),
-                visualTransformation = PasswordVisualTransformation(),
-                modifier = Modifier.fillMaxWidth()
-            )
-            OutlinedTextField(
-                value = settings.wavelogStationId,
-                onValueChange = {
-                    onAction(SettingsAction.UpdateWavelogSettings(settings.wavelogUrl, settings.wavelogApiKey, it, settings.wavelogAutoUpload))
-                },
-                label = { Text(stringResource(id = R.string.prefs_wavelog_station_hint)) },
-                singleLine = true,
-                textStyle = LocalTextStyle.current.copy(fontSize = 14.sp),
-                modifier = Modifier.fillMaxWidth()
-            )
-            SwitchRow(R.string.prefs_wavelog_auto, settings.wavelogAutoUpload) {
-                onAction(SettingsAction.UpdateWavelogSettings(settings.wavelogUrl, settings.wavelogApiKey, settings.wavelogStationId, it))
-            }
-            Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                CardButton(
-                    onClick = { onAction(SettingsAction.TestWavelogConnection) },
-                    text = stringResource(id = R.string.prefs_wavelog_test),
-                    modifier = Modifier.weight(1f)
-                )
-                CardButton(
-                    onClick = { onAction(SettingsAction.UploadWavelogQueue) },
-                    text = stringResource(id = R.string.prefs_wavelog_upload),
-                    modifier = Modifier.weight(1f)
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun UiSettingsCard(
-    hiddenScreens: List<String>,
-    screenOrder: List<String>,
-    subMenuOrder: List<String>,
-    onToggle: (String) -> Unit,
-    onReorder: (List<String>) -> Unit,
-    onResetOrder: () -> Unit,
-    onUpdateMenu: (List<String>, List<String>) -> Unit
-) {
-    val screens = listOf(
-        R.string.nav_sat to "Satellites",
-        R.string.nav_pass to "Passes",
-        R.string.nav_radar to "Radar",
-        R.string.nav_mutual to "Mutual",
-        R.string.nav_roaming to "Roaming",
-        R.string.nav_cw to "CwDecode",
-        R.string.nav_log to "WavelogLog",
-        R.string.nav_amsat to "AMSAT",
-        R.string.nav_map to "Map",
-        R.string.nav_prefs to "Settings"
-    ) // name 必须与 Screen.screenId 一致 (R8 安全)
-    // 主菜单项: 排除更多菜单项, Settings 固定最后
-    val mainItems = remember(screens, screenOrder, subMenuOrder) {
-        val sub = subMenuOrder.ifEmpty { defaultSubMenuOrder }
-        screens.map { it.second }
-            .filter { it !in sub }
-            .sortedBy { name ->
-                screenOrder.indexOf(name).let { idx ->
-                    if (idx != -1) idx else defaultScreenOrder.indexOf(name).let {
-                        if (it != -1) it else Int.MAX_VALUE
-                    }
-                }
-            }
-            .sortedWith(compareBy { if (it == "Settings") 1 else 0 })
-    }
-    // 更多菜单项
-    val subItems = remember(screens, subMenuOrder) {
-        val sub = subMenuOrder.ifEmpty { defaultSubMenuOrder }
-        sub.filter { s -> screens.any { (_, name) -> name == s } }
-    }
-    ElevatedCard(modifier = Modifier.fillMaxWidth()) {
-        Column(
-            modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp),
-            verticalArrangement = Arrangement.spacedBy(4.dp)
-        ) {
-            Text(
-                text = stringResource(id = R.string.prefs_ui_title),
-                color = MaterialTheme.colorScheme.primary
-            )
-            screens.forEach { (labelRes, name) ->
-                if (name == "Settings") {
-                    // 设置页固定显示, 开关禁用
-                    SwitchRow(labelRes, true, null)
-                } else {
-                    SwitchRow(labelRes, name !in hiddenScreens) {
-                        onToggle(name)
-                    }
-                }
-            }
-            Text(
-                text = stringResource(id = R.string.prefs_ui_order_title),
-                color = MaterialTheme.colorScheme.primary
-            )
-            // 主菜单区(底部栏, 最多 5 项, 设置锁定最后)
-            Text(
-                text = stringResource(id = R.string.prefs_ui_main_title),
-                fontSize = 12.sp,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
-            )
-            DragOrderList(
-                items = mainItems,
-                labels = screens,
-                locked = setOf("Settings"),
-                moveLabel = stringResource(id = R.string.prefs_ui_move_out),
-                moveEnabled = { name -> name != "Settings" },
-                onMove = { name ->
-                    onUpdateMenu(
-                        mainItems.filter { it != name },
-                        (subMenuOrder.ifEmpty { defaultSubMenuOrder } + name).distinct()
-                    )
-                },
-                onReorder = { main -> onUpdateMenu(main, subMenuOrder) }
-            )
-            // 更多菜单区(进「更多」的页面)
-            Text(
-                text = stringResource(id = R.string.prefs_ui_sub_title),
-                fontSize = 12.sp,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
-            )
-            DragOrderList(
-                items = subItems,
-                labels = screens,
-                moveLabel = stringResource(id = R.string.prefs_ui_move_back),
-                // 按钮常显; 主菜单满 5 时自动让位(最后一个非"设置"项移入更多, 交换)
-                moveEnabled = { true },
-                onMove = { name ->
-                    val mainWithoutSettings = mainItems.filter { it != "Settings" }
-                    val needSwap = mainWithoutSettings.size >= 5
-                    val evicted = if (needSwap) mainWithoutSettings.last() else null
-                    val newMain = if (needSwap) {
-                        (mainWithoutSettings.dropLast(1) + name).distinct()
-                    } else {
-                        (mainWithoutSettings + name).distinct()
-                    }
-                    val newSub = (subItems.filter { it != name } +
-                        if (evicted != null) listOf(evicted) else emptyList()).distinct()
-                    onUpdateMenu(newMain, newSub)
-                },
-                onReorder = { sub -> onUpdateMenu(screenOrder, sub) }
-            )
-            TextButton(onClick = onResetOrder) {
-                Text(text = stringResource(id = R.string.prefs_ui_order_reset))
-            }
-        }
-    }
-}
-
-/** 页面顺序拖拽列表: 每行右侧抓手, 按住上下拖动实时换位, 松手持久化 */
-@Composable
-private fun DragOrderList(
-    items: List<String>,
-    labels: List<Pair<Int, String>>,
-    locked: Set<String> = emptySet(),
-    moveLabel: String? = null,
-    moveEnabled: (String) -> Boolean = { true },
-    onMove: ((String) -> Unit)? = null,
-    onReorder: (List<String>) -> Unit
-) {
-    val itemHeight = 48.dp
-    val itemHeightPx = with(LocalDensity.current) { itemHeight.toPx() }
-    val listState = rememberLazyListState()
-    val localItems = remember(items) { mutableStateListOf<String>().apply { addAll(items) } }
-    var draggingIndex by remember { mutableIntStateOf(-1) }
-    var dragOffset by remember { mutableStateOf(0f) }
-
-    // 固定高度: 嵌套在 LazyVerticalGrid 内必须给有界高度, 否则无限高度约束崩溃
-    LazyColumn(
-        state = listState,
-        modifier = Modifier
-            .fillMaxWidth()
-            .height(itemHeight * localItems.size)
-    ) {
-        itemsIndexed(localItems, key = { _, name -> name }) { index, name ->
-            val isDragging = draggingIndex == index
-            val isLocked = name in locked
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(itemHeight)
-                    .zIndex(if (isDragging) 1f else 0f)
-                    .graphicsLayer { translationY = if (isDragging) dragOffset else 0f }
-                    .animateItem()
-            ) {
-                Text(
-                    text = stringResource(id = labels.first { it.second == name }.first),
-                    modifier = Modifier.weight(1f)
-                )
-                if (moveLabel != null && onMove != null && moveEnabled(name)) {
-                    TextButton(onClick = { onMove(name) }, contentPadding = PaddingValues(horizontal = 4.dp)) {
-                        Text(moveLabel, fontSize = 11.sp)
-                    }
-                }
-                if (isLocked) {
-                    // 锁定行(设置页): 无抓手, 固定最后
-                    Text(
-                        text = stringResource(id = R.string.prefs_ui_order_locked),
-                        fontSize = 11.sp,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                        modifier = Modifier.padding(horizontal = 12.dp)
-                    )
-                } else {
-                    Box(
-                        modifier = Modifier
-                            .size(48.dp)
-                            .padding(20.dp)
-                            .pointerInput(name) {
-                                detectDragGestures(
-                                    onDragStart = { draggingIndex = localItems.indexOf(name) },
-                                    onDrag = { change, dragAmount ->
-                                        change.consume()
-                                        dragOffset += dragAmount.y
-                                        val currentIndex = draggingIndex
-                                        val target = (currentIndex + (dragOffset / itemHeightPx).roundToInt())
-                                            .coerceIn(0, localItems.size - 1)
-                                        if (target != currentIndex) {
-                                            localItems.add(target, localItems.removeAt(currentIndex))
-                                            dragOffset += (currentIndex - target) * itemHeightPx
-                                            draggingIndex = target
-                                        }
-                                    },
-                                    onDragEnd = {
-                                        onReorder(localItems.toList())
-                                        draggingIndex = -1
-                                        dragOffset = 0f
-                                    },
-                                    onDragCancel = {
-                                        draggingIndex = -1
-                                        dragOffset = 0f
-                                    }
-                                )
-                            }
-                    ) {
-                        // 小圆点手柄(触控区 padding 20dp 居中 -> 8dp 圆点)
-                        Box(
-                            modifier = Modifier
-                                .fillMaxSize()
-                                .background(MaterialTheme.colorScheme.onSurfaceVariant, CircleShape)
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun SwitchRow(labelResId: Int, checked: Boolean, onCheckedChange: ((Boolean) -> Unit)?) {
+private fun SwitchRow(labelResId: Int, checked: Boolean, onCheckedChange: (Boolean) -> Unit) {
     Row(
         horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically,
@@ -948,11 +543,15 @@ private fun CardCreditsPreview() = MainTheme { CardCredits() }
 @Composable
 private fun CardCredits(modifier: Modifier = Modifier) {
     ElevatedCard(
-        modifier = modifier.fillMaxWidth()
+        modifier = modifier
+            .fillMaxWidth()
+            .height(268.dp)
     ) {
         Column(
-            verticalArrangement = Arrangement.spacedBy(8.dp),
-            modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp)
+            verticalArrangement = Arrangement.SpaceBetween,
+            modifier = Modifier
+                .padding(horizontal = 8.dp, vertical = 4.dp)
+                .fillMaxHeight()
         ) {
             Text(
                 text = stringResource(id = R.string.prefs_outro_title),
@@ -961,8 +560,6 @@ private fun CardCredits(modifier: Modifier = Modifier) {
             Text(
                 text = stringResource(id = R.string.prefs_outro_thanks)
             )
-            // 感谢列表与保修声明之间保留约两行间距 (用户要求)
-            Spacer(modifier = Modifier.height(24.dp))
             Text(
                 text = stringResource(id = R.string.prefs_outro_license),
                 color = MaterialTheme.colorScheme.primary
@@ -978,7 +575,7 @@ private fun TopCard(onClick: () -> Unit, modifier: Modifier = Modifier, version:
             horizontalArrangement = Arrangement.spacedBy(12.dp),
             verticalAlignment = Alignment.CenterVertically,
             modifier = Modifier
-                .heightIn(min = 48.dp)
+                .height(48.dp)
                 .clickable { onClick() }) {
             Spacer(Modifier)
             Icon(
@@ -993,6 +590,7 @@ private fun TopCard(onClick: () -> Unit, modifier: Modifier = Modifier, version:
                 modifier = Modifier
                     .weight(1f)
                     .padding(end = 6.dp)
+                    .infiniteMarquee()
             )
         }
     }

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

@@ -64,24 +64,6 @@ sealed interface SettingsAction {
     data class ToggleSensor(val value: Boolean) : SettingsAction
     data class ToggleLightTheme(val value: Boolean) : SettingsAction
     data class ToggleNightMode(val value: Boolean) : SettingsAction
-    // UI 设置: 切换底部导航栏页面的隐藏状态(Screen simpleName)
-    data class ToggleScreen(val screenName: String) : SettingsAction
-    // UI 设置: 更新页面顺序
-    data class ReorderScreens(val order: List<String>) : SettingsAction
-    // UI 设置: 重置为默认顺序
-    data object ResetScreenOrder : SettingsAction
-    // UI 设置: 更新主菜单 + 更多菜单顺序(4.5.1 折叠菜单)
-    data class UpdateMenuOrder(val mainOrder: List<String>, val subOrder: List<String>) : SettingsAction
-    // UI 设置: 重置主菜单 + 更多菜单顺序
-    data object ResetMenuOrder : SettingsAction
-    // WaveLog 日志(4.5.2): 更新服务器配置
-    data class UpdateWavelogSettings(
-        val url: String, val apiKey: String, val stationId: String, val autoUpload: Boolean
-    ) : SettingsAction
-    // WaveLog: 测试连接
-    data object TestWavelogConnection : SettingsAction
-    // WaveLog: 手动上传队列
-    data object UploadWavelogQueue : SettingsAction
 
     // Remote control
     data class UpdateRC(val settings: RCSettings) : SettingsAction

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

@@ -25,18 +25,11 @@ import com.rtbishop.look4sat.core.domain.repository.IDatabaseRepo
 import com.rtbishop.look4sat.core.domain.repository.IMainContainer
 import com.rtbishop.look4sat.core.domain.repository.ISettingsRepo
 import com.rtbishop.look4sat.core.domain.usecase.IShowToast
-import com.rtbishop.look4sat.core.domain.wavelog.UploadOutcome
-import com.rtbishop.look4sat.core.domain.wavelog.WaveLogApi
-import com.rtbishop.look4sat.core.domain.wavelog.WavelogResult
-import com.rtbishop.look4sat.core.domain.wavelog.WavelogUploader
 import com.rtbishop.look4sat.core.presentation.R
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
 
 class SettingsViewModel(
     private val databaseRepo: IDatabaseRepo,
@@ -128,34 +121,10 @@ class SettingsViewModel(
             is SettingsAction.ToggleSensor -> settingsRepo.updateOtherSettings { it.copy(stateOfSensors = action.value) }
             is SettingsAction.ToggleLightTheme -> settingsRepo.updateOtherSettings { it.copy(stateOfLightTheme = action.value) }
             is SettingsAction.ToggleNightMode -> settingsRepo.updateOtherSettings { it.copy(stateOfNightMode = action.value) }
-            is SettingsAction.ToggleScreen -> settingsRepo.updateOtherSettings { current ->
-                val hidden = current.hiddenScreens.toMutableList()
-                if (action.screenName in hidden) hidden.remove(action.screenName) else hidden.add(action.screenName)
-                current.copy(hiddenScreens = hidden)
-            }
-            is SettingsAction.ReorderScreens -> settingsRepo.updateOtherSettings { it.copy(screenOrder = action.order) }
-            SettingsAction.ResetScreenOrder -> settingsRepo.updateOtherSettings { it.copy(screenOrder = emptyList()) }
-            is SettingsAction.UpdateMenuOrder -> settingsRepo.updateOtherSettings {
-                it.copy(screenOrder = action.mainOrder, subMenuOrder = action.subOrder)
-            }
-            SettingsAction.ResetMenuOrder -> settingsRepo.updateOtherSettings {
-                it.copy(screenOrder = emptyList(), subMenuOrder = emptyList())
-            }
             // Remote control & data sources
             is SettingsAction.UpdateRC -> settingsRepo.updateRCSettings(action.settings)
             is SettingsAction.UpdateRadioControl -> settingsRepo.updateRadioControlSettings(action.settings)
             is SettingsAction.UpdateDataSources -> settingsRepo.updateDataSourcesSettings(action.settings)
-            // WaveLog 日志(4.5.2)
-            is SettingsAction.UpdateWavelogSettings -> settingsRepo.updateOtherSettings {
-                it.copy(
-                    wavelogUrl = action.url,
-                    wavelogApiKey = action.apiKey,
-                    wavelogStationId = action.stationId,
-                    wavelogAutoUpload = action.autoUpload
-                )
-            }
-            SettingsAction.TestWavelogConnection -> testWavelogConnection()
-            SettingsAction.UploadWavelogQueue -> uploadWavelogQueue()
             // System
             is SettingsAction.ShowToast -> showToast(action.message)
         }
@@ -164,16 +133,7 @@ class SettingsViewModel(
     // region Position helpers — consolidated from 3 near-identical functions
 
     private fun setGpsPosition() {
-        viewModelScope.launch {
-            _uiState.update { it.copy(positionSettings = it.positionSettings.copy(isUpdating = true)) }
-            val success = settingsRepo.setStationPosition()
-            _uiState.update {
-                it.copy(positionSettings = it.positionSettings.copy(
-                    isUpdating = false,
-                    messageResId = if (success) R.string.prefs_loc_success else R.string.prefs_loc_gps_error
-                ))
-            }
-        }
+        updatePosition(R.string.prefs_loc_gps_error) { settingsRepo.setStationPosition() }
     }
 
     private fun setGeoPosition(latitude: Double, longitude: Double) {
@@ -221,7 +181,6 @@ class SettingsViewModel(
                 it.copy(dataSettings = it.dataSettings.copy(isUpdating = false))
             }
             println(exception)
-            showToast(R.string.prefs_data_update_failed)
         }
     }
 
@@ -238,65 +197,6 @@ class SettingsViewModel(
     }
 
 
-    // endregion
-
-    // region WaveLog(4.5.2)
-
-    // 由 SettingsScreen 注入的共享 uploader(容器级单例)
-    var pendingUploader: WavelogUploader? = null
-
-    // 网格不一致确认弹窗状态(UI 观察后弹 AlertDialog)
-    var gridConfirm by mutableStateOf<GridConfirmData?>(null)
-
-    // WaveLog 错误详情弹窗(UI 观察后弹 AlertDialog, 可一键复制)
-    var wavelogError by mutableStateOf<String?>(null)
-
-    data class GridConfirmData(val stationGrid: String, val userGrid: String)
-
-    private fun testWavelogConnection() {
-        viewModelScope.launch {
-            val s = settingsRepo.otherSettings.value
-            val result = WaveLogApi.testToken(s.wavelogUrl, s.wavelogApiKey, s.wavelogStationId)
-            when (result) {
-                is WavelogResult.Success -> showToast("WaveLog: ${result.message}")
-                is WavelogResult.Failure -> wavelogError = result.message
-            }
-        }
-    }
-
-    private fun uploadWavelogQueue() {
-        viewModelScope.launch {
-            val result = pendingUploader?.uploadQueue()
-            when (result) {
-                is UploadOutcome.Done -> {
-                    if (result.failedCount > 0 && result.firstError.isNotBlank()) {
-                        wavelogError = result.firstError
-                    } else {
-                        showToast("WaveLog: ${result.message}")
-                    }
-                }
-                is UploadOutcome.NeedConfirm -> {
-                    gridConfirm = GridConfirmData(result.stationGrid, result.userGrid)
-                }
-                null -> showToast("WaveLog: 上传失败")
-            }
-        }
-    }
-
-    /** 网格确认结果: 忽略并上传 / 取消 */
-    fun resolveGridConfirm(ignoreAndUpload: Boolean) {
-        val confirm = gridConfirm ?: return
-        gridConfirm = null
-        if (!ignoreAndUpload) return
-        viewModelScope.launch {
-            val result = pendingUploader?.uploadQueue(force = true)
-            when (result) {
-                is UploadOutcome.Done -> showToast("WaveLog: ${result.message}")
-                else -> showToast("WaveLog: 上传失败")
-            }
-        }
-    }
-
     // endregion
 
     companion object {
@@ -307,7 +207,7 @@ class SettingsViewModel(
                     databaseRepo = container.databaseRepo,
                     settingsRepo = container.settingsRepo,
                     showToast = container.provideShowToast()
-                ).apply { pendingUploader = container.provideWavelogUploader() }
+                )
             }
         }
     }

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

@@ -1,20 +1,18 @@
 package com.rtbishop.look4sat.feature.status
 
-import androidx.compose.animation.core.RepeatMode
-import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.infiniteRepeatable
-import androidx.compose.animation.core.rememberInfiniteTransition
-import androidx.compose.animation.core.tween
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 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.FlowRow
 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.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -22,7 +20,6 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
@@ -36,49 +33,64 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+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.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.lifecycle.viewmodel.viewModelFactory
 import com.rtbishop.look4sat.core.domain.model.SatDay
 import com.rtbishop.look4sat.core.domain.model.SatReport
 import com.rtbishop.look4sat.core.domain.model.SatSlot
 import com.rtbishop.look4sat.core.domain.model.SatStatus
-import com.rtbishop.look4sat.core.domain.repository.IMainContainer
+import com.rtbishop.look4sat.core.domain.repository.IContainerProvider
+import com.rtbishop.look4sat.core.presentation.InfoDialog
 import com.rtbishop.look4sat.core.presentation.R
+import com.rtbishop.look4sat.core.presentation.layoutPadding
 import java.util.Calendar
 
-// ========== 官网状态色(amsat.org/status 原色) ==========
-val ActiveBlue = Color(0xFF648FFF)
-val TlmOrange = Color(0xFFFFB000)
-val NotHeardPink = Color(0xFFDC267F)
-val ConflictDeepOrange = Color(0xFFFE6100)
-val NoReportGray = Color(0xFFC0C0C0)
+/** Fixed width per day tile — tablet-safe; name column absorbs remaining space. */
+private val TILE_WIDTH: Dp = 64.dp
+
+/**
+ * Map AMSAT status text to Material3 colorScheme colors.
+ * Addresses PR #233 review: use colorScheme instead of hardcoded Color() constants.
+ */
+@Composable
+private fun statusColorOf(statusText: String): Color {
+    return when {
+        statusText.contains("Heard", ignoreCase = true) && !statusText.contains("Not", ignoreCase = true) ->
+            MaterialTheme.colorScheme.tertiary
+        statusText.contains("Telemetry", ignoreCase = true) || statusText.contains("Beacon", ignoreCase = true) ->
+            MaterialTheme.colorScheme.tertiaryContainer
+        statusText.contains("Not Heard", ignoreCase = true) ->
+            Color(0xFFDC267F)
+        else ->
+            MaterialTheme.colorScheme.error
+    }
+}
 
 @Composable
-fun SatStatusScreen(container: IMainContainer) {
-    val viewModel: SatStatusViewModel = viewModel(
-        factory = viewModelFactory {
-            initializer { SatStatusViewModel(container) }
-        }
-    )
+fun SatStatusDestination() {
+    val context = LocalContext.current
+    val container = (context.applicationContext as IContainerProvider).getMainContainer()
+    val viewModel: SatStatusViewModel = viewModel(factory = SatStatusViewModel.factory(container))
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-    var selectedDay by remember { mutableStateOf<Pair<SatStatus, SatDay>?>(null) }
+    SatStatusScreen(uiState) { viewModel.refresh() }
+}
 
-    Column(modifier = Modifier.fillMaxSize().padding(horizontal = 8.dp)) {
-        // 顶部: 图例 + 刷新
-        StatusHeader(
-            fetchedAtUtcMs = uiState.fetchedAtUtcMs,
-            isRefreshing = uiState.isRefreshing,
-            onRefresh = { viewModel.refresh() }
-        )
+@Composable
+private fun SatStatusScreen(uiState: SatStatusUiState, refresh: () -> Unit) {
+    var selectedDay by remember { mutableStateOf<Pair<SatStatus, SatDay>?>(null) }
+    Column(modifier = Modifier.fillMaxSize().layoutPadding()) {
+        StatusHeader(fetchedAtUtcMs = uiState.fetchedAtUtcMs, isRefreshing = uiState.isRefreshing, onRefresh = refresh)
         LegendRow()
 
         when {
@@ -88,24 +100,21 @@ fun SatStatusScreen(container: IMainContainer) {
                 }
             }
             uiState.error != null && uiState.statuses.isEmpty() -> {
-                Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-                    Text(
-                        text = stringResource(id = R.string.amsat_load_failed),
-                        color = MaterialTheme.colorScheme.error
-                    )
+                Column(
+                    modifier = Modifier.fillMaxSize(),
+                    verticalArrangement = Arrangement.Center,
+                    horizontalAlignment = Alignment.CenterHorizontally
+                ) {
+                    Text(text = stringResource(id = R.string.amsat_load_failed), color = MaterialTheme.colorScheme.error)
+                    TextButton(onClick = refresh) { Text(text = stringResource(id = R.string.amsat_retry)) }
                 }
             }
             else -> {
-                // 表头
                 HeaderRow(statuses = uiState.statuses)
                 HorizontalDivider(thickness = 1.dp)
-                // 行
                 LazyColumn(modifier = Modifier.fillMaxSize()) {
                     items(uiState.statuses, key = { it.name }) { status ->
-                        StatusRow(
-                            status = status,
-                            onClickDay = { day -> selectedDay = status to day }
-                        )
+                        StatusRow(status = status, onClickDay = { day -> selectedDay = status to day })
                     }
                 }
             }
@@ -113,231 +122,206 @@ fun SatStatusScreen(container: IMainContainer) {
     }
 
     selectedDay?.let { (status, day) ->
-        ReportDialog(
-            statusName = status.name,
-            day = day,
-            reports = uiState.reports,
-            onDismiss = { selectedDay = null }
-        )
+        ReportDialog(statusName = status.name, day = day, reports = uiState.reports, onDismiss = { selectedDay = null })
     }
 }
 
-/** 顶部: 更新时间 + 刷新按钮(加载中旋转动画) */
+/** Top: update time + refresh button (spinner while loading) */
 @Composable
-private fun StatusHeader(
-    fetchedAtUtcMs: Long,
-    isRefreshing: Boolean,
-    onRefresh: () -> Unit
-) {
-    val infiniteTransition = rememberInfiniteTransition(label = "refresh")
-    val angle by infiniteTransition.animateFloat(
-        initialValue = 0f,
-        targetValue = 360f,
-        animationSpec = infiniteRepeatable(tween(800), RepeatMode.Restart),
-        label = "angle"
-    )
+private fun StatusHeader(fetchedAtUtcMs: Long, isRefreshing: Boolean, onRefresh: () -> Unit) {
     Row(
-        modifier = Modifier.fillMaxWidth().padding(vertical = 6.dp),
+        modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
         Text(
-            text = if (fetchedAtUtcMs > 0) stringResource(id = R.string.amsat_updated) + " " + formatFetchedAt(fetchedAtUtcMs) else stringResource(id = R.string.amsat_title),
-            fontSize = 13.sp,
+            text = if (fetchedAtUtcMs > 0)
+                stringResource(id = R.string.amsat_updated) + " " + formatFetchedAt(fetchedAtUtcMs)
+            else
+                stringResource(id = R.string.amsat_title),
+            fontSize = 14.sp,
             color = MaterialTheme.colorScheme.onSurfaceVariant,
             modifier = Modifier.weight(1f)
         )
         Box(
             modifier = Modifier
-                .size(34.dp)
+                .size(32.dp)
                 .clip(CircleShape)
                 .background(MaterialTheme.colorScheme.surfaceVariant)
                 .clickable(onClick = onRefresh),
             contentAlignment = Alignment.Center
         ) {
             if (isRefreshing) {
-                CircularProgressIndicator(modifier = Modifier.size(18.dp), strokeWidth = 2.dp)
+                CircularProgressIndicator(modifier = Modifier.size(16.dp), strokeWidth = 2.dp)
             } else {
-                Text(
-                    text = "↻",
-                    fontSize = 20.sp,
-                    color = MaterialTheme.colorScheme.primary,
-                    modifier = Modifier.rotate(angle)
+                Image(
+                    painter = painterResource(id = R.drawable.ic_refresh),
+                    contentDescription = stringResource(id = R.string.amsat_refresh),
+                    modifier = Modifier.size(16.dp),
+                    colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary)
                 )
             }
         }
     }
 }
 
-/** 图例(官网四色) */
+/** Legend: FlowRow of colored chips — wraps to two lines on narrow screens, stays one line when wide. */
 @Composable
 private fun LegendRow() {
     val legend = listOf(
-        stringResource(id = R.string.amsat_active) to ActiveBlue,
-        stringResource(id = R.string.amsat_tlm) to TlmOrange,
-        stringResource(id = R.string.amsat_not_heard) to NotHeardPink,
-        stringResource(id = R.string.amsat_conflict) to ConflictDeepOrange
+        stringResource(id = R.string.amsat_active) to Color(0xFF648FFF),
+        stringResource(id = R.string.amsat_tlm) to Color(0xFFFFB000),
+        stringResource(id = R.string.amsat_not_heard) to Color(0xFFDC267F),
+        stringResource(id = R.string.amsat_conflict) to Color(0xFFFE6100)
     )
-    Row(
-        modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp),
-        horizontalArrangement = Arrangement.spacedBy(8.dp)
+    FlowRow(
+        modifier = Modifier.fillMaxWidth().padding(bottom = 6.dp),
+        horizontalArrangement = Arrangement.spacedBy(6.dp),
+        verticalArrangement = Arrangement.spacedBy(6.dp)
     ) {
         legend.forEach { (label, color) ->
-            Row(verticalAlignment = Alignment.CenterVertically) {
+            val alphaColor = color.copy(alpha = 0.25f)
+            Row(
+                modifier = Modifier
+                    .clip(RoundedCornerShape(32.dp))
+                    .background(alphaColor)
+                    .padding(horizontal = 12.dp, vertical = 4.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
                 Box(
                     modifier = Modifier
-                        .size(10.dp)
-                        .clip(RoundedCornerShape(2.dp))
+                        .size(8.dp)
+                        .clip(RoundedCornerShape(4.dp))
                         .background(color)
                 )
-                Spacer(modifier = Modifier.width(3.dp))
-                Text(text = label, fontSize = 10.sp, color = MaterialTheme.colorScheme.onSurfaceVariant)
+                Spacer(modifier = Modifier.width(6.dp))
+                Text(
+                    text = label,
+                    fontSize = 14.sp,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                )
             }
         }
     }
 }
 
-/** 表头: 卫星名 + 6 天日期 */
+/** Header: satellite name column + fixed-width date labels aligned to tiles. */
 @Composable
 private fun HeaderRow(statuses: List<SatStatus>) {
     val dates = statuses.firstOrNull()?.days?.map { it.dateLabel } ?: emptyList()
     Row(
-        modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp),
+        modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
         Text(
             text = stringResource(id = R.string.amsat_name),
-            fontSize = 11.sp,
-            fontWeight = FontWeight.Bold,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.Medium,
             color = MaterialTheme.colorScheme.primary,
-            modifier = Modifier.weight(1.4f).padding(start = 4.dp)
+            modifier = Modifier.weight(1f).padding(start = 4.dp)
         )
         dates.forEach { date ->
             Text(
                 text = date,
-                fontSize = 10.sp,
-                fontWeight = FontWeight.Bold,
+                fontSize = 12.sp,
+                fontWeight = FontWeight.Medium,
                 textAlign = TextAlign.Center,
                 color = MaterialTheme.colorScheme.primary,
-                modifier = Modifier.weight(1f)
+                modifier = Modifier.width(TILE_WIDTH)
             )
         }
     }
 }
 
-/** 卫星行: 名称 + 6 天色块(官网色 + 报告数) */
+/** Satellite row: name takes remaining width; day tiles are fixed-width (tablet-safe). */
 @Composable
 private fun StatusRow(status: SatStatus, onClickDay: (SatDay) -> Unit) {
+    val noReportGray = 0xFFC0C0C0L
     Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(vertical = 3.dp),
+        modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
         Text(
             text = status.name,
-            fontSize = 11.sp,
+            fontSize = 14.sp,
             maxLines = 1,
-            overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
-            modifier = Modifier.weight(1.4f).padding(start = 4.dp)
+            overflow = TextOverflow.Ellipsis,
+            modifier = Modifier.weight(1f).padding(end = 4.dp)
         )
         status.days.forEach { day ->
-            val slot = day.slots.firstOrNull { it.statusColor != NoReportGray.value.toInt().toLong() } ?: day.slots.first()
+            val slot = day.slots.firstOrNull { it.statusColor != noReportGray } ?: day.slots.first()
             DayCell(
                 slot = slot,
-                modifier = Modifier.weight(1f).padding(horizontal = 1.dp),
+                modifier = Modifier.width(TILE_WIDTH).padding(horizontal = 2.dp),
                 onClick = { onClickDay(day) }
             )
         }
     }
 }
 
-/** 单天色块: 取当天 12 槽中最新的有报告状态; 无报告则灰 */
+/** Day block: newest reported status among the day's 12 slots; gray when none. */
 @Composable
 private fun DayCell(slot: SatSlot, modifier: Modifier, onClick: () -> Unit) {
     val color = Color(slot.statusColor)
     Box(
         modifier = modifier
-            .height(26.dp)
+            .height(28.dp)
             .clip(RoundedCornerShape(4.dp))
             .background(color)
             .clickable(onClick = onClick),
         contentAlignment = Alignment.Center
     ) {
         if (slot.count > 0) {
-            Text(
-                text = slot.count.toString(),
-                fontSize = 11.sp,
-                fontWeight = FontWeight.Bold,
-                color = Color.White
-            )
+            Text(text = slot.count.toString(), fontSize = 13.sp, fontWeight = FontWeight.Bold, color = Color.White)
         }
     }
 }
 
-/** 报告详情弹窗(3 级: 呼号/日期/时间/网格) */
+/** Report detail dialog (callsign / date / time / grid) */
 @Composable
-private fun ReportDialog(
-    statusName: String,
-    day: SatDay,
-    reports: Map<String, SatReport>,
-    onDismiss: () -> Unit
-) {
-    val dayReports = day.slots.flatMap { it.reportIds }
-        .mapNotNull { reports[it] }
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(text = "$statusName · ${day.dateLabel}") },
-        text = {
-            if (dayReports.isEmpty()) {
-                Text(stringResource(id = R.string.amsat_no_reports))
-            } else {
-                LazyColumn(modifier = Modifier.height(320.dp)) {
-                    items(dayReports) { report ->
-                        Column(modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp)) {
-                            Row(verticalAlignment = Alignment.CenterVertically) {
-                                Box(
-                                    modifier = Modifier
-                                        .size(8.dp)
-                                        .clip(CircleShape)
-                                        .background(statusColorOf(report.statusText))
-                                )
-                                Spacer(modifier = Modifier.width(6.dp))
-                                Text(
-                                    text = report.statusText,
-                                    fontSize = 13.sp,
-                                    fontWeight = FontWeight.Bold
-                                )
-                            }
-                            Text(
-                                text = "${report.call}  ${report.dateUtc}  ${report.timeUtc}" +
-                                    if (report.grid.isNotBlank() && report.grid != "-") "  ${report.grid}" else "",
-                                fontSize = 12.sp,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+private fun ReportDialog(statusName: String, day: SatDay, reports: Map<String, SatReport>, onDismiss: () -> Unit) {
+    val dayReports = day.slots.flatMap { it.reportIds }.mapNotNull { reports[it] }
+    InfoDialog(title = "$statusName · ${day.dateLabel}", onDismiss = onDismiss, onAccept = onDismiss) {
+        if (dayReports.isEmpty()) {
+            Text(stringResource(id = R.string.amsat_no_reports))
+            Spacer(modifier = Modifier.height(8.dp))
+        } else {
+            LazyColumn(modifier = Modifier.heightIn(max = 480.dp)) {
+                items(dayReports) { report ->
+                    Column(modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp)) {
+                        Row(verticalAlignment = Alignment.CenterVertically) {
+                            Box(
+                                modifier = Modifier
+                                    .size(8.dp)
+                                    .clip(CircleShape)
+                                    .background(statusColorOf(report.statusText))
                             )
+                            Spacer(modifier = Modifier.width(6.dp))
+                            Text(text = report.statusText, fontSize = 14.sp, fontWeight = FontWeight.Bold)
                         }
-                        HorizontalDivider(thickness = 0.5.dp)
+                        Text(
+                            text = "${report.call}  ${report.dateUtc}  ${report.timeUtc}" +
+                                if (report.grid.isNotBlank() && report.grid != "-") "  ${report.grid}" else "",
+                            fontSize = 14.sp,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                        )
                     }
+                    HorizontalDivider(thickness = 0.5.dp)
                 }
             }
-        },
-        confirmButton = {
-            TextButton(onClick = onDismiss) { Text(stringResource(id = R.string.amsat_close)) }
         }
-    )
+    }
 }
 
-private fun statusColorOf(statusText: String): Color = when {
-    statusText.contains("Heard", ignoreCase = true) && !statusText.contains("Not", ignoreCase = true) -> ActiveBlue
-    statusText.contains("Telemetry", ignoreCase = true) || statusText.contains("Beacon", ignoreCase = true) -> TlmOrange
-    statusText.contains("Not Heard", ignoreCase = true) -> NotHeardPink
-    else -> ConflictDeepOrange
-}
+private val MONTH_ABBR = arrayOf("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec")
 
 private fun formatFetchedAt(utcMs: Long): String {
     val cal = Calendar.getInstance()
     cal.timeInMillis = utcMs
-    return "%02d-%02d %02d:%02d".format(
-        cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH),
-        cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE)
-    )
-}
+    val day = cal.get(Calendar.DAY_OF_MONTH)
+    val month = MONTH_ABBR[cal.get(Calendar.MONTH)]
+    val year = cal.get(Calendar.YEAR)
+    val hh = cal.get(Calendar.HOUR_OF_DAY).toString().padStart(2, '0')
+    val mm = cal.get(Calendar.MINUTE).toString().padStart(2, '0')
+    val ss = cal.get(Calendar.SECOND).toString().padStart(2, '0')
+    return "$day$month $year - $hh:$mm:$ss"
+}

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

@@ -2,8 +2,11 @@ package com.rtbishop.look4sat.feature.status
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.initializer
+import androidx.lifecycle.viewmodel.viewModelFactory
 import com.rtbishop.look4sat.core.domain.model.SatReport
 import com.rtbishop.look4sat.core.domain.model.SatStatus
+import com.rtbishop.look4sat.core.domain.repository.IAmSatRepository
 import com.rtbishop.look4sat.core.domain.repository.IMainContainer
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -20,7 +23,7 @@ data class SatStatusUiState(
 )
 
 class SatStatusViewModel(
-    private val container: IMainContainer
+    private val amSatRepo: IAmSatRepository
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(SatStatusUiState(isLoading = true))
@@ -34,7 +37,7 @@ class SatStatusViewModel(
         viewModelScope.launch {
             _uiState.update { it.copy(isLoading = true, error = null) }
             try {
-                val page = container.amSatRepo.fetchStatus()
+                val page = amSatRepo.fetchStatus()
                 if (page != null && page.statuses.isNotEmpty()) {
                     _uiState.update {
                         it.copy(
@@ -63,7 +66,7 @@ class SatStatusViewModel(
         _uiState.update { it.copy(isRefreshing = true, error = null) }
         viewModelScope.launch {
             try {
-                val page = container.amSatRepo.fetchStatus()
+                val page = amSatRepo.fetchStatus()
                 if (page != null && page.statuses.isNotEmpty()) {
                     _uiState.update {
                         it.copy(
@@ -81,4 +84,12 @@ class SatStatusViewModel(
             }
         }
     }
+
+    companion object {
+        fun factory(container: IMainContainer) = viewModelFactory {
+            initializer {
+                SatStatusViewModel(container.amSatRepo)
+            }
+        }
+    }
 }

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 #noinspection UnusedVersionCatalogEntry
-appVersionCode = "453"
+appVersionCode = "446"
 #noinspection UnusedVersionCatalogEntry
-appVersionName = "4.5.3"
+appVersionName = "4.4.6-ba7opf.1"
 #noinspection UnusedVersionCatalogEntry
 compileSdk = "37"
 #noinspection UnusedVersionCatalogEntry
@@ -11,11 +11,6 @@ minSdk = "24"
 jdkVersion = "21"
 #noinspection UnusedVersionCatalogEntry
 packageName = "com.rtbishop.look4sat"
-# Fork application ID: official app uses com.rtbishop.look4sat with a different
-# signing cert. Installing a fork with the same applicationId would conflict
-# with the official build (signature mismatch / cannot overwrite), so the fork
-# ships under its own applicationId suffix.
-applicationId = "com.rtbishop.look4sat.bg7nta"
 
 android-gradle-plugin = "9.3.1"
 
@@ -28,7 +23,7 @@ compose-activity = "1.13.0"
 compose-lifecycle = "2.11.0"
 compose-navigation3 = "1.1.5"
 
-google-ksp = "2.3.8"
+google-ksp = "2.3.10"
 
 kotlin = "2.4.10"
 kotlin-coroutines = "1.11.0"

settings.gradle.kts

@@ -26,7 +26,6 @@ include(
     ":feature:mutual",
     ":feature:passes",
     ":feature:radar",
-    ":feature:roaming",
     ":feature:satellites",
     ":feature:settings",
     ":feature:status"