Skip to content
This repository was archived by the owner on Apr 6, 2020. It is now read-only.

Fix crash on empty albums #151

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix crash on empty albums #151

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
897e232
No longer adding the index paths of non-cell elements in collection v…
Apr 18, 2016
fdd5131
Renamed qb_indexPathsForElementsInRect to qb_indexPathsForCellsInRect…
Apr 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions QBImagePicker/QBAssetsViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,17 @@ - (NSArray *)qb_indexPathsFromIndexesWithSection:(NSUInteger)section

@implementation UICollectionView (Convenience)

- (NSArray *)qb_indexPathsForElementsInRect:(CGRect)rect
- (NSArray *)qb_indexPathsForCellsInRect:(CGRect)rect
{
NSArray *allLayoutAttributes = [self.collectionViewLayout layoutAttributesForElementsInRect:rect];
if (allLayoutAttributes.count == 0) { return nil; }

NSMutableArray *indexPaths = [NSMutableArray arrayWithCapacity:allLayoutAttributes.count];
for (UICollectionViewLayoutAttributes *layoutAttributes in allLayoutAttributes) {
NSIndexPath *indexPath = layoutAttributes.indexPath;
[indexPaths addObject:indexPath];
if (layoutAttributes.representedElementCategory == UICollectionElementCategoryCell) {
NSIndexPath *indexPath = layoutAttributes.indexPath;
[indexPaths addObject:indexPath];
}
}
return indexPaths;
}
Expand Down Expand Up @@ -307,10 +309,10 @@ - (void)updateCachedAssets
NSMutableArray *removedIndexPaths = [NSMutableArray array];

[self computeDifferenceBetweenRect:self.previousPreheatRect andRect:preheatRect addedHandler:^(CGRect addedRect) {
NSArray *indexPaths = [self.collectionView qb_indexPathsForElementsInRect:addedRect];
NSArray *indexPaths = [self.collectionView qb_indexPathsForCellsInRect:addedRect];
[addedIndexPaths addObjectsFromArray:indexPaths];
} removedHandler:^(CGRect removedRect) {
NSArray *indexPaths = [self.collectionView qb_indexPathsForElementsInRect:removedRect];
NSArray *indexPaths = [self.collectionView qb_indexPathsForCellsInRect:removedRect];
[removedIndexPaths addObjectsFromArray:indexPaths];
}];

Expand Down