Merge pull request hyperoslo#91 from hyperoslo/support/rotation

Support rotation
hukuanfu1220 · Jan 19, 2016 · 1512077 · 1512077
2 parents d91d428 + c2485bd
commit 1512077
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 32 deletions.
diff --git a/Demo/ImagePickerDemo/ImagePickerDemo.xcodeproj/project.pbxproj b/Demo/ImagePickerDemo/ImagePickerDemo.xcodeproj/project.pbxproj
@@ -11,11 +11,10 @@
 		29D699E61B70ABFC0021FA73 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29D699E51B70ABFC0021FA73 /* Images.xcassets */; };
 		29D699E91B70ABFC0021FA73 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29D699E71B70ABFC0021FA73 /* LaunchScreen.xib */; };
 		29D699FF1B70ACD50021FA73 /* Podfile in Resources */ = {isa = PBXBuildFile; fileRef = 29D699FE1B70ACD50021FA73 /* Podfile */; };
-		C3771E008DA39CF04754C8A9 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 733A7AD0105A657A80502E72 /* Pods.framework */; };
+		4221AE1F43A643A689082012 /* Pods_ImagePickerDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1148A4E4BFF9A0AAED07754 /* Pods_ImagePickerDemo.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		0F514C1F72DEB3C2416C8948 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
 		29D699D91B70ABFC0021FA73 /* ImagePickerDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ImagePickerDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		29D699DD1B70ABFC0021FA73 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		29D699DE1B70ABFC0021FA73 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -24,16 +23,18 @@
 		29D699F31B70ABFC0021FA73 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		29D699F41B70ABFC0021FA73 /* ImagePickerDemoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePickerDemoTests.swift; sourceTree = "<group>"; };
 		29D699FE1B70ACD50021FA73 /* Podfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Podfile; sourceTree = "<group>"; };
-		51FD9E3875E02B0489658272 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
+		6F9E1FF802198DC16F260795 /* Pods-ImagePickerDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImagePickerDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-ImagePickerDemo/Pods-ImagePickerDemo.release.xcconfig"; sourceTree = "<group>"; };
 		733A7AD0105A657A80502E72 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		C4392341AC7391C01AD9F350 /* Pods-ImagePickerDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImagePickerDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ImagePickerDemo/Pods-ImagePickerDemo.debug.xcconfig"; sourceTree = "<group>"; };
+		F1148A4E4BFF9A0AAED07754 /* Pods_ImagePickerDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ImagePickerDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		29D699D61B70ABFC0021FA73 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C3771E008DA39CF04754C8A9 /* Pods.framework in Frameworks */,
+				4221AE1F43A643A689082012 /* Pods_ImagePickerDemo.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -46,8 +47,8 @@
 				29D699DB1B70ABFC0021FA73 /* ImagePickerDemo */,
 				29D699F11B70ABFC0021FA73 /* ImagePickerDemoTests */,
 				29D699DA1B70ABFC0021FA73 /* Products */,
-				9B7B7FC28B6848049E4EBD4D /* Pods */,
 				DD112158CF9886DE925FED5E /* Frameworks */,
