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

Clean up interfacing with internal editing/completed stores

Browse Source
This commit is contained in:
Levi McCallum
2015-10-03 15:03:09 -07:00
committed by Levi McCallum
parent 835f9e99ca
commit afda471bd0
6 changed files with 161 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
AsyncDisplayKit/Details/ASCollectionDataController.mm
View File

@@ -8,6 +8,7 @@
#import "ASCollectionDataController.h"
#import "ASLog.h"
#import "ASAssert.h"
#import "ASMultidimensionalArrayUtils.h"
#import "ASDisplayNode.h"
@@ -21,17 +22,18 @@
@end
@implementation ASCollectionDataController {
NSMutableDictionary *_completedSupplementaryNodes;
NSMutableDictionary *_editingSupplementaryNodes;
NSMutableDictionary *_pendingNodes;
NSMutableDictionary *_pendingIndexPaths;
}
- (void)prepareForReloadData
{
_pendingNodes = [NSMutableDictionary dictionary];
_pendingIndexPaths = [NSMutableDictionary dictionary];
NSArray *elementKinds = [self.collectionDataSource supplementaryNodeKindsInDataController:self];
[elementKinds enumerateObjectsUsingBlock:^(NSString *kind, NSUInteger idx, BOOL * _Nonnull stop) {
ASLOG(@"Populating elements of kind: %@", kind);
NSMutableArray *indexPaths = [NSMutableArray array];
NSMutableArray *nodes = [NSMutableArray array];
[self _populateSupplementaryNodesOfKind:kind withMutableNodes:nodes mutableIndexPaths:indexPaths];
@@ -43,9 +45,21 @@
- (void)willReloadData
{
[_pendingNodes enumerateKeysAndObjectsUsingBlock:^(NSString *kind, NSMutableArray *nodes, BOOL *stop) {
ASLOG(@"Batch layout nodes of kind: %@, (%@)", kind, nodes);
// Insert each section
NSUInteger sectionCount = [self.collectionDataSource dataController:self numberOfSectionsForSupplementaryKind:kind];
NSMutableArray *sections = [NSMutableArray arrayWithCapacity:sectionCount];
for (int i = 0; i < sectionCount; i++) {
[sections addObject:[[NSMutableArray alloc] init]];
}
[self insertSections:sections ofKind:kind atIndexSet:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, sectionCount)] completion:nil];
[self batchLayoutNodes:nodes atIndexPaths:_pendingIndexPaths[kind] constrainedSize:^ASSizeRange(NSIndexPath *indexPath) {
return [self.collectionDataSource dataController:self constrainedSizeForSupplementaryNodeOfKind:kind atIndexPath:indexPath];
} completion:nil];
} completion:^(NSArray *nodes, NSArray *indexPaths) {
[self insertNodes:nodes ofKind:kind atIndexPaths:indexPaths completion:nil];
}];
}];
}
@@ -66,7 +80,7 @@
- (ASDisplayNode *)supplementaryNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
{
ASDisplayNodeAssertMainThread();
return _completedSupplementaryNodes[kind][indexPath.section][indexPath.item];
return [self internalCompletedNodes][kind][indexPath.section][indexPath.item];
}
- (id<ASCollectionDataControllerSource>)collectionDataSource
@@ -74,37 +88,4 @@
return (id<ASCollectionDataControllerSource>)self.dataSource;
}
#pragma mark - Internal Data Querying
// TODO: Reduce code duplication by exposing generic insert/delete helpers from ASDataController
- (void)_insertNodes:(NSArray *)nodes ofKind:(NSString *)kind atIndexPaths:(NSArray *)indexPaths
{
if (indexPaths.count == 0)
return;
NSMutableArray *editingNodes = [self _editingNodesOfKind:kind];
ASInsertElementsIntoMultidimensionalArrayAtIndexPaths(editingNodes, indexPaths, nodes);
NSMutableArray *completedNodes = (NSMutableArray *)ASMultidimensionalArrayDeepMutableCopy(editingNodes);
ASDisplayNodePerformBlockOnMainThread(^{
_completedSupplementaryNodes[kind] = completedNodes;
// TODO: Notify change
});
}
// TODO: Reduce code duplication by exposing generic insert/delete helpers from ASDataController
- (void)_deleteNodesOfKind:(NSString *)kind atIndexPaths:(NSArray *)indexPaths
{
if (indexPaths.count == 0)
return;
}
- (NSMutableArray *)_completedNodesOfKind:(NSString *)kind
{
return _completedSupplementaryNodes[kind];
}
- (NSMutableArray *)_editingNodesOfKind:(NSString *)kind
{
return _editingSupplementaryNodes[kind];
}
@end