Skip to content

Commit

Permalink
Merge pull request airbnb#487 from wangyaqing/master
Browse files Browse the repository at this point in the history
remove unnecessary newlines
  • Loading branch information
buba447 committed Nov 30, 2017
2 parents 7303a7b + 248b325 commit 8a576df
Show file tree
Hide file tree
Showing 12 changed files with 2 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ - (void)displayWithFrame:(NSNumber *)frame forceUpdate:(BOOL)forceUpdate {
}
if (ENABLE_DEBUG_LOGGING) NSLog(@"-------------------- ------------------------------- --------------------");
if (ENABLE_DEBUG_LOGGING) NSLog(@"-------------------- ------------------------------- --------------------");

}

- (BOOL)setValue:(nonnull id)value
Expand Down
3 changes: 1 addition & 2 deletions lottie-ios/Classes/AnimatableLayers/LOTLayerContainer.m
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,7 @@ - (void)setViewportBounds:(CGRect)viewportBounds {
}

- (void)logHierarchyKeypathsWithParent:(NSString * _Nullable)parent {
[_contentsGroup logHierarchyKeypathsWithParent:parent
];
[_contentsGroup logHierarchyKeypathsWithParent:parent];
}

@end
1 change: 0 additions & 1 deletion lottie-ios/Classes/Extensions/LOTBezierPath.m
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ - (void)LOT_appendPath:(LOTBezierPath *)bezierPath {

nextSubpath = nextSubpath->nextSubpath;
}

}

- (void)trimPathFromT:(CGFloat)fromT toT:(CGFloat)toT offset:(CGFloat)offset {
Expand Down
2 changes: 0 additions & 2 deletions lottie-ios/Classes/Models/LOTAsset.m
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ - (instancetype)initWithJSON:(NSDictionary *)jsonDictionary
return self;
}


- (void)_mapFromJSON:(NSDictionary *)jsonDictionary
withAssetGroup:(LOTAssetGroup * _Nullable)assetGroup {
_referenceID = [jsonDictionary[@"id"] copy];
Expand All @@ -51,7 +50,6 @@ - (void)_mapFromJSON:(NSDictionary *)jsonDictionary
_layerGroup = [[LOTLayerGroup alloc] initWithLayerJSON:layersJSON
withAssetGroup:assetGroup];
}

}

@end
1 change: 0 additions & 1 deletion lottie-ios/Classes/Models/LOTShapeTransform.m
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ - (void)_mapFromJSON:(NSDictionary *)jsonDictionary {
if (hasSkew || hasSkewAxis) {
NSLog(@"%s: Warning: skew is not supported: %@", __PRETTY_FUNCTION__, name);
}

}

- (NSString *)description {
Expand Down
1 change: 0 additions & 1 deletion lottie-ios/Classes/Private/LOTAnimatedSwitch.m
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ - (void)setOn:(BOOL)on animated:(BOOL)animated {
} else {
self.animationView.animationProgress = endProgress;
}

}

- (NSString *)accessibilityValue {
Expand Down
2 changes: 0 additions & 2 deletions lottie-ios/Classes/Private/LOTAnimationView.m
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,6 @@ - (void)setProgressWithFrame:(nonnull NSNumber *)currentFrame callCompletionIfNe
}
}


- (void)setLoopAnimation:(BOOL)loopAnimation {
_loopAnimation = loopAnimation;
if (_isAnimationPlaying && _sceneModel) {
Expand Down Expand Up @@ -457,7 +456,6 @@ - (CGRect)convertRect:(CGRect)rect
return [_compContainer convertRect:rect fromLayer:self.layer toLayerNamed:layerName];
}


- (void)setValue:(nonnull id)value
forKeypath:(nonnull NSString *)keypath
atFrame:(nullable NSNumber *)frame{
Expand Down
1 change: 0 additions & 1 deletion lottie-ios/Classes/Private/LOTComposition.m
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ - (void)_mapFromJSON:(NSDictionary *)jsonDictionary
}

[_assetGroup finalizeInitialization];

}

- (void)setRootDirectory:(NSString *)rootDirectory {
Expand Down
1 change: 0 additions & 1 deletion lottie-ios/Classes/PublicHeaders/LOTComposition.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
+ (nonnull instancetype)animationFromJSON:(nullable NSDictionary *)animationJSON
inBundle:(nullable NSBundle *)bundle NS_SWIFT_NAME(init(json:bundle:));


- (instancetype _Nonnull)initWithJSON:(NSDictionary * _Nullable)jsonDictionary
withAssetBundle:(NSBundle * _Nullable)bundle;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ - (NSDictionary *)valueInterpolators {

- (BOOL)needsUpdateForFrame:(NSNumber *)frame {
return [_interpolator hasUpdateForFrame:frame];

}

- (void)performLocalUpdate {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,4 @@ - (void)performLocalUpdate {
self.localPath = path1;
}



@end
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ @interface LOTValueInterpolator ()

@end

@implementation LOTValueInterpolator {
}
@implementation LOTValueInterpolator

- (instancetype)initWithKeyframes:(NSArray <LOTKeyframe *> *)keyframes {
self = [super init];
Expand Down

0 comments on commit 8a576df

Please sign in to comment.