Merge pull request #84 from hyperoslo/fix/bar

Fix title and button on navigation bar in iOS 10

Author: onmyway133

Sources/BarcodeScannerController.swift

@@ -204,13 +204,16 @@ open class BarcodeScannerController: UIViewController {
     // navigationBar
     let item = UINavigationItem()
     let closeButton = HeaderElement.makeCloseButton()
+    closeButton.sizeToFit()
     closeButton.addTarget(
       self,
       action: #selector(closeButtonDidTouched),
       for: .touchUpInside
     )
     item.leftBarButtonItem = UIBarButtonItem(customView: closeButton)
-    item.titleView = HeaderElement.makeLabel()
+    let label = HeaderElement.makeLabel()
+    label.sizeToFit()
+    item.titleView = label
 
     navigationBar.isTranslucent = false
     navigationBar.delegate = self
@@ -224,15 +227,18 @@ open class BarcodeScannerController: UIViewController {
     if #available(iOS 11, *) {
       navigationBar.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor).isActive = true
     } else {
-      navigationBar.topAnchor.constraint(equalTo: view.topAnchor).isActive = true
+      navigationBar.topAnchor.constraint(
+        equalTo: topLayoutGuide.bottomAnchor).isActive = true
     }
   }
 
   open override func viewWillAppear(_ animated: Bool) {
     super.viewWillAppear(animated)
 
     if navigationController != nil {
-      navigationItem.titleView = HeaderElement.makeLabel()
+      let label = HeaderElement.makeLabel()
+      label.sizeToFit()
+      navigationItem.titleView = label
       navigationBar.isHidden = true
     } else {
       navigationBar.isHidden = false