Skip to content

M
Material
Commit 319de2cd by Daniel Dahan
Options

updated CaptureView defaults

parent 4d2c029e
Showing with 9 additions and 7 deletions
Examples/Programmatic/CaptureView/CaptureView.xcodeproj/project.pbxproj
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
961725841C2230550091B34F /* MaterialKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 961725831C2230550091B34F /* MaterialKit.framework */; };
961725851C2230550091B34F /* MaterialKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 961725831C2230550091B34F /* MaterialKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
967C0E5A1C1CB980005175A6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967C0E591C1CB980005175A6 /* AppDelegate.swift */; }; 967C0E5A1C1CB980005175A6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967C0E591C1CB980005175A6 /* AppDelegate.swift */; };
967C0E5C1C1CB980005175A6 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967C0E5B1C1CB980005175A6 /* ViewController.swift */; }; 967C0E5C1C1CB980005175A6 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967C0E5B1C1CB980005175A6 /* ViewController.swift */; };
967C0E611C1CB980005175A6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 967C0E601C1CB980005175A6 /* Assets.xcassets */; }; 967C0E611C1CB980005175A6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 967C0E601C1CB980005175A6 /* Assets.xcassets */; };
...@@ -20,6 +22,7 @@ ...@@ -20,6 +22,7 @@
dstPath = ""; dstPath = "";
dstSubfolderSpec = 10; dstSubfolderSpec = 10;
files = ( files = (
961725851C2230550091B34F /* MaterialKit.framework in Embed Frameworks */,
); );
name = "Embed Frameworks"; name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
...@@ -27,6 +30,7 @@ ...@@ -27,6 +30,7 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
961725831C2230550091B34F /* MaterialKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = MaterialKit.framework; path = "/Users/danieldahan/Library/Developer/Xcode/DerivedData/MaterialKit-anypxbsecgdqqxevbavirvnffqxd/Build/Products/Debug-iphoneos/MaterialKit.framework"; sourceTree = "<absolute>"; };
967C0E561C1CB980005175A6 /* CaptureView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CaptureView.app; sourceTree = BUILT_PRODUCTS_DIR; }; 967C0E561C1CB980005175A6 /* CaptureView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CaptureView.app; sourceTree = BUILT_PRODUCTS_DIR; };
967C0E591C1CB980005175A6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 967C0E591C1CB980005175A6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
967C0E5B1C1CB980005175A6 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; }; 967C0E5B1C1CB980005175A6 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
...@@ -40,6 +44,7 @@ ...@@ -40,6 +44,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
961725841C2230550091B34F /* MaterialKit.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -49,6 +54,7 @@ ...@@ -49,6 +54,7 @@
967C0E4D1C1CB980005175A6 = { 967C0E4D1C1CB980005175A6 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
961725831C2230550091B34F /* MaterialKit.framework */,
967C0E581C1CB980005175A6 /* CaptureView */, 967C0E581C1CB980005175A6 /* CaptureView */,
967C0E571C1CB980005175A6 /* Products */, 967C0E571C1CB980005175A6 /* Products */,
); );
......
Examples/Programmatic/CaptureView/CaptureView/ViewController.swift
...@@ -75,8 +75,6 @@ class ViewController: UIViewController, CaptureViewDelegate, CaptureSessionDeleg ...@@ -75,8 +75,6 @@ class ViewController: UIViewController, CaptureViewDelegate, CaptureSessionDeleg
videoButton.hidden = true videoButton.hidden = true
switchCamerasButton.hidden = true switchCamerasButton.hidden = true
flashButton.hidden = true flashButton.hidden = true
navigationBarView.backgroundColor = nil
} }
/** /**
...@@ -90,8 +88,6 @@ class ViewController: UIViewController, CaptureViewDelegate, CaptureSessionDeleg ...@@ -90,8 +88,6 @@ class ViewController: UIViewController, CaptureViewDelegate, CaptureSessionDeleg
videoButton.hidden = false videoButton.hidden = false
switchCamerasButton.hidden = false switchCamerasButton.hidden = false
flashButton.hidden = false flashButton.hidden = false
navigationBarView.backgroundColor = MaterialColor.black.colorWithAlphaComponent(0.3)
} }
func captureViewDidStartRecordTimer(captureView: CaptureView) { func captureViewDidStartRecordTimer(captureView: CaptureView) {
...@@ -232,7 +228,7 @@ class ViewController: UIViewController, CaptureViewDelegate, CaptureSessionDeleg ...@@ -232,7 +228,7 @@ class ViewController: UIViewController, CaptureViewDelegate, CaptureSessionDeleg
:name: prepareNavigationBarView :name: prepareNavigationBarView
*/ */
private func prepareNavigationBarView() { private func prepareNavigationBarView() {
navigationBarView.backgroundColor = MaterialColor.black.colorWithAlphaComponent(0.3) navigationBarView.backgroundColor = nil
navigationBarView.shadowDepth = .None navigationBarView.shadowDepth = .None
navigationBarView.statusBarStyle = .LightContent navigationBarView.statusBarStyle = .LightContent
......
MK.podspec
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'MK' s.name = 'MK'
s.version = '1.25.0' s.version = '1.25.1'
s.license = { :type => "AGPL-3.0", :file => "LICENSE" } s.license = { :type => "AGPL-3.0", :file => "LICENSE" }
s.summary = 'Beautiful Material Design in Swift.' s.summary = 'Beautiful Material Design in Swift.'
s.homepage = 'http://materialkit.io' s.homepage = 'http://materialkit.io'
......
Sources/Info.plist
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.25.0</string> <string>1.25.1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
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