From 71326e95895d5ca2caeecccd8b7e6622fad3d3a0 Mon Sep 17 00:00:00 2001 From: bellchen Date: Mon, 12 Jun 2017 10:56:39 +0800 Subject: [PATCH] change rootDic to rootDirectory; change animationWithFile to animationWithFilePath --- lottie-ios/Classes/AnimatableLayers/LOTLayerView.m | 8 ++++---- lottie-ios/Classes/Models/LOTAsset.h | 2 +- lottie-ios/Classes/Models/LOTAssetGroup.h | 2 +- lottie-ios/Classes/Models/LOTAssetGroup.m | 6 +++--- lottie-ios/Classes/Models/LOTComposition.h | 2 +- lottie-ios/Classes/Models/LOTComposition.m | 6 +++--- lottie-ios/Classes/Private/LOTAnimationView.m | 4 ++-- lottie-ios/Classes/PublicHeaders/LOTAnimationView.h | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lottie-ios/Classes/AnimatableLayers/LOTLayerView.m b/lottie-ios/Classes/AnimatableLayers/LOTLayerView.m index e70e2fde0d..9749dfd13d 100644 --- a/lottie-ios/Classes/AnimatableLayers/LOTLayerView.m +++ b/lottie-ios/Classes/AnimatableLayers/LOTLayerView.m @@ -319,12 +319,12 @@ - (void)_setImageForAsset { if (_layerModel.imageAsset.imageName) { UIImage *image; - if (_layerModel.imageAsset.rootDir.length > 0) { - NSString *rootDic = _layerModel.imageAsset.rootDir; + if (_layerModel.imageAsset.rootDirectory.length > 0) { + NSString *rootDirectory = _layerModel.imageAsset.rootDirectory; if (_layerModel.imageAsset.imageDirectory.length > 0) { - rootDic = [rootDic stringByAppendingPathComponent:_layerModel.imageAsset.imageDirectory]; + rootDirectory = [rootDirectory stringByAppendingPathComponent:_layerModel.imageAsset.imageDirectory]; } - NSString *imagePath = [rootDic stringByAppendingPathComponent:_layerModel.imageAsset.imageName]; + NSString *imagePath = [rootDirectory stringByAppendingPathComponent:_layerModel.imageAsset.imageName]; image = [UIImage imageWithContentsOfFile:imagePath]; }else{ NSArray *components = [_layerModel.imageAsset.imageName componentsSeparatedByString:@"."]; diff --git a/lottie-ios/Classes/Models/LOTAsset.h b/lottie-ios/Classes/Models/LOTAsset.h index 87f38875e5..e7a798cd04 100644 --- a/lottie-ios/Classes/Models/LOTAsset.h +++ b/lottie-ios/Classes/Models/LOTAsset.h @@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly, nullable) LOTLayerGroup *layerGroup; -@property (nonatomic, readwrite) NSString *rootDir; +@property (nonatomic, readwrite) NSString *rootDirectory; @end NS_ASSUME_NONNULL_END diff --git a/lottie-ios/Classes/Models/LOTAssetGroup.h b/lottie-ios/Classes/Models/LOTAssetGroup.h index 8bc0ceb5b2..f28df221a1 100644 --- a/lottie-ios/Classes/Models/LOTAssetGroup.h +++ b/lottie-ios/Classes/Models/LOTAssetGroup.h @@ -12,7 +12,7 @@ @class LOTAsset; @class LOTLayerGroup; @interface LOTAssetGroup : NSObject -@property (nonatomic, readwrite) NSString * _Nullable rootDir; +@property (nonatomic, readwrite) NSString * _Nullable rootDirectory; - (instancetype _Nonnull)initWithJSON:(NSArray * _Nonnull)jsonArray; diff --git a/lottie-ios/Classes/Models/LOTAssetGroup.m b/lottie-ios/Classes/Models/LOTAssetGroup.m index 3febe704cf..c1605846cb 100644 --- a/lottie-ios/Classes/Models/LOTAssetGroup.m +++ b/lottie-ios/Classes/Models/LOTAssetGroup.m @@ -58,10 +58,10 @@ - (LOTAsset *)assetModelForID:(NSString *)assetID { return _assetMap[assetID]; } -- (void)setRootDir:(NSString *)rootDir{ - _rootDir = rootDir; +- (void)setRootDirectory:(NSString *)rootDirectory{ + _rootDirectory = rootDirectory; [_assetMap enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, LOTAsset * _Nonnull obj, BOOL * _Nonnull stop) { - obj.rootDir = rootDir; + obj.rootDirectory = rootDirectory; }]; } @end diff --git a/lottie-ios/Classes/Models/LOTComposition.h b/lottie-ios/Classes/Models/LOTComposition.h index cf10c3c9c3..4dc3a88a47 100644 --- a/lottie-ios/Classes/Models/LOTComposition.h +++ b/lottie-ios/Classes/Models/LOTComposition.h @@ -24,6 +24,6 @@ @property (nonatomic, readonly) NSTimeInterval timeDuration; @property (nonatomic, readonly) LOTLayerGroup *layerGroup; @property (nonatomic, readonly) LOTAssetGroup *assetGroup; -@property (nonatomic, readwrite) NSString *rootDir; +@property (nonatomic, readwrite) NSString *rootDirectory; @end diff --git a/lottie-ios/Classes/Models/LOTComposition.m b/lottie-ios/Classes/Models/LOTComposition.m index c364e31406..0511e24a26 100644 --- a/lottie-ios/Classes/Models/LOTComposition.m +++ b/lottie-ios/Classes/Models/LOTComposition.m @@ -55,8 +55,8 @@ [_assetGroup finalizeInitialization]; } -- (void)setRootDir:(NSString *)rootDir{ - _rootDir = rootDir; - self.assetGroup.rootDir = rootDir; +- (void)setRootDirectory:(NSString *)rootDirectory{ + _rootDirectory = rootDirectory; + self.assetGroup.rootDirectory = rootDirectory; } @end diff --git a/lottie-ios/Classes/Private/LOTAnimationView.m b/lottie-ios/Classes/Private/LOTAnimationView.m index 697ed2ab2c..97d66f8bfd 100644 --- a/lottie-ios/Classes/Private/LOTAnimationView.m +++ b/lottie-ios/Classes/Private/LOTAnimationView.m @@ -215,7 +215,7 @@ return [[LOTAnimationView alloc] initWithModel:laScene]; } -+ (instancetype)animationWithFile:(NSString *)filePath{ ++ (instancetype)animationWithFilePath:(NSString *)filePath{ NSString *animationName = filePath; LOTComposition *comp = [[LOTAnimationCache sharedCache] animationForKey:animationName]; @@ -229,7 +229,7 @@ options:0 error:&error] : nil; if (JSONObject && !error) { LOTComposition *laScene = [[LOTComposition alloc] initWithJSON:JSONObject]; - laScene.rootDir = [filePath stringByDeletingLastPathComponent]; + laScene.rootDirectory = [filePath stringByDeletingLastPathComponent]; [[LOTAnimationCache sharedCache] addAnimation:laScene forKey:animationName]; return [[LOTAnimationView alloc] initWithModel:laScene]; } diff --git a/lottie-ios/Classes/PublicHeaders/LOTAnimationView.h b/lottie-ios/Classes/PublicHeaders/LOTAnimationView.h index d26be72653..d7cb3e63fc 100644 --- a/lottie-ios/Classes/PublicHeaders/LOTAnimationView.h +++ b/lottie-ios/Classes/PublicHeaders/LOTAnimationView.h @@ -19,7 +19,7 @@ typedef void (^LOTAnimationCompletionBlock)(BOOL animationFinished); - (instancetype)initWithContentsOfURL:(NSURL *)url; -+ (instancetype)animationWithFile:(NSString *)filePath NS_SWIFT_NAME(init(file:)); ++ (instancetype)animationWithFilePath:(NSString *)filePath NS_SWIFT_NAME(init(filePath:)); @property (nonatomic, readonly) BOOL isAnimationPlaying; @property (nonatomic, assign) BOOL loopAnimation;