lottie-ios 4.3.2 → 4.3.4

package/Sources/Public/Controls/LottieButton.swift

@@ -1,6 +1,7 @@
 // Created by Cal Stephens on 8/14/23.
 // Copyright © 2023 Airbnb Inc. All rights reserved.
 
+#if canImport(SwiftUI)
 import SwiftUI
 
 /// A wrapper which exposes Lottie's `AnimatedButton` to SwiftUI
@@ -118,5 +119,5 @@ public struct LottieButton: UIViewConfiguringSwiftUIView {
   private let animation: LottieAnimation?
   private let action: () -> Void
   private var configuration: LottieConfiguration = .shared
-
 }
+#endif

package/Sources/Public/Controls/LottieSwitch.swift

@@ -1,6 +1,7 @@
 // Created by Cal Stephens on 8/11/23.
 // Copyright © 2023 Airbnb Inc. All rights reserved.
 
+#if canImport(SwiftUI)
 import SwiftUI
 
 /// A wrapper which exposes Lottie's `AnimatedSwitch` to SwiftUI
@@ -142,3 +143,4 @@ public struct LottieSwitch: UIViewConfiguringSwiftUIView {
   private var isOn: Binding<Bool>?
 
 }
+#endif

package/Sources/Public/DotLottie/Cache/DotLottieCache.swift

@@ -33,21 +33,25 @@ public class DotLottieCache: DotLottieCacheProvider {
 
   /// Clears the Cache.
   public func clearCache() {
-    cache.removeAllObjects()
+    cache.removeAllValues()
   }
 
   public func file(forKey key: String) -> DotLottieFile? {
-    cache.object(forKey: key as NSString)
+    cache.value(forKey: key)
   }
 
   public func setFile(_ lottie: DotLottieFile, forKey key: String) {
-    cache.setObject(lottie, forKey: key as NSString)
+    cache.setValue(lottie, forKey: key)
   }
 
   // MARK: Private
 
   private static let defaultCacheCountLimit = 100
 
-  private var cache = NSCache<NSString, DotLottieFile>()
+  /// The underlying storage of this cache.
+  ///  - We use the `LRUCache` library instead of `NSCache`, because `NSCache`
+  ///    clears all cached values when the app is backgrounded instead of
+  ///    only when the app receives a memory warning notification.
+  private var cache = LRUCache<String, DotLottieFile>()
 
 }

package/Sources/Public/DotLottie/DotLottieFileHelpers.swift

@@ -146,7 +146,7 @@ extension DotLottieFile {
     bundle: Bundle = Bundle.main,
     subdirectory: String? = nil,
     dotLottieCache: DotLottieCacheProvider? = DotLottieCache.sharedCache,
-    dispatchQueue: DispatchQueue = .global(),
+    dispatchQueue: DispatchQueue = .dotLottie,
     handleResult: @escaping (Result<DotLottieFile, Error>) -> Void)
   {
     dispatchQueue.async {
@@ -186,7 +186,7 @@ extension DotLottieFile {
   public static func loadedFrom(
     filepath: String,
     dotLottieCache: DotLottieCacheProvider? = DotLottieCache.sharedCache,
-    dispatchQueue: DispatchQueue = .global(),
+    dispatchQueue: DispatchQueue = .dotLottie,
     handleResult: @escaping (Result<DotLottieFile, Error>) -> Void)
   {
     dispatchQueue.async {
@@ -228,7 +228,7 @@ extension DotLottieFile {
     named name: String,
     bundle: Bundle = Bundle.main,
     dotLottieCache: DotLottieCacheProvider? = DotLottieCache.sharedCache,
-    dispatchQueue: DispatchQueue = .global(),
+    dispatchQueue: DispatchQueue = .dotLottie,
     handleResult: @escaping (Result<DotLottieFile, Error>) -> Void)
   {
     dispatchQueue.async {
@@ -331,7 +331,7 @@ extension DotLottieFile {
   public static func loadedFrom(
     data: Data,
     filename: String,
-    dispatchQueue: DispatchQueue = .global(),
+    dispatchQueue: DispatchQueue = .dotLottie,
     handleResult: @escaping (Result<DotLottieFile, Error>) -> Void)
   {
     dispatchQueue.async {
@@ -358,7 +358,7 @@ extension DotLottieFile {
   public static func loadedFrom(
     data: Data,
     filename: String,
-    dispatchQueue: DispatchQueue = .global())
+    dispatchQueue: DispatchQueue = .dotLottie)
     async throws -> DotLottieFile
   {
     try await withCheckedThrowingContinuation { continuation in
@@ -367,5 +367,12 @@ extension DotLottieFile {
       }
     }
   }
+}
 
+extension DispatchQueue {
+  /// A serial dispatch queue ensures that IO related to loading dot Lottie files don't overlap,
+  /// which can trigger file loading errors due to concurrent unzipping on a single archive.
+  public static let dotLottie = DispatchQueue(
+    label: "com.airbnb.lottie.dot-lottie",
+    qos: .userInitiated)
 }

package/Sources/Public/iOS/LottieAnimationViewBase.swift

@@ -39,7 +39,11 @@ open class LottieAnimationViewBase: UIView {
 
   var screenScale: CGFloat {
     #if os(iOS) || os(tvOS)
-    UIScreen.main.scale
+    if #available(iOS 13.0, tvOS 13.0, *) {
+      return max(UITraitCollection.current.displayScale, 1)
+    } else {
+      return UIScreen.main.scale
+    }
     #else // if os(visionOS)
     // We intentionally don't check `#if os(visionOS)`, because that emits
     // a warning when building on Xcode 14 and earlier.
@@ -79,6 +83,5 @@ open class LottieAnimationViewBase: UIView {
   func animationWillEnterForeground() {
     // Implemented by subclasses.
   }
-
 }
 #endif

package/lottie-ios.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'lottie-ios'
-  s.version          = '4.3.2'
+  s.version          = '4.3.4'
   s.summary          = 'A library to render native animations from bodymovin json'
 
   s.description = <<-DESC
@@ -36,5 +36,6 @@ Lottie enables designers to create and ship beautiful animations without an engi
   s.ios.frameworks = ['UIKit', 'CoreGraphics', 'QuartzCore']
   s.tvos.frameworks = ['UIKit', 'CoreGraphics', 'QuartzCore']
   s.osx.frameworks = ['AppKit', 'CoreGraphics', 'QuartzCore']
+  s.weak_frameworks = ['SwiftUI', 'Combine']
   s.module_name = 'Lottie'
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lottie-ios",
-  "version": "4.3.2",
+  "version": "4.3.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": {