Merge pull request lbrndnr#73 from colinta/cg/compile-times

Decrease compile times

Author: colinta

ImagePickerSheetController/ImagePickerSheetController/ImagePickerSheetController.swift

@@ -316,16 +316,25 @@ public class ImagePickerSheetController: UIViewController {
         let maxHeight: CGFloat = 400
         let maxImageWidth = sheetController.preferredSheetWidth - 2 * previewCollectionViewInset
 
-        let assetRatios = assets.map { CGSize(width: max($0.pixelHeight, $0.pixelWidth), height: min($0.pixelHeight, $0.pixelWidth)) }
-                                .map { $0.height / $0.width }
-            
-        let assetHeights = assetRatios.map { $0 * maxImageWidth }
-                                      .filter { $0 < maxImageWidth && $0 < maxHeight } // Make sure the preview isn't too high eg for squares
+        let assetRatios = assets.map { (asset: PHAsset) -> CGSize in
+                CGSize(width: max(asset.pixelHeight, asset.pixelWidth), height: min(asset.pixelHeight, asset.pixelWidth))
+            }.map { (size: CGSize) -> CGFloat in
+                size.height / size.width
+            }
+
+        let assetHeights = assetRatios.map { (ratio: CGFloat) -> CGFloat in ratio * maxImageWidth }
+                                      .filter { (height: CGFloat) -> Bool in height < maxImageWidth && height < maxHeight } // Make sure the preview isn't too high eg for squares
                                       .sort(>)
-        let assetHeight = ceil(assetHeights.first ?? 0)
-        
+        let assetHeight: CGFloat
+        if let first = assetHeights.first {
+            assetHeight = first
+        }
+        else {
+            assetHeight = 0
+        }
+
         // Just a sanity check, to make sure this doesn't exceed 400 points
-        let scaledHeight = max(min(assetHeight, maxHeight), 200)
+        let scaledHeight: CGFloat = max(min(assetHeight, maxHeight), 200)
         maximumPreviewHeight = scaledHeight + 2 * previewCollectionViewInset
     }
 

ImagePickerSheetController/ImagePickerSheetController/Sheet/Preview/PreviewCollectionView.swift

@@ -11,7 +11,9 @@ import UIKit
 class PreviewCollectionView: UICollectionView {
 
     var bouncing: Bool {
-        return contentOffset.x < -contentInset.left || contentOffset.x + frame.width > contentSize.width + contentInset.right
+        if contentOffset.x < -contentInset.left { return true }
+        if contentOffset.x + frame.width > contentSize.width + contentInset.right { return true }
+        return false
     }
 
     var imagePreviewLayout: PreviewCollectionViewLayout {

ImagePickerSheetController/ImagePickerSheetController/Sheet/SheetController.swift

@@ -72,9 +72,9 @@ class SheetController: NSObject {
 
     private func allIndexPaths() -> [NSIndexPath] {
         let s = numberOfSections()
-        return (0 ..< s).map { (self.numberOfItemsInSection($0), $0) }
-                        .flatMap { numberOfItems, section in
-                            (0 ..< numberOfItems).map { NSIndexPath(forItem: $0, inSection: section) }
+        return (0 ..< s).map { (section: Int) -> (Int, Int) in (self.numberOfItemsInSection(section), section) }
+                        .flatMap { (numberOfItems: Int, section: Int) -> [NSIndexPath] in
+                            (0 ..< numberOfItems).map { (item: Int) -> NSIndexPath in NSIndexPath(forItem: item, inSection: section) }
                         }
     }