feat(passes/radar): port pass history + compass calibration, cumulative what's new

- Pass history (Iu-yang1 fork): PassesSettings.hoursBefore look-back window;
  second 'Time before' slider in the pass filter; completed passes stay
  listed (progress clamped to [0,1]) in the history window.
- Compass calibration (Iu-yang1 fork): OtherSettings.compassOffsetDegrees,
  CompassAccuracy from the magnetic sensor, calibration dialog with
  figure-eight accuracy meter, corrected heading and manual offset field;
  RadarViewModel applies the offset.
- What's New dialog now shows the cumulative 4.4.6->4.4.7 changelog and
  follows the system language (values/ + values-zh/).
- pass_filter_history_hours localized in es/ru/si/tr/uk.
This commit is contained in:
atsunatsu committed 2026-09-21 10:42:45 +08:00
1 parent 3591960d55
commit bf492e3f8b
20 files changed
+363 -29

No files matched your search

@@ -73,6 +73,7 @@ private val allModes = listOf(
)
private val hourSteps = listOf(1, 2, 4, 8, 12, 24, 48, 72, 96, 120, 144, 168, 192, 216, 240)
private val historyHourSteps = listOf(0) + hourSteps
private const val dayMinutes = 24 * 60
private const val minuteStep = 15
private const val endOfDayMinute = dayMinutes - 1
@@ -80,6 +81,7 @@ private const val quarterHourSlots = dayMinutes / minuteStep
data class PassFilterParams(
val hours: Int,
val hoursBefore: Int,
val elevation: Double,
val lowElevation: Double,
val highElevation: Double,
@@ -95,6 +97,7 @@ private fun PassesDialogPreview() {
MainTheme {
PassesFilterDialog(
hours = 24,
hoursBefore = 0,
elevation = 16.0,
lowElevation = 16.0,
highElevation = 65.0,
@@ -111,6 +114,7 @@ private fun PassesDialogPreview() {
@Composable
internal fun PassesFilterDialog(
hours: Int,
hoursBefore: Int,
elevation: Double,
lowElevation: Double,
highElevation: Double,
@@ -122,6 +126,9 @@ internal fun PassesFilterDialog(
accept: (PassFilterParams) -> Unit
) {
val hoursIndex = remember { mutableIntStateOf(hourSteps.indexOfFirst { it >= hours }.coerceAtLeast(0)) }
val hoursBeforeIndex = remember {
mutableIntStateOf(historyHourSteps.indexOfFirst { it >= hoursBefore }.coerceAtLeast(0))
}
val elevationValueNew = remember { mutableDoubleStateOf(elevation) }
val highlightBounds = 0f..90f
var highlightRange by remember(lowElevation, highElevation) {
@@ -136,6 +143,7 @@ internal fun PassesFilterDialog(
accept(
PassFilterParams(
hours = hourSteps[hoursIndex.intValue],
hoursBefore = historyHourSteps[hoursBeforeIndex.intValue],
elevation = elevationValueNew.doubleValue,
lowElevation = highlightRange.start.roundToInt().toDouble(),
highElevation = highlightRange.endInclusive.roundToInt().toDouble(),
@@ -164,6 +172,14 @@ internal fun PassesFilterDialog(
valueRange = 0f..(hourSteps.size - 1).toFloat(),
steps = hourSteps.size - 2
) { hoursIndex.intValue = it.toInt().coerceIn(0, hourSteps.size - 1) }
SliderRow(
title = stringResource(R.string.pass_filter_history_hours),
value = hoursBeforeIndex.intValue.toDouble(),
displayValue = formatHoursLabel(historyHourSteps[hoursBeforeIndex.intValue]),
valueResId = R.drawable.ic_clock,
valueRange = 0f..(historyHourSteps.size - 1).toFloat(),
steps = historyHourSteps.size - 2
) { hoursBeforeIndex.intValue = it.toInt().coerceIn(0, historyHourSteps.size - 1) }
ToggleRow(
title = stringResource(R.string.pass_filter_deep_space),
checked = deepSpaceEnabled,
@@ -103,6 +103,7 @@ private fun PassesScreen(
if (uiState.isPassesDialogShown) {
PassesFilterDialog(
hours = uiState.hours,
hoursBefore = uiState.hoursBefore,
elevation = uiState.elevation,
lowElevation = uiState.lowElevation,
highElevation = uiState.highElevation,
@@ -115,6 +116,7 @@ private fun PassesScreen(
onAction(
PassesAction.FilterPasses(
hoursAhead = params.hours,
hoursBefore = params.hoursBefore,
minElevation = params.elevation,
lowElevation = params.lowElevation,
highElevation = params.highElevation,
@@ -28,6 +28,8 @@ data class PassesState(
val nextTime: String = "00:00:00",
val isNextTimeAos: Boolean = true,
val hours: Int = 24,
/** 历史过境回看窗口(小时), 0 = 只看未来. */
val hoursBefore: Int = 0,
val elevation: Double = 16.0,
val lowElevation: Double = 16.0,
val highElevation: Double = 65.0,
@@ -47,6 +49,7 @@ sealed interface PassesAction {
data object DismissWhatsNew : PassesAction
data class FilterPasses(
val hoursAhead: Int,
val hoursBefore: Int,
val minElevation: Double,
val lowElevation: Double,
val highElevation: Double,
@@ -55,6 +55,7 @@ class PassesViewModel(
isUtc = settingsRepo.otherSettings.value.stateOfUtc,
nextPass = defaultPass,
hours = settingsRepo.passesSettings.value.hoursAhead,
hoursBefore = settingsRepo.passesSettings.value.hoursBefore,
elevation = settingsRepo.passesSettings.value.minElevation,
lowElevation = settingsRepo.otherSettings.value.lowElevation,
highElevation = settingsRepo.otherSettings.value.highElevation,
@@ -123,6 +124,7 @@ class PassesViewModel(
is PassesAction.FilterPasses ->
applyFilter(
hoursAhead = action.hoursAhead,
hoursBefore = action.hoursBefore,
minElevation = action.minElevation,
lowElevation = action.lowElevation,
highElevation = action.highElevation,
@@ -135,6 +137,7 @@ class PassesViewModel(
is PassesAction.FilterRadios ->
applyFilter(
hoursAhead = _uiState.value.hours,
hoursBefore = _uiState.value.hoursBefore,
minElevation = _uiState.value.elevation,
lowElevation = _uiState.value.lowElevation,
highElevation = _uiState.value.highElevation,
@@ -246,7 +249,7 @@ class PassesViewModel(
return ordered
}
/** Computes live progress for each pass, filtering out expired ones. */
/** Computes live progress while retaining completed passes in the requested history window. */
private fun computePassProgress(passList: List<OrbitalPass>, time: Long): List<OrbitalPass> {
val result = ArrayList<OrbitalPass>(passList.size)
for (pass in passList) {
@@ -254,9 +257,9 @@ class PassesViewModel(
val deltaNow = time.minus(pass.aosTime).toFloat()
val deltaTotal = pass.losTime.minus(pass.aosTime).toFloat()
val newProgress = (deltaNow / deltaTotal).round(2)
if (newProgress >= 1.0f) continue
if (newProgress != pass.progress) {
result.add(pass.copy(progress = newProgress))
val boundedProgress = newProgress.coerceIn(0f, 1f)
if (boundedProgress != pass.progress) {
result.add(pass.copy(progress = boundedProgress))
} else {
result.add(pass)
}
@@ -285,6 +288,7 @@ class PassesViewModel(
private fun applyFilter(
hoursAhead: Int,
hoursBefore: Int,
minElevation: Double,
lowElevation: Double,
highElevation: Double,
@@ -302,13 +306,15 @@ class PassesViewModel(
aosStartMinute,
aosEndMinute,
invertAosTimeWindow,
modes
modes,
hoursBefore
)
)
settingsRepo.updateOtherSettings { it.copy(lowElevation = lowElevation, highElevation = highElevation) }
_uiState.update {
it.copy(
hours = hoursAhead,
hoursBefore = hoursBefore,
elevation = minElevation,
lowElevation = lowElevation,
highElevation = highElevation,
@@ -319,9 +325,10 @@ class PassesViewModel(
modes = modes
)
}
val now = System.currentTimeMillis()
satelliteRepo.calculatePasses(
time = System.currentTimeMillis(),
hoursAhead = hoursAhead,
time = now - hoursBefore * 60L * 60L * 1000L,
hoursAhead = hoursBefore + hoursAhead,
minElevation = minElevation,
aosStartMinute = aosStartMinute,
aosEndMinute = aosEndMinute,