From e9a32bfd3cd187069bfba74bccd4b581fd613c54 Mon Sep 17 00:00:00 2001 From: Levi McCallum Date: Thu, 19 Nov 2015 11:48:06 -0800 Subject: [PATCH] Remove deprecated layout controller methods --- AsyncDisplayKit/ASCollectionView.h | 8 +----- AsyncDisplayKit/ASTableView.h | 8 +----- .../Details/ASAbstractLayoutController.h | 2 -- .../Details/ASAbstractLayoutController.mm | 28 +------------------ AsyncDisplayKit/Details/ASLayoutController.h | 6 ---- 5 files changed, 3 insertions(+), 49 deletions(-) diff --git a/AsyncDisplayKit/ASCollectionView.h b/AsyncDisplayKit/ASCollectionView.h index eca5ba4883..204d155f8a 100644 --- a/AsyncDisplayKit/ASCollectionView.h +++ b/AsyncDisplayKit/ASCollectionView.h @@ -415,10 +415,4 @@ */ - (CGSize)collectionView:(ASCollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout referenceSizeForFooterInSection:(NSInteger)section; -@end - -@interface ASCollectionView (Deprecated) - -@property (nonatomic, assign) ASRangeTuningParameters rangeTuningParameters ASDISPLAYNODE_DEPRECATED; - -@end +@end \ No newline at end of file diff --git a/AsyncDisplayKit/ASTableView.h b/AsyncDisplayKit/ASTableView.h index d7ea79dc2d..8a5f33531e 100644 --- a/AsyncDisplayKit/ASTableView.h +++ b/AsyncDisplayKit/ASTableView.h @@ -344,10 +344,4 @@ */ - (BOOL)shouldBatchFetchForTableView:(ASTableView *)tableView; -@end - -@interface ASTableView (Deprecated) - -@property (nonatomic, assign) ASRangeTuningParameters rangeTuningParameters ASDISPLAYNODE_DEPRECATED; - -@end +@end \ No newline at end of file diff --git a/AsyncDisplayKit/Details/ASAbstractLayoutController.h b/AsyncDisplayKit/Details/ASAbstractLayoutController.h index 45b92ece00..7fcf36da70 100644 --- a/AsyncDisplayKit/Details/ASAbstractLayoutController.h +++ b/AsyncDisplayKit/Details/ASAbstractLayoutController.h @@ -15,6 +15,4 @@ - (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType; -@property (nonatomic, assign) ASRangeTuningParameters tuningParameters ASDISPLAYNODE_DEPRECATED; - @end diff --git a/AsyncDisplayKit/Details/ASAbstractLayoutController.mm b/AsyncDisplayKit/Details/ASAbstractLayoutController.mm index 28d6ceb04f..30723e43b7 100644 --- a/AsyncDisplayKit/Details/ASAbstractLayoutController.mm +++ b/AsyncDisplayKit/Details/ASAbstractLayoutController.mm @@ -52,33 +52,7 @@ _tuningParameters[rangeType] = tuningParameters; } -// Support for the deprecated tuningParameters property -- (ASRangeTuningParameters)tuningParameters -{ - return [self tuningParametersForRangeType:ASLayoutRangeTypeRender]; -} - -// Support for the deprecated tuningParameters property -- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters -{ - [self setTuningParameters:tuningParameters forRangeType:ASLayoutRangeTypeRender]; -} - -#pragma mark - Index Path Range Support - -// Support for deprecated method -- (BOOL)shouldUpdateForVisibleIndexPath:(NSArray *)indexPaths viewportSize:(CGSize)viewportSize -{ - return [self shouldUpdateForVisibleIndexPaths:indexPaths viewportSize:viewportSize rangeType:ASLayoutRangeTypeRender]; -} - -// Support for the deprecated method -- (NSSet *)indexPathsForScrolling:(ASScrollDirection)scrollDirection viewportSize:(CGSize)viewportSize -{ - return [self indexPathsForScrolling:scrollDirection viewportSize:viewportSize rangeType:ASLayoutRangeTypeRender]; -} - -#pragma mark - Abstract +#pragma mark - Abstract Index Path Range Support - (BOOL)shouldUpdateForVisibleIndexPaths:(NSArray *)indexPaths viewportSize:(CGSize)viewportSize rangeType:(ASLayoutRangeType)rangeType { diff --git a/AsyncDisplayKit/Details/ASLayoutController.h b/AsyncDisplayKit/Details/ASLayoutController.h index b45efd8793..5c206a75ee 100644 --- a/AsyncDisplayKit/Details/ASLayoutController.h +++ b/AsyncDisplayKit/Details/ASLayoutController.h @@ -31,12 +31,6 @@ typedef struct { - (NSSet *)indexPathsForScrolling:(ASScrollDirection)scrollDirection viewportSize:(CGSize)viewportSize rangeType:(ASLayoutRangeType)rangeType; -@property (nonatomic, assign) ASRangeTuningParameters tuningParameters ASDISPLAYNODE_DEPRECATED; - -- (BOOL)shouldUpdateForVisibleIndexPath:(NSArray *)indexPath viewportSize:(CGSize)viewportSize ASDISPLAYNODE_DEPRECATED; - -- (NSSet *)indexPathsForScrolling:(ASScrollDirection)scrollDirection viewportSize:(CGSize)viewportSize ASDISPLAYNODE_DEPRECATED; - @optional - (void)insertNodesAtIndexPaths:(NSArray *)indexPaths withSizes:(NSArray *)nodeSizes;