lottie-ios 3.2.2 → 3.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (316) hide show
  1. package/.github/actions/setup/action.yml +32 -0
  2. package/.github/issue_template.md +6 -23
  3. package/.github/workflows/main.yml +98 -0
  4. package/.spi.yml +6 -0
  5. package/.swift-version +1 -0
  6. package/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata +7 -0
  7. package/.swiftpm/xcode/package.xcworkspace/xcuserdata/cal.xcuserdatad/UserInterfaceState.xcuserstate +0 -0
  8. package/.swiftpm/xcode/xcuserdata/{brandonwithrow.xcuserdatad → cal.xcuserdatad}/xcschemes/xcschememanagement.plist +25 -15
  9. package/.swiftpm/xcode/xcuserdata/calstephens.xcuserdatad/xcschemes/xcschememanagement.plist +14 -0
  10. package/Gemfile +4 -0
  11. package/Gemfile.lock +102 -0
  12. package/Lottie.xcodeproj/project.pbxproj +2003 -1972
  13. package/Lottie.xcodeproj/project.xcworkspace/contents.xcworkspacedata +1 -1
  14. package/Lottie.xcodeproj/project.xcworkspace/xcuserdata/cal.xcuserdatad/UserInterfaceState.xcuserstate +0 -0
  15. package/Lottie.xcodeproj/xcshareddata/xcschemes/{Lottie_iOS.xcscheme → Lottie (iOS).xcscheme } +15 -18
  16. package/Lottie.xcodeproj/xcshareddata/xcschemes/{Lottie_macOS.xcscheme → Lottie (macOS).xcscheme } +7 -20
  17. package/Lottie.xcodeproj/xcshareddata/xcschemes/{Lottie_tvOS.xcscheme → Lottie (tvOS).xcscheme } +5 -18
  18. package/Lottie.xcodeproj/xcuserdata/cal.xcuserdatad/xcschemes/xcschememanagement.plist +37 -0
  19. package/Lottie.xcodeproj/xcuserdata/calstephens.xcuserdatad/xcschemes/xcschememanagement.plist +24 -0
  20. package/Lottie.xcworkspace/contents.xcworkspacedata +10 -0
  21. package/Lottie.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +8 -0
  22. package/Lottie.xcworkspace/xcshareddata/swiftpm/Package.resolved +115 -0
  23. package/Lottie.xcworkspace/xcuserdata/cal.xcuserdatad/UserInterfaceState.xcuserstate +0 -0
  24. package/{Lottie.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad → Lottie.xcworkspace/xcuserdata/cal.xcuserdatad}/xcdebugger/Breakpoints_v2.xcbkptlist +2 -2
  25. package/Lottie.xcworkspace/xcuserdata/cal.xcuserdatad/xcdebugger/Expressions.xcexplist +153 -0
  26. package/Lottie.xcworkspace/xcuserdata/calstephens.xcuserdatad/UserInterfaceState.xcuserstate +0 -0
  27. package/Lottie.xcworkspace/xcuserdata/calstephens.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +39 -0
  28. package/Lottie.xcworkspace/xcuserdata/calstephens.xcuserdatad/xcdebugger/Expressions.xcexplist +25 -0
  29. package/Lottie.xcworkspace/xcuserdata/calstephens.xcuserdatad/xcschemes/xcschememanagement.plist +30 -0
  30. package/Package.resolved +88 -0
  31. package/Package.swift +10 -15
  32. package/README.md +40 -60
  33. package/Rakefile +121 -0
  34. package/Sources/Private/CoreAnimation/Animations/CAAnimation+TimingConfiguration.swift +81 -0
  35. package/Sources/Private/CoreAnimation/Animations/CALayer+addAnimation.swift +448 -0
  36. package/Sources/Private/CoreAnimation/Animations/CombinedShapeAnimation.swift +53 -0
  37. package/Sources/Private/CoreAnimation/Animations/CustomPathAnimation.swift +41 -0
  38. package/Sources/Private/CoreAnimation/Animations/EllipseAnimation.swift +28 -0
  39. package/Sources/Private/CoreAnimation/Animations/GradientAnimations.swift +210 -0
  40. package/Sources/Private/CoreAnimation/Animations/LayerProperty.swift +229 -0
  41. package/Sources/Private/CoreAnimation/Animations/OpacityAnimation.swift +52 -0
  42. package/Sources/Private/CoreAnimation/Animations/RectangleAnimation.swift +31 -0
  43. package/Sources/Private/CoreAnimation/Animations/ShapeAnimation.swift +246 -0
  44. package/Sources/Private/CoreAnimation/Animations/StarAnimation.swift +95 -0
  45. package/Sources/Private/CoreAnimation/Animations/StrokeAnimation.swift +70 -0
  46. package/Sources/Private/CoreAnimation/Animations/TransformAnimations.swift +205 -0
  47. package/Sources/Private/CoreAnimation/Animations/VisibilityAnimation.swift +37 -0
  48. package/Sources/Private/CoreAnimation/CompatibilityTracker.swift +130 -0
  49. package/Sources/Private/CoreAnimation/CoreAnimationLayer.swift +492 -0
  50. package/Sources/Private/CoreAnimation/Extensions/CALayer+fillBounds.swift +35 -0
  51. package/Sources/Private/CoreAnimation/Extensions/KeyframeGroup+exactlyOneKeyframe.swift +37 -0
  52. package/Sources/Private/CoreAnimation/Extensions/Keyframes+combinedIfPossible.swift +73 -0
  53. package/Sources/Private/CoreAnimation/Layers/AnimationLayer.swift +83 -0
  54. package/Sources/Private/CoreAnimation/Layers/BaseAnimationLayer.swift +33 -0
  55. package/Sources/Private/CoreAnimation/Layers/BaseCompositionLayer.swift +87 -0
  56. package/Sources/Private/CoreAnimation/Layers/CALayer+setupLayerHierarchy.swift +131 -0
  57. package/Sources/Private/CoreAnimation/Layers/GradientRenderLayer.swift +94 -0
  58. package/Sources/Private/CoreAnimation/Layers/ImageLayer.swift +79 -0
  59. package/Sources/Private/CoreAnimation/Layers/LayerModel+makeAnimationLayer.swift +60 -0
  60. package/Sources/Private/CoreAnimation/Layers/MaskCompositionLayer.swift +138 -0
  61. package/Sources/Private/CoreAnimation/Layers/PreCompLayer.swift +140 -0
  62. package/Sources/Private/CoreAnimation/Layers/ShapeItemLayer.swift +302 -0
  63. package/Sources/Private/CoreAnimation/Layers/ShapeLayer.swift +319 -0
  64. package/Sources/Private/CoreAnimation/Layers/SolidLayer.swift +47 -0
  65. package/Sources/Private/CoreAnimation/Layers/TextLayer.swift +91 -0
  66. package/Sources/Private/CoreAnimation/Layers/TransformLayer.swift +11 -0
  67. package/Sources/Private/CoreAnimation/ValueProviderStore.swift +139 -0
  68. package/{lottie-swift/src/Private → Sources/Private/MainThread}/LayerContainers/CompLayers/CompositionLayer.swift +93 -85
  69. package/{lottie-swift/src/Private → Sources/Private/MainThread}/LayerContainers/CompLayers/ImageCompositionLayer.swift +24 -21
  70. package/{lottie-swift/src/Private → Sources/Private/MainThread}/LayerContainers/CompLayers/MaskContainerLayer.swift +75 -54
  71. package/{lottie-swift/src/Private → Sources/Private/MainThread}/LayerContainers/CompLayers/NullCompositionLayer.swift +5 -5
  72. package/{lottie-swift/src/Private → Sources/Private/MainThread}/LayerContainers/CompLayers/PreCompositionLayer.swift +61 -44
  73. package/{lottie-swift/src/Private → Sources/Private/MainThread}/LayerContainers/CompLayers/ShapeCompositionLayer.swift +22 -20
  74. package/{lottie-swift/src/Private → Sources/Private/MainThread}/LayerContainers/CompLayers/SolidCompositionLayer.swift +26 -17
  75. package/{lottie-swift/src/Private → Sources/Private/MainThread}/LayerContainers/CompLayers/TextCompositionLayer.swift +42 -36
  76. package/{lottie-swift/src/Private/LayerContainers/AnimationContainer.swift → Sources/Private/MainThread/LayerContainers/MainThreadAnimationLayer.swift} +200 -140
  77. package/Sources/Private/MainThread/LayerContainers/Utility/CachedImageProvider.swift +47 -0
  78. package/{lottie-swift/src/Private → Sources/Private/MainThread}/LayerContainers/Utility/CompositionLayersInitializer.swift +33 -24
  79. package/{lottie-swift/src/Private/LayerContainers/Utility/TextLayer.swift → Sources/Private/MainThread/LayerContainers/Utility/CoreTextRenderLayer.swift} +120 -106
  80. package/{lottie-swift/src/Private → Sources/Private/MainThread}/LayerContainers/Utility/InvertedMatteLayer.swift +25 -24
  81. package/Sources/Private/MainThread/LayerContainers/Utility/LayerFontProvider.swift +41 -0
  82. package/{lottie-swift/src/Private → Sources/Private/MainThread}/LayerContainers/Utility/LayerImageProvider.swift +20 -16
  83. package/Sources/Private/MainThread/LayerContainers/Utility/LayerTextProvider.swift +40 -0
  84. package/{lottie-swift/src/Private → Sources/Private/MainThread}/LayerContainers/Utility/LayerTransformNode.swift +82 -67
  85. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Extensions/ItemsExtension.swift +4 -4
  86. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/NodeProperties/NodeProperty.swift +29 -21
  87. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/NodeProperties/Protocols/AnyNodeProperty.swift +16 -10
  88. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/NodeProperties/Protocols/AnyValueContainer.swift +6 -6
  89. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/NodeProperties/Protocols/KeypathSearchable.swift +5 -5
  90. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/NodeProperties/Protocols/NodePropertyMap.swift +10 -8
  91. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/NodeProperties/ValueContainer.swift +25 -21
  92. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/NodeProperties/ValueProviders/GroupInterpolator.swift +23 -17
  93. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/NodeProperties/ValueProviders/KeyframeInterpolator.swift +125 -108
  94. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/NodeProperties/ValueProviders/SingleValueProvider.swift +22 -17
  95. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Nodes/ModifierNodes/TrimPathNode.swift +110 -79
  96. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Nodes/OutputNodes/GroupOutputNode.swift +22 -16
  97. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Nodes/OutputNodes/PassThroughOutputNode.swift +19 -15
  98. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Nodes/OutputNodes/PathOutputNode.swift +22 -20
  99. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Nodes/OutputNodes/Renderables/FillRenderer.swift +22 -23
  100. package/Sources/Private/MainThread/NodeRenderSystem/Nodes/OutputNodes/Renderables/GradientFillRenderer.swift +242 -0
  101. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Nodes/OutputNodes/Renderables/GradientStrokeRenderer.swift +30 -24
  102. package/{lottie-swift/src/Private/NodeRenderSystem/Nodes/OutputNodes/Renderables/GradientFillRenderer.swift → Sources/Private/MainThread/NodeRenderSystem/Nodes/OutputNodes/Renderables/LegacyGradientFillRenderer.swift} +93 -66
  103. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Nodes/OutputNodes/Renderables/StrokeRenderer.swift +23 -19
  104. package/Sources/Private/MainThread/NodeRenderSystem/Nodes/PathNodes/EllipseNode.swift +139 -0
  105. package/Sources/Private/MainThread/NodeRenderSystem/Nodes/PathNodes/PolygonNode.swift +170 -0
  106. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Nodes/PathNodes/RectNode.swift +95 -58
  107. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Nodes/PathNodes/ShapeNode.swift +42 -29
  108. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Nodes/PathNodes/StarNode.swift +108 -69
  109. package/Sources/Private/MainThread/NodeRenderSystem/Nodes/RenderContainers/GroupNode.swift +155 -0
  110. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Nodes/RenderNodes/FillNode.swift +51 -37
  111. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Nodes/RenderNodes/GradientFillNode.swift +54 -42
  112. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Nodes/RenderNodes/GradientStrokeNode.swift +65 -57
  113. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Nodes/RenderNodes/StrokeNode.swift +84 -58
  114. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Nodes/Text/TextAnimatorNode.swift +138 -119
  115. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Protocols/AnimatorNode.swift +80 -79
  116. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Protocols/PathNode.swift +5 -3
  117. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/Protocols/RenderNode.swift +22 -17
  118. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/RenderLayers/ShapeContainerLayer.swift +27 -24
  119. package/{lottie-swift/src/Private → Sources/Private/MainThread}/NodeRenderSystem/RenderLayers/ShapeRenderLayer.swift +34 -25
  120. package/Sources/Private/Model/Animation.swift +160 -0
  121. package/Sources/Private/Model/Assets/Asset.swift +43 -0
  122. package/{lottie-swift/src → Sources}/Private/Model/Assets/AssetLibrary.swift +40 -13
  123. package/Sources/Private/Model/Assets/ImageAsset.swift +112 -0
  124. package/{lottie-swift/src → Sources}/Private/Model/Assets/PrecompAsset.swift +20 -10
  125. package/Sources/Private/Model/DictionaryInitializable.swift +67 -0
  126. package/Sources/Private/Model/Extensions/Bundle.swift +34 -0
  127. package/{lottie-swift/src → Sources}/Private/Model/Extensions/KeyedDecodingContainerExtensions.swift +8 -4
  128. package/Sources/Private/Model/Keyframes/KeyframeData.swift +113 -0
  129. package/Sources/Private/Model/Keyframes/KeyframeGroup.swift +197 -0
  130. package/{lottie-swift/src → Sources}/Private/Model/Layers/ImageLayerModel.swift +21 -11
  131. package/Sources/Private/Model/Layers/LayerModel.swift +228 -0
  132. package/{lottie-swift/src → Sources}/Private/Model/Layers/PreCompLayerModel.swift +39 -22
  133. package/{lottie-swift/src → Sources}/Private/Model/Layers/ShapeLayerModel.swift +23 -12
  134. package/{lottie-swift/src → Sources}/Private/Model/Layers/SolidLayerModel.swift +31 -19
  135. package/{lottie-swift/src → Sources}/Private/Model/Layers/TextLayerModel.swift +33 -19
  136. package/Sources/Private/Model/Objects/DashPattern.swift +44 -0
  137. package/Sources/Private/Model/Objects/Marker.swift +33 -0
  138. package/Sources/Private/Model/Objects/Mask.swift +80 -0
  139. package/Sources/Private/Model/Objects/Transform.swift +179 -0
  140. package/Sources/Private/Model/ShapeItems/Ellipse.swift +75 -0
  141. package/Sources/Private/Model/ShapeItems/Fill.swift +74 -0
  142. package/Sources/Private/Model/ShapeItems/GradientFill.swift +124 -0
  143. package/Sources/Private/Model/ShapeItems/GradientStroke.swift +186 -0
  144. package/Sources/Private/Model/ShapeItems/Group.swift +48 -0
  145. package/{lottie-swift/src → Sources}/Private/Model/ShapeItems/Merge.swift +29 -11
  146. package/Sources/Private/Model/ShapeItems/Rectangle.swift +73 -0
  147. package/Sources/Private/Model/ShapeItems/Repeater.swift +136 -0
  148. package/Sources/Private/Model/ShapeItems/Shape.swift +56 -0
  149. package/Sources/Private/Model/ShapeItems/ShapeItem.swift +163 -0
  150. package/Sources/Private/Model/ShapeItems/ShapeTransform.swift +136 -0
  151. package/Sources/Private/Model/ShapeItems/Star.swift +132 -0
  152. package/Sources/Private/Model/ShapeItems/Stroke.swift +102 -0
  153. package/Sources/Private/Model/ShapeItems/Trim.swift +78 -0
  154. package/Sources/Private/Model/Text/Font.swift +61 -0
  155. package/{lottie-swift/src → Sources}/Private/Model/Text/Glyph.swift +63 -39
  156. package/Sources/Private/Model/Text/TextAnimator.swift +164 -0
  157. package/Sources/Private/Model/Text/TextDocument.swift +123 -0
  158. package/Sources/Private/RootAnimationLayer.swift +51 -0
  159. package/{lottie-swift/src → Sources}/Private/Utility/Debugging/AnimatorNodeDebugging.swift +7 -7
  160. package/{lottie-swift/src → Sources}/Private/Utility/Debugging/LayerDebugging.swift +72 -48
  161. package/Sources/Private/Utility/Debugging/TestHelpers.swift +10 -0
  162. package/{lottie-swift/src → Sources}/Private/Utility/Extensions/AnimationKeypathExtension.swift +69 -59
  163. package/Sources/Private/Utility/Extensions/BlendMode+Filter.swift +31 -0
  164. package/Sources/Private/Utility/Extensions/CGColor+RGB.swift +22 -0
  165. package/{lottie-swift/src → Sources}/Private/Utility/Extensions/CGFloatExtensions.swift +70 -67
  166. package/Sources/Private/Utility/Extensions/DataExtension.swift +27 -0
  167. package/Sources/Private/Utility/Extensions/MathKit.swift +450 -0
  168. package/Sources/Private/Utility/Extensions/StringExtensions.swift +38 -0
  169. package/{lottie-swift/src → Sources}/Private/Utility/Helpers/AnimationContext.swift +42 -16
  170. package/Sources/Private/Utility/Interpolatable/InterpolatableExtensions.swift +134 -0
  171. package/{lottie-swift/src → Sources}/Private/Utility/Interpolatable/KeyframeExtensions.swift +13 -10
  172. package/Sources/Private/Utility/Interpolatable/KeyframeGroup+Extensions.swift +59 -0
  173. package/{lottie-swift/src → Sources}/Private/Utility/Primitives/BezierPath.swift +229 -143
  174. package/Sources/Private/Utility/Primitives/CGPointExtension.swift +35 -0
  175. package/{lottie-swift/src → Sources}/Private/Utility/Primitives/ColorExtension.swift +46 -14
  176. package/{lottie-swift/src → Sources}/Private/Utility/Primitives/CompoundBezierPath.swift +58 -49
  177. package/Sources/Private/Utility/Primitives/CurveVertex.swift +184 -0
  178. package/Sources/Private/Utility/Primitives/PathElement.swift +75 -0
  179. package/Sources/Private/Utility/Primitives/UnitBezier.swift +115 -0
  180. package/Sources/Private/Utility/Primitives/VectorsExtensions.swift +341 -0
  181. package/Sources/Public/Animation/AnimationPublic.swift +266 -0
  182. package/Sources/Public/Animation/AnimationView.swift +1335 -0
  183. package/Sources/Public/Animation/AnimationViewInitializers.swift +109 -0
  184. package/Sources/Public/AnimationCache/AnimationCacheProvider.swift +22 -0
  185. package/{lottie-swift/src → Sources}/Public/AnimationCache/LRUAnimationCache.swift +22 -18
  186. package/Sources/Public/DynamicProperties/AnimationKeypath.swift +49 -0
  187. package/Sources/Public/DynamicProperties/AnyValueProvider.swift +132 -0
  188. package/{lottie-swift/src → Sources}/Public/DynamicProperties/ValueProviders/ColorValueProvider.swift +54 -36
  189. package/{lottie-swift/src → Sources}/Public/DynamicProperties/ValueProviders/FloatValueProvider.swift +40 -36
  190. package/Sources/Public/DynamicProperties/ValueProviders/GradientValueProvider.swift +123 -0
  191. package/{lottie-swift/src → Sources}/Public/DynamicProperties/ValueProviders/PointValueProvider.swift +40 -35
  192. package/{lottie-swift/src → Sources}/Public/DynamicProperties/ValueProviders/SizeValueProvider.swift +40 -35
  193. package/{lottie-swift/src → Sources}/Public/FontProvider/AnimationFontProvider.swift +15 -8
  194. package/Sources/Public/ImageProvider/AnimationImageProvider.swift +21 -0
  195. package/Sources/Public/Keyframes/Interpolatable.swift +253 -0
  196. package/Sources/Public/Keyframes/Keyframe.swift +92 -0
  197. package/Sources/Public/Logging/LottieLogger.swift +137 -0
  198. package/Sources/Public/LottieConfiguration.swift +143 -0
  199. package/{lottie-swift/src → Sources}/Public/Primitives/AnimationTime.swift +1 -1
  200. package/{lottie-swift/src → Sources}/Public/Primitives/Color.swift +10 -6
  201. package/{lottie-swift/src → Sources}/Public/Primitives/Vectors.swift +13 -12
  202. package/Sources/Public/TextProvider/AnimationTextProvider.swift +53 -0
  203. package/{lottie-swift/src → Sources}/Public/iOS/AnimatedButton.swift +42 -26
  204. package/{lottie-swift/src → Sources}/Public/iOS/AnimatedControl.swift +100 -91
  205. package/{lottie-swift/src → Sources}/Public/iOS/AnimatedSwitch.swift +128 -94
  206. package/{lottie-swift/src → Sources}/Public/iOS/AnimationSubview.swift +3 -3
  207. package/Sources/Public/iOS/AnimationViewBase.swift +78 -0
  208. package/{lottie-swift/src → Sources}/Public/iOS/BundleImageProvider.swift +36 -34
  209. package/{lottie-swift/src → Sources}/Public/iOS/Compatibility/CompatibleAnimationKeypath.swift +4 -0
  210. package/{lottie-swift/src → Sources}/Public/iOS/Compatibility/CompatibleAnimationView.swift +38 -29
  211. package/{lottie-swift/src → Sources}/Public/iOS/FilepathImageProvider.swift +24 -21
  212. package/{lottie-swift/src → Sources}/Public/iOS/UIColorExtension.swift +4 -4
  213. package/{lottie-swift/src/Public/MacOS/AnimationSubview.swift → Sources/Public/macOS/AnimationSubview.macOS.swift} +4 -5
  214. package/{lottie-swift/src/Public/MacOS/LottieView.swift → Sources/Public/macOS/AnimationViewBase.macOS.swift} +58 -50
  215. package/{lottie-swift/src/Public/MacOS/BundleImageProvider.swift → Sources/Public/macOS/BundleImageProvider.macOS.swift} +31 -32
  216. package/Sources/Public/macOS/FilepathImageProvider.macOS.swift +67 -0
  217. package/Tests/AnimationKeypathTests.swift +94 -0
  218. package/Tests/AutomaticEngineTests.swift +57 -0
  219. package/Tests/BundleTests.swift +25 -0
  220. package/Tests/DataURLTests.swift +64 -0
  221. package/Tests/ParsingTests.swift +43 -0
  222. package/Tests/PerformanceTests.swift +215 -0
  223. package/Tests/SnapshotConfiguration.swift +153 -0
  224. package/Tests/SnapshotTests.swift +265 -0
  225. package/Tests/Utils/Bundle+Module.swift +30 -0
  226. package/Tests/Utils/HardcodedFontProvider.swift +19 -0
  227. package/Tests/Utils/HardcodedImageProvider.swift +23 -0
  228. package/Tests/Utils/Snapshotting+presentationLayer.swift +47 -0
  229. package/Tests/ValueProvidersTests.swift +27 -0
  230. package/lottie-ios.podspec +11 -12
  231. package/package.json +1 -1
  232. package/script/test-carthage/Cartfile +1 -0
  233. package/script/test-carthage/Cartfile.resolved +1 -0
  234. package/script/test-carthage/CarthageTest/AppDelegate.swift +26 -0
  235. package/script/test-carthage/CarthageTest/Assets.xcassets/AccentColor.colorset/Contents.json +11 -0
  236. package/script/test-carthage/CarthageTest/Assets.xcassets/AppIcon.appiconset/Contents.json +98 -0
  237. package/script/test-carthage/CarthageTest/Assets.xcassets/Contents.json +6 -0
  238. package/script/test-carthage/CarthageTest/Base.lproj/LaunchScreen.storyboard +25 -0
  239. package/script/test-carthage/CarthageTest/Base.lproj/Main.storyboard +24 -0
  240. package/script/test-carthage/CarthageTest/Info.plist +66 -0
  241. package/script/test-carthage/CarthageTest/SceneDelegate.swift +10 -0
  242. package/script/test-carthage/CarthageTest/ViewController.swift +15 -0
  243. package/script/test-carthage/CarthageTest-macOS/AppDelegate.swift +7 -0
  244. package/script/test-carthage/CarthageTest-macOS/Assets.xcassets/AccentColor.colorset/Contents.json +11 -0
  245. package/script/test-carthage/CarthageTest-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json +58 -0
  246. package/script/test-carthage/CarthageTest-macOS/Assets.xcassets/Contents.json +6 -0
  247. package/script/test-carthage/CarthageTest-macOS/Base.lproj/Main.storyboard +717 -0
  248. package/script/test-carthage/CarthageTest-macOS/CarthageTest_macOS.entitlements +10 -0
  249. package/script/test-carthage/CarthageTest-macOS/ViewController.swift +15 -0
  250. package/script/test-carthage/CarthageTest.xcodeproj/project.pbxproj +532 -0
  251. package/script/test-carthage/CarthageTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata +7 -0
  252. package/script/test-carthage/CarthageTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +8 -0
  253. package/script/test-carthage/CarthageTest.xcodeproj/project.xcworkspace/xcuserdata/cal.xcuserdatad/UserInterfaceState.xcuserstate +0 -0
  254. package/script/test-carthage/CarthageTest.xcodeproj/project.xcworkspace/xcuserdata/calstephens.xcuserdatad/UserInterfaceState.xcuserstate +0 -0
  255. package/script/test-carthage/CarthageTest.xcodeproj/xcuserdata/cal.xcuserdatad/xcschemes/xcschememanagement.plist +14 -0
  256. package/script/test-carthage/CarthageTest.xcodeproj/xcuserdata/calstephens.xcuserdatad/xcschemes/xcschememanagement.plist +19 -0
  257. package/script/test-carthage/Mintfile +1 -0
  258. package/script/test-spm/LottieSPM.xcworkspace/contents.xcworkspacedata +7 -0
  259. package/script/test-spm/LottieSPM.xcworkspace/xcuserdata/cal.xcuserdatad/UserInterfaceState.xcuserstate +0 -0
  260. package/script/test-spm/Mintfile +1 -0
  261. package/.swiftpm/xcode/package.xcworkspace/xcuserdata/brandonwithrow.xcuserdatad/UserInterfaceState.xcuserstate +0 -0
  262. package/Lottie/Info.plist +0 -22
  263. package/Lottie.xcodeproj/project.xcworkspace/xcuserdata/brandonwithrow.xcuserdatad/UserInterfaceState.xcuserstate +0 -0
  264. package/Lottie.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/LottieLibraryMacOS.xcscheme +0 -80
  265. package/Lottie.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/xcschememanagement.plist +0 -57
  266. package/lottie-swift/Assets/.gitkeep +0 -0
  267. package/lottie-swift/src/Private/LayerContainers/Utility/LayerFontProvider.swift +0 -37
  268. package/lottie-swift/src/Private/LayerContainers/Utility/LayerTextProvider.swift +0 -36
  269. package/lottie-swift/src/Private/Model/Animation.swift +0 -107
  270. package/lottie-swift/src/Private/Model/Assets/Asset.swift +0 -27
  271. package/lottie-swift/src/Private/Model/Assets/ImageAsset.swift +0 -48
  272. package/lottie-swift/src/Private/Model/Keyframes/Keyframe.swift +0 -128
  273. package/lottie-swift/src/Private/Model/Keyframes/KeyframeGroup.swift +0 -108
  274. package/lottie-swift/src/Private/Model/Layers/LayerModel.swift +0 -150
  275. package/lottie-swift/src/Private/Model/Objects/DashPattern.swift +0 -24
  276. package/lottie-swift/src/Private/Model/Objects/Marker.swift +0 -23
  277. package/lottie-swift/src/Private/Model/Objects/Mask.swift +0 -48
  278. package/lottie-swift/src/Private/Model/Objects/Transform.swift +0 -105
  279. package/lottie-swift/src/Private/Model/ShapeItems/Ellipse.swift +0 -50
  280. package/lottie-swift/src/Private/Model/ShapeItems/FillI.swift +0 -49
  281. package/lottie-swift/src/Private/Model/ShapeItems/GradientFill.swift +0 -86
  282. package/lottie-swift/src/Private/Model/ShapeItems/GradientStroke.swift +0 -125
  283. package/lottie-swift/src/Private/Model/ShapeItems/Group.swift +0 -32
  284. package/lottie-swift/src/Private/Model/ShapeItems/Rectangle.swift +0 -50
  285. package/lottie-swift/src/Private/Model/ShapeItems/Repeater.swift +0 -80
  286. package/lottie-swift/src/Private/Model/ShapeItems/Shape.swift +0 -37
  287. package/lottie-swift/src/Private/Model/ShapeItems/ShapeItem.swift +0 -95
  288. package/lottie-swift/src/Private/Model/ShapeItems/ShapeTransform.swift +0 -68
  289. package/lottie-swift/src/Private/Model/ShapeItems/Star.swift +0 -86
  290. package/lottie-swift/src/Private/Model/ShapeItems/Stroke.swift +0 -67
  291. package/lottie-swift/src/Private/Model/ShapeItems/Trim.swift +0 -53
  292. package/lottie-swift/src/Private/Model/Text/Font.swift +0 -35
  293. package/lottie-swift/src/Private/Model/Text/TextAnimator.swift +0 -99
  294. package/lottie-swift/src/Private/Model/Text/TextDocument.swift +0 -70
  295. package/lottie-swift/src/Private/NodeRenderSystem/Nodes/PathNodes/EllipseNode.swift +0 -109
  296. package/lottie-swift/src/Private/NodeRenderSystem/Nodes/PathNodes/PolygonNode.swift +0 -132
  297. package/lottie-swift/src/Private/NodeRenderSystem/Nodes/RenderContainers/GroupNode.swift +0 -141
  298. package/lottie-swift/src/Private/Utility/Extensions/MathKit.swift +0 -539
  299. package/lottie-swift/src/Private/Utility/Extensions/StringExtensions.swift +0 -32
  300. package/lottie-swift/src/Private/Utility/Interpolatable/Interpolatable.swift +0 -18
  301. package/lottie-swift/src/Private/Utility/Interpolatable/InterpolatableExtensions.swift +0 -170
  302. package/lottie-swift/src/Private/Utility/Primitives/CurveVertex.swift +0 -177
  303. package/lottie-swift/src/Private/Utility/Primitives/PathElement.swift +0 -68
  304. package/lottie-swift/src/Private/Utility/Primitives/VectorsExtensions.swift +0 -218
  305. package/lottie-swift/src/Public/Animation/AnimationPublic.swift +0 -196
  306. package/lottie-swift/src/Public/Animation/AnimationView.swift +0 -1006
  307. package/lottie-swift/src/Public/Animation/AnimationViewInitializers.swift +0 -83
  308. package/lottie-swift/src/Public/AnimationCache/AnimationCacheProvider.swift +0 -24
  309. package/lottie-swift/src/Public/DynamicProperties/AnimationKeypath.swift +0 -46
  310. package/lottie-swift/src/Public/DynamicProperties/AnyValueProvider.swift +0 -29
  311. package/lottie-swift/src/Public/DynamicProperties/ValueProviders/GradientValueProvider.swift +0 -114
  312. package/lottie-swift/src/Public/ImageProvider/AnimationImageProvider.swift +0 -23
  313. package/lottie-swift/src/Public/MacOS/FilepathImageProvider.swift +0 -67
  314. package/lottie-swift/src/Public/TextProvider/AnimationTextProvider.swift +0 -39
  315. package/lottie-swift/src/Public/iOS/LottieView.swift +0 -62
  316. package/lottie-swift-testing.podspec +0 -32
@@ -0,0 +1,319 @@
1
+ // Created by Cal Stephens on 12/14/21.
2
+ // Copyright © 2021 Airbnb Inc. All rights reserved.
3
+
4
+ import QuartzCore
5
+
6
+ // MARK: - ShapeLayer
7
+
8
+ /// The CALayer type responsible for rendering `ShapeLayerModel`s
9
+ final class ShapeLayer: BaseCompositionLayer {
10
+
11
+ // MARK: Lifecycle
12
+
13
+ init(shapeLayer: ShapeLayerModel, context: LayerContext) throws {
14
+ self.shapeLayer = shapeLayer
15
+ super.init(layerModel: shapeLayer)
16
+ try setupGroups(from: shapeLayer.items, parentGroup: nil, context: context)
17
+ }
18
+
19
+ required init?(coder _: NSCoder) {
20
+ fatalError("init(coder:) has not been implemented")
21
+ }
22
+
23
+ /// Called by CoreAnimation to create a shadow copy of this layer
24
+ /// More details: https://developer.apple.com/documentation/quartzcore/calayer/1410842-init
25
+ override init(layer: Any) {
26
+ guard let typedLayer = layer as? Self else {
27
+ fatalError("\(Self.self).init(layer:) incorrectly called with \(type(of: layer))")
28
+ }
29
+
30
+ shapeLayer = typedLayer.shapeLayer
31
+ super.init(layer: typedLayer)
32
+ }
33
+
34
+ // MARK: Private
35
+
36
+ private let shapeLayer: ShapeLayerModel
37
+
38
+ }
39
+
40
+ // MARK: - GroupLayer
41
+
42
+ /// The CALayer type responsible for rendering `Group`s
43
+ final class GroupLayer: BaseAnimationLayer {
44
+
45
+ // MARK: Lifecycle
46
+
47
+ init(group: Group, inheritedItems: [ShapeItemLayer.Item], context: LayerContext) throws {
48
+ self.group = group
49
+ self.inheritedItems = inheritedItems
50
+ super.init()
51
+ try setupLayerHierarchy(context: context)
52
+ }
53
+
54
+ required init?(coder _: NSCoder) {
55
+ fatalError("init(coder:) has not been implemented")
56
+ }
57
+
58
+ /// Called by CoreAnimation to create a shadow copy of this layer
59
+ /// More details: https://developer.apple.com/documentation/quartzcore/calayer/1410842-init
60
+ override init(layer: Any) {
61
+ guard let typedLayer = layer as? Self else {
62
+ fatalError("\(Self.self).init(layer:) incorrectly called with \(type(of: layer))")
63
+ }
64
+
65
+ group = typedLayer.group
66
+ inheritedItems = typedLayer.inheritedItems
67
+ super.init(layer: typedLayer)
68
+ }
69
+
70
+ // MARK: Internal
71
+
72
+ override func setupAnimations(context: LayerAnimationContext) throws {
73
+ try super.setupAnimations(context: context)
74
+
75
+ if let (shapeTransform, context) = nonGroupItems.first(ShapeTransform.self, context: context) {
76
+ try addTransformAnimations(for: shapeTransform, context: context)
77
+ try addOpacityAnimation(for: shapeTransform, context: context)
78
+ }
79
+ }
80
+
81
+ // MARK: Private
82
+
83
+ private let group: Group
84
+
85
+ /// `ShapeItem`s that were listed in the parent's `items: [ShapeItem]` array
86
+ /// - This layer's parent is either the root `ShapeLayerModel` or some other `Group`
87
+ private let inheritedItems: [ShapeItemLayer.Item]
88
+
89
+ /// `ShapeItem`s (other than nested `Group`s) that are included in this group
90
+ private lazy var nonGroupItems = group.items
91
+ .filter { !($0 is Group) }
92
+ .map { ShapeItemLayer.Item(item: $0, parentGroup: group) }
93
+ + inheritedItems
94
+
95
+ private func setupLayerHierarchy(context: LayerContext) throws {
96
+ // Groups can contain other groups, so we may have to continue
97
+ // recursively creating more `GroupLayer`s
98
+ try setupGroups(from: group.items, parentGroup: group, context: context)
99
+
100
+ // Create `ShapeItemLayer`s for each subgroup of shapes that should be rendered as a single unit
101
+ // - These groups are listed from front-to-back, so we have to add the sublayers in reverse order
102
+ for shapeRenderGroup in nonGroupItems.shapeRenderGroups.reversed() {
103
+ // If all of the path-drawing `ShapeItem`s have keyframes with the same timing information,
104
+ // we can combine the `[KeyframeGroup<BezierPath>]` (which have to animate in separate layers)
105
+ // into a single `KeyframeGroup<[BezierPath]>`, which can be combined into a single CGPath animation.
106
+ //
107
+ // This is how Groups with multiple path-drawing items are supposed to be rendered,
108
+ // because combining multiple paths into a single `CGPath` (instead of rendering them in separate layers)
109
+ // allows `CAShapeLayerFillRule.evenOdd` to be applied if the paths overlap. We just can't do this
110
+ // in all cases, due to limitations of Core Animation.
111
+ //
112
+ // As a fall back when this is not possible, we render each shape in its own `CAShapeLayer`,
113
+ // which causes the `fillRule` to be applied incorrectly in cases where the paths overlap.
114
+ // We can't really detect when this happens, so this is a case where `RenderingEngineMode.automatic`
115
+ // can behave incorrectly. In the future we could fix this by precomputing the full combined CGPath for each
116
+ // individual frame in the animation (like we do for some trim animations as of #1612).
117
+ if
118
+ shapeRenderGroup.pathItems.count > 1,
119
+ let combinedShapeKeyframes = Keyframes.combinedIfPossible(
120
+ shapeRenderGroup.pathItems.map { ($0.item as? Shape)?.path }),
121
+ // `Trim`s are currently only applied correctly using individual `ShapeItemLayer`s,
122
+ // because each path has to be trimmed separately.
123
+ !shapeRenderGroup.otherItems.contains(where: { $0.item is Trim })
124
+ {
125
+ let combinedShape = CombinedShapeItem(
126
+ shapes: combinedShapeKeyframes,
127
+ name: group.name)
128
+
129
+ let sublayer = try ShapeItemLayer(
130
+ shape: ShapeItemLayer.Item(item: combinedShape, parentGroup: group),
131
+ otherItems: shapeRenderGroup.otherItems,
132
+ context: context)
133
+
134
+ addSublayer(sublayer)
135
+ }
136
+
137
+ // Otherwise, if each `ShapeItem` that draws a `GGPath` animates independently,
138
+ // we have to create a separate `ShapeItemLayer` for each one.
139
+ else {
140
+ for pathDrawingItem in shapeRenderGroup.pathItems {
141
+ let sublayer = try ShapeItemLayer(
142
+ shape: pathDrawingItem,
143
+ otherItems: shapeRenderGroup.otherItems,
144
+ context: context)
145
+
146
+ addSublayer(sublayer)
147
+ }
148
+ }
149
+ }
150
+ }
151
+
152
+ }
153
+
154
+ extension CALayer {
155
+ /// Sets up `GroupLayer`s for each `Group` in the given list of `ShapeItem`s
156
+ /// - Each `Group` item becomes its own `GroupLayer` sublayer.
157
+ /// - Other `ShapeItem` are applied to all sublayers
158
+ fileprivate func setupGroups(from items: [ShapeItem], parentGroup: Group?, context: LayerContext) throws {
159
+ var (groupItems, otherItems) = items.grouped(by: { $0 is Group })
160
+
161
+ // If this shape doesn't have any groups but just has top-level shape items,
162
+ // we can create a placeholder group with those items. (Otherwise the shape items
163
+ // would be silently ignored, since we expect all shape layers to have a top-level group).
164
+ if groupItems.isEmpty, parentGroup == nil {
165
+ groupItems = [Group(items: otherItems, name: "Group")]
166
+ otherItems = []
167
+ }
168
+
169
+ // Groups are listed from front to back,
170
+ // but `CALayer.sublayers` are listed from back to front.
171
+ let groupsInZAxisOrder = groupItems.reversed()
172
+
173
+ for group in groupsInZAxisOrder {
174
+ guard let group = group as? Group else { continue }
175
+
176
+ // `ShapeItem`s either draw a path, or modify how a path is rendered.
177
+ // - If this group doesn't have any items that draw a path, then its
178
+ // items are applied to all of this groups children.
179
+ let inheritedItems: [ShapeItemLayer.Item]
180
+ if !otherItems.contains(where: { $0.drawsCGPath }) {
181
+ inheritedItems = otherItems.map {
182
+ ShapeItemLayer.Item(item: $0, parentGroup: parentGroup)
183
+ }
184
+ } else {
185
+ inheritedItems = []
186
+ }
187
+
188
+ let groupLayer = try GroupLayer(
189
+ group: group,
190
+ inheritedItems: inheritedItems,
191
+ context: context)
192
+
193
+ addSublayer(groupLayer)
194
+ }
195
+ }
196
+ }
197
+
198
+ extension ShapeItem {
199
+ /// Whether or not this `ShapeItem` is responsible for rendering a `CGPath`
200
+ var drawsCGPath: Bool {
201
+ switch type {
202
+ case .ellipse, .rectangle, .shape, .star:
203
+ return true
204
+
205
+ case .fill, .gradientFill, .group, .gradientStroke, .merge,
206
+ .repeater, .round, .stroke, .trim, .transform, .unknown:
207
+ return false
208
+ }
209
+ }
210
+
211
+ /// Whether or not this `ShapeItem` provides a fill for a set of shapes
212
+ var isFill: Bool {
213
+ switch type {
214
+ case .fill, .gradientFill:
215
+ return true
216
+
217
+ case .ellipse, .rectangle, .shape, .star, .group, .gradientStroke,
218
+ .merge, .repeater, .round, .stroke, .trim, .transform, .unknown:
219
+ return false
220
+ }
221
+ }
222
+
223
+ /// Whether or not this `ShapeItem` provides a stroke for a set of shapes
224
+ var isStroke: Bool {
225
+ switch type {
226
+ case .stroke, .gradientStroke:
227
+ return true
228
+
229
+ case .ellipse, .rectangle, .shape, .star, .group, .gradientFill,
230
+ .merge, .repeater, .round, .fill, .trim, .transform, .unknown:
231
+ return false
232
+ }
233
+ }
234
+ }
235
+
236
+ extension Collection {
237
+ /// Splits this collection into two groups, based on the given predicate
238
+ func grouped(by predicate: (Element) -> Bool) -> (trueElements: [Element], falseElements: [Element]) {
239
+ var trueElements = [Element]()
240
+ var falseElements = [Element]()
241
+
242
+ for element in self {
243
+ if predicate(element) {
244
+ trueElements.append(element)
245
+ } else {
246
+ falseElements.append(element)
247
+ }
248
+ }
249
+
250
+ return (trueElements, falseElements)
251
+ }
252
+ }
253
+
254
+ // MARK: - ShapeRenderGroup
255
+
256
+ /// A group of `ShapeItem`s that should be rendered together as a single unit
257
+ struct ShapeRenderGroup {
258
+ /// The items in this group that render `CGPath`s
259
+ var pathItems: [ShapeItemLayer.Item] = []
260
+ /// Shape items that modify the appearance of the shapes rendered by this group
261
+ var otherItems: [ShapeItemLayer.Item] = []
262
+ }
263
+
264
+ extension Array where Element == ShapeItemLayer.Item {
265
+ /// Splits this list of `ShapeItem`s into groups that should be rendered together as individual units
266
+ var shapeRenderGroups: [ShapeRenderGroup] {
267
+ var renderGroups = [ShapeRenderGroup()]
268
+
269
+ for item in self {
270
+ // `renderGroups` is non-empty, so is guaranteed to have a valid end index
271
+ let lastIndex = renderGroups.indices.last!
272
+
273
+ if item.item.drawsCGPath {
274
+ renderGroups[lastIndex].pathItems.append(item)
275
+ }
276
+
277
+ // `Fill` items are unique, because they specifically only apply to _previous_ shapes in a `Group`
278
+ // - For example, with [Rectangle, Fill(Red), Circle, Fill(Blue)], the Rectangle should be Red
279
+ // but the Circle should be Blue.
280
+ // - To handle this, we create a new `ShapeRenderGroup` when we encounter a `Fill` item
281
+ else if item.item.isFill {
282
+ renderGroups[lastIndex].otherItems.append(item)
283
+ renderGroups.append(ShapeRenderGroup())
284
+ }
285
+
286
+ // Other items in the list are applied to all subgroups
287
+ else {
288
+ for index in renderGroups.indices {
289
+ renderGroups[index].otherItems.append(item)
290
+ }
291
+ }
292
+ }
293
+
294
+ // `Fill` and `Stroke` items have an `alpha` property that can be animated separately,
295
+ // but each layer only has a single `opacity` property, so we have to create
296
+ // separate layers / render groups for each of these if necessary.
297
+ return renderGroups.flatMap { group -> [ShapeRenderGroup] in
298
+ let (strokesAndFills, otherItems) = group.otherItems.grouped(by: { $0.item.isFill || $0.item.isStroke })
299
+
300
+ // However, if all of the strokes / fills have the exact same opacity animation configuration,
301
+ // then we can continue using a single layer / render group.
302
+ let allAlphaAnimationsAreIdentical = strokesAndFills.allSatisfy { item in
303
+ (item.item as? OpacityAnimationModel)?.opacity
304
+ == (strokesAndFills.first?.item as? OpacityAnimationModel)?.opacity
305
+ }
306
+
307
+ if allAlphaAnimationsAreIdentical {
308
+ return [group]
309
+ }
310
+
311
+ // Create a new group for each stroke / fill
312
+ return strokesAndFills.map { strokeOrFill in
313
+ ShapeRenderGroup(
314
+ pathItems: group.pathItems,
315
+ otherItems: [strokeOrFill] + otherItems)
316
+ }
317
+ }
318
+ }
319
+ }
@@ -0,0 +1,47 @@
1
+ // Created by Cal Stephens on 12/13/21.
2
+ // Copyright © 2021 Airbnb Inc. All rights reserved.
3
+
4
+ import QuartzCore
5
+
6
+ // MARK: - SolidLayer
7
+
8
+ final class SolidLayer: BaseCompositionLayer {
9
+
10
+ // MARK: Lifecycle
11
+
12
+ init(_ solidLayer: SolidLayerModel) {
13
+ self.solidLayer = solidLayer
14
+ super.init(layerModel: solidLayer)
15
+ setupContentLayer()
16
+ }
17
+
18
+ required init?(coder _: NSCoder) {
19
+ fatalError("init(coder:) has not been implemented")
20
+ }
21
+
22
+ /// Called by CoreAnimation to create a shadow copy of this layer
23
+ /// More details: https://developer.apple.com/documentation/quartzcore/calayer/1410842-init
24
+ override init(layer: Any) {
25
+ guard let typedLayer = layer as? Self else {
26
+ fatalError("\(Self.self).init(layer:) incorrectly called with \(type(of: layer))")
27
+ }
28
+
29
+ solidLayer = typedLayer.solidLayer
30
+ super.init(layer: typedLayer)
31
+ }
32
+
33
+ // MARK: Private
34
+
35
+ private let solidLayer: SolidLayerModel
36
+
37
+ private func setupContentLayer() {
38
+ // Render the fill color in a child `CAShapeLayer`
39
+ // - Using a `CAShapeLayer` specifically, instead of a `CALayer` with a `backgroundColor`,
40
+ // allows the size of the fill shape to be different from `contentsLayer.size`.
41
+ let shapeLayer = CAShapeLayer()
42
+ shapeLayer.fillColor = solidLayer.colorHex.cgColor
43
+ shapeLayer.path = CGPath(rect: .init(x: 0, y: 0, width: solidLayer.width, height: solidLayer.height), transform: nil)
44
+ addSublayer(shapeLayer)
45
+ }
46
+
47
+ }
@@ -0,0 +1,91 @@
1
+ // Created by Cal Stephens on 2/9/22.
2
+ // Copyright © 2022 Airbnb Inc. All rights reserved.
3
+
4
+ import QuartzCore
5
+
6
+ /// The `CALayer` type responsible for rendering `TextLayer`s
7
+ final class TextLayer: BaseCompositionLayer {
8
+
9
+ // MARK: Lifecycle
10
+
11
+ init(
12
+ textLayerModel: TextLayerModel,
13
+ context: LayerContext)
14
+ throws
15
+ {
16
+ self.textLayerModel = textLayerModel
17
+ super.init(layerModel: textLayerModel)
18
+ setupSublayers()
19
+ try configureRenderLayer(with: context)
20
+ }
21
+
22
+ required init?(coder _: NSCoder) {
23
+ fatalError("init(coder:) has not been implemented")
24
+ }
25
+
26
+ /// Called by CoreAnimation to create a shadow copy of this layer
27
+ /// More details: https://developer.apple.com/documentation/quartzcore/calayer/1410842-init
28
+ override init(layer: Any) {
29
+ guard let typedLayer = layer as? Self else {
30
+ fatalError("\(Self.self).init(layer:) incorrectly called with \(type(of: layer))")
31
+ }
32
+
33
+ textLayerModel = typedLayer.textLayerModel
34
+ super.init(layer: typedLayer)
35
+ }
36
+
37
+ // MARK: Internal
38
+
39
+ func configureRenderLayer(with context: LayerContext) throws {
40
+ // We can't use `CATextLayer`, because it doesn't support enough features we use.
41
+ // Instead, we use the same `CoreTextRenderLayer` (with a custom `draw` implementation)
42
+ // used by the Main Thread rendering engine. This means the Core Animation engine can't
43
+ // _animate_ text properties, but it can display static text without any issues.
44
+ let text = try textLayerModel.text.exactlyOneKeyframe(context: context, description: "text layer text").value
45
+
46
+ // The Core Animation engine doesn't currently support `TextAnimator`s.
47
+ // - We could add support for animating the transform-related properties without much trouble.
48
+ // - We may be able to support animating `fillColor` by getting clever with layer blend modes
49
+ // or masks (e.g. use `CoreTextRenderLayer` to draw black glyphs, and then fill them in
50
+ // using a `CAShapeLayer`).
51
+ if !textLayerModel.animators.isEmpty {
52
+ try context.logCompatibilityIssue("""
53
+ The Core Animation rendering engine currently doesn't support text animators.
54
+ """)
55
+ }
56
+
57
+ renderLayer.text = text.text
58
+ renderLayer.font = context.fontProvider.fontFor(family: text.fontFamily, size: CGFloat(text.fontSize))
59
+
60
+ renderLayer.alignment = text.justification.textAlignment
61
+ renderLayer.lineHeight = CGFloat(text.lineHeight)
62
+ renderLayer.tracking = (CGFloat(text.fontSize) * CGFloat(text.tracking)) / 1000
63
+
64
+ renderLayer.fillColor = text.fillColorData?.cgColorValue
65
+ renderLayer.strokeColor = text.strokeColorData?.cgColorValue
66
+ renderLayer.strokeWidth = CGFloat(text.strokeWidth ?? 0)
67
+ renderLayer.strokeOnTop = text.strokeOverFill ?? false
68
+
69
+ renderLayer.preferredSize = text.textFrameSize?.sizeValue
70
+ renderLayer.sizeToFit()
71
+
72
+ renderLayer.transform = CATransform3DIdentity
73
+ renderLayer.position = text.textFramePosition?.pointValue ?? .zero
74
+ }
75
+
76
+ // MARK: Private
77
+
78
+ private let textLayerModel: TextLayerModel
79
+ private let renderLayer = CoreTextRenderLayer()
80
+
81
+ private func setupSublayers() {
82
+ // Place the text render layer in an additional container
83
+ // - Direct sublayers of a `BaseCompositionLayer` always fill the bounds
84
+ // of their superlayer -- so this container will be the bounds of self,
85
+ // and the text render layer can be positioned anywhere.
86
+ let textContainerLayer = CALayer()
87
+ textContainerLayer.addSublayer(renderLayer)
88
+ addSublayer(textContainerLayer)
89
+ }
90
+
91
+ }
@@ -0,0 +1,11 @@
1
+ // Created by Cal Stephens on 12/21/21.
2
+ // Copyright © 2021 Airbnb Inc. All rights reserved.
3
+
4
+ /// The CALayer type responsible for only rendering the `transform` of a `LayerModel`
5
+ final class TransformLayer: BaseCompositionLayer {
6
+
7
+ /// `TransformLayer`s don't render any visible content,
8
+ /// they just `transform` their sublayers
9
+ override var renderLayerContents: Bool { false }
10
+
11
+ }
@@ -0,0 +1,139 @@
1
+ // Created by Cal Stephens on 1/13/22.
2
+ // Copyright © 2022 Airbnb Inc. All rights reserved.
3
+
4
+ import QuartzCore
5
+
6
+ // MARK: - ValueProviderStore
7
+
8
+ /// Registration and storage for `AnyValueProvider`s that can dynamically
9
+ /// provide custom values for `AnimationKeypath`s within an `Animation`.
10
+ final class ValueProviderStore {
11
+
12
+ // MARK: Lifecycle
13
+
14
+ init(logger: LottieLogger) {
15
+ self.logger = logger
16
+ }
17
+
18
+ // MARK: Internal
19
+
20
+ /// Registers an `AnyValueProvider` for the given `AnimationKeypath`
21
+ func setValueProvider(_ valueProvider: AnyValueProvider, keypath: AnimationKeypath) {
22
+ logger.assert(
23
+ valueProvider.typeErasedStorage.isSupportedByCoreAnimationRenderingEngine,
24
+ """
25
+ The Core Animation rendering engine doesn't support Value Providers that vend a closure,
26
+ because that would require calling the closure on the main thread once per frame.
27
+ """)
28
+
29
+ // TODO: Support more value types
30
+ logger.assert(
31
+ keypath.keys.last == PropertyName.color.rawValue,
32
+ "The Core Animation rendering engine currently only supports customizing color values")
33
+
34
+ valueProviders.append((keypath: keypath, valueProvider: valueProvider))
35
+ }
36
+
37
+ // Retrieves the custom value keyframes for the given property,
38
+ // if an `AnyValueProvider` was registered for the given keypath.
39
+ func customKeyframes<Value>(
40
+ of customizableProperty: CustomizableProperty<Value>,
41
+ for keypath: AnimationKeypath,
42
+ context: LayerAnimationContext)
43
+ throws
44
+ -> KeyframeGroup<Value>?
45
+ {
46
+ if context.logHierarchyKeypaths {
47
+ context.logger.info(keypath.fullPath)
48
+ }
49
+
50
+ guard let anyValueProvider = valueProvider(for: keypath) else {
51
+ return nil
52
+ }
53
+
54
+ // Retrieve the type-erased keyframes from the custom `ValueProvider`
55
+ let typeErasedKeyframes: [Keyframe<Any>]
56
+ switch anyValueProvider.typeErasedStorage {
57
+ case .singleValue(let typeErasedValue):
58
+ typeErasedKeyframes = [Keyframe(typeErasedValue)]
59
+
60
+ case .keyframes(let keyframes, _):
61
+ typeErasedKeyframes = keyframes
62
+
63
+ case .closure:
64
+ try context.logCompatibilityIssue("""
65
+ The Core Animation rendering engine doesn't support Value Providers that vend a closure,
66
+ because that would require calling the closure on the main thread once per frame.
67
+ """)
68
+ return nil
69
+ }
70
+
71
+ // Convert the type-erased keyframe values using this `CustomizableProperty`'s conversion closure
72
+ let typedKeyframes = typeErasedKeyframes.compactMap { typeErasedKeyframe -> Keyframe<Value>? in
73
+ guard let convertedValue = customizableProperty.conversion(typeErasedKeyframe.value) else {
74
+ logger.assertionFailure("""
75
+ Could not convert value of type \(type(of: typeErasedKeyframe.value)) to expected type \(Value.self)
76
+ """)
77
+ return nil
78
+ }
79
+
80
+ return typeErasedKeyframe.withValue(convertedValue)
81
+ }
82
+
83
+ // Verify that all of the keyframes were successfully converted to the expected type
84
+ guard typedKeyframes.count == typeErasedKeyframes.count else {
85
+ return nil
86
+ }
87
+
88
+ return KeyframeGroup(keyframes: ContiguousArray(typedKeyframes))
89
+ }
90
+
91
+ // MARK: Private
92
+
93
+ private let logger: LottieLogger
94
+
95
+ private var valueProviders = [(keypath: AnimationKeypath, valueProvider: AnyValueProvider)]()
96
+
97
+ /// Retrieves the most-recently-registered Value Provider that matches the given keypat
98
+ private func valueProvider(for keypath: AnimationKeypath) -> AnyValueProvider? {
99
+ // Find the last keypath matching the given keypath,
100
+ // so we return the value provider that was registered most-recently
101
+ valueProviders.last(where: { registeredKeypath, _ in
102
+ keypath.matches(registeredKeypath)
103
+ })?.valueProvider
104
+ }
105
+
106
+ }
107
+
108
+ extension AnyValueProviderStorage {
109
+ /// Whether or not this type of value provider is supported
110
+ /// by the new Core Animation rendering engine
111
+ var isSupportedByCoreAnimationRenderingEngine: Bool {
112
+ switch self {
113
+ case .singleValue, .keyframes:
114
+ return true
115
+ case .closure:
116
+ return false
117
+ }
118
+ }
119
+ }
120
+
121
+ extension AnimationKeypath {
122
+ /// Whether or not this keypath from the animation hierarchy
123
+ /// matches the given keypath (which may contain wildcards)
124
+ func matches(_ keypath: AnimationKeypath) -> Bool {
125
+ var regex = "^" // match the start of the string
126
+ + keypath.keys.joined(separator: "\\.") // match this keypath, escaping "." characters
127
+ + "$" // match the end of the string
128
+
129
+ // ** wildcards match anything
130
+ // - "**.Color" matches both "Layer 1.Color" and "Layer 1.Layer 2.Color"
131
+ regex = regex.replacingOccurrences(of: "**", with: ".+")
132
+
133
+ // * wildcards match any individual path component
134
+ // - "*.Color" matches "Layer 1.Color" but not "Layer 1.Layer 2.Color"
135
+ regex = regex.replacingOccurrences(of: "*", with: "[^.]+")
136
+
137
+ return fullPath.range(of: regex, options: .regularExpression) != nil
138
+ }
139
+ }