Merge pull request #95 from hyperoslo/fix/setting-button

Fix settings button covered by focus animation
hyperoslo · Jan 30, 2018 · 51acd30 · 51acd30
2 parents bdc0450 + 2bbd61d
commit 51acd30
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/BarcodeScanner.podspec b/BarcodeScanner.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "BarcodeScanner"
   s.summary          = "Simple and beautiful barcode scanner."
-  s.version          = "4.0.0"
+  s.version          = "4.0.1"
   s.homepage         = "https://github.com/hyperoslo/BarcodeScanner"
   s.license          = 'MIT'
   s.author           = { "Hyper Interaktiv AS" => "[email protected]" }

diff --git a/Sources/Controllers/CameraViewController.swift b/Sources/Controllers/CameraViewController.swift
@@ -275,8 +275,11 @@ public final class CameraViewController: UIViewController {
 
   /// Performs focus view animation.
   private func animateFocusView() {
+    // Restore to initial state
     focusView.layer.removeAllAnimations()
-    focusView.isHidden = false
+    animatedFocusViewConstraints.deactivate()
+    regularFocusViewConstraints.activate()
+    view.layoutIfNeeded()
 
     guard barCodeFocusViewType == .animated else {
       return