Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added small tweaks to Sources, Components and strings
Arty Bishop2d3adfc6a644
diff --git a/.github/dependabot.yml b/.github/dependabot.ymlindex 5ace4600..c8ac7976 100644--- a/.github/dependabot.yml+++ b/.github/dependabot.yml@@ -4,3 +4,7 @@ updates:directory: "/"schedule:interval: "weekly"+ - package-ecosystem: "bundler"+ directory: "/"+ schedule:+ interval: "never"diff --git a/AGENTS.md b/AGENTS.mdindex 943bd754..b797b073 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -8,16 +8,15 @@ All assistant-specific files (`CLAUDE.md`, `.github/copilot-instructions.md`) po## Project OverviewLook4Sat is an open-source, fully offline Android satellite tracker and pass predictor. It tracks 9000+ active-satellites using TLE/OMM data from Celestrak/SatNOGS, calculates orbital positions via SGP4/SDP4 models, and displays-passes relative to the user's location. Features include polar radar visualization, SSTV image decoding, satellite-ground track mapping, and pass predictions up to 10 days ahead. No ads, no tracking, no network required after initial-data download.+satellites using Celestrak/SatNOGS orbital data, calculates positions via SGP4/SDP4, and predicts passes relative to+the user's location. Features include polar radar visualization, SSTV image decoding, and ground track mapping. No ads,+no tracking, no network required after initial data download.-## Architecture+## Architecture & Design**MVI (Model-View-Intent)** with unidirectional data flow:-- `State` data class → exposed via `StateFlow` from ViewModel-- `Action` sealed interface → user intents dispatched to ViewModel's `onAction()`+- `State` data class (named `<Feature>State`) exposed via `StateFlow` from ViewModel+- `Action` sealed interface (named `<Feature>Action`) dispatched to ViewModel's `onAction()`- Jetpack Compose UI observes state and recomposes reactively**Clean Architecture layers:**@@ -34,9 +33,11 @@ data download.| `feature:satellites` | Satellite list, filtering, selection || `feature:settings` | User preferences |-- `feature:*` modules depend only on `core:domain` + `core:presentation`. Features never depend on each other.+**Feature isolation:**+- `feature:*` modules depend only on `core:domain` and `core:presentation`.+- No feature-to-feature dependencies; cross-feature communication goes through core layers.-## Build & Run+## Build & Platform```shell# Debug build@@ -50,54 +51,55 @@ data download.```- **Min SDK**: 24 | **Target SDK**: 36 | **JDK**: 17-- **Gradle**: Uses version catalog (`gradle/libs.versions.toml`) + convention plugins in `build-logic/`+- **Gradle**: Version catalog in `gradle/libs.versions.toml` + convention plugins in `build-logic/`-## Key Libraries+## Tech Stack- **Compose** (BOM 2026.05.01) + Material3 Adaptive-- **Navigation3** (type-safe, uses `@Serializable` NavKeys)-- **Room** (KSP code generation) for local satellite/TLE storage-- **OkHttp** 5.x for TLE downloads+- **Navigation3**: Type-safe navigation with `@Serializable` nav keys+- **Room** (KSP code generation) for local satellite/orbital storage+- **OkHttp** 5.x for data downloads- **OSMDroid** for map rendering-- **Kotlin Serialization** for navigation args and data parsing+- **Kotlin Serialization** for navigation args and parsing- **Coroutines** + `StateFlow` for async/reactive patterns--## Conventions--- **Minimal dependencies**: Avoid adding libraries when a simple manual solution exists. Fewer deps = less maintenance.-- **DI**: Manual — ViewModels use companion `factory()` methods with `IMainContainer` interface.-- **Navigation**: Type-safe Compose Navigation3 with `@Serializable` data classes as nav keys.-- **State naming**: `<Feature>State` data class + `<Feature>Action` sealed interface per feature.-- **No feature-to-feature deps**: All cross-feature communication goes through core layers.-- **Localization**: 7 languages (en, es, ru, si, tr, uk, zh).+- **Localization**: 7 languages (en, es, ru, si, tr, uk, zh)## Data Formats & Migration-**TLE vs. OMM/CSV format:**--Look4Sat supports both TLE and OMM (Orbit Mean-Elements Message) formats for backward compatibility:--- **TLE format**: Traditional 3-line element format (deprecated). NORAD catalog numbers are 5-digit integers, which- are running out of space. Celestrak has signaled that TLE format will eventually be phased out.-- **OMM/CSV format**: The future standard. CSV files contain the same orbital parameters as TLE but use ISO 8601- timestamps and support larger NORAD IDs. Celestrak and SatNOGS already provide OMM data in CSV format.--**Current implementation:**-- `DataParser.kt` handles both `parseTLEStream()` and `parseCSVStream()` seamlessly-- TLE data is downloaded from configured sources and stored in Room database-- When downloading satellite data, the app automatically detects format and parses accordingly-- Both formats produce identical `OrbitalData` objects, ensuring transparent format switching--**Migration path:**-As NORAD catalog space becomes constrained, OMM/CSV will become the primary format. Look4Sat is already positioned-to handle this transition without code changes — existing users can continue using TLE files while new sources-transition to OMM/CSV automatically.--## Code Style--- Prefer **short, focused functions** — single responsibility, easy to read.-- **Exceptions**: Composable functions and math-heavy algorithms (SGP4/SDP4) may be longer.-- Strict code style — no dead code, no unused imports, consistent formatting.+Look4Sat supports both TLE and OMM (Orbit Mean-Elements Message) CSV formats:++- **TLE format**: Legacy 3-line element format limited by 5-digit NORAD IDs+- **OMM/CSV format**: Successor format with ISO 8601 timestamps and larger NORAD ID support+- New 5-digit NORAD IDs are exhausted; TLE is officially deprecated and OMM/CSV is the clear default+- `DataParser.kt` supports both via `parseTLEStream()` and `parseCSVStream()`+- Downloads auto-detect format; both produce identical `OrbitalData` objects+- Existing code already supports transparent source transition without feature changes+- Refresh orbital data weekly for accurate pass prediction (orbital decay)++## Engineering Heuristics (Lazy = Efficient)++- Treat "lazy" as efficient, not careless: the best code is the code never written.+- First understand the task and trace the real flow end-to-end, then climb this ladder:+ 1. Does this need to be built now? (YAGNI)+ 2. Does it already exist in this codebase? Reuse helpers/patterns before rewriting.+ 3. Does Kotlin/Java stdlib already solve it?+ 4. Does the Android/platform API already solve it?+ 5. Does an already-installed dependency solve it?+ 6. Can this be simpler (including one-liner simple)?+ 7. Only then: write the minimum code that works.+- Prefer deletion to addition, boring over clever, and the fewest touched files.+- Avoid new abstractions, dependencies, and boilerplate unless explicitly requested.+- Manual DI only: ViewModels use companion `factory()` methods with `IMainContainer`.+- Release builds use ProGuard: avoid reflection-heavy libraries unless explicitly approved.+- When two options are similar in size, choose the edge-case-correct one.+- If you keep a deliberate simplification (for example O(n^2) scan or global lock), leave a short comment with the ceiling and upgrade path.+- For complex asks, challenge scope when appropriate: "Do you need X, or does Y already cover it?"++## Bug-Fix Policy++- Fix root cause, not just the reported symptom.+- If touching a shared function, inspect callers and prefer one shared fix over per-caller patches.+- The smallest correct diff wins only after behavior is understood.## Roadmap@@ -105,12 +107,9 @@ transition to OMM/CSV automatically.## Gotchas-- Orbital math lives in `core:domain/predict/` — it's dense vector math (SGP4/SDP4). Tread carefully.-- TLE/OMM data must be refreshed weekly for accurate predictions (satellite orbits decay). TLE format is legacy and- will eventually be deprecated in favor of OMM/CSV as NORAD catalog numbers approach the 5-digit limit.+- Orbital math lives in `core:domain/predict/` — dense vector math (SGP4/SDP4). Tread carefully.- SSTV decoding in `feature:radar` is experimental; image quality depends on signal strength during satellite pass.-- `build-logic/convention/` contains all shared Gradle configuration — edit there, not in individual modules.-- ProGuard is enabled for release builds — don't add reflection-based libs or any other dependencies without asking.+- `build-logic/convention/` contains shared Gradle configuration — edit there, not in individual modules.## Copilot Working Mode: Code-Onlydiff --git a/core/data/src/main/java/com/rtbishop/look4sat/core/data/injection/MainContainer.kt b/core/data/src/main/java/com/rtbishop/look4sat/core/data/injection/MainContainer.ktindex a45e3481..75d7f7df 100644--- a/core/data/src/main/java/com/rtbishop/look4sat/core/data/injection/MainContainer.kt+++ b/core/data/src/main/java/com/rtbishop/look4sat/core/data/injection/MainContainer.kt@@ -135,6 +135,13 @@ class MainContainer(private val context: Context) : IMainContainer {return SensorsRepo(manager, displayManager)}+ override fun providePairedBluetoothDevices(): List<Pair<String, String>> = buildList {+ try {+ val manager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager+ manager.adapter?.bondedDevices?.forEach { add(Pair(it.name ?: "Unknown", it.address ?: "")) }+ } catch (_: SecurityException) {}+ }+private fun provideDatabaseRepo(): IDatabaseRepo {val dbDispatcher = Dispatchers.Defaultval dataParser = DataParser(dbDispatcher)diff --git a/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SelectionRepo.kt b/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SelectionRepo.ktindex 6836d264..757cccd9 100644--- a/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SelectionRepo.kt+++ b/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SelectionRepo.kt@@ -62,7 +62,7 @@ class SelectionRepo(override fun getCurrentTypes() = currentTypes.valueoverride fun getTypesList() = Sources.satelliteDataUrls.keys.sorted().toMutableList().apply {- removeAt(0)+ remove("All")}override suspend fun getEntriesFlow() = withContext(dispatcher) {diff --git a/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/repository/IMainContainer.kt b/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/repository/IMainContainer.ktindex a46bbaeb..34e3e8fa 100644--- a/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/repository/IMainContainer.kt+++ b/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/repository/IMainContainer.kt@@ -39,6 +39,7 @@ interface IMainContainer {fun provideRxRadioController(): IRadioControllerfun provideAudioCapture(): IAudioCapturefun provideSaveImage(): ISaveImage+ fun providePairedBluetoothDevices(): List<Pair<String, String>>}interface IContainerProvider {diff --git a/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/source/Sources.kt b/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/source/Sources.ktindex 17c91e34..4eb72da4 100644--- a/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/source/Sources.kt+++ b/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/source/Sources.kt@@ -46,6 +46,7 @@ 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(diff --git a/core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/Components.kt b/core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/Components.ktindex cb0a3b65..d95eaec3 100644--- a/core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/Components.kt+++ b/core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/Components.kt@@ -34,6 +34,7 @@ import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.statusBarsPaddingimport androidx.compose.foundation.layout.width+import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.ButtonDefaultsimport androidx.compose.material3.CardDefaultsimport androidx.compose.material3.CircularProgressIndicator@@ -357,7 +358,7 @@ private fun DialogShell(onDismissRequest = onDismissRequest,sheetState = sheetState,dragHandle = null,- shape = MaterialTheme.shapes.medium,+ shape = RoundedCornerShape(topStart = 24.dp, topEnd = 24.dp),scrimColor = Color.Black.copy(alpha = 0.64f)) {Column(diff --git a/core/presentation/src/main/res/values-es/strings.xml b/core/presentation/src/main/res/values-es/strings.xmlindex 1d9bd834..bf6d324d 100644--- a/core/presentation/src/main/res/values-es/strings.xml+++ b/core/presentation/src/main/res/values-es/strings.xml@@ -14,7 +14,7 @@<!-- Satellites screen --><string name="sat_type_hint">Tipo: %s</string>- <string name="sat_type_title">Seleccionar tipo de satélite</string>+ <string name="sat_type_title">Seleccionar tipos</string><string name="sat_search_hint">Id - Nombre</string><string name="sat_search_clear">Vaciar</string><string name="sat_clear_all">Vaciar todo</string>@@ -35,7 +35,7 @@<string name="pass_filter_aos_time">Ventana AOS</string><string name="pass_filter_invert_time">Invertir ventana AOS</string><string name="pass_filter_deep_space">DeepSpace (período >225min)</string>- <string name="pass_modes_title">Tipo de modulación</string>+ <string name="pass_modes_title">Seleccionar modos</string><string name="pass_elevation">Elevación: %.1f°</string><string name="pass_altitude">Altitud: %.0f km</string><string name="pass_empty_list_message">@@ -96,11 +96,11 @@<string name="prefs_loc_qth_title">QTH</string><string name="prefs_loc_qth_error">Ubicación QTH no válida</string><string name="prefs_loc_success">Ubicación actualizada con éxito</string>- <string name="prefs_station_title">Ajustar ubicaicón de la estación</string>- <string name="prefs_station_lat_text">Latitud de tu estación terrestre</string>- <string name="prefs_station_lon_text">Longitud de tu estación terrestre</string>- <string name="prefs_locator_title">Ajustes ubicación QTH</string>- <string name="prefs_locator_text">Ajustar posición de la estación con tu ubicación</string>+ <string name="prefs_station_title">Ubicación de la estación</string>+ <string name="prefs_station_lat_text">Latitud de estación</string>+ <string name="prefs_station_lon_text">Longitud de estación</string>+ <string name="prefs_locator_title">Localizador QTH</string>+ <string name="prefs_locator_text">Posición por localizador</string><string name="prefs_data_title">Datos satelitales</string><string name="prefs_data_entries">Satélites: %s</string>@@ -110,39 +110,52 @@<string name="prefs_data_clear">Vaciar</string><string name="prefs_data_clear_success">Datos eliminados con éxito</string><string name="prefs_data_update_success">Actualización completada con éxito</string>+ <string name="prefs_data_import_satellites_error">No se importaron satélites. Usa un TLE/3LE (.txt) u OMM (.csv) válido.</string>+ <string name="prefs_data_import_transceivers_error">No se importaron transceptores. Usa un SatNOGS (.json) válido.</string>- <string name="prefs_data_sources_title">Custom data sources</string>- <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>- <string name="prefs_data_sources_transceivers_switch">Custom transceivers URL</string>+ <string name="prefs_data_sources_title">Fuentes personalizadas</string>+ <string name="prefs_data_sources_tle_switch">URL TLE</string>+ <string name="prefs_data_sources_transceivers_switch">URL transceptores</string>+ <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>- <string name="prefs_data_output_title">Data output</string>- <string name="prefs_net_output">Network</string>+ <string name="prefs_data_output_title">Salida de datos</string>+ <string name="prefs_net_output">Red</string><string name="prefs_bt_output">Bluetooth</string>-- <string name="prefs_net_title">Salida de datos de red</string>- <string name="prefs_net_rotator_switch">Enable rotation output</string>+ <string name="prefs_cat_output">CAT</string>++ <string name="nav_radiocontrol">Control de radio</string>+ <string name="rc_settings_title">Control CAT</string>+ <string name="rc_radio_model">Modelo de radio</string>+ <string name="rc_tx_device_hint">Dirección BT TX</string>+ <string name="rc_rx_device_hint">Dirección BT RX</string>+ <string name="rc_tx_name_hint">Nombre radio TX</string>+ <string name="rc_rx_name_hint">Nombre radio RX</string>+ <string name="rc_enable_switch">Activar CAT</string>++ <string name="prefs_net_title">Salida de red</string>+ <string name="prefs_net_rotator_switch">Activar salida de rotación</string><string name="prefs_net_rotator_address_hint">IP:Puerto</string><string name="prefs_net_rotator_format_hint">Formato de datos</string>- <string name="prefs_net_frequency_switch">Enable frequency output</string>+ <string name="prefs_net_frequency_switch">Activar salida de frecuencia</string><string name="prefs_net_frequency_address_hint">IP:Puerto</string><string name="prefs_net_frequency_format_hint">Formato de datos</string>- <string name="prefs_bt_title">Salida por Bluetooth</string>- <string name="prefs_bt_rotator_switch">Enable rotation output</string>- <string name="prefs_bt_rotator_device_hint">Id dispositivo</string>- <string name="prefs_bt_rotator_output_hint">Formato de datos</string>- <string name="prefs_bt_frequency_switch">Enable frequency output</string>- <string name="prefs_bt_frequency_device_hint">Id dispositivo</string>- <string name="prefs_bt_frequency_output_hint">Formato de datos</string>+ <string name="prefs_bt_title">Salida Bluetooth</string>+ <string name="prefs_bt_rotator_switch">Activar salida de rotación</string>+ <string name="prefs_bt_rotator_device_hint">ID dispositivo</string>+ <string name="prefs_bt_rotator_output_hint">Formato</string>+ <string name="prefs_bt_frequency_switch">Activar salida de frecuencia</string>+ <string name="prefs_bt_frequency_device_hint">ID dispositivo</string>+ <string name="prefs_bt_frequency_output_hint">Formato</string><string name="prefs_bt_perm_error">Revisa los permisos de Bluetooth</string><string name="prefs_net_perm_error">Revisa los permisos de red</string>- <string name="prefs_other_title">Otros ajustes</string>- <string name="prefs_other_switch_utc">Mostrar tiempos de pase en UTC</string>- <string name="prefs_other_switch_update">Habilitar auto actualización de datos</string>- <string name="prefs_other_switch_sweep">Habilitar animaciones radar</string>- <string name="prefs_other_switch_sensors">Usar sensores para rotar vista de radar</string>- <string name="prefs_other_switch_night_mode">Activar filtro nocturno rojo</string>+ <string name="prefs_other_title">Otros</string>+ <string name="prefs_other_switch_utc">Mostrar hora UTC</string>+ <string name="prefs_other_switch_update">Actualización automática</string>+ <string name="prefs_other_switch_sweep">Animación de radar</string>+ <string name="prefs_other_switch_sensors">Sensores para radar</string>+ <string name="prefs_other_switch_night_mode">Filtro nocturno rojo</string><string name="prefs_highlight_title">Resaltado de elevación</string><string name="prefs_highlight_low">Baja < %1$d°</string>diff --git a/core/presentation/src/main/res/values-ru/strings.xml b/core/presentation/src/main/res/values-ru/strings.xmlindex 17031bf9..85a42f47 100644--- a/core/presentation/src/main/res/values-ru/strings.xml+++ b/core/presentation/src/main/res/values-ru/strings.xml@@ -14,7 +14,7 @@<!-- Satellites screen --><string name="sat_type_hint">Тип: %s</string>- <string name="sat_type_title">Выберите тип спутника</string>+ <string name="sat_type_title">Выберите типы</string><string name="sat_search_hint">Id - Название</string><string name="sat_search_clear">Очистить</string><string name="sat_clear_all">Очистить</string>@@ -34,7 +34,7 @@<string name="pass_filter_aos_time">Окно AOS</string><string name="pass_filter_invert_time">Инвертировать окно AOS</string><string name="pass_filter_deep_space">DeepSpace (период >225мин)</string>- <string name="pass_modes_title">Выберите тип модуляции</string>+ <string name="pass_modes_title">Выберите режимы</string><string name="pass_elevation">Элевация: %.1f°</string><string name="pass_altitude">Высота: %d км</string><string name="pass_empty_list_message">@@ -95,11 +95,11 @@<string name="prefs_loc_qth_title">QTH</string><string name="prefs_loc_qth_error">Неправильный локатор QTH</string><string name="prefs_loc_success">Позиция успешно обновлена</string>- <string name="prefs_station_title">Настройки местоположения</string>- <string name="prefs_station_lat_text">Введите широту наземной станции</string>- <string name="prefs_station_lon_text">Введите долготу наземной станции</string>- <string name="prefs_locator_title">Настройки локатора QTH</string>- <string name="prefs_locator_text">Введите позицию через локатор</string>+ <string name="prefs_station_title">Положение станции</string>+ <string name="prefs_station_lat_text">Широта станции</string>+ <string name="prefs_station_lon_text">Долгота станции</string>+ <string name="prefs_locator_title">Локатор QTH</string>+ <string name="prefs_locator_text">Позиция по локатору</string><string name="prefs_data_title">Данные спутников</string><string name="prefs_data_entries">Спутников: %s</string>@@ -109,16 +109,30 @@<string name="prefs_data_clear">Очистить</string><string name="prefs_data_clear_success">Очистка прошла успешно</string><string name="prefs_data_update_success">Обновление прошло успешно</string>+ <string name="prefs_data_import_satellites_error">Спутники не импортированы. Нужен TLE/3LE (.txt) или OMM (.csv).</string>+ <string name="prefs_data_import_transceivers_error">Трансиверы не импортированы. Нужен SatNOGS (.json).</string>- <string name="prefs_data_sources_title">Свои источники данных</string>- <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>- <string name="prefs_data_sources_transceivers_switch">Custom Transceivers URL</string>+ <string name="prefs_data_sources_title">Свои источники</string>+ <string name="prefs_data_sources_tle_switch">URL TLE</string>+ <string name="prefs_data_sources_transceivers_switch">URL трансиверов</string>+ <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>- <string name="prefs_data_output_title">Вывод данных</string>+ <string name="prefs_data_output_title">Вывод</string><string name="prefs_net_output">Сеть</string><string name="prefs_bt_output">Bluetooth</string>+ <string name="prefs_cat_output">CAT</string>- <string name="prefs_net_title">Вывод сетевых данных</string>+ <string name="nav_radiocontrol">Управление радио</string>++ <string name="rc_settings_title">CAT управление</string>+ <string name="rc_radio_model">Модель радио</string>+ <string name="rc_tx_device_hint">BT адрес TX</string>+ <string name="rc_rx_device_hint">BT адрес RX</string>+ <string name="rc_tx_name_hint">Имя радио TX</string>+ <string name="rc_rx_name_hint">Имя радио RX</string>+ <string name="rc_enable_switch">Включить CAT</string>++ <string name="prefs_net_title">Сетевой вывод</string><string name="prefs_net_rotator_switch">Включить вывод ротатора</string><string name="prefs_net_rotator_address_hint">IP:Порт</string><string name="prefs_net_rotator_format_hint">Формат</string>@@ -126,22 +140,22 @@<string name="prefs_net_frequency_address_hint">IP:Порт</string><string name="prefs_net_frequency_format_hint">Формат</string>- <string name="prefs_bt_title">Вывод данных Bluetooth</string>+ <string name="prefs_bt_title">Вывод Bluetooth</string><string name="prefs_bt_rotator_switch">Включить вывод ротатора</string>- <string name="prefs_bt_rotator_device_hint">Id устройства</string>+ <string name="prefs_bt_rotator_device_hint">ID устройства</string><string name="prefs_bt_rotator_output_hint">Формат</string><string name="prefs_bt_frequency_switch">Включить вывод частоты</string>- <string name="prefs_bt_frequency_device_hint">Id устройства</string>+ <string name="prefs_bt_frequency_device_hint">ID устройства</string><string name="prefs_bt_frequency_output_hint">Формат</string><string name="prefs_bt_perm_error">Нет разрешения использовать bluetooth</string><string name="prefs_net_perm_error">Нет разрешения использовать сеть</string>- <string name="prefs_other_title">Другие настройки</string>- <string name="prefs_other_switch_utc">Показывать время по UTC</string>- <string name="prefs_other_switch_update">Обновлять данные автоматически</string>- <string name="prefs_other_switch_sweep">Показывать анимацию радара</string>- <string name="prefs_other_switch_sensors">Использовать сенсоры устройства</string>- <string name="prefs_other_switch_night_mode">Включить красный ночной фильтр</string>+ <string name="prefs_other_title">Прочее</string>+ <string name="prefs_other_switch_utc">Время в UTC</string>+ <string name="prefs_other_switch_update">Автообновление данных</string>+ <string name="prefs_other_switch_sweep">Анимация радара</string>+ <string name="prefs_other_switch_sensors">Сенсоры для радара</string>+ <string name="prefs_other_switch_night_mode">Красный ночной фильтр</string><string name="prefs_highlight_title">Подсветка высоты</string><string name="prefs_highlight_low">Низко < %1$d°</string>diff --git a/core/presentation/src/main/res/values-si/strings.xml b/core/presentation/src/main/res/values-si/strings.xmlindex 44d1433b..0310dbb1 100644--- a/core/presentation/src/main/res/values-si/strings.xml+++ b/core/presentation/src/main/res/values-si/strings.xml@@ -14,7 +14,7 @@<!-- Satellites screen --><string name="sat_type_hint">වර්ගය: %s</string>- <string name="sat_type_title">චන්ද්රිකා ආකාරය තෝරන්න</string>+ <string name="sat_type_title">ආකාර තෝරන්න</string><string name="sat_search_hint">Id - නම</string><string name="sat_search_clear">පිරිසිදු ක°</string><string name="sat_clear_all">සියල්ල පිරිසිදු ක°</string>@@ -35,7 +35,7 @@<string name="pass_filter_aos_time">AOS කවුළුව</string><string name="pass_filter_invert_time">AOS කවුළුව ප්රතිවිරුද්ධ කරන්න</string><string name="pass_filter_deep_space">DeepSpace (කාලය >225min)</string>- <string name="pass_modes_title">මූර්ජන ආකාරය තෝරන්න</string>+ <string name="pass_modes_title">මූර්ජන තෝරන්න</string><string name="pass_elevation">උත්තෝලනය: %.1f°</string><string name="pass_altitude">උන්නතාශය: %d km</string><string name="pass_empty_list_message">@@ -96,11 +96,11 @@<string name="prefs_loc_qth_title">QTH</string><string name="prefs_loc_qth_error">QTH locator වලංගු නොවේ</string><string name="prefs_loc_success">පිහිටීම යාවත්කාලීනය සාර්ථකයි</string>- <string name="prefs_station_title">පොළෙහි පිහිටීම් පසුතල</string>- <string name="prefs_station_lat_text">ඔබගේ පොළෙහි අක්ෂාංශය සකසන්න</string>- <string name="prefs_station_lon_text">ඔබගේ පොළෙහි දේශාංශය සකසන්න</string>- <string name="prefs_locator_title">QTH locator පසුතල</string>- <string name="prefs_locator_text"> ඔබගේ locator භාවිතා කර පොළහි පිහිටීම සකසන්න</string>+ <string name="prefs_station_title">පොළ පිහිටීම</string>+ <string name="prefs_station_lat_text">පොළ අක්ෂාංශය</string>+ <string name="prefs_station_lon_text">පොළ දේශාංශය</string>+ <string name="prefs_locator_title">QTH locator</string>+ <string name="prefs_locator_text">locator මඟින් පොළ පිහිටීම සකසන්න</string><string name="prefs_data_title">චන්ද්රිකා දත්ත</string><string name="prefs_data_entries">චන්ද්රිකා: %s</string>@@ -110,39 +110,52 @@<string name="prefs_data_clear">පිරිසිදු ක°</string><string name="prefs_data_clear_success">දත්ත ඉවත් කිරීම සාර්ථකයි</string><string name="prefs_data_update_success">යාවත්කාලීනය සම්පූර්ණ කිරීම සාර්ථකයි</string>+ <string name="prefs_data_import_satellites_error">චන්ද්රිකා ආයාත නොවීය. වලංගු TLE/3LE (.txt) හෝ OMM (.csv) ගොනුවක් තෝරන්න.</string>+ <string name="prefs_data_import_transceivers_error">සම්ප්රේෂක ආයාත නොවීය. වලංගු SatNOGS (.json) ගොනුවක් තෝරන්න.</string>- <string name="prefs_data_sources_title">Custom data sources</string>- <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>- <string name="prefs_data_sources_transceivers_switch">Custom transceivers URL</string>+ <string name="prefs_data_sources_title">අභිරුචි මූලාශ්ර</string>+ <string name="prefs_data_sources_tle_switch">TLE URL</string>+ <string name="prefs_data_sources_transceivers_switch">Transceivers URL</string>+ <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>- <string name="prefs_data_output_title">Data output</string>- <string name="prefs_net_output">Network</string>+ <string name="prefs_data_output_title">දත්ත ප්රතිදානය</string>+ <string name="prefs_net_output">ජාලය</string><string name="prefs_bt_output">Bluetooth</string>+ <string name="prefs_cat_output">CAT</string>++ <string name="nav_radiocontrol">රේඩියෝ පාලනය</string>+ <string name="rc_settings_title">CAT පාලනය</string>+ <string name="rc_radio_model">රේඩියෝ මාදිලිය</string>+ <string name="rc_tx_device_hint">TX BT ලිපිනය</string>+ <string name="rc_rx_device_hint">RX BT ලිපිනය</string>+ <string name="rc_tx_name_hint">TX රේඩියෝ නම</string>+ <string name="rc_rx_name_hint">RX රේඩියෝ නම</string>+ <string name="rc_enable_switch">CAT සබල කරන්න</string><string name="prefs_net_title">ජාල ප්රතිදානය</string>- <string name="prefs_net_rotator_switch">Enable rotation output</string>+ <string name="prefs_net_rotator_switch">Rotation ප්රතිදානය සබල කරන්න</string><string name="prefs_net_rotator_address_hint">IP:Port</string>- <string name="prefs_net_rotator_format_hint">දත්ත අකාරය</string>- <string name="prefs_net_frequency_switch">Enable frequency output</string>+ <string name="prefs_net_rotator_format_hint">දත්ත ආකෘතිය</string>+ <string name="prefs_net_frequency_switch">Frequency ප්රතිදානය සබල කරන්න</string><string name="prefs_net_frequency_address_hint">IP:Port</string>- <string name="prefs_net_frequency_format_hint">දත්ත අකාරය</string>-- <string name="prefs_bt_title">Bluetooth දත්ත ප්රතිදානය</string>- <string name="prefs_bt_rotator_switch">Enable rotation output</string>- <string name="prefs_bt_rotator_device_hint">උපාංග id</string>- <string name="prefs_bt_rotator_output_hint">දත්ත අකාරය</string>- <string name="prefs_bt_frequency_switch">Enable frequency output</string>- <string name="prefs_bt_frequency_device_hint">උපාංග id</string>- <string name="prefs_bt_frequency_output_hint">දත්ත අකාරය</string>+ <string name="prefs_net_frequency_format_hint">දත්ත ආකෘතිය</string>++ <string name="prefs_bt_title">Bluetooth ප්රතිදානය</string>+ <string name="prefs_bt_rotator_switch">Rotation ප්රතිදානය සබල කරන්න</string>+ <string name="prefs_bt_rotator_device_hint">උපාංග ID</string>+ <string name="prefs_bt_rotator_output_hint">දත්ත ආකෘතිය</string>+ <string name="prefs_bt_frequency_switch">Frequency ප්රතිදානය සබල කරන්න</string>+ <string name="prefs_bt_frequency_device_hint">උපාංග ID</string>+ <string name="prefs_bt_frequency_output_hint">දත්ත ආකෘතිය</string><string name="prefs_bt_perm_error">Bluetooth අවසර පරික්ෂා ක°</string><string name="prefs_net_perm_error">Network අවසර පරික්ෂා කරන්න</string>- <string name="prefs_other_title">වෙනත් සැකසුම්</string>- <string name="prefs_other_switch_utc">පසුකර වේලාවන් UTC මගින්</string>- <string name="prefs_other_switch_update">ස්වයං දත්ත යාවත්කාලීනය</string>- <string name="prefs_other_switch_sweep">radar sweep සජීවිකරණය සබල කරන්න</string>- <string name="prefs_other_switch_sensors">Radar දර්ශනය කරකැවීමට සංවේදක භාවිතා කරන්න </string>- <string name="prefs_other_switch_night_mode">රතු රාත්රී පෙරහන සබල කරන්න</string>+ <string name="prefs_other_title">වෙනත්</string>+ <string name="prefs_other_switch_utc">UTC වේලාව පෙන්වන්න</string>+ <string name="prefs_other_switch_update">දත්ත ස්වයං යාවත්කාලීන</string>+ <string name="prefs_other_switch_sweep">Radar sweep සජීවිකරණය</string>+ <string name="prefs_other_switch_sensors">Radar සඳහා සංවේදක භාවිතා කරන්න</string>+ <string name="prefs_other_switch_night_mode">රතු රාත්රී පෙරහන</string><string name="prefs_highlight_title">උස් උද්දීපනය</string><string name="prefs_highlight_low">අඩු < %1$d°</string>diff --git a/core/presentation/src/main/res/values-tr/strings.xml b/core/presentation/src/main/res/values-tr/strings.xmlindex 7e65fb7b..4a0fec46 100644--- a/core/presentation/src/main/res/values-tr/strings.xml+++ b/core/presentation/src/main/res/values-tr/strings.xml@@ -15,7 +15,7 @@<!-- Satellites screen --><string name="sat_type_hint">Uydu türü: %s</string>- <string name="sat_type_title">Uydu türü seçin</string>+ <string name="sat_type_title">Türleri seçin</string><string name="sat_search_hint">Id - Ad</string><string name="sat_search_clear">Temizle</string><string name="sat_clear_all">Tümünü temizle</string>@@ -36,7 +36,7 @@<string name="pass_filter_invert_time">AOS aralığını tersine çevir</string><string name="pass_filter_deep_space">DeepSpace (periyot >225dk)</string><string name="pass_time_placeholder" translatable="false"> -- : -- : -- </string>- <string name="pass_modes_title">Modulasyon türü seçin</string>+ <string name="pass_modes_title">Modları seçin</string><string name="pass_satId" translatable="false">%05d</string><string name="pass_elevation">Yükseklik açısı: %.1f°</string><string name="pass_deep_space" translatable="false">DeepSpace</string>@@ -127,11 +127,11 @@<string name="prefs_loc_qth_title">QTH</string><string name="prefs_loc_qth_error">Geçersiz QTH konumlandırıcısı</string><string name="prefs_loc_success">Konum başarıyla güncellendi</string>- <string name="prefs_station_title">İstasyon konumu ayarları</string>- <string name="prefs_station_lat_text">Yer istasyonunuzun enlemini girin</string>- <string name="prefs_station_lon_text">Yer istasyonunuzun boylamını girin</string>- <string name="prefs_locator_title">QTH konumlandırıcı ayarları</string>- <string name="prefs_locator_text">İstasyon konumunu konumlandırıcı ile ayarlayın</string>+ <string name="prefs_station_title">İstasyon konumu</string>+ <string name="prefs_station_lat_text">İstasyon enlemi</string>+ <string name="prefs_station_lon_text">İstasyon boylamı</string>+ <string name="prefs_locator_title">QTH konumlandırıcı</string>+ <string name="prefs_locator_text">Konumu lokatörle ayarla</string><string name="prefs_data_title">Uydu verisi</string><string name="prefs_data_entries">Uydular: %s</string>@@ -141,28 +141,30 @@<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_import_satellites_error">Uydu içe aktarılmadı. Geçerli bir TLE/3LE (.txt) veya OMM (.csv) dosyası seçin.</string>+ <string name="prefs_data_import_transceivers_error">Transceiver içe aktarılmadı. Geçerli bir SatNOGS (.json) dosyası seçin.</string>- <string name="prefs_data_sources_title">Özel veri kaynakları</string>- <string name="prefs_data_sources_tle_switch">Özel TLE URL</string>- <string name="prefs_data_sources_transceivers_switch">Özel transceiver URL</string>+ <string name="prefs_data_sources_title">Özel kaynaklar</string>+ <string name="prefs_data_sources_tle_switch">TLE URL</string>+ <string name="prefs_data_sources_transceivers_switch">Transceiver URL</string><string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>- <string name="prefs_data_output_title">Veri aktarımı</string>+ <string name="prefs_data_output_title">Veri çıkışı</string><string name="prefs_net_output">Ağ</string><string name="prefs_bt_output">Bluetooth</string><string name="prefs_cat_output">CAT</string><!-- Radio Control --><string name="nav_radiocontrol">Radyo Kontrolü</string>- <string name="rc_settings_title">CAT Radyo Kontrolü</string>+ <string name="rc_settings_title">CAT kontrolü</string><string name="rc_radio_model">Radyo Modeli</string>- <string name="rc_tx_device_hint">TX Radyo BT Adresi</string>- <string name="rc_rx_device_hint">RX Radyo BT Adresi</string>+ <string name="rc_tx_device_hint">TX BT adresi</string>+ <string name="rc_rx_device_hint">RX BT adresi</string><string name="rc_tx_name_hint">TX Radyo Adı</string><string name="rc_rx_name_hint">RX Radyo Adı</string>- <string name="rc_enable_switch">CAT Kontrolünü Etkinleştir</string>+ <string name="rc_enable_switch">CAT\'i etkinleştir</string>- <string name="prefs_net_title">Ağ veri çıkışı</string>+ <string name="prefs_net_title">Ağ çıkışı</string><string name="prefs_net_rotator_switch">Döndürme çıkışını etkinleştir</string><string name="prefs_net_rotator_address_hint">IP:Port</string><string name="prefs_net_rotator_format_hint">Biçim</string>@@ -170,22 +172,22 @@<string name="prefs_net_frequency_address_hint">IP:Port</string><string name="prefs_net_frequency_format_hint">Biçim</string>- <string name="prefs_bt_title">Bluetooth veri çıkışı</string>+ <string name="prefs_bt_title">Bluetooth çıkışı</string><string name="prefs_bt_rotator_switch">Döndürme çıkışını etkinleştir</string><string name="prefs_bt_rotator_device_hint">Cihaz kimliği</string>- <string name="prefs_bt_rotator_output_hint">Veri biçimi</string>+ <string name="prefs_bt_rotator_output_hint">Biçim</string><string name="prefs_bt_frequency_switch">Frekans çıkışını etkinleştir</string><string name="prefs_bt_frequency_device_hint">Cihaz kimliği</string>- <string name="prefs_bt_frequency_output_hint">Veri biçimi</string>+ <string name="prefs_bt_frequency_output_hint">Biçim</string><string name="prefs_bt_perm_error">Bluetooth izninizi kontrol edin</string><string name="prefs_net_perm_error">Ağ izninizi kontrol edin</string>- <string name="prefs_other_title">Diğer ayarlar</string>- <string name="prefs_other_switch_utc">Geçiş saatini UTC olarak göster</string>- <string name="prefs_other_switch_update">Otomatik veri güncellemeyi etkinleştir</string>- <string name="prefs_other_switch_sweep">Radar taramasını etkinleştir</string>- <string name="prefs_other_switch_sensors">Radar görünümünü döndürmek için sensörleri kullan</string>- <string name="prefs_other_switch_night_mode">Kırmızı gece filtresini etkinleştir</string>+ <string name="prefs_other_title">Diğer</string>+ <string name="prefs_other_switch_utc">UTC saatini göster</string>+ <string name="prefs_other_switch_update">Veriyi otomatik güncelle</string>+ <string name="prefs_other_switch_sweep">Radar tarama animasyonu</string>+ <string name="prefs_other_switch_sensors">Radar için sensör kullan</string>+ <string name="prefs_other_switch_night_mode">Kırmızı gece filtresi</string><string name="prefs_highlight_title">Elevasyon vurgusu</string><string name="prefs_highlight_low">Düşük < %1$d°</string>diff --git a/core/presentation/src/main/res/values-uk/strings.xml b/core/presentation/src/main/res/values-uk/strings.xmlindex a6754918..cc6fb62c 100644--- a/core/presentation/src/main/res/values-uk/strings.xml+++ b/core/presentation/src/main/res/values-uk/strings.xml@@ -14,7 +14,7 @@<!-- Satellites screen --><string name="sat_type_hint">Тип: %s</string>- <string name="sat_type_title">Виберіть тип супутника</string>+ <string name="sat_type_title">Виберіть типи</string><string name="sat_search_hint">Id - Назва</string><string name="sat_search_clear">Очистити</string><string name="sat_clear_all">Очистити всі</string>@@ -35,7 +35,7 @@<string name="pass_filter_aos_time">Вікно AOS</string><string name="pass_filter_invert_time">Інвертувати вікно AOS</string><string name="pass_filter_deep_space">DeepSpace (період >225хв)</string>- <string name="pass_modes_title">Виберіть тип модуляції</string>+ <string name="pass_modes_title">Виберіть режими</string><string name="pass_elevation">Піднес.: %.1f°</string><string name="pass_altitude">Висота: %.0f км</string><string name="pass_empty_list_message">@@ -96,11 +96,11 @@<string name="prefs_loc_qth_title">QTH</string><string name="prefs_loc_qth_error">Некоректний локатор QTH</string><string name="prefs_loc_success">Позицію успішно оновлено</string>- <string name="prefs_station_title">Налаштування місцезнаходження станції</string>- <string name="prefs_station_lat_text">Широта місцезнаходження станції</string>- <string name="prefs_station_lon_text">Довгота місцезнаходження станції</string>- <string name="prefs_locator_title">Налаштування QTH локатора</string>- <string name="prefs_locator_text">Задати позицію за QTH локатором</string>+ <string name="prefs_station_title">Позиція станції</string>+ <string name="prefs_station_lat_text">Широта станції</string>+ <string name="prefs_station_lon_text">Довгота станції</string>+ <string name="prefs_locator_title">Локатор QTH</string>+ <string name="prefs_locator_text">Позиція за локатором</string><string name="prefs_data_title">Супутникові дані</string><string name="prefs_data_entries">Супутників: %s</string>@@ -110,39 +110,52 @@<string name="prefs_data_clear">Очистити</string><string name="prefs_data_clear_success">Дані успішно очищено</string><string name="prefs_data_update_success">Оновлення успішне</string>+ <string name="prefs_data_import_satellites_error">Супутники не імпортовано. Потрібен TLE/3LE (.txt) або OMM (.csv).</string>+ <string name="prefs_data_import_transceivers_error">Трансивери не імпортовано. Потрібен SatNOGS (.json).</string>- <string name="prefs_data_sources_title">Custom data sources</string>- <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>- <string name="prefs_data_sources_transceivers_switch">Custom transceivers URL</string>+ <string name="prefs_data_sources_title">Власні джерела</string>+ <string name="prefs_data_sources_tle_switch">URL TLE</string>+ <string name="prefs_data_sources_transceivers_switch">URL трансиверів</string>+ <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>- <string name="prefs_data_output_title">Data output</string>- <string name="prefs_net_output">Network</string>+ <string name="prefs_data_output_title">Вивід даних</string>+ <string name="prefs_net_output">Мережа</string><string name="prefs_bt_output">Bluetooth</string>-- <string name="prefs_net_title">Вивід мережевих даних</string>- <string name="prefs_net_rotator_switch">Enable rotation output</string>+ <string name="prefs_cat_output">CAT</string>++ <string name="nav_radiocontrol">Керування радіо</string>+ <string name="rc_settings_title">CAT керування</string>+ <string name="rc_radio_model">Модель радіо</string>+ <string name="rc_tx_device_hint">BT адреса TX</string>+ <string name="rc_rx_device_hint">BT адреса RX</string>+ <string name="rc_tx_name_hint">Назва радіо TX</string>+ <string name="rc_rx_name_hint">Назва радіо RX</string>+ <string name="rc_enable_switch">Увімкнути CAT</string>++ <string name="prefs_net_title">Мережевий вивід</string>+ <string name="prefs_net_rotator_switch">Увімкнути вивід повороту</string><string name="prefs_net_rotator_address_hint">IP:Порт</string><string name="prefs_net_rotator_format_hint">Формат даних</string>- <string name="prefs_net_frequency_switch">Enable frequency output</string>+ <string name="prefs_net_frequency_switch">Увімкнути вивід частоти</string><string name="prefs_net_frequency_address_hint">IP:Порт</string><string name="prefs_net_frequency_format_hint">Формат даних</string>- <string name="prefs_bt_title">Вивід даних Bluetooth</string>- <string name="prefs_bt_rotator_switch">Enable rotation output</string>- <string name="prefs_bt_rotator_device_hint">Id пристрою</string>+ <string name="prefs_bt_title">Вивід Bluetooth</string>+ <string name="prefs_bt_rotator_switch">Увімкнути вивід повороту</string>+ <string name="prefs_bt_rotator_device_hint">ID пристрою</string><string name="prefs_bt_rotator_output_hint">Формат даних</string>- <string name="prefs_bt_frequency_switch">Enable frequency output</string>- <string name="prefs_bt_frequency_device_hint">Id пристрою</string>+ <string name="prefs_bt_frequency_switch">Увімкнути вивід частоти</string>+ <string name="prefs_bt_frequency_device_hint">ID пристрою</string><string name="prefs_bt_frequency_output_hint">Формат даних</string><string name="prefs_bt_perm_error">Перевірте дозвіл Bluetooth</string><string name="prefs_net_perm_error">Перевірте дозвіл мережі</string>- <string name="prefs_other_title">Інші налаштування</string>- <string name="prefs_other_switch_utc">Показувати час в UTC</string>- <string name="prefs_other_switch_update">Автоматичне оновлення даних</string>- <string name="prefs_other_switch_sweep">Показувати анімацію радара</string>- <string name="prefs_other_switch_sensors">Використовувати сенсори пристрою</string>- <string name="prefs_other_switch_night_mode">Увімкнути червоний нічний фільтр</string>+ <string name="prefs_other_title">Інше</string>+ <string name="prefs_other_switch_utc">Час в UTC</string>+ <string name="prefs_other_switch_update">Автооновлення даних</string>+ <string name="prefs_other_switch_sweep">Анімація радара</string>+ <string name="prefs_other_switch_sensors">Сенсори для радара</string>+ <string name="prefs_other_switch_night_mode">Червоний нічний фільтр</string><string name="prefs_highlight_title">Підсвічування висоти</string><string name="prefs_highlight_low">Низько < %1$d°</string>diff --git a/core/presentation/src/main/res/values-zh/strings.xml b/core/presentation/src/main/res/values-zh/strings.xmlindex 50c0f6f5..d97b35aa 100644--- a/core/presentation/src/main/res/values-zh/strings.xml+++ b/core/presentation/src/main/res/values-zh/strings.xml@@ -14,7 +14,7 @@<!-- Satellites screen --><string name="sat_type_hint">类型:%s</string>- <string name="sat_type_title">选择卫星类型</string>+ <string name="sat_type_title">选择类型</string><string name="sat_search_hint">Id - 名称</string><string name="sat_search_clear">清空</string><string name="sat_clear_all">全部清空</string>@@ -30,7 +30,7 @@<string name="pass_filter_aos_time">AOS 时间段</string><string name="pass_filter_invert_time">反选 AOS 时间段</string><string name="pass_filter_deep_space">DeepSpace(周期 >225分钟)</string>- <string name="pass_modes_title">选择调制类型</string>+ <string name="pass_modes_title">选择模式</string><string name="pass_elevation">仰角:%.1f°</string><string name="pass_altitude">高度:%d km</string><string name="pass_empty_list_message">请确保您的过滤器设置正确,并且已选择卫星</string>@@ -88,11 +88,11 @@<string name="prefs_loc_qth_title">QTH 网格</string><string name="prefs_loc_qth_error">无效的 QTH 网格</string><string name="prefs_loc_success">位置更新成功</string>- <string name="prefs_station_title">站位设置</string>- <string name="prefs_station_lat_text">输入站位的纬度</string>- <string name="prefs_station_lon_text">输入站位的经度</string>- <string name="prefs_locator_title">QTH 网格</string>- <string name="prefs_locator_text">使用梅登黑德网格设置站位</string>+ <string name="prefs_station_title">站位</string>+ <string name="prefs_station_lat_text">站位纬度</string>+ <string name="prefs_station_lon_text">站位经度</string>+ <string name="prefs_locator_title">QTH 定位</string>+ <string name="prefs_locator_text">通过 QTH 设置站位</string><string name="prefs_data_title">卫星数据更新</string><string name="prefs_data_entries">卫星:%s</string>@@ -102,16 +102,29 @@<string name="prefs_data_clear">清空</string><string name="prefs_data_clear_success">数据清空成功</string><string name="prefs_data_update_success">更新成功</string>+ <string name="prefs_data_import_satellites_error">未导入卫星。请选择有效的 TLE/3LE (.txt) 或 OMM (.csv) 文件。</string>+ <string name="prefs_data_import_transceivers_error">未导入收发器。请选择有效的 SatNOGS (.json) 文件。</string>- <string name="prefs_data_sources_title">自定义数据源</string>- <string name="prefs_data_sources_tle_switch">自定义TLE URL</string>- <string name="prefs_data_sources_transceivers_switch">自定义收发器URL</string>+ <string name="prefs_data_sources_title">自定义源</string>+ <string name="prefs_data_sources_tle_switch">TLE URL</string>+ <string name="prefs_data_sources_transceivers_switch">收发器 URL</string>+ <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string><string name="prefs_data_output_title">数据输出</string><string name="prefs_net_output">网络</string><string name="prefs_bt_output">蓝牙</string>-- <string name="prefs_net_title">网络数据输出</string>+ <string name="prefs_cat_output">CAT</string>++ <string name="nav_radiocontrol">电台控制</string>+ <string name="rc_settings_title">CAT 控制</string>+ <string name="rc_radio_model">电台型号</string>+ <string name="rc_tx_device_hint">TX 电台蓝牙地址</string>+ <string name="rc_rx_device_hint">RX 电台蓝牙地址</string>+ <string name="rc_tx_name_hint">TX 电台名称</string>+ <string name="rc_rx_name_hint">RX 电台名称</string>+ <string name="rc_enable_switch">启用 CAT</string>++ <string name="prefs_net_title">网络输出</string><string name="prefs_net_rotator_switch">启用方位俯仰角输出</string><string name="prefs_net_rotator_address_hint">IP:端口</string><string name="prefs_net_rotator_format_hint">数据格式</string>@@ -119,7 +132,7 @@<string name="prefs_net_frequency_address_hint">IP:端口</string><string name="prefs_net_frequency_format_hint">数据格式</string>- <string name="prefs_bt_title">蓝牙数据输出</string>+ <string name="prefs_bt_title">蓝牙输出</string><string name="prefs_bt_rotator_switch">启用方位俯仰角输出</string><string name="prefs_bt_rotator_device_hint">蓝牙设备 ID</string><string name="prefs_bt_rotator_output_hint">数据格式</string>@@ -129,12 +142,12 @@<string name="prefs_bt_perm_error">请检查蓝牙权限</string><string name="prefs_net_perm_error">请检查网络权限</string>- <string name="prefs_other_title">其他设置</string>- <string name="prefs_other_switch_utc">以 UTC 时间显示</string>- <string name="prefs_other_switch_update">启用卫星数据自动更新</string>- <string name="prefs_other_switch_sweep">启用雷达扫描动画</string>- <string name="prefs_other_switch_sensors">使用传感器旋转雷达视图</string>- <string name="prefs_other_switch_night_mode">启用红色夜间模式</string>+ <string name="prefs_other_title">其他</string>+ <string name="prefs_other_switch_utc">UTC 时间</string>+ <string name="prefs_other_switch_update">自动更新数据</string>+ <string name="prefs_other_switch_sweep">雷达扫描动画</string>+ <string name="prefs_other_switch_sensors">传感器控制雷达</string>+ <string name="prefs_other_switch_night_mode">红色夜间模式</string><string name="prefs_highlight_title">仰角高亮</string><string name="prefs_highlight_low">低 < %1$d°</string>diff --git a/core/presentation/src/main/res/values/strings.xml b/core/presentation/src/main/res/values/strings.xmlindex 530545e5..380a7f71 100644--- a/core/presentation/src/main/res/values/strings.xml+++ b/core/presentation/src/main/res/values/strings.xml@@ -15,7 +15,7 @@<!-- Satellites screen --><string name="sat_type_hint">Type: %s</string>- <string name="sat_type_title">Select satellite type</string>+ <string name="sat_type_title">Select types</string><string name="sat_search_hint">Id - Name</string><string name="sat_search_clear">Clear</string><string name="sat_clear_all">Clear all</string>@@ -36,7 +36,7 @@<string name="pass_filter_invert_time">Invert AOS window</string><string name="pass_filter_deep_space">DeepSpace (period >225min)</string><string name="pass_time_placeholder" translatable="false"> -- : -- : -- </string>- <string name="pass_modes_title">Select modulation type</string>+ <string name="pass_modes_title">Select modes</string><string name="pass_satId" translatable="false">%05d</string><string name="pass_elevation">Elevation: %.1f°</string><string name="pass_deep_space" translatable="false">DeepSpace</string>@@ -124,11 +124,11 @@<string name="prefs_loc_qth_title">QTH</string><string name="prefs_loc_qth_error">Invalid QTH locator</string><string name="prefs_loc_success">Position updated successfully</string>- <string name="prefs_station_title">Station position settings</string>- <string name="prefs_station_lat_text">Set your ground station\'s latitude</string>- <string name="prefs_station_lon_text">Set your ground station\'s longitude</string>- <string name="prefs_locator_title">QTH locator settings</string>- <string name="prefs_locator_text">Set station\'s position using locator</string>+ <string name="prefs_station_title">Station position</string>+ <string name="prefs_station_lat_text">Station latitude</string>+ <string name="prefs_station_lon_text">Station longitude</string>+ <string name="prefs_locator_title">QTH locator</string>+ <string name="prefs_locator_text">Set position via locator</string><string name="prefs_data_title">Satellite data</string><string name="prefs_data_entries">Satellites: %s</string>@@ -141,9 +141,9 @@<string name="prefs_data_import_satellites_error">No satellites imported. Select a valid TLE/3LE (.txt) or OMM (.csv) file.</string><string name="prefs_data_import_transceivers_error">No transceivers imported. Select a valid SatNOGS (.json) file.</string>- <string name="prefs_data_sources_title">Custom data sources</string>- <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>- <string name="prefs_data_sources_transceivers_switch">Custom transceivers URL</string>+ <string name="prefs_data_sources_title">Custom sources</string>+ <string name="prefs_data_sources_tle_switch">TLE URL</string>+ <string name="prefs_data_sources_transceivers_switch">Transceivers URL</string><string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string><string name="prefs_data_output_title">Data output</string>@@ -153,15 +153,15 @@<!-- Radio Control --><string name="nav_radiocontrol">Radio Control</string>- <string name="rc_settings_title">CAT Radio Control</string>+ <string name="rc_settings_title">CAT control</string><string name="rc_radio_model">Radio Model</string>- <string name="rc_tx_device_hint">TX Radio BT Address</string>- <string name="rc_rx_device_hint">RX Radio BT Address</string>+ <string name="rc_tx_device_hint">TX BT address</string>+ <string name="rc_rx_device_hint">RX BT address</string><string name="rc_tx_name_hint">TX Radio Name</string><string name="rc_rx_name_hint">RX Radio Name</string>- <string name="rc_enable_switch">Enable CAT Control</string>+ <string name="rc_enable_switch">Enable CAT</string>- <string name="prefs_net_title">Network data output</string>+ <string name="prefs_net_title">Network output</string><string name="prefs_net_rotator_switch">Enable rotation output</string><string name="prefs_net_rotator_address_hint">IP:Port</string><string name="prefs_net_rotator_format_hint">Format</string>@@ -169,22 +169,22 @@<string name="prefs_net_frequency_address_hint">IP:Port</string><string name="prefs_net_frequency_format_hint">Format</string>- <string name="prefs_bt_title">Bluetooth data output</string>+ <string name="prefs_bt_title">Bluetooth output</string><string name="prefs_bt_rotator_switch">Enable rotation output</string>- <string name="prefs_bt_rotator_device_hint">Device id</string>- <string name="prefs_bt_rotator_output_hint">Data format</string>+ <string name="prefs_bt_rotator_device_hint">Device ID</string>+ <string name="prefs_bt_rotator_output_hint">Format</string><string name="prefs_bt_frequency_switch">Enable frequency output</string>- <string name="prefs_bt_frequency_device_hint">Device id</string>- <string name="prefs_bt_frequency_output_hint">Data format</string>+ <string name="prefs_bt_frequency_device_hint">Device ID</string>+ <string name="prefs_bt_frequency_output_hint">Format</string><string name="prefs_bt_perm_error">Check your bluetooth permission</string><string name="prefs_net_perm_error">Check your network permission</string>- <string name="prefs_other_title">Other settings</string>- <string name="prefs_other_switch_utc">Show pass time in UTC</string>- <string name="prefs_other_switch_update">Enable automatic data update</string>- <string name="prefs_other_switch_sweep">Enable radar sweep animation</string>- <string name="prefs_other_switch_sensors">Use sensors to rotate radar view</string>- <string name="prefs_other_switch_night_mode">Enable red night mode filter</string>+ <string name="prefs_other_title">Other</string>+ <string name="prefs_other_switch_utc">Show UTC time</string>+ <string name="prefs_other_switch_update">Auto-update data</string>+ <string name="prefs_other_switch_sweep">Radar sweep animation</string>+ <string name="prefs_other_switch_sensors">Use sensors for radar</string>+ <string name="prefs_other_switch_night_mode">Red night filter</string><string name="prefs_highlight_title">Elevation highlight</string><string name="prefs_highlight_low">Low < %1$d°</string>diff --git a/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesScreen.kt b/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesScreen.ktindex 6b9752e2..10a75a46 100644--- a/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesScreen.kt+++ b/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesScreen.kt@@ -30,6 +30,7 @@ import androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidth+import androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.width@@ -147,6 +148,7 @@ private fun PassesScreen(color = MaterialTheme.colorScheme.onSurface,modifier = Modifier.padding(horizontal = padding))+ Spacer(modifier = Modifier.height(0.dp))}}ScreenColumn(diff --git a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/TransceiversPage.kt b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/TransceiversPage.ktindex 41bab435..c47f20e1 100644--- a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/TransceiversPage.kt+++ b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/TransceiversPage.kt@@ -369,10 +369,11 @@ private fun ExpandedRadioControl()Spacer(modifier = Modifier.height(4.dp))FlowRow(- horizontalArrangement = Arrangement.spacedBy(4.dp),+ horizontalArrangement = Arrangement.spacedBy(2.dp),+ maxItemsInEachRow = 5,modifier = Modifier.fillMaxWidth()) {- val chipModifier = Modifier.width(64.dp)+ val chipModifier = Modifier.weight(1f)FilterChip(selected = radioControl.ctcssTone == null,onClick = { onAction(RadarAction.SetCtcssTone(null)) },diff --git a/feature/satellites/src/main/java/com/rtbishop/look4sat/feature/satellites/SatellitesScreen.kt b/feature/satellites/src/main/java/com/rtbishop/look4sat/feature/satellites/SatellitesScreen.ktindex 78e6bb5a..c487e3b4 100644--- a/feature/satellites/src/main/java/com/rtbishop/look4sat/feature/satellites/SatellitesScreen.kt+++ b/feature/satellites/src/main/java/com/rtbishop/look4sat/feature/satellites/SatellitesScreen.kt@@ -108,6 +108,7 @@ private fun SatellitesScreen(color = MaterialTheme.colorScheme.onSurface,modifier = Modifier.padding(horizontal = padding))+ Spacer(modifier = Modifier.height(0.dp))}}diff --git a/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsDialog.kt b/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsDialog.ktindex c0897b4d..42ca9169 100644--- a/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsDialog.kt+++ b/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsDialog.kt@@ -17,12 +17,9 @@*/package com.rtbishop.look4sat.feature.settings-import android.bluetooth.BluetoothManager-import android.content.Contextimport androidx.compose.foundation.clickableimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Column-import androidx.compose.foundation.layout.ExperimentalLayoutApiimport androidx.compose.foundation.layout.FlowRowimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.Spacer@@ -30,18 +27,19 @@ import androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.paddingimport androidx.compose.material3.FilterChip+import androidx.compose.material3.MaterialThemeimport androidx.compose.material3.OutlinedTextFieldimport androidx.compose.material3.Switchimport androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.runtime.mutableIntStateOfimport androidx.compose.runtime.mutableStateOf-import androidx.compose.runtime.rememberimport androidx.compose.runtime.saveable.rememberSaveableimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.font.FontWeight+import androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.tooling.preview.Previewimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.sp@@ -66,18 +64,27 @@ fun PositionDialog(lat: Double, lon: Double, dismiss: () -> Unit, save: (Double,val titleText = stringResource(id = R.string.prefs_station_title)val onAccept = { saveValues(latValue.value, lonValue.value, save).also { dismiss() } }SharedDialog(title = titleText, onCancel = dismiss, onAccept = onAccept) {- OutlinedTextField(- value = latValue.value,- onValueChange = { latValue.value = it },- label = { Text(text = stringResource(id = R.string.prefs_station_lat_text)) },- modifier = Modifier.fillMaxWidth().padding(horizontal = LocalSpacing.current.large),- )- OutlinedTextField(- value = lonValue.value,- onValueChange = { lonValue.value = it },- label = { Text(text = stringResource(id = R.string.prefs_station_lon_text)) },- modifier = Modifier.fillMaxWidth().padding(horizontal = LocalSpacing.current.large),- )+ Row(+ horizontalArrangement = Arrangement.spacedBy(6.dp),+ modifier = Modifier+ .fillMaxWidth()+ .padding(horizontal = LocalSpacing.current.large)+ ) {+ OutlinedTextField(+ value = latValue.value,+ onValueChange = { latValue.value = it },+ label = { Text(text = stringResource(id = R.string.prefs_station_lat_text)) },+ singleLine = true,+ modifier = Modifier.weight(1f),+ )+ OutlinedTextField(+ value = lonValue.value,+ onValueChange = { lonValue.value = it },+ label = { Text(text = stringResource(id = R.string.prefs_station_lon_text)) },+ singleLine = true,+ modifier = Modifier.weight(1f),+ )+ }Spacer(modifier = Modifier.height(0.dp))}}@@ -100,12 +107,18 @@ private fun LocatorDialogPreview() {fun LocatorDialog(qthLocator: String, dismiss: () -> Unit, save: (String) -> Unit) {val locator = rememberSaveable { mutableStateOf(qthLocator) }val onAccept = { save(locator.value).also { dismiss() } }- SharedDialog(title = stringResource(R.string.prefs_locator_title), onCancel = dismiss, onAccept = onAccept) {+ SharedDialog(+ title = stringResource(R.string.prefs_locator_title),+ onCancel = dismiss,+ onAccept = onAccept+ ) {OutlinedTextField(value = locator.value,onValueChange = { locator.value = it },label = { Text(text = stringResource(id = R.string.prefs_locator_text)) },- modifier = Modifier.fillMaxWidth().padding(horizontal = LocalSpacing.current.large),+ modifier = Modifier+ .fillMaxWidth()+ .padding(horizontal = LocalSpacing.current.large),)Spacer(modifier = Modifier.height(0.dp))}@@ -147,7 +160,12 @@ fun DataSourcesDialog(val urlTle = rememberSaveable { mutableStateOf(tleUrl) }val urlTransceivers = rememberSaveable { mutableStateOf(transceiversUrl) }val onAccept = {- onSave(isEnabledCustomTle.value, isEnabledCustomTransceivers.value, urlTle.value, urlTransceivers.value)+ onSave(+ isEnabledCustomTle.value,+ isEnabledCustomTransceivers.value,+ urlTle.value,+ urlTransceivers.value+ )onDismiss()}val onCancel = { onDismiss() }@@ -377,11 +395,15 @@ fun BluetoothOutputDialog() {val padding = LocalSpacing.current.largeval rotatorState = rememberSaveable { mutableStateOf(initialSettings.bluetoothRotatorState) }- val rotatorAddress = rememberSaveable { mutableStateOf(initialSettings.bluetoothRotatorAddress) }+ val rotatorAddress =+ rememberSaveable { mutableStateOf(initialSettings.bluetoothRotatorAddress) }val rotatorFormat = rememberSaveable { mutableStateOf(initialSettings.bluetoothRotatorFormat) }- val frequencyState = rememberSaveable { mutableStateOf(initialSettings.bluetoothFrequencyState) }- val frequencyAddress = rememberSaveable { mutableStateOf(initialSettings.bluetoothFrequencyAddress) }- val frequencyFormat = rememberSaveable { mutableStateOf(initialSettings.bluetoothFrequencyFormat) }+ val frequencyState =+ rememberSaveable { mutableStateOf(initialSettings.bluetoothFrequencyState) }+ val frequencyAddress =+ rememberSaveable { mutableStateOf(initialSettings.bluetoothFrequencyAddress) }+ val frequencyFormat =+ rememberSaveable { mutableStateOf(initialSettings.bluetoothFrequencyFormat) }val onAccept = {onSave(rotatorState.value, rotatorAddress.value, rotatorFormat.value,@@ -470,23 +492,22 @@ private fun OutputChannelSection(}}-@OptIn(ExperimentalLayoutApi::class)@Composablefun RadioControlDialog(initialSettings: RadioControlSettings,+ pairedBluetoothDevices: List<Pair<String, String>>,onDismiss: () -> Unit,onSave: (RadioControlSettings) -> Unit) {- val context = androidx.compose.ui.platform.LocalContext.current- val padding = LocalSpacing.current.large- val enabled = rememberSaveable { mutableStateOf(initialSettings.enabled) }+ val padding = LocalSpacing.current.large+ val enabled = rememberSaveable { mutableStateOf(initialSettings.enabled) }val radioModel = rememberSaveable { mutableStateOf(initialSettings.radioModel) }- val splitMode = rememberSaveable { mutableStateOf(initialSettings.splitMode) }- val txAddress = rememberSaveable { mutableStateOf(initialSettings.txRadioAddress) }- val rxAddress = rememberSaveable { mutableStateOf(initialSettings.rxRadioAddress) }- val txName = rememberSaveable { mutableStateOf(initialSettings.txRadioName) }- val rxName = rememberSaveable { mutableStateOf(initialSettings.rxRadioName) }- val baudRate = rememberSaveable { mutableIntStateOf(initialSettings.baudRate) }+ val splitMode = rememberSaveable { mutableStateOf(initialSettings.splitMode) }+ val txAddress = rememberSaveable { mutableStateOf(initialSettings.txRadioAddress) }+ val rxAddress = rememberSaveable { mutableStateOf(initialSettings.rxRadioAddress) }+ val txName = rememberSaveable { mutableStateOf(initialSettings.txRadioName) }+ val rxName = rememberSaveable { mutableStateOf(initialSettings.rxRadioName) }+ val baudRate = rememberSaveable { mutableIntStateOf(initialSettings.baudRate) }val selectingFor = rememberSaveable { mutableStateOf("") } // "tx", "rx", or ""val isIcom = radioModel.value == RadioControlSettings.MODEL_ICOM_IC705@@ -496,157 +517,157 @@ fun RadioControlDialog(if (!isIcom && splitMode.value) splitMode.value = falseval baudRates = if (isIcom) RadioControlSettings.BAUD_RATES_ICOM- else RadioControlSettings.BAUD_RATES_YAESU+ else RadioControlSettings.BAUD_RATES_YAESU// If current baud rate is not in the new list, default to the first availableif (baudRate.intValue !in baudRates) baudRate.intValue = baudRates.first()- val pairedDevices: List<Pair<String, String>> = remember {- buildList {- try {- val manager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager- manager.adapter?.bondedDevices?.forEach {- add(Pair(it.name ?: "Unknown", it.address ?: ""))- }- } catch (_: SecurityException) { }- }- }-val onAccept = {onSave(RadioControlSettings(- enabled = enabled.value,- radioModel = radioModel.value,+ enabled = enabled.value,+ radioModel = radioModel.value,txRadioAddress = txAddress.value,rxRadioAddress = if (isSingleRadio) "" else rxAddress.value,- txRadioName = txName.value,- rxRadioName = if (isSingleRadio) "" else rxName.value,- baudRate = baudRate.intValue,- splitMode = splitMode.value+ txRadioName = txName.value,+ rxRadioName = if (isSingleRadio) "" else rxName.value,+ baudRate = baudRate.intValue,+ splitMode = splitMode.value))onDismiss()}SharedDialog(- title = stringResource(R.string.rc_settings_title),+ title = stringResource(R.string.rc_settings_title),onCancel = onDismiss,onAccept = onAccept) {Column(modifier = Modifier.padding(horizontal = padding)) {- // Enable switchRow(horizontalArrangement = Arrangement.SpaceBetween,- verticalAlignment = Alignment.CenterVertically,- modifier = Modifier.fillMaxWidth()+ verticalAlignment = Alignment.CenterVertically,+ modifier = Modifier.fillMaxWidth()) {Text(stringResource(R.string.rc_enable_switch))Switch(checked = enabled.value, onCheckedChange = { enabled.value = it })}Spacer(modifier = Modifier.height(6.dp))- // Radio model — FlowRow so chips wrap on small screensText(- text = stringResource(R.string.rc_radio_model),+ text = stringResource(R.string.rc_radio_model),fontWeight = FontWeight.Medium,- color = androidx.compose.material3.MaterialTheme.colorScheme.primary+ color = MaterialTheme.colorScheme.primary)- FlowRow(horizontalArrangement = Arrangement.spacedBy(4.dp)) {+ Row(+ horizontalArrangement = Arrangement.spacedBy(2.dp),+ modifier = Modifier.fillMaxWidth()+ ) {RadioControlSettings.SUPPORTED_RADIOS.forEach { model ->FilterChip(selected = radioModel.value == model,- onClick = { radioModel.value = model },- label = { Text(model, fontSize = 12.sp) },- enabled = enabled.value+ onClick = { radioModel.value = model },+ label = {+ Text(+ text = compactRadioModelLabel(model),+ fontSize = 12.sp,+ textAlign = TextAlign.Center,+ modifier = Modifier.fillMaxWidth()+ )+ },+ enabled = enabled.value,+ modifier = Modifier.weight(1f))}}Spacer(modifier = Modifier.height(6.dp))- // IC-705 split-mode toggle (only shown for IC-705)- if (isIcom) {- Row(- horizontalArrangement = Arrangement.SpaceBetween,- verticalAlignment = Alignment.CenterVertically,- modifier = Modifier.fillMaxWidth()- ) {- Column(modifier = Modifier.weight(1f)) {- Text("Split mode (single radio)", fontWeight = FontWeight.Medium)- Text(- text = "Use VFO-A/B split on one IC-705 instead of two radios",- fontSize = 12.sp,- color = androidx.compose.material3.MaterialTheme.colorScheme.onSurfaceVariant- )- }- Switch(- checked = splitMode.value,- onCheckedChange = { splitMode.value = it },- enabled = enabled.value- )- }- Spacer(modifier = Modifier.height(6.dp))+ val isSplitModeAvailable = enabled.value && isIcom+ val splitModeLabelColor = if (isSplitModeAvailable) {+ MaterialTheme.colorScheme.onSurface+ } else {+ MaterialTheme.colorScheme.onSurface.copy(alpha = 0.56f)}-- // TX Radio (always shown; in split mode this is the single IC-705)- val txLabel = if (isSingleRadio) "Radio (IC-705)" else "TX Radio (Uplink)"- Text(txLabel, fontWeight = FontWeight.Medium)- if (txAddress.value.isNotBlank()) {- Text("${txName.value} — ${txAddress.value}", fontSize = 13.sp)- }- CardButton(- onClick = { selectingFor.value = "tx" },- text = if (isSingleRadio) "Select Device" else "Select TX Device",+ Row(+ horizontalArrangement = Arrangement.SpaceBetween,+ verticalAlignment = Alignment.CenterVertically,modifier = Modifier.fillMaxWidth()- )+ ) {+ Text(+ text = "Split mode (IC-705 only)",+ fontWeight = FontWeight.Medium,+ color = splitModeLabelColor+ )+ Switch(+ checked = splitMode.value,+ onCheckedChange = { splitMode.value = it },+ enabled = isSplitModeAvailable+ )+ }Spacer(modifier = Modifier.height(6.dp))- // RX Radio (hidden in split mode — the same radio handles both)- if (!isSingleRadio) {- Text("RX Radio (Downlink)", fontWeight = FontWeight.Medium)- if (rxAddress.value.isNotBlank()) {- Text("${rxName.value} — ${rxAddress.value}", fontSize = 13.sp)- }+ Text("Radio devices", fontWeight = FontWeight.Medium)+ Row(+ horizontalArrangement = Arrangement.spacedBy(6.dp),+ modifier = Modifier.fillMaxWidth()+ ) {CardButton(- onClick = { selectingFor.value = "rx" },- text = "Select RX Device",- modifier = Modifier.fillMaxWidth()+ onClick = { selectingFor.value = "tx" },+ text = if (isSingleRadio) "Select Radio" else "Select TX",+ modifier = Modifier.weight(1f))- Spacer(modifier = Modifier.height(6.dp))+ CardButton(+ onClick = { if (!isSingleRadio) selectingFor.value = "rx" },+ text = if (isSingleRadio) "RX = TX" else "Select RX",+ modifier = Modifier.weight(1f)+ )+ }+ if (txAddress.value.isNotBlank()) {+ Text("TX: ${txName.value} — ${txAddress.value}", fontSize = 13.sp)+ }+ if (isSingleRadio && txAddress.value.isNotBlank()) {+ Text("RX: same as TX", fontSize = 13.sp)+ } else if (rxAddress.value.isNotBlank()) {+ Text("RX: ${rxName.value} — ${rxAddress.value}", fontSize = 13.sp)}+ Spacer(modifier = Modifier.height(6.dp))- // Paired device picker (inline, shown while selecting)if (selectingFor.value.isNotBlank()) {Text(- text = "Paired Bluetooth Devices:",+ text = "Paired Bluetooth Devices:",fontWeight = FontWeight.Medium,- color = androidx.compose.material3.MaterialTheme.colorScheme.primary+ color = MaterialTheme.colorScheme.primary)Spacer(modifier = Modifier.height(2.dp))- if (pairedDevices.isEmpty()) {+ if (pairedBluetoothDevices.isEmpty()) {Text("No paired devices found. Pair your BT adapter in Android Bluetooth settings first.",fontSize = 13.sp)} else {- pairedDevices.forEach { (name, address) ->+ pairedBluetoothDevices.forEach { (name, address) ->androidx.compose.material3.Surface(modifier = Modifier.fillMaxWidth().clickable {if (selectingFor.value == "tx") {txAddress.value = address- txName.value = name+ txName.value = name+ if (isSingleRadio) {+ rxAddress.value = address+ rxName.value = name+ }} else {rxAddress.value = address- rxName.value = name+ rxName.value = name}selectingFor.value = ""}.padding(vertical = 4.dp)) {Row(- modifier = Modifier.fillMaxWidth(),+ modifier = Modifier.fillMaxWidth(),horizontalArrangement = Arrangement.SpaceBetween) {Text(name, modifier = Modifier.weight(1f))@@ -658,15 +679,26 @@ fun RadioControlDialog(Spacer(modifier = Modifier.height(6.dp))}- // Baud rate — FlowRow so all chips fit on narrow screensText("Baud Rate:", fontWeight = FontWeight.Medium)- FlowRow(horizontalArrangement = Arrangement.spacedBy(4.dp)) {+ FlowRow(+ horizontalArrangement = Arrangement.spacedBy(2.dp),+ maxItemsInEachRow = 6,+ modifier = Modifier.fillMaxWidth()+ ) {baudRates.forEach { rate ->FilterChip(selected = rate == baudRate.intValue,- onClick = { baudRate.intValue = rate },- label = { Text(rate.toString(), fontSize = 12.sp) },- enabled = enabled.value+ onClick = { baudRate.intValue = rate },+ label = {+ Text(+ text = baudLabel(rate),+ fontSize = 12.sp,+ textAlign = TextAlign.Center,+ modifier = Modifier.fillMaxWidth()+ )+ },+ enabled = enabled.value,+ modifier = Modifier.weight(1f))}}@@ -674,3 +706,20 @@ fun RadioControlDialog(}}}++private fun compactRadioModelLabel(model: String): String = when (model) {+ RadioControlSettings.MODEL_YAESU_FT817 -> "FT-817/818"+ RadioControlSettings.MODEL_YAESU_FT857 -> "FT-857/897"+ RadioControlSettings.MODEL_ICOM_IC705 -> "IC-705"+ else -> model+}++private fun baudLabel(rate: Int): String = when (rate) {+ 4800 -> "4k"+ 9600 -> "9k"+ 19200 -> "19k"+ 38400 -> "38k"+ 57600 -> "57k"+ 115200 -> "115k"+ else -> rate.toString()+}diff --git a/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsScreen.kt b/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsScreen.ktindex e4c9e2b0..9170aa04 100644--- a/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsScreen.kt+++ b/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsScreen.kt@@ -190,6 +190,7 @@ private fun SettingsScreen(uiState: SettingsState, onAction: (SettingsAction) ->if (dialogs.radioControl) {RadioControlDialog(initialSettings = uiState.radioControlSettings,+ pairedBluetoothDevices = uiState.pairedBluetoothDevices,onDismiss = { dialogs.radioControl = false },onSave = { onAction(SettingsAction.UpdateRadioControl(it)) })diff --git a/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsState.kt b/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsState.ktindex 928cf60b..d5c66f5e 100644--- a/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsState.kt+++ b/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsState.kt@@ -41,7 +41,8 @@ data class SettingsState(val otherSettings: OtherSettings,val rcSettings: RCSettings,val radioControlSettings: RadioControlSettings,- val dataSourcesSettings: DataSourcesSettings+ val dataSourcesSettings: DataSourcesSettings,+ val pairedBluetoothDevices: List<Pair<String, String>> = emptyList())sealed interface SettingsAction {diff --git a/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsViewModel.kt b/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsViewModel.ktindex f43e91f6..33a5a5b1 100644--- a/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsViewModel.kt+++ b/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsViewModel.kt@@ -32,6 +32,7 @@ import kotlinx.coroutines.flow.updateimport kotlinx.coroutines.launchclass SettingsViewModel(+ private val container: IMainContainer,private val databaseRepo: IDatabaseRepo,private val settingsRepo: ISettingsRepo,private val showToast: IShowToast@@ -47,7 +48,8 @@ class SettingsViewModel(otherSettings = settingsRepo.otherSettings.value,rcSettings = settingsRepo.rcSettings.value,radioControlSettings = settingsRepo.radioControlSettings.value,- dataSourcesSettings = settingsRepo.dataSourcesSettings.value+ dataSourcesSettings = settingsRepo.dataSourcesSettings.value,+ pairedBluetoothDevices = container.providePairedBluetoothDevices()))@@ -204,6 +206,7 @@ class SettingsViewModel(fun factory(container: IMainContainer) = viewModelFactory {initializer {SettingsViewModel(+ container = container,databaseRepo = container.databaseRepo,settingsRepo = container.settingsRepo,showToast = container.provideShowToast()