bukovinafilip/Atoll
1
0
Fork 0
mirror of https://github.com/FBukovina/Atoll.git synced 2026-10-28 15:44: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

121
DynamicIsland/components/LockScreen/LockIconAnimationView.swift Normal file
View file

@ -0,0 +1,121 @@
//
// LockIconAnimationView.swift
// DynamicIsland
//
// Shared animator and SwiftUI Lottie rendering for the lock/unlock sequence.
//
import SwiftUI
import Lottie
@MainActor
final class LockIconAnimator: ObservableObject {
@Published private(set) var progress: CGFloat
private var animationTask: Task<Void, Never>?
private let animationDuration: TimeInterval = 0.35
private let animationSteps: Int = 48
init(initiallyLocked: Bool) {
progress = initiallyLocked ? 1.0 : 0.0
}
deinit {
animationTask?.cancel()
}
func update(isLocked: Bool, animated: Bool = true) {
let target = isLocked ? 1.0 : 0.0
let clampedTarget = max(0.0, min(1.0, target))
if !animated {
animationTask?.cancel()
progress = clampedTarget
return
}
guard abs(progress - clampedTarget) > 0.0005 else {
progress = clampedTarget
return
}
animationTask?.cancel()
let startProgress = progress
let delta = clampedTarget - startProgress
let stepDuration = animationDuration / Double(animationSteps)
let stepNanoseconds = UInt64(stepDuration * 1_000_000_000)
animationTask = Task { [weak self] in
guard let self else { return }
for step in 0...animationSteps {
if Task.isCancelled { return }
if step > 0 {
try? await Task.sleep(nanoseconds: stepNanoseconds)
}
let fraction = Double(step) / Double(animationSteps)
let eased = easeOutCubic(fraction)
progress = startProgress + CGFloat(eased) * CGFloat(delta)
}
progress = clampedTarget
}
}
private func easeOutCubic(_ t: Double) -> Double {
let clamped = max(0.0, min(1.0, t))
return 1.0 - pow(1.0 - clamped, 3)
}
}
struct LockIconProgressView: View {
var progress: CGFloat
var iconColor: Color = .white
var body: some View {
if LockIconLottieView.isAvailable {
Rectangle()
.fill(iconColor)
.mask {
LockIconLottieView(progress: 1 - progress)
.scaleEffect(1.12)
}
} else {
Image(systemName: progress >= 0.5 ? "lock.fill" : "lock.open.fill")
.font(.system(size: 12, weight: .semibold))
.foregroundStyle(iconColor)
}
}
}
struct LockIconLottieView: View {
var progress: CGFloat
private static let animation: LottieAnimation? = {
if let animation = LottieAnimation.named("Lock") {
return animation
} else {
print("⚠️ [LockIconLottieView] Missing Lock.json animation – falling back to SF Symbols")
return nil
}
}()
static var isAvailable: Bool {
animation != nil
}
var body: some View {
Group {
if let animation = Self.animation {
LottieView(animation: animation)
.currentProgress(progress)
.configuration(.init(renderingEngine: .mainThread))
} else {
Color.clear
}
}
}
}

21
DynamicIsland/components/LockScreen/LockScreenLiveActivity.swift
View file

@ -11,30 +11,27 @@ import Defaults
struct LockScreenLiveActivity: View {
@EnvironmentObject var vm: DynamicIslandViewModel
@ObservedObject private var lockScreenManager = LockScreenManager.shared
@StateObject private var iconAnimator = LockIconAnimator(initiallyLocked: LockScreenManager.shared.isLocked)
@State private var isHovering: Bool = false
@State private var gestureProgress: CGFloat = 0
@State private var isExpanded: Bool = false
@Namespace private var lockIconSpace
private var iconName: String {
lockScreenManager.isLocked ? "lock.fill" : "lock.open.fill"
}
private var iconColor: Color {
.white
}
private var indicatorDimension: CGFloat {
max(0, vm.effectiveClosedNotchHeight - 12)
}
var body: some View {
HStack(spacing: 0) {
// Left - Lock icon with subtle glow
Color.clear
.overlay(alignment: .leading) {
if isExpanded {
Image(systemName: iconName)
.font(.system(size: 12, weight: .semibold))
.foregroundStyle(iconColor)
.matchedGeometryEffect(id: "lock-icon", in: lockIconSpace)
.frame(width: vm.effectiveClosedNotchHeight - 12, height: vm.effectiveClosedNotchHeight - 12)
LockIconProgressView(progress: iconAnimator.progress, iconColor: iconColor)
.frame(width: indicatorDimension, height: indicatorDimension)
}
}
.frame(width: isExpanded ? max(0, vm.effectiveClosedNotchHeight - (isHovering ? 0 : 12) + gestureProgress / 2) : 0, height: vm.effectiveClosedNotchHeight - (isHovering ? 0 : 12))
@ -50,6 +47,7 @@ struct LockScreenLiveActivity: View {
}
.frame(height: vm.effectiveClosedNotchHeight + (isHovering ? 8 : 0))
.onAppear {
iconAnimator.update(isLocked: lockScreenManager.isLocked, animated: false)
// Expand immediately without animation to avoid conflicts
withAnimation(.smooth(duration: 0.4)) {
isExpanded = true
@ -70,6 +68,9 @@ struct LockScreenLiveActivity: View {
}
}
}
.onChange(of: lockScreenManager.isLocked) { _, newValue in
iconAnimator.update(isLocked: newValue)
}
.animation(.spring(response: 0.5, dampingFraction: 0.85), value: lockScreenManager.isLocked)
.animation(.easeOut(duration: 0.25), value: isExpanded)
}

7
DynamicIsland/components/LockScreen/LockScreenLiveActivityOverlay.swift
View file

@ -1,13 +1,13 @@
import SwiftUI
final class LockScreenLiveActivityOverlayModel: ObservableObject {
@Published var iconName: String = "lock.fill"
@Published var scale: CGFloat = 0.6
@Published var opacity: Double = 0
}
struct LockScreenLiveActivityOverlay: View {
@ObservedObject var model: LockScreenLiveActivityOverlayModel
@ObservedObject var animator: LockIconAnimator
let notchSize: CGSize
private var indicatorSize: CGFloat {
@ -26,9 +26,7 @@ struct LockScreenLiveActivityOverlay: View {
HStack(spacing: 0) {
Color.clear
.overlay(alignment: .leading) {
Image(systemName: model.iconName)
.font(.system(size: 12, weight: .semibold))
.foregroundStyle(.white)
LockIconProgressView(progress: animator.progress)
.frame(width: indicatorSize, height: indicatorSize)
}
.frame(width: indicatorSize, height: notchSize.height)
@ -52,6 +50,5 @@ struct LockScreenLiveActivityOverlay: View {
.frame(width: totalWidth, height: notchSize.height)
.scaleEffect(x: model.scale, y: 1, anchor: .center)
.opacity(model.opacity)
.drawingGroup()
}
}

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()