mirror of
https://github.com/FBukovina/Atoll.git
synced 2026-10-27 23:24:32 +00:00
Create Lock Screen Reminder Widget
This commit is contained in:
Hariharan Mudaliar
parent
00c5774433
commit
436d5a4e96
10 changed files with 465 additions and 0 deletions
|
|
@ -105,6 +105,7 @@ class LockScreenManager: ObservableObject {
|
|||
LockScreenPanelManager.shared.showPanel()
|
||||
LockScreenLiveActivityWindowManager.shared.showLocked()
|
||||
LockScreenWeatherManager.shared.showWeatherWidget()
|
||||
LockScreenReminderWidgetManager.shared.showReminderWidget()
|
||||
|
||||
// THEN trigger lock icon in Dynamic Island (only if enabled in settings)
|
||||
if Defaults[.enableLockScreenLiveActivity] {
|
||||
|
|
@ -125,6 +126,7 @@ class LockScreenManager: ObservableObject {
|
|||
LockScreenPanelManager.shared.hidePanel()
|
||||
LockScreenLiveActivityWindowManager.shared.showUnlockAndScheduleHide()
|
||||
LockScreenWeatherManager.shared.hideWeatherWidget()
|
||||
LockScreenReminderWidgetManager.shared.hideReminderWidget()
|
||||
|
||||
// Update state immediately
|
||||
if Defaults[.enableLockScreenLiveActivity] {
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ class LockScreenPanelManager {
|
|||
private var collapsedFrame: NSRect?
|
||||
private let collapsedPanelCornerRadius: CGFloat = 28
|
||||
private let expandedPanelCornerRadius: CGFloat = 52
|
||||
private(set) var latestFrame: NSRect?
|
||||
|
||||
private init() {
|
||||
print("[\(timestamp())] LockScreenPanelManager: initialized")
|
||||
|
|
@ -79,6 +80,7 @@ class LockScreenPanelManager {
|
|||
}
|
||||
|
||||
window.setFrame(targetFrame, display: true)
|
||||
latestFrame = targetFrame
|
||||
let hosting = NSHostingView(rootView: LockScreenMusicPanel())
|
||||
hosting.frame = NSRect(origin: .zero, size: targetFrame.size)
|
||||
window.contentView = hosting
|
||||
|
|
@ -123,6 +125,8 @@ class LockScreenPanelManager {
|
|||
window.setFrame(targetFrame, display: true)
|
||||
}
|
||||
|
||||
latestFrame = targetFrame
|
||||
|
||||
// Update corner radius to match the SwiftUI panel's style
|
||||
let targetRadius = expanded ? expandedPanelCornerRadius : collapsedPanelCornerRadius
|
||||
if animated {
|
||||
|
|
@ -146,6 +150,8 @@ class LockScreenPanelManager {
|
|||
window.orderOut(nil)
|
||||
window.contentView = nil
|
||||
|
||||
latestFrame = nil
|
||||
|
||||
print("[\(timestamp())] LockScreenPanelManager: panel hidden")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
209
DynamicIsland/managers/LockScreenReminderWidgetManager.swift
Normal file
209
DynamicIsland/managers/LockScreenReminderWidgetManager.swift
Normal file
|
|
@ -0,0 +1,209 @@
|
|||
import Foundation
|
||||
import Combine
|
||||
import Defaults
|
||||
import SwiftUI
|
||||
import AppKit
|
||||
|
||||
@MainActor
|
||||
final class LockScreenReminderWidgetManager: ObservableObject {
|
||||
static let shared = LockScreenReminderWidgetManager()
|
||||
|
||||
@Published private(set) var snapshot: LockScreenReminderWidgetSnapshot?
|
||||
|
||||
private let reminderManager = ReminderLiveActivityManager.shared
|
||||
private var cancellables = Set<AnyCancellable>()
|
||||
|
||||
private let timeFormatter: DateFormatter = {
|
||||
let formatter = DateFormatter()
|
||||
formatter.dateStyle = .none
|
||||
formatter.timeStyle = .short
|
||||
return formatter
|
||||
}()
|
||||
|
||||
private init() {
|
||||
observeReminderUpdates()
|
||||
observeDefaults()
|
||||
}
|
||||
|
||||
func showReminderWidget() {
|
||||
guard Defaults[.enableLockScreenReminderWidget] else {
|
||||
LockScreenReminderWidgetPanelManager.shared.hide()
|
||||
return
|
||||
}
|
||||
|
||||
if let snapshot {
|
||||
LockScreenReminderWidgetPanelManager.shared.show(with: snapshot)
|
||||
} else {
|
||||
recomputeSnapshot(now: reminderManager.currentDate)
|
||||
if let snapshot {
|
||||
LockScreenReminderWidgetPanelManager.shared.show(with: snapshot)
|
||||
} else {
|
||||
LockScreenReminderWidgetPanelManager.shared.hide()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func hideReminderWidget() {
|
||||
LockScreenReminderWidgetPanelManager.shared.hide()
|
||||
}
|
||||
|
||||
private func observeReminderUpdates() {
|
||||
reminderManager.$activeReminder
|
||||
.receive(on: RunLoop.main)
|
||||
.sink { [weak self] _ in
|
||||
guard let self else { return }
|
||||
self.recomputeSnapshot(now: self.reminderManager.currentDate)
|
||||
}
|
||||
.store(in: &cancellables)
|
||||
|
||||
reminderManager.$currentDate
|
||||
.receive(on: RunLoop.main)
|
||||
.sink { [weak self] now in
|
||||
guard let self else { return }
|
||||
self.recomputeSnapshot(now: now)
|
||||
}
|
||||
.store(in: &cancellables)
|
||||
}
|
||||
|
||||
private func observeDefaults() {
|
||||
Defaults.publisher(.enableLockScreenReminderWidget, options: [])
|
||||
.sink { [weak self] change in
|
||||
guard let self else { return }
|
||||
if change.newValue {
|
||||
self.recomputeSnapshot(now: self.reminderManager.currentDate)
|
||||
self.showReminderWidgetIfPossible()
|
||||
} else {
|
||||
self.snapshot = nil
|
||||
LockScreenReminderWidgetPanelManager.shared.hide()
|
||||
}
|
||||
}
|
||||
.store(in: &cancellables)
|
||||
|
||||
Defaults.publisher(.lockScreenReminderChipStyle, options: [])
|
||||
.sink { [weak self] _ in
|
||||
guard let self else { return }
|
||||
self.recomputeSnapshot(now: self.reminderManager.currentDate)
|
||||
}
|
||||
.store(in: &cancellables)
|
||||
}
|
||||
|
||||
private func showReminderWidgetIfPossible() {
|
||||
guard LockScreenManager.shared.currentLockStatus else { return }
|
||||
guard Defaults[.enableLockScreenReminderWidget] else { return }
|
||||
if let snapshot {
|
||||
LockScreenReminderWidgetPanelManager.shared.show(with: snapshot)
|
||||
} else {
|
||||
LockScreenReminderWidgetPanelManager.shared.hide()
|
||||
}
|
||||
}
|
||||
|
||||
private func recomputeSnapshot(now: Date) {
|
||||
guard Defaults[.enableLockScreenReminderWidget] else {
|
||||
snapshot = nil
|
||||
LockScreenReminderWidgetPanelManager.shared.hide()
|
||||
return
|
||||
}
|
||||
|
||||
guard let entry = reminderManager.activeReminder else {
|
||||
snapshot = nil
|
||||
LockScreenReminderWidgetPanelManager.shared.hide()
|
||||
return
|
||||
}
|
||||
|
||||
let snapshot = makeSnapshot(from: entry, now: now)
|
||||
if self.snapshot != snapshot {
|
||||
self.snapshot = snapshot
|
||||
}
|
||||
deliver(snapshot)
|
||||
}
|
||||
|
||||
private func deliver(_ snapshot: LockScreenReminderWidgetSnapshot) {
|
||||
guard LockScreenManager.shared.currentLockStatus else { return }
|
||||
if LockScreenReminderWidgetPanelManager.shared.isVisible {
|
||||
LockScreenReminderWidgetPanelManager.shared.update(with: snapshot)
|
||||
} else {
|
||||
LockScreenReminderWidgetPanelManager.shared.show(with: snapshot)
|
||||
}
|
||||
}
|
||||
|
||||
private func makeSnapshot(from entry: ReminderLiveActivityManager.ReminderEntry, now: Date) -> LockScreenReminderWidgetSnapshot {
|
||||
let title = entry.event.title.isEmpty ? "Upcoming Reminder" : entry.event.title
|
||||
let timeText = timeFormatter.string(from: entry.event.start)
|
||||
let isCritical = criticalWindowContains(entry: entry, now: now)
|
||||
let relative = relativeDescription(for: entry, now: now)
|
||||
let accent = accentColor(for: entry, isCritical: isCritical)
|
||||
let iconName = isCritical ? ReminderLiveActivityManager.criticalIconName : ReminderLiveActivityManager.standardIconName
|
||||
|
||||
return LockScreenReminderWidgetSnapshot(
|
||||
title: title,
|
||||
eventTimeText: timeText,
|
||||
relativeDescription: relative,
|
||||
accent: accent,
|
||||
chipStyle: Defaults[.lockScreenReminderChipStyle],
|
||||
isCritical: isCritical,
|
||||
iconName: iconName
|
||||
)
|
||||
}
|
||||
|
||||
private func accentColor(for entry: ReminderLiveActivityManager.ReminderEntry, isCritical: Bool) -> LockScreenReminderWidgetSnapshot.RGBAColor {
|
||||
if isCritical {
|
||||
return LockScreenReminderWidgetSnapshot.RGBAColor(nsColor: .systemRed)
|
||||
}
|
||||
|
||||
let boosted = Color(nsColor: entry.event.calendar.color).ensureMinimumBrightness(factor: 0.7)
|
||||
return LockScreenReminderWidgetSnapshot.RGBAColor(nsColor: NSColor(boosted))
|
||||
}
|
||||
|
||||
private func relativeDescription(for entry: ReminderLiveActivityManager.ReminderEntry, now: Date) -> String? {
|
||||
let remaining = entry.event.start.timeIntervalSince(now)
|
||||
if remaining <= 0 {
|
||||
return "now"
|
||||
}
|
||||
|
||||
let minutes = Int(ceil(remaining / 60))
|
||||
if minutes <= 0 {
|
||||
return "now"
|
||||
}
|
||||
if minutes == 1 {
|
||||
return "in 1 min"
|
||||
}
|
||||
return "in \(minutes) min"
|
||||
}
|
||||
|
||||
private func criticalWindowContains(entry: ReminderLiveActivityManager.ReminderEntry, now: Date) -> Bool {
|
||||
let window = TimeInterval(Defaults[.reminderSneakPeekDuration])
|
||||
guard window > 0 else { return false }
|
||||
let remaining = entry.event.start.timeIntervalSince(now)
|
||||
return remaining > 0 && remaining <= window
|
||||
}
|
||||
}
|
||||
|
||||
struct LockScreenReminderWidgetSnapshot: Equatable {
|
||||
struct RGBAColor: Equatable {
|
||||
let red: Double
|
||||
let green: Double
|
||||
let blue: Double
|
||||
let alpha: Double
|
||||
|
||||
init(nsColor: NSColor) {
|
||||
let color = nsColor.usingColorSpace(.sRGB) ?? nsColor
|
||||
self.red = Double(color.redComponent)
|
||||
self.green = Double(color.greenComponent)
|
||||
self.blue = Double(color.blueComponent)
|
||||
self.alpha = Double(color.alphaComponent)
|
||||
}
|
||||
|
||||
var color: Color {
|
||||
Color(red: red, green: green, blue: blue, opacity: alpha)
|
||||
}
|
||||
}
|
||||
|
||||
let title: String
|
||||
let eventTimeText: String
|
||||
let relativeDescription: String?
|
||||
let accent: RGBAColor
|
||||
let chipStyle: LockScreenReminderChipStyle
|
||||
let isCritical: Bool
|
||||
let iconName: String
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,108 @@
|
|||
import AppKit
|
||||
import SwiftUI
|
||||
import SkyLightWindow
|
||||
|
||||
@MainActor
|
||||
final class LockScreenReminderWidgetPanelManager {
|
||||
static let shared = LockScreenReminderWidgetPanelManager()
|
||||
|
||||
private var window: NSWindow?
|
||||
private var hasDelegated = false
|
||||
|
||||
var isVisible: Bool {
|
||||
window?.isVisible == true
|
||||
}
|
||||
|
||||
private init() {}
|
||||
|
||||
func show(with snapshot: LockScreenReminderWidgetSnapshot) {
|
||||
render(snapshot: snapshot, makeVisible: true)
|
||||
}
|
||||
|
||||
func update(with snapshot: LockScreenReminderWidgetSnapshot) {
|
||||
render(snapshot: snapshot, makeVisible: false)
|
||||
}
|
||||
|
||||
func hide() {
|
||||
guard let window else { return }
|
||||
window.orderOut(nil)
|
||||
window.contentView = nil
|
||||
}
|
||||
|
||||
private func render(snapshot: LockScreenReminderWidgetSnapshot, makeVisible: Bool) {
|
||||
guard let screen = NSScreen.main else { return }
|
||||
if !makeVisible, window == nil {
|
||||
return
|
||||
}
|
||||
|
||||
let view = LockScreenReminderWidget(snapshot: snapshot)
|
||||
let hostingView = NSHostingView(rootView: view)
|
||||
let fittingSize = hostingView.fittingSize
|
||||
hostingView.frame = NSRect(origin: .zero, size: fittingSize)
|
||||
|
||||
let window = ensureWindow()
|
||||
window.setFrame(frame(for: fittingSize, on: screen), display: true)
|
||||
window.contentView = hostingView
|
||||
|
||||
if makeVisible {
|
||||
window.orderFrontRegardless()
|
||||
}
|
||||
}
|
||||
|
||||
private func ensureWindow() -> NSWindow {
|
||||
if let window {
|
||||
return window
|
||||
}
|
||||
|
||||
let frame = NSRect(origin: .zero, size: CGSize(width: 220, height: 48))
|
||||
let newWindow = NSWindow(
|
||||
contentRect: frame,
|
||||
styleMask: [.borderless, .nonactivatingPanel],
|
||||
backing: .buffered,
|
||||
defer: false
|
||||
)
|
||||
|
||||
newWindow.isReleasedWhenClosed = false
|
||||
newWindow.isOpaque = false
|
||||
newWindow.backgroundColor = .clear
|
||||
newWindow.hasShadow = false
|
||||
newWindow.ignoresMouseEvents = true
|
||||
newWindow.level = NSWindow.Level(rawValue: Int(CGShieldingWindowLevel()))
|
||||
newWindow.collectionBehavior = [.canJoinAllSpaces, .stationary, .fullScreenAuxiliary]
|
||||
|
||||
window = newWindow
|
||||
if !hasDelegated {
|
||||
SkyLightOperator.shared.delegateWindow(newWindow)
|
||||
hasDelegated = true
|
||||
}
|
||||
return newWindow
|
||||
}
|
||||
|
||||
private func frame(for size: CGSize, on screen: NSScreen) -> NSRect {
|
||||
let screenFrame = screen.frame
|
||||
let originX = screenFrame.midX - (size.width / 2)
|
||||
let musicTop = LockScreenPanelManager.shared.latestFrame?.maxY ?? (screenFrame.midY - 32)
|
||||
|
||||
let defaultWeatherBottom = screenFrame.midY + (screenFrame.height * 0.14)
|
||||
let weatherBottom = LockScreenWeatherPanelManager.shared.latestFrame?.minY ?? min(screenFrame.maxY - 120, max(defaultWeatherBottom, musicTop + size.height + 80))
|
||||
|
||||
let marginAboveMusic: CGFloat = 16
|
||||
let marginBelowWeather: CGFloat = 16
|
||||
|
||||
let constrainedWeatherBottom = max(weatherBottom, musicTop + size.height + marginAboveMusic + marginBelowWeather)
|
||||
let centerY = (musicTop + constrainedWeatherBottom) / 2
|
||||
let lowerBound = screenFrame.minY + 80
|
||||
let upperBound = constrainedWeatherBottom - marginBelowWeather - size.height
|
||||
|
||||
var proposedY = centerY - (size.height / 2)
|
||||
if proposedY < lowerBound {
|
||||
proposedY = lowerBound
|
||||
}
|
||||
if upperBound > lowerBound {
|
||||
proposedY = min(proposedY, upperBound)
|
||||
}
|
||||
|
||||
return NSRect(x: originX, y: proposedY, width: size.width, height: size.height)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -8,6 +8,7 @@ final class LockScreenWeatherPanelManager {
|
|||
|
||||
private var window: NSWindow?
|
||||
private var hasDelegated = false
|
||||
private(set) var latestFrame: NSRect?
|
||||
|
||||
private init() {}
|
||||
|
||||
|
|
@ -23,6 +24,7 @@ final class LockScreenWeatherPanelManager {
|
|||
guard let window else { return }
|
||||
window.orderOut(nil)
|
||||
window.contentView = nil
|
||||
latestFrame = nil
|
||||
}
|
||||
|
||||
private func render(snapshot: LockScreenWeatherSnapshot, makeVisible: Bool) {
|
||||
|
|
@ -39,6 +41,7 @@ final class LockScreenWeatherPanelManager {
|
|||
let targetFrame = frame(for: fittingSize, on: screen)
|
||||
let window = ensureWindow()
|
||||
window.setFrame(targetFrame, display: true)
|
||||
latestFrame = targetFrame
|
||||
window.contentView = hostingView
|
||||
|
||||
if makeVisible {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue