Commit 27e11c4d by Daniel Dahan

added adjustment method for CaptureSession, to correctly adjust the underlying…

added adjustment method for CaptureSession, to correctly adjust the underlying image captured based on orientation
parent dd92bc32
...@@ -36,7 +36,7 @@ flow of your application. ...@@ -36,7 +36,7 @@ flow of your application.
import UIKit import UIKit
import Material import Material
class AppMenuController: MenuController, MenuViewDelegate { class AppMenuController: MenuController {
/// MenuView diameter. /// MenuView diameter.
private let baseSize: CGSize = CGSizeMake(56, 56) private let baseSize: CGSize = CGSizeMake(56, 56)
...@@ -74,11 +74,6 @@ class AppMenuController: MenuController, MenuViewDelegate { ...@@ -74,11 +74,6 @@ class AppMenuController: MenuController, MenuViewDelegate {
(menuView.menu.views?.first as? MaterialButton)?.animate(MaterialAnimation.rotate(angle: 0)) (menuView.menu.views?.first as? MaterialButton)?.animate(MaterialAnimation.rotate(angle: 0))
} }
// Handles touch outside
func menuViewDidTapOutside(menuView: MenuView) {
closeMenu()
}
/// Handler for blue button. /// Handler for blue button.
func handleBlueButton() { func handleBlueButton() {
closeMenu() closeMenu()
...@@ -103,7 +98,6 @@ class AppMenuController: MenuController, MenuViewDelegate { ...@@ -103,7 +98,6 @@ class AppMenuController: MenuController, MenuViewDelegate {
} }
} }
/// Prepares the menuView. /// Prepares the menuView.
private func prepareMenuView() { private func prepareMenuView() {
var image: UIImage? = MaterialIcon.cm.add var image: UIImage? = MaterialIcon.cm.add
...@@ -159,3 +153,10 @@ class AppMenuController: MenuController, MenuViewDelegate { ...@@ -159,3 +153,10 @@ class AppMenuController: MenuController, MenuViewDelegate {
} }
} }
/// MenuViewDelegate.
extension AppMenuController: MenuViewDelegate {
func menuViewDidTapOutside(menuView: MenuView) {
closeMenu()
}
}
...@@ -237,21 +237,13 @@ class ViewController: UIViewController, CaptureViewDelegate, CaptureSessionDeleg ...@@ -237,21 +237,13 @@ class ViewController: UIViewController, CaptureViewDelegate, CaptureSessionDeleg
toolbar.depth = .None toolbar.depth = .None
// Title label. // Title label.
let titleLabel: UILabel = UILabel() toolbar.titleLabel.hidden = true
titleLabel.hidden = true toolbar.titleLabel.textColor = MaterialColor.white
titleLabel.textAlignment = .Center
titleLabel.textColor = MaterialColor.white
titleLabel.font = RobotoFont.regular
toolbar.titleLabel = titleLabel
// Detail label. // Detail label.
let detailLabel: UILabel = UILabel() toolbar.detail = "Recording"
detailLabel.hidden = true toolbar.detailLabel.hidden = true
detailLabel.text = "Recording" toolbar.detailLabel.textColor = MaterialColor.red.accent1
detailLabel.textAlignment = .Center
detailLabel.textColor = MaterialColor.red.accent1
detailLabel.font = RobotoFont.regular
toolbar.detailLabel = detailLabel
toolbar.leftControls = [switchCamerasButton] toolbar.leftControls = [switchCamerasButton]
toolbar.rightControls = [flashButton] toolbar.rightControls = [flashButton]
......
...@@ -36,7 +36,7 @@ flow of your application. ...@@ -36,7 +36,7 @@ flow of your application.
import UIKit import UIKit
import Material import Material
class AppMenuController: MenuController, MenuViewDelegate { class AppMenuController: MenuController {
/// MenuView diameter. /// MenuView diameter.
private let baseSize: CGSize = CGSizeMake(56, 56) private let baseSize: CGSize = CGSizeMake(56, 56)
...@@ -105,11 +105,7 @@ class AppMenuController: MenuController, MenuViewDelegate { ...@@ -105,11 +105,7 @@ class AppMenuController: MenuController, MenuViewDelegate {
view.backgroundColor = MaterialColor.black view.backgroundColor = MaterialColor.black
prepareMenuView() prepareMenuView()
} }

func menuViewDidTapOutside(menuView: MenuView) {
closeMenu()
}
/// Prepares the add button. /// Prepares the add button.
private func prepareMenuView() { private func prepareMenuView() {
var image: UIImage? = MaterialIcon.cm.add var image: UIImage? = MaterialIcon.cm.add
...@@ -158,3 +154,10 @@ class AppMenuController: MenuController, MenuViewDelegate { ...@@ -158,3 +154,10 @@ class AppMenuController: MenuController, MenuViewDelegate {
} }
} }
/// MenuViewDelegate.
extension AppMenuController: MenuViewDelegate {
func menuViewDidTapOutside(menuView: MenuView) {
closeMenu()
}
}
...@@ -311,7 +311,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate { ...@@ -311,7 +311,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate {
v.frame.origin.x = bounds.width - v.bounds.width - contentInset.right v.frame.origin.x = bounds.width - v.bounds.width - contentInset.right
} }
if let v: AVCaptureConnection = (previewView.layer as! AVCaptureVideoPreviewLayer).connection { if let v: AVCaptureConnection = (previewView.layer as! AVCaptureVideoPreviewLayer).connection {
v.videoOrientation = captureSession.currentVideoOrientation v.videoOrientation = captureSession.videoOrientation
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment