lottie-ios 4.2.0 → 4.3.0

package/Sources/Public/iOS/FilepathImageProvider.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if os(iOS) || os(tvOS) || os(watchOS) || targetEnvironment(macCatalyst)
+#if canImport(UIKit)
 import UIKit
 
 /// Provides an image for a lottie animation from a provided Bundle.
@@ -17,13 +17,21 @@ public class FilepathImageProvider: AnimationImageProvider {
   /// Initializes an image provider with a specific filepath.
   ///
   /// - Parameter filepath: The absolute filepath containing the images.
+  /// - Parameter contentsGravity: The contents gravity to use when rendering the images.
   ///
-  public init(filepath: String) {
+  public init(filepath: String, contentsGravity: CALayerContentsGravity = .resize) {
     self.filepath = URL(fileURLWithPath: filepath)
+    self.contentsGravity = contentsGravity
   }
 
-  public init(filepath: URL) {
+  /// Initializes an image provider with a specific filepath.
+  ///
+  /// - Parameter filepath: The absolute filepath containing the images.
+  /// - Parameter contentsGravity: The contents gravity to use when rendering the images.
+  ///
+  public init(filepath: URL, contentsGravity: CALayerContentsGravity = .resize) {
     self.filepath = filepath
+    self.contentsGravity = contentsGravity
   }
 
   // MARK: Public
@@ -52,8 +60,19 @@ public class FilepathImageProvider: AnimationImageProvider {
     return nil
   }
 
+  public func contentsGravity(for _: ImageAsset) -> CALayerContentsGravity {
+    contentsGravity
+  }
+
   // MARK: Internal
 
   let filepath: URL
+  let contentsGravity: CALayerContentsGravity
+}
+
+extension FilepathImageProvider: Equatable {
+  public static func ==(_ lhs: FilepathImageProvider, _ rhs: FilepathImageProvider) -> Bool {
+    lhs.filepath == rhs.filepath
+  }
 }
 #endif

package/Sources/Public/iOS/LottieAnimationViewBase.swift

@@ -5,7 +5,7 @@
 //  Created by Brandon Withrow on 2/6/19.
 //
 
-#if os(iOS) || os(tvOS) || os(watchOS) || targetEnvironment(macCatalyst)
+#if canImport(UIKit)
 import UIKit
 
 /// The base view for `LottieAnimationView` on iOS, tvOS, watchOS, and macCatalyst.
@@ -38,7 +38,13 @@ open class LottieAnimationViewBase: UIView {
   }
 
   var screenScale: CGFloat {
+    #if os(iOS) || os(tvOS)
     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.
+    1.0
+    #endif
   }
 
   func layoutAnimation() {

package/Sources/Public/macOS/BundleImageProvider.macOS.swift

@@ -20,10 +20,12 @@ public class BundleImageProvider: AnimationImageProvider {
   ///
   /// - Parameter bundle: The bundle containing images for the provider.
   /// - Parameter searchPath: The subpath is a path within the bundle to search for image assets.
+  /// - Parameter contentsGravity: The contents gravity to use when rendering the image.
   ///
-  public init(bundle: Bundle, searchPath: String?) {
+  public init(bundle: Bundle, searchPath: String?, contentsGravity: CALayerContentsGravity = .resize) {
     self.bundle = bundle
     self.searchPath = searchPath
+    self.contentsGravity = contentsGravity
   }
 
   // MARK: Public
@@ -70,10 +72,22 @@ public class BundleImageProvider: AnimationImageProvider {
     return image.lottie_CGImage
   }
 
+  public func contentsGravity(for _: ImageAsset) -> CALayerContentsGravity {
+    contentsGravity
+  }
+
   // MARK: Internal
 
   let bundle: Bundle
   let searchPath: String?
+  let contentsGravity: CALayerContentsGravity
+}
+
+extension BundleImageProvider: Equatable {
+  public static func ==(_ lhs: BundleImageProvider, _ rhs: BundleImageProvider) -> Bool {
+    lhs.bundle == rhs.bundle
+      && lhs.searchPath == rhs.searchPath
+  }
 }
 
 #endif

package/Sources/Public/macOS/FilepathImageProvider.macOS.swift

@@ -16,13 +16,21 @@ public class FilepathImageProvider: AnimationImageProvider {
   /// Initializes an image provider with a specific filepath.
   ///
   /// - Parameter filepath: The absolute filepath containing the images.
+  /// - Parameter contentsGravity: The contents gravity to use when rendering the images.
   ///
-  public init(filepath: String) {
+  public init(filepath: String, contentsGravity: CALayerContentsGravity = .resize) {
     self.filepath = URL(fileURLWithPath: filepath)
+    self.contentsGravity = contentsGravity
   }
 
-  public init(filepath: URL) {
+  /// Initializes an image provider with a specific filepath.
+  ///
+  /// - Parameter filepath: The absolute filepath containing the images.
+  /// - Parameter contentsGravity: The contents gravity to use when rendering the images.
+  ///
+  public init(filepath: URL, contentsGravity: CALayerContentsGravity = .resize) {
     self.filepath = filepath
+    self.contentsGravity = contentsGravity
   }
 
   // MARK: Public
@@ -51,9 +59,20 @@ public class FilepathImageProvider: AnimationImageProvider {
     return nil
   }
 
+  public func contentsGravity(for _: ImageAsset) -> CALayerContentsGravity {
+    contentsGravity
+  }
+
   // MARK: Internal
 
   let filepath: URL
+  let contentsGravity: CALayerContentsGravity
+}
+
+extension FilepathImageProvider: Equatable {
+  public static func ==(_ lhs: FilepathImageProvider, _ rhs: FilepathImageProvider) -> Bool {
+    lhs.filepath == rhs.filepath
+  }
 }
 
 extension NSImage {

package/lottie-ios.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'lottie-ios'
-  s.version          = '4.2.0'
+  s.version          = '4.3.0'
   s.summary          = 'A library to render native animations from bodymovin json'
 
   s.description = <<-DESC
@@ -28,6 +28,7 @@ Lottie enables designers to create and ship beautiful animations without an engi
   s.tvos.deployment_target = '11.0'
 
   s.source_files = 'Sources/**/*'
+  s.exclude_files = 'Sources/**/*.md'
   s.ios.exclude_files = 'Sources/Public/MacOS/**/*'
   s.tvos.exclude_files = 'Sources/Public/MacOS/**/*'
   s.osx.exclude_files = 'Sources/Public/iOS/**/*'

package/package.json

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

package/Sources/Private/Model/DotLottie/DotLottieConfiguration.swift

@@ -1,15 +0,0 @@
-//
-// DotLottieSettings.swift
-// Lottie
-//
-// Created by Evandro Hoffmann on 19/10/22.
-//
-
-import Foundation
-
-struct DotLottieConfiguration {
-  var id: String
-  var imageProvider: AnimationImageProvider?
-  var loopMode: LottieLoopMode
-  var speed: Double
-}