ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-19 12:49:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1571 from maicki/FixASPagerNodeDataSourceSourceInconsistency

Browse Source 
[ASPagerNode] Fix ASPagerNode data source and delegate inconsistencies
This commit is contained in:
appleguy 2016-05-10 13:44:39 -07:00
commit a1d2f8ccc6
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsyncDisplayKit/ASCollectionView.h
View File

@ -342,7 +342,7 @@ NS_ASSUME_NONNULL_BEGIN
* This is a node-based UICollectionViewDataSource. * This is a node-based UICollectionViewDataSource.
*/ */
#define ASCollectionViewDataSource ASCollectionDataSource #define ASCollectionViewDataSource ASCollectionDataSource
@protocol ASCollectionDataSource <ASCommonCollectionViewDataSource, NSObject> @protocol ASCollectionDataSource <ASCommonCollectionViewDataSource>
@optional @optional

22
AsyncDisplayKit/ASPagerNode.h
View File

@ -11,7 +11,8 @@
@class ASPagerNode; @class ASPagerNode;
@class ASPagerFlowLayout; @class ASPagerFlowLayout;
@protocol ASPagerNodeDataSource <NSObject> #define ASPagerNodeDataSource ASPagerDataSource
@protocol ASPagerDataSource <NSObject>
/** /**
* This method replaces -collectionView:numberOfItemsInSection: * This method replaces -collectionView:numberOfItemsInSection:
@ -65,25 +66,30 @@
@end @end
@protocol ASPagerDelegate <ASCollectionDelegate>
@end
@interface ASPagerNode : ASCollectionNode @interface ASPagerNode : ASCollectionNode
// Configures a default horizontal, paging flow layout with 0 inter-item spacing. /// Configures a default horizontal, paging flow layout with 0 inter-item spacing.
- (instancetype)init; - (instancetype)init;
// Initializer with custom-configured flow layout properties. /// Initializer with custom-configured flow layout properties.
- (instancetype)initWithCollectionViewLayout:(ASPagerFlowLayout *)flowLayout; - (instancetype)initWithCollectionViewLayout:(ASPagerFlowLayout *)flowLayout;
// Data Source is required, and uses a different protocol from ASCollectionNode. /// Data Source is required, and uses a different protocol from ASCollectionNode.
- (void)setDataSource:(id <ASPagerNodeDataSource>)dataSource; - (void)setDataSource:(id <ASPagerDataSource>)dataSource;
- (id <ASPagerNodeDataSource>)dataSource; - (id <ASPagerDataSource>)dataSource;
// Delegate is optional, and uses the same protocol as ASCollectionNode. // Delegate is optional, and uses the same protocol as ASCollectionNode.
// This includes UIScrollViewDelegate as well as most methods from UICollectionViewDelegate, like willDisplay... // This includes UIScrollViewDelegate as well as most methods from UICollectionViewDelegate, like willDisplay...
@property (nonatomic, weak) id <ASCollectionDelegate> delegate; @property (nonatomic, weak) id <ASPagerDelegate> delegate;
// The underlying ASCollectionView object. /// The underlying ASCollectionView object.
@property (nonatomic, readonly) ASCollectionView *view; @property (nonatomic, readonly) ASCollectionView *view;
/// Scroll the contents of the receiver to ensure that the page is visible.
- (void)scrollToPageAtIndex:(NSInteger)index animated:(BOOL)animated; - (void)scrollToPageAtIndex:(NSInteger)index animated:(BOOL)animated;
@end @end

6
AsyncDisplayKit/ASPagerNode.m
View File

@ -16,7 +16,7 @@
{ {
ASPagerFlowLayout *_flowLayout; ASPagerFlowLayout *_flowLayout;
ASPagerNodeProxy *_proxy; ASPagerNodeProxy *_proxy;
__weak id <ASPagerNodeDataSource> _pagerDataSource; __weak id <ASPagerDataSource> _pagerDataSource;
BOOL _pagerDataSourceImplementsNodeBlockAtIndex; BOOL _pagerDataSourceImplementsNodeBlockAtIndex;
BOOL _pagerDataSourceImplementsConstrainedSizeForNode; BOOL _pagerDataSourceImplementsConstrainedSizeForNode;
} }
@ -111,12 +111,12 @@
#pragma mark - Data Source Proxy #pragma mark - Data Source Proxy
- (id <ASPagerNodeDataSource>)dataSource - (id <ASPagerDataSource>)dataSource
{ {
return _pagerDataSource; return _pagerDataSource;
} }
- (void)setDataSource:(id <ASPagerNodeDataSource>)pagerDataSource - (void)setDataSource:(id <ASPagerDataSource>)pagerDataSource
{ {
if (pagerDataSource != _pagerDataSource) { if (pagerDataSource != _pagerDataSource) {
_pagerDataSource = pagerDataSource; _pagerDataSource = pagerDataSource;

2
AsyncDisplayKit/Details/ASDelegateProxy.m
View File

@ -77,7 +77,7 @@
- (BOOL)interceptsSelector:(SEL)selector - (BOOL)interceptsSelector:(SEL)selector
{ {
return ( return (
// handled by ASPagerNodeDataSource node<->cell machinery // handled by ASPagerDataSource node<->cell machinery
selector == @selector(collectionView:nodeForItemAtIndexPath:) || selector == @selector(collectionView:nodeForItemAtIndexPath:) ||
selector == @selector(collectionView:nodeBlockForItemAtIndexPath:) || selector == @selector(collectionView:nodeBlockForItemAtIndexPath:) ||
selector == @selector(collectionView:numberOfItemsInSection:) || selector == @selector(collectionView:numberOfItemsInSection:) ||