Update Lottie and the related code

Automattic · Jan 24, 2024 · e2c6474 · e2c6474
1 parent 4cda81b
commit e2c6474
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/podcasts.xcodeproj/project.pbxproj b/podcasts.xcodeproj/project.pbxproj
@@ -11358,7 +11358,7 @@
 			repositoryURL = "https://github.com/airbnb/lottie-ios.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 3.2.3;
+				minimumVersion = 4.4.0;
 			};
 		};
 		BDD239BB267C869B0047750C /* XCRemoteSwiftPackageReference "SwipeCellKit" */ = {

diff --git a/podcasts.xcworkspace/xcshareddata/swiftpm/Package.resolved b/podcasts.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -159,8 +159,8 @@
         "repositoryURL": "https://github.com/airbnb/lottie-ios.git",
         "state": {
           "branch": null,
-          "revision": "4a6058cbbdfe4f74aeae92c8bd51ad3b0de2a1ee",
-          "version": "3.3.0"
+          "revision": "f522990668c2f9132323a2e68d924c7dcb9130b4",
+          "version": "4.4.0"
         }
       },
       {

diff --git a/podcasts/BasePlayPauseButton.swift b/podcasts/BasePlayPauseButton.swift
@@ -7,7 +7,7 @@ class BasePlayPauseButton: UIButton {
     private enum PlayState { case playing, paused, notSet }
 
     private var currentState = PlayState.notSet
-    var animationView: AnimationView!
+    var animationView: LottieAnimationView!
 
     var isPlaying = false {
         didSet {
@@ -33,7 +33,7 @@ class BasePlayPauseButton: UIButton {
     var playButtonColor: UIColor = .white {
         didSet {
             let colorValues = playButtonColor.getRGBA()
-            let colorProvider = ColorValueProvider(Color(r: colorValues[0], g: colorValues[1], b: colorValues[2], a: colorValues[3]))
+            let colorProvider = ColorValueProvider(LottieColor(r: colorValues[0], g: colorValues[1], b: colorValues[2], a: colorValues[3]))
             animationView.setValueProvider(colorProvider, keypath: AnimationKeypath(keypath: "**.Fill 1.Color"))
             animationView.setValueProvider(colorProvider, keypath: AnimationKeypath(keypath: "**.Stroke 1.Color"))
         }
@@ -42,7 +42,7 @@ class BasePlayPauseButton: UIButton {
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
 
-        animationView = AnimationView(name: animationName())
+        animationView = LottieAnimationView(name: animationName())
         animationView.isUserInteractionEnabled = false
         animationView.animationSpeed = BasePlayPauseButton.animationSpeed
     }
@@ -65,7 +65,7 @@ class BasePlayPauseButton: UIButton {
         animate(from: 0, to: 0.5, changingToState: .paused)
     }
 
-    func place(animation: AnimationView) {}
+    func place(animation: LottieAnimationView) {}
     func animationName() -> String {
         "player_play_button"
     }

diff --git a/podcasts/NowPlayingAnimationView.swift b/podcasts/NowPlayingAnimationView.swift
@@ -15,10 +15,10 @@ class NowPlayingAnimationView: UIView {
         }
     }
 
-    private var animationView: AnimationView
+    private var animationView: LottieAnimationView
 
     required init?(coder aDecoder: NSCoder) {
-        animationView = AnimationView(name: "nowplaying")
+        animationView = LottieAnimationView(name: "nowplaying")
 
         super.init(coder: aDecoder)
     }

diff --git a/podcasts/PlayPauseButton.swift b/podcasts/PlayPauseButton.swift
@@ -26,7 +26,7 @@ class PlayPauseButton: BasePlayPauseButton {
         circleView.layer.cornerRadius = 0.5 * circleView.bounds.width
     }
 
-    override func place(animation: AnimationView) {
+    override func place(animation: LottieAnimationView) {
         circleView.translatesAutoresizingMaskIntoConstraints = false
         addSubview(circleView)
         NSLayoutConstraint.activate([

diff --git a/podcasts/PlayPauseLabeledButton.swift b/podcasts/PlayPauseLabeledButton.swift
@@ -73,7 +73,7 @@ class PlayPauseLabeledButton: BasePlayPauseButton {
         layer.cornerRadius = frame.size.height / 2
     }
 
-    override func place(animation: AnimationView) {
+    override func place(animation: LottieAnimationView) {
         animation.translatesAutoresizingMaskIntoConstraints = false
         animation.isUserInteractionEnabled = false
         label.translatesAutoresizingMaskIntoConstraints = false

diff --git a/podcasts/SkipButton.swift b/podcasts/SkipButton.swift
@@ -27,17 +27,17 @@ class SkipButton: UIButton {
             skipLabel.textColor = tintColor
 
             let colorValues = tintColor.getRGBA()
-            let colorProvider = ColorValueProvider(Color(r: colorValues[0], g: colorValues[1], b: colorValues[2], a: colorValues[3]))
+            let colorProvider = ColorValueProvider(LottieColor(r: colorValues[0], g: colorValues[1], b: colorValues[2], a: colorValues[3]))
             animationView.setValueProvider(colorProvider, keypath: AnimationKeypath(keypath: "**.Fill 1.Color"))
             animationView.setValueProvider(colorProvider, keypath: AnimationKeypath(keypath: "**.Stroke 1.Color"))
         }
     }
 
-    private var animationView: AnimationView
+    private var animationView: LottieAnimationView
     private let skipLabel: UILabel
 
     required init?(coder aDecoder: NSCoder) {
-        animationView = AnimationView(name: "skip_button")
+        animationView = LottieAnimationView(name: "skip_button")
         skipLabel = UILabel()
 
         super.init(coder: aDecoder)

diff --git a/podcasts/SleepTimerButton.swift b/podcasts/SleepTimerButton.swift
@@ -21,20 +21,20 @@ class SleepTimerButton: UIButton {
         }
     }
 
-    private var animationView: AnimationView
+    private var animationView: LottieAnimationView
 
     override var tintColor: UIColor! {
         didSet {
             let colorValues = tintColor.getRGBA()
-            let colorProvider = ColorValueProvider(Color(r: colorValues[0], g: colorValues[1], b: colorValues[2], a: colorValues[3] * 2))
+            let colorProvider = ColorValueProvider(LottieColor(r: colorValues[0], g: colorValues[1], b: colorValues[2], a: colorValues[3] * 2))
             animationView.setValueProvider(colorProvider, keypath: AnimationKeypath(keypath: "**.Fill 1.Color"))
             animationView.setValueProvider(colorProvider, keypath: AnimationKeypath(keypath: "**.Fill 2.Color"))
             animationView.setValueProvider(colorProvider, keypath: AnimationKeypath(keypath: "**.Fill 3.Color"))
         }
     }
 
     override init(frame: CGRect) {
-        animationView = AnimationView(name: "sleep_button")
+        animationView = LottieAnimationView(name: "sleep_button")
         animationView.isUserInteractionEnabled = false
         animationView.animationSpeed = 1.0
         animationView.currentProgress = 0.5
@@ -45,7 +45,7 @@ class SleepTimerButton: UIButton {
     }
 
     required init?(coder aDecoder: NSCoder) {
-        animationView = AnimationView(name: "sleep_button")
+        animationView = LottieAnimationView(name: "sleep_button")
         animationView.isUserInteractionEnabled = false
         animationView.animationSpeed = 1.0
         animationView.currentProgress = 0.5