Skip to content

M
Material
Commit c69187bd by Daniel Dahan
Options

updated CGRectNull to CGRectZero

parent 76c67232
Showing with 35 additions and 18 deletions
Examples/Programmatic/App/App.xcodeproj/project.pbxproj
......@@ -18,6 +18,8 @@
9663F94C1C7A74C700AF0965 /* AppMenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9663F94B1C7A74C700AF0965 /* AppMenuViewController.swift */; };
9663F94E1C7A74EA00AF0965 /* AppLeftViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9663F94D1C7A74EA00AF0965 /* AppLeftViewController.swift */; };
9663F9521C7A751D00AF0965 /* ItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9663F9511C7A751D00AF0965 /* ItemViewController.swift */; };
9679CEC21CC92C1F0021685B /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9679CEC11CC92C1F0021685B /* Material.framework */; };
9679CEC31CC92C1F0021685B /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9679CEC11CC92C1F0021685B /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
96CC08881C7FEBD60034FF84 /* RecipesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC08871C7FEBD60034FF84 /* RecipesViewController.swift */; };
/* End PBXBuildFile section */
......@@ -28,6 +30,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
9679CEC31CC92C1F0021685B /* Material.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
......@@ -48,6 +51,7 @@
9663F94B1C7A74C700AF0965 /* AppMenuViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppMenuViewController.swift; sourceTree = "<group>"; };
9663F94D1C7A74EA00AF0965 /* AppLeftViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppLeftViewController.swift; sourceTree = "<group>"; };
9663F9511C7A751D00AF0965 /* ItemViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemViewController.swift; sourceTree = "<group>"; };
9679CEC11CC92C1F0021685B /* Material.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = Material.framework; path = "/Users/danieldahan/Library/Developer/Xcode/DerivedData/Material-bshwisidfobstlbomegqyybbrygh/Build/Products/Debug-iphonesimulator/Material.framework"; sourceTree = "<absolute>"; };
96CC08871C7FEBD60034FF84 /* RecipesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecipesViewController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
......@@ -56,6 +60,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9679CEC21CC92C1F0021685B /* Material.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -65,6 +70,7 @@
9663F9251C7A744500AF0965 = {
isa = PBXGroup;
children = (
9679CEC11CC92C1F0021685B /* Material.framework */,
9663F9301C7A744600AF0965 /* App */,
9663F92F1C7A744600AF0965 /* Products */,
);
......
Examples/Programmatic/TextField/TextField.xcodeproj/project.pbxproj
......@@ -11,6 +11,8 @@
966F57A31C226BAA009185B7 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 966F57A21C226BAA009185B7 /* ViewController.swift */; };
966F57A81C226BAA009185B7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 966F57A71C226BAA009185B7 /* Assets.xcassets */; };
966F57AB1C226BAA009185B7 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 966F57A91C226BAA009185B7 /* LaunchScreen.storyboard */; };
9679CEBF1CC926970021685B /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9679CEBE1CC926970021685B /* Material.framework */; };
9679CEC01CC926970021685B /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9679CEBE1CC926970021685B /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
......@@ -20,6 +22,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
9679CEC01CC926970021685B /* Material.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
......@@ -33,6 +36,7 @@
966F57A71C226BAA009185B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
966F57AA1C226BAA009185B7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
966F57AC1C226BAA009185B7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9679CEBE1CC926970021685B /* Material.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = Material.framework; path = "/Users/danieldahan/Library/Developer/Xcode/DerivedData/Material-bshwisidfobstlbomegqyybbrygh/Build/Products/Debug-iphonesimulator/Material.framework"; sourceTree = "<absolute>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -40,6 +44,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9679CEBF1CC926970021685B /* Material.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -49,6 +54,7 @@
966F57941C226BAA009185B7 = {
isa = PBXGroup;
children = (
9679CEBE1CC926970021685B /* Material.framework */,
966F579F1C226BAA009185B7 /* TextField */,
966F579E1C226BAA009185B7 /* Products */,
);
......
Examples/Programmatic/TextField/TextField/Info.plist
......@@ -32,6 +32,8 @@
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
......
Examples/Programmatic/TextField/TextField/ViewController.swift
......@@ -56,11 +56,14 @@ class ViewController: UIViewController, TextFieldDelegate {
/// Prepares the name TextField.
private func prepareNameField() {
let w: CGFloat = 300
let x: CGFloat = (MaterialDevice.width - w) / 2
nameField = TextField(frame: CGRectMake(x, 100, w, 24))
nameField = TextField()
nameField.placeholder = "Name"
view.addSubview(nameField)
nameField.translatesAutoresizingMaskIntoConstraints = false
MaterialLayout.alignFromTop(view, child: nameField, top: 100)
MaterialLayout.alignToParentHorizontally(view, child: nameField, left: 20, right: 20)
}
/// Prepares the email TextField.
......
Sources/iOS/BottomTabBar.swift
......@@ -200,7 +200,7 @@ public class BottomTabBar : UITabBar {
/// A convenience initializer.
public convenience init() {
self.init(frame: CGRectNull)
self.init(frame: CGRectZero)
}
public override func layoutSubviews() {
......
Sources/iOS/CaptureView.swift
......@@ -288,7 +288,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate {
:name: init
*/
public convenience init() {
self.init(frame: CGRectNull)
self.init(frame: CGRectZero)
}
/**
......
Sources/iOS/CardView.swift
......@@ -228,14 +228,14 @@ public class CardView : MaterialPulseView {
:name: init
*/
public convenience init() {
self.init(frame: CGRectNull)
self.init(frame: CGRectZero)
}
/**
:name: init
*/
public convenience init?(image: UIImage? = nil, titleLabel: UILabel? = nil, detailView: UIView? = nil, leftButtons: Array<UIButton>? = nil, rightButtons: Array<UIButton>? = nil) {
self.init(frame: CGRectNull)
self.init(frame: CGRectZero)
prepareProperties(image, titleLabel: titleLabel, detailView: detailView, leftButtons: leftButtons, rightButtons: rightButtons)
}
......
Sources/iOS/ImageCardView.swift
......@@ -321,14 +321,14 @@ public class ImageCardView : MaterialPulseView {
:name: init
*/
public convenience init() {
self.init(frame: CGRectNull)
self.init(frame: CGRectZero)
}
/**
:name: init
*/
public convenience init?(image: UIImage? = nil, titleLabel: UILabel? = nil, detailView: UIView? = nil, leftButtons: Array<UIButton>? = nil, rightButtons: Array<UIButton>? = nil) {
self.init(frame: CGRectNull)
self.init(frame: CGRectZero)
prepareProperties(image, titleLabel: titleLabel, detailView: detailView, leftButtons: leftButtons, rightButtons: rightButtons)
}
......
Sources/iOS/MaterialButton.swift
......@@ -339,7 +339,7 @@ public class MaterialButton : UIButton {
/// A convenience initializer.
public convenience init() {
self.init(frame: CGRectNull)
self.init(frame: CGRectZero)
}
public override func layoutSublayersOfLayer(layer: CALayer) {
......
Sources/iOS/MaterialCollectionView.swift
......@@ -107,7 +107,7 @@ public class MaterialCollectionView : UICollectionView {
/// A convenience initializer that initializes the object.
public convenience init() {
self.init(frame: CGRectNull)
self.init(frame: CGRectZero)
}
/**
......
Sources/iOS/MaterialCollectionViewCell.swift
......@@ -444,7 +444,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell {
/// A convenience initializer.
public convenience init() {
self.init(frame: CGRectNull)
self.init(frame: CGRectZero)
}
public override func layoutSublayersOfLayer(layer: CALayer) {
......
Sources/iOS/MaterialLabel.swift
......@@ -132,7 +132,7 @@ public class MaterialLabel : UILabel {
:name: init
*/
public convenience init() {
self.init(frame: CGRectNull)
self.init(frame: CGRectZero)
prepareView()
}
......
Sources/iOS/MaterialView.swift
......@@ -383,7 +383,7 @@ public class MaterialView : UIView {
/// A convenience initializer.
public convenience init() {
self.init(frame: CGRectNull)
self.init(frame: CGRectZero)
}
public override func layoutSublayersOfLayer(layer: CALayer) {
......
Sources/iOS/NavigationBar.swift
......@@ -256,7 +256,7 @@ public class NavigationBar : UINavigationBar {
/// A convenience initializer.
public convenience init() {
self.init(frame: CGRectNull)
self.init(frame: CGRectZero)
}
public override func layoutSubviews() {
......
Sources/iOS/TextField.swift
......@@ -428,7 +428,7 @@ public class TextField : UITextField {
/// A convenience initializer.
public convenience init() {
self.init(frame: CGRectNull)
self.init(frame: CGRectZero)
}
public override func layoutSubviews() {
......@@ -571,7 +571,7 @@ public class TextField : UITextField {
/// Prepares the titleLabel.
private func prepareTitleLabel() {
titleLabel = UILabel()
titleLabel = UILabel(frame: CGRectZero)
titleLabel.hidden = true
titleLabel.font = RobotoFont.mediumWithSize(12)
addSubview(titleLabel)
......
Sources/iOS/TextView.swift
......@@ -327,7 +327,7 @@ public class TextView: UITextView {
- Parameter textContainer: A NSTextContainer instance.
*/
public convenience init(textContainer: NSTextContainer?) {
self.init(frame: CGRectNull, textContainer: textContainer)
self.init(frame: CGRectZero, textContainer: textContainer)
}
/** Denitializer. This should never be called unless you know
......
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