From afff02de5de6ef29d6d0bd0b2ebba7a9ecdec6d8 Mon Sep 17 00:00:00 2001 From: Ran Greenberg Date: Mon, 13 Mar 2017 15:19:56 +0200 Subject: [PATCH] update default unselected badge location to "top-right" --- .../CKGalleryCollectionViewCell.m | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/ios/lib/ReactNativeCameraKit/CKGalleryCollectionViewCell.m b/ios/lib/ReactNativeCameraKit/CKGalleryCollectionViewCell.m index a81a08e..6c9121b 100644 --- a/ios/lib/ReactNativeCameraKit/CKGalleryCollectionViewCell.m +++ b/ios/lib/ReactNativeCameraKit/CKGalleryCollectionViewCell.m @@ -174,12 +174,12 @@ static UIColor *selectionOverlayColor = nil; -(void)updateBadgeImageViewFrame { id imagePositionProp = selection[SELECTION_IMAGE_POSITION]; - if(imagePositionProp) { - CGRect badgeRect = [self frameforImagePosition:imagePositionProp image:self.badgeImageView.image]; - if (!CGRectIsEmpty(badgeRect)) { - self.badgeImageView.frame = badgeRect; - }; - } + if(!imagePositionProp) imagePositionProp = @"top-right"; // defualt + CGRect badgeRect = [self frameforImagePosition:imagePositionProp image:self.badgeImageView.image]; + if (!CGRectIsEmpty(badgeRect)) { + self.badgeImageView.frame = badgeRect; + }; + } - (void)prepareForReuse { @@ -268,10 +268,6 @@ static UIColor *selectionOverlayColor = nil; -(void)setIsSelected:(BOOL)isSelected { - if(_isSelected == isSelected) { - return; - } - _isSelected = isSelected; if (self.disableSelectionIcons) return; @@ -298,9 +294,11 @@ static UIColor *selectionOverlayColor = nil; } } else { - self.imageOveray.backgroundColor = [UIColor clearColor]; - self.badgeImageView.image = unSelectedImageIcon; - [self updateBadgeImageViewFrame]; + if (unSelectedImageIcon) { + self.imageOveray.backgroundColor = [UIColor clearColor]; + self.badgeImageView.image = unSelectedImageIcon; + [self updateBadgeImageViewFrame]; + } } }