kylefang/AsyncDisplayKit
1
0
Fork 0
mirror of https://github.com/HackPlan/AsyncDisplayKit.git synced 2026-04-24 03:45:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ASVideoNode

Browse Source
This commit is contained in:
Luke Parham
2016-01-13 12:22:55 -06:00
parent 5fbf39644b 516e1f177d
commit 579313f086
74 changed files with 1597 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/ASTableViewStressTest/Sample/AppDelegate.m
View File

@@ -13,10 +13,15 @@
#import "ViewController.h"
#import <AsyncDisplayKit/ASDisplayNode.h>
#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
@implementation AppDelegate
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
[ASDisplayNode setShouldUseNewRenderingRange:YES];
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
self.window.backgroundColor = [UIColor whiteColor];
self.window.rootViewController = [[UINavigationController alloc] init];

16
examples/CollectionViewWithViewControllerCells/Sample.xcodeproj/project.pbxproj
View File

@@ -130,7 +130,6 @@
AC3C4A5B1A11F47200143C57 /* Frameworks */,
AC3C4A5C1A11F47200143C57 /* Resources */,
A6902C454C7661D0D277AC62 /* Copy Pods Resources */,
EC37EEC9933F5786936BFE7C /* Embed Pods Frameworks */,
);
buildRules = (
);
@@ -201,21 +200,6 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
showEnvVarsInLog = 0;
};
EC37EEC9933F5786936BFE7C /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
F868CFBB21824CC9521B6588 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;

8
examples/CustomCollectionView/Sample/ViewController.m
View File

@@ -54,7 +54,7 @@ static NSUInteger kNumberOfImages = 14;
_layoutInspector = [[MosaicCollectionViewLayoutInspector alloc] init];
_collectionView = [[ASCollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout asyncDataFetching:YES];
_collectionView = [[ASCollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
_collectionView.asyncDataSource = self;
_collectionView.asyncDelegate = self;
_collectionView.layoutInspector = _layoutInspector;
@@ -101,11 +101,13 @@ static NSUInteger kNumberOfImages = 14;
return [[SupplementaryNode alloc] initWithText:text];
}
- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
{
return _sections.count;
}
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
{
return [_sections[section] count];
}

16
examples/Kittens/Sample.xcodeproj/project.pbxproj
View File

@@ -128,7 +128,6 @@
05E2127E19D4DB510098F589 /* Frameworks */,
05E2127F19D4DB510098F589 /* Resources */,
F012A6F39E0149F18F564F50 /* Copy Pods Resources */,
54296444B3B4D82560F3906E /* Embed Pods Frameworks */,
);
buildRules = (
);
@@ -185,21 +184,6 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
54296444B3B4D82560F3906E /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
E080B80F89C34A25B3488E26 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;

16
examples/Multiplex/Sample.xcodeproj/project.pbxproj
View File

@@ -123,7 +123,6 @@
05E2127E19D4DB510098F589 /* Frameworks */,
05E2127F19D4DB510098F589 /* Resources */,
F012A6F39E0149F18F564F50 /* Copy Pods Resources */,
93B7780A33739EF25F20366B /* Embed Pods Frameworks */,
);
buildRules = (
);
@@ -180,21 +179,6 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
93B7780A33739EF25F20366B /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
E080B80F89C34A25B3488E26 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;

2
examples/Multiplex/Sample/ScreenNode.m
View File

@@ -60,7 +60,7 @@
NSDictionary *attributes = @{NSFontAttributeName: [UIFont fontWithName:@"HelveticaNeue-Light" size:22.0f]};
NSAttributedString *string = [[NSAttributedString alloc] initWithString:text
attributes:attributes];
[_buttonNode setAttributedTitle:string forState:ASButtonStateNormal];
[_buttonNode setAttributedTitle:string forState:ASControlStateNormal];
[self setNeedsLayout];
}

14
examples/SocialAppLayout/Sample/ViewController.m
View File

