Merge remote-tracking branch 'path/master'

Sega-Zero · Sega-Zero · commit 7cf6b356c45e · 2016-09-12T18:18:57.000+03:00
fix conflicts
diff --git a/.gitignore b/.gitignore
@@ -19,5 +19,5 @@ profile
 DerivedData
 
 # Demo Images
-FastImageCacheDemo/Demo Images/*.jpg
+FastImageCache/FastImageCacheDemo/Demo Images/*.jpg
 Carthage
diff --git a/FastImageCache/FastImageCache.xcodeproj/project.pbxproj b/FastImageCache/FastImageCache.xcodeproj/project.pbxproj
@@ -528,6 +528,7 @@
 		B2E5677F1B316D5800906840 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -544,6 +545,7 @@
 		B2E567801B316D5800906840 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
diff --git a/FastImageCache/FastImageCache/FastImageCache/FICEntity.h b/FastImageCache/FastImageCache/FastImageCache/FICEntity.h
@@ -26,15 +26,15 @@ typedef void (^FICEntityImageDrawingBlock)(CGContextRef context, CGSize contextS
  @discussion Within each image table, each entry is identified by an entity's UUID. Ideally, this value should never change for an entity. For example, if your entity class is a person
  model, its UUID might be an API-assigned, unchanging, unique user ID. No matter how the properties of the person change, its user ID should never change.
  */
-@property (nonatomic, copy, readonly) NSString *UUID;
+@property (nonatomic, copy, readonly) NSString *fic_UUID;
 
 /**
  A string that uniquely identifies an entity's source image.
  
  @discussion While `<UUID>` should be unchanging, a source image UUID might change. For example, if your entity class is a person model, its source image UUID might change every time the
  person changes their profile photo. In this case, the source image UUID might be a hash of the profile photo URL (assuming each image is given a unique URL).
  */
-@property (nonatomic, copy, readonly) NSString *sourceImageUUID;
+@property (nonatomic, copy, readonly) NSString *fic_sourceImageUUID;
 
 /**
  Returns the source image URL associated with a specific format name.
@@ -54,7 +54,8 @@ typedef void (^FICEntityImageDrawingBlock)(CGContextRef context, CGSize contextS
  @see FICImageFormat
  @see [FICImageCacheDelegate imageCache:wantsSourceImageForEntity:withFormatName:completionBlock:]
  */
-- (nullable NSURL *)sourceImageURLWithFormatName:(NSString *)formatName;
+- (nullable NSURL *)fic_sourceImageURLWithFormatName:(NSString *)formatName;
+
 
 /**
  Returns the drawing block for a specific image and format name.
@@ -75,15 +76,15 @@ typedef void (^FICEntityImageDrawingBlock)(CGContextRef context, CGSize contextS
  
  @note This block will always be called from the serial dispatch queue used by the image cache.
  */
-- (nullable FICEntityImageDrawingBlock)drawingBlockForImage:(UIImage *)image withFormatName:(NSString *)formatName;
+- (nullable FICEntityImageDrawingBlock)fic_drawingBlockForImage:(UIImage *)image withFormatName:(NSString *)formatName;
 
 @optional
 /**
  Returns the image for a format
  
  @param format The image format that identifies which image table is requesting the source image.
  */
-- (nullable UIImage *)imageForFormat:(FICImageFormat *)format;
+- (nullable UIImage *)fic_imageForFormat:(FICImageFormat *)format;
 
 @end
 
