lottie-ios 4.3.4 → 4.4.0

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

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/7/19.
 //
 
-import Foundation
-
 /// The animatable transform for a layer. Controls position, rotation, scale, and opacity.
 final class Transform: Codable, DictionaryInitializable {
 
@@ -86,7 +84,7 @@ final class Transform: Codable, DictionaryInitializable {
     {
       self.anchorPoint = anchorPoint
     } else {
-      anchorPoint = KeyframeGroup(LottieVector3D(x: Double(0), y: 0, z: 0))
+      anchorPoint = Transform.default.anchorPoint
     }
 
     if
@@ -112,7 +110,7 @@ final class Transform: Codable, DictionaryInitializable {
       positionY = try KeyframeGroup<LottieVector1D>(dictionary: yDictionary)
       position = nil
     } else {
-      position = KeyframeGroup(LottieVector3D(x: Double(0), y: 0, z: 0))
+      position = Transform.default.position
       positionX = nil
       positionY = nil
     }
@@ -123,7 +121,7 @@ final class Transform: Codable, DictionaryInitializable {
     {
       self.scale = scale
     } else {
-      scale = KeyframeGroup(LottieVector3D(x: Double(100), y: 100, z: 100))
+      scale = Transform.default.scale
     }
 
     if
@@ -132,7 +130,7 @@ final class Transform: Codable, DictionaryInitializable {
     {
       rotationX = rotation
     } else {
-      rotationX = KeyframeGroup(LottieVector1D(0))
+      rotationX = Transform.default.rotationX
     }
 
     if
@@ -141,7 +139,7 @@ final class Transform: Codable, DictionaryInitializable {
     {
       rotationY = rotation
     } else {
-      rotationY = KeyframeGroup(LottieVector1D(0))
+      rotationY = Transform.default.rotationY
     }
 
     if
@@ -155,7 +153,7 @@ final class Transform: Codable, DictionaryInitializable {
     {
       rotationZ = rotation
     } else {
-      rotationZ = KeyframeGroup(LottieVector1D(0))
+      rotationZ = Transform.default.rotationZ
     }
     rotation = nil
     if
@@ -164,10 +162,34 @@ final class Transform: Codable, DictionaryInitializable {
     {
       self.opacity = opacity
     } else {
-      opacity = KeyframeGroup(LottieVector1D(100))
+      opacity = Transform.default.opacity
     }
   }
 
+  init(
+    anchorPoint: KeyframeGroup<LottieVector3D>,
+    position: KeyframeGroup<LottieVector3D>?,
+    positionX: KeyframeGroup<LottieVector1D>?,
+    positionY: KeyframeGroup<LottieVector1D>?,
+    scale: KeyframeGroup<LottieVector3D>,
+    rotationX: KeyframeGroup<LottieVector1D>,
+    rotationY: KeyframeGroup<LottieVector1D>,
+    rotationZ: KeyframeGroup<LottieVector1D>,
+    opacity: KeyframeGroup<LottieVector1D>,
+    rotation: KeyframeGroup<LottieVector1D>?)
+  {
+    self.anchorPoint = anchorPoint
+    self.position = position
+    self.positionX = positionX
+    self.positionY = positionY
+    self.scale = scale
+    self.rotationX = rotationX
+    self.rotationY = rotationY
+    self.rotationZ = rotationZ
+    self.opacity = opacity
+    self.rotation = rotation
+  }
+
   // MARK: Internal
 
   enum CodingKeys: String, CodingKey {
@@ -189,6 +211,21 @@ final class Transform: Codable, DictionaryInitializable {
     case positionY = "y"
   }
 
+  /// Default transform values to use if no transform is provided
+  static var `default`: Transform {
+    Transform(
+      anchorPoint: KeyframeGroup(LottieVector3D(x: Double(0), y: 0, z: 0)),
+      position: KeyframeGroup(LottieVector3D(x: Double(0), y: 0, z: 0)),
+      positionX: nil,
+      positionY: nil,
+      scale: KeyframeGroup(LottieVector3D(x: Double(100), y: 100, z: 100)),
+      rotationX: KeyframeGroup(LottieVector1D(0)),
+      rotationY: KeyframeGroup(LottieVector1D(0)),
+      rotationZ: KeyframeGroup(LottieVector1D(0)),
+      opacity: KeyframeGroup(LottieVector1D(100)),
+      rotation: nil)
+  }
+
   /// The anchor point of the transform.
   let anchorPoint: KeyframeGroup<LottieVector3D>
 

package/Sources/Private/Model/ShapeItems/Ellipse.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/8/19.
 //
 
-import Foundation
-
 // MARK: - PathDirection
 
 enum PathDirection: Int, Codable {

package/Sources/Private/Model/ShapeItems/Fill.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/8/19.
 //
 
-import Foundation
-
 // MARK: - FillRule
 
 enum FillRule: Int, Codable {

package/Sources/Private/Model/ShapeItems/GradientFill.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/8/19.
 //
 
-import Foundation
-
 // MARK: - GradientType
 
 enum GradientType: Int, Codable, Sendable {
@@ -45,7 +43,7 @@ final class GradientFill: ShapeItem {
     endPoint = try KeyframeGroup<LottieVector3D>(dictionary: endPointDictionary)
     let gradientRawType: Int = try dictionary.value(for: CodingKeys.gradientType)
     guard let gradient = GradientType(rawValue: gradientRawType) else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     gradientType = gradient
     if let highlightLengthDictionary = dictionary[CodingKeys.highlightLength.rawValue] as? [String: Any] {

package/Sources/Private/Model/ShapeItems/GradientStroke.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/8/19.
 //
 
-import Foundation
-
 // MARK: - LineCap
 
 enum LineCap: Int, Codable, Sendable {
@@ -60,7 +58,7 @@ final class GradientStroke: ShapeItem {
     endPoint = try KeyframeGroup<LottieVector3D>(dictionary: endPointDictionary)
     let gradientRawType: Int = try dictionary.value(for: CodingKeys.gradientType)
     guard let gradient = GradientType(rawValue: gradientRawType) else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     gradientType = gradient
     if let highlightLengthDictionary = dictionary[CodingKeys.highlightLength.rawValue] as? [String: Any] {

package/Sources/Private/Model/ShapeItems/Group.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/8/19.
 //
 
-import Foundation
-
 /// An item that define a a group of shape items
 final class Group: ShapeItem {
 

package/Sources/Private/Model/ShapeItems/Merge.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/8/19.
 //
 
-import Foundation
-
 // MARK: - MergeMode
 
 enum MergeMode: Int, Codable, Sendable {
@@ -33,7 +31,7 @@ final class Merge: ShapeItem {
   required init(dictionary: [String: Any]) throws {
     let modeRawType: Int = try dictionary.value(for: CodingKeys.mode)
     guard let mode = MergeMode(rawValue: modeRawType) else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     self.mode = mode
     try super.init(dictionary: dictionary)

package/Sources/Private/Model/ShapeItems/Rectangle.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/8/19.
 //
 
-import Foundation
-
 final class Rectangle: ShapeItem {
 
   // MARK: Lifecycle

package/Sources/Private/Model/ShapeItems/Repeater.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/8/19.
 //
 
-import Foundation
-
 final class Repeater: ShapeItem {
 
   // MARK: Lifecycle

package/Sources/Private/Model/ShapeItems/RoundedCorners.swift

@@ -5,8 +5,6 @@
 //  Created by Duolingo on 10/31/22.
 //
 
-import Foundation
-
 // MARK: - RoundedCorners
 
 final class RoundedCorners: ShapeItem {

package/Sources/Private/Model/ShapeItems/Shape.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/8/19.
 //
 
-import Foundation
-
 /// An item that defines an custom shape
 final class Shape: ShapeItem {
 

package/Sources/Private/Model/ShapeItems/ShapeItem.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/8/19.
 //
 
-import Foundation
-
 // MARK: - ShapeType
 
 enum ShapeType: String, Codable, Sendable {
@@ -122,7 +120,7 @@ class ShapeItem: Codable, DictionaryInitializable {
   }
 }
 
-extension Array where Element == ShapeItem {
+extension [ShapeItem] {
 
   static func fromDictionaries(_ dictionaries: [[String: Any]]) throws -> [ShapeItem] {
     try dictionaries.compactMap { dictionary in
@@ -169,4 +167,5 @@ extension Array where Element == ShapeItem {
 
 /// Since `ShapeItem` isn't `final`, we have to use `@unchecked Sendable` instead of `Sendable.`
 /// All `ShapeItem` subclasses are immutable `Sendable` values.
+// swiftlint:disable:next no_unchecked_sendable
 extension ShapeItem: @unchecked Sendable { }

package/Sources/Private/Model/ShapeItems/ShapeTransform.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/8/19.
 //
 
-import Foundation
-
 final class ShapeTransform: ShapeItem {
 
   // MARK: Lifecycle

package/Sources/Private/Model/ShapeItems/Star.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/8/19.
 //
 
-import Foundation
-
 // MARK: - StarType
 
 enum StarType: Int, Codable, Sendable {
@@ -66,7 +64,7 @@ final class Star: ShapeItem {
     points = try KeyframeGroup<LottieVector1D>(dictionary: pointsDictionary)
     let starTypeRawValue: Int = try dictionary.value(for: CodingKeys.starType)
     guard let starType = StarType(rawValue: starTypeRawValue) else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     self.starType = starType
     try super.init(dictionary: dictionary)

package/Sources/Private/Model/ShapeItems/Stroke.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/8/19.
 //
 
-import Foundation
-
 final class Stroke: ShapeItem {
 
   // MARK: Lifecycle

package/Sources/Private/Model/ShapeItems/Trim.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/8/19.
 //
 
-import Foundation
-
 // MARK: - TrimType
 
 enum TrimType: Int, Codable {
@@ -38,7 +36,7 @@ final class Trim: ShapeItem {
     offset = try KeyframeGroup<LottieVector1D>(dictionary: offsetDictionary)
     let trimTypeRawValue: Int = try dictionary.value(for: CodingKeys.trimType)
     guard let trimType = TrimType(rawValue: trimTypeRawValue) else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     self.trimType = trimType
     try super.init(dictionary: dictionary)

package/Sources/Private/Model/Text/Font.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/9/19.
 //
 
-import Foundation
-
 // MARK: - Font
 
 final class Font: Codable, Sendable, DictionaryInitializable {

package/Sources/Private/Model/Text/Glyph.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/9/19.
 //
 
-import Foundation
-
 /// A model that holds a vector character
 final class Glyph: Codable, Sendable, DictionaryInitializable {
 

package/Sources/Private/Model/Text/TextAnimator.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/9/19.
 //
 
-import Foundation
-
 final class TextAnimator: Codable, DictionaryInitializable {
 
   // MARK: Lifecycle

package/Sources/Private/Model/Text/TextDocument.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/9/19.
 //
 
-import Foundation
-
 // MARK: - TextJustification
 
 enum TextJustification: Int, Codable {
@@ -27,7 +25,7 @@ final class TextDocument: Codable, DictionaryInitializable, AnyInitializable {
     fontFamily = try dictionary.value(for: CodingKeys.fontFamily)
     let justificationValue: Int = try dictionary.value(for: CodingKeys.justification)
     guard let justification = TextJustification(rawValue: justificationValue) else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     self.justification = justification
     tracking = try dictionary.value(for: CodingKeys.tracking)
@@ -59,7 +57,7 @@ final class TextDocument: Codable, DictionaryInitializable, AnyInitializable {
 
   convenience init(value: Any) throws {
     guard let dictionary = value as? [String: Any] else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     try self.init(dictionary: dictionary)
   }

package/Sources/Private/Utility/Debugging/AnimatorNodeDebugging.swift

@@ -5,8 +5,6 @@
 //  Created by Brandon Withrow on 1/18/19.
 //
 
-import Foundation
-
 extension AnimatorNode {
 
   func printNodeTree() {

package/Sources/Private/Utility/Debugging/LayerDebugging.swift

@@ -5,7 +5,6 @@
 //  Created by Brandon Withrow on 1/24/19.
 //
 
-import Foundation
 import QuartzCore
 
 // MARK: - LayerDebugStyle
@@ -54,7 +53,7 @@ extension CALayer {
     }
     string = string + "|_" + String(describing: self)
     LottieLogger.shared.info(string)
-    if let sublayers = sublayers {
+    if let sublayers {
       for sublayer in sublayers {
         sublayer.logLayerTree(withIndent: withIndent + 1)
       }
@@ -80,7 +79,7 @@ extension CALayer {
       sublayers = cust.layerForDebugging().sublayers
     }
 
-    if let sublayers = sublayers {
+    if let sublayers {
       for i in 0..<sublayers.count {
         if let debugLayer = sublayers[i] as? DebugLayer {
           debugLayer.removeFromSuperlayer()
@@ -89,7 +88,7 @@ extension CALayer {
       }
     }
 
-    if let sublayers = sublayers {
+    if let sublayers {
       for sublayer in sublayers {
         sublayer.setDebuggingState(visible: visible)
       }
@@ -206,7 +205,7 @@ extension LayerDebugStyle {
   }
 }
 
-extension Array where Element == LayerModel {
+extension [LayerModel] {
 
   var parents: [Int] {
     var array = [Int]()

package/Sources/Private/Utility/Extensions/AnimationKeypathExtension.swift

@@ -5,7 +5,6 @@
 //  Created by Brandon Withrow on 2/4/19.
 //
 
-import Foundation
 import QuartzCore
 
 extension KeypathSearchable {
@@ -201,7 +200,7 @@ extension AnimationKeypath {
   // Pops the top keypath from the stack if the keyname matches.
   func popKey(_ keyname: String) -> AnimationKeypath? {
     guard
-      let currentKey = currentKey,
+      let currentKey,
       currentKey.equalsKeypath(keyname),
       keys.count > 1
     else {
@@ -215,7 +214,7 @@ extension AnimationKeypath {
     if currentKey.keyPathType == .fuzzyWildcard {
       /// Dont remove if current key is a fuzzy wildcard, and if the next keypath doesnt equal keypathname
       if
-        let nextKeypath = nextKeypath,
+        let nextKeypath,
         nextKeypath.equalsKeypath(keyname)
       {
         /// Remove next two keypaths. This keypath breaks the wildcard.

package/Sources/Private/Utility/Extensions/DataExtension.swift

@@ -5,7 +5,6 @@
 //  Created by René Fouquet on 03.05.21.
 //
 
-import Foundation
 #if canImport(UIKit)
 import UIKit
 #elseif canImport(AppKit)

package/Sources/Private/Utility/Extensions/StringExtensions.swift

@@ -15,6 +15,11 @@ extension String {
     return .rgb(red, green, blue)
   }
 
+  var lottieColor: LottieColor {
+    let (red, green, blue) = hexColorComponents()
+    return .init(r: red, g: green, b: blue, a: 1.0)
+  }
+
   func hexColorComponents() -> (red: CGFloat, green: CGFloat, blue: CGFloat) {
     var cString: String = trimmingCharacters(in: .whitespacesAndNewlines).uppercased()
 

package/Sources/Private/Utility/Helpers/AnimationContext.swift

@@ -5,7 +5,6 @@
 //  Created by Brandon Withrow on 2/1/19.
 //
 
-import CoreGraphics
 import Foundation
 import QuartzCore
 
@@ -71,13 +70,13 @@ class AnimationCompletionDelegate: NSObject, CAAnimationDelegate {
   public func animationDidStop(_ anim: CAAnimation, finished flag: Bool) {
     guard ignoreDelegate == false else { return }
     animationState = flag ? .complete : .cancelled
-    if let animationLayer = animationLayer, let key = animationKey {
+    if let animationLayer, let key = animationKey {
       animationLayer.removeAnimation(forKey: key)
       if flag {
         animationLayer.currentFrame = (anim as! CABasicAnimation).toValue as! CGFloat
       }
     }
-    if let completionBlock = completionBlock {
+    if let completionBlock {
       completionBlock(flag)
     }
   }

package/Sources/Private/Utility/Helpers/AnyEquatable.swift

@@ -1,8 +1,6 @@
 // Created by miguel_jimenez on 8/2/23.
 // Copyright © 2023 Airbnb Inc. All rights reserved.
 
-import Foundation
-
 // MARK: - AnyEquatable
 
 struct AnyEquatable {

package/Sources/Private/Utility/LottieAnimationSource.swift

@@ -20,8 +20,18 @@ extension LottieAnimationSource {
     switch self {
     case .lottieAnimation(let animation):
       return animation
+    case .dotLottieFile:
+      return dotLottieAnimation?.animation
+    }
+  }
+
+  /// The `DotLottieFile.Animation`, if this is a dotLottie animation
+  var dotLottieAnimation: DotLottieFile.Animation? {
+    switch self {
+    case .lottieAnimation:
+      return nil
     case .dotLottieFile(let dotLottieFile):
-      return dotLottieFile.animation()?.animation
+      return dotLottieFile.animation()
     }
   }
 }

package/Sources/Private/Utility/Primitives/BezierPath.swift

@@ -6,7 +6,6 @@
 //
 
 import CoreGraphics
-import Foundation
 
 // MARK: - BezierPath
 
@@ -405,7 +404,7 @@ extension BezierPath: AnyInitializable {
     } else if let dictionary = value as? [String: Any] {
       pathDictionary = dictionary
     } else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     closed = (try? pathDictionary.value(for: CodingKeys.closed)) ?? true
     var vertexDictionaries: [Any] = try pathDictionary.value(for: CodingKeys.vertices)
@@ -415,7 +414,7 @@ extension BezierPath: AnyInitializable {
       vertexDictionaries.count == inPointsDictionaries.count,
       inPointsDictionaries.count == outPointsDictionaries.count
     else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     guard vertexDictionaries.count > 0 else {
       length = 0

package/Sources/Private/Utility/Primitives/CGPointExtension.swift

@@ -22,7 +22,7 @@ extension CGPoint: AnyInitializable {
     {
       self.init(x: array[0], y: array[1])
     } else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
   }
 

package/Sources/Private/Utility/Primitives/ColorExtension.swift

@@ -6,7 +6,6 @@
 //
 
 import CoreGraphics
-import Foundation
 
 // MARK: - LottieColor + Codable
 
@@ -70,7 +69,7 @@ extension LottieColor: AnyInitializable {
 
   init(value: Any) throws {
     guard var array = value as? [Double] else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     var r: Double = array.count > 0 ? array.removeFirst() : 0
     var g: Double = array.count > 0 ? array.removeFirst() : 0

package/Sources/Private/Utility/Primitives/VectorsExtensions.swift

@@ -54,7 +54,7 @@ extension LottieVector1D: AnyInitializable {
     } else if let double = value as? Double {
       self.value = double
     } else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
   }
 
@@ -127,7 +127,7 @@ extension LottieVector2D: AnyInitializable {
 
   init(value: Any) throws {
     guard let dictionary = value as? [String: Any] else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
 
     if
@@ -138,7 +138,7 @@ extension LottieVector2D: AnyInitializable {
     } else if let double = dictionary[CodingKeys.x.rawValue] as? Double {
       x = double
     } else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     if
       let array = dictionary[CodingKeys.y.rawValue] as? [Double],
@@ -148,7 +148,7 @@ extension LottieVector2D: AnyInitializable {
     } else if let double = dictionary[CodingKeys.y.rawValue] as? Double {
       y = double
     } else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
   }
 }
@@ -213,7 +213,7 @@ extension LottieVector3D: AnyInitializable {
 
   init(value: Any) throws {
     guard var array = value as? [Double] else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     x = array.count > 0 ? array.removeFirst() : 0
     y = array.count > 0 ? array.removeFirst() : 0
@@ -322,7 +322,7 @@ extension CATransform3D {
     skewAxis: CGFloat?)
     -> CATransform3D
   {
-    if let skew = skew, let skewAxis = skewAxis {
+    if let skew, let skewAxis {
       return CATransform3DMakeTranslation(position.x, position.y, 0)
         .rotated(rotationX, axis: .x)
         .rotated(rotationY, axis: .y)

package/Sources/Public/Animation/LottieAnimation.swift

@@ -39,7 +39,7 @@ public final class LottieAnimation: Codable, Sendable, DictionaryInitializable {
     assetLibrary = try container.decodeIfPresent(AssetLibrary.self, forKey: .assetLibrary)
     markers = try container.decodeIfPresent([Marker].self, forKey: .markers)
 
-    if let markers = markers {
+    if let markers {
       var markerMap: [String: Marker] = [:]
       for marker in markers {
         markerMap[marker.name] = marker
@@ -109,7 +109,7 @@ public final class LottieAnimation: Codable, Sendable, DictionaryInitializable {
 
   /// Return all marker names, in order, or an empty list if none are specified
   public var markerNames: [String] {
-    guard let markers = markers else { return [] }
+    guard let markers else { return [] }
     return markers.map { $0.name }
   }