Merge branch 'release/0.7.0'

SergioEstevao · SergioEstevao · commit d0595d21e538 · 2015-11-16T14:52:20.000Z
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - WPMediaPicker (0.6.1)
+  - WPMediaPicker (0.7.0)
 
 DEPENDENCIES:
   - WPMediaPicker (from `../`)
@@ -9,6 +9,6 @@ EXTERNAL SOURCES:
     :path: ../
 
 SPEC CHECKSUMS:
-  WPMediaPicker: 1596fcd29afc5a7d0c4baf9361a2b96887a2c3ad
+  WPMediaPicker: f721cacd4113c6e718a1c7296083b9fd4a040536
 
 COCOAPODS: 0.39.0
diff --git a/Pod/Classes/WPALAssetDataSource.m b/Pod/Classes/WPALAssetDataSource.m
@@ -95,6 +95,15 @@ - (ALAssetsLibrary *)assetsLibrary
 - (void)loadDataWithSuccess:(WPMediaChangesBlock)successBlock
                     failure:(WPMediaFailureBlock)failureBlock
 {
+    ALAuthorizationStatus authorizationStatus = ALAssetsLibrary.authorizationStatus;
+    if (authorizationStatus == ALAuthorizationStatusDenied ||
+        authorizationStatus == ALAuthorizationStatusRestricted) {
+        if (failureBlock) {
+            NSError *error = [NSError errorWithDomain:WPMediaPickerErrorDomain code:WPMediaErrorCodePermissionsFailed userInfo:nil];
+            failureBlock(error);
+        }
+        return;
+    }
     [self.extraAssets removeAllObjects];
     if (self.refreshGroups) {
         [self loadGroupsWithSuccess:^{
@@ -127,8 +136,14 @@ - (void)loadGroupsWithSuccess:(WPMediaChangesBlock)successBlock
         }
     } failureBlock:^(NSError *error) {
         NSLog(@"Error: %@", [error localizedDescription]);
+        NSError * filteredError = error;
+        if ([error.domain isEqualToString:ALAssetsLibraryErrorDomain] &&
+            (error.code == ALAssetsLibraryAccessUserDeniedError || error.code == ALAssetsLibraryAccessGloballyDeniedError)
+            ) {
+            filteredError = [NSError errorWithDomain:WPMediaPickerErrorDomain code:WPMediaErrorCodePermissionsFailed userInfo:error.userInfo];
+        }
         if (failureBlock) {
-            failureBlock(error);
+            failureBlock(filteredError);
         }
     }];
 }
diff --git a/Pod/Classes/WPMediaCaptureCollectionViewCell.m b/Pod/Classes/WPMediaCaptureCollectionViewCell.m
@@ -107,4 +107,14 @@ - (void)deviceOrientationDidChange:(NSNotification *)notification
     }
 }
 
+- (BOOL)isAccessibilityElement
+{
+    return YES;
+}
+
+- (NSString *)accessibilityLabel
+{
+    return NSLocalizedString(@"Camera", @"Accessibility label for the camera tile in the collection view");
+}
+
 @end
diff --git a/Pod/Classes/WPMediaCollectionDataSource.h b/Pod/Classes/WPMediaCollectionDataSource.h
@@ -5,6 +5,13 @@ typedef NS_ENUM(NSInteger, WPMediaType){
     WPMediaTypeAll
 };
 
+static NSString * const WPMediaPickerErrorDomain = @"WPMediaPickerErrorDomain";
+
+typedef NS_ENUM(NSInteger, WPMediaPickerErrorCode){
+    WPMediaErrorCodePermissionsFailed,
+    WPMediaErrorCodePermissionsUnknow
+};
+
 @protocol WPMediaAsset;
 
 typedef void (^WPMediaChangesBlock)();
diff --git a/Pod/Classes/WPMediaCollectionViewCell.h b/Pod/Classes/WPMediaCollectionViewCell.h
@@ -7,6 +7,6 @@
 
 - (void)setCaption:(NSString *)caption;
 
-- (void)setImage:(UIImage *)image animated:(BOOL)animated;
+- (void)setImage:(UIImage *)image animated:(BOOL)animated withAccessibilityLabel:(NSString*)accessibilityLabel;
 
 @end
