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.
import UIKit
import Material
class AppMenuController: MenuController, MenuViewDelegate {
class AppMenuController: MenuController {
/// MenuView diameter.
private let baseSize: CGSize = CGSizeMake(56, 56)
......@@ -74,11 +74,6 @@ class AppMenuController: MenuController, MenuViewDelegate {
(menuView.menu.views?.first as? MaterialButton)?.animate(MaterialAnimation.rotate(angle: 0))
}
// Handles touch outside
func menuViewDidTapOutside(menuView: MenuView) {
closeMenu()
}
/// Handler for blue button.
func handleBlueButton() {
closeMenu()
......@@ -103,7 +98,6 @@ class AppMenuController: MenuController, MenuViewDelegate {
}
}
/// Prepares the menuView.
private func prepareMenuView() {
var image: UIImage? = MaterialIcon.cm.add
......@@ -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
toolbar.depth = .None
// Title label.
let titleLabel: UILabel = UILabel()
titleLabel.hidden = true
titleLabel.textAlignment = .Center
titleLabel.textColor = MaterialColor.white
titleLabel.font = RobotoFont.regular
toolbar.titleLabel = titleLabel
toolbar.titleLabel.hidden = true
toolbar.titleLabel.textColor = MaterialColor.white
// Detail label.
let detailLabel: UILabel = UILabel()
detailLabel.hidden = true
detailLabel.text = "Recording"
detailLabel.textAlignment = .Center
detailLabel.textColor = MaterialColor.red.accent1
detailLabel.font = RobotoFont.regular
toolbar.detailLabel = detailLabel
toolbar.detail = "Recording"
toolbar.detailLabel.hidden = true
toolbar.detailLabel.textColor = MaterialColor.red.accent1
toolbar.leftControls = [switchCamerasButton]
toolbar.rightControls = [flashButton]
......
......@@ -36,7 +36,7 @@ flow of your application.
import UIKit
import Material
class AppMenuController: MenuController, MenuViewDelegate {
class AppMenuController: MenuController {
/// MenuView diameter.
private let baseSize: CGSize = CGSizeMake(56, 56)
......@@ -105,11 +105,7 @@ class AppMenuController: MenuController, MenuViewDelegate {
view.backgroundColor = MaterialColor.black
prepareMenuView()
}
func menuViewDidTapOutside(menuView: MenuView) {
closeMenu()
}

/// Prepares the add button.
private func prepareMenuView() {
var image: UIImage? = MaterialIcon.cm.add
......@@ -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 {
v.frame.origin.x = bounds.width - v.bounds.width - contentInset.right
}
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