Update other Files

Lottie-Screenshot/Lottie-ScreenshotTests/LottieAnimationTestCase.m

@@ -19,7 +19,7 @@ @implementation LottieAnimationTestCase
 
 - (void)setUp {
  [super setUp];
- self.recordMode = YES;
+// self.recordMode = YES;
  self.usesDrawViewHierarchyInRect = YES;
  self.animationView = [LOTAnimationView animationNamed:self.animationName];
  self.window = [[UIWindow alloc] initWithFrame:self.animationView.bounds];
@@ -41,4 +41,11 @@ - (void)testAnimationProgress:(float)progress {
  }];
 }
 
+//-(void)tearDown {
+// [super tearDown];
+// [self.animationView removeFromSuperview];
+// self.animationView = nil;
+// [self.window resignKeyWindow];
+//}
+
 @end

Lottie.xcodeproj/project.pbxproj

@@ -154,6 +154,18 @@
  484EBA261E57898D00D4CAD9 /* LOTLayerGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 484EBA231E57898D00D4CAD9 /* LOTLayerGroup.h */; };
  484EBA271E57898D00D4CAD9 /* LOTLayerGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 484EBA241E57898D00D4CAD9 /* LOTLayerGroup.m */; };
  484EBA281E57898D00D4CAD9 /* LOTLayerGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 484EBA241E57898D00D4CAD9 /* LOTLayerGroup.m */; };
+ 4883E4E71E5FA59200027E57 /* LOTCompositionLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4883E4E51E5FA59200027E57 /* LOTCompositionLayer.h */; };
+ 4883E4E81E5FA59200027E57 /* LOTCompositionLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4883E4E51E5FA59200027E57 /* LOTCompositionLayer.h */; };
+ 4883E4E91E5FA59200027E57 /* LOTCompositionLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4883E4E61E5FA59200027E57 /* LOTCompositionLayer.m */; };
+ 4883E4EA1E5FA59200027E57 /* LOTCompositionLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4883E4E61E5FA59200027E57 /* LOTCompositionLayer.m */; };
+ 4883E4EB1E5FA59200027E57 /* LOTCompositionLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4883E4E61E5FA59200027E57 /* LOTCompositionLayer.m */; };
+ 4883E4F01E5FA5EE00027E57 /* LOTAssetGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 4883E4EC1E5FA5EE00027E57 /* LOTAssetGroup.h */; };
+ 4883E4F11E5FA5EE00027E57 /* LOTAssetGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 4883E4EC1E5FA5EE00027E57 /* LOTAssetGroup.h */; };
+ 4883E4F21E5FA5EE00027E57 /* LOTAssetGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 4883E4ED1E5FA5EE00027E57 /* LOTAssetGroup.m */; };
+ 4883E4F31E5FA5EE00027E57 /* LOTAssetGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 4883E4ED1E5FA5EE00027E57 /* LOTAssetGroup.m */; };
+ 4883E4F41E5FA5EE00027E57 /* LOTAssetGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 4883E4ED1E5FA5EE00027E57 /* LOTAssetGroup.m */; };
+ 4883E4FA1E5FA67200027E57 /* LOTStrokeShapeLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 489F8E111E4CF3BE00F2DEB7 /* LOTStrokeShapeLayer.m */; };
+ 4883E4FB1E5FA67200027E57 /* CGGeometry+LOTAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 48183C9B1E54E20B0039F121 /* CGGeometry+LOTAdditions.m */; };
  489F8E121E4CF3BE00F2DEB7 /* LOTStrokeShapeLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 489F8E101E4CF3BE00F2DEB7 /* LOTStrokeShapeLayer.h */; };
  489F8E131E4CF3BE00F2DEB7 /* LOTStrokeShapeLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 489F8E101E4CF3BE00F2DEB7 /* LOTStrokeShapeLayer.h */; };
  489F8E141E4CF3BE00F2DEB7 /* LOTStrokeShapeLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 489F8E111E4CF3BE00F2DEB7 /* LOTStrokeShapeLayer.m */; };
@@ -295,6 +307,10 @@
  484EBA151E565AF700D4CAD9 /* LOTAsset.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LOTAsset.m; sourceTree = "<group>"; };
  484EBA231E57898D00D4CAD9 /* LOTLayerGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LOTLayerGroup.h; sourceTree = "<group>"; };
  484EBA241E57898D00D4CAD9 /* LOTLayerGroup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LOTLayerGroup.m; sourceTree = "<group>"; };
+ 4883E4E51E5FA59200027E57 /* LOTCompositionLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LOTCompositionLayer.h; sourceTree = "<group>"; };
+ 4883E4E61E5FA59200027E57 /* LOTCompositionLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LOTCompositionLayer.m; sourceTree = "<group>"; };
+ 4883E4EC1E5FA5EE00027E57 /* LOTAssetGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LOTAssetGroup.h; sourceTree = "<group>"; };
+ 4883E4ED1E5FA5EE00027E57 /* LOTAssetGroup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LOTAssetGroup.m; sourceTree = "<group>"; };
  489F8E101E4CF3BE00F2DEB7 /* LOTStrokeShapeLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LOTStrokeShapeLayer.h; sourceTree = "<group>"; };
  489F8E111E4CF3BE00F2DEB7 /* LOTStrokeShapeLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LOTStrokeShapeLayer.m; sourceTree = "<group>"; };
  62CA59B81E3C173B002D7188 /* Lottie.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Lottie.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -337,6 +353,8 @@
  children = (
  481A4A181E4A7885003CF62B /* LOTAnimatableLayer.h */,
  481A4A191E4A7885003CF62B /* LOTAnimatableLayer.m */,
