From 096f20c8d52469f37b9bed0509fb89d962a24729 Mon Sep 17 00:00:00 2001 From: ricky Date: Wed, 25 May 2016 13:34:43 -0700 Subject: [PATCH] update sample app --- examples/ASTraitCollection/Sample/KittenNode.m | 8 +++----- .../ASTraitCollection/Sample/OverrideViewController.m | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/examples/ASTraitCollection/Sample/KittenNode.m b/examples/ASTraitCollection/Sample/KittenNode.m index ef572e2265..18babcdc36 100644 --- a/examples/ASTraitCollection/Sample/KittenNode.m +++ b/examples/ASTraitCollection/Sample/KittenNode.m @@ -130,13 +130,11 @@ static const CGFloat kInnerPadding = 10.0f; - (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize { - ASTraitCollection *traitCollection = [self asyncTraitCollection]; - ASStackLayoutSpec *stackSpec = [[ASStackLayoutSpec alloc] init]; stackSpec.spacing = kInnerPadding; - [stackSpec setChildren:@[_imageNode, _textNode] withTraitCollection:traitCollection]; + [stackSpec setChildren:@[_imageNode, _textNode]]; - if (traitCollection.horizontalSizeClass == UIUserInterfaceSizeClassRegular) { + if (self.asyncTraitCollection.horizontalSizeClass == UIUserInterfaceSizeClassRegular) { _imageNode.alignSelf = ASStackLayoutAlignSelfStart; stackSpec.direction = ASStackLayoutDirectionHorizontal; } else { @@ -144,7 +142,7 @@ static const CGFloat kInnerPadding = 10.0f; stackSpec.direction = ASStackLayoutDirectionVertical; } - return [ASInsetLayoutSpec insetLayoutSpecWithInsets:UIEdgeInsetsMake(kOuterPadding, kOuterPadding, kOuterPadding, kOuterPadding) child:stackSpec traitCollection:traitCollection]; + return [ASInsetLayoutSpec insetLayoutSpecWithInsets:UIEdgeInsetsMake(kOuterPadding, kOuterPadding, kOuterPadding, kOuterPadding) child:stackSpec]; } + (void)defaultImageTappedAction:(ASViewController *)sourceViewController diff --git a/examples/ASTraitCollection/Sample/OverrideViewController.m b/examples/ASTraitCollection/Sample/OverrideViewController.m index 84acf5ef24..e9f2b957f1 100644 --- a/examples/ASTraitCollection/Sample/OverrideViewController.m +++ b/examples/ASTraitCollection/Sample/OverrideViewController.m @@ -63,9 +63,9 @@ static NSString *kLinkAttributeName = @"PlaceKittenNodeLinkAttributeName"; _textNode.attributedString = string; ASStackLayoutSpec *stackSpec = [ASStackLayoutSpec verticalStackLayoutSpec]; - [stackSpec setChildren:@[_textNode, _buttonNode] withTraitCollection:traitCollection]; + [stackSpec setChildren:@[_textNode, _buttonNode]]; stackSpec.spacing = 10; - return [ASInsetLayoutSpec insetLayoutSpecWithInsets:UIEdgeInsetsMake(40, 20, 20, 20) child:stackSpec traitCollection:traitCollection]; + return [ASInsetLayoutSpec insetLayoutSpecWithInsets:UIEdgeInsetsMake(40, 20, 20, 20) child:stackSpec]; } @end