Merge pull request #135 from facebook/basic-init

Make ASNetworkImageNode Just Work.
This commit is contained in:
tanliboy 2014-12-03 17:40:27 -08:00
commit 6c0ffdf2e1
3 changed files with 13 additions and 6 deletions

View File

@ -29,10 +29,16 @@
* *
* @discussion If `cache` is nil, the receiver will not attempt to retrieve images from a cache before downloading them. * @discussion If `cache` is nil, the receiver will not attempt to retrieve images from a cache before downloading them.
* *
* @result An initialized ASNetworkImageNode. * @returns An initialized ASNetworkImageNode.
*/ */
- (instancetype)initWithCache:(id<ASImageCacheProtocol>)cache downloader:(id<ASImageDownloaderProtocol>)downloader; - (instancetype)initWithCache:(id<ASImageCacheProtocol>)cache downloader:(id<ASImageDownloaderProtocol>)downloader;
- (instancetype)init NS_UNAVAILABLE;
/**
* Convenience initialiser.
*
* @returns An ASNetworkImageNode configured to use the NSURLSession-powered ASBasicImageDownloader, and no extra cache.
*/
- (instancetype)init;
/** /**
* The delegate, which must conform to the <ASNetworkImageNodeDelegate> protocol. * The delegate, which must conform to the <ASNetworkImageNodeDelegate> protocol.

View File

@ -8,8 +8,9 @@
#import "ASNetworkImageNode.h" #import "ASNetworkImageNode.h"
#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h> #import "ASBasicImageDownloader.h"
#import <AsyncDisplayKit/ASThread.h> #import "ASDisplayNode+Subclasses.h"
#import "ASThread.h"
@interface ASNetworkImageNode () @interface ASNetworkImageNode ()
@ -49,7 +50,7 @@
- (instancetype)init - (instancetype)init
{ {
ASDISPLAYNODE_NOT_DESIGNATED_INITIALIZER(); return [self initWithCache:nil downloader:[[ASBasicImageDownloader alloc] init]];
} }
- (void)dealloc - (void)dealloc

View File

@ -74,7 +74,7 @@ static const CGFloat kInnerPadding = 10.0f;
_kittenSize = size; _kittenSize = size;
// kitten image, with a purple background colour serving as placeholder // kitten image, with a purple background colour serving as placeholder
_imageNode = [[ASNetworkImageNode alloc] initWithCache:nil downloader:[[ASBasicImageDownloader alloc] init]]; _imageNode = [[ASNetworkImageNode alloc] init];
_imageNode.backgroundColor = [UIColor purpleColor]; _imageNode.backgroundColor = [UIColor purpleColor];
_imageNode.URL = [NSURL URLWithString:[NSString stringWithFormat:@"http://placekitten.com/%zd/%zd", _imageNode.URL = [NSURL URLWithString:[NSString stringWithFormat:@"http://placekitten.com/%zd/%zd",
(NSInteger)roundl(_kittenSize.width), (NSInteger)roundl(_kittenSize.width),