Skip to content

M
Material
Commit c5437c46 by Daniel Dahan
Options

migrated CameraView into ViewController for example

parent 0d503a05
Showing with 3 additions and 7 deletions
MaterialKit.xcodeproj/project.pbxproj
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
96D88C731C132ACC00B91418 /* MaterialAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88BFF1C1328D800B91418 /* MaterialAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96D88C731C132ACC00B91418 /* MaterialAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88BFF1C1328D800B91418 /* MaterialAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C741C132ACC00B91418 /* MaterialBasicAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C001C1328D800B91418 /* MaterialBasicAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96D88C741C132ACC00B91418 /* MaterialBasicAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C001C1328D800B91418 /* MaterialBasicAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C751C132AD500B91418 /* NavigationBarView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C151C1328D800B91418 /* NavigationBarView.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96D88C751C132AD500B91418 /* NavigationBarView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C151C1328D800B91418 /* NavigationBarView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96F367031C20B87D00DD91F4 /* CameraView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F367021C20B87D00DD91F4 /* CameraView.swift */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
...@@ -137,7 +136,6 @@ ...@@ -137,7 +136,6 @@
96D88C1B1C1328D800B91418 /* Roboto-Thin.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Thin.ttf"; sourceTree = "<group>"; }; 96D88C1B1C1328D800B91418 /* Roboto-Thin.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Thin.ttf"; sourceTree = "<group>"; };
96D88C1C1C1328D800B91418 /* RobotoFont.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RobotoFont.swift; sourceTree = "<group>"; }; 96D88C1C1C1328D800B91418 /* RobotoFont.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RobotoFont.swift; sourceTree = "<group>"; };
96D88C1D1C1328D800B91418 /* SideNavigationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SideNavigationViewController.swift; sourceTree = "<group>"; }; 96D88C1D1C1328D800B91418 /* SideNavigationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SideNavigationViewController.swift; sourceTree = "<group>"; };
96F367021C20B87D00DD91F4 /* CameraView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CameraView.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
...@@ -235,7 +233,6 @@ ...@@ -235,7 +233,6 @@
96D88C491C13292700B91418 /* Capture */ = { 96D88C491C13292700B91418 /* Capture */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
96F367021C20B87D00DD91F4 /* CameraView.swift */,
96D88BF51C1328D800B91418 /* CaptureView.swift */, 96D88BF51C1328D800B91418 /* CaptureView.swift */,
96D88BF71C1328D800B91418 /* CapturePreviewView.swift */, 96D88BF71C1328D800B91418 /* CapturePreviewView.swift */,
96D88BF81C1328D800B91418 /* CaptureSession.swift */, 96D88BF81C1328D800B91418 /* CaptureSession.swift */,
...@@ -518,7 +515,6 @@ ...@@ -518,7 +515,6 @@
96D88C3F1C1328D800B91418 /* RaisedButton.swift in Sources */, 96D88C3F1C1328D800B91418 /* RaisedButton.swift in Sources */,
96D88C3C1C1328D800B91418 /* MaterialTransitionAnimation.swift in Sources */, 96D88C3C1C1328D800B91418 /* MaterialTransitionAnimation.swift in Sources */,
96D88C361C1328D800B91418 /* MaterialPulseView.swift in Sources */, 96D88C361C1328D800B91418 /* MaterialPulseView.swift in Sources */,
96F367031C20B87D00DD91F4 /* CameraView.swift in Sources */,
96D88C1E1C1328D800B91418 /* CaptureView.swift in Sources */, 96D88C1E1C1328D800B91418 /* CaptureView.swift in Sources */,
96D88C2D1C1328D800B91418 /* MaterialDepth.swift in Sources */, 96D88C2D1C1328D800B91418 /* MaterialDepth.swift in Sources */,
96D88C331C1328D800B91418 /* MaterialLabel.swift in Sources */, 96D88C331C1328D800B91418 /* MaterialLabel.swift in Sources */,
......
Sources/CaptureView.swift
...@@ -179,7 +179,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate { ...@@ -179,7 +179,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate {
/** /**
:name: startTimer :name: startTimer
*/ */
internal func startTimer() { public func startTimer() {
timer?.invalidate() timer?.invalidate()
timer = NSTimer(timeInterval: 0.5, target: self, selector: "updateTimer", userInfo: nil, repeats: true) timer = NSTimer(timeInterval: 0.5, target: self, selector: "updateTimer", userInfo: nil, repeats: true)
NSRunLoop.mainRunLoop().addTimer(timer!, forMode: NSRunLoopCommonModes) NSRunLoop.mainRunLoop().addTimer(timer!, forMode: NSRunLoopCommonModes)
...@@ -189,7 +189,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate { ...@@ -189,7 +189,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate {
/** /**
:name: updateTimer :name: updateTimer
*/ */
internal func updateTimer() { public func updateTimer() {
let duration: CMTime = captureSession.recordedDuration let duration: CMTime = captureSession.recordedDuration
let time: Double = CMTimeGetSeconds(duration) let time: Double = CMTimeGetSeconds(duration)
let hours: Int = Int(time / 3600) let hours: Int = Int(time / 3600)
...@@ -201,7 +201,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate { ...@@ -201,7 +201,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate {
/** /**
:name: stopTimer :name: stopTimer
*/ */
internal func stopTimer() { public func stopTimer() {
let duration: CMTime = captureSession.recordedDuration let duration: CMTime = captureSession.recordedDuration
let time: Double = CMTimeGetSeconds(duration) let time: Double = CMTimeGetSeconds(duration)
let hours: Int = Int(time / 3600) let hours: Int = Int(time / 3600)
......
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