@@ -134,4 +134,18 @@
return _socialAppDataSource.count;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
PostNode *postNode = (PostNode *)[_tableView nodeForRowAtIndexPath:indexPath];
Post *post = _socialAppDataSource[indexPath.row];
BOOL shouldRasterize = postNode.shouldRasterizeDescendants;
shouldRasterize = !shouldRasterize;
postNode.shouldRasterizeDescendants = shouldRasterize;
NSLog(@"%@ rasterization for %@'s post: %@", shouldRasterize ? @"Enabling" : @"Disabling", post.name, postNode);
[tableView deselectRowAtIndexPath:indexPath animated:YES];
}
@end

16
examples/SynchronousKittens/Sample.xcodeproj/project.pbxproj
View File

@@ -128,7 +128,6 @@
05E2127E19D4DB510098F589 /* Frameworks */,
05E2127F19D4DB510098F589 /* Resources */,
F012A6F39E0149F18F564F50 /* Copy Pods Resources */,
ACCB3408566E7626721EF2D5 /* Embed Pods Frameworks */,
);
buildRules = (
);
@@ -185,21 +184,6 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
ACCB3408566E7626721EF2D5 /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
E080B80F89C34A25B3488E26 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;

5
examples/VerticalWithinHorizontalScrolling/Sample/AppDelegate.m
View File

@@ -13,10 +13,15 @@
#import "ViewController.h"
#import <AsyncDisplayKit/ASDisplayNode.h>
#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
@implementation AppDelegate
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
[ASDisplayNode setShouldUseNewRenderingRange:YES];
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
self.window.backgroundColor = [UIColor whiteColor];
self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:[[ViewController alloc] init]];

2
examples/VerticalWithinHorizontalScrolling/Sample/GradientTableNode.h
View File

@@ -19,4 +19,6 @@
- (instancetype)initWithElementSize:(CGSize)size;
@property (nonatomic) NSInteger pageNumber;
@end

9
examples/VerticalWithinHorizontalScrolling/Sample/GradientTableNode.mm
View File

