Commit 34c4fc03 by Daniel Dahan

fixed issue-244, where Gather Test Coverage flag was failing

parent d7b65e8d
......@@ -21,7 +21,7 @@
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
9663F9461C7A746B00AF0965 /* Embed Frameworks */ = {
96815B361CA07B0A0006CBE2 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
......@@ -105,7 +105,7 @@
9663F92A1C7A744600AF0965 /* Sources */,
9663F92B1C7A744600AF0965 /* Frameworks */,
9663F92C1C7A744600AF0965 /* Resources */,
9663F9461C7A746B00AF0965 /* Embed Frameworks */,
96815B361CA07B0A0006CBE2 /* Embed Frameworks */,
);
buildRules = (
);
......
Pod::Spec.new do |s|
s.name = 'Material'
s.version = '1.37.2'
s.version = '1.37.3'
s.license = 'BSD'
s.summary = 'Express your creativity with Material, an animation and graphics framework for Google\'s Material Design and Apple\'s Flat UI in Swift.'
s.homepage = 'http://cosmicmind.io'
......
......@@ -51,7 +51,7 @@
9656CD0C1C6BD33700EBCEF1 /* Grid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9656CD0B1C6BD33700EBCEF1 /* Grid.swift */; };
966F57B81C226D75009185B7 /* TextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 966F57B71C226D75009185B7 /* TextField.swift */; };
967887871C9775900037F6C9 /* NavigationItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967887861C9775900037F6C9 /* NavigationItem.swift */; };
967887891C9777CB0037F6C9 /* MaterialViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967887881C9777CB0037F6C9 /* MaterialViewTests.swift */; };
96815B381CA07BA20006CBE2 /* MaterialViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967887881C9777CB0037F6C9 /* MaterialViewTests.swift */; };
968F16F61C9260EC008CA3F6 /* Toolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 968F16F51C9260EC008CA3F6 /* Toolbar.swift */; };
968F16F81C92612E008CA3F6 /* ToolbarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 968F16F71C92612E008CA3F6 /* ToolbarController.swift */; };
968F17171C9266D0008CA3F6 /* MaterialIcon.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BE340E1C8E68EF007D02BE /* MaterialIcon.swift */; settings = {ATTRIBUTES = (Public, ); }; };
......@@ -852,7 +852,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
967887891C9777CB0037F6C9 /* MaterialViewTests.swift in Sources */,
96815B381CA07BA20006CBE2 /* MaterialViewTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.37.2</string>
<string>1.37.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -280,13 +280,13 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
A CGFloat property to access the width that the leftView
opens up to.
*/
@IBInspectable public private(set) var leftViewWidth: CGFloat = .iPhone == MaterialDevice.type ? 280 : 320
@IBInspectable public private(set) var leftViewWidth: CGFloat!
/**
A CGFloat property to access the width that the rightView
opens up to.
*/
@IBInspectable public private(set) var rightViewWidth: CGFloat = .iPhone == MaterialDevice.type ? 280 : 320
@IBInspectable public private(set) var rightViewWidth: CGFloat!
/**
An initializer for the SideNavigationController.
......@@ -754,6 +754,7 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
/// A method that prepares the leftView.
private func prepareLeftView() {
if nil != leftViewController {
leftViewWidth = .iPhone == MaterialDevice.type ? 280 : 320
leftView = MaterialView()
leftView!.frame = CGRectMake(0, 0, leftViewWidth, view.frame.height)
leftView!.backgroundColor = MaterialColor.clear
......@@ -770,6 +771,7 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
/// A method that prepares the leftView.
private func prepareRightView() {
if nil != rightViewController {
rightViewWidth = .iPhone == MaterialDevice.type ? 280 : 320
rightView = MaterialView()
rightView!.frame = CGRectMake(0, 0, rightViewWidth, view.frame.height)
rightView!.backgroundColor = MaterialColor.clear
......
......@@ -29,7 +29,6 @@
*/
import XCTest
@testable import Material
class MaterialViewTests: XCTestCase {
......
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