Swift3 migration

Example/SRC/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -30,6 +40,16 @@
       "size" : "60x60",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "idiom" : "ipad",
       "size" : "29x29",

Example/SRC/Base.lproj/LaunchScreen.storyboard

@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -13,10 +14,9 @@
                         <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <animations/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>

Example/SRC/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>4</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

Example/SRC/VideoCollectionReusableView.swift

@@ -49,7 +49,7 @@ class VideoCollectionReusableView: UICollectionReusableView {
             }
         }
 
-        let date = NSDateFormatter.localizedStringFromDate(collection.startDate!, dateStyle:.LongStyle, timeStyle:.NoStyle)
+        let date = DateFormatter.localizedString(from: collection.startDate!, dateStyle:.long, timeStyle:.none)
 
         if self.titleLabel.text != nil {
             self.dateLabel.text = date
@@ -76,30 +76,33 @@ class VideoCollectionReusableView: UICollectionReusableView {
 
         if (self.subtitleLabel.text?.characters.count == 0) {
 
-            self.titleLabel.frame = CGRectMake(horizontalBordersOffset,
-                                               titleLabelTopOffsetWithNoSubtitle,
-                                               CGRectGetWidth(self.bounds) - dateLabelWidth,
-                                               CGRectGetHeight(self.bounds) - titleLabelTopOffsetWithNoSubtitle)
+            self.titleLabel.frame = CGRect(origin: CGPoint(x: horizontalBordersOffset,
+                                                           y: titleLabelTopOffsetWithNoSubtitle ),
+                                             size: CGSize(width: self.bounds.width - dateLabelWidth,
+                                                        height: self.bounds.height - titleLabelTopOffsetWithNoSubtitle ))
+
+
+
+            self.dateLabel.frame  = CGRect( origin: CGPoint(x: self.bounds.width - dateLabelWidth - horizontalBordersOffset,
+                                                            y: 0 + titleLabelTopOffsetWithNoSubtitle ),
+                                              size: CGSize(width: dateLabelWidth,
+                                                         height: self.bounds.height - titleLabelTopOffsetWithNoSubtitle ))
 
-            self.dateLabel.frame  = CGRectMake(CGRectGetWidth(self.bounds) - dateLabelWidth - horizontalBordersOffset,
-                                               0 + titleLabelTopOffsetWithNoSubtitle,
-                                               dateLabelWidth,
-                                               CGRectGetHeight(self.bounds) - titleLabelTopOffsetWithNoSubtitle)
         } else {
-            self.titleLabel.frame    = CGRectMake(horizontalBordersOffset,
-                                                  titleLabelTopOffset,
-                                                  CGRectGetWidth(self.bounds) - dateLabelWidth - 2 * horizontalBordersOffset,
-                                                  CGRectGetHeight(self.titleLabel.bounds))
+            self.titleLabel.frame    = CGRect( origin: CGPoint(x: horizontalBordersOffset,
+                                                               y: titleLabelTopOffset ),
+                                                 size: CGSize(width: self.bounds.width - dateLabelWidth - 2 * horizontalBordersOffset,
+                                                            height: self.titleLabel.bounds.height ))
 
-            self.subtitleLabel.frame = CGRectMake(horizontalBordersOffset,
-                                                  CGRectGetHeight(self.bounds) - subtitleLabelBottomOffset - CGRectGetHeight(self.subtitleLabel.bounds),
-                                                  CGRectGetWidth(self.bounds) - dateLabelWidth - 2 * horizontalBordersOffset,
-                                                  CGRectGetHeight(self.subtitleLabel.bounds))
+            self.subtitleLabel.frame = CGRect( origin: CGPoint(x: horizontalBordersOffset,
+                                                               y: self.bounds.height - subtitleLabelBottomOffset - self.subtitleLabel.bounds.height ),
+                                                 size: CGSize(width: self.bounds.width - dateLabelWidth - 2 * horizontalBordersOffset,
+                                                               height: self.subtitleLabel.bounds.height))
 
-            self.dateLabel.frame     = CGRectMake(CGRectGetWidth(self.bounds) - dateLabelWidth - horizontalBordersOffset,
-                                                  titleLabelTopOffset,
-                                                  dateLabelWidth,
-                                                  CGRectGetHeight(self.dateLabel.bounds) )
+            self.dateLabel.frame     = CGRect( origin: CGPoint(x: self.bounds.width - dateLabelWidth - horizontalBordersOffset,
+                                                               y: titleLabelTopOffset ),
+                                                  size: CGSize(width:  dateLabelWidth,
+                                                               height: self.dateLabel.bounds.height ))
         }
     }
 }

Example/SRC/VideoCollectionViewCell.swift

