Commit 22717582 by Daniel Dahan

updated comments to CaptureSession

parent 17b67d99
......@@ -53,9 +53,13 @@ public class CapturePreview : MaterialView {
return (layer as! AVCaptureVideoPreviewLayer).pointForCaptureDevicePoint(ofInterest: point)
}
/**
:name: prepareView
*/
/**
Prepares the view instance when intialized. When subclassing,
it is recommended to override the prepareView method
to initialize property values and other setup operations.
The super.prepareView method should always be called immediately
when subclassing.
*/
public override func prepareView() {
super.prepareView()
preparePreviewLayer()
......
......@@ -433,9 +433,9 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate {
*/
@objc
internal func handleTapToFocusGesture(recognizer: UITapGestureRecognizer) {
if enableTapToFocus && captureSession.cameraSupportsTapToFocus {
if enableTapToFocus && captureSession.isFocusPointOfInterestSupported {
let point: CGPoint = recognizer.location(in: self)
captureSession.focusAtPoint(point: previewView.captureDevicePointOfInterestForPoint(point: point))
captureSession.focus(point: previewView.captureDevicePointOfInterestForPoint(point: point))
animateTapLayer(layer: focusLayer!, point: point)
(delegate as? CaptureViewDelegate)?.captureViewDidTapToFocusAtPoint?(captureView: self, point: point)
}
......@@ -447,9 +447,9 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate {
*/
@objc
internal func handleTapToExposeGesture(recognizer: UITapGestureRecognizer) {
if enableTapToExpose && captureSession.cameraSupportsTapToExpose {
if enableTapToExpose && captureSession.isExposurePointOfInterestSupported {
let point: CGPoint = recognizer.location(in: self)
captureSession.exposeAtPoint(point: previewView.captureDevicePointOfInterestForPoint(point: point))
captureSession.expose(point: previewView.captureDevicePointOfInterestForPoint(point: point))
animateTapLayer(layer: exposureLayer!, point: point)
(delegate as? CaptureViewDelegate)?.captureViewDidTapToExposeAtPoint?(captureView: self, point: point)
}
......@@ -462,7 +462,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate {
@objc
internal func handleTapToResetGesture(recognizer: UITapGestureRecognizer) {
if enableTapToReset {
captureSession.resetFocusAndExposureModes()
captureSession.reset()
let point: CGPoint = previewView.pointForCaptureDevicePointOfInterest(point: CGPoint(x: 0.5, y: 0.5))
animateTapLayer(layer: resetLayer!, point: point)
(delegate as? CaptureViewDelegate)?.captureViewDidTapToResetAtPoint?(captureView: self, point: point)
......
......@@ -59,7 +59,7 @@ public class ControlView : MaterialView {
/// A preset wrapper around interimSpace.
public var interimSpacePreset: InterimSpace = .none {
didSet {
interimSpace = interimSpaceToValue(interimSpacePreset)
interimSpace = InterimSpaceToValue(interimSpacePreset)
}
}
......
......@@ -156,7 +156,7 @@ public class Grid {
/// A preset wrapper around interimSpace.
public var interimSpacePreset: InterimSpace = .none {
didSet {
interimSpace = interimSpaceToValue(interimSpacePreset)
interimSpace = InterimSpaceToValue(interimSpacePreset)
}
}
......@@ -252,4 +252,4 @@ public extension UIView {
associateObject(self, key: &GridKey, value: value)
}
}
}
\ No newline at end of file
}
......@@ -44,7 +44,7 @@ public enum InterimSpace {
}
/// Converts the InterimSpace enum to a CGFloat value.
public func interimSpaceToValue(interimSpace: InterimSpace) -> CGFloat {
public func InterimSpaceToValue(interimSpace: InterimSpace) -> CGFloat {
switch interimSpace {
case .none:
return 0
......
......@@ -155,7 +155,7 @@ public class MaterialCollectionReusableView : UICollectionReusableView {
/// A preset wrapper around interimSpace.
public var interimSpacePreset: InterimSpace = .none {
didSet {
interimSpace = interimSpaceToValue(interimSpacePreset)
interimSpace = InterimSpaceToValue(interimSpacePreset)
}
}
......@@ -606,4 +606,4 @@ public class MaterialCollectionReusableView : UICollectionReusableView {
}
}
}
}
\ No newline at end of file
}
......@@ -104,7 +104,7 @@ public class MaterialCollectionView : UICollectionView {
/// A preset wrapper around interimSpace.
public var interimSpacePreset: InterimSpace = .none {
didSet {
interimSpace = interimSpaceToValue(interimSpacePreset)
interimSpace = InterimSpaceToValue(interimSpacePreset)
}
}
......@@ -163,4 +163,4 @@ public class MaterialCollectionView : UICollectionView {
backgroundColor = Color.clear
contentInset = UIEdgeInsetsZero
}
}
\ No newline at end of file
}
......@@ -155,7 +155,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell {
/// A preset wrapper around interimSpace.
public var interimSpacePreset: InterimSpace = .none {
didSet {
interimSpace = interimSpaceToValue(interimSpacePreset)
interimSpace = InterimSpaceToValue(interimSpacePreset)
}
}
......@@ -605,4 +605,4 @@ public class MaterialCollectionViewCell : UICollectionViewCell {
}
}
}
}
\ No newline at end of file
}
......@@ -62,7 +62,7 @@ public class MaterialCollectionViewLayout : UICollectionViewLayout {
/// A preset wrapper around interimSpace.
public var interimSpacePreset: InterimSpace = .none {
didSet {
interimSpace = interimSpaceToValue(interimSpacePreset)
interimSpace = InterimSpaceToValue(interimSpacePreset)
}
}
......@@ -159,4 +159,4 @@ public class MaterialCollectionViewLayout : UICollectionViewLayout {
contentSize = CGSizeMake(offset.x, collectionView!.bounds.height)
}
}
}
\ No newline at end of file
}
......@@ -51,7 +51,7 @@ public class Menu {
/// A preset wrapper around interimSpace.
public var interimSpacePreset: InterimSpace = .none {
didSet {
interimSpace = interimSpaceToValue(interimSpacePreset)
interimSpace = InterimSpaceToValue(interimSpacePreset)
}
}
......
......@@ -78,7 +78,7 @@ public class NavigationBar : UINavigationBar {
/// A preset wrapper around interimSpace.
public var interimSpacePreset: InterimSpace = .none {
didSet {
interimSpace = interimSpaceToValue(interimSpacePreset)
interimSpace = InterimSpaceToValue(interimSpacePreset)
}
}
......@@ -475,4 +475,4 @@ public class NavigationBar : UINavigationBar {
item.contentView!.grid.axis.direction = .Vertical
return item.contentView!
}
}
\ No newline at end of file
}
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