@@ -51,7 +51,7 @@
ASRangeTuningParameters rangeTuningParameters;
rangeTuningParameters.leadingBufferScreenfuls = 1.0;
rangeTuningParameters.trailingBufferScreenfuls = 0.5;
[_tableNode.view setTuningParameters:rangeTuningParameters forRangeType:ASLayoutRangeTypeRender];
[_tableNode.view setTuningParameters:rangeTuningParameters forRangeType:ASLayoutRangeTypeDisplay];
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
@@ -63,9 +63,16 @@
{
RandomCoreGraphicsNode *elementNode = [[RandomCoreGraphicsNode alloc] init];
elementNode.preferredFrameSize = _elementSize;
elementNode.indexPath = [NSIndexPath indexPathForRow:indexPath.row inSection:_pageNumber];
return elementNode;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
[tableView deselectRowAtIndexPath:indexPath animated:NO];
[_tableNode.view reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
}
- (void)layout
{
[super layout];

5
examples/VerticalWithinHorizontalScrolling/Sample/RandomCoreGraphicsNode.h
View File

@@ -9,5 +9,10 @@
#import <AsyncDisplayKit/AsyncDisplayKit.h>
@interface RandomCoreGraphicsNode : ASCellNode
{
ASTextNode *_indexPathTextNode;
}
@property (nonatomic) NSIndexPath *indexPath;
@end

51
examples/VerticalWithinHorizontalScrolling/Sample/RandomCoreGraphicsNode.m
View File

@@ -42,4 +42,55 @@
CGColorSpaceRelease(colorSpace);
}
- (instancetype)init
{
if (!(self = [super init])) {
return nil;
}
_indexPathTextNode = [[ASTextNode alloc] init];
[self addSubnode:_indexPathTextNode];
return self;
}
- (void)setIndexPath:(NSIndexPath *)indexPath
{
_indexPath = indexPath;
_indexPathTextNode.attributedString = [[NSAttributedString alloc] initWithString:[indexPath description] attributes:nil];
}
//- (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
//{
// ASStackLayoutSpec *stackSpec = [ASStackLayoutSpec stackLayoutSpecWithDirection:ASStackLayoutDirectionVertical spacing:0 justifyContent:ASStackLayoutJustifyContentStart alignItems:ASStackLayoutAlignItemsStart children:@[_indexPathTextNode]];
// stackSpec.flexGrow = YES;
// return stackSpec;
//}
- (void)layout
{
_indexPathTextNode.frame = self.bounds;
[super layout];
}
#if 0
- (void)fetchData
{
NSLog(@"fetchData - %@, %@", self, self.indexPath);
[super fetchData];
}
- (void)clearFetchedData
{
NSLog(@"clearFetchedData - %@, %@", self, self.indexPath);
[super clearFetchedData];
}
- (void)visibilityDidChange:(BOOL)isVisible
{
NSLog(@"visibilityDidChange:%d - %@, %@", isVisible, self, self.indexPath);
[super visibilityDidChange:isVisible];
}
#endif
@end

43
examples/VerticalWithinHorizontalScrolling/Sample/ViewController.m
View File

@@ -10,14 +10,12 @@
*/
#import <AsyncDisplayKit/AsyncDisplayKit.h>
#import <AsyncDisplayKit/ASAssert.h>
#import "ViewController.h"
#import "GradientTableNode.h"
@interface ViewController () <ASCollectionViewDataSource, ASCollectionViewDelegate>
@interface ViewController () <ASPagerNodeDataSource>
{
ASCollectionView *_pagerView;
ASPagerNode *_pagerNode;
}
@end
@@ -31,23 +29,12 @@
{
if (!(self = [super init]))
return nil;
UICollectionViewFlowLayout *flowLayout = [[UICollectionViewFlowLayout alloc] init];
flowLayout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
// flowLayout.itemSize = [[UIScreen mainScreen] bounds].size;
flowLayout.minimumInteritemSpacing = 0;
flowLayout.minimumLineSpacing = 0;
_pagerView = [[ASCollectionView alloc] initWithCollectionViewLayout:flowLayout];
_pagerNode = [[ASPagerNode alloc] init];
_pagerNode.dataSource = self;
ASRangeTuningParameters rangeTuningParameters;
rangeTuningParameters.leadingBufferScreenfuls = 1.0;
rangeTuningParameters.trailingBufferScreenfuls = 1.0;
[_pagerView setTuningParameters:rangeTuningParameters forRangeType:ASLayoutRangeTypeRender];
_pagerView.pagingEnabled = YES;
_pagerView.asyncDataSource = self;
_pagerView.asyncDelegate = self;
// Could implement ASCollectionDelegate if we wanted extra callbacks, like from UIScrollView.
//_pagerNode.delegate = self;
self.title = @"Paging Table Nodes";
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemRedo
@@ -59,20 +46,19 @@
- (void)reloadEverything
{
[_pagerView reloadData];
[_pagerNode reloadData];
}
- (void)viewDidLoad
{
[super viewDidLoad];
[self.view addSubview:_pagerView];
[self.view addSubnode:_pagerNode];
}
- (void)viewWillLayoutSubviews
{
_pagerView.frame = self.view.bounds;
_pagerView.contentInset = UIEdgeInsetsZero;
_pagerNode.frame = self.view.bounds;
}
- (BOOL)prefersStatusBarHidden
@@ -81,20 +67,21 @@
}
#pragma mark -
#pragma mark ASTableView.
#pragma mark ASPagerNode.
- (ASCellNode *)collectionView:(ASCollectionView *)collectionView nodeForItemAtIndexPath:(NSIndexPath *)indexPath;
- (ASCellNode *)pagerNode:(ASPagerNode *)pagerNode nodeAtIndex:(NSInteger)index
{
CGSize boundsSize = collectionView.bounds.size;
CGSize boundsSize = pagerNode.bounds.size;
CGSize gradientRowSize = CGSizeMake(boundsSize.width, 100);
GradientTableNode *node = [[GradientTableNode alloc] initWithElementSize:gradientRowSize];
node.preferredFrameSize = boundsSize;
node.pageNumber = index;
return node;
}
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
- (NSInteger)numberOfPagesInPagerNode:(ASPagerNode *)pagerNode
{
return (section == 0 ? 10 : 0);
return 10;
}
@end