Removed Old Renderer

lottie-ios/Classes/AnimatableLayers/LOTLayerContainer.m

@@ -9,7 +9,6 @@
 #import "LOTLayerContainer.h"
 #import "LOTTransformInterpolator.h"
 #import "LOTNumberInterpolator.h"
-#import "LOTAnimatableNumberValue.h"
 #import "CGGeometry+LOTAdditions.h"
 #import "LOTRenderGroup.h"
 #import "LOTHelpers.h"
@@ -84,7 +83,7 @@ - (void)commonInitializeWith:(LOTLayer *)layer
  parentID = parentModel.parentID;
  }
  }
- _opacityInterpolator = [[LOTNumberInterpolator alloc] initWithKeyframes:layer.opacity.keyframeGroup.keyframes];
+ _opacityInterpolator = [[LOTNumberInterpolator alloc] initWithKeyframes:layer.opacity.keyframes];
  if (layer.layerType == LOTLayerTypeShape &&
  layer.shapes.count) {
  [self buildContents:layer.shapes];
@@ -131,15 +130,15 @@ - (void)_setImageForAsset:(LOTAsset *)asset {
 #else
 
 - (void)_setImageForAsset:(LOTAsset *)asset {
- if (lasset.imageName) {
+ if (asset.imageName) {
  NSArray *components = [asset.imageName componentsSeparatedByString:@"."];
  NSImage *image = [NSImage imageNamed:components.firstObject];
  if (image) {
  NSWindow *window = [NSApp mainWindow];
  CGFloat desiredScaleFactor = [window backingScaleFactor];
  CGFloat actualScaleFactor = [image recommendedLayerContentsScale:desiredScaleFactor];
  id layerContents = [image layerContentsForContentsScale:actualScaleFactor];
- _childSolid.contents = layerContents;
+ _wrapperLayer = layerContents;
 
  }
  }

lottie-ios/Classes/AnimatableLayers/LOTMaskContainer.m

@@ -7,8 +7,6 @@
 //
 
 #import "LOTMaskContainer.h"
-#import "LOTAnimatableShapeValue.h"
-#import "LOTAnimatableNumberValue.h"
 #import "LOTPathInterpolator.h"
 #import "LOTNumberInterpolator.h"
 
@@ -30,9 +28,9 @@ @implementation LOTMaskNodeLayer {
 - (instancetype)initWithMask:(LOTMask *)maskNode {
  self = [super init];
  if (self) {
- _pathInterpolator = [[LOTPathInterpolator alloc] initWithKeyframes:maskNode.maskPath.keyframeGroup.keyframes];
- _opacityInterpolator = [[LOTNumberInterpolator alloc] initWithKeyframes:maskNode.opacity.keyframeGroup.keyframes];
- _expansionInterpolator = [[LOTNumberInterpolator alloc] initWithKeyframes:maskNode.expansion.keyframeGroup.keyframes];
+ _pathInterpolator = [[LOTPathInterpolator alloc] initWithKeyframes:maskNode.maskPath.keyframes];
+ _opacityInterpolator = [[LOTNumberInterpolator alloc] initWithKeyframes:maskNode.opacity.keyframes];
+ _expansionInterpolator = [[LOTNumberInterpolator alloc] initWithKeyframes:maskNode.expansion.keyframes];
  _maskNode = maskNode;
  self.fillColor = [UIColor blueColor].CGColor;
  }

lottie-ios/Classes/AnimatableProperties/LOTKeyframe.m

@@ -140,7 +140,12 @@ @implementation LOTKeyframeGroup
 - (instancetype)initWithData:(id)data {
  self = [super init];
  if (self) {
- [self buildKeyframesFromData:data];
+ if ([data isKindOfClass:[NSDictionary class]] &&
+ [(NSDictionary *)data valueForKey:@"k"]) {
+ [self buildKeyframesFromData:[(NSDictionary *)data valueForKey:@"k"]];
+ } else {
+ [self buildKeyframesFromData:data];
+ }
  }
  return self;
 }

lottie-ios/Classes/Extensions/LOTHelpers.h

@@ -11,6 +11,7 @@
 
 #import "UIColor+Expanded.h"
 #import "CGGeometry+LOTAdditions.h"
+#import "LOTBezierPath.h"
 
 #define DEBUG_USE_NEW_RENDERER YES
 #define ENABLE_DEBUG_LOGGING NO
@@ -25,11 +26,10 @@
  - Preload animation
  - Image bundle support
  - Image Cache Support
- 
+ - Asset bundle
+ - Skew transform
  PASS on LOTAnimationView
- - Completion Block Support
- - Proper Playing looping seeking
- - Reverse, autoreverse
+
  - Add sublayer support
 
  - Play to Keyframe Point

lottie-ios/Classes/MacCompatability/LOTPlatformCompat.h

@@ -19,8 +19,6 @@
 
 #import <AppKit/AppKit.h>
 #import "UIColor.h"
-#import "UIBezierPath.h"
-#import "CADisplayLink.h"
 #import "CALayer+Compat.h"
 #import "NSValue+Compat.h"
 

lottie-ios/Classes/Models/LOTAsset.h

@@ -18,8 +18,6 @@ NS_ASSUME_NONNULL_BEGIN
 @interface LOTAsset : NSObject
 
 - (instancetype)initWithJSON:(NSDictionary *)jsonDictionary
- withBounds:(CGRect)bounds
- withFramerate:(NSNumber * _Nullable)framerate
  withAssetGroup:(LOTAssetGroup * _Nullable)assetGroup
  withAssetBundle:(NSBundle *_Nonnull)bundle;
 

lottie-ios/Classes/Models/LOTAsset.m

@@ -14,25 +14,19 @@
 @implementation LOTAsset
 
 - (instancetype)initWithJSON:(NSDictionary *)jsonDictionary
- withBounds:(CGRect)bounds
- withFramerate:(NSNumber * _Nullable)framerate
  withAssetGroup:(LOTAssetGroup * _Nullable)assetGroup
  withAssetBundle:(NSBundle *_Nonnull)bundle {
  self = [super init];
  if (self) {
  _assetBundle = bundle;
  [self _mapFromJSON:jsonDictionary
- withBounds:bounds
- withFramerate:framerate
  withAssetGroup:assetGroup];
  }
  return self;
 }
 
 
 - (void)_mapFromJSON:(NSDictionary *)jsonDictionary
- withBounds:(CGRect)bounds
- withFramerate:(NSNumber *)framerate
  withAssetGroup:(LOTAssetGroup * _Nullable)assetGroup{
  _referenceID = [jsonDictionary[@"id"] copy];
 
@@ -55,8 +49,6 @@ - (void)_mapFromJSON:(NSDictionary *)jsonDictionary
  NSArray *layersJSON = jsonDictionary[@"layers"];
  if (layersJSON) {
  _layerGroup = [[LOTLayerGroup alloc] initWithLayerJSON:layersJSON
- withBounds:bounds
- withFramerate:framerate
  withAssetGroup:assetGroup];
  }
 

lottie-ios/Classes/Models/LOTAssetGroup.h

@@ -18,9 +18,7 @@
 - (instancetype _Nonnull)initWithJSON:(NSArray * _Nonnull)jsonArray
  withAssetBundle:(NSBundle *_Nullable)bundle;
 
-- (void)buildAssetNamed:(NSString * _Nonnull)refID
- withBounds:(CGRect)bounds
- andFramerate:(NSNumber * _Nullable)framerate;
+- (void)buildAssetNamed:(NSString * _Nonnull)refID;
 
 - (void)finalizeInitialization;
 

lottie-ios/Classes/Models/LOTAssetGroup.m

@@ -32,9 +32,7 @@ - (instancetype _Nonnull)initWithJSON:(NSArray * _Nonnull)jsonArray
  return self;
 }
 
-- (void)buildAssetNamed:(NSString *)refID
- withBounds:(CGRect)bounds
- andFramerate:(NSNumber * _Nullable)framerate {
+- (void)buildAssetNamed:(NSString *)refID {
 
  if ([self assetModelForID:refID]) {
  return;
@@ -43,8 +41,6 @@ - (void)buildAssetNamed:(NSString *)refID
  NSDictionary *assetDictionary = _assetJSONMap[refID];
  if (assetDictionary) {
  LOTAsset *asset = [[LOTAsset alloc] initWithJSON:assetDictionary
- withBounds:bounds
- withFramerate:framerate
  withAssetGroup:self
  withAssetBundle:_assetBundle];
  _assetMap[refID] = asset;
@@ -53,7 +49,7 @@ - (void)buildAssetNamed:(NSString *)refID
 
 - (void)finalizeInitialization {
  for (NSString *refID in _assetJSONMap.allKeys) {
- [self buildAssetNamed:refID withBounds:CGRectZero andFramerate:nil];
+ [self buildAssetNamed:refID];
  }
  _assetJSONMap = nil;
 }