Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ability to customize selected asset badge image #10

Merged
merged 1 commit into from
Jan 21, 2016
Merged

Add ability to customize selected asset badge image #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Pod/Classes/TNKAssetCell.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,7 @@
@interface TNKAssetCell : UICollectionViewCell

@property (nonatomic, strong) PHAsset *asset;
@property (nonatomic, strong, readonly) UIImageView *selectedBadgeImageView;


@end
13 changes: 6 additions & 7 deletions Pod/Classes/TNKAssetCell.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@interface TNKAssetCell ()

@property (nonatomic, strong) TNKAssetImageView *imageView;
@property (nonatomic, strong) UIImageView *selectIcon;
@property (nonatomic, strong) UIImageView *selectedBadgeImageView;

@end

Expand All @@ -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 {
Expand All @@ -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;
Expand All @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions Pod/Classes/TNKImagePickerController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
@property (nonatomic, readonly) UIBarButtonItem *pasteButton;
@property (nonatomic, readonly) UIBarButtonItem *selectAllButton;

@property (nonatomic, strong) UIImage *selectedAssetBadgeImage;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs null_resettable if #8 is merged first.


@property (nonatomic, copy) NSArray *mediaTypes;

Expand Down
8 changes: 7 additions & 1 deletion Pod/Classes/TNKImagePickerController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -636,7 +641,8 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
PHAsset *asset = [self _assetAtIndexPath:indexPath];

cell.asset = asset;

cell.selectedBadgeImageView.image = _selectedAssetBadgeImage;

return cell;
}

Expand Down