Merge pull request #52 from icefall/bugfix-screen-orientation

Bugfix screen orientation + change number of lines of InfoLabel

Author: vadymmarkov

Sources/BarcodeScannerController.swift

@@ -207,7 +207,6 @@ open class BarcodeScannerController: UIViewController {
 
   open override func viewWillAppear(_ animated: Bool) {
     super.viewWillAppear(animated)
-    setupFrame()
 
     headerView.isHidden = !isBeingPresented
   }
@@ -216,6 +215,16 @@ open class BarcodeScannerController: UIViewController {
     super.viewDidAppear(animated)
     animateFocusView()
   }
+  
+  open override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+    super.viewWillTransition(to: size, with: coordinator)
+    coordinator.animate(alongsideTransition: { (context) in
+      self.setupFrame()
+    }) { (context) in
+      self.focusView.layer.removeAllAnimations()
+      self.animateFocusView()
+    }
+  }
 
   /**
    `UIApplicationWillEnterForegroundNotification` action.
@@ -309,14 +318,13 @@ open class BarcodeScannerController: UIViewController {
     flashButton.alpha = alpha
     settingsButton.isHidden = status.state != .unauthorized
   }
-  
+
   // MARK: - Layout
-  
   func setupFrame() {
     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 let connection = videoPreviewLayer.connection, connection.isVideoOrientationSupported {

Sources/InfoView.swift

@@ -8,7 +8,7 @@ class InfoView: UIVisualEffectView {
   /// Text label.
   lazy var label: UILabel = {
     let label = UILabel()
-    label.numberOfLines = 2
+    label.numberOfLines = 3
 
     return label
   }()