fix(time): respect UTC toggle for AOS filter window and sunrise/sunset day anchor

- PassesViewModel: use the DEVICE timezone for the natural-day anchor in
  findTodaySunRiseSet instead of the display timezone. With UTC enabled the
  anchor was UTC midnight = 08:00 local for UTC+8 stations, when the sun is
  already up — tripping the white-night guard and rendering '--:--'.
- SatelliteRepo.isAosInRange: follow the UTC display toggle so the pass time
  window is interpreted in UTC when UTC mode is on. Previously the list
  showed UTC times while the filter silently used local time, off by the
  timezone offset (8h for China).
This commit is contained in:
atsunatsu committed 2026-09-14 14:13:16 +08:00
1 parent 2773145e0c
commit 7ef555e377
2 files changed
+16 -4

No files matched your search

@@ -175,7 +175,16 @@ class SatelliteRepo(
aosEndMinute: Int,
invertAosTimeWindow: Boolean
): Boolean {
val offsetMillis = TimeZone.getDefault().getOffset(aosTime).toLong()
// Follow the UTC display toggle: with UTC enabled the window is interpreted
// in UTC, otherwise in the device's local timezone. Otherwise the pass list
// shows UTC times while the filter silently uses local time — the two
// disagree by the timezone offset (e.g. 8h for China).
val tz = if (settingsRepo.otherSettings.value.stateOfUtc) {
TimeZone.getTimeZone("UTC")
} else {
TimeZone.getDefault()
}
val offsetMillis = tz.getOffset(aosTime).toLong()
val localMillis = Math.floorMod(aosTime + offsetMillis, 24L * 60L * 60L * 1000L)
val aosMinute = (localMillis / 60_000L).toInt()
val inRange = if (aosStartMinute <= aosEndMinute) {