Merge pull request #154 from wordpress-mobile/media-picker-additions

Tweaks required for Media Library deletion in WPiOS

Author: frosty

Pod/Classes/WPMediaPickerViewController.h

@@ -111,7 +111,8 @@
 
 /**
  *  Asks the delegate for a view controller to push when previewing the specified asset.
- *  If this method isn't implemented or returns nil, the default view controller will be used.
+ *  If this method isn't implemented, the default view controller will be used.
+ *  If it returns nil, no preview will be displayed.
  *
  *  @param picker The controller object managing the assets picker interface.
  *  @param asset  The asset to be previewed.
@@ -164,5 +165,10 @@
  */
 - (void)setGroup:(nonnull id<WPMediaGroup>)group;
 
+/**
+ * Clears the current asset selection in the picker.
+ */
+- (void)clearSelectedAssets:(BOOL)animated;
+
 @end
 

Pod/Classes/WPMediaPickerViewController.m

@@ -139,6 +139,24 @@ - (BOOL)isShowingCaptureCell
     return self.allowCaptureOfMedia && [self isMediaDeviceAvailable] && !self.refreshGroupFirstTime;
 }
 
+- (void)setAllowMultipleSelection:(BOOL)allowMultipleSelection
+{
+    _allowMultipleSelection = allowMultipleSelection;
+
+    if (self.isViewLoaded) {
+        self.collectionView.allowsMultipleSelection = allowMultipleSelection;
+    }
+}
+
+- (void)clearSelectedAssets:(BOOL)animated
+{
+    for (NSIndexPath *indexPath in [self.collectionView indexPathsForSelectedItems]) {
+        [self.collectionView deselectItemAtIndexPath:indexPath animated:animated];
+    }
+
+    [self.selectedAssets removeAllObjects];
+}
+
 #pragma mark - UICollectionViewDataSource
 
 -(void)updateDataWithRemoved:(NSIndexSet *)removed inserted:(NSIndexSet *)inserted changed:(NSIndexSet *)changed moved:(NSArray<id<WPMediaMove>> *)moves {
@@ -709,18 +727,12 @@ - (nullable UIViewController *)previewControllerForTouchLocation:(CGPoint)locati
 
 - (UIViewController *)previewViewControllerForAsset:(id <WPMediaAsset>)asset
 {
-    UIViewController *previewViewController = nil;
-
     if ([self.mediaPickerDelegate respondsToSelector:@selector(mediaPickerController:previewViewControllerForAsset:)]) {
-        previewViewController = [self.mediaPickerDelegate mediaPickerController:self
-                                                  previewViewControllerForAsset:asset];
-    }
-
-    if (!previewViewController) {
-        previewViewController = [self defaultPreviewViewControllerForAsset:asset];
+        return [self.mediaPickerDelegate mediaPickerController:self
+                                 previewViewControllerForAsset:asset];
     }
 
-    return previewViewController;
+    return [self defaultPreviewViewControllerForAsset:asset];
 }
 
 - (UIViewController *)defaultPreviewViewControllerForAsset:(id <WPMediaAsset>)asset