11import UIKit
22
33/// Responsible for parsing GIF data and decoding the individual frames.
4+ @MainActor
45public class Animator {
56 /// Total duration of one animation loop
67 var loopDuration : TimeInterval {
@@ -20,7 +21,7 @@ public class Animator {
2021 private var displayLinkInitialized : Bool = false
2122
2223 /// A delegate responsible for displaying the GIF frames.
23- private weak var delegate : ( any GIFAnimatable ) !
24+ private weak var delegate : ( any GIFAnimatable ) ?
2425
2526 /// Callback for when all the loops of the animation are done (never called for infinite loops)
2627 private var animationBlock : ( ( ) -> Void ) ? = nil
@@ -31,6 +32,7 @@ public class Animator {
3132 /// Responsible for starting and stopping the animation.
3233 private lazy var displayLink : CADisplayLink = { [ unowned self] in
3334 self . displayLinkInitialized = true
35+
3436 let display = CADisplayLink (
3537 target: DisplayLinkProxy ( target: self ) ,
3638 selector: #selector( DisplayLinkProxy . onScreenUpdate)
@@ -71,7 +73,7 @@ public class Animator {
7173
7274 store. shouldChangeFrame ( with: displayLink. duration) {
7375 if $0 {
74- delegate. animatorHasNewFrame ( )
76+ delegate? . animatorHasNewFrame ( )
7577 if store. isLoopFinished, let loopBlock {
7678 loopBlock ( )
7779 }
@@ -88,8 +90,12 @@ public class Animator {
8890 /// - parameter loopCount: Desired number of loops, <= 0 for infinite loop.
8991 /// - parameter completionHandler: Completion callback function
9092 func prepareForAnimation(
91- withGIFNamed imageName: String , inBundle bundle: Bundle = . main, size: CGSize ,
92- contentMode: UIView . ContentMode , loopCount: Int = 0 , completionHandler: ( ( ) -> Void ) ? = nil
93+ withGIFNamed imageName: String ,
94+ inBundle bundle: Bundle = . main,
95+ size: CGSize ,
96+ contentMode: UIView . ContentMode ,
97+ loopCount: Int = 0 ,
98+ completionHandler: ( @Sendable ( ) -> Void ) ? = nil
9399 ) {
94100 guard let extensionRemoved = imageName. components ( separatedBy: " . " ) [ safe: 0 ] ,
95101 let imagePath = bundle. url ( forResource: extensionRemoved, withExtension: " gif " ) ,
@@ -101,7 +107,8 @@ public class Animator {
101107 size: size,
102108 contentMode: contentMode,
103109 loopCount: loopCount,
104- completionHandler: completionHandler)
110+ completionHandler: completionHandler
111+ )
105112 }
106113
107114 /// Prepares the animator instance for animation.
@@ -116,7 +123,7 @@ public class Animator {
116123 size: CGSize ,
117124 contentMode: UIView . ContentMode ,
118125 loopCount: Int = 0 ,
119- completionHandler: ( ( ) -> Void ) ? = nil
126+ completionHandler: ( @ Sendable ( ) -> Void ) ? = nil
120127 ) {
121128 frameStore = FrameStore (
122129 data: imageData,
@@ -136,12 +143,18 @@ public class Animator {
136143 displayLink. add ( to: . main, forMode: RunLoop . Mode. common)
137144 }
138145
139- deinit {
140- if displayLinkInitialized {
146+ private func invalidateDisplayLink ( ) {
147+ Task { [ displayLink ] in
141148 displayLink. invalidate ( )
142149 }
143150 }
144151
152+ deinit {
153+ MainActor . assumeIsolated {
154+ invalidateDisplayLink ( )
155+ }
156+ }
157+
145158 /// Start animating.
146159 func startAnimating( ) {
147160 if frameStore? . isAnimatable ?? false {
@@ -164,9 +177,13 @@ public class Animator {
164177 /// - parameter animationBlock: Callback for when all the loops of the animation are done (never called for infinite loops)
165178 /// - parameter loopBlock: Callback for when a loop is done (at the end of each loop)
166179 func animate(
167- withGIFNamed imageName: String , size: CGSize , contentMode: UIView . ContentMode ,
168- loopCount: Int = 0 , preparationBlock: ( ( ) -> Void ) ? = nil , animationBlock: ( ( ) -> Void ) ? = nil ,
169- loopBlock: ( ( ) -> Void ) ? = nil
180+ withGIFNamed imageName: String ,
181+ size: CGSize ,
182+ contentMode: UIView . ContentMode ,
183+ loopCount: Int = 0 ,
184+ preparationBlock: ( @Sendable ( ) -> Void ) ? = nil ,
185+ animationBlock: ( @Sendable ( ) -> Void ) ? = nil ,
186+ loopBlock: ( @Sendable ( ) -> Void ) ? = nil
170187 ) {
171188 self . animationBlock = animationBlock
172189 self . loopBlock = loopBlock
@@ -175,7 +192,8 @@ public class Animator {
175192 size: size,
176193 contentMode: contentMode,
177194 loopCount: loopCount,
178- completionHandler: preparationBlock)
195+ completionHandler: preparationBlock
196+ )
179197 startAnimating ( )
180198 }
181199
@@ -189,9 +207,13 @@ public class Animator {
189207 /// - parameter animationBlock: Callback for when all the loops of the animation are done (never called for infinite loops)
190208 /// - parameter loopBlock: Callback for when a loop is done (at the end of each loop)
191209 func animate(
192- withGIFData imageData: Data , size: CGSize , contentMode: UIView . ContentMode , loopCount: Int = 0 ,
193- preparationBlock: ( ( ) -> Void ) ? = nil , animationBlock: ( ( ) -> Void ) ? = nil ,
194- loopBlock: ( ( ) -> Void ) ? = nil
210+ withGIFData imageData: Data ,
211+ size: CGSize ,
212+ contentMode: UIView . ContentMode ,
213+ loopCount: Int = 0 ,
214+ preparationBlock: ( @Sendable ( ) -> Void ) ? = nil ,
215+ animationBlock: ( @Sendable ( ) -> Void ) ? = nil ,
216+ loopBlock: ( @Sendable ( ) -> Void ) ? = nil
195217 ) {
196218 self . animationBlock = animationBlock
197219 self . loopBlock = loopBlock
@@ -200,7 +222,8 @@ public class Animator {
200222 size: size,
201223 contentMode: contentMode,
202224 loopCount: loopCount,
203- completionHandler: preparationBlock)
225+ completionHandler: preparationBlock
226+ )
204227 startAnimating ( )
205228 }
206229
@@ -232,5 +255,5 @@ private class DisplayLinkProxy {
232255 init ( target: Animator ) { self . target = target }
233256
234257 /// Lets the target update the frame if needed.
235- @objc func onScreenUpdate( ) { target? . updateFrameIfNeeded ( ) }
258+ @MainActor @ objc func onScreenUpdate( ) { target? . updateFrameIfNeeded ( ) }
236259}
0 commit comments