Merge pull request #31 from tapwork/allows_all_orientation_fixes_layouting

Allows all orientation & fixes layouting

Author: onmyway133

Sources/BarcodeScannerController.swift

@@ -203,14 +203,6 @@ open class BarcodeScannerController: UIViewController {
       object: nil)
   }
 
-  open override func viewWillAppear(_ animated: Bool) {
-    super.viewWillAppear(animated)
-
-    setupFrames()
-    infoView.setupFrames()
-    headerView.isHidden = !isBeingPresented
-  }
-
   open override func viewDidAppear(_ animated: Bool) {
     super.viewDidAppear(animated)
     animateFocusView()
@@ -268,7 +260,7 @@ open class BarcodeScannerController: UIViewController {
     output.metadataObjectTypes = metadata
     videoPreviewLayer?.session = captureSession
 
-    setupFrames()
+    view.setNeedsLayout()
   }
 
   // MARK: - Reset
@@ -310,25 +302,30 @@ open class BarcodeScannerController: UIViewController {
   }
 
   // MARK: - Layout
+  open override func viewWillLayoutSubviews() {
+    super.viewWillLayoutSubviews()
 
-  /**
-   Sets frames of the subviews.
-   */
-  func setupFrames() {
     headerView.frame = CGRect(x: 0, y: 0, width: view.frame.width, height: 64)
     flashButton.frame = CGRect(x: view.frame.width - 50, y: 73, width: 37, height: 37)
     infoView.frame = infoFrame
 
     if let videoPreviewLayer = videoPreviewLayer {
       videoPreviewLayer.frame = view.layer.bounds
-
-      if videoPreviewLayer.connection != nil {
-        videoPreviewLayer.connection.videoOrientation = .portrait
+      if let connection = videoPreviewLayer.connection, connection.isVideoOrientationSupported {
+        switch (UIApplication.shared.statusBarOrientation) {
+        case .portrait: connection.videoOrientation = .portrait
+        case .landscapeRight: connection.videoOrientation = .landscapeRight
+        case .landscapeLeft: connection.videoOrientation = .landscapeLeft
+        case .portraitUpsideDown: connection.videoOrientation = .portraitUpsideDown
+        default: connection.videoOrientation = .portrait
+        }
       }
     }
 
     center(subview: focusView, inSize: CGSize(width: 218, height: 150))
     center(subview: settingsButton, inSize: CGSize(width: 150, height: 50))
+
+    headerView.isHidden = !isBeingPresented
   }
 
   /**
@@ -345,12 +342,6 @@ open class BarcodeScannerController: UIViewController {
       height: size.height)
   }
 
-  // MARK: - Orientation
-
-  open override var supportedInterfaceOrientations : UIInterfaceOrientationMask {
-    return .portrait
-  }
-
   // MARK: - Animations
 
   /**
@@ -386,13 +377,13 @@ open class BarcodeScannerController: UIViewController {
     focusView.layer.removeAllAnimations()
     focusView.isHidden = false
 
-    setupFrames()
-
     UIView.animate(withDuration: 1.0, delay:0,
       options: [.repeat, .autoreverse, .beginFromCurrentState],
       animations: {
         self.center(subview: self.focusView, inSize: CGSize(width: 280, height: 80))
       }, completion: nil)
+
+    view.setNeedsLayout()
   }
 
   // MARK: - Actions

Sources/InfoView.swift

@@ -36,7 +36,7 @@ class InfoView: UIVisualEffectView {
    */
   var status: Status = Status(state: .scanning) {
     didSet {
-      setupFrames()
+      setNeedsLayout()
 
       let stateStyles = status.state.styles
 
@@ -79,7 +79,9 @@ class InfoView: UIVisualEffectView {
   /**
    Sets up frames of subviews.
    */
-  func setupFrames() {
+  override func layoutSubviews() {
+    super.layoutSubviews()
+
     let padding: CGFloat = 10
     let labelHeight: CGFloat = 40
     let imageSize = CGSize(width: 30, height: 27)
@@ -127,7 +129,7 @@ class InfoView: UIVisualEffectView {
     borderView.isHidden = false
 
     animate(blurStyle: .light)
-    animate(borderViewAngle: CGFloat(M_PI_2))
+    animate(borderViewAngle: CGFloat(Double.pi/2))
   }
 
   /**
@@ -164,7 +166,7 @@ class InfoView: UIVisualEffectView {
       animations: {
         self.borderView.transform = CGAffineTransform(rotationAngle: borderViewAngle)
       }, completion: { [weak self] _ in
-        self?.animate(borderViewAngle: borderViewAngle + CGFloat(M_PI_2))
+        self?.animate(borderViewAngle: borderViewAngle + CGFloat(Double.pi/2))
     })
   }
 }