kylefang/AsyncDisplayKit
1
0
Fork 0
mirror of https://github.com/HackPlan/AsyncDisplayKit.git synced 2026-05-10 04:33:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert the giant layout diff

Browse Source
This commit is contained in:
Adlai Holler
2016-09-14 11:03:21 -07:00
parent 025af5d594
commit a4b6942f00
109 changed files with 1322 additions and 2087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
examples/ASMapNode/Sample/MapHandlerNode.m
View File

@@ -115,86 +115,66 @@
{
#define SPACING 5
#define HEIGHT 30
CGSize nodeSize = CGSizeMake(constrainedSize.max.width * 0.3, HEIGHT);
CGSize preferredSize = CGSizeMake(constrainedSize.max.width * 0.3, HEIGHT);
[_latEditableNode setSizeWithCGSize:nodeSize];
[_lonEditableNode setSizeWithCGSize:nodeSize];
[_deltaLatEditableNode setSizeWithCGSize:nodeSize];
[_deltaLonEditableNode setSizeWithCGSize:nodeSize];
[_updateRegionButton setSizeWithCGSize:nodeSize];
[_liveMapToggleButton setSizeWithCGSize:nodeSize];
_latEditableNode.preferredFrameSize = _lonEditableNode.preferredFrameSize = preferredSize;
_deltaLatEditableNode.preferredFrameSize = _deltaLonEditableNode.preferredFrameSize = preferredSize;
_updateRegionButton.preferredFrameSize = _liveMapToggleButton.preferredFrameSize = preferredSize;
_latEditableNode.flexGrow = _lonEditableNode.flexGrow = YES;
_deltaLatEditableNode.flexGrow = _deltaLonEditableNode.flexGrow = YES;
_updateRegionButton.flexGrow = _liveMapToggleButton.flexGrow = YES;
_latEditableNode.flexGrow = _lonEditableNode.flexGrow = true;
_deltaLatEditableNode.flexGrow = _deltaLonEditableNode.flexGrow = true;
_updateRegionButton.flexGrow = _liveMapToggleButton.flexGrow = true;
_mapNode.flexGrow = YES;
_mapNode.flexGrow = true;
ASStackLayoutSpec *lonlatSpec =
[ASStackLayoutSpec
stackLayoutSpecWithDirection:ASStackLayoutDirectionHorizontal
spacing:SPACING
justifyContent:ASStackLayoutJustifyContentStart
alignItems:ASStackLayoutAlignItemsCenter
children:@[_latEditableNode, _lonEditableNode]];
ASStackLayoutSpec * lonlatSpec = [ASStackLayoutSpec stackLayoutSpecWithDirection:ASStackLayoutDirectionHorizontal
spacing:SPACING
justifyContent:ASStackLayoutJustifyContentStart
alignItems:ASStackLayoutAlignItemsCenter
children:@[_latEditableNode, _lonEditableNode]];
lonlatSpec.flexGrow = true;
ASStackLayoutSpec *deltaLonlatSpec =
[ASStackLayoutSpec
stackLayoutSpecWithDirection:ASStackLayoutDirectionHorizontal
spacing:SPACING
justifyContent:ASStackLayoutJustifyContentStart
alignItems:ASStackLayoutAlignItemsCenter
children:@[_deltaLatEditableNode, _deltaLonEditableNode]];
ASStackLayoutSpec * deltaLonlatSpec = [ASStackLayoutSpec stackLayoutSpecWithDirection:ASStackLayoutDirectionHorizontal
spacing:SPACING
justifyContent:ASStackLayoutJustifyContentStart
alignItems:ASStackLayoutAlignItemsCenter
children:@[_deltaLatEditableNode, _deltaLonEditableNode]];
deltaLonlatSpec.flexGrow = true;
ASStackLayoutSpec *lonlatConfigSpec =
[ASStackLayoutSpec
stackLayoutSpecWithDirection:ASStackLayoutDirectionVertical
spacing:SPACING
justifyContent:ASStackLayoutJustifyContentStart
alignItems:ASStackLayoutAlignItemsStretch
children:@[lonlatSpec, deltaLonlatSpec]];
ASStackLayoutSpec * lonlatConfigSpec = [ASStackLayoutSpec stackLayoutSpecWithDirection:ASStackLayoutDirectionVertical
spacing:SPACING
justifyContent:ASStackLayoutJustifyContentStart
alignItems:ASStackLayoutAlignItemsStretch
children:@[lonlatSpec, deltaLonlatSpec]];
lonlatConfigSpec.flexGrow = true;
ASStackLayoutSpec *buttonsSpec =
[ASStackLayoutSpec
stackLayoutSpecWithDirection:ASStackLayoutDirectionVertical
spacing:SPACING
justifyContent:ASStackLayoutJustifyContentStart
alignItems:ASStackLayoutAlignItemsStretch
children:@[_updateRegionButton, _liveMapToggleButton]];
ASStackLayoutSpec * buttonsSpec = [ASStackLayoutSpec stackLayoutSpecWithDirection:ASStackLayoutDirectionVertical
spacing:SPACING
justifyContent:ASStackLayoutJustifyContentStart
alignItems:ASStackLayoutAlignItemsStretch
children:@[_updateRegionButton, _liveMapToggleButton]];
buttonsSpec.flexGrow = true;
ASStackLayoutSpec *dashboardSpec =
[ASStackLayoutSpec
stackLayoutSpecWithDirection:ASStackLayoutDirectionHorizontal
spacing:SPACING
justifyContent:ASStackLayoutJustifyContentStart
alignItems:ASStackLayoutAlignItemsStretch
children:@[lonlatConfigSpec, buttonsSpec]];
ASStackLayoutSpec * dashboardSpec = [ASStackLayoutSpec stackLayoutSpecWithDirection:ASStackLayoutDirectionHorizontal
spacing:SPACING
justifyContent:ASStackLayoutJustifyContentStart
alignItems:ASStackLayoutAlignItemsStretch
children:@[lonlatConfigSpec, buttonsSpec]];
dashboardSpec.flexGrow = true;
ASInsetLayoutSpec *insetSpec =
[ASInsetLayoutSpec
insetLayoutSpecWithInsets:UIEdgeInsetsMake(20, 10, 0, 10)
child:dashboardSpec];
ASInsetLayoutSpec * insetSpec = [ASInsetLayoutSpec insetLayoutSpecWithInsets:UIEdgeInsetsMake(20, 10, 0, 10) child:dashboardSpec];
ASStackLayoutSpec *layoutSpec =
[ASStackLayoutSpec
stackLayoutSpecWithDirection:ASStackLayoutDirectionVertical
spacing:SPACING
justifyContent:ASStackLayoutJustifyContentStart
alignItems:ASStackLayoutAlignItemsStretch
children:@[insetSpec, _mapNode ]];
ASStackLayoutSpec * layoutSpec = [ASStackLayoutSpec stackLayoutSpecWithDirection:ASStackLayoutDirectionVertical
spacing:SPACING
justifyContent:ASStackLayoutJustifyContentStart
alignItems:ASStackLayoutAlignItemsStretch
children:@[insetSpec, _mapNode ]];
return layoutSpec;
}
#pragma mark - Button actions
- (void)updateRegion
-(void)updateRegion
{
NSNumberFormatter *f = [[NSNumberFormatter alloc] init];
f.numberStyle = NSNumberFormatterDecimalStyle;
@@ -210,7 +190,7 @@
_mapNode.region = region;
}
- (void)toggleLiveMap
-(void)toggleLiveMap
{
_mapNode.liveMap = !_mapNode.liveMap;
NSString * const liveMapStr = [self liveMapStr];