Skip to content

fix: transitionDates function for explicit update timing #10

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
Gavin-WangSC wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: transitionDates function for explicit update timing #10

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
37 changes: 25 additions & 12 deletions Outspire/Features/LiveActivity/ClassActivityView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,32 @@ import WidgetKit
}
}

private func transitionDates(for state: ClassActivityAttributes.ContentState) -> [Date] {
let now = Date()
var dates = Set<Date>()
for cls in state.schedule {
dates.insert(cls.startTime)
dates.insert(cls.endTime)
dates.insert(cls.endTime.addingTimeInterval(-300))
}
let upcoming = dates.filter { $0 > now }.sorted()
return upcoming.isEmpty ? [now] : upcoming
}

private struct LiveActivityTimeline<Content: View>: View {
let context: ActivityViewContext<ClassActivityAttributes>
let refreshInterval: TimeInterval
let content: (LiveActivityDerivedState) -> Content

init(
context: ActivityViewContext<ClassActivityAttributes>,
refreshInterval: TimeInterval = 10,
@ViewBuilder content: @escaping (LiveActivityDerivedState) -> Content
) {
self.context = context
self.refreshInterval = refreshInterval
self.content = content
}

var body: some View {
TimelineView(.periodic(from: Date(), by: refreshInterval)) { timeline in
TimelineView(.explicit(transitionDates(for: context.state))) { timeline in
let derived = LiveActivityDerivedState(context: context, date: timeline.date)
content(derived)
}
Expand Down Expand Up @@ -186,8 +195,9 @@ import WidgetKit
.foregroundStyle(.secondary)
}

if state.status == .ongoing || state.status == .ending,
let active = state.current
if (state.status == .ongoing || state.status == .ending),
let active = state.current,
active.endTime > state.date
{
ProgressView(
timerInterval: active.startTime ... active.endTime,
Expand Down Expand Up @@ -295,8 +305,9 @@ import WidgetKit

Spacer()

if state.status == .ongoing || state.status == .ending,
let active = state.current
if (state.status == .ongoing || state.status == .ending),
let active = state.current,
active.endTime > state.date
{
ProgressView(
timerInterval: active.startTime ... active.endTime,
Expand All @@ -317,8 +328,9 @@ import WidgetKit

var body: some View {
ZStack {
if state.status == .ongoing || state.status == .ending,
let active = state.current
if (state.status == .ongoing || state.status == .ending),
let active = state.current,
active.endTime > state.date
{
ProgressView(
timerInterval: active.startTime ... active.endTime,
Expand Down Expand Up @@ -373,8 +385,9 @@ import WidgetKit
let state: LiveActivityDerivedState

var body: some View {
if state.status == .ongoing || state.status == .ending,
let active = state.current
if (state.status == .ongoing || state.status == .ending),
let active = state.current,
active.endTime > state.date
{
ProgressView(
timerInterval: active.startTime ... active.endTime,
Expand Down