Fixed issues in iPad landscape

.travis.yml

@@ -3,7 +3,6 @@ language: objective-c
 
 before_install:
 - brew update
-#- brew install carthage
 - if brew outdated | grep -qx xctool; then brew upgrade xctool; fi
 
 script:

Source/CameraView/CameraView.swift

@@ -96,6 +96,11 @@ class CameraView: UIViewController {
       view.addSubview($0)
     }
   }
+
+  override func viewDidAppear(animated: Bool) {
+    super.viewDidAppear(animated)
+    setCorrectOrientationToPreviewLayer()
+  }
 
   // MARK: - Layout
 
@@ -233,21 +238,18 @@ class CameraView: UIViewController {
 
     let queue = dispatch_queue_create("session queue", DISPATCH_QUEUE_SERIAL)
 
+    guard let stillImageOutput = self.stillImageOutput else { return }
+
     if let videoOrientation = previewLayer?.connection.videoOrientation {
-      stillImageOutput?.connectionWithMediaType(AVMediaTypeVideo).videoOrientation = videoOrientation
+        stillImageOutput.connectionWithMediaType(AVMediaTypeVideo).videoOrientation = videoOrientation
     }
 
-    guard let stillImageOutput = self.stillImageOutput else { return }
-
     dispatch_async(queue, { [unowned self] in
       stillImageOutput.captureStillImageAsynchronouslyFromConnection(stillImageOutput.connectionWithMediaType(AVMediaTypeVideo),
         completionHandler: { (buffer, error) -> Void in
           let imageData = AVCaptureStillImageOutput.jpegStillImageNSDataRepresentation(buffer)
           guard let imageFromData = UIImage(data: imageData) else { return }
-          let image = self.cropImage(imageFromData)
-          let orientation = self.pictureOrientation()
-          guard let imageCG = image.CGImage else { return }
-          UIImageWriteToSavedPhotosAlbum(UIImage(CGImage: imageCG, scale: 1.0, orientation: orientation), self, "saveImage:error:context:", nil)
+          UIImageWriteToSavedPhotosAlbum(imageFromData, self, "saveImage:error:context:", nil)
       })
       })
   }
@@ -256,27 +258,6 @@ class CameraView: UIViewController {
     delegate?.imageToLibrary()
   }
 
-  func cropImage(image: UIImage) -> UIImage {
-    guard let imageReference = CGImageCreateWithImageInRect(image.CGImage,
-      CGRect(x: 0, y: 0, width: image.size.height - 285, height: image.size.width)) else { return UIImage() }
-    let normalizedImage = UIImage(CGImage: imageReference, scale: 1, orientation: .Right)
-
-    return normalizedImage
-  }
-
-  func pictureOrientation() -> UIImageOrientation {
-    switch UIDevice.currentDevice().orientation {
-    case .LandscapeLeft:
-      return .Up
-    case .LandscapeRight:
-      return .Down
-    case .PortraitUpsideDown:
-      return .Left
-    default:
-      return .Right
-    }
-  }
-
   // MARK: - Timer methods
 
   func timerDidFire() {
@@ -380,12 +361,15 @@ class CameraView: UIViewController {
   override func viewWillTransitionToSize(size: CGSize, withTransitionCoordinator coordinator: UIViewControllerTransitionCoordinator) {
     super.viewWillTransitionToSize(size, withTransitionCoordinator: coordinator)
 
+    previewLayer?.frame.size = size
+    setCorrectOrientationToPreviewLayer()
+  }
+
+  func setCorrectOrientationToPreviewLayer() {
     guard let previewLayer = self.previewLayer,
       connection = previewLayer.connection
       else { return }
-
-    previewLayer.frame.size = size
-
+
     switch UIDevice.currentDevice().orientation {
     case .Portrait:
       connection.videoOrientation = .Portrait

Source/Configuration.swift

@@ -30,4 +30,8 @@ public struct Configuration {
   // MARK: Dimensions
 
   public static var cellSpacing: CGFloat = 2
+
+  // MARK: Custom behaviour
+
+    public static var collapseCollectionViewWhileShot: Bool = true
 }

Source/ImageGallery/ImageGalleryView.swift

@@ -125,6 +125,7 @@ public class ImageGalleryView: UIView {
     collectionView.delegate = self
 
     topSeparator.frame = CGRect(x: 0, y: 0, width: totalWidth, height: Dimensions.galleryBarHeight)
+    topSeparator.autoresizingMask = [.FlexibleLeftMargin, .FlexibleRightMargin]
     indicator.frame = CGRect(x: (totalWidth - Dimensions.indicatorWidth) / 2, y: (topSeparator.frame.height - Dimensions.indicatorHeight) / 2,
       width: Dimensions.indicatorWidth, height: Dimensions.indicatorHeight)
     collectionView.frame = CGRect(x: 0, y: topSeparator.frame.height, width: totalWidth, height: collectionFrame - topSeparator.frame.height)

Source/ImagePickerController.swift

@@ -72,7 +72,7 @@ public class ImagePickerController: UIViewController {
   public weak var delegate: ImagePickerDelegate?
   public var stack = ImageStack()
   public var imageLimit = 0
-  let totalSize = UIScreen.mainScreen().bounds.size
+  var totalSize: CGSize { return UIScreen.mainScreen().bounds.size }
   var initialFrame: CGRect?
   var initialContentOffset: CGPoint?
   var numberOfCells: Int?
@@ -188,6 +188,15 @@ public class ImagePickerController: UIViewController {
 
   // MARK: - Helpers
 
+  public override func viewWillLayoutSubviews() {
+    super.viewWillLayoutSubviews()
+
+    let galleryHeight: CGFloat = UIScreen.mainScreen().nativeBounds.height == 960
+            ? ImageGalleryView.Dimensions.galleryBarHeight : GestureConstants.minimumHeight
+    galleryView.frame = CGRectMake(0, totalSize.height - bottomContainer.frame.height - galleryHeight,
+            totalSize.width, galleryHeight)
+  }
+
   public override func prefersStatusBarHidden() -> Bool {
     return true
   }
@@ -257,8 +266,15 @@ extension ImagePickerController: BottomContainerViewDelegate {
 
     bottomContainer.pickerButton.enabled = false
     bottomContainer.stackView.startLoader()
-    collapseGalleryView { [unowned self] in
-      self.cameraController.takePicture()
+    let action: Void -> Void = { [unowned self] in
+              self.cameraController.takePicture()
+            }
+
+    if Configuration.collapseCollectionViewWhileShot {
+        collapseGalleryView(action)
+    }
+    else {
+        action()
     }
   }