Fix for gradients

airbnb · Aug 4, 2017 · 4b747e1 · 4b747e1
1 parent 2bb2399
commit 4b747e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lottie-ios/Classes/Extensions/LOTRadialGradientLayer.m b/lottie-ios/Classes/Extensions/LOTRadialGradientLayer.m
@@ -29,6 +29,10 @@ + (BOOL)needsDisplayForKey:(NSString *)key {
 }
 
 - (id)actionForKey:(NSString *)key {
+ if (self.actions[key]) {
+ return self.actions[key];
+ }
+
  if ([key isEqualToString:@"startPoint"] ||
  [key isEqualToString:@"endPoint"] ||
  [key isEqualToString:@"colors"] ||
@@ -73,7 +77,7 @@ - (void)drawInContext:(CGContextRef)ctx {
  if (self.isRadial) {
  CGContextDrawRadialGradient(ctx, gradient, origin, 0, origin, radius, kCGGradientDrawsAfterEndLocation);
  } else {
- CGContextDrawLinearGradient(ctx, gradient, self.startPoint, self.endPoint, kCGGradientDrawsAfterEndLocation);
+ CGContextDrawLinearGradient(ctx, gradient, self.startPoint, self.endPoint, kCGGradientDrawsBeforeStartLocation | kCGGradientDrawsAfterEndLocation);
  }
 
  CGGradientRelease(gradient);

diff --git a/lottie-ios/Classes/RenderSystem/RenderNodes/LOTGradientFillRender.m b/lottie-ios/Classes/RenderSystem/RenderNodes/LOTGradientFillRender.m
@@ -57,7 +57,8 @@ - (instancetype _Nonnull )initWithInputNode:(LOTAnimatorNode *_Nonnull)inputNode
  @"locations" : [NSNull null],
  @"colors" : [NSNull null],
  @"bounds" : [NSNull null],
- @"anchorPoint" : [NSNull null]};
+ @"anchorPoint" : [NSNull null],
+ @"isRadial" : [NSNull null]};
  _gradientOpacityLayer.mask = _maskShape;
  [wrapperLayer addSublayer:_gradientOpacityLayer];
 
@@ -137,6 +138,7 @@ - (void)rebuildOutputs {
  CGRect frame = [self.inputNode.outputPath bounds];
  CGPoint modifiedAnchor = CGPointMake(-frame.origin.x / frame.size.width,
  -frame.origin.y / frame.size.height);
+ _maskShape.path = self.inputNode.outputPath.CGPath;
  _gradientOpacityLayer.bounds = frame;
  _gradientOpacityLayer.anchorPoint = modifiedAnchor;