diff --git a/core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/ProjectWiki.kt b/core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/ProjectWiki.kt new file mode 100644 index 00000000..de5f213b --- /dev/null +++ b/core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/ProjectWiki.kt @@ -0,0 +1,82 @@ +/* + * 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 . + */ +package com.rtbishop.look4sat.core.presentation + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +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 + +/** + * The fork's Project Wiki: a short overview of what Look4Sat-BA7OPF adds over upstream + * and how to use those features. Shown in the What's-New card (first launch after an + * update) and behind the Settings → Project Wiki entry. Text lives in string resources, + * so it always renders even when the GitHub page is unreachable. + */ +@Composable +fun ProjectWikiBody(modifier: Modifier = Modifier) { + Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(8.dp)) { + Text( + text = stringResource(R.string.project_wiki_intro), + fontSize = 13.sp + ) + WikiSection(stringResource(R.string.project_wiki_section_logbook)) + WikiEntry(stringResource(R.string.project_wiki_logbook_1)) + WikiEntry(stringResource(R.string.project_wiki_logbook_2)) + WikiEntry(stringResource(R.string.project_wiki_logbook_3)) + WikiHow(stringResource(R.string.project_wiki_logbook_how)) + WikiSection(stringResource(R.string.project_wiki_section_mutual)) + WikiEntry(stringResource(R.string.project_wiki_mutual_1)) + WikiHow(stringResource(R.string.project_wiki_mutual_how)) + WikiSection(stringResource(R.string.project_wiki_section_grids)) + WikiEntry(stringResource(R.string.project_wiki_grids_1)) + WikiHow(stringResource(R.string.project_wiki_grids_how)) + } +} + +@Composable +private fun WikiSection(text: String) { + Text( + text = text, + color = MaterialTheme.colorScheme.primary, + fontWeight = FontWeight.Medium, + fontSize = 13.sp + ) +} + +@Composable +private fun WikiEntry(text: String) { + Text(text = text, fontSize = 12.sp) +} + +@Composable +private fun WikiHow(text: String) { + Text( + text = text, + fontSize = 12.sp, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(start = 8.dp) + ) +} diff --git a/core/presentation/src/main/res/values-zh/strings.xml b/core/presentation/src/main/res/values-zh/strings.xml index 3b90991c..f43ee945 100644 --- a/core/presentation/src/main/res/values-zh/strings.xml +++ b/core/presentation/src/main/res/values-zh/strings.xml @@ -41,7 +41,6 @@ 请务必在设置中通过GPS、经纬度或QTH定位您的位置\n建议至少每周更新一次数据库，以确保预测结果的准确性 - 4.4.6 以来的全部更新（4.4.7 / 4.4.8 系列）：\n\n• 合并上游 4.4.8：IC-705 读频修复；地图昼夜分界线极性修复（秋分后昼夜阴影反相）；白色主题（地图、状态栏、弹窗与自绘网格/奖状图层一并适配）；卫星名模糊搜索。\n\n• LoTW 日志本：上传预检按真实 BAND/SATELLITE 给出原因；QSO 全详情编辑；卫星名按 TQSL 官方名录校验（非官方名不予保存）；FM 卫星固定记录语音转发器频率（SO-50 下行 436.795）；LoTW 确认记录会并入已上传的那条 QSO，不再另起一行（卫星名经 TQSL 别名表比对，报告里的 BAND 按上行解析）。\n\n• 弹窗统一为底部弹出栏同款配色与圆角。\n\n• 设置页链接指向本项目：版本号 → 发布页，GitHub → 本仓库。\n\n• 网格模式地图：LoTW 已确认网格绿色填充、漫游网格蓝色条纹、当前网格加粗框；右上角网格/卫星模式开关。\n\n• 首通呼号（VUCC 视图）：绿格显示该格最早通联的呼号，非绿格空白。\n\n• worked 网格可按操作网格筛选（含“全部”）；点击网格弹出 QSO 明细；每格 QSO 计数。\n\n• 各操作网格独立 VUCC 计数；极区网格标签；反经线修复；漫游条纹密度一致。\n\n• WAPC/WAJA 地图标签随系统语言。\n\n• 网格模式视口与筛选跨页保持。\n\n• LoTW 同步：账号直连、全量/增量模式、实时进度、可取消、启动自动同步（独立开关）、设置页显示上次同步时间。\n\n• 历史过境：过境筛选可回看过去数小时（历史过境时间）。\n\n• 指南针校准：8 字动作精度指示 + 手动航向偏置。\n\n• AMSAT 状态页：连续相同状态报告计数。\n\n• 过境/雷达：UTC 切换重算过境；日出日落与仰角颜色修复；卫星模糊搜索；相互过境页滚动保持、跟随 UTC、雷达快捷入口。\n\n• CW 解码器支持 32/64 位设备；Android 17 (API 37) 适配。\n\n• v4.4.7-ba7opf.21：日志本卫星名统一按 TQSL 官方名存取（SAUDISAT 1C → SO-50），存量记录自动改名；日志页与通联帖按卫星身份匹配。\n• v4.4.7-ba7opf.22：同步时自动修正旧确认行的频段方向；上传重复判定改为时间+卫星+呼号三者相同。\n• v4.4.7-ba7opf.23：应用更名为 Look4Sat-BA7OPF；致谢页声明为非官方修改版，关于页加入上游项目链接，移除打赏/F-Droid 卡片。 AMSAT AMSAT 卫星状态 diff --git a/core/presentation/src/main/res/values/strings.xml b/core/presentation/src/main/res/values/strings.xml index b2544414..ade1596f 100644 --- a/core/presentation/src/main/res/values/strings.xml +++ b/core/presentation/src/main/res/values/strings.xml @@ -51,8 +51,6 @@ 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. - What\'s new in Look4Sat - All changes since 4.4.6 (the 4.4.7 / 4.4.8 series):\n\n• Merged from upstream 4.4.8: IC-705 frequency readout fix; day/night terminator polarity fix (shading was inverted after the September equinox); white/light theme (map, status bar, dialogs and the custom grid/award overlays included); fuzzy satellite search.\n\n• LoTW logbook: upload pre-check reports the real BAND/SATELLITE reasons; full QSO detail editing; satellite names validated against the TQSL list (unofficial names are not saved); FM satellites always log the voice repeater frequency (SO-50 downlink 436.795); a LoTW confirmation now folds into the uploaded QSO instead of appearing as a second row (satellite names are matched through the TQSL aliases, and the report\'s BAND is read as the uplink).\n\n• Dialogs share the bottom-sheet colours and corner radius.\n\n• Settings links point to this project: version number -> releases page, GitHub -> repository.\n\n• Grid-mode map: LoTW confirmed grids in green, roamed grids with blue stripes, current grid highlighted; mode switch pill at the map\'s top-right.\n\n• First-call labels (VUCC view): show the first callsign worked in each green grid instead of the grid code; non-worked cells stay empty.\n\n• Worked grids filtered by operated grid (with an All option); tap a grid to see its QSO detail dialog; per-grid QSO counts.\n\n• Per-operated-grid VUCC counting; polar grid labels; antimeridian fixes; consistent roamed-stripe density.\n\n• WAPC/WAJA map labels follow the system language.\n\n• Grid-mode viewport and award filter survive page switches.\n\n• LoTW sync: direct login, full/incremental modes, live progress, cancel button, auto-sync on app start with its own toggle, last-sync time shown.\n\n• Pass history: filter can look back over past passes (Time before).\n\n• Compass calibration: figure-eight accuracy meter plus manual heading offset.\n\n• AMSAT status page: consecutive same-status report counts.\n\n• Passes/radar: UTC toggle recalculates passes; sunrise/sunset and elevation color fixes; satellite fuzzy search; mutual page keeps scroll, follows UTC, radar shortcut.\n\n• CW decoder for 32/64-bit devices; Android 17 (API 37) support.\n\n• v4.4.7-ba7opf.21: the logbook stores and shows satellites under their TQSL official names (SAUDISAT 1C -> SO-50); existing records are renamed automatically; the log page and QSO post match by satellite identity.\n• v4.4.7-ba7opf.22: stale confirmation rows get their band direction fixed on sync; upload duplicate detection keys on time + satellite + callsign.\n• v4.4.7-ba7opf.23: renamed to Look4Sat-BA7OPF; the credits card states this is an unofficial build, the About screen links the upstream project, and the Donate / F-Droid cards were removed. AMSAT 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.kt index 7a66b6ad..49137556 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 @@ -72,6 +72,7 @@ import com.rtbishop.look4sat.core.presentation.EmptyListCard import com.rtbishop.look4sat.core.presentation.IconCard import com.rtbishop.look4sat.core.presentation.MainTheme import com.rtbishop.look4sat.core.presentation.NextPassRow +import com.rtbishop.look4sat.core.presentation.ProjectWikiBody import com.rtbishop.look4sat.core.presentation.R import com.rtbishop.look4sat.core.presentation.ScreenColumn import com.rtbishop.look4sat.core.presentation.SharedDialog @@ -143,17 +144,14 @@ private fun PassesScreen( if (uiState.shouldSeeWhatsNew) { val dismiss = { onAction(PassesAction.DismissWhatsNew) } SharedDialog( - title = stringResource(R.string.pass_whatsnew_title), + title = stringResource(R.string.prefs_project_wiki), onDismissRequest = dismiss, onAccept = dismiss, titleFontSize = 18 ) { padding -> - // The changelog is long; keep the dialog frame fixed and let the + // The wiki is long; keep the dialog frame fixed and let the // text scroll inside it (matches the update-checker page pattern). - Text( - text = stringResource(R.string.pass_whatsnew_message), - fontSize = 16.sp, - color = MaterialTheme.colorScheme.onSurface, + ProjectWikiBody( modifier = Modifier .padding(horizontal = padding) .heightIn(max = 360.dp) diff --git a/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/ProjectWiki.kt b/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/ProjectWiki.kt index 923876bb..45149d06 100644 --- a/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/ProjectWiki.kt +++ b/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/ProjectWiki.kt @@ -17,54 +17,22 @@ */ package com.rtbishop.look4sat.feature.settings -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.AlertDialog -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier 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 com.rtbishop.look4sat.core.presentation.ProjectWikiBody import com.rtbishop.look4sat.core.presentation.R +import com.rtbishop.look4sat.core.presentation.SheetDialogTitle import com.rtbishop.look4sat.core.presentation.sheetDialogContainerColor import com.rtbishop.look4sat.core.presentation.sheetDialogShape -import com.rtbishop.look4sat.core.presentation.SheetDialogTitle - -/** - * The fork's Project Wiki: a short overview of what Look4Sat-BA7OPF adds over upstream - * and how to use those features. Shown in the update-checker screen and behind the - * Settings → Project Wiki entry. Text lives in string resources (no release-body parsing), - * so it always renders even when the GitHub page is unreachable. - */ -@Composable -fun ProjectWikiBody(modifier: Modifier = Modifier) { - Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(8.dp)) { - Text( - text = stringResource(R.string.project_wiki_intro), - fontSize = 13.sp - ) - WikiSection(stringResource(R.string.project_wiki_section_logbook)) - WikiEntry(stringResource(R.string.project_wiki_logbook_1)) - WikiEntry(stringResource(R.string.project_wiki_logbook_2)) - WikiEntry(stringResource(R.string.project_wiki_logbook_3)) - WikiHow(stringResource(R.string.project_wiki_logbook_how)) - WikiSection(stringResource(R.string.project_wiki_section_mutual)) - WikiEntry(stringResource(R.string.project_wiki_mutual_1)) - WikiHow(stringResource(R.string.project_wiki_mutual_how)) - WikiSection(stringResource(R.string.project_wiki_section_grids)) - WikiEntry(stringResource(R.string.project_wiki_grids_1)) - WikiHow(stringResource(R.string.project_wiki_grids_how)) - } -} +/** Settings → Project Wiki: the same content as the What's-New card, in a dialog. */ @Composable fun ProjectWikiDialog(onDismiss: () -> Unit) { AlertDialog( @@ -86,28 +54,3 @@ fun ProjectWikiDialog(onDismiss: () -> Unit) { } ) } - -@Composable -private fun WikiSection(text: String) { - Text( - text = text, - color = MaterialTheme.colorScheme.primary, - fontWeight = FontWeight.Medium, - fontSize = 13.sp - ) -} - -@Composable -private fun WikiEntry(text: String) { - Text(text = text, fontSize = 12.sp) -} - -@Composable -private fun WikiHow(text: String) { - Text( - text = text, - fontSize = 12.sp, - color = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier.padding(start = 8.dp) - ) -}