From 6a661b9500a3dff7400aabf53ab4e74b985f95d8 Mon Sep 17 00:00:00 2001 From: Valeriy Van Date: Wed, 1 Mar 2017 02:02:23 +0100 Subject: [PATCH] Fix attempt assign NSString to NSNumber. Adds missing nullability annotations. --- lottie-ios/Classes/Models/LOTAssetGroup.h | 6 +++--- lottie-ios/Classes/Models/LOTAssetGroup.m | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lottie-ios/Classes/Models/LOTAssetGroup.h b/lottie-ios/Classes/Models/LOTAssetGroup.h index 3fdde36709..4ad1f88d10 100644 --- a/lottie-ios/Classes/Models/LOTAssetGroup.h +++ b/lottie-ios/Classes/Models/LOTAssetGroup.h @@ -13,14 +13,14 @@ @class LOTLayerGroup; @interface LOTAssetGroup : NSObject -- (instancetype)initWithJSON:(NSArray *)jsonArray; +- (instancetype _Nonnull)initWithJSON:(NSArray * _Nonnull)jsonArray; -- (void)buildAssetNamed:(NSString *)refID +- (void)buildAssetNamed:(NSString * _Nonnull)refID withBounds:(CGRect)bounds andFramerate:(NSNumber * _Nullable)framerate; - (void)finalizeInitialization; -- (LOTAsset *)assetModelForID:(NSNumber *)assetID; +- (LOTAsset * _Nullable)assetModelForID:(NSString * _Nonnull)assetID; @end diff --git a/lottie-ios/Classes/Models/LOTAssetGroup.m b/lottie-ios/Classes/Models/LOTAssetGroup.m index f81b1a6ab7..d5aa414637 100644 --- a/lottie-ios/Classes/Models/LOTAssetGroup.m +++ b/lottie-ios/Classes/Models/LOTAssetGroup.m @@ -10,8 +10,8 @@ #import "LOTAsset.h" @implementation LOTAssetGroup { - NSMutableDictionary *_assetMap; - NSDictionary *_assetJSONMap; + NSMutableDictionary *_assetMap; + NSDictionary *_assetJSONMap; } - (instancetype)initWithJSON:(NSArray *)jsonArray { @@ -19,7 +19,7 @@ if (self) { _assetMap = [NSMutableDictionary dictionary]; NSMutableDictionary *assetJSONMap = [NSMutableDictionary dictionary]; - for (NSDictionary *assetDictionary in jsonArray) { + for (NSDictionary *assetDictionary in jsonArray) { NSString *referenceID = assetDictionary[@"id"]; if (referenceID) { assetJSONMap[referenceID] = assetDictionary; @@ -55,7 +55,7 @@ _assetJSONMap = nil; } -- (LOTAsset *)assetModelForID:(NSNumber *)assetID { +- (LOTAsset *)assetModelForID:(NSString *)assetID { return _assetMap[assetID]; }