diff --git a/FastImageCache/FastImageCache/FastImageCache/FICImageCache.m b/FastImageCache/FastImageCache/FastImageCache/FICImageCache.m
@@ -163,8 +163,8 @@ - (BOOL)_retrieveImageForEntity:(id <FICEntity>)entity withFormatName:(NSString
     BOOL imageExists = NO;
     
     FICImageTable *imageTable = [_imageTables objectForKey:formatName];
-    NSString *entityUUID = [entity UUID];
-    NSString *sourceImageUUID = [entity sourceImageUUID];
+    NSString *entityUUID = [entity fic_UUID];
+    NSString *sourceImageUUID = [entity fic_sourceImageUUID];
     
     if (loadSynchronously == NO && [imageTable entryExistsForEntityUUID:entityUUID sourceImageUUID:sourceImageUUID]) {
         imageExists = YES;
@@ -196,7 +196,7 @@ - (BOOL)_retrieveImageForEntity:(id <FICEntity>)entity withFormatName:(NSString
         
         if (image == nil) {
             // No image for this UUID exists in the image table. We'll need to ask the delegate to retrieve the source asset.
-            NSURL *sourceImageURL = [entity sourceImageURLWithFormatName:formatName];
+            NSURL *sourceImageURL = [entity fic_sourceImageURLWithFormatName:formatName];
             
             if (sourceImageURL != nil) {
                 // We check to see if this image is already being fetched.
@@ -216,9 +216,9 @@ - (BOOL)_retrieveImageForEntity:(id <FICEntity>)entity withFormatName:(NSString
                 if (needsToFetch) {
                     @autoreleasepool {
                         UIImage *image;
-                        if ([entity respondsToSelector:@selector(imageForFormat:)]){
+                        if ([entity respondsToSelector:@selector(fic_imageForFormat:)]){
                             FICImageFormat *format = [self formatWithName:formatName];
-                            image = [entity imageForFormat:format];
+                            image = [entity fic_imageForFormat:format];
                         }
                         
                         if (image){
@@ -274,7 +274,7 @@ - (void)_imageDidLoad:(UIImage *)image forURL:(NSURL *)URL {
 }
 
 static void _FICAddCompletionBlockForEntity(NSString *formatName, NSMutableDictionary *entityRequestsDictionary, id <FICEntity> entity, FICImageCacheCompletionBlock completionBlock) {
-    NSString *entityUUID = [entity UUID];
+    NSString *entityUUID = [entity fic_UUID];
     NSMutableDictionary *requestDictionary = [entityRequestsDictionary objectForKey:entityUUID];
     NSMutableDictionary *completionBlocks = nil;
     
@@ -315,7 +315,7 @@ - (void)setImage:(UIImage *)image forEntity:(id <FICEntity>)entity withFormatNam
             completionBlocksDictionary = [NSDictionary dictionaryWithObject:[NSArray arrayWithObject:[completionBlock copy]] forKey:formatName];
         }
         
-        NSString *entityUUID = [entity UUID];
+        NSString *entityUUID = [entity fic_UUID];
         FICImageTable *imageTable = [_imageTables objectForKey:formatName];
         if (imageTable) {
             [imageTable deleteEntryForEntityUUID:entityUUID];
@@ -338,21 +338,21 @@ - (void)_processImage:(UIImage *)image forEntity:(id <FICEntity>)entity completi
 
 - (void)_processImage:(UIImage *)image forEntity:(id <FICEntity>)entity imageTable:(FICImageTable *)imageTable completionBlocks:(NSArray *)completionBlocks {
     if (imageTable != nil) {
-        if ([entity UUID] == nil) {
+        if ([entity fic_UUID] == nil) {
             [self _logMessage:[NSString stringWithFormat:@"*** FIC Error: %s entity %@ is missing its UUID.", __PRETTY_FUNCTION__, entity]];
             return;
         }
         
-        if ([entity sourceImageUUID] == nil) {
+        if ([entity fic_sourceImageUUID] == nil) {
             [self _logMessage:[NSString stringWithFormat:@"*** FIC Error: %s entity %@ is missing its source image UUID.", __PRETTY_FUNCTION__, entity]];
             return;
         }
         
-        NSString *entityUUID = [entity UUID];
-        NSString *sourceImageUUID = [entity sourceImageUUID];
+        NSString *entityUUID = [entity fic_UUID];
+        NSString *sourceImageUUID = [entity fic_sourceImageUUID];
         FICImageFormat *imageFormat = [imageTable imageFormat];
         NSString *imageFormatName = [imageFormat name];
-        FICEntityImageDrawingBlock imageDrawingBlock = [entity drawingBlockForImage:image withFormatName:imageFormatName];
+        FICEntityImageDrawingBlock imageDrawingBlock = [entity fic_drawingBlockForImage:image withFormatName:imageFormatName];
         
         dispatch_async([FICImageCache dispatchQueue], ^{
             [imageTable setEntryForEntityUUID:entityUUID sourceImageUUID:sourceImageUUID imageDrawingBlock:imageDrawingBlock];
@@ -412,7 +412,7 @@ - (NSSet *)formatsToProcessForCompletionBlocks:(NSDictionary *)completionBlocksD
             }
 
             // If the image already exists, keep going
-            if ([table entryExistsForEntityUUID:entity.UUID sourceImageUUID:entity.sourceImageUUID]) {
+            if ([table entryExistsForEntityUUID:entity.fic_UUID sourceImageUUID:entity.fic_sourceImageUUID]) {
                 continue;
             }
 
@@ -427,8 +427,8 @@ - (NSSet *)formatsToProcessForCompletionBlocks:(NSDictionary *)completionBlocksD
 
 - (BOOL)imageExistsForEntity:(id <FICEntity>)entity withFormatName:(NSString *)formatName {
     FICImageTable *imageTable = [_imageTables objectForKey:formatName];
-    NSString *entityUUID = [entity UUID];
-    NSString *sourceImageUUID = [entity sourceImageUUID];
+    NSString *entityUUID = [entity fic_UUID];
+    NSString *sourceImageUUID = [entity fic_sourceImageUUID];
     
     BOOL imageExists = [imageTable entryExistsForEntityUUID:entityUUID sourceImageUUID:sourceImageUUID];
 
@@ -439,13 +439,13 @@ - (BOOL)imageExistsForEntity:(id <FICEntity>)entity withFormatName:(NSString *)f
 
 - (void)deleteImageForEntity:(id <FICEntity>)entity withFormatName:(NSString *)formatName {
     FICImageTable *imageTable = [_imageTables objectForKey:formatName];
-    NSString *entityUUID = [entity UUID];    
+    NSString *entityUUID = [entity fic_UUID];
     [imageTable deleteEntryForEntityUUID:entityUUID];
 }
 
 - (void)cancelImageRetrievalForEntity:(id <FICEntity>)entity withFormatName:(NSString *)formatName {
-    NSURL *sourceImageURL = [entity sourceImageURLWithFormatName:formatName];
-    NSString *entityUUID = [entity UUID];
+    NSURL *sourceImageURL = [entity fic_sourceImageURLWithFormatName:formatName];
+    NSString *entityUUID = [entity fic_UUID];
 
     BOOL cancelImageLoadingForEntity = NO;
     @synchronized (_requests) {
diff --git a/FastImageCache/FastImageCacheDemo/Classes/FICDPhoto.m b/FastImageCache/FastImageCacheDemo/Classes/FICDPhoto.m
@@ -167,7 +167,7 @@ - (void)deleteThumbnail {
 
 #pragma mark - FICImageCacheEntity
 
-- (NSString *)UUID {
+- (NSString *)fic_UUID {
     if (_UUID == nil) {
         // MD5 hashing is expensive enough that we only want to do it once
         NSString *imageName = [_sourceImageURL lastPathComponent];
@@ -178,15 +178,15 @@ - (NSString *)UUID {
     return _UUID;
 }
 
-- (NSString *)sourceImageUUID {
-    return [self UUID];
+- (NSString *)fic_sourceImageUUID {
+    return [self fic_UUID];
 }
 
-- (NSURL *)sourceImageURLWithFormatName:(NSString *)formatName {
+- (NSURL *)fic_sourceImageURLWithFormatName:(NSString *)formatName {
     return _sourceImageURL;
 }
 
-- (FICEntityImageDrawingBlock)drawingBlockForImage:(UIImage *)image withFormatName:(NSString *)formatName {
+- (FICEntityImageDrawingBlock)fic_drawingBlockForImage:(UIImage *)image withFormatName:(NSString *)formatName {
     FICEntityImageDrawingBlock drawingBlock = ^(CGContextRef contextRef, CGSize contextSize) {
         CGRect contextBounds = CGRectZero;
         contextBounds.size = contextSize;
diff --git a/FastImageCache/FastImageCacheDemo/Classes/FICDPhotosTableViewCell.m b/FastImageCache/FastImageCacheDemo/Classes/FICDPhotosTableViewCell.m
@@ -19,7 +19,7 @@ @interface FICDPhotosTableViewCell () <UIGestureRecognizerDelegate> {
     NSArray *_photos;
     NSString *_imageFormatName;
     
-    NSMutableArray *_imageViews;
+    NSArray *_imageViews;
     UITapGestureRecognizer *_tapGestureRecognizer;
 }
 
@@ -39,42 +39,28 @@ @implementation FICDPhotosTableViewCell
 - (void)setPhotos:(NSArray *)photos {
     if (photos != _photos) {
         _photos = [photos copy];
-        
-        // Either create the image views for this cell or clear them out if they already exist
-        if (_imageViews == nil) {
-            NSInteger photosPerRow = [[self class] photosPerRow];
-            _imageViews = [[NSMutableArray alloc] initWithCapacity:photosPerRow];
-            
-            for (NSInteger i = 0; i < photosPerRow; i++) {
-                UIImageView *imageView = [[UIImageView alloc] init];
-                [imageView setContentMode:UIViewContentModeScaleAspectFill];
-                [_imageViews addObject:imageView];
-            }
-        } else {
-            for (UIImageView *imageView in _imageViews) {
-                [imageView setImage:nil];
-                [imageView removeFromSuperview];
-            }
-        }
-        
-        NSInteger photosCount = [_photos count];
-        for (NSInteger i = 0; i < photosCount; i++) {
-            FICDPhoto *photo = [_photos objectAtIndex:i];
+
+        for (NSInteger i = 0; i < [_imageViews count]; i++) {
             UIImageView *imageView = [_imageViews objectAtIndex:i];
-            
-            if (_usesImageTable) {
-                [[FICImageCache sharedImageCache] retrieveImageForEntity:photo withFormatName:_imageFormatName completionBlock:^(id<FICEntity> entity, NSString *formatName, UIImage *image) {
-                    // This completion block may be called much later. We should check to make sure this cell hasn't been reused for different photos before displaying the image that has loaded.
-                    if (photos == [self photos]) {
-                        [imageView setImage:image];
-                    }
-                }];
+
+            if (i < [_photos count]) {
+                FICDPhoto *photo = [_photos objectAtIndex:i];
+
+                if (_usesImageTable) {
+                    [[FICImageCache sharedImageCache] retrieveImageForEntity:photo withFormatName:_imageFormatName completionBlock:^(id<FICEntity> entity, NSString *formatName, UIImage *image) {
+                        // This completion block may be called much later. We should check to make sure this cell hasn't been reused for different photos before displaying the image that has loaded.
+                        if (photos == [self photos]) {
+                            [imageView setImage:image];
+                        }
+                    }];
+                } else {
+                    [imageView setImage:[photo thumbnailImage]];
+                }
             } else {
-                [imageView setImage:[photo thumbnailImage]];
+                // Last row might not be full
+                [imageView setImage:nil];
             }
         }
-        
-        [self setNeedsLayout];
     }
 }
 
@@ -117,6 +103,18 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
     if (self != nil) {
         _tapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_tapGestureRecognizerStateDidChange)];
         [self addGestureRecognizer:_tapGestureRecognizer];
+
+        NSInteger photosPerRow = [[self class] photosPerRow];
+        NSMutableArray *imageViews = [[NSMutableArray alloc] initWithCapacity:photosPerRow];
+
+        for (NSInteger i = 0; i < photosPerRow; i++) {
+            UIImageView *imageView = [[UIImageView alloc] init];
+            [imageView setContentMode:UIViewContentModeScaleAspectFill];
+            [imageViews addObject:imageView];
+            [self.contentView addSubview:imageView];
+        }
+
+        _imageViews = [imageViews copy];
     }
     
     return self;
@@ -139,14 +137,12 @@ - (void)layoutSubviews {
     CGFloat outerPadding = [[self class] outerPadding];
     
     CGRect imageViewFrame = CGRectMake(outerPadding, outerPadding, FICDPhotoSquareImageSize.width, FICDPhotoSquareImageSize.height);
-    
-    UIView *contentView = [self contentView];
+
     NSInteger count = [_photos count];
     
     for (NSInteger i = 0; i < count; i++) {
         UIImageView *imageView = [_imageViews objectAtIndex:i];
         [imageView setFrame:imageViewFrame];
-        [contentView addSubview:imageView];
 
         imageViewFrame.origin.x += imageViewFrame.size.width + innerPadding;
     }
diff --git a/FastImageCache/FastImageCacheDemo/Classes/FICDViewController.m b/FastImageCache/FastImageCacheDemo/Classes/FICDViewController.m
@@ -95,6 +95,7 @@ - (void)loadView {
         [_tableView setDelegate:self];
         [_tableView setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
         [_tableView setSeparatorStyle:UITableViewCellSeparatorStyleNone];
+        [_tableView registerClass:[FICDPhotosTableViewCell class] forCellReuseIdentifier:[FICDPhotosTableViewCell reuseIdentifier]];
         
         CGFloat tableViewCellOuterPadding = [FICDPhotosTableViewCell outerPadding];
         [_tableView setContentInset:UIEdgeInsetsMake(0, 0, tableViewCellOuterPadding, 0)];
@@ -461,13 +462,9 @@ - (NSInteger)tableView:(UITableView*)tableView numberOfRowsInSection:(NSInteger)
 - (UITableViewCell*)tableView:(UITableView*)table cellForRowAtIndexPath:(NSIndexPath*)indexPath {
     NSString *reuseIdentifier = [FICDPhotosTableViewCell reuseIdentifier];
     
-    FICDPhotosTableViewCell *tableViewCell = (FICDPhotosTableViewCell *)[table dequeueReusableCellWithIdentifier:reuseIdentifier];
-    if (tableViewCell == nil) {
-        tableViewCell = [[FICDPhotosTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier];
-        [tableViewCell setBackgroundColor:[table backgroundColor]];
-        [tableViewCell setSelectionStyle:UITableViewCellSelectionStyleNone];
-    }
-    
+    FICDPhotosTableViewCell *tableViewCell = (FICDPhotosTableViewCell *)[table dequeueReusableCellWithIdentifier:reuseIdentifier forIndexPath:indexPath];
+    tableViewCell.selectionStyle = UITableViewCellSeparatorStyleNone;
+
     [tableViewCell setDelegate:self];
     [tableViewCell setImageFormatName:_imageFormatName];
     
diff --git a/README.md b/README.md
