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

Working Animation Lock Screen

Browse source
This commit is contained in:
Hariharan Mudaliar 2025-10-23 01:25:51 +05:30
commit 71e6be4218
9 changed files with 158 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

19
DynamicIsland/managers/LockScreenLiveActivityWindowManager.swift
View file

@ -19,6 +19,7 @@ class LockScreenLiveActivityWindowManager {
private var hideTask: Task<Void, Never>?
private var hostingView: NSHostingView<LockScreenLiveActivityOverlay>?
private let overlayModel = LockScreenLiveActivityOverlayModel()
private let overlayAnimator = LockIconAnimator(initiallyLocked: LockScreenManager.shared.isLocked)
private weak var viewModel: DynamicIslandViewModel?
private init() {}
@ -103,7 +104,7 @@ class LockScreenLiveActivityWindowManager {
let targetFrame = frame(for: windowSize, on: screen)
window.setFrame(targetFrame, display: true)
let overlayView = LockScreenLiveActivityOverlay(model: overlayModel, notchSize: notchSize)
let overlayView = LockScreenLiveActivityOverlay(model: overlayModel, animator: overlayAnimator, notchSize: notchSize)
if let hostingView {
hostingView.rootView = overlayView
@ -134,7 +135,7 @@ class LockScreenLiveActivityWindowManager {
hideTask?.cancel()
guard let context = lockContext() else { return }
overlayModel.iconName = "lock.fill"
overlayAnimator.update(isLocked: true)
overlayModel.scale = 0.6
overlayModel.opacity = 0
@ -156,20 +157,12 @@ class LockScreenLiveActivityWindowManager {
hideTask?.cancel()
guard let context = lockContext() else { return }
overlayModel.iconName = "lock.open.fill"
overlayModel.scale = 0.7
overlayModel.opacity = 0
overlayModel.scale = 1
overlayModel.opacity = 1
present(notchSize: context.notchSize, on: context.screen)
DispatchQueue.main.async {
withAnimation(.spring(response: 0.45, dampingFraction: 0.85)) {
self.overlayModel.scale = 1
}
withAnimation(.easeOut(duration: 0.16)) {
self.overlayModel.opacity = 1
}
}
overlayAnimator.update(isLocked: false)
hideTask = Task { [weak self] in
try? await Task.sleep(for: .seconds(max(Defaults[.waitInterval], 1.0)))

12
DynamicIsland/managers/LockScreenManager.swift
View file

@ -27,6 +27,7 @@ class LockScreenManager: ObservableObject {
// MARK: - Private Properties
private var debounceIdleTask: Task<Void, Never>?
private var collapseTask: Task<Void, Never>?
// MARK: - Helpers
@ -45,6 +46,7 @@ class LockScreenManager: ObservableObject {
deinit {
DistributedNotificationCenter.default().removeObserver(self)
debounceIdleTask?.cancel()
collapseTask?.cancel()
}
// MARK: - Setup
@ -80,6 +82,7 @@ class LockScreenManager: ObservableObject {
// Set locked state immediately without animation wrapper
isLocked = true
collapseTask?.cancel()
viewModel?.closeForLockScreen()
@ -120,7 +123,14 @@ class LockScreenManager: ObservableObject {
// Update state immediately
if Defaults[.enableLockScreenLiveActivity] {
self.coordinator.toggleExpandingView(status: false, type: .lockScreen)
collapseTask?.cancel()
collapseTask = Task { [weak self] in
try? await Task.sleep(for: .milliseconds(380))
guard let self = self, !Task.isCancelled else { return }
await MainActor.run {
self.coordinator.toggleExpandingView(status: false, type: .lockScreen)
}
}
}
self.lastUpdated = Date()