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/ASOverlayLayoutSpec.mm
View File

@@ -13,42 +13,30 @@
#import "ASAssert.h"
#import "ASBaseDefines.h"
#import "ASLayout.h"
#import "ASTraitCollection.h"
static NSString * const kOverlayChildKey = @"kOverlayChildKey";
@implementation ASOverlayLayoutSpec
- (instancetype)initWithChild:(id<ASLayoutable>)child overlay:(id<ASLayoutable>)overlay traitCollection:(nullable ASTraitCollection *)traitCollection
- (instancetype)initWithChild:(id<ASLayoutable>)child overlay:(id<ASLayoutable>)overlay
{
if (!(self = [super init])) {
return nil;
}
ASDisplayNodeAssertNotNil(child, @"Child that will be overlayed on shouldn't be nil");
self.environmentTraitCollection = [traitCollection environmentTraitCollection];
[self setOverlay:overlay traitCollection:traitCollection];
[self setChild:child withTraitCollection:traitCollection];
self.overlay = overlay;
[self setChild:child];
return self;
}
+ (instancetype)overlayLayoutSpecWithChild:(id<ASLayoutable>)child overlay:(id<ASLayoutable>)overlay
{
return [self overlayLayoutSpecWithChild:child overlay:overlay traitCollection:nil];
}
+ (instancetype)overlayLayoutSpecWithChild:(id<ASLayoutable>)child overlay:(nullable id<ASLayoutable>)overlay traitCollection:(nullable ASTraitCollection *)traitCollection
{
return [[self alloc] initWithChild:child overlay:overlay traitCollection:traitCollection];
return [[self alloc] initWithChild:child overlay:overlay];
}
- (void)setOverlay:(id<ASLayoutable>)overlay
{
[self setOverlay:overlay traitCollection:nil];
}
- (void)setOverlay:(id<ASLayoutable> _Nullable)overlay traitCollection:(nullable ASTraitCollection *)traitCollection
{
return [super setChild:overlay forIdentifier:kOverlayChildKey withTraitCollection:traitCollection];
[super setChild:overlay forIdentifier:kOverlayChildKey];
}
- (id<ASLayoutable>)overlay