@@ -20,29 +20,29 @@ class VideoCollectionViewCell: UICollectionViewCell {
             guard let videoSource = videoSource else {
                 return
             }
-            self.timeLabel.text = self.stringWithTime(videoSource.duration)
+            self.timeLabel.text = self.stringWithTime(time: videoSource.duration)
             self.timeLabelContainer.layer.cornerRadius = self.timeLabelContainer.bounds.size.height/2;
 
 
-            imageManager.requestImageForAsset(videoSource, targetSize:self.bounds.size, contentMode:.AspectFill, options:nil, resultHandler: {result, _ in
+            imageManager.requestImage(for: videoSource, targetSize:self.bounds.size, contentMode:.aspectFill, options:nil, resultHandler: {result, _ in
                     self.imageView.image = result;
             })
         }
     }
 
-    func stringWithTime(time:NSTimeInterval) -> String {
-        var seconds = time;
+    func stringWithTime(time:TimeInterval) -> String {
+        var seconds = time.int;
         var minutes = seconds/60;
         seconds = seconds%60;
         let hours = minutes/60;
         minutes = minutes%60;
 
         if hours > 0 {
-            return String(format: "%d:%02d:%02d", Int(hours), Int(minutes), Int(seconds));
+            return String(format: "%d:%d:%d", hours, minutes, seconds);
         } else if minutes > 0 {
-            return String(format:"%d:%02d", Int(minutes), Int(seconds));
+            return String(format:"%d:%d", minutes, seconds);
         } else {
-            return String(format:"0:%02d", Int(seconds));
+            return String(format:"0:%d", seconds);
         }
     }
 }

Example/SRC/VideoCollectionViewController.swift

@@ -12,16 +12,16 @@ import Photos
 @objc
 class VideoCollectionViewController: UICollectionViewController {
 
-    var assetsFetchResults: [PHFetchResult] = []
+    var assetsFetchResults: [PHFetchResult] = [PHFetchResult<AnyObject>]()
     var moments: [PHAssetCollection]        = []
 
     var userAlbumsFetchPredicate       = NSPredicate(format: "estimatedAssetCount > 0")
     var userAlbumsFetchSortDescriptors = [NSSortDescriptor(key: "startDate", ascending: false)]
-    var inAlbumItemsFetchPredicate     = NSPredicate(format: "mediaType == %d", PHAssetMediaType.Video.rawValue)
+    var inAlbumItemsFetchPredicate     = NSPredicate(format: "mediaType == %d", PHAssetMediaType.video.rawValue)
 
     var selectedSnapshotView: UIView?
 
-    private struct Constants {
+    fileprivate struct Constants {
         static let collectionViewCellReuseId = "video_collection_view_cell"
         static let collectionHeaderReuseId   = "video_collection_view_header"
         static let collectionFooterReuseId   = "FooterView"
@@ -44,11 +44,11 @@ class VideoCollectionViewController: UICollectionViewController {
     // MARK: - Constuctor/Destructor
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        PHPhotoLibrary.sharedPhotoLibrary().registerChangeObserver(self)
+        PHPhotoLibrary.shared().register(self)
     }
 
     deinit{
-        PHPhotoLibrary.sharedPhotoLibrary().unregisterChangeObserver(self)
+        PHPhotoLibrary.shared().unregisterChangeObserver(self)
     }
 
     // MARK: - View Controller Lifetime
@@ -57,10 +57,10 @@ class VideoCollectionViewController: UICollectionViewController {
 
         // Hide nav bar bottom line
         let navBarHairlineImageView: UIImageView? = navigationController?.barHairlineImageView()
-        navBarHairlineImageView?.hidden           = true;
+        navBarHairlineImageView?.isHidden           = true;
     }
 
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         clearApplicationTmpDirectory()
 
@@ -74,17 +74,17 @@ class VideoCollectionViewController: UICollectionViewController {
 
 // MARK: - UICollectionViewDataSource
 extension VideoCollectionViewController {
-    override func numberOfSectionsInCollectionView(collectionView: UICollectionView) -> Int {
+    override func numberOfSections(in collectionView: UICollectionView) -> Int {
         return assetsFetchResults.count
     }
 
-    override func collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+    override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return assetsFetchResults[section].count
     }
 
-    override func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {
+    override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
 
-        let cell = collectionView.dequeueReusableCellWithReuseIdentifier(Constants.collectionViewCellReuseId, forIndexPath:indexPath)
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: Constants.collectionViewCellReuseId, for:indexPath)
 
         if let cell = cell as? VideoCollectionViewCell,
             let asset = self.assetsFetchResults[indexPath.section][indexPath.row] as? PHAsset {
@@ -96,14 +96,14 @@ extension VideoCollectionViewController {
         return cell
     }
 
-    override func collectionView(collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, atIndexPath indexPath: NSIndexPath) -> UICollectionReusableView {
+    override func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
 
-        let reuseId = Constants.collectionSupplementaryElementReuseIdForKind(kind)
-        let reusableView = collectionView.dequeueReusableSupplementaryViewOfKind(kind, withReuseIdentifier: reuseId, forIndexPath: indexPath)
+        let reuseId = Constants.collectionSupplementaryElementReuseIdForKind(kind: kind)
+        let reusableView = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: reuseId, for: indexPath)
 
         switch (kind, reusableView) {
         case (UICollectionElementKindSectionHeader, let headerView as VideoCollectionReusableView):
-            headerView.configureWithCollection(self.moments[indexPath.section])
+            headerView.configureWithCollection(collection: self.moments[indexPath.section])
         case (UICollectionElementKindSectionFooter, _): ()
         default:
             fatalError()
@@ -119,20 +119,20 @@ extension VideoCollectionViewController: UICollectionViewDelegateFlowLayout {
     func collectionView(collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAtIndexPath indexPath: NSIndexPath) -> CGSize {
 
         let count = floor(self.view.bounds.width/Constants.preview_width);
-        let width = CGRectGetWidth(self.view.bounds)/count;
-        return CGSizeMake(width, Constants.preview_height);
+        let width = self.view.bounds.width/count;
+        return CGSize(width: width,height: Constants.preview_height);
     }
 
     func collectionView(collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAtIndex section: Int) -> UIEdgeInsets {
-        return UIEdgeInsetsZero
+        return .zero
     }
 }
 
 // MARK: - Navigation/Transition
 extension VideoCollectionViewController {
 
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
-        let controller     = segue.destinationViewController as! ViewController
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        let controller     = segue.destination as! ViewController
         let cell           = sender as! VideoCollectionViewCell
         controller.phAsset = cell.videoSource
     }
@@ -143,30 +143,28 @@ extension VideoCollectionViewController {
 extension VideoCollectionViewController {
 
     func updateAssetsFetchResultsAndMoments() {
-        var assets  = [PHFetchResult]()
+        var assets  = [PHFetchResult<AnyObject>]()
         var moments = [PHAssetCollection]()
 
         let userAlbumsFetchOptions             = PHFetchOptions()
         userAlbumsFetchOptions.predicate       = userAlbumsFetchPredicate
         userAlbumsFetchOptions.sortDescriptors = userAlbumsFetchSortDescriptors
 
-        let userAlbumsFetchResult = PHAssetCollection.fetchMomentsWithOptions(userAlbumsFetchOptions)
+        let userAlbumsFetchResult = PHAssetCollection.fetchMoments(with: userAlbumsFetchOptions)
 
         let inAlbumItemsFetchOptions       = PHFetchOptions()
         inAlbumItemsFetchOptions.predicate = inAlbumItemsFetchPredicate
 
-        userAlbumsFetchResult.enumerateObjectsUsingBlock { (collection, _, _) -> Void in
-            guard let collection = collection as? PHAssetCollection else {
-                return
-            }
+
+        userAlbumsFetchResult.enumerateObjects ({ (collection, _, _) -> Void in
 
-            let assetsFetchResult = PHAsset.fetchAssetsInAssetCollection(collection, options: inAlbumItemsFetchOptions)
+            let assetsFetchResult = PHAsset.fetchAssets(in: collection, options: inAlbumItemsFetchOptions)
 
             if assetsFetchResult.count > 0 {
-                assets.append(assetsFetchResult)
+                assets.append(assetsFetchResult as! PHFetchResult<AnyObject>)
                 moments.append(collection)
             }
-        }
+        })
 
         self.moments            = moments
         self.assetsFetchResults = assets
@@ -176,20 +174,21 @@ extension VideoCollectionViewController {
 
 // MARK: - View Controller Auto Rotation
 extension VideoCollectionViewController {
-    override func shouldAutorotate() -> Bool {
+
+    override var shouldAutorotate: Bool {
         return false
     }
 
-    override func supportedInterfaceOrientations() -> UIInterfaceOrientationMask {
-        return .Portrait
+    override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
+        return .portrait
     }
 }
 
 
 // MARK: - PHPhotoLibraryChangeObserver
 extension VideoCollectionViewController: PHPhotoLibraryChangeObserver {
-    func photoLibraryDidChange(changeInstance: PHChange) {
-        dispatch_async(dispatch_get_main_queue()) { () -> Void in
+    func photoLibraryDidChange(_ changeInstance: PHChange) {
+        DispatchQueue.main.async { () -> Void in
             self.updateAssetsFetchResultsAndMoments()
             self.collectionView?.reloadData()
         }
@@ -208,9 +207,9 @@ extension UINavigationController {
 
 // MARK: - UIView ex
 extension UIView {
-    func findSubview<T: UIView>(predicate: (T) -> (Bool)) -> T? {
+    func findSubview<T: UIView>(_ predicate: (T) -> (Bool)) -> T? {
 
-        if let self_ = self as? T where predicate(self_) {
+        if let self_ = self as? T , predicate(self_) {
             return self_
         }
 
@@ -226,10 +225,10 @@ extension UIView {
 // MARK: - Utility
 func clearApplicationTmpDirectory() {
     do {
-        let tmpDirectoryContent = try NSFileManager.defaultManager().contentsOfDirectoryAtPath(NSTemporaryDirectory())
+        let tmpDirectoryContent = try FileManager.default.contentsOfDirectory(atPath: NSTemporaryDirectory())
         for file in tmpDirectoryContent {
             let filePath = NSTemporaryDirectory() + file
-            try NSFileManager.defaultManager().removeItemAtPath(filePath)
+            try FileManager.default.removeItem(atPath: filePath)
         }
     } catch (let error) {
         print("\(#function), catched error:\(error)")