+ 4883E4E51E5FA59200027E57 /* LOTCompositionLayer.h */,
+ 4883E4E61E5FA59200027E57 /* LOTCompositionLayer.m */,
  481A4A1A1E4A7885003CF62B /* LOTEllipseShapeLayer.h */,
  481A4A1B1E4A7885003CF62B /* LOTEllipseShapeLayer.m */,
  481A4A1C1E4A7885003CF62B /* LOTGroupLayerView.h */,
@@ -405,6 +423,8 @@
  481A4A3F1E4A7885003CF62B /* Models */ = {
  isa = PBXGroup;
  children = (
+ 4883E4EC1E5FA5EE00027E57 /* LOTAssetGroup.h */,
+ 4883E4ED1E5FA5EE00027E57 /* LOTAssetGroup.m */,
  481A4A401E4A7885003CF62B /* LOTComposition.h */,
  481A4A411E4A7885003CF62B /* LOTComposition.m */,
  481A4A421E4A7885003CF62B /* LOTLayer.h */,
@@ -542,6 +562,7 @@
  481A4AB91E4A7885003CF62B /* LOTShapeGroup.h in Headers */,
  481A4A5F1E4A7885003CF62B /* LOTEllipseShapeLayer.h in Headers */,
  481A4ACD1E4A7885003CF62B /* LOTShapeTrimPath.h in Headers */,
+ 4883E4F01E5FA5EE00027E57 /* LOTAssetGroup.h in Headers */,
  489F8E121E4CF3BE00F2DEB7 /* LOTStrokeShapeLayer.h in Headers */,
  484EBA251E57898D00D4CAD9 /* LOTLayerGroup.h in Headers */,
  481A4A671E4A7885003CF62B /* LOTLayerView.h in Headers */,
@@ -559,6 +580,7 @@
  481A4AAB1E4A7885003CF62B /* LOTMask.h in Headers */,
  481A4A871E4A7885003CF62B /* LOTAnimatableScaleValue.h in Headers */,
  481A4A951E4A7885003CF62B /* CAAnimationGroup+LOTAnimatableGroup.h in Headers */,
+ 4883E4E71E5FA59200027E57 /* LOTCompositionLayer.h in Headers */,
  481A4AA71E4A7885003CF62B /* LOTLayer.h in Headers */,
  2DBA19324CDD83B5F0F115B8 /* LOTAnimationView_Compat.h in Headers */,
  );
@@ -603,9 +625,11 @@
  481A4AA41E4A7885003CF62B /* LOTComposition.h in Headers */,
  481A4A801E4A7885003CF62B /* LOTAnimatableNumberValue.h in Headers */,
  484EBA261E57898D00D4CAD9 /* LOTLayerGroup.h in Headers */,
+ 4883E4E81E5FA59200027E57 /* LOTCompositionLayer.h in Headers */,
  481A4ACE1E4A7885003CF62B /* LOTShapeTrimPath.h in Headers */,
  481A4AA01E4A7885003CF62B /* UIColor+Expanded.h in Headers */,
  FAE1F7CE1E428CBE002E0974 /* LOTAnimationTransitionController.h in Headers */,
+ 4883E4F11E5FA5EE00027E57 /* LOTAssetGroup.h in Headers */,
  FAE1F7D71E428CBE002E0974 /* Lottie.h in Headers */,
  481A4AAC1E4A7885003CF62B /* LOTMask.h in Headers */,
  481A4A961E4A7885003CF62B /* CAAnimationGroup+LOTAnimatableGroup.h in Headers */,
@@ -738,6 +762,7 @@
  481A4A971E4A7885003CF62B /* CAAnimationGroup+LOTAnimatableGroup.m in Sources */,
  481A4A811E4A7885003CF62B /* LOTAnimatableNumberValue.m in Sources */,
  481A4A931E4A7885003CF62B /* LOTAnimationCache.m in Sources */,
+ 4883E4E91E5FA59200027E57 /* LOTCompositionLayer.m in Sources */,
  481A4AA11E4A7885003CF62B /* UIColor+Expanded.m in Sources */,
  481A4AA51E4A7885003CF62B /* LOTComposition.m in Sources */,
  481A4A7D1E4A7885003CF62B /* LOTAnimatableColorValue.m in Sources */,
@@ -762,6 +787,7 @@
  481A4ABF1E4A7885003CF62B /* LOTShapePath.m in Sources */,
  481A4A611E4A7885003CF62B /* LOTEllipseShapeLayer.m in Sources */,
  481A4A851E4A7885003CF62B /* LOTAnimatablePointValue.m in Sources */,
+ 4883E4F21E5FA5EE00027E57 /* LOTAssetGroup.m in Sources */,
  481A4A791E4A7885003CF62B /* LOTAnimatableBoundsValue.m in Sources */,
  481A4AD31E4A7885003CF62B /* LOTAnimationView.m in Sources */,
  481A4A891E4A7885003CF62B /* LOTAnimatableScaleValue.m in Sources */,
@@ -772,14 +798,15 @@
  isa = PBXSourcesBuildPhase;
  buildActionMask = 2147483647;
  files = (
- 4883E4E31E5F9EE400027E57 /* LOTStrokeShapeLayer.m in Sources */,
- 4883E4E41E5F9EE400027E57 /* CGGeometry+LOTAdditions.m in Sources */,
+ 4883E4FA1E5FA67200027E57 /* LOTStrokeShapeLayer.m in Sources */,
+ 4883E4FB1E5FA67200027E57 /* CGGeometry+LOTAdditions.m in Sources */,
  84FE12F81E4C1553009B157C /* LOTAnimatableLayer.m in Sources */,
  84FE12F91E4C1553009B157C /* LOTEllipseShapeLayer.m in Sources */,
  84FE12FA1E4C1553009B157C /* LOTGroupLayerView.m in Sources */,
  84FE12FB1E4C1553009B157C /* LOTLayerView.m in Sources */,
  84FE12FC1E4C1553009B157C /* LOTMaskLayer.m in Sources */,
  84FE12FD1E4C1553009B157C /* LOTRectShapeLayer.m in Sources */,
+ 4883E4F41E5FA5EE00027E57 /* LOTAssetGroup.m in Sources */,
  84FE12FE1E4C1553009B157C /* LOTShapeLayerView.m in Sources */,
  84FE12FF1E4C1553009B157C /* LOTAnimatableBoundsValue.m in Sources */,
  84FE13001E4C1553009B157C /* LOTAnimatableColorValue.m in Sources */,
@@ -794,6 +821,7 @@
  84FE13091E4C1553009B157C /* LOTComposition.m in Sources */,
  84FE130A1E4C1553009B157C /* LOTLayer.m in Sources */,
  84FE130B1E4C1553009B157C /* LOTMask.m in Sources */,
+ 4883E4EB1E5FA59200027E57 /* LOTCompositionLayer.m in Sources */,
  84FE130C1E4C1553009B157C /* LOTShapeCircle.m in Sources */,
  84FE130D1E4C1553009B157C /* LOTShapeFill.m in Sources */,
  84FE130E1E4C1553009B157C /* LOTShapeGroup.m in Sources */,
@@ -817,6 +845,7 @@
  481A4A941E4A7885003CF62B /* LOTAnimationCache.m in Sources */,
  481A4AD01E4A7885003CF62B /* LOTShapeTrimPath.m in Sources */,
  481A4AA61E4A7885003CF62B /* LOTComposition.m in Sources */,
+ 4883E4F31E5FA5EE00027E57 /* LOTAssetGroup.m in Sources */,
  481A4AC41E4A7885003CF62B /* LOTShapeRectangle.m in Sources */,
  481A4ACC1E4A7885003CF62B /* LOTShapeTransform.m in Sources */,
  481A4AB81E4A7885003CF62B /* LOTShapeFill.m in Sources */,
@@ -843,6 +872,7 @@
  481A4AE91E4A78A0003CF62B /* NSValue+Compat.m in Sources */,
  481A4AE61E4A78A0003CF62B /* CALayer+Compat.m in Sources */,
  481A4AEB1E4A78A0003CF62B /* UIBezierPath.m in Sources */,
+ 4883E4EA1E5FA59200027E57 /* LOTCompositionLayer.m in Sources */,
  481A4A7A1E4A7885003CF62B /* LOTAnimatableBoundsValue.m in Sources */,
  481A4A7E1E4A7885003CF62B /* LOTAnimatableColorValue.m in Sources */,
  481A4AAA1E4A7885003CF62B /* LOTLayer.m in Sources */,

lottie-ios/Classes/Models/LOTAssetGroup.h

@@ -7,6 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <CoreGraphics/CoreGraphics.h>
+
 @class LOTAsset;
 @class LOTLayerGroup;
 @interface LOTAssetGroup : NSObject

lottie-ios/Classes/Private/LOTAnimationView_Internal.h

@@ -16,7 +16,7 @@ typedef enum : NSUInteger {
 
 @interface LOTAnimationState : NSObject
 
-- (_Nonnull instancetype)initWithDuration:(CGFloat)duration layer:( CALayer * _Nullable)layer framerate:(NSNumber *)framerate;
+- (instancetype)initWithDuration:(CGFloat)duration layer:(CALayer *)layer frameRate:(NSNumber *)framerate;
 
 - (void)setAnimationIsPlaying:(BOOL)animationIsPlaying;
 - (void)setAnimationDoesLoop:(BOOL)loopAnimation;