Merge pull request #10 from a2/badge-image

Add ability to customize selected asset badge image
davbeck · Jan 21, 2016 · 35a5118 · 35a5118
2 parents 5eb7e69 + 1c8c743
commit 35a5118
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/Pod/Classes/TNKAssetCell.h b/Pod/Classes/TNKAssetCell.h
@@ -15,5 +15,7 @@
 @interface TNKAssetCell : UICollectionViewCell
 
 @property (nonatomic, strong) PHAsset *asset;
+@property (nonatomic, strong, readonly) UIImageView *selectedBadgeImageView;
+
 
 @end
diff --git a/Pod/Classes/TNKAssetCell.m b/Pod/Classes/TNKAssetCell.m
@@ -15,7 +15,7 @@
 @interface TNKAssetCell ()
 
 @property (nonatomic, strong) TNKAssetImageView *imageView;
-@property (nonatomic, strong) UIImageView *selectIcon;
+@property (nonatomic, strong) UIImageView *selectedBadgeImageView;
 
 @end
 
@@ -35,7 +35,7 @@ - (PHAsset *)asset {
 - (void)setSelected:(BOOL)selected {
 	[super setSelected:selected];
 
-	self.selectIcon.hidden = !self.selected;
+	self.selectedBadgeImageView.hidden = !self.selected;
 }
 
 - (void)_init {
@@ -46,10 +46,9 @@ - (void)_init {
     _imageView.layer.borderColor = [UIColor colorWithRed:0.401 green:0.682 blue:0.017 alpha:1.000].CGColor;
     [self.contentView addSubview:_imageView];
 
-    _selectIcon = [[UIImageView alloc] init];
-	_selectIcon.image = TNKImagePickerControllerImageNamed(@"checkmark-selected");
-	_selectIcon.hidden = YES;
-    [self.contentView addSubview:_selectIcon];
+    _selectedBadgeImageView = [[UIImageView alloc] init];
+	_selectedBadgeImageView.hidden = YES;
+    [self.contentView addSubview:_selectedBadgeImageView];
 
 
 	self.isAccessibilityElement = YES;
@@ -76,7 +75,7 @@ - (void)layoutSubviews {
 
     _imageView.frame = self.contentView.bounds;
 
-    _selectIcon.frame = CGRectMake(10.0, 10.0, _selectIcon.image.size.width, _selectIcon.image.size.height);
+    _selectedBadgeImageView.frame = CGRectMake(10.0, 10.0, _selectedBadgeImageView.image.size.width, _selectedBadgeImageView.image.size.height);
 }
 
 - (void)_updateAccessibility {

diff --git a/Pod/Classes/TNKImagePickerController.h b/Pod/Classes/TNKImagePickerController.h
@@ -94,6 +94,7 @@
 @property (nonatomic, readonly) UIBarButtonItem *pasteButton;
 @property (nonatomic, readonly) UIBarButtonItem *selectAllButton;
 
+@property (nonatomic, strong) UIImage *selectedAssetBadgeImage;
 
 @property (nonatomic, copy) NSArray *mediaTypes;
 

diff --git a/Pod/Classes/TNKImagePickerController.m b/Pod/Classes/TNKImagePickerController.m
@@ -216,13 +216,18 @@ - (void)_updateSelection {
 	}
 }
 
+- (void)setSelectedAssetBadgeImage:(UIImage *)selectedAssetBadgeImage
+{
+    _selectedAssetBadgeImage = selectedAssetBadgeImage ?: TNKImagePickerControllerImageNamed(@"checkmark-selected");
+}
 
 #pragma mark - Initialization
 
 - (void)_init
 {
     _mediaTypes = @[ (NSString *)kUTTypeImage ];
     _selectedAssets = [NSMutableOrderedSet new];
+    _selectedAssetBadgeImage = TNKImagePickerControllerImageNamed(@"checkmark-selected");
 
     _cancelButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancel:)];
     self.navigationItem.leftBarButtonItem = _cancelButton;
@@ -636,7 +641,8 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
     PHAsset *asset = [self _assetAtIndexPath:indexPath];
 
     cell.asset = asset;
-
+    cell.selectedBadgeImageView.image = _selectedAssetBadgeImage;
+
     return cell;
 }