This repository was archived by the owner on Jan 7, 2026. It is now read-only.
Multi orientation support #185
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -31,4 +31,32 @@ extension CGImagePropertyOrientation { | |||
| self = .right | ||||
| } | ||||
| } | ||||
|
|
||||
| init(deviceOrientation: UIDeviceOrientation) { | ||||
| switch deviceOrientation { | ||||
| case .portrait: self = .up | ||||
|
There was a problem hiding this comment.
|
||||
| case .portraitUpsideDown: self = .down | ||||
|
There was a problem hiding this comment.
|
||||
| case .landscapeLeft: self = .left | ||||
|
There was a problem hiding this comment.
|
||||
| case .landscapeRight: self = .right | ||||
|
There was a problem hiding this comment.
|
||||
| case .unknown: self = .up | ||||
|
There was a problem hiding this comment.
|
||||
| case .faceUp: self = .up | ||||
|
There was a problem hiding this comment.
|
||||
| case .faceDown: self = .up | ||||
|
There was a problem hiding this comment.
|
||||
| @unknown default: | ||||
| assertionFailure("Unknow orientation, falling to default") | ||||
| self = .right | ||||
| } | ||||
| } | ||||
|
|
||||
| init(interfaceOrientation: UIInterfaceOrientation) { | ||||
| switch interfaceOrientation { | ||||
| case .portrait: self = .up | ||||
|
There was a problem hiding this comment.
|
||||
| case .portraitUpsideDown: self = .up | ||||
|
There was a problem hiding this comment.
|
||||
| case .landscapeLeft: self = .left | ||||
|
There was a problem hiding this comment.
|
||||
| case .landscapeRight: self = .right | ||||
|
There was a problem hiding this comment.
|
||||
| case .unknown: self = .up | ||||
|
There was a problem hiding this comment.
|
||||
| @unknown default: | ||||
| assertionFailure("Unknow orientation, falling to default") | ||||
| self = .right | ||||
| } | ||||
| } | ||||
| } | ||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| // | ||
| // UIInterfaceOrientation+Utils.swift | ||
| // WeScan | ||
| // | ||
| // Created by Antoine Harlin on 01/10/2019. | ||
| // Copyright © 2019 WeTransfer. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
| import UIKit | ||
|
|
||
| extension UIInterfaceOrientation { | ||
| var rotationAngle: CGFloat { | ||
| switch self { | ||
| case UIInterfaceOrientation.portrait: | ||
| return CGFloat.pi / 2 | ||
| case UIInterfaceOrientation.portraitUpsideDown: | ||
| return -CGFloat.pi / 2 | ||
| case UIInterfaceOrientation.landscapeLeft: | ||
| return CGFloat.pi | ||
| case UIInterfaceOrientation.landscapeRight: | ||
| return CGFloat.pi * 2 | ||
| default: | ||
| return CGFloat.pi / 2 | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -280,6 +280,7 @@ extension CaptureSessionManager: AVCapturePhotoCaptureDelegate { | |
| /// Completes the image capture by processing the image, and passing it to the delegate object. | ||
| /// This function is necessary because the capture functions for iOS 10 and 11 are decoupled. | ||
| private func completeImageCapture(with imageData: Data) { | ||
| let statusBarOrientation = UIApplication.shared.statusBarOrientation | ||
| DispatchQueue.global(qos: .background).async { [weak self] in | ||
| CaptureSession.current.isEditing = true | ||
| guard let image = UIImage(data: imageData) else { | ||
|
|
@@ -292,29 +293,25 @@ extension CaptureSessionManager: AVCapturePhotoCaptureDelegate { | |
| } | ||
| return | ||
| } | ||
|
|
||
| let floatAngle = statusBarOrientation.rotationAngle + CGFloat.pi | ||
| let angle = Measurement(value: Double(floatAngle), unit: UnitAngle.radians) | ||
| let orientedImage = image.rotated(by: angle) ?? image | ||
| var quad: Quadrilateral? | ||
| if let displayedRectangleResult = self?.displayedRectangleResult { | ||
| quad = self?.displayRectangleResult(rectangleResult: displayedRectangleResult) | ||
| quad = quad?.scale( | ||
| displayedRectangleResult.imageSize, | ||
| orientedImage.size, | ||
| withRotationAngle: statusBarOrientation.rotationAngle | ||
| ) | ||
| } | ||
|
|
||
| DispatchQueue.main.async { | ||
| guard let strongSelf = self else { | ||
| return | ||
| } | ||
| strongSelf.delegate?.captureSessionManager(strongSelf, didCapturePicture: orientedImage, withQuad: quad) | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -102,17 +102,23 @@ final class ScannerViewController: UIViewController { | |||
| navigationController?.navigationBar.sendSubviewToBack(visualEffectView) | ||||
|
|
||||
| navigationController?.navigationBar.barStyle = .blackTranslucent | ||||
|
|
||||
| setupVideoOrientation() | ||||
| setupViewsForCurrentOrientation() | ||||
| } | ||||
|
|
||||
| override func viewDidAppear(_ animated: Bool) { | ||||
| super.viewDidAppear(animated) | ||||
| setupViewsForCurrentOrientation() | ||||
| } | ||||
|
|
||||
| override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) { | ||||
| super.viewWillTransition(to: size, with: coordinator) | ||||
| coordinator.animate(alongsideTransition: { [weak self] (context) in | ||||
|
There was a problem hiding this comment.
|
||||
| self?.setupViewsForCurrentOrientation() | ||||
| }, completion: { [weak self] (_) in | ||||
| self?.setupVideoOrientation() | ||||
| }) | ||||
| } | ||||
|
|
||||
| override func viewWillDisappear(_ animated: Bool) { | ||||
|
|
@@ -140,7 +146,20 @@ final class ScannerViewController: UIViewController { | |||
| view.addSubview(shutterButton) | ||||
| view.addSubview(activityIndicator) | ||||
| } | ||||
|
|
||||
| private func setupViewsForCurrentOrientation() { | ||||
| let statusBarHeight = UIApplication.shared.statusBarFrame.size.height | ||||
| let visualEffectRect = self.navigationController?.navigationBar.bounds.insetBy( | ||||
| dx: 0, | ||||
| dy: -(statusBarHeight) | ||||
| ).offsetBy( | ||||
| dx: 0, | ||||
| dy: -statusBarHeight | ||||
| ) | ||||
| self.visualEffectView.frame = visualEffectRect ?? CGRect.zero | ||||
| videoPreviewLayer.frame = view.layer.bounds | ||||
| } | ||||
|
|
||||
| private func setupNavigationBar() { | ||||
| navigationItem.setLeftBarButton(flashButton, animated: false) | ||||
| navigationItem.setRightBarButton(autoScanButton, animated: false) | ||||
|
|
@@ -196,6 +215,17 @@ final class ScannerViewController: UIViewController { | |||
|
|
||||
| NSLayoutConstraint.activate(quadViewConstraints + cancelButtonConstraints + shutterButtonConstraints + activityIndicatorConstraints) | ||||
| } | ||||
|
|
||||
| func setupVideoOrientation() { | ||||
| let statusBarOrientation = UIApplication.shared.statusBarOrientation | ||||
| var initialVideoOrientation: AVCaptureVideoOrientation = .portrait | ||||
| if statusBarOrientation != .unknown { | ||||
| if let videoOrientation = AVCaptureVideoOrientation(rawValue: statusBarOrientation.rawValue) { | ||||
| initialVideoOrientation = videoOrientation | ||||
| } | ||||
| } | ||||
| videoPreviewLayer.connection?.videoOrientation = initialVideoOrientation | ||||
| } | ||||
|
|
||||
| // MARK: - Tap to Focus | ||||
|
|
||||
|
|
@@ -302,7 +332,6 @@ extension ScannerViewController: RectangleDetectionDelegateProtocol { | |||
|
|
||||
| func captureSessionManager(_ captureSessionManager: CaptureSessionManager, didCapturePicture picture: UIImage, withQuad quad: Quadrilateral?) { | ||||
| activityIndicator.stopAnimating() | ||||
| let editVC = EditScanViewController(image: picture, quad: quad) | ||||
| navigationController?.pushViewController(editVC, animated: false) | ||||
|
|
||||
|
|
@@ -315,13 +344,18 @@ extension ScannerViewController: RectangleDetectionDelegateProtocol { | |||
| quadView.removeQuadrilateral() | ||||
| return | ||||
| } | ||||
|
|
||||
| let statusBarOrientation = UIApplication.shared.statusBarOrientation | ||||
|
|
||||
| let orientedImageSize = CGSize( | ||||
| width: statusBarOrientation.isPortrait ? imageSize.height : imageSize.width, | ||||
| height: statusBarOrientation.isPortrait ? imageSize.width : imageSize.height | ||||
| ) | ||||
|
|
||||
| let scaleTransform = CGAffineTransform.scaleTransform(forSize: orientedImageSize, aspectFillInSize: quadView.bounds.size) | ||||
| let scaledImageSize = imageSize.applying(scaleTransform) | ||||
|
|
||||
| let rotationTransform = CGAffineTransform(rotationAngle: statusBarOrientation.rotationAngle) | ||||
|
|
||||
| let imageBounds = CGRect(origin: .zero, size: scaledImageSize).applying(rotationTransform) | ||||
|
|
||||
|
|
||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -96,7 +96,7 @@ final class HomeViewController: UIViewController { | |
|
|
||
| @objc func scanOrSelectImage(_ sender: UIButton) { | ||
| let actionSheet = UIAlertController(title: "Would you like to scan an image or select one from your photo library?", message: nil, preferredStyle: .actionSheet) | ||
| actionSheet.popoverPresentationController?.sourceView = sender | ||
| let scanAction = UIAlertAction(title: "Scan", style: .default) { (_) in | ||
| self.scanImage() | ||
| } | ||
|
|
@@ -116,6 +116,7 @@ final class HomeViewController: UIViewController { | |
|
|
||
| func scanImage() { | ||
| let scannerViewController = ImageScannerController(delegate: self) | ||
| scannerViewController.modalPresentationStyle = .fullScreen | ||
| present(scannerViewController, animated: true) | ||
| } | ||
|
|
||
|
|
@@ -153,6 +154,7 @@ extension HomeViewController: UIImagePickerControllerDelegate, UINavigationContr | |
|
|
||
| guard let image = info[.originalImage] as? UIImage else { return } | ||
| let scannerViewController = ImageScannerController(image: image, delegate: self) | ||
| scannerViewController.modalPresentationStyle = .fullScreen | ||
| present(scannerViewController, animated: true) | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.