ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 22:25:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove explicit passing of trait collection to setChild/Children

Browse Source
This commit is contained in:
ricky
2016-05-25 10:49:42 -07:00
parent a33966d4ae
commit c42b0dd33a
21 changed files with 59 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.mm
View File

@@ -13,7 +13,6 @@
#import "ASAssert.h"
#import "ASBaseDefines.h"
#import "ASLayout.h"
#import "ASTraitCollection.h"
static NSString * const kBackgroundChildKey = @"kBackgroundChildKey";
@@ -22,27 +21,21 @@ static NSString * const kBackgroundChildKey = @"kBackgroundChildKey";
@implementation ASBackgroundLayoutSpec
- (instancetype)initWithChild:(id<ASLayoutable>)child background:(id<ASLayoutable>)background traitCollection:(ASTraitCollection *)traitCollection
- (instancetype)initWithChild:(id<ASLayoutable>)child background:(id<ASLayoutable>)background
{
if (!(self = [super init])) {
return nil;
}
ASDisplayNodeAssertNotNil(child, @"Child cannot be nil");
self.environmentTraitCollection = [traitCollection environmentTraitCollection];
[self setChild:child withTraitCollection:traitCollection];
[self setBackground:background traitCollection:traitCollection];
[self setChild:child];
self.background = background;
return self;
}
+ (instancetype)backgroundLayoutSpecWithChild:(id<ASLayoutable>)child background:(id<ASLayoutable>)background;
{
return [self backgroundLayoutSpecWithChild:child background:background traitCollect:nil];
}
+ (instancetype)backgroundLayoutSpecWithChild:(id<ASLayoutable>)child background:(nullable id<ASLayoutable>)background traitCollect:(nullable ASTraitCollection *)traitCollection
{
return [[self alloc] initWithChild:child background:background traitCollection:traitCollection];
return [[self alloc] initWithChild:child background:background];
}
/**
@@ -67,12 +60,7 @@ static NSString * const kBackgroundChildKey = @"kBackgroundChildKey";
- (void)setBackground:(id<ASLayoutable>)background
{
[self setBackground:background traitCollection:nil];
}
- (void)setBackground:(id<ASLayoutable>)background traitCollection:(ASTraitCollection *)traitCollection
{
[super setChild:background forIdentifier:kBackgroundChildKey withTraitCollection:traitCollection];
[super setChild:background forIdentifier:kBackgroundChildKey];
}
- (id<ASLayoutable>)background