diff --git a/Pod/Classes/WPMediaCollectionViewCell.m b/Pod/Classes/WPMediaCollectionViewCell.m
@@ -40,6 +40,7 @@ - (void)prepareForReuse
 - (void)commonInit
 {
     _imageView = [[UIImageView alloc] init];
+    _imageView.isAccessibilityElement = YES;
     _imageView.contentMode = UIViewContentModeScaleAspectFill;
     _imageView.clipsToBounds = YES;
     _imageView.backgroundColor = self.backgroundColor;
@@ -70,25 +71,28 @@ - (void)commonInit
     [self.contentView addSubview:_captionLabel];
 }
 
-- (void)setImage:(UIImage *)image
+- (void)setImage:(UIImage *)image withAccessibilityLabel:(NSString*)accessibilityLabel
 {
-    [self setImage:image animated:YES];
+    [self setImage:image animated:YES withAccessibilityLabel:accessibilityLabel];
 }
 
-- (void)setImage:(UIImage *)image animated:(BOOL)animated
+- (void)setImage:(UIImage *)image animated:(BOOL)animated withAccessibilityLabel:(NSString*)accessibilityLabel
 {
     if (!image){
         self.imageView.alpha = 0;
         self.imageView.image = nil;
+        self.imageView.accessibilityLabel = nil;
     } else {
         if (animated) {
             [UIView animateWithDuration:0.3 animations:^{
                 self.imageView.alpha = 1.0;
                 self.imageView.image = image;
+                self.imageView.accessibilityLabel = accessibilityLabel;
             }];
         } else {
             self.imageView.alpha = 1.0;
             self.imageView.image = image;
+            self.imageView.accessibilityLabel = accessibilityLabel;
         }
     }
 }
diff --git a/Pod/Classes/WPMediaCollectionViewController.m b/Pod/Classes/WPMediaCollectionViewController.m
@@ -3,7 +3,6 @@
 #import "WPMediaCaptureCollectionViewCell.h"
 #import "WPMediaPickerViewController.h"
 #import "WPMediaGroupPickerViewController.h"
-#import "WPALAssetDataSource.h"
 
 @import MobileCoreServices;
 @import AVFoundation;
@@ -274,22 +273,21 @@ - (void)refreshData
             strongSelf.collectionView.allowsSelection = YES;
             strongSelf.collectionView.scrollEnabled = YES;
             [strongSelf.collectionView reloadData];
-            if ([error.domain isEqualToString:ALAssetsLibraryErrorDomain]) {
-                if (error.code == ALAssetsLibraryAccessUserDeniedError || error.code == ALAssetsLibraryAccessGloballyDeniedError) {
-                        NSString *otherButtonTitle = nil;
-                        if ([[self class] isiOS8OrAbove]) {
-                            otherButtonTitle = NSLocalizedString(@"Open Settings", @"Go to the settings app");
-                        }
-                        UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Media Library", @"Title for alert when access to the media library is not granted by the user")
-                                                    message:NSLocalizedString(@"This app needs permission to access your device media library in order to add photos and/or video to your posts. Please change the privacy settings if you wish to allow this.",  @"Explaining to the user why the app needs access to the device media library.")
-                                                   delegate:self
-                                          cancelButtonTitle:NSLocalizedString(@"OK", "")
-                                          otherButtonTitles:otherButtonTitle,nil];
-                        alertView.tag =  WPMediaCollectionAlertMediaLibraryPermissionsNeeded;
-                        alertView.delegate = strongSelf;
-                        [alertView show];
-                        return;
+            if (error.domain == WPMediaPickerErrorDomain &&
+                error.code == WPMediaErrorCodePermissionsFailed) {
+                NSString *otherButtonTitle = nil;
+                if ([[self class] isiOS8OrAbove]) {
+                    otherButtonTitle = NSLocalizedString(@"Open Settings", @"Go to the settings app");
                 }
+                UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Media Library", @"Title for alert when access to the media library is not granted by the user")
+                                            message:NSLocalizedString(@"This app needs permission to access your device media library in order to add photos and/or video to your posts. Please change the privacy settings if you wish to allow this.",  @"Explaining to the user why the app needs access to the device media library.")
+                                           delegate:self
+                                  cancelButtonTitle:NSLocalizedString(@"OK", "")
+                                  otherButtonTitles:otherButtonTitle,nil];
+                alertView.tag =  WPMediaCollectionAlertMediaLibraryPermissionsNeeded;
+                alertView.delegate = strongSelf;
+                [alertView show];
+                return;
             }
             UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Media Library", @"Title for alert when a generic error happened when loading media")
                                                                 message:NSLocalizedString(@"There was a problem when trying to access your media. Please try again later.",  @"Explaining to the user there was an generic error accesing media.")
@@ -353,6 +351,24 @@ - (BOOL)isCaptureCellIndexPath:(NSIndexPath *)indexPath
     return asset;
 }
 
+- (NSString *)accessibilityLabelForType:(WPMediaType)assetType atIndexPath:(NSInteger)index
+{
+    NSString *accessibilityLabelFormat;
+    switch (assetType) {
+        case WPMediaTypeImage:
+            accessibilityLabelFormat = NSLocalizedString(@"Asset %d, image.", @"Accessibility label for image thumbnails in the media collection view. The parameter is the index of the image in the collection view.");
+            break;
+        case WPMediaTypeVideo:
+            accessibilityLabelFormat = NSLocalizedString(@"Asset %d, video", @"Accessibility label for video thumbnails in the media collection view. The parameter is the index of the video in the collection view.");
+            break;
+        default:
+            accessibilityLabelFormat = NSLocalizedString(@"Asset %d", @"Accessibility label for asset (of unknown type) thumbnails in the media collection view. The parameter is the index of the asset in the collection view.");
+            break;
+    }
+
+    return [NSString stringWithFormat:accessibilityLabelFormat, index];
+}
+
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
     if ([self isCaptureCellIndexPath:indexPath]) {
@@ -370,22 +386,29 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
     // Configure the cell
     __block WPMediaRequestID requestKey = 0;
     NSTimeInterval timestamp = [NSDate timeIntervalSinceReferenceDate];
+    NSInteger itemIndex = indexPath.item + 1; // Asset position + 1 to avoid starting at "Asset 0"
+    WPMediaType assetType = asset.assetType;
     requestKey = [asset imageWithSize:cell.frame.size completionHandler:^(UIImage *result, NSError *error) {
         BOOL animated = ([NSDate timeIntervalSinceReferenceDate] - timestamp) > 0.03;
         if (error) {
             cell.image = nil;
             NSLog(@"%@", [error localizedDescription]);
             return;
         }
-        if ([NSThread isMainThread]){
+        void (^setImage)() = ^{
             if (requestKey == cell.tag){
-                [cell setImage:result animated:animated];
+                NSString *accessibilityLabel = [self accessibilityLabelForType:assetType
+                                                                   atIndexPath:itemIndex];
+                [cell setImage:result
+                      animated:animated
+        withAccessibilityLabel:accessibilityLabel];
             }
+        };
+        if ([NSThread isMainThread]){
+            setImage();
         } else {
             dispatch_async(dispatch_get_main_queue(), ^{
-                if (requestKey == cell.tag){
-                    [cell setImage:result animated:animated];
-                }
+                setImage();
             });
         }
     }];
diff --git a/Pod/Classes/WPPHAssetDataSource.m b/Pod/Classes/WPPHAssetDataSource.m
@@ -69,14 +69,24 @@ - (void)photoLibraryDidChange:(PHChange *)changeInstance
 - (void)loadDataWithSuccess:(WPMediaChangesBlock)successBlock
                     failure:(WPMediaFailureBlock)failureBlock
 {
-    if (self.refreshGroups) {
-        [self loadGroupsWithSuccess:^{
-            self.refreshGroups = NO;
+    [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) {
+        if ([PHPhotoLibrary authorizationStatus] == PHAuthorizationStatusDenied ||
+            [PHPhotoLibrary authorizationStatus] == PHAuthorizationStatusRestricted) {
+            if (failureBlock) {
+                NSError *error = [NSError errorWithDomain:WPMediaPickerErrorDomain code:WPMediaErrorCodePermissionsFailed userInfo:nil];
+                failureBlock(error);
+            }
+            return;
+        }
+        if (self.refreshGroups) {
+            [self loadGroupsWithSuccess:^{
+                self.refreshGroups = NO;
+                [self loadAssetsWithSuccess:successBlock failure:failureBlock];
+            } failure:failureBlock];
+        } else {
             [self loadAssetsWithSuccess:successBlock failure:failureBlock];
-        } failure:failureBlock];
-    } else {
-        [self loadAssetsWithSuccess:successBlock failure:failureBlock];
-    }
+        }
+    }];
 }
 
 - (void)loadGroupsWithSuccess:(WPMediaChangesBlock)successBlock
diff --git a/WPMediaPicker.podspec b/WPMediaPicker.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "WPMediaPicker"
-  s.version          = "0.6.1"
+  s.version          = "0.7.0"
   s.summary          = "WPMediaPicker is an iOS controller that allows capture and picking of media assets."
   s.description      = <<-DESC
                        WPMediaPicker is an iOS controller that allows capture and picking of media assets.

Original file line number	Diff line number	Diff line change
`@@ -107,4 +107,14 @@ - (void)deviceOrientationDidChange:(NSNotification *)notification`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
	`110`	`+- (BOOL)isAccessibilityElement`
	`111`	`+{`
	`112`	`+ return YES;`
	`113`	`+}`
	`114`	`+`
	`115`	`+- (NSString *)accessibilityLabel`
	`116`	`+{`
	`117`	`+ return NSLocalizedString(@"Camera", @"Accessibility label for the camera tile in the collection view");`
	`118`	`+}`
	`119`	`+`
`110`	`120`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ - (void)prepareForReuse`
`40`	`40`	`- (void)commonInit`
`41`	`41`	`{`
`42`	`42`	`_imageView = [[UIImageView alloc] init];`
	`43`	`+ _imageView.isAccessibilityElement = YES;`
`43`	`44`	`_imageView.contentMode = UIViewContentModeScaleAspectFill;`
`44`	`45`	`_imageView.clipsToBounds = YES;`
`45`	`46`	`_imageView.backgroundColor = self.backgroundColor;`
`@@ -70,25 +71,28 @@ - (void)commonInit`
`70`	`71`	`[self.contentView addSubview:_captionLabel];`
`71`	`72`	`}`
`72`	`73`
`73`		`-- (void)setImage:(UIImage *)image`
	`74`	`+- (void)setImage:(UIImage )image withAccessibilityLabel:(NSString)accessibilityLabel`
`74`	`75`	`{`
`75`		`- [self setImage:image animated:YES];`
	`76`	`+ [self setImage:image animated:YES withAccessibilityLabel:accessibilityLabel];`
`76`	`77`	`}`
`77`	`78`
`78`		`-- (void)setImage:(UIImage *)image animated:(BOOL)animated`
	`79`	`+- (void)setImage:(UIImage )image animated:(BOOL)animated withAccessibilityLabel:(NSString)accessibilityLabel`
`79`	`80`	`{`
`80`	`81`	`if (!image){`
`81`	`82`	`self.imageView.alpha = 0;`
`82`	`83`	`self.imageView.image = nil;`
	`84`	`+ self.imageView.accessibilityLabel = nil;`
`83`	`85`	`} else {`
`84`	`86`	`if (animated) {`
`85`	`87`	`[UIView animateWithDuration:0.3 animations:^{`
`86`	`88`	`self.imageView.alpha = 1.0;`
`87`	`89`	`self.imageView.image = image;`
	`90`	`+ self.imageView.accessibilityLabel = accessibilityLabel;`
`88`	`91`	`}];`
`89`	`92`	`} else {`
`90`	`93`	`self.imageView.alpha = 1.0;`
`91`	`94`	`self.imageView.image = image;`
	`95`	`+ self.imageView.accessibilityLabel = accessibilityLabel;`
`92`	`96`	`}`
`93`	`97`	`}`
`94`	`98`	`}`