Skip to content

Support for landscape mode, device orientation changes and frame size changes #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Looking4Cache wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Support for landscape mode, device orientation changes and frame size changes #25

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02d5762
focusImageView: Use the frame of the QRScannerView instead of the mai…
Nov 8, 2020
73bfd54
Support for device orientation changes
Nov 22, 2020
046ae9c
focusView adaptive to landscape mode
Nov 22, 2020
2adf699
Resize subviews on frame change
Nov 22, 2020
04abce1
Merge from mercari
Nov 22, 2020
a6cf77d
Merge branch 'master' of github.com:mercari/QRScanner
Mar 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 35 additions & 2 deletions QRScanner/QRScannerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ public class QRScannerView: UIView {
addPreviewLayer()
setupBlurEffectView()
setupImageViews()

NotificationCenter.default.addObserver(self, selector: #selector(updatePreviewLayerForDeviceOrientation), name: UIDevice.orientationDidChangeNotification, object: nil)
}

public func startRunning() {
Expand Down Expand Up @@ -126,6 +128,19 @@ public class QRScannerView: UIView {
videoDevice.unlockForConfiguration()
}

public override var frame: CGRect {
willSet {
}
didSet {
if oldValue.size.width != frame.size.width || oldValue.size.height != frame.size.height {
focusImageView.removeFromSuperview()
qrCodeImageView.removeFromSuperview()
setupImageViews()
self.previewLayer?.frame = self.bounds
}
}
}

deinit {
setTorchActive(isOn: false)
focusImageView.removeFromSuperview()
Expand All @@ -134,6 +149,7 @@ public class QRScannerView: UIView {
session.outputs.forEach { session.removeOutput($0) }
removePreviewLayer()
torchActiveObservation = nil
NotificationCenter.default.removeObserver(self, name: UIDevice.orientationDidChangeNotification, object: nil)
}

// MARK: - Private
Expand Down Expand Up @@ -246,8 +262,8 @@ public class QRScannerView: UIView {
}

private func setupImageViews() {
let width = self.bounds.width * 0.618
let x = self.bounds.width * 0.191
let width = min(self.bounds.width, self.bounds.height) * 0.618
let x = (self.bounds.width > self.bounds.height) ? (self.bounds.width - width) / 2 : self.bounds.width * 0.191
let y = self.bounds.height * 0.191
focusImageView = UIImageView(frame: CGRect(x: x, y: y, width: width, height: width))
focusImageView.image = focusImage ?? UIImage(named: "scan_qr_focus", in: .module, compatibleWith: nil)
Expand All @@ -265,6 +281,23 @@ public class QRScannerView: UIView {
layer.addSublayer(previewLayer)

self.previewLayer = previewLayer

updatePreviewLayerForDeviceOrientation()
}

@objc private func updatePreviewLayerForDeviceOrientation() {
var videoOrientation: AVCaptureVideoOrientation
switch UIDevice.current.orientation {
case .landscapeLeft:
videoOrientation = .landscapeRight
case .landscapeRight:
videoOrientation = .landscapeLeft
case .portraitUpsideDown:
videoOrientation = .portraitUpsideDown
default:
videoOrientation = .portrait
}
self.previewLayer?.connection?.videoOrientation = videoOrientation
}

private func removePreviewLayer() {
Expand Down