Merge pull request #334 from wordpress-mobile/feature/update_to_ios11_as_mininum

SergioEstevao · web-flow · commit cdda2906f969 · 2019-09-19T08:11:26.000-04:00
Feature/update to ios11 as mininum
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 `WPMediaPicker` adheres to [Semantic Versioning](http://semver.org/).
 
 #### Releases
+- `1.5.0` Release  - [1.5](#1.5.0)
 - `1.4.2` Release  - [1.4](#1.4.2)
 - `1.4` Release  - [1.4](#1.4)
 - `1.3.4` Release  - [1.3.4](#1.3.4)
@@ -25,6 +26,13 @@ All notable changes to this project will be documented in this file.
 - `0.16` Releases - [0.16](#16)
 - `0.15` Releases - [0.15](#15)
 
+---
+## [1.5.0](https://github.com/wordpress-mobile/MediaPicker-iOS/releases/tag/1.5.0)
+Released on 2019-09-09. All issues associated with this milestone can be found using this [filter](https://github.com/wordpress-mobile/MediaPicker-iOS/pulls?utf8=✓&q=is%3Apr%20is%3Aclosed%20milestone%3A1.5.0).
+
+### Changes
+- Update code to have as minimum working version iOS 11.
+
 ---
 ## [1.4.2](https://github.com/wordpress-mobile/MediaPicker-iOS/releases/tag/1.4.2)
 Released on 2019-06-14. All issues associated with this milestone can be found using this [filter](https://github.com/wordpress-mobile/MediaPicker-iOS/pulls?utf8=✓&q=is%3Apr%20is%3Aclosed%20milestone%3A1.4.2).
diff --git a/Example/Podfile b/Example/Podfile
@@ -1,5 +1,5 @@
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '10.0'
+platform :ios, '11.0'
 target 'WPMediaPicker' do
   pod "WPMediaPicker", :path => "../"
 
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - WPMediaPicker (1.4.2)
+  - WPMediaPicker (1.5.0)
 
 DEPENDENCIES:
   - WPMediaPicker (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  WPMediaPicker: 1897f312c7b41114ffd239fb782431ae602134a1
+  WPMediaPicker: 3f03b6deeb4d2360679b65c3b33d5c470c822bce
 
-PODFILE CHECKSUM: 7c47e10b39aca62b1f30c3c4260cc99456cf95f8
+PODFILE CHECKSUM: 02a24c94627582ae16b486b76dc047a7f773dcc4
 
 COCOAPODS: 1.6.1
diff --git a/Example/WPMediaPicker.xcodeproj/project.pbxproj b/Example/WPMediaPicker.xcodeproj/project.pbxproj
@@ -479,7 +479,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -526,7 +526,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -548,6 +548,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "WPMediaPicker/WPMediaPicker-Prefix.pch";
 				INFOPLIST_FILE = "WPMediaPicker/WPMediaPicker-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.wordpress.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -573,6 +574,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "WPMediaPicker/WPMediaPicker-Prefix.pch";
 				INFOPLIST_FILE = "WPMediaPicker/WPMediaPicker-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.wordpress.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
diff --git a/Example/WPMediaPicker.xcodeproj/xcshareddata/xcschemes/WPMediaPicker-Example.xcscheme b/Example/WPMediaPicker.xcodeproj/xcshareddata/xcschemes/WPMediaPicker-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1030"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Example/WPMediaPicker/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/WPMediaPicker/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -172,8 +172,15 @@
       "size" : "44x44",
       "idiom" : "watch",
       "scale" : "2x",
-      "role" : "longLook",
-      "subtype" : "42mm"
+      "role" : "appLauncher",
+      "subtype" : "40mm"
+    },
+    {
+      "size" : "50x50",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "appLauncher",
+      "subtype" : "44mm"
     },
     {
       "size" : "86x86",
@@ -189,10 +196,24 @@
       "role" : "quickLook",
       "subtype" : "42mm"
     },
+    {
+      "size" : "108x108",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "44mm"
+    },
     {
       "idiom" : "watch-marketing",
       "size" : "1024x1024",
       "scale" : "1x"
+    },
+    {
+      "size" : "44x44",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "longLook",
+      "subtype" : "42mm"
     }
   ],
   "info" : {
diff --git a/Pod/Classes/WPAssetViewController.m b/Pod/Classes/WPAssetViewController.m
@@ -36,15 +36,15 @@ - (void)viewDidLoad
     self.imageView.translatesAutoresizingMaskIntoConstraints = NO;
     [self.imageView.leftAnchor constraintEqualToAnchor:self.view.leftAnchor].active = YES;
     [self.imageView.widthAnchor constraintEqualToAnchor:self.view.widthAnchor].active = YES;
-    [self.imageView.topAnchor constraintEqualToAnchor:self.topLayoutGuide.bottomAnchor].active = YES;
-    [self.imageView.bottomAnchor constraintEqualToAnchor:self.bottomLayoutGuide.topAnchor].active = YES;
+    [self.imageView.topAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.topAnchor].active = YES;
+    [self.imageView.bottomAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.bottomAnchor].active = YES;
 
     [self.view addSubview:self.videoView];
     self.videoView.translatesAutoresizingMaskIntoConstraints = NO;
     [self.videoView.leftAnchor constraintEqualToAnchor:self.view.leftAnchor].active = YES;
     [self.videoView.widthAnchor constraintEqualToAnchor:self.view.widthAnchor].active = YES;
-    [self.videoView.topAnchor constraintEqualToAnchor:self.topLayoutGuide.bottomAnchor].active = YES;
-    [self.videoView.bottomAnchor constraintEqualToAnchor:self.bottomLayoutGuide.topAnchor].active = YES;
+    [self.videoView.topAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.topAnchor].active = YES;
+    [self.videoView.bottomAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.bottomAnchor].active = YES;
     self.videoView.delegate = self;
 
     [self.view addSubview:self.activityIndicatorView];
@@ -109,9 +109,8 @@ - (UIImageView *)imageView
     _imageView.backgroundColor = [UIColor blackColor];
     _imageView.userInteractionEnabled = YES;
     [_imageView addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapOnAsset:)]];
-    if (@available(iOS 11.0, *)) {
-        _imageView.accessibilityIgnoresInvertColors = YES;
-    }
+    _imageView.accessibilityIgnoresInvertColors = YES;
+
     return _imageView;
 }
 
@@ -228,10 +227,7 @@ - (void)handleTapOnAsset:(UIGestureRecognizer *)gestureRecognizer
         __weak __typeof(self) weakSelf = self;
         [self.videoView setControlToolbarHidden:hidden animated:YES completion:^{
             [weakSelf setNeedsStatusBarAppearanceUpdate];
-
-            if (@available(iOS 11.0, *)) {
-                [weakSelf setNeedsUpdateOfHomeIndicatorAutoHidden];
-            }
+            [weakSelf setNeedsUpdateOfHomeIndicatorAutoHidden];
         }];
     }
 }
diff --git a/Pod/Classes/WPInputMediaPickerViewController.m b/Pod/Classes/WPInputMediaPickerViewController.m
@@ -54,13 +54,8 @@ - (void)setupMediaPickerViewController {
     self.mediaPicker.view.translatesAutoresizingMaskIntoConstraints = NO;
     [self.view addSubview:self.mediaPicker.view];
     
-    NSLayoutAnchor *leadingAnchor = self.view.leadingAnchor;
-    NSLayoutAnchor *trailingAnchor = self.view.trailingAnchor;
-
-    if (@available(iOS 11.0, *)) {
-        leadingAnchor = self.view.safeAreaLayoutGuide.leadingAnchor;
-        trailingAnchor = self.view.safeAreaLayoutGuide.trailingAnchor;
-    }
+    NSLayoutAnchor *leadingAnchor = self.view.safeAreaLayoutGuide.leadingAnchor;
+    NSLayoutAnchor *trailingAnchor = self.view.safeAreaLayoutGuide.trailingAnchor;    
 
     [NSLayoutConstraint activateConstraints:
      @[
diff --git a/Pod/Classes/WPMediaCollectionViewCell.m b/Pod/Classes/WPMediaCollectionViewCell.m
@@ -81,9 +81,8 @@ - (void)commonInit
     _imageView.contentMode = UIViewContentModeScaleAspectFill;
     _imageView.clipsToBounds = YES;
     _imageView.backgroundColor = self.backgroundColor;
-    if (@available(iOS 11.0, *)) {
-        _imageView.accessibilityIgnoresInvertColors = YES;
-    }
+    _imageView.accessibilityIgnoresInvertColors = YES;
+    
     self.backgroundView = _imageView;
 
     _selectionFrame = [[UIView alloc] initWithFrame:self.backgroundView.frame];
diff --git a/Pod/Classes/WPMediaGroupTableViewCell.m b/Pod/Classes/WPMediaGroupTableViewCell.m
@@ -21,9 +21,8 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSStr
     _imagePosterView.clipsToBounds = YES;
     _imagePosterView.translatesAutoresizingMaskIntoConstraints = NO;
     _imagePosterView.backgroundColor = _posterBackgroundColor;
-    if (@available(iOS 11.0, *)) {
-        _imagePosterView.accessibilityIgnoresInvertColors = YES;
-    }
+    _imagePosterView.accessibilityIgnoresInvertColors = YES;
+    
     [self.contentView addSubview:_imagePosterView];
     
     _titleLabel = [[UILabel alloc] initWithFrame:CGRectZero];
diff --git a/Pod/Classes/WPMediaPickerViewController.m b/Pod/Classes/WPMediaPickerViewController.m
@@ -119,9 +119,8 @@ - (void)viewDidLoad
         [self.view addGestureRecognizer:self.longPressGestureRecognizer];
     }
 
-    if (@available(iOS 11.0, *)) {
-        self.layout.sectionInsetReference = UICollectionViewFlowLayoutSectionInsetFromSafeArea;
-    }
+    self.layout.sectionInsetReference = UICollectionViewFlowLayoutSectionInsetFromSafeArea;
+    
     [self refreshDataAnimated:NO];
 }
 
@@ -201,7 +200,7 @@ - (void)setupLayout
     CGFloat photoSize;
     UICollectionViewFlowLayout *layout = self.layout;
     CGFloat frameWidth = self.view.frame.size.width;
-    CGFloat frameHeight = self.view.frame.size.width - self.topLayoutGuide.length;
+    CGFloat frameHeight = self.view.frame.size.width - self.view.safeAreaInsets.bottom - self.view.safeAreaInsets.top;
     CGFloat dimensionToUse;
     if (self.options.scrollVertically) {
         dimensionToUse = frameWidth;
@@ -229,18 +228,9 @@ - (void)setupLayout
 
 - (void)resetContentInset
 {
-    if (@available(iOS 11.0, *)) {
-        CGFloat searchBarHeight = self.searchBar.bounds.size.height;
-        self.additionalSafeAreaInsets = UIEdgeInsetsMake(searchBarHeight, 0, 0, 0);
-        self.searchBarTopConstraint.constant = self.view.safeAreaInsets.top - searchBarHeight;
-    } else {
-        UIEdgeInsets inset = self.collectionView.contentInset;
-        inset.top = self.searchBar.bounds.size.height + self.topLayoutGuide.length;
-        inset.bottom = self.bottomLayoutGuide.length;
-        self.collectionView.contentInset = inset;
-        self.collectionView.scrollIndicatorInsets = inset;
-        self.searchBarTopConstraint.constant = self.topLayoutGuide.length;
-    }
+    CGFloat searchBarHeight = self.searchBar.bounds.size.height;
+    self.additionalSafeAreaInsets = UIEdgeInsetsMake(searchBarHeight, 0, 0, 0);
+    self.searchBarTopConstraint.constant = self.view.safeAreaInsets.top - searchBarHeight;
 }
 
 - (CGFloat)cellSizeForPhotosPerLineCount:(NSUInteger)photosPerLine photoSpacing:(CGFloat)photoSpacing frameWidth:(CGFloat)frameWidth
@@ -748,9 +738,6 @@ - (void)refreshDataAnimated:(BOOL)animated
                     [strongSelf.refreshControl endRefreshing];
                 }];
             }
-            if (@available(iOS 11, *)) {} else { // Just on iOS 10
-                [self resetContentInset]; //Fix top content inset when refresh control dissapear.
-            }
 
             // Scroll to the correct position
             if (refreshGroupFirstTime){
@@ -986,11 +973,7 @@ - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView
         CGSize fixedSize = self.cameraPreviewSize;
         UICollectionViewFlowLayout *layout = (UICollectionViewFlowLayout *)self.collectionView.collectionViewLayout;
         if (layout.scrollDirection == UICollectionViewScrollDirectionHorizontal) {
-            if (@available(iOS 11, *)) {
-                fixedSize.height = self.view.frame.size.height - self.view.safeAreaInsets.top - self.view.safeAreaInsets.bottom - self.collectionView.contentInset.bottom;
-            } else {
-                fixedSize.height = self.view.frame.size.height - self.collectionView.contentInset.top - self.collectionView.contentInset.bottom;
-            }
+            fixedSize.height = self.view.frame.size.height - self.view.safeAreaInsets.top - self.view.safeAreaInsets.bottom - self.collectionView.contentInset.bottom;
         } else {
             fixedSize.width = self.view.frame.size.width;
         }
@@ -1401,13 +1384,7 @@ - (void)keyboardWillShowNotification:(NSNotification *)notification
 - (void)keyboardWillHideNotification:(NSNotification *)notification
 {
     UIEdgeInsets contentInset = self.collectionView.contentInset;
-
-    if (@available(iOS 11, *)) {
-        contentInset.bottom = 0.f;
-    } else {
-        contentInset.bottom = self.bottomLayoutGuide.length;
-    }
-
+    contentInset.bottom = 0.f;
     self.collectionView.contentInset = contentInset;
     self.collectionView.scrollIndicatorInsets = contentInset;
 
diff --git a/Pod/Classes/WPPHAssetDataSource.m b/Pod/Classes/WPPHAssetDataSource.m
@@ -177,22 +177,17 @@ - (void)loadDataWithOptions:(WPMediaLoadOptions)options
 }
 
 - (NSArray *)smartAlbumsToShow {
-    NSMutableArray *smartAlbumsOrder = [NSMutableArray arrayWithArray:@[
-                                                                        @(PHAssetCollectionSubtypeSmartAlbumUserLibrary),
-                                                                        @(PHAssetCollectionSubtypeSmartAlbumRecentlyAdded),
-                                                                        @(PHAssetCollectionSubtypeSmartAlbumFavorites),
-                                                                        @(PHAssetCollectionSubtypeSmartAlbumPanoramas),
-                                                                        @(PHAssetCollectionSubtypeSmartAlbumVideos),
-                                                                        @(PHAssetCollectionSubtypeSmartAlbumSlomoVideos),
-                                                                        @(PHAssetCollectionSubtypeSmartAlbumTimelapses),
-                                                                        ]];
-    // Add iOS 9's new albums
-    NSOperatingSystemVersion iOS9 = {9,0,0};
-    if ( [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:iOS9]) {
-        [smartAlbumsOrder insertObject:@(PHAssetCollectionSubtypeSmartAlbumSelfPortraits) atIndex:3];
-        [smartAlbumsOrder addObject:@(PHAssetCollectionSubtypeSmartAlbumScreenshots)];
-    }
-    return [NSArray arrayWithArray:smartAlbumsOrder];
+    return @[
+             @(PHAssetCollectionSubtypeSmartAlbumUserLibrary),
+             @(PHAssetCollectionSubtypeSmartAlbumRecentlyAdded),
+             @(PHAssetCollectionSubtypeSmartAlbumFavorites),
+             @(PHAssetCollectionSubtypeSmartAlbumSelfPortraits),
+             @(PHAssetCollectionSubtypeSmartAlbumPanoramas),
+             @(PHAssetCollectionSubtypeSmartAlbumVideos),
+             @(PHAssetCollectionSubtypeSmartAlbumSlomoVideos),
+             @(PHAssetCollectionSubtypeSmartAlbumTimelapses),
+             @(PHAssetCollectionSubtypeSmartAlbumScreenshots)
+             ];    
 }
 
 - (void)loadGroupsWithSuccess:(WPMediaSuccessBlock)successBlock
diff --git a/Pod/Classes/WPVideoPlayerView.m b/Pod/Classes/WPVideoPlayerView.m
@@ -55,9 +55,7 @@ - (void)commonInit {
         [weakSelf updateVideoDuration];
     }];
 
-    if (@available(iOS 11.0, *)) {
-        self.accessibilityIgnoresInvertColors = YES;
-    }
+    self.accessibilityIgnoresInvertColors = YES;
 }
 
 - (void)dealloc {
@@ -223,9 +221,7 @@ - (void)setControlToolbarHidden:(BOOL)hidden animated:(BOOL)animated completion:
 - (void)updateToolbarPosition:(BOOL)hidden
 {
     CGFloat height = toolbarHeight;
-    if (@available(iOS 11.0, *)) {
-        height += self.safeAreaInsets.bottom;
-    }
+    height += self.safeAreaInsets.bottom;
 
     CGFloat position = hidden ? 0 : height;
     self.controlToolbar.frame = CGRectMake(0, self.frame.size.height - position, self.frame.size.width, toolbarHeight);
diff --git a/README.md b/README.md
@@ -107,8 +107,8 @@ To run the example project, clone the repo, and run `pod install` from the `Exam
 
  * ARC 
  * Photos, AVFoundation, ImageIO
- * XCode 9 or above
- * iOS 10 or above
+ * XCode 10 or above
+ * iOS 11 or above
 
 ## Contributing
 
diff --git a/WPMediaPicker.podspec b/WPMediaPicker.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "WPMediaPicker"
-  s.version          = "1.4.2"
+  s.version          = "1.5.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.
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.social_media_url = "http://twitter.com/WordPressiOS"
   s.source           = { :git => "https://github.com/wordpress-mobile/MediaPicker-iOS.git", :tag => s.version.to_s }
 
-  s.platform     = :ios, '10.0'
+  s.platform     = :ios, '11.0'
   s.requires_arc = true 
 
   s.source_files = 'Pod/Classes'
