lottie-ios 4.4.0 → 4.4.2

package/Sources/Public/DotLottie/DotLottieFileHelpers.swift

@@ -118,7 +118,6 @@ extension DotLottieFile {
   /// - Parameter bundle: The bundle in which the lottie is located. Defaults to `Bundle.main`
   /// - Parameter subdirectory: A subdirectory in the bundle in which the lottie is located. Optional.
   /// - Parameter dotLottieCache: A cache for holding loaded lotties. Defaults to `LRUDotLottieCache.sharedCache`. Optional.
-  @available(iOS 13.0, macOS 10.15, tvOS 13.0, *)
   public static func named(
     _ name: String,
     bundle: Bundle = Bundle.main,
@@ -165,7 +164,6 @@ extension DotLottieFile {
   /// Loads an DotLottie from a specific filepath.
   /// - Parameter filepath: The absolute filepath of the lottie to load. EG "/User/Me/starAnimation.lottie"
   /// - Parameter dotLottieCache: A cache for holding loaded lotties. Defaults to `LRUDotLottieCache.sharedCache`. Optional.
-  @available(iOS 13.0, macOS 10.15, tvOS 13.0, *)
   public static func loadedFrom(
     filepath: String,
     dotLottieCache: DotLottieCacheProvider? = DotLottieCache.sharedCache)
@@ -204,7 +202,6 @@ extension DotLottieFile {
   /// - Parameter name: The name of the lottie file in the asset catalog. EG "StarAnimation"
   /// - Parameter bundle: The bundle in which the lottie is located. Defaults to `Bundle.main`
   /// - Parameter dotLottieCache: A cache for holding loaded lottie files. Defaults to `LRUDotLottieCache.sharedCache` Optional.
-  @available(iOS 13.0, macOS 10.15, tvOS 13.0, *)
   public static func asset(
     named name: String,
     bundle: Bundle = Bundle.main,
@@ -270,7 +267,6 @@ extension DotLottieFile {
   ///
   /// - Parameter url: The url to load the animation from.
   /// - Parameter animationCache: A cache for holding loaded animations. Defaults to `LRUAnimationCache.sharedCache`. Optional.
-  @available(iOS 13.0, macOS 10.15, tvOS 13.0, *)
   public static func loadedFrom(
     url: URL,
     session: URLSession = .shared,
@@ -354,7 +350,6 @@ extension DotLottieFile {
   ///   - data: The data(`Foundation.Data`) object to load DotLottie from
   ///   - filename: The name of the lottie file without the lottie extension. eg. "StarAnimation"
   ///   - dispatchQueue: A dispatch queue used to load animations. Defaults to `DispatchQueue.global()`. Optional.
-  @available(iOS 13.0, macOS 10.15, tvOS 13.0, *)
   public static func loadedFrom(
     data: Data,
     filename: String,

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

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if os(iOS) || os(tvOS) || os(watchOS) || targetEnvironment(macCatalyst)
+#if canImport(UIKit)
 
 /// An Objective-C compatible wrapper around Lottie's AnimationKeypath
 @objc

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

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if os(iOS) || os(tvOS) || os(watchOS) || targetEnvironment(macCatalyst)
+#if canImport(UIKit)
 import UIKit
 
 /// An Objective-C compatible wrapper around Lottie's Animation class.

package/Sources/Public/iOS/LottieAnimationViewBase.swift

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

package/Version.xcconfig

@@ -0,0 +1,6 @@
+// Created by Cal Stephens on 3/12/24.
+// Copyright © 2024 Airbnb Inc. All rights reserved.
+
+// The version numbers used when building Lottie.xcframework
+MARKETING_VERSION = 4.4.2
+CURRENT_PROJECT_VERSION = 442 // a three-digit representation of the marketing version, without dots.

package/lottie-ios.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'lottie-ios'
-  s.version          = '4.4.0'
+  s.version          = '4.4.2'
   s.summary          = 'A library to render native animations from bodymovin json'
 
   s.description = <<-DESC
@@ -23,14 +23,14 @@ Lottie enables designers to create and ship beautiful animations without an engi
   s.source           = { :git => 'https://github.com/airbnb/lottie-ios.git', :tag => s.version.to_s }
 
   s.swift_version = '5.7'
-  s.ios.deployment_target = '11.0'
-  s.osx.deployment_target = '10.12'
-  s.tvos.deployment_target = '11.0'
+  s.ios.deployment_target = '13.0'
+  s.osx.deployment_target = '10.15'
+  s.tvos.deployment_target = '13.0'
+  s.visionos.deployment_target = "1.0"
 
-  s.source_files = 'Sources/**/*'
-  s.exclude_files = 'Sources/**/*.md'
+  s.source_files = 'Sources/**/*.swift'
   s.resource_bundles = {
-    'Lottie_Privacy' => ['Sources/PrivacyInfo.xcprivacy'],
+    'LottiePrivacyInfo' => ['Sources/PrivacyInfo.xcprivacy'],
   }
   s.ios.exclude_files = 'Sources/Public/MacOS/**/*'
   s.tvos.exclude_files = 'Sources/Public/MacOS/**/*'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lottie-ios",
-  "version": "4.4.0",
+  "version": "4.4.2",
   "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/EmbeddedLibraries/EpoxyCore/SwiftUI/EpoxySwiftUIHostingController.swift

@@ -1,46 +0,0 @@
-// Created by eric_horacek on 10/8/21.
-// Copyright © 2021 Airbnb Inc. All rights reserved.
-
-#if canImport(SwiftUI) && !os(macOS)
-import SwiftUI
-
-// MARK: - EpoxySwiftUIUIHostingController
-
-/// A `UIHostingController` that hosts SwiftUI views within an Epoxy container, e.g. an Epoxy
-/// `CollectionView`.
-///
-/// Exposed internally to allow consumers to reason about these view controllers, e.g. to opt
-/// collection view cells out of automated view controller impression tracking.
-///
-/// - SeeAlso: `EpoxySwiftUIHostingView`
-@available(iOS 13.0, tvOS 13.0, *)
-open class EpoxySwiftUIHostingController<Content: View>: UIHostingController<Content> {
-
-  // MARK: Lifecycle
-
-  /// Creates a `UIHostingController` that optionally ignores the `safeAreaInsets` when laying out
-  /// its contained `RootView`.
-  convenience init(rootView: Content, ignoreSafeArea: Bool) {
-    self.init(rootView: rootView)
-
-    // We unfortunately need to call a private API to disable the safe area. We can also accomplish
-    // this by dynamically subclassing this view controller's view at runtime and overriding its
-    // `safeAreaInsets` property and returning `.zero`. An implementation of that logic is
-    // available in this file in the `2d28b3181cca50b89618b54836f7a9b6e36ea78e` commit if this API
-    // no longer functions in future SwiftUI versions.
-    _disableSafeArea = ignoreSafeArea
-  }
-
-  // MARK: Open
-
-  open override func viewDidLoad() {
-    super.viewDidLoad()
-
-    // A `UIHostingController` has a system background color by default as it's typically used in
-    // full-screen use cases. Since we're using this view controller to place SwiftUI views within
-    // other view controllers we default the background color to clear so we can see the views
-    // below, e.g. to draw highlight states in a `CollectionView`.
-    view.backgroundColor = .clear
-  }
-}
-#endif

package/Sources/Private/EmbeddedLibraries/EpoxyCore/SwiftUI/EpoxySwiftUIHostingView.swift

@@ -1,389 +0,0 @@
-// Created by eric_horacek on 9/16/21.
-// Copyright © 2021 Airbnb Inc. All rights reserved.
-
-#if canImport(Combine) && canImport(SwiftUI) && !os(macOS)
-import Combine
-import SwiftUI
-
-// MARK: - SwiftUIHostingViewReuseBehavior
-
-/// The reuse behavior of an `EpoxySwiftUIHostingView`.
-enum SwiftUIHostingViewReuseBehavior: Hashable {
-  /// Instances of a `EpoxySwiftUIHostingView` with `RootView`s of same type can be reused within
-  /// the Epoxy container.
-  ///
-  /// This is the default reuse behavior.
-  case reusable
-  /// Instances of a `EpoxySwiftUIHostingView` with `RootView`s of same type can only reused within
-  /// the Epoxy container when they have identical `reuseID`s.
-  case unique(reuseID: AnyHashable)
-}
-
-// MARK: - CallbackContextEpoxyModeled
-
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, *)
-extension CallbackContextEpoxyModeled
-  where
-  Self: WillDisplayProviding & DidEndDisplayingProviding,
-  CallbackContext: ViewProviding & AnimatedProviding
-{
-  /// Updates the appearance state of a `EpoxySwiftUIHostingView` in coordination with the
-  /// `willDisplay` and `didEndDisplaying` callbacks of this `EpoxyableModel`.
-  ///
-  /// - Note: You should only need to call then from the implementation of a concrete
-  ///   `EpoxyableModel` convenience vendor method, e.g. `SwiftUI.View.itemModel(…)`.
-  func linkDisplayLifecycle<RootView: View>() -> Self
-    where
-    CallbackContext.View == EpoxySwiftUIHostingView<RootView>
-  {
-    willDisplay { context in
-      context.view.handleWillDisplay(animated: context.animated)
-    }
-    .didEndDisplaying { context in
-      context.view.handleDidEndDisplaying(animated: context.animated)
-    }
-  }
-}
-
-// MARK: - EpoxySwiftUIHostingView
-
-/// A `UIView` that hosts a SwiftUI view within an Epoxy container, e.g. an Epoxy `CollectionView`.
-///
-/// Wraps an `EpoxySwiftUIHostingController` and adds it as a child view controller to the next
-/// ancestor view controller in the hierarchy.
-///
-/// There's a private API that accomplishes this same behavior without needing a `UIViewController`:
-/// `_UIHostingView`, but we can't safely use it as 1) the behavior may change out from under us, 2)
-/// the API is private and 3) the `_UIHostingView` doesn't not accept setting a new `View` instance.
-///
-/// - SeeAlso: `EpoxySwiftUIHostingController`
-@available(iOS 13.0, tvOS 13.0, *)
-final class EpoxySwiftUIHostingView<RootView: View>: UIView, EpoxyableView {
-
-  // MARK: Lifecycle
-
-  init(style: Style) {
-    // Ignore the safe area to ensure the view isn't laid out incorrectly when being sized while
-    // overlapping the safe area.
-    epoxyContent = EpoxyHostingContent(rootView: style.initialContent.rootView)
-    viewController = EpoxySwiftUIHostingController(
-      rootView: .init(content: epoxyContent, environment: epoxyEnvironment),
-      ignoreSafeArea: true)
-
-    dataID = style.initialContent.dataID ?? DefaultDataID.noneProvided as AnyHashable
-
-    super.init(frame: .zero)
-
-    epoxyEnvironment.intrinsicContentSizeInvalidator = .init(invalidate: { [weak self] in
-      self?.viewController.view.invalidateIntrinsicContentSize()
-
-      // Inform the enclosing collection view that the size has changed, if we're contained in one,
-      // allowing the cell to resize.
-      //
-      // On iOS 16+, we could call `invalidateIntrinsicContentSize()` on the enclosing collection
-      // view cell instead, but that currently causes visual artifacts with `MagazineLayout`. The
-      // better long term fix is likely to switch to `UIHostingConfiguration` on iOS 16+ anyways.
-      if let enclosingCollectionView = self?.superview?.superview?.superview as? UICollectionView {
-        enclosingCollectionView.collectionViewLayout.invalidateLayout()
-      }
-    })
-    layoutMargins = .zero
-  }
-
-  @available(*, unavailable)
-  required init?(coder _: NSCoder) {
-    fatalError("init(coder:) has not been implemented")
-  }
-
-  // MARK: Internal
-
-  struct Style: Hashable {
-    init(reuseBehavior: SwiftUIHostingViewReuseBehavior, initialContent: Content) {
-      self.reuseBehavior = reuseBehavior
-      self.initialContent = initialContent
-    }
-
-    var reuseBehavior: SwiftUIHostingViewReuseBehavior
-    var initialContent: Content
-
-    static func == (lhs: Style, rhs: Style) -> Bool {
-      lhs.reuseBehavior == rhs.reuseBehavior
-    }
-
-    func hash(into hasher: inout Hasher) {
-      hasher.combine(reuseBehavior)
-    }
-  }
-
-  struct Content: Equatable {
-    init(rootView: RootView, dataID: AnyHashable?) {
-      self.rootView = rootView
-      self.dataID = dataID
-    }
-
-    var rootView: RootView
-    var dataID: AnyHashable?
-
-    static func == (_: Content, _: Content) -> Bool {
-      // The content should never be equal since we need the `rootView` to be updated on every
-      // content change.
-      false
-    }
-  }
-
-  override func didMoveToWindow() {
-    super.didMoveToWindow()
-
-    // We'll only be able to discover a valid parent `viewController` once we're added to a window,
-    // so we do so here in addition to the `handleWillDisplay(…)` method.
-    if window != nil {
-      addViewControllerIfNeeded()
-    }
-  }
-
-  func setContent(_ content: Content, animated _: Bool) {
-    // This triggers a change in the observed `EpoxyHostingContent` object and allows the
-    // propagation of the SwiftUI transaction, instead of just replacing the `rootView`.
-    epoxyContent.rootView = content.rootView
-    dataID = content.dataID ?? DefaultDataID.noneProvided as AnyHashable
-
-    // The view controller must be added to the view controller hierarchy to measure its content.
-    if window != nil {
-      addViewControllerIfNeeded()
-    }
-
-    // As of iOS 15.2, `UIHostingController` now renders updated content asynchronously, and as such
-    // this view will get sized incorrectly with the previous content when reused unless we invoke
-    // this semi-private API. We couldn't find any other method to get the view to resize
-    // synchronously after updating `rootView`, but hopefully this will become a internal API soon so
-    // we can remove this call.
-    viewController._render(seconds: 0)
-
-    // This is required to ensure that views with new content are properly resized.
-    viewController.view.invalidateIntrinsicContentSize()
-  }
-
-  override func layoutMarginsDidChange() {
-    super.layoutMarginsDidChange()
-
-    let margins = layoutMargins
-    switch effectiveUserInterfaceLayoutDirection {
-    case .rightToLeft:
-      epoxyEnvironment.layoutMargins = .init(
-        top: margins.top,
-        leading: margins.right,
-        bottom: margins.bottom,
-        trailing: margins.left)
-    case .leftToRight:
-      fallthrough
-    @unknown default:
-      epoxyEnvironment.layoutMargins = .init(
-        top: margins.top,
-        leading: margins.left,
-        bottom: margins.bottom,
-        trailing: margins.right)
-    }
-
-    // Allow the layout margins update to fully propagate through to the SwiftUI View before
-    // invalidating the layout.
-    DispatchQueue.main.async {
-      self.viewController.view.invalidateIntrinsicContentSize()
-    }
-  }
-
-  func handleWillDisplay(animated: Bool) {
-    guard state != .appeared, window != nil else { return }
-    transition(to: .appearing(animated: animated))
-    transition(to: .appeared)
-  }
-
-  func handleDidEndDisplaying(animated: Bool) {
-    guard state != .disappeared else { return }
-    transition(to: .disappearing(animated: animated))
-    transition(to: .disappeared)
-  }
-
-  // MARK: Private
-
-  private let viewController: EpoxySwiftUIHostingController<EpoxyHostingWrapper<RootView>>
-  private let epoxyContent: EpoxyHostingContent<RootView>
-  private let epoxyEnvironment = EpoxyHostingEnvironment()
-  private var dataID: AnyHashable
-  private var state: AppearanceState = .disappeared
-
-  /// Updates the appearance state of the `viewController`.
-  private func transition(to state: AppearanceState) {
-    guard state != self.state else { return }
-
-    // See "Handling View-Related Notifications" section for the state machine diagram.
-    // https://developer.apple.com/documentation/uikit/uiviewcontroller
-    switch (to: state, from: self.state) {
-    case (to: .appearing(let animated), from: .disappeared):
-      viewController.beginAppearanceTransition(true, animated: animated)
-      addViewControllerIfNeeded()
-    case (to: .disappearing(let animated), from: .appeared):
-      viewController.beginAppearanceTransition(false, animated: animated)
-    case (to: .disappeared, from: .disappearing):
-      removeViewControllerIfNeeded()
-    case (to: .appeared, from: .appearing):
-      viewController.endAppearanceTransition()
-    case (to: .disappeared, from: .appeared):
-      viewController.beginAppearanceTransition(false, animated: true)
-      removeViewControllerIfNeeded()
-    case (to: .appeared, from: .disappearing(let animated)):
-      viewController.beginAppearanceTransition(true, animated: animated)
-      viewController.endAppearanceTransition()
-    case (to: .disappeared, from: .appearing(let animated)):
-      viewController.beginAppearanceTransition(false, animated: animated)
-      removeViewControllerIfNeeded()
-    case (to: .appeared, from: .disappeared):
-      viewController.beginAppearanceTransition(true, animated: false)
-      addViewControllerIfNeeded()
-      viewController.endAppearanceTransition()
-    case (to: .appearing(let animated), from: .appeared):
-      viewController.beginAppearanceTransition(false, animated: animated)
-      viewController.beginAppearanceTransition(true, animated: animated)
-    case (to: .appearing(let animated), from: .disappearing):
-      viewController.beginAppearanceTransition(true, animated: animated)
-    case (to: .disappearing(let animated), from: .disappeared):
-      viewController.beginAppearanceTransition(true, animated: animated)
-      addViewControllerIfNeeded()
-      viewController.beginAppearanceTransition(false, animated: animated)
-    case (to: .disappearing(let animated), from: .appearing):
-      viewController.beginAppearanceTransition(false, animated: animated)
-    case (to: .appearing, from: .appearing),
-         (to: .appeared, from: .appeared),
-         (to: .disappearing, from: .disappearing),
-         (to: .disappeared, from: .disappeared):
-      // This should never happen since we guard on identical states.
-      EpoxyLogger.shared.assertionFailure("Impossible state change from \(self.state) to \(state)")
-    }
-
-    self.state = state
-  }
-
-  private func addViewControllerIfNeeded() {
-    // This isn't great, and means that we're going to add this view controller as a child view
-    // controller of a view controller somewhere else in the hierarchy, which the author of that
-    // view controller may not be expecting. However there's not really a better pathway forward
-    // here without requiring a view controller instance to be passed all the way through, which is
-    // both burdensome and error-prone.
-    guard let nextViewController = superview?.next(UIViewController.self) else {
-      EpoxyLogger.shared.assertionFailure(
-        """
-        Unable to add a UIHostingController view, could not locate a UIViewController in the \
-        responder chain for view with ID \(dataID) of type \(RootView.self).
-        """)
-      return
-    }
-
-    guard viewController.parent !== nextViewController else { return }
-
-    // If in a different parent, we need to first remove from it before we add.
-    if viewController.parent != nil {
-      removeViewControllerIfNeeded()
-    }
-
-    addViewController(to: nextViewController)
-
-    state = .appeared
-  }
-
-  private func addViewController(to parent: UIViewController) {
-    viewController.willMove(toParent: parent)
-
-    parent.addChild(viewController)
-
-    addSubview(viewController.view)
-
-    // Get the view controller's view to be sized correctly so that we don't have to wait for
-    // autolayout to perform a pass to do so.
-    viewController.view.frame = bounds
-
-    viewController.view.translatesAutoresizingMaskIntoConstraints = false
-    NSLayoutConstraint.activate([
-      viewController.view.leadingAnchor.constraint(equalTo: leadingAnchor),
-      viewController.view.topAnchor.constraint(equalTo: topAnchor),
-      viewController.view.trailingAnchor.constraint(equalTo: trailingAnchor),
-      viewController.view.bottomAnchor.constraint(equalTo: bottomAnchor),
-    ])
-
-    viewController.didMove(toParent: parent)
-  }
-
-  private func removeViewControllerIfNeeded() {
-    guard viewController.parent != nil else { return }
-
-    viewController.willMove(toParent: nil)
-    viewController.view.removeFromSuperview()
-    viewController.removeFromParent()
-    viewController.didMove(toParent: nil)
-  }
-}
-
-// MARK: - AppearanceState
-
-/// The appearance state of a `EpoxySwiftUIHostingController` contained within a
-/// `EpoxySwiftUIHostingView`.
-private enum AppearanceState: Equatable {
-  case appearing(animated: Bool)
-  case appeared
-  case disappearing(animated: Bool)
-  case disappeared
-}
-
-// MARK: - UIResponder
-
-extension UIResponder {
-  /// Recursively traverses the responder chain upwards from this responder to its next responder
-  /// until the a responder of the given type is located, else returns `nil`.
-  @nonobjc
-  fileprivate func next<ResponderType>(_ type: ResponderType.Type) -> ResponderType? {
-    self as? ResponderType ?? next?.next(type)
-  }
-}
-
-// MARK: - EpoxyHostingContent
-
-/// The object that is used to communicate changes in the root view to the
-/// `EpoxySwiftUIHostingController`.
-@available(iOS 13.0, tvOS 13.0, *)
-final class EpoxyHostingContent<RootView: View>: ObservableObject {
-
-  // MARK: Lifecycle
-
-  init(rootView: RootView) {
-    _rootView = .init(wrappedValue: rootView)
-  }
-
-  // MARK: Internal
-
-  @Published var rootView: RootView
-}
-
-// MARK: - EpoxyHostingEnvironment
-
-/// The object that is used to communicate values to SwiftUI views within an
-/// `EpoxySwiftUIHostingController`, e.g. layout margins.
-@available(iOS 13.0, tvOS 13.0, *)
-final class EpoxyHostingEnvironment: ObservableObject {
-  @Published var layoutMargins = EdgeInsets()
-  @Published var intrinsicContentSizeInvalidator = EpoxyIntrinsicContentSizeInvalidator(invalidate: { })
-}
-
-// MARK: - EpoxyHostingWrapper
-
-/// The wrapper view that is used to communicate values to SwiftUI views within an
-/// `EpoxySwiftUIHostingController`, e.g. layout margins.
-@available(iOS 13.0, tvOS 13.0, *)
-struct EpoxyHostingWrapper<Content: View>: View {
-  @ObservedObject var content: EpoxyHostingContent<Content>
-  @ObservedObject var environment: EpoxyHostingEnvironment
-
-  var body: some View {
-    content.rootView
-      .environment(\.epoxyLayoutMargins, environment.layoutMargins)
-      .environment(\.epoxyIntrinsicContentSizeInvalidator, environment.intrinsicContentSizeInvalidator)
-  }
-}
-#endif