From 2c3fc0483dbb320d07c0e297aa7e96fdbe47d777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Olejn=C3=ADk?= Date: Thu, 11 Jun 2015 11:38:17 +0200 Subject: [PATCH 1/2] Implemented max number of photos that can be selected --- .../DVGViewController.m | 1 + Pod/Classes/DVGAssetPickerViewController.h | 1 + Pod/Classes/DVGAssetPickerViewController.m | 28 +++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/Example/DVGAssetPickerController/DVGViewController.m b/Example/DVGAssetPickerController/DVGViewController.m index f4701b8..c448d33 100644 --- a/Example/DVGAssetPickerController/DVGViewController.m +++ b/Example/DVGAssetPickerController/DVGViewController.m @@ -57,6 +57,7 @@ - (IBAction)pickPhoto:(id)sender { DVGAssetPickerViewController *picker = [[DVGAssetPickerViewController alloc] init]; picker.delegate = self; + picker.maxNumberOfAssets = 2; [self presentViewController:picker animated:YES completion:nil]; } diff --git a/Pod/Classes/DVGAssetPickerViewController.h b/Pod/Classes/DVGAssetPickerViewController.h index 8757a12..e5db5ab 100644 --- a/Pod/Classes/DVGAssetPickerViewController.h +++ b/Pod/Classes/DVGAssetPickerViewController.h @@ -33,5 +33,6 @@ typedef NS_ENUM(NSUInteger, DVGAssetPickerMenuItem) { - (void)cancel; @property (nonatomic, weak) id delegate; @property (strong, nonatomic) ALAssetsLibrary *assetsLibrary; +@property (nonatomic) NSUInteger maxNumberOfAssets; @end diff --git a/Pod/Classes/DVGAssetPickerViewController.m b/Pod/Classes/DVGAssetPickerViewController.m index 6f09aee..97af904 100644 --- a/Pod/Classes/DVGAssetPickerViewController.m +++ b/Pod/Classes/DVGAssetPickerViewController.m @@ -24,6 +24,7 @@ static CGFloat const kCollectionViewExpandedHeight = 308.f; static CGFloat const kCollectionViewPadding = 4.f; static NSTimeInterval const kExpandAnimationDuration = 0.3; +static CGFloat const kDefaultDisabledSelectionAlpha = .6; @interface DVGAssetPickerViewController () Date: Thu, 11 Jun 2015 13:37:30 +0200 Subject: [PATCH 2/2] Fixed colectionView cell states when collectionView is not expanded --- Pod/Classes/DVGAssetPickerViewController.m | 1 + 1 file changed, 1 insertion(+) diff --git a/Pod/Classes/DVGAssetPickerViewController.m b/Pod/Classes/DVGAssetPickerViewController.m index 97af904..c8fe6fd 100644 --- a/Pod/Classes/DVGAssetPickerViewController.m +++ b/Pod/Classes/DVGAssetPickerViewController.m @@ -415,6 +415,7 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa DVGAssetPickerCollectionLayout *layout = (id)self.collectionView.collectionViewLayout; layout.showCheckmarks = self.collectionViewExpanded; [self.tableView reloadData]; + [collectionView reloadData]; }]; } else {