Merge branch 'develop' into issue/improve_permission_handling

Author: SergioEstevao

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

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

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;
         }
     }
 }

Pod/Classes/WPMediaCollectionViewController.m

@@ -351,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]) {
@@ -368,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();
             });
         }
     }];