+				A067DFAD5749963FA2D2ADED /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -96,11 +97,11 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		9B7B7FC28B6848049E4EBD4D /* Pods */ = {
+		A067DFAD5749963FA2D2ADED /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				51FD9E3875E02B0489658272 /* Pods.debug.xcconfig */,
-				0F514C1F72DEB3C2416C8948 /* Pods.release.xcconfig */,
+				C4392341AC7391C01AD9F350 /* Pods-ImagePickerDemo.debug.xcconfig */,
+				6F9E1FF802198DC16F260795 /* Pods-ImagePickerDemo.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
@@ -109,6 +110,7 @@
 			isa = PBXGroup;
 			children = (
 				733A7AD0105A657A80502E72 /* Pods.framework */,
+				F1148A4E4BFF9A0AAED07754 /* Pods_ImagePickerDemo.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -120,12 +122,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 29D699F81B70ABFC0021FA73 /* Build configuration list for PBXNativeTarget "ImagePickerDemo" */;
 			buildPhases = (
-				358AC00AD9C2C2AC8AA41FA2 /* Check Pods Manifest.lock */,
+				CFC24DB54992EE46F3A63C6F /* Check Pods Manifest.lock */,
 				29D699D51B70ABFC0021FA73 /* Sources */,
 				29D699D61B70ABFC0021FA73 /* Frameworks */,
 				29D699D71B70ABFC0021FA73 /* Resources */,
-				8182353F8374CFF768DC72C0 /* Embed Pods Frameworks */,
-				F181B235D97DB7806C445532 /* Copy Pods Resources */,
+				A0BD0958A43D0416D3FF9365 /* Embed Pods Frameworks */,
+				6821C4AC157C46704C0307CA /* Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -184,22 +186,22 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		358AC00AD9C2C2AC8AA41FA2 /* Check Pods Manifest.lock */ = {
+		6821C4AC157C46704C0307CA /* Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Check Pods Manifest.lock";
+			name = "Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImagePickerDemo/Pods-ImagePickerDemo-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		8182353F8374CFF768DC72C0 /* Embed Pods Frameworks */ = {
+		A0BD0958A43D0416D3FF9365 /* Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -211,22 +213,22 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImagePickerDemo/Pods-ImagePickerDemo-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		F181B235D97DB7806C445532 /* Copy Pods Resources */ = {
+		CFC24DB54992EE46F3A63C6F /* Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Copy Pods Resources";
+			name = "Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -340,7 +342,7 @@
 		};
 		29D699F91B70ABFC0021FA73 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 51FD9E3875E02B0489658272 /* Pods.debug.xcconfig */;
+			baseConfigurationReference = C4392341AC7391C01AD9F350 /* Pods-ImagePickerDemo.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -354,7 +356,7 @@
 		};
 		29D699FA1B70ABFC0021FA73 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0F514C1F72DEB3C2416C8948 /* Pods.release.xcconfig */;
+			baseConfigurationReference = 6F9E1FF802198DC16F260795 /* Pods-ImagePickerDemo.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";

diff --git a/Demo/ImagePickerDemo/ImagePickerDemo/Info.plist b/Demo/ImagePickerDemo/ImagePickerDemo/Info.plist
@@ -33,6 +33,9 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>

diff --git a/Demo/ImagePickerDemo/Podfile b/Demo/ImagePickerDemo/Podfile
@@ -3,4 +3,6 @@ platform :ios, '8.0'
 use_frameworks!
 inhibit_all_warnings!
 
-pod 'ImagePicker', path: '../../'
+target "ImagePickerDemo" do
+  pod 'ImagePicker', path: '../../'
+end
diff --git a/Demo/ImagePickerDemo/Podfile.lock b/Demo/ImagePickerDemo/Podfile.lock
@@ -6,9 +6,11 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   ImagePicker:
-    :path: ../../
+    :path: "../../"
 
 SPEC CHECKSUMS:
   ImagePicker: 2a904341bbc47c96457de00558d2f8dd186eff7c
 
-COCOAPODS: 0.39.0
+PODFILE CHECKSUM: ebbcd890a98cb01cb66183bea63d5e8e97f82923
+
+COCOAPODS: 1.0.0.beta.2
diff --git a/Source/CameraView/CameraView.swift b/Source/CameraView/CameraView.swift
@@ -13,7 +13,6 @@ class CameraView: UIViewController {
   lazy var blurView: UIVisualEffectView = { [unowned self] in
     let effect = UIBlurEffect(style: .Dark)
     let blurView = UIVisualEffectView(effect: effect)
-    self.containerView.addSubview(blurView)
 
     return blurView
     }()
@@ -24,7 +23,6 @@ class CameraView: UIViewController {
     imageView.backgroundColor = .clearColor()
     imageView.frame = CGRectMake(0, 0, 110, 110)
     imageView.alpha = 0
-    self.view.addSubview(imageView)
 
     return imageView
     }()
@@ -33,7 +31,6 @@ class CameraView: UIViewController {
     let view = UIView()
     view.backgroundColor = .blackColor()
     view.alpha = 0
-    self.view.addSubview(view)
 
     return view
     }()
@@ -93,6 +90,11 @@ class CameraView: UIViewController {
 
     view.backgroundColor = Configuration.mainColor
     previewLayer?.backgroundColor = Configuration.mainColor.CGColor
+
+    containerView.addSubview(blurView)
+    [focusImageView, capturedImageView].forEach {
+      view.addSubview($0)
+    }
   }
 
   // MARK: - Layout
@@ -374,4 +376,27 @@ class CameraView: UIViewController {
 
     return image
   }
+
+  override func viewWillTransitionToSize(size: CGSize, withTransitionCoordinator coordinator: UIViewControllerTransitionCoordinator) {
+    super.viewWillTransitionToSize(size, withTransitionCoordinator: coordinator)
+
+    guard let previewLayer = self.previewLayer,
+      connection = previewLayer.connection
+      else { return }
+
+    previewLayer.frame.size = size
+
+    switch UIDevice.currentDevice().orientation {
+    case .Portrait:
+      connection.videoOrientation = .Portrait
+    case .LandscapeLeft:
+      connection.videoOrientation = .LandscapeRight
+    case .LandscapeRight:
+      connection.videoOrientation = .LandscapeLeft
+    case .PortraitUpsideDown:
+      connection.videoOrientation = .PortraitUpsideDown
+    default:
+      break
+    }
+  }
 }
diff --git a/Source/Extensions/ConstraintsSetup.swift b/Source/Extensions/ConstraintsSetup.swift
@@ -111,10 +111,6 @@ extension ImagePickerController {
       view.addConstraint(NSLayoutConstraint(item: cameraController.view, attribute: attribute,
         relatedBy: .Equal, toItem: view, attribute: attribute,
         multiplier: 1, constant: 0))
-
-      view.addConstraint(NSLayoutConstraint(item: cameraController.view, attribute: attribute,
-        relatedBy: .Equal, toItem: view, attribute: attribute,
-        multiplier: 1, constant: 0))
     }
 
     for attribute in topViewAttributes {

diff --git a/Source/ImagePickerController.swift b/Source/ImagePickerController.swift
@@ -220,7 +220,7 @@ extension ImagePickerController: BottomContainerViewDelegate {
 
   func pickerButtonDidPress() {
     guard imageLimit == 0 || imageLimit > galleryView.selectedStack.assets.count else { return }
-    
+
     bottomContainer.pickerButton.enabled = false
     bottomContainer.stackView.startLoader()
     collapseGalleryView { [unowned self] in
@@ -367,4 +367,10 @@ extension ImagePickerController: ImageGalleryPanGestureDelegate {
       collapseGalleryView(nil)
     }
   }
+
+  override public func viewWillTransitionToSize(size: CGSize, withTransitionCoordinator coordinator: UIViewControllerTransitionCoordinator) {
+    super.viewWillTransitionToSize(size, withTransitionCoordinator: coordinator)
+
+    cameraController.viewWillTransitionToSize(size, withTransitionCoordinator: coordinator)
+  }
 }