bukovinafilip/Atoll
1
0
Fork 0
mirror of https://github.com/FBukovina/Atoll.git synced 2026-10-27 15:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Unlock delay

Browse source
This commit is contained in:
Hariharan Mudaliar 2025-11-07 01:24:11 +05:30
commit 4ab062213d
3 changed files with 41 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,14 @@ struct LockScreenLiveActivity: View {
@State private var gestureProgress: CGFloat = 0
@State private var isExpanded: Bool = false
private var expandAnimation: Animation {
.smooth(duration: LockScreenAnimationTimings.lockExpand)
}
private var collapseAnimation: Animation {
.smooth(duration: LockScreenAnimationTimings.unlockCollapse)
}
private var iconColor: Color {
.white
}
@ -48,9 +56,9 @@ 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
let shouldStartExpanded = lockScreenManager.isLocked || !lockScreenManager.isLockIdle
withAnimation(expandAnimation) {
isExpanded = shouldStartExpanded
}
}
.onDisappear {
@ -59,17 +67,26 @@ struct LockScreenLiveActivity: View {
}
.onChange(of: lockScreenManager.isLockIdle) { _, newValue in
if newValue {
withAnimation(.smooth(duration: 0.4)) {
withAnimation(collapseAnimation) {
isExpanded = false
}
} else {
withAnimation(.smooth(duration: 0.4)) {
} else if lockScreenManager.isLocked {
withAnimation(expandAnimation) {
isExpanded = true
}
}
}
.onChange(of: lockScreenManager.isLocked) { _, newValue in
iconAnimator.update(isLocked: newValue)
if newValue {
withAnimation(expandAnimation) {
isExpanded = true
}
} else {
withAnimation(collapseAnimation) {
isExpanded = false
}
}
}
.animation(.spring(response: 0.5, dampingFraction: 0.85), value: lockScreenManager.isLocked)
.animation(.easeOut(duration: 0.25), value: isExpanded)