mirror of
https://github.com/FBukovina/Atoll.git
synced 2026-10-27 15:14:33 +00:00
Working Lock Screen HUD
This commit is contained in:
parent
44b18513f2
commit
ce8cce0252
4 changed files with 265 additions and 10 deletions
127
DynamicIsland/managers/LockScreenLiveActivityWindowManager.swift
Normal file
127
DynamicIsland/managers/LockScreenLiveActivityWindowManager.swift
Normal file
|
|
@ -0,0 +1,127 @@
|
|||
//
|
||||
// LockScreenLiveActivityWindowManager.swift
|
||||
// DynamicIsland
|
||||
//
|
||||
// Delegates the lock screen live activity layout to SkyLight so it remains visible when the display is locked.
|
||||
//
|
||||
|
||||
import AppKit
|
||||
import Defaults
|
||||
import SkyLightWindow
|
||||
import SwiftUI
|
||||
|
||||
@MainActor
|
||||
class LockScreenLiveActivityWindowManager {
|
||||
static let shared = LockScreenLiveActivityWindowManager()
|
||||
|
||||
private var window: NSWindow?
|
||||
private var hasDelegated = false
|
||||
private var hideTask: Task<Void, Never>?
|
||||
|
||||
private init() {}
|
||||
|
||||
private func timestamp() -> String {
|
||||
let formatter = DateFormatter()
|
||||
formatter.dateFormat = "HH:mm:ss.SSS"
|
||||
return formatter.string(from: Date())
|
||||
}
|
||||
|
||||
private func frame(for notchSize: CGSize, on screen: NSScreen) -> NSRect {
|
||||
let indicatorSize = max(0, notchSize.height - 12)
|
||||
let horizontalPadding = cornerRadiusInsets.closed.bottom
|
||||
let totalWidth = notchSize.width + (indicatorSize * 2) + (horizontalPadding * 2)
|
||||
|
||||
let screenFrame = screen.frame
|
||||
let originX = screenFrame.origin.x + (screenFrame.width / 2) - (totalWidth / 2)
|
||||
let originY = screenFrame.origin.y + screenFrame.height - notchSize.height
|
||||
|
||||
return NSRect(x: originX, y: originY, width: totalWidth, height: notchSize.height)
|
||||
}
|
||||
|
||||
private func ensureWindow(notchSize: CGSize, screen: NSScreen) -> NSWindow {
|
||||
if let window {
|
||||
return window
|
||||
}
|
||||
|
||||
let window = NSWindow(
|
||||
contentRect: frame(for: notchSize, on: screen),
|
||||
styleMask: [.borderless, .nonactivatingPanel],
|
||||
backing: .buffered,
|
||||
defer: false
|
||||
)
|
||||
|
||||
window.isOpaque = false
|
||||
window.backgroundColor = .clear
|
||||
window.isReleasedWhenClosed = false
|
||||
window.ignoresMouseEvents = true
|
||||
window.hasShadow = false
|
||||
window.level = NSWindow.Level(rawValue: Int(CGShieldingWindowLevel()))
|
||||
window.collectionBehavior = [.canJoinAllSpaces, .stationary, .fullScreenAuxiliary]
|
||||
window.alphaValue = 0
|
||||
|
||||
self.window = window
|
||||
self.hasDelegated = false
|
||||
return window
|
||||
}
|
||||
|
||||
private func present(state: LockLiveActivityState) {
|
||||
guard Defaults[.enableLockScreenLiveActivity] else {
|
||||
hideImmediately()
|
||||
return
|
||||
}
|
||||
|
||||
guard let screen = NSScreen.main else {
|
||||
print("[\(timestamp())] LockScreenLiveActivityWindowManager: no main screen available")
|
||||
return
|
||||
}
|
||||
|
||||
let notchSize = getClosedNotchSize(screen: screen.localizedName)
|
||||
let window = ensureWindow(notchSize: notchSize, screen: screen)
|
||||
let targetFrame = frame(for: notchSize, on: screen)
|
||||
window.setFrame(targetFrame, display: true)
|
||||
|
||||
let overlay = LockScreenLiveActivityOverlay(state: state, notchSize: notchSize)
|
||||
window.contentView = NSHostingView(rootView: overlay)
|
||||
|
||||
if !hasDelegated {
|
||||
SkyLightOperator.shared.delegateWindow(window)
|
||||
hasDelegated = true
|
||||
}
|
||||
|
||||
window.alphaValue = 1
|
||||
window.orderFrontRegardless()
|
||||
}
|
||||
|
||||
func showLocked() {
|
||||
hideTask?.cancel()
|
||||
present(state: .locked)
|
||||
print("[\(timestamp())] LockScreenLiveActivityWindowManager: showing locked state")
|
||||
}
|
||||
|
||||
func showUnlockAndScheduleHide() {
|
||||
hideTask?.cancel()
|
||||
present(state: .unlocking)
|
||||
print("[\(timestamp())] LockScreenLiveActivityWindowManager: showing unlock state")
|
||||
|
||||
hideTask = Task { [weak self] in
|
||||
try? await Task.sleep(for: .seconds(max(Defaults[.waitInterval], 1.0)))
|
||||
guard let self, !Task.isCancelled else { return }
|
||||
await MainActor.run {
|
||||
self.hideImmediately()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func hideImmediately() {
|
||||
hideTask?.cancel()
|
||||
hideTask = nil
|
||||
|
||||
guard let window else { return }
|
||||
|
||||
window.orderOut(nil)
|
||||
window.alphaValue = 0
|
||||
window.contentView = nil
|
||||
|
||||
print("[\(timestamp())] LockScreenLiveActivityWindowManager: HUD hidden")
|
||||
}
|
||||
}
|
||||
|
|
@ -83,6 +83,7 @@ class LockScreenManager: ObservableObject {
|
|||
// Show panel FIRST (creates and shows window on lock screen)
|
||||
print("[\(timestamp())] LockScreenManager: 🎵 Showing lock screen panel")
|
||||
LockScreenPanelManager.shared.showPanel()
|
||||
LockScreenLiveActivityWindowManager.shared.showLocked()
|
||||
|
||||
// THEN trigger lock icon in Dynamic Island (only if enabled in settings)
|
||||
if Defaults[.enableLockScreenLiveActivity] {
|
||||
|
|
@ -101,6 +102,7 @@ class LockScreenManager: ObservableObject {
|
|||
// Hide panel window immediately and synchronously
|
||||
print("[\(timestamp())] LockScreenManager: 🚪 Hiding panel window")
|
||||
LockScreenPanelManager.shared.hidePanel()
|
||||
LockScreenLiveActivityWindowManager.shared.showUnlockAndScheduleHide()
|
||||
|
||||
// Update state immediately
|
||||
if Defaults[.enableLockScreenLiveActivity] {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue