bukovinafilip/Atoll
1
0
Fork 0
mirror of https://github.com/FBukovina/Atoll.git synced 2026-10-28 07:34:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Partial fixes for lock screen calendar

Browse source
This commit is contained in:
Hariharan Mudaliar 2026-02-07 22:26:03 +05:30
commit f411676d02
No known key found for this signature in database
GPG key ID: 025583EB0BE5640E
10 changed files with 1348 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

92
DynamicIsland/managers/CalendarManager.swift
View file

@ -38,6 +38,7 @@ class CalendarManager: ObservableObject {
@Published var selectedCalendarIDs: Set<String> = []
@Published var calendarAuthorizationStatus: EKAuthorizationStatus = .notDetermined
@Published var reminderAuthorizationStatus: EKAuthorizationStatus = .notDetermined
@Published var lockScreenEvents: [EventModel] = []
private var selectedCalendars: [CalendarModel] = []
private let calendarService = CalendarService()
@ -50,6 +51,9 @@ class CalendarManager: ObservableObject {
private let eventStoreChangeThrottle: TimeInterval = 20
private let selfInducedChangeSuppression: TimeInterval = 6
private let eventFetchLimiter = EventFetchLimiter()
private var lastLockScreenEventsFetchDate: Date?
private let lockScreenRefreshInterval: TimeInterval = 15
private var lockScreenRefreshTask: Task<Void, Never>?
var hasCalendarAccess: Bool { isAuthorized(calendarAuthorizationStatus) }
var hasReminderAccess: Bool { isAuthorized(reminderAuthorizationStatus) }
@ -57,6 +61,7 @@ class CalendarManager: ObservableObject {
private init() {
currentWeekStartDate = CalendarManager.startOfDay(Date())
setupEventStoreChangedObserver()
startLockScreenRefreshLoop()
Task {
await reloadCalendarAndReminderLists()
}
@ -67,6 +72,7 @@ class CalendarManager: ObservableObject {
NotificationCenter.default.removeObserver(observer)
}
pendingEventStoreRefreshTask?.cancel()
lockScreenRefreshTask?.cancel()
}
private func setupEventStoreChangedObserver() {
@ -111,6 +117,7 @@ class CalendarManager: ObservableObject {
pendingEventStoreRefreshTask = nil
await reloadCalendarAndReminderLists()
await maybeRefreshEventsAfterReload()
await updateLockScreenEvents(force: true)
nextAllowedEventStoreRefresh = Date().addingTimeInterval(eventStoreChangeThrottle)
ignoreEventStoreChangesUntil = Date().addingTimeInterval(selfInducedChangeSuppression)
}
@ -154,12 +161,14 @@ class CalendarManager: ObservableObject {
if granted {
await reloadCalendarAndReminderLists()
await updateEvents(force: true)
await updateLockScreenEvents(force: true)
}
case .restricted, .denied:
NSLog("Calendar access denied or restricted")
case .authorized, .fullAccess:
await reloadCalendarAndReminderLists()
await updateEvents(force: true)
await updateLockScreenEvents(force: true)
case .writeOnly:
NSLog("Calendar write only")
@unknown default:
@ -230,6 +239,7 @@ class CalendarManager: ObservableObject {
Defaults[.calendarSelectionState] = selectionState
updateSelectedCalendars()
await updateEvents(force: true)
await updateLockScreenEvents(force: true)
}
static func startOfDay(_ date: Date) -> Date {
@ -239,6 +249,88 @@ class CalendarManager: ObservableObject {
func updateCurrentDate(_ date: Date) async {
currentWeekStartDate = Calendar.current.startOfDay(for: date)
await updateEvents(force: true)
await updateLockScreenEvents(force: true)
}
func updateLockScreenEvents(force: Bool = false) async {
let now = Date()
if !force,
let lastFetch = lastLockScreenEventsFetchDate,
now.timeIntervalSince(lastFetch) < lockScreenRefreshInterval {
return
}
let lookaheadRaw = Defaults[.lockScreenCalendarEventLookaheadWindow]
.trimmingCharacters(in: .whitespacesAndNewlines)
.lowercased()
let isAllTimeLookahead =
lookaheadRaw == "all_time" ||
lookaheadRaw == "all time" ||
lookaheadRaw == "alltime"
let isRestOfDay =
lookaheadRaw == "rest_of_day" ||
lookaheadRaw == "rest of the day" ||
lookaheadRaw == "restofday"
func lookaheadMinutes(from raw: String) -> Int? {
switch raw {
case "15m", "15 min", "15 mins", "15min", "15mins": return 15
case "30m", "30 min", "30 mins", "30min", "30mins": return 30
case "1h", "1 hr", "1 hour", "1hour": return 60
case "3h", "3 hr", "3 hours", "3hours": return 180
case "6h", "6 hr", "6 hours", "6hours": return 360
case "12h", "12 hr", "12 hours", "12hours": return 720
default: return nil
}
}
let calendar = Calendar.current
let startOfToday = calendar.startOfDay(for: now)
let startDate = calendar.date(byAdding: .day, value: -1, to: startOfToday) ?? startOfToday
let endDate: Date
if isAllTimeLookahead {
endDate = calendar.date(byAdding: .day, value: 365, to: now) ?? now.addingTimeInterval(365 * 24 * 3600)
} else if isRestOfDay {
endDate = calendar.date(byAdding: .day, value: 1, to: startOfToday) ?? startOfToday.addingTimeInterval(24 * 3600)
} else if let minutes = lookaheadMinutes(from: lookaheadRaw) {
endDate = calendar.date(byAdding: .minute, value: minutes, to: now) ?? now.addingTimeInterval(TimeInterval(minutes * 60))
} else {
endDate = calendar.date(byAdding: .minute, value: 180, to: now) ?? now.addingTimeInterval(180 * 60)
}
let calendarIDs = allCalendars.map { $0.id }
let service = calendarService
let fetched = await eventFetchLimiter.run {
await service.events(from: startDate, to: endDate, calendars: calendarIDs)
}
if lockScreenEvents == fetched {
lastLockScreenEventsFetchDate = Date()
return
}
withAnimation(.smooth(duration: 0.25)) {
lockScreenEvents = fetched
}
lastLockScreenEventsFetchDate = Date()
}
private func startLockScreenRefreshLoop() {
lockScreenRefreshTask?.cancel()
lockScreenRefreshTask = Task { [weak self] in
guard let self else { return }
while !Task.isCancelled {
try? await Task.sleep(nanoseconds: 60 * 1_000_000_000)
if Task.isCancelled { break }
guard self.hasCalendarAccess else { continue }
await self.updateLockScreenEvents(force: false)
}
}
}
private func updateEvents(force: Bool = false) async {

12
DynamicIsland/managers/LockScreenReminderWidgetManager.swift
View file

@ -94,6 +94,18 @@ final class LockScreenReminderWidgetManager: ObservableObject {
self.handleSnapshotUpdate(self.reminderManager.lockScreenSnapshot)
}
.store(in: &cancellables)
Defaults.publisher(.lockScreenReminderWidgetHorizontalAlignment, options: [])
.sink { _ in
LockScreenReminderWidgetPanelManager.shared.refreshPosition(animated: true)
}
.store(in: &cancellables)
Defaults.publisher(.lockScreenReminderWidgetVerticalOffset, options: [])
.sink { _ in
LockScreenReminderWidgetPanelManager.shared.refreshPosition(animated: true)
}
.store(in: &cancellables)
}
private func handleSnapshotUpdate(_ newSnapshot: LockScreenReminderWidgetSnapshot?) {

18
DynamicIsland/managers/LockScreenReminderWidgetPanelManager.swift
View file

@ -20,6 +20,7 @@ import AppKit
import SwiftUI
import SkyLightWindow
import QuartzCore
import Defaults
@MainActor
final class LockScreenReminderWidgetPanelManager {
@ -119,7 +120,18 @@ final class LockScreenReminderWidgetPanelManager {
private func frame(for size: CGSize, on screen: NSScreen) -> NSRect {
let screenFrame = screen.frame
let originX = screenFrame.midX - (size.width / 2)
let horizontalPadding: CGFloat = 24
let alignment = Defaults[.lockScreenReminderWidgetHorizontalAlignment].lowercased()
let originX: CGFloat
switch alignment {
case "leading", "left":
originX = screenFrame.minX + horizontalPadding
case "trailing", "right":
originX = screenFrame.maxX - size.width - horizontalPadding
default:
originX = screenFrame.midX - (size.width / 2)
}
let musicTop = LockScreenPanelManager.shared.latestFrame?.maxY ?? (screenFrame.midY - 32)
let timerFrame = LockScreenTimerWidgetPanelManager.shared.latestFrame
@ -148,7 +160,9 @@ final class LockScreenReminderWidgetPanelManager {
proposedY = (lowerBound + clampedUpperBound) / 2
}
proposedY = max(lowerBound, min(proposedY, clampedUpperBound))
let rawOffset = CGFloat(Defaults[.lockScreenReminderWidgetVerticalOffset])
let clampedOffset = min(max(rawOffset, -160), 160)
proposedY = max(lowerBound, min(proposedY + clampedOffset, clampedUpperBound))
return NSRect(x: originX, y: proposedY, width: size.width, height: size.height)
}

8
DynamicIsland/managers/LockScreenWeatherPanelManager.swift
View file

@ -114,14 +114,18 @@ final class LockScreenWeatherPanelManager {
let screenFrame = screen.frame
let originX = screenFrame.midX - (size.width / 2)
let verticalOffset = screenFrame.height * 0.15
let maxY = screenFrame.maxY - size.height - 48
let isCircular = snapshot.widgetStyle == .circular
let topMargin: CGFloat = isCircular ? 120 : 48
let maxY = screenFrame.maxY - size.height - topMargin
let baseY = min(maxY, screenFrame.midY + verticalOffset)
let loweredY = baseY - 36
let inlineLift: CGFloat = snapshot.widgetStyle == .inline ? 44 : 0
let circularDrop: CGFloat = isCircular ? 28 : 0
let sizeDrop = max(0, size.height - 80) * 0.35
let userOffset = CGFloat(Defaults[.lockScreenWeatherVerticalOffset])
let clampedOffset = min(max(userOffset, -160), 160)
let adjustedY = loweredY + inlineLift + clampedOffset
let adjustedY = loweredY + inlineLift + clampedOffset - circularDrop - sizeDrop
let upperClampedY = min(maxY, adjustedY)
let clampedY = max(screenFrame.minY + 80, upperClampedY)
return NSRect(x: originX, y: clampedY, width: size.width, height: size.height)