Skip to content

Fix stale snooze state in alarm list #678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bjorkert wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix stale snooze state in alarm list #678

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions LoopFollow/Alarm/AlarmListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,21 @@ struct AlarmListView: View {
@State private var deleteAfterDismiss: UUID?
@State private var selectedAlarm: Alarm?

// Snapshot of "now" used to categorize snoozed vs. active alarms. SwiftUI does
// not re-render when the wall clock passes a snooze's expiry, so we refresh this
// whenever the screen appears or the app returns to the foreground.
@State private var now = Date()
@Environment(\.scenePhase) private var scenePhase

// MARK: - Categorized Alarms

private var snoozedAlarms: [Alarm] {
store.value.filter { $0.snoozedUntil ?? .distantPast > Date() && $0.isEnabled }
store.value.filter { $0.snoozedUntil ?? .distantPast > now && $0.isEnabled }
.sorted(by: Alarm.byPriorityThenSpec)
}

private var activeAlarms: [Alarm] {
store.value.filter { $0.isEnabled && ($0.snoozedUntil ?? .distantPast <= Date()) }
store.value.filter { $0.isEnabled && ($0.snoozedUntil ?? .distantPast <= now) }
.sorted(by: Alarm.byPriorityThenSpec)
}

Expand Down Expand Up @@ -90,6 +96,10 @@ struct AlarmListView: View {
Button { sheetInfo = .picker } label: { Image(systemName: "plus") }
}
}
.onAppear { now = Date() }
.onChange(of: scenePhase) { phase in
if phase == .active { now = Date() }
}
.preferredColorScheme(Storage.shared.appearanceMode.value.colorScheme)
}

Expand All @@ -111,7 +121,7 @@ struct AlarmListView: View {
Text(alarm.name)
.foregroundColor(.primary)

if let until = alarm.snoozedUntil, until > Date() {
if let until = alarm.snoozedUntil, until > now {
HStack(spacing: 4) {
Image(systemName: "zzz")
.font(.caption2)
Expand Down
Loading