-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[ASTextNode] Implement an example comparing ASTextNode 1 & 2 behavior. #570
Merged
nguyenhuy
merged 22 commits into
TextureGroup:master
from
wsdwsd0829:flex-layout-examples
Oct 17, 2017
Merged
Changes from 17 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
929d118
fix SIMULATE_WEB_RESPONSE not imported #449
wsdwsd0829 dd24d8f
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 16eed36
add constraint to using catching for layout
wsdwsd0829 c701a04
Add TextNode example to test Yoga Layout
wsdwsd0829 14e55fc
update Yoga version
wsdwsd0829 38de2a4
add debugging log
wsdwsd0829 6da11f9
fix lisence
wsdwsd0829 084917e
clean up
wsdwsd0829 64c69fb
clean up
wsdwsd0829 dd61928
fix lisence warning
wsdwsd0829 2273696
add shared scheme
wsdwsd0829 e922dbe
change sdk version
wsdwsd0829 a5005f5
revert some metadata
wsdwsd0829 b8eaffa
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 a073da7
Merge branch 'master' into flex-layout-examples
wsdwsd0829 a5eaa5a
Merge FlexLayoutExample to TextStressText.
wsdwsd0829 8c6caee
clean up
wsdwsd0829 b6622f2
fix lisence and syntax
wsdwsd0829 fd497d6
clean up
wsdwsd0829 55074c5
remove xcworkspacedata
wsdwsd0829 720bdd1
Tiny coding style changes
nguyenhuy f257d5b
Another tiny change related to code style
nguyenhuy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
source 'https://github.com/CocoaPods/Specs.git' | ||
platform :ios, '8.0' | ||
target 'Sample' do | ||
pod 'Texture', :path => '../..' | ||
pod 'Texture/Yoga', :path => '../..' | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,9 @@ | |
6C2C82AC19EE274300767484 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 6C2C82AA19EE274300767484 /* [email protected] */; }; | ||
6C2C82AD19EE274300767484 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 6C2C82AB19EE274300767484 /* [email protected] */; }; | ||
92F1263CECFE3FFCC7A5F936 /* libPods-Sample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E8EC8300ABAAEA079224272A /* libPods-Sample.a */; }; | ||
C081EE8D1F85AEEC00F0B5F1 /* TabBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = C081EE8C1F85AEEC00F0B5F1 /* TabBarController.m */; }; | ||
C081EE921F85AFB800F0B5F1 /* CollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C081EE8F1F85AFB800F0B5F1 /* CollectionViewController.m */; }; | ||
C081EE931F85AFB800F0B5F1 /* TextCellNode.m in Sources */ = {isa = PBXBuildFile; fileRef = C081EE911F85AFB800F0B5F1 /* TextCellNode.m */; }; | ||
/* End PBXBuildFile section */ | ||
|
||
/* Begin PBXFileReference section */ | ||
|
@@ -29,6 +32,12 @@ | |
6C2C82AA19EE274300767484 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = SOURCE_ROOT; }; | ||
6C2C82AB19EE274300767484 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = SOURCE_ROOT; }; | ||
A950870A2154F92D5DC91F1A /* Pods-Sample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Sample.release.xcconfig"; path = "Pods/Target Support Files/Pods-Sample/Pods-Sample.release.xcconfig"; sourceTree = "<group>"; }; | ||
C081EE8B1F85AEEC00F0B5F1 /* TabBarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TabBarController.h; sourceTree = "<group>"; }; | ||
C081EE8C1F85AEEC00F0B5F1 /* TabBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TabBarController.m; sourceTree = "<group>"; }; | ||
C081EE8E1F85AFB800F0B5F1 /* CollectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectionViewController.h; sourceTree = "<group>"; }; | ||
C081EE8F1F85AFB800F0B5F1 /* CollectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CollectionViewController.m; sourceTree = "<group>"; }; | ||
C081EE901F85AFB800F0B5F1 /* TextCellNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCellNode.h; sourceTree = "<group>"; }; | ||
C081EE911F85AFB800F0B5F1 /* TextCellNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TextCellNode.m; sourceTree = "<group>"; }; | ||
E8EC8300ABAAEA079224272A /* libPods-Sample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Sample.a"; sourceTree = BUILT_PRODUCTS_DIR; }; | ||
/* End PBXFileReference section */ | ||
|
||
|
@@ -68,11 +77,17 @@ | |
05E2128319D4DB510098F589 /* Sample */ = { | ||
isa = PBXGroup; | ||
children = ( | ||
C081EE8E1F85AFB800F0B5F1 /* CollectionViewController.h */, | ||
C081EE8F1F85AFB800F0B5F1 /* CollectionViewController.m */, | ||
C081EE901F85AFB800F0B5F1 /* TextCellNode.h */, | ||
C081EE911F85AFB800F0B5F1 /* TextCellNode.m */, | ||
05E2128819D4DB510098F589 /* AppDelegate.h */, | ||
05E2128919D4DB510098F589 /* AppDelegate.m */, | ||
05E2128B19D4DB510098F589 /* ViewController.h */, | ||
05E2128C19D4DB510098F589 /* ViewController.m */, | ||
05E2128419D4DB510098F589 /* Supporting Files */, | ||
C081EE8B1F85AEEC00F0B5F1 /* TabBarController.h */, | ||
C081EE8C1F85AEEC00F0B5F1 /* TabBarController.m */, | ||
); | ||
path = Sample; | ||
sourceTree = "<group>"; | ||
|
@@ -181,13 +196,16 @@ | |
files = ( | ||
); | ||
inputPaths = ( | ||
"${PODS_PODFILE_DIR_PATH}/Podfile.lock", | ||
"${PODS_ROOT}/Manifest.lock", | ||
); | ||
name = "[CP] Check Pods Manifest.lock"; | ||
outputPaths = ( | ||
"$(DERIVED_FILE_DIR)/Pods-Sample-checkManifestLockResult.txt", | ||
); | ||
runOnlyForDeploymentPostprocessing = 0; | ||
shellPath = /bin/sh; | ||
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; | ||
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; | ||
showEnvVarsInLog = 0; | ||
}; | ||
96436DA0C1AFF84D8041B522 /* [CP] Embed Pods Frameworks */ = { | ||
|
@@ -227,8 +245,11 @@ | |
isa = PBXSourcesBuildPhase; | ||
buildActionMask = 2147483647; | ||
files = ( | ||
C081EE931F85AFB800F0B5F1 /* TextCellNode.m in Sources */, | ||
05E2128D19D4DB510098F589 /* ViewController.m in Sources */, | ||
C081EE8D1F85AEEC00F0B5F1 /* TabBarController.m in Sources */, | ||
05E2128A19D4DB510098F589 /* AppDelegate.m in Sources */, | ||
C081EE921F85AFB800F0B5F1 /* CollectionViewController.m in Sources */, | ||
05E2128719D4DB510098F589 /* main.m in Sources */, | ||
); | ||
runOnlyForDeploymentPostprocessing = 0; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
examples_extra/TextStressTest/Sample/CollectionViewController.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
// | ||
// CollectionViewController.h | ||
// Texture | ||
// | ||
// Copyright (c) 2017-present, Pinterest, Inc. All rights reserved. | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
|
||
#import <UIKit/UIKit.h> | ||
#import <AsyncDisplayKit/AsyncDisplayKit.h> | ||
|
||
@interface CollectionViewController : ASViewController | ||
@end |
60 changes: 60 additions & 0 deletions
60
examples_extra/TextStressTest/Sample/CollectionViewController.m
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
// | ||
// CollectionViewController.m | ||
// Texture | ||
// | ||
// Copyright (c) 2017-present, Pinterest, Inc. All rights reserved. | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
|
||
#import "CollectionViewController.h" | ||
#import "TextCellNode.h" | ||
|
||
@interface CollectionViewController()<ASCollectionDataSource, ASCollectionDelegate> { | ||
ASCollectionNode* _collectionNode; | ||
NSArray<NSString*>* _labels; | ||
TextCellNode* _cellNode; | ||
} | ||
|
||
@end | ||
|
||
@implementation CollectionViewController | ||
- (instancetype)init { | ||
UICollectionViewFlowLayout* flowLayout = [[UICollectionViewFlowLayout alloc] init]; | ||
_collectionNode = [[ASCollectionNode alloc] initWithCollectionViewLayout:flowLayout]; | ||
CGRect rect = [[UIApplication sharedApplication] statusBarFrame]; | ||
_collectionNode.contentInset = UIEdgeInsetsMake(rect.size.height, 0, 0, 0); | ||
self = [super initWithNode:_collectionNode]; | ||
if (self) { | ||
_collectionNode.delegate = self; | ||
_collectionNode.dataSource = self; | ||
} | ||
return self; | ||
} | ||
|
||
- (void)viewDidLoad { | ||
[super viewDidLoad]; | ||
_collectionNode.backgroundColor = [UIColor whiteColor]; | ||
_labels = @[@"Fight of the Living Dead: Experiment Fight of the Living Dead: Experiment", @"S1 • E1"]; | ||
} | ||
|
||
- (NSInteger)collectionNode:(ASCollectionNode *)collectionNode numberOfItemsInSection:(NSInteger)section { | ||
return 1; | ||
} | ||
|
||
- (ASCellNodeBlock)collectionNode:(ASCollectionNode *)collectionNode nodeBlockForItemAtIndexPath:(NSIndexPath *)indexPath { | ||
return ^{ | ||
_cellNode = [[TextCellNode alloc] initWithText1:_labels[0] text2:_labels[1]]; | ||
return _cellNode; | ||
}; | ||
} | ||
|
||
- (ASSizeRange)collectionNode:(ASCollectionNode *)collectionNode constrainedSizeForItemAtIndexPath:(NSIndexPath *)indexPath { | ||
CGFloat width = collectionNode.view.bounds.size.width; | ||
return ASSizeRangeMake(CGSizeMake(width, 0.0f), CGSizeMake(width, CGFLOAT_MAX)); | ||
} | ||
|
||
@end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
// | ||
// TabBarController.h | ||
// Texture | ||
// | ||
// Copyright (c) 2017-present, Pinterest, Inc. All rights reserved. | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
|
||
#import <AsyncDisplayKit/AsyncDisplayKit.h> | ||
|
||
@interface TabBarController : ASTabBarController | ||
@end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
// | ||
// TabBarController.m | ||
// Texture | ||
// | ||
// Copyright (c) 2017-present, Pinterest, Inc. All rights reserved. | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
|
||
#import "TabBarController.h" | ||
|
||
@interface TabBarController () | ||
@end | ||
|
||
@implementation TabBarController | ||
@end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
// | ||
// TextCellNode.h | ||
// Texture | ||
// | ||
// Copyright (c) 2017-present, Pinterest, Inc. All rights reserved. | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
|
||
#import <AsyncDisplayKit/AsyncDisplayKit.h> | ||
|
||
@interface TextCellNode : ASCellNode | ||
- (instancetype)initWithText1:(NSString*)text1 text2:(NSString*)text2; | ||
@end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
// | ||
// TextCellNode.m | ||
// Texture | ||
// | ||
// Copyright (c) 2017-present, Pinterest, Inc. All rights reserved. | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
|
||
#import "TextCellNode.h" | ||
#import <AsyncDisplayKit/AsyncDisplayKit.h> | ||
#import <AsyncDisplayKit/ASDisplayNode+Beta.h> | ||
|
||
#ifndef USE_ASTEXTNODE_2 | ||
#define USE_ASTEXTNODE_2 1 | ||
#endif | ||
|
||
@interface TextCellNode() { | ||
#if USE_ASTEXTNODE_2 | ||
ASTextNode2 *_label1; | ||
ASTextNode2 *_label2; | ||
#else | ||
ASTextNode *_label1; | ||
ASTextNode *_label2; | ||
#endif | ||
} | ||
@end | ||
|
||
@implementation TextCellNode | ||
|
||
- (instancetype)initWithText1:(NSString*)text1 text2:(NSString*)text2 { | ||
self = [super init]; | ||
if (self) { | ||
self.automaticallyManagesSubnodes = YES; | ||
self.clipsToBounds = YES; | ||
#if USE_ASTEXTNODE_2 | ||
_label1 = [[ASTextNode2 alloc] init]; | ||
_label2 = [[ASTextNode2 alloc] init]; | ||
#else | ||
_label1 = [[ASTextNode alloc] init]; | ||
_label2 = [[ASTextNode alloc] init]; | ||
#endif | ||
|
||
_label1.attributedText = [[NSAttributedString alloc] initWithString:text1]; | ||
_label2.attributedText = [[NSAttributedString alloc] initWithString:text2]; | ||
|
||
_label1.maximumNumberOfLines = 1; | ||
_label1.truncationMode = NSLineBreakByTruncatingTail; | ||
_label2.maximumNumberOfLines = 1; | ||
_label2.truncationMode = NSLineBreakByTruncatingTail; | ||
|
||
[self simpleSetupYogaLayout]; | ||
} | ||
return self; | ||
} | ||
|
||
/** | ||
This is to text a row with two labels, the first should be truncated with "...". | ||
Layout is like: [l1Container[_label1], label2]. | ||
This shows a bug of ASTextNode2. | ||
*/ | ||
- (void)simpleSetupYogaLayout { | ||
[self.style yogaNodeCreateIfNeeded]; | ||
[_label1.style yogaNodeCreateIfNeeded]; | ||
[_label2.style yogaNodeCreateIfNeeded]; | ||
|
||
_label1.style.flexGrow = 0; | ||
_label1.style.flexShrink = 1; | ||
_label1.backgroundColor = [UIColor lightGrayColor]; | ||
|
||
_label2.style.flexGrow = 0; | ||
_label2.style.flexShrink = 0; | ||
_label2.backgroundColor = [UIColor greenColor]; | ||
|
||
ASDisplayNode* l1Container = [ASDisplayNode yogaVerticalStack]; | ||
|
||
// TODO(fix ASTextNode2): next two line will show the bug of TextNode2 | ||
// which works for ASTextNode though | ||
// see discussion here: https://github.com/TextureGroup/Texture/pull/553 | ||
l1Container.style.alignItems = ASStackLayoutAlignItemsCenter; | ||
_label1.style.alignSelf = ASStackLayoutAlignSelfStart; | ||
|
||
l1Container.style.flexGrow = 0; | ||
l1Container.style.flexShrink = 1; | ||
|
||
l1Container.yogaChildren = @[_label1]; | ||
|
||
self.style.justifyContent = ASStackLayoutJustifyContentSpaceBetween; | ||
self.style.alignItems = ASStackLayoutAlignItemsStart; | ||
self.style.flexDirection = ASStackLayoutDirectionHorizontal; | ||
self.yogaChildren = @[l1Container, _label2]; | ||
} | ||
|
||
@end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While it's totally fine to use a collection node even if there is only 1 item, it seems a bit overkill to me. A simple display node or even a scroll node should also do the trick. Not a blocker though.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, Just incase I may add more examples to the collection later.