diff --git a/RATreeView.podspec.json b/RATreeView.podspec.json index 7883013..2193988 100644 --- a/RATreeView.podspec.json +++ b/RATreeView.podspec.json @@ -16,7 +16,7 @@ "tag": "v2.1.5" }, "platforms": { - "ios": "7.0", + "ios": "11.0", "tvos": "9.0" }, "source_files": "RATreeView/RATreeView/**/*.{h,m}", diff --git a/RATreeView/RATreeView/Private Files/RABatchChangeEntity.h b/RATreeView/RATreeView/Private Files/RABatchChangeEntity.h index 41b4601..eacc8b8 100644 --- a/RATreeView/RATreeView/Private Files/RABatchChangeEntity.h +++ b/RATreeView/RATreeView/Private Files/RABatchChangeEntity.h @@ -23,9 +23,9 @@ typedef NS_ENUM(NSInteger, RABatchChangeType) { @property (nonatomic) RABatchChangeType type; @property (nonatomic) NSInteger ranking; -@property (nonatomic, copy) void(^updatesBlock)(); +@property (nonatomic, copy) void(^updatesBlock)(void); -+ (instancetype)batchChangeEntityWithBlock:(void(^)())updates type:(RABatchChangeType)type ranking:(NSInteger)ranking; ++ (instancetype)batchChangeEntityWithBlock:(void(^)(void))updates type:(RABatchChangeType)type ranking:(NSInteger)ranking; @end diff --git a/RATreeView/RATreeView/Private Files/RABatchChangeEntity.m b/RATreeView/RATreeView/Private Files/RABatchChangeEntity.m index 96c6228..d5fbc48 100644 --- a/RATreeView/RATreeView/Private Files/RABatchChangeEntity.m +++ b/RATreeView/RATreeView/Private Files/RABatchChangeEntity.m @@ -12,7 +12,7 @@ @implementation RABatchChangeEntity -+ (instancetype)batchChangeEntityWithBlock:(void (^)())updates type:(RABatchChangeType)type ranking:(NSInteger)ranking ++ (instancetype)batchChangeEntityWithBlock:(void (^)(void))updates type:(RABatchChangeType)type ranking:(NSInteger)ranking { NSParameterAssert(updates); RABatchChangeEntity *entity = [RABatchChangeEntity new]; diff --git a/RATreeView/RATreeView/Private Files/RABatchChanges.h b/RATreeView/RATreeView/Private Files/RABatchChanges.h index 495674b..ea42d9f 100644 --- a/RATreeView/RATreeView/Private Files/RABatchChanges.h +++ b/RATreeView/RATreeView/Private Files/RABatchChanges.h @@ -26,12 +26,12 @@ - (void)beginUpdates; - (void)endUpdates; -- (void)expandItemWithBlock:(void(^)())update atIndex:(NSInteger)index; -- (void)insertItemWithBlock:(void(^)())update atIndex:(NSInteger)index; +- (void)expandItemWithBlock:(void(^)(void))update atIndex:(NSInteger)index; +- (void)insertItemWithBlock:(void(^)(void))update atIndex:(NSInteger)index; -- (void)collapseItemWithBlock:(void(^)())update lastIndex:(NSInteger)index; -- (void)deleteItemWithBlock:(void(^)())update lastIndex:(NSInteger)index; +- (void)collapseItemWithBlock:(void(^)(void))update lastIndex:(NSInteger)index; +- (void)deleteItemWithBlock:(void(^)(void))update lastIndex:(NSInteger)index; -- (void)moveItemWithDeletionBlock:(void (^)())deletionUpdate fromLastIndex:(NSInteger)lastIndex additionBlock:(void (^)())additionUpdate toIndex:(NSInteger)index; +- (void)moveItemWithDeletionBlock:(void (^)(void))deletionUpdate fromLastIndex:(NSInteger)lastIndex additionBlock:(void (^)(void))additionUpdate toIndex:(NSInteger)index; @end diff --git a/RATreeView/RATreeView/Private Files/RABatchChanges.m b/RATreeView/RATreeView/Private Files/RABatchChanges.m index e2e88ad..09934ee 100644 --- a/RATreeView/RATreeView/Private Files/RABatchChanges.m +++ b/RATreeView/RATreeView/Private Files/RABatchChanges.m @@ -63,7 +63,7 @@ - (void)endUpdates } } -- (void)insertItemWithBlock:(void (^)())update atIndex:(NSInteger)index +- (void)insertItemWithBlock:(void (^)(void))update atIndex:(NSInteger)index { RABatchChangeEntity *entity = [RABatchChangeEntity batchChangeEntityWithBlock:update type:RABatchChangeTypeItemRowInsertion @@ -71,7 +71,7 @@ - (void)insertItemWithBlock:(void (^)())update atIndex:(NSInteger)index [self addBatchChangeEntity:entity]; } -- (void)expandItemWithBlock:(void (^)())update atIndex:(NSInteger)index +- (void)expandItemWithBlock:(void (^)(void))update atIndex:(NSInteger)index { RABatchChangeEntity *entity= [RABatchChangeEntity batchChangeEntityWithBlock:update type:RABatchChangeTypeItemRowExpansion @@ -79,7 +79,7 @@ - (void)expandItemWithBlock:(void (^)())update atIndex:(NSInteger)index [self addBatchChangeEntity:entity]; } -- (void)deleteItemWithBlock:(void (^)())update lastIndex:(NSInteger)lastIndex +- (void)deleteItemWithBlock:(void (^)(void))update lastIndex:(NSInteger)lastIndex { RABatchChangeEntity *entity = [RABatchChangeEntity batchChangeEntityWithBlock:update type:RABatchChangeTypeItemRowDeletion @@ -87,7 +87,7 @@ - (void)deleteItemWithBlock:(void (^)())update lastIndex:(NSInteger)lastIndex [self addBatchChangeEntity:entity]; } -- (void)collapseItemWithBlock:(void (^)())update lastIndex:(NSInteger)lastIndex +- (void)collapseItemWithBlock:(void (^)(void))update lastIndex:(NSInteger)lastIndex { RABatchChangeEntity *entity = [RABatchChangeEntity batchChangeEntityWithBlock:update type:RABatchChangeTypeItemRowCollapse @@ -95,7 +95,7 @@ - (void)collapseItemWithBlock:(void (^)())update lastIndex:(NSInteger)lastIndex [self addBatchChangeEntity:entity]; } -- (void)moveItemWithDeletionBlock:(void (^)())deletionUpdate fromLastIndex:(NSInteger)lastIndex additionBlock:(void (^)())additionUpdate toIndex:(NSInteger)index +- (void)moveItemWithDeletionBlock:(void (^)(void))deletionUpdate fromLastIndex:(NSInteger)lastIndex additionBlock:(void (^)(void))additionUpdate toIndex:(NSInteger)index { RABatchChangeEntity *firstEntity = [RABatchChangeEntity batchChangeEntityWithBlock:deletionUpdate type:RABatchChangeTypeItemRowDeletion diff --git a/RATreeView/RATreeView/Private Files/RATreeView+Enums.m b/RATreeView/RATreeView/Private Files/RATreeView+Enums.m index 862e919..43d36ca 100644 --- a/RATreeView/RATreeView/Private Files/RATreeView+Enums.m +++ b/RATreeView/RATreeView/Private Files/RATreeView+Enums.m @@ -60,8 +60,6 @@ + (RATreeViewCellSeparatorStyle)treeViewCellSeparatorStyleForTableViewSeparatorS return RATreeViewCellSeparatorStyleNone; case UITableViewCellSeparatorStyleSingleLine: return RATreeViewCellSeparatorStyleSingleLine; - case UITableViewCellSeparatorStyleSingleLineEtched: - return RATreeViewCellSeparatorStyleSingleLineEtched; default: return RATreeViewCellSeparatorStyleNone; } @@ -74,8 +72,6 @@ + (UITableViewCellSeparatorStyle)tableViewCellSeparatorStyleForTreeViewCellSepar return UITableViewCellSeparatorStyleNone; case RATreeViewCellSeparatorStyleSingleLine: return UITableViewCellSeparatorStyleSingleLine; - case RATreeViewCellSeparatorStyleSingleLineEtched: - return UITableViewCellSeparatorStyleSingleLineEtched; default: return UITableViewCellSeparatorStyleNone; } diff --git a/RATreeView/RATreeView/RATreeView.h b/RATreeView/RATreeView/RATreeView.h index 327e639..4ccefc3 100644 --- a/RATreeView/RATreeView/RATreeView.h +++ b/RATreeView/RATreeView/RATreeView.h @@ -65,7 +65,6 @@ typedef enum RATreeViewRowAnimation { * * @param treeView The tree-view that sent the message. * @param item An item identifying a cell in tree view. - * @param treeNodeInfo Object including additional information about item. * * @return The number of child items encompassed by item. If item is nil, this method should return the number of children for the top-level item. */ @@ -105,7 +104,6 @@ typedef enum RATreeViewRowAnimation { * @param treeView The tree-view object requesting the insertion or deletion. * @param editingStyle The cell editing style corresponding to a insertion or deletion requested for the row specified by item. Possible editing styles are `UITableViewCellEditingStyleInsert` or `UITableViewCellEditingStyleDelete`. * @param item An item identifying a cell in tree view. - * @param treeNodeInfo Object including additional information about item. */ - (void)treeView:(RATreeView *)treeView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowForItem:(id)item; @@ -413,7 +411,6 @@ typedef enum RATreeViewRowAnimation { * Asks the delegate if the row for a specified item should be highlighted. * * @param treeView The tree-view object that is making this request. - * @param treeNodeInfo Object including additional information about item. * * @return YES if the row should be highlighted or NO if it should not. */