lottie-ios 3.4.3 → 3.4.4

package/.github/FUNDING.yml

@@ -1,12 +1 @@
-# These are supported funding model platforms
-
-github: [buba447]
-patreon: # Replace with a single Patreon username
 open_collective: lottie
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

package/Lottie.xcodeproj/project.pbxproj

@@ -2674,8 +2674,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing.git";
 			requirement = {
-				branch = main;
-				kind = branch;
+				kind = revision;
+				revision = 0c2826f26d00ff5ddf2de92cb6b2139b0dd3d1ee;
 			};
 		};
 		6D0E635D28246BD0007C5DB6 /* XCRemoteSwiftPackageReference "Difference" */ = {

package/Lottie.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,22 @@
+{
+  "pins" : [
+    {
+      "identity" : "difference",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/krzysztofzablocki/Difference",
+      "state" : {
+        "revision" : "02fe1111edc8318c4f8a0da96336fcbcc201f38b",
+        "version" : "1.0.1"
+      }
+    },
+    {
+      "identity" : "swift-snapshot-testing",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-snapshot-testing.git",
+      "state" : {
+        "revision" : "0c2826f26d00ff5ddf2de92cb6b2139b0dd3d1ee"
+      }
+    }
+  ],
+  "version" : 2
+}

package/Lottie.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -23,8 +23,8 @@
         "package": "swift-snapshot-testing",
         "repositoryURL": "https://github.com/pointfreeco/swift-snapshot-testing.git",
         "state": {
-          "branch": "main",
-          "revision": "88f6e2c0afe04221fcfb1601a2ecaad83115a05f",
+          "branch": null,
+          "revision": "0c2826f26d00ff5ddf2de92cb6b2139b0dd3d1ee",
           "version": null
         }
       }

package/Sources/Private/CoreAnimation/Animations/CombinedShapeAnimation.swift

@@ -56,22 +56,25 @@ extension CombinedShapeItem {
   /// Manually combines the given shape keyframes by manually interpolating at each frame
   static func manuallyInterpolating(
     shapes: [KeyframeGroup<BezierPath>],
-    name: String,
-    context: LayerContext)
+    name: String)
     -> CombinedShapeItem
   {
-    let animationTimeRange = Int(context.animation.startFrame)...Int(context.animation.endFrame)
-
     let interpolators = shapes.map { shape in
       KeyframeInterpolator(keyframes: shape.keyframes)
     }
 
-    let interpolatedKeyframes = animationTimeRange.map { frame in
+    let times = shapes.flatMap { $0.keyframes.map { $0.time } }
+
+    let minimumTime = times.min() ?? 0
+    let maximumTime = times.max() ?? 0
+    let animationLocalTimeRange = Int(minimumTime)...Int(maximumTime)
+
+    let interpolatedKeyframes = animationLocalTimeRange.map { localTime in
       Keyframe(
         value: interpolators.compactMap { interpolator in
-          interpolator.value(frame: AnimationFrameTime(frame)) as? BezierPath
+          interpolator.value(frame: AnimationFrameTime(localTime)) as? BezierPath
         },
-        time: AnimationFrameTime(frame))
+        time: AnimationFrameTime(localTime))
     }
 
     return CombinedShapeItem(

package/Sources/Private/CoreAnimation/Layers/ShapeLayer.swift

@@ -157,7 +157,7 @@ final class GroupLayer: BaseAnimationLayer {
         // interpolate the path for each shape at each frame ahead of time so we can combine them
         // into a single set of bezier path keyframes.
         else {
-          combinedShape = .manuallyInterpolating(shapes: allPathKeyframes, name: group.name, context: context)
+          combinedShape = .manuallyInterpolating(shapes: allPathKeyframes, name: group.name)
         }
 
         let sublayer = try ShapeItemLayer(

package/Sources/Private/MainThread/NodeRenderSystem/Extensions/ItemsExtension.swift

@@ -80,7 +80,7 @@ extension Array where Element == ShapeItem {
         nodeTree.paths.append(contentsOf: tree.paths)
         nodeTree.renderContainers.append(node.container)
       } else if item is Repeater {
-        LottieLogger.shared.assertionFailure("""
+        LottieLogger.shared.warn("""
           The Main Thread rendering engine doesn't currently support repeaters.
           To play an animation with repeaters, you can use the Core Animation rendering engine instead.
           """)

package/Sources/Private/Model/Objects/Marker.swift

@@ -15,6 +15,7 @@ final class Marker: Codable, DictionaryInitializable {
   init(dictionary: [String: Any]) throws {
     name = try dictionary.value(for: CodingKeys.name)
     frameTime = try dictionary.value(for: CodingKeys.frameTime)
+    durationFrameTime = try dictionary.value(for: CodingKeys.durationFrameTime)
   }
 
   // MARK: Internal
@@ -22,6 +23,7 @@ final class Marker: Codable, DictionaryInitializable {
   enum CodingKeys: String, CodingKey {
     case name = "cm"
     case frameTime = "tm"
+    case durationFrameTime = "dr"
   }
 
   /// The Marker Name
@@ -30,4 +32,6 @@ final class Marker: Codable, DictionaryInitializable {
   /// The Frame time of the marker
   let frameTime: AnimationFrameTime
 
+  /// The duration of the marker, in frames.
+  let durationFrameTime: AnimationFrameTime
 }

package/Sources/Public/Animation/AnimationPublic.swift

@@ -234,6 +234,21 @@ extension Animation {
     return marker.frameTime
   }
 
+  /// Markers are a way to describe a point in time and a duration by a key name.
+  ///
+  /// Markers are encoded into animation JSON. By using markers a designer can mark
+  /// playback points for a developer to use without having to worry about keeping
+  /// track of animation frames. If the animation file is updated, the developer
+  /// does not need to update playback code.
+  ///
+  /// - Returns: The duration frame time for the marker, or `nil` if no marker found.
+  public func durationFrameTime(forMarker named: String) -> AnimationFrameTime? {
+    guard let marker = markerMap?[named] else {
+      return nil
+    }
+    return marker.durationFrameTime
+  }
+
   /// Converts Frame Time (Seconds * Framerate) into Progress Time
   /// (optionally clamped to between 0 and 1).
   public func progressTime(

package/Sources/Public/Animation/AnimationView.swift

@@ -513,6 +513,32 @@ final public class AnimationView: AnimationViewBase {
     addNewAnimationForContext(context)
   }
 
+  /// Plays the animation from a named marker to the end of the marker's duration.
+  ///
+  /// A marker is a point in time with an associated duration that is encoded into the
+  /// animation data and assigned a name.
+  ///
+  /// NOTE: If marker is not found the play command will exit.
+  ///
+  /// - Parameter marker: The start marker for the animation playback.
+  /// - Parameter loopMode: The loop behavior of the animation. If `nil` the view's `loopMode` property will be used.
+  /// - Parameter completion: An optional completion closure to be called when the animation stops.
+  public func play(
+    marker: String,
+    loopMode: LottieLoopMode? = nil,
+    completion: LottieCompletionBlock? = nil)
+  {
+    guard let from = animation?.markerMap?[marker] else {
+      return
+    }
+
+    play(
+      fromFrame: from.frameTime,
+      toFrame: from.frameTime + from.durationFrameTime,
+      loopMode: loopMode,
+      completion: completion)
+  }
+
   /// Stops the animation and resets the view to its start frame.
   ///
   /// The completion closure will be called with `false`
@@ -713,6 +739,21 @@ final public class AnimationView: AnimationViewBase {
     return animation.frameTime(forMarker: named)
   }
 
+  /// Markers are a way to describe a point in time and a duration by a key name.
+  ///
+  /// Markers are encoded into animation JSON. By using markers a designer can mark
+  /// playback points for a developer to use without having to worry about keeping
+  /// track of animation frames. If the animation file is updated, the developer
+  /// does not need to update playback code.
+  ///
+  /// - Returns: The duration frame time for the marker, or `nil` if no marker found.
+  public func durationFrameTime(forMarker named: String) -> AnimationFrameTime? {
+    guard let animation = animation else {
+      return nil
+    }
+    return animation.durationFrameTime(forMarker: named)
+  }
+
   // MARK: Internal
 
   var animationLayer: RootAnimationLayer? = nil

package/Sources/Public/iOS/AnimatedButton.swift

@@ -31,29 +31,9 @@ open class AnimatedButton: AnimatedControl {
     isAccessibilityElement = true
   }
 
-  // MARK: Public
-
-  public override var accessibilityTraits: UIAccessibilityTraits {
-    set { super.accessibilityTraits = newValue }
-    get { super.accessibilityTraits.union(.button) }
-  }
-
-  /// Sets the play range for the given UIControlEvent.
-  public func setPlayRange(fromProgress: AnimationProgressTime, toProgress: AnimationProgressTime, event: UIControl.Event) {
-    rangesForEvents[event.rawValue] = (from: fromProgress, to: toProgress)
-  }
+  // MARK: Open
 
-  /// Sets the play range for the given UIControlEvent.
-  public func setPlayRange(fromMarker fromName: String, toMarker toName: String, event: UIControl.Event) {
-    if
-      let start = animationView.progressTime(forMarker: fromName),
-      let end = animationView.progressTime(forMarker: toName)
-    {
-      rangesForEvents[event.rawValue] = (from: start, to: end)
-    }
-  }
-
-  public override func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
+  open override func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
     let _ = super.beginTracking(touch, with: event)
     let touchEvent = UIControl.Event.touchDown
     if let playrange = rangesForEvents[touchEvent.rawValue] {
@@ -62,7 +42,7 @@ open class AnimatedButton: AnimatedControl {
     return true
   }
 
-  public override func endTracking(_ touch: UITouch?, with event: UIEvent?) {
+  open override func endTracking(_ touch: UITouch?, with event: UIEvent?) {
     super.endTracking(touch, with: event)
     let touchEvent: UIControl.Event
     if let touch = touch, bounds.contains(touch.location(in: self)) {
@@ -76,6 +56,28 @@ open class AnimatedButton: AnimatedControl {
     }
   }
 
+  // MARK: Public
+
+  public override var accessibilityTraits: UIAccessibilityTraits {
+    set { super.accessibilityTraits = newValue }
+    get { super.accessibilityTraits.union(.button) }
+  }
+
+  /// Sets the play range for the given UIControlEvent.
+  public func setPlayRange(fromProgress: AnimationProgressTime, toProgress: AnimationProgressTime, event: UIControl.Event) {
+    rangesForEvents[event.rawValue] = (from: fromProgress, to: toProgress)
+  }
+
+  /// Sets the play range for the given UIControlEvent.
+  public func setPlayRange(fromMarker fromName: String, toMarker toName: String, event: UIControl.Event) {
+    if
+      let start = animationView.progressTime(forMarker: fromName),
+      let end = animationView.progressTime(forMarker: toName)
+    {
+      rangesForEvents[event.rawValue] = (from: start, to: end)
+    }
+  }
+
   // MARK: Private
 
   private var rangesForEvents: [UInt : (from: CGFloat, to: CGFloat)] =

package/Sources/Public/iOS/AnimatedSwitch.swift

@@ -67,6 +67,18 @@ open class AnimatedSwitch: AnimatedControl {
     isAccessibilityElement = true
   }
 
+  // MARK: Open
+
+  open override func animationDidSet() {
+    updateOnState(isOn: _isOn, animated: animateUpdateWhenChangingAnimation, shouldFireHaptics: false)
+  }
+
+  open override func endTracking(_ touch: UITouch?, with event: UIEvent?) {
+    super.endTracking(touch, with: event)
+    updateOnState(isOn: !_isOn, animated: true, shouldFireHaptics: true)
+    sendActions(for: .valueChanged)
+  }
+
   // MARK: Public
 
   /// Defines what happens when the user taps the switch while an
@@ -79,6 +91,9 @@ open class AnimatedSwitch: AnimatedControl {
   /// The cancel behavior for the switch. See CancelBehavior for options
   public var cancelBehavior: CancelBehavior = .reverse
 
+  /// If `false` the switch will not play the animation when changing between animations.
+  public var animateUpdateWhenChangingAnimation = true
+
   public override var accessibilityTraits: UIAccessibilityTraits {
     set { super.accessibilityTraits = newValue }
     get { super.accessibilityTraits.union(.button) }
@@ -119,16 +134,6 @@ open class AnimatedSwitch: AnimatedControl {
     updateOnState(isOn: _isOn, animated: false, shouldFireHaptics: false)
   }
 
-  public override func endTracking(_ touch: UITouch?, with event: UIEvent?) {
-    super.endTracking(touch, with: event)
-    updateOnState(isOn: !_isOn, animated: true, shouldFireHaptics: true)
-    sendActions(for: .valueChanged)
-  }
-
-  public override func animationDidSet() {
-    updateOnState(isOn: _isOn, animated: true, shouldFireHaptics: false)
-  }
-
   // MARK: Internal
 
   // MARK: Animation State

package/Sources/Public/iOS/Compatibility/CompatibleAnimationView.swift

@@ -186,6 +186,16 @@ public final class CompatibleAnimationView: UIView {
       completion: completion)
   }
 
+  @objc
+  public func play(
+    marker: String,
+    completion: ((Bool) -> Void)? = nil)
+  {
+    animationView.play(
+      marker: marker,
+      completion: completion)
+  }
+
   @objc
   public func stop() {
     animationView.stop()
@@ -302,6 +312,11 @@ public final class CompatibleAnimationView: UIView {
     animationView.frameTime(forMarker: named) ?? 0
   }
 
+  @objc
+  public func durationFrameTime(forMarker named: String) -> CGFloat {
+    animationView.durationFrameTime(forMarker: named) ?? 0
+  }
+
   // MARK: Private
 
   private let animationView: AnimationView

package/Tests/Artifacts/LottieTests.xcresult/Data/data.0~4VqMqsI5lOfxRppnud6-VDWcNsU8J7VgFCJfW2dXPwOcAkvU-I8Um5yp9n0Zv6nr3VmcxYggaVMDFfR0U_vjKw==

@@ -0,0 +1 @@
+[]

package/Tests/Artifacts/LottieTests.xcresult/Data/data.0~MBDeCFoahVzzmtSQrVhhy9VMJV6CmcnUkFya_qwe0XsMFscmY2nS8dxrTEYkY16sH68sEH7WVCCzTuW1z1Hocw==

@@ -0,0 +1 @@
+[{"name":"testmanagerd.log","type":1}]

package/Tests/Artifacts/LottieTests.xcresult/Data/data.0~f_-bfn-KRHHFg39_MtwgBulEAuWH6F05yqGYydXhil6kqZ51eAoRX6tsiqOr0Oa6eL3dK1tcCBD1bWX5orCZhw==

@@ -0,0 +1 @@
+[{"name":"LottieTests-A17CE926-26F9-42D1-A19F-AD020F4D4595","type":2},{"name":"scheduling.log","type":1}]

package/Tests/Artifacts/LottieTests.xcresult/Info.plist

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>dateCreated</key>
+	<date>2022-10-07T20:55:10Z</date>
+	<key>externalLocations</key>
+	<array/>
+	<key>rootId</key>
+	<dict>
+		<key>hash</key>
+		<string>0~U4plJajEDM_uSZdglhDyj6gQO63mbeKxYP9X94aIaOtL0yErtfQnGz5SgsqQ0ToSZcJj6Ao9Wx-nesZVwBTRuw==</string>
+	</dict>
+	<key>storage</key>
+	<dict>
+		<key>backend</key>
+		<string>fileBacked2</string>
+		<key>compression</key>
+		<string>standard</string>
+	</dict>
+	<key>version</key>
+	<dict>
+		<key>major</key>
+		<integer>3</integer>
+		<key>minor</key>
+		<integer>39</integer>
+	</dict>
+</dict>
+</plist>

package/lottie-ios.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'lottie-ios'
-  s.version          = '3.4.3'
+  s.version          = '3.4.4'
   s.summary          = 'A library to render native animations from bodymovin json'
 
   s.description = <<-DESC

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lottie-ios",
-  "version": "3.4.3",
+  "version": "3.4.4",
   "description": "Lottie is a mobile library for Android and iOS that parses Adobe After Effects animations exported as json with bodymovin and renders the vector animations natively on mobile and through React Native!",
   "main": "index.js",
   "scripts": {