Add snapshot tests for dot lottie animations, and other cleanup

Lottie.xcodeproj/project.pbxproj

@@ -2658,7 +2658,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.airbnb.LottieTests;
@@ -2677,7 +2677,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.airbnb.LottieTests;

Sources/Private/Model/DotLottie/DotLottieImageProvider.swift

@@ -14,7 +14,7 @@ import AppKit
 
 // MARK: - DotLottieImageProvider
 
-/// Provides an image for a lottie animation from a provided Bundle.
+/// An image provide that loads the images from a DotLottieFile into memory
 class DotLottieImageProvider: AnimationImageProvider {
 
   // MARK: Lifecycle
@@ -38,12 +38,12 @@ class DotLottieImageProvider: AnimationImageProvider {
   let filepath: URL
 
   func imageForAsset(asset: ImageAsset) -> CGImage? {
-    imageCache.object(forKey: asset.name as NSString)
+    images[asset.name]
   }
 
   // MARK: Private
 
-  private var imageCache: NSCache<NSString, CGImage> = .init()
+  private var images = [String: CGImage]()
 
   private func loadImages() {
     filepath.urls.forEach {
@@ -52,14 +52,14 @@ class DotLottieImageProvider: AnimationImageProvider {
         let data = try? Data(contentsOf: $0),
         let image = UIImage(data: data)?.cgImage
       {
-        imageCache.setObject(image, forKey: $0.lastPathComponent as NSString)
+        images[$0.lastPathComponent] = image
       }
       #elseif os(macOS)
       if
         let data = try? Data(contentsOf: $0),
         let image = NSImage(data: data)?.lottie_CGImage
       {
-        imageCache.setObject(image, forKey: $0.lastPathComponent as NSString)
+        images[$0.lastPathComponent] = image
       }
       #endif
     }

Sources/Public/Animation/LottieAnimation.swift

@@ -157,7 +157,4 @@ public final class LottieAnimation: Codable, DictionaryInitializable {
   /// Markers
   let markers: [Marker]?
   let markerMap: [String: Marker]?
-
-  /// DotLottie configuration to setup the player
-  var dotLottieConfiguration: DotLottieConfiguration?
 }

Sources/Public/Animation/LottieAnimationView.swift

@@ -126,16 +126,17 @@ final public class LottieAnimationView: LottieAnimationViewBase {
     configuration: LottieConfiguration = .shared,
     logger: LottieLogger = .shared)
   {
-    animation = dotLottie?.animation(for: animationId)
+    let dotLottieAnimation = dotLottie?.animation(for: animationId)
+    animation = dotLottieAnimation?.animation
     imageProvider = dotLottie?.imageProvider ?? BundleImageProvider(bundle: Bundle.main, searchPath: nil)
     self.textProvider = textProvider
     self.fontProvider = fontProvider
     self.configuration = configuration
     self.logger = logger
     super.init(frame: .zero)
     commonInit()
-    loopMode = animation?.dotLottieConfiguration?.loopMode ?? .playOnce
-    animationSpeed = CGFloat(animation?.dotLottieConfiguration?.speed ?? 1)
+    loopMode = dotLottieAnimation?.configuration.loopMode ?? .playOnce
+    animationSpeed = CGFloat(dotLottieAnimation?.configuration.speed ?? 1)
     makeAnimationLayer(usingEngine: configuration.renderingEngine)
     if let animation = animation {
       frame = animation.bounds
@@ -440,15 +441,16 @@ final public class LottieAnimationView: LottieAnimationViewBase {
     _ animationId: String? = nil,
     from dotLottieFile: DotLottieFile)
   {
-    guard let animation = dotLottieFile.animation(for: animationId) else { return }
-    if let configuration = animation.dotLottieConfiguration {
-      loopMode = configuration.loopMode
-      animationSpeed = CGFloat(configuration.speed)
-    }
-    if let imageProvider = dotLottieFile.imageProvider {
+    guard let dotLottieAnimation = dotLottieFile.animation(for: animationId) else { return }
+
+    loopMode = dotLottieAnimation.configuration.loopMode
+    animationSpeed = CGFloat(dotLottieAnimation.configuration.speed)
+
+    if let imageProvider = dotLottieAnimation.configuration.imageProvider {
       self.imageProvider = imageProvider
     }
-    self.animation = animation
+
+    animation = dotLottieAnimation.animation
   }
 
   /// Plays the animation from its current state to the end.

Sources/Public/Animation/LottieAnimationViewInitializers.swift

@@ -114,10 +114,10 @@ extension LottieAnimationView {
     configuration: LottieConfiguration = .shared)
   {
     self.init(dotLottie: nil, animationId: animationId, configuration: configuration)
-    DotLottieFile.named(name, bundle: bundle, subdirectory: nil, closure: { result in
+    DotLottieFile.named(name, bundle: bundle, dotLottieCache: dotLottieCache) { result in
       guard case Result.success(let lottie) = result else { return }
       self.loadAnimation(animationId, from: lottie)
-    }, dotLottieCache: dotLottieCache)
+    }
   }
 
   /// Loads a Lottie from a .lottie file in a specific path on disk.
@@ -132,10 +132,10 @@ extension LottieAnimationView {
     configuration: LottieConfiguration = .shared)
   {
     self.init(dotLottie: nil, animationId: animationId, configuration: configuration)
-    DotLottieFile.filepath(filePath, closure: { result in
+    DotLottieFile.loadedFrom(filepath: filePath, dotLottieCache: dotLottieCache) { result in
       guard case Result.success(let lottie) = result else { return }
       self.loadAnimation(animationId, from: lottie)
-    }, dotLottieCache: dotLottieCache)
+    }
   }
 
   /// Loads a Lottie file asynchronously from the URL
@@ -156,14 +156,14 @@ extension LottieAnimationView {
       closure(nil)
     } else {
       self.init(dotLottie: nil, configuration: configuration)
-      DotLottieFile.loadedFrom(url: url, closure: { result in
+      DotLottieFile.loadedFrom(url: url, dotLottieCache: dotLottieCache) { result in
         switch result {
         case .success(let lottie):
           self.loadAnimation(animationId, from: lottie)
         case .failure(let error):
           closure(error)
         }
-      }, dotLottieCache: dotLottieCache)
+      }
     }
   }
 
@@ -181,10 +181,10 @@ extension LottieAnimationView {
     configuration: LottieConfiguration = .shared)
   {
     self.init(dotLottie: nil, animationId: animationId, configuration: configuration)
-    DotLottieFile.asset(name, bundle: bundle, closure: { result in
+    DotLottieFile.asset(named: name, bundle: bundle, dotLottieCache: dotLottieCache) { result in
       guard case Result.success(let lottie) = result else { return }
       self.loadAnimation(animationId, from: lottie)
-    }, dotLottieCache: dotLottieCache)
+    }
   }
 
   // MARK: Public

Sources/Public/DotLottie/DotLottieFile.swift

@@ -27,11 +27,17 @@ public final class DotLottieFile {
 
   // MARK: Internal
 
+  /// Definition for a single animation within a `DotLottieFile`
+  struct Animation {
+    let animation: LottieAnimation
+    let configuration: DotLottieConfiguration
+  }
+
   /// List of `LottieAnimation` in the file
-  var animations: [LottieAnimation] = []
+  private(set) var animations: [Animation] = []
 
   /// Image provider for animations
-  var imageProvider: AnimationImageProvider?
+  private(set) var imageProvider: AnimationImageProvider?
 
   /// Manifest.json file loading
   lazy var manifest: DotLottieManifest? = {
@@ -62,6 +68,15 @@ public final class DotLottieFile {
     FileManager.default.urls(for: imagesUrl) ?? []
   }()
 
+  /// The `LottieAnimation` and `DotLottieConfiguration` for the given animation ID in this file
+  func animation(for id: String? = nil) -> DotLottieFile.Animation? {
+    if let id = id {
+      return animations.first(where: { $0.configuration.id == id })
+    } else {
+      return animations.first
+    }
+  }
+
   // MARK: Private
 
   private static let manifestFileName = "manifest.json"
@@ -70,6 +85,14 @@ public final class DotLottieFile {
 
   private let fileUrl: URL
 
+  private var dotLottieAnimations: [DotLottieAnimation] {
+    manifest?.animations.map({
+      var animation = $0
+      animation.animationUrl = animationsUrl.appendingPathComponent("\($0.id).json")
+      return animation
+    }) ?? []
+  }
+
   /// Decompresses .lottie file from `URL` and saves to local temp folder
   ///
   /// - Parameters:
@@ -100,14 +123,20 @@ public final class DotLottieFile {
   private func loadContent() {
     imageProvider = DotLottieImageProvider(filepath: imagesUrl)
 
-    animations = dotLottieAnimations.compactMap {
-      let animation = try? $0.animation()
-      animation?.dotLottieConfiguration = DotLottieConfiguration(
-        id: $0.id,
+    animations = dotLottieAnimations.compactMap { dotLottieAnimation -> DotLottieFile.Animation? in
+      guard let animation = try? dotLottieAnimation.animation() else {
+        return nil
+      }
+
+      let configuration = DotLottieConfiguration(
+        id: dotLottieAnimation.id,
         imageProvider: imageProvider,
-        loopMode: $0.loopMode,
-        speed: $0.animationSpeed)
-      return animation
+        loopMode: dotLottieAnimation.loopMode,
+        speed: dotLottieAnimation.animationSpeed)
+
+      return DotLottieFile.Animation(
+        animation: animation,
+        configuration: configuration)
     }
   }
 }