Skip to content

M
Material
Commit d5c7dfcf by Daniel Dahan
Options

update MaterialEdgeInsets to MaterialEdgeInsetPreset

parent b66f37d2
Showing with 84 additions and 84 deletions
MaterialKit.xcodeproj/project.pbxproj
......@@ -51,7 +51,7 @@
96D88C2D1C1328D800B91418 /* MaterialDepth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C041C1328D800B91418 /* MaterialDepth.swift */; };
96D88C2E1C1328D800B91418 /* MaterialFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C051C1328D800B91418 /* MaterialFont.swift */; };
96D88C2F1C1328D800B91418 /* MaterialGravity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C061C1328D800B91418 /* MaterialGravity.swift */; };
96D88C301C1328D800B91418 /* MaterialEdgeInsets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C071C1328D800B91418 /* MaterialEdgeInsets.swift */; };
96D88C301C1328D800B91418 /* MaterialEdgeInsetPreset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C071C1328D800B91418 /* MaterialEdgeInsetPreset.swift */; };
96D88C311C1328D800B91418 /* MaterialKeyframeAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C081C1328D800B91418 /* MaterialKeyframeAnimation.swift */; };
96D88C321C1328D800B91418 /* MaterialKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C091C1328D800B91418 /* MaterialKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C331C1328D800B91418 /* MaterialLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D88C0A1C1328D800B91418 /* MaterialLabel.swift */; };
......@@ -81,7 +81,7 @@
96D88C5D1C132ABF00B91418 /* MaterialColor.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C031C1328D800B91418 /* MaterialColor.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C5E1C132ABF00B91418 /* MaterialDepth.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C041C1328D800B91418 /* MaterialDepth.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C5F1C132ABF00B91418 /* MaterialGravity.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C061C1328D800B91418 /* MaterialGravity.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C601C132ABF00B91418 /* MaterialEdgeInsets.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C071C1328D800B91418 /* MaterialEdgeInsets.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C601C132ABF00B91418 /* MaterialEdgeInsetPreset.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C071C1328D800B91418 /* MaterialEdgeInsetPreset.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C611C132ABF00B91418 /* CaptureView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88BF51C1328D800B91418 /* CaptureView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C621C132ABF00B91418 /* CapturePreviewView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88BF71C1328D800B91418 /* CapturePreviewView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
96D88C631C132ABF00B91418 /* CaptureSession.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96D88BF81C1328D800B91418 /* CaptureSession.swift */; settings = {ATTRIBUTES = (Public, ); }; };
......@@ -151,7 +151,7 @@
96D88C041C1328D800B91418 /* MaterialDepth.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialDepth.swift; sourceTree = "<group>"; };
96D88C051C1328D800B91418 /* MaterialFont.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialFont.swift; sourceTree = "<group>"; };
96D88C061C1328D800B91418 /* MaterialGravity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialGravity.swift; sourceTree = "<group>"; };
96D88C071C1328D800B91418 /* MaterialEdgeInsets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialEdgeInsets.swift; sourceTree = "<group>"; };
96D88C071C1328D800B91418 /* MaterialEdgeInsetPreset.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialEdgeInsetPreset.swift; sourceTree = "<group>"; };
96D88C081C1328D800B91418 /* MaterialKeyframeAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialKeyframeAnimation.swift; sourceTree = "<group>"; };
96D88C091C1328D800B91418 /* MaterialKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MaterialKit.h; sourceTree = "<group>"; };
96D88C0A1C1328D800B91418 /* MaterialLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialLabel.swift; sourceTree = "<group>"; };
......@@ -313,7 +313,7 @@
96D88C011C1328D800B91418 /* MaterialBorder.swift */,
96D88C041C1328D800B91418 /* MaterialDepth.swift */,
96D88C061C1328D800B91418 /* MaterialGravity.swift */,
96D88C071C1328D800B91418 /* MaterialEdgeInsets.swift */,
96D88C071C1328D800B91418 /* MaterialEdgeInsetPreset.swift */,
);
name = Type;
sourceTree = "<group>";
......@@ -447,7 +447,7 @@
96D88C5D1C132ABF00B91418 /* MaterialColor.swift in Headers */,
96D88C5E1C132ABF00B91418 /* MaterialDepth.swift in Headers */,
96D88C5F1C132ABF00B91418 /* MaterialGravity.swift in Headers */,
96D88C601C132ABF00B91418 /* MaterialEdgeInsets.swift in Headers */,
96D88C601C132ABF00B91418 /* MaterialEdgeInsetPreset.swift in Headers */,
96D88C611C132ABF00B91418 /* CaptureView.swift in Headers */,
96D88C621C132ABF00B91418 /* CapturePreviewView.swift in Headers */,
96D88C631C132ABF00B91418 /* CaptureSession.swift in Headers */,
......@@ -607,7 +607,7 @@
96D88C451C1328D800B91418 /* RobotoFont.swift in Sources */,
96D88C1F1C1328D800B91418 /* CardView.swift in Sources */,
96D88C2C1C1328D800B91418 /* MaterialColor.swift in Sources */,
96D88C301C1328D800B91418 /* MaterialEdgeInsets.swift in Sources */,
96D88C301C1328D800B91418 /* MaterialEdgeInsetPreset.swift in Sources */,
96D88C211C1328D800B91418 /* CaptureSession.swift in Sources */,
96442ADE1C28EF3700C3C574 /* MaterialTableViewCell.swift in Sources */,
960B23271C383E5500E96216 /* MaterialKit+String.swift in Sources */,
......
README.md
......@@ -75,28 +75,6 @@ let button: FabButton = FabButton()
button.backgroundColor = MaterialColor.blue.darken1
```
<a name="textfield"/>
### TextField
A TextField is an excellent way to improve UX. Checkout the Examples directory for a project using this component.
![MaterialKitTextField](http://www.materialkit.io/MK/MaterialKitTextField.gif)
```swift
let nameField: TextField = TextField(frame: CGRectMake(57, 100, 300, 24))
nameField.placeholder = "First Name"
nameField.font = RobotoFont.regularWithSize(20)
nameField.textColor = MaterialColor.black
nameField.titleLabel = UILabel()
nameField.titleLabel!.font = RobotoFont.mediumWithSize(12)
nameField.titleLabelNormalColor = MaterialColor.grey.lighten2
nameField.titleLabelHighlightedColor = MaterialColor.blue.accent3
nameField.clearButtonMode = .WhileEditing
// Add nameField to UIViewController.
view.addSubview(nameField)
```
<a name="materiallayer"/>
### MaterialLayer
......@@ -654,6 +632,28 @@ UIImage.contentsOfURL(url) { (image: UIImage?, error: NSError?) in
}
```
<a name="textfield"/>
### TextField
A TextField is an excellent way to improve UX. Checkout the Examples directory for a project using this component.
![MaterialKitTextField](http://www.materialkit.io/MK/MaterialKitTextField.gif)
```swift
let nameField: TextField = TextField(frame: CGRectMake(57, 100, 300, 24))
nameField.placeholder = "First Name"
nameField.font = RobotoFont.regularWithSize(20)
nameField.textColor = MaterialColor.black
nameField.titleLabel = UILabel()
nameField.titleLabel!.font = RobotoFont.mediumWithSize(12)
nameField.titleLabelNormalColor = MaterialColor.grey.lighten2
nameField.titleLabelHighlightedColor = MaterialColor.blue.accent3
nameField.clearButtonMode = .WhileEditing
// Add nameField to UIViewController.
view.addSubview(nameField)
```
<a name="textview"/>
### TextView
......
Sources/CaptureView.swift
......@@ -173,16 +173,16 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate {
/**
:name: contentInsets
*/
public var contentInsetPreset: MaterialEdgeInsets = .None {
public var contentInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
contentInset = MaterialEdgeInsetsToValue(contentInsetPreset)
contentInset = MaterialEdgeInsetPresetToValue(contentInsetPreset)
}
}
/**
:name: contentInset
*/
public var contentInset: UIEdgeInsets = MaterialEdgeInsetsToValue(.Square4) {
public var contentInset: UIEdgeInsets = MaterialEdgeInsetPresetToValue(.Square4) {
didSet {
reloadView()
}
......
Sources/CardView.swift
......@@ -45,9 +45,9 @@ public class CardView : MaterialPulseView {
/**
:name: dividerInsets
*/
public var dividerInsetPreset: MaterialEdgeInsets = .None {
public var dividerInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
dividerInset = MaterialEdgeInsetsToValue(dividerInsetPreset)
dividerInset = MaterialEdgeInsetPresetToValue(dividerInsetPreset)
}
}
......@@ -63,16 +63,16 @@ public class CardView : MaterialPulseView {
/**
:name: contentInsets
*/
public var contentInsetPreset: MaterialEdgeInsets = .None {
public var contentInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
contentInset = MaterialEdgeInsetsToValue(contentInsetPreset)
contentInset = MaterialEdgeInsetPresetToValue(contentInsetPreset)
}
}
/**
:name: contentInset
*/
public var contentInset: UIEdgeInsets = MaterialEdgeInsetsToValue(.Square2) {
public var contentInset: UIEdgeInsets = MaterialEdgeInsetPresetToValue(.Square2) {
didSet {
reloadView()
}
......@@ -81,16 +81,16 @@ public class CardView : MaterialPulseView {
/**
:name: titleLabelInsets
*/
public var titleLabelInsetPreset: MaterialEdgeInsets = .None {
public var titleLabelInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
titleLabelInset = MaterialEdgeInsetsToValue(titleLabelInsetPreset)
titleLabelInset = MaterialEdgeInsetPresetToValue(titleLabelInsetPreset)
}
}
/**
:name: titleLabelInset
*/
public var titleLabelInset: UIEdgeInsets = MaterialEdgeInsetsToValue(.Square2) {
public var titleLabelInset: UIEdgeInsets = MaterialEdgeInsetPresetToValue(.Square2) {
didSet {
reloadView()
}
......@@ -109,16 +109,16 @@ public class CardView : MaterialPulseView {
/**
:name: detailLabelInsets
*/
public var detailLabelInsetPreset: MaterialEdgeInsets = .None {
public var detailLabelInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
detailLabelInset = MaterialEdgeInsetsToValue(detailLabelInsetPreset)
detailLabelInset = MaterialEdgeInsetPresetToValue(detailLabelInsetPreset)
}
}
/**
:name: detailLabelInset
*/
public var detailLabelInset: UIEdgeInsets = MaterialEdgeInsetsToValue(.Square2) {
public var detailLabelInset: UIEdgeInsets = MaterialEdgeInsetPresetToValue(.Square2) {
didSet {
reloadView()
}
......@@ -137,16 +137,16 @@ public class CardView : MaterialPulseView {
/**
:name: leftButtonsInsets
*/
public var leftButtonsInsetPreset: MaterialEdgeInsets = .None {
public var leftButtonsInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
leftButtonsInset = MaterialEdgeInsetsToValue(leftButtonsInsetPreset)
leftButtonsInset = MaterialEdgeInsetPresetToValue(leftButtonsInsetPreset)
}
}
/**
:name: leftButtonsInset
*/
public var leftButtonsInset: UIEdgeInsets = MaterialEdgeInsetsToValue(.None) {
public var leftButtonsInset: UIEdgeInsets = MaterialEdgeInsetPresetToValue(.None) {
didSet {
reloadView()
}
......@@ -169,16 +169,16 @@ public class CardView : MaterialPulseView {
/**
:name: rightButtonsInsets
*/
public var rightButtonsInsetPreset: MaterialEdgeInsets = .None {
public var rightButtonsInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
rightButtonsInset = MaterialEdgeInsetsToValue(rightButtonsInsetPreset)
rightButtonsInset = MaterialEdgeInsetPresetToValue(rightButtonsInsetPreset)
}
}
/**
:name: rightButtonsInset
*/
public var rightButtonsInset: UIEdgeInsets = MaterialEdgeInsetsToValue(.None) {
public var rightButtonsInset: UIEdgeInsets = MaterialEdgeInsetPresetToValue(.None) {
didSet {
reloadView()
}
......
Sources/ImageCardView.swift
......@@ -45,9 +45,9 @@ public class ImageCardView : MaterialPulseView {
/**
:name: dividerInsets
*/
public var dividerInsetPreset: MaterialEdgeInsets = .None {
public var dividerInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
dividerInset = MaterialEdgeInsetsToValue(dividerInsetPreset)
dividerInset = MaterialEdgeInsetPresetToValue(dividerInsetPreset)
}
}
......@@ -153,16 +153,16 @@ public class ImageCardView : MaterialPulseView {
/**
:name: contentInsets
*/
public var contentInsetPreset: MaterialEdgeInsets = .None {
public var contentInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
contentInset = MaterialEdgeInsetsToValue(contentInsetPreset)
contentInset = MaterialEdgeInsetPresetToValue(contentInsetPreset)
}
}
/**
:name: contentInset
*/
public var contentInset: UIEdgeInsets = MaterialEdgeInsetsToValue(.Square2) {
public var contentInset: UIEdgeInsets = MaterialEdgeInsetPresetToValue(.Square2) {
didSet {
reloadView()
}
......@@ -171,16 +171,16 @@ public class ImageCardView : MaterialPulseView {
/**
:name: titleLabelInsets
*/
public var titleLabelInsetPreset: MaterialEdgeInsets = .None {
public var titleLabelInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
titleLabelInset = MaterialEdgeInsetsToValue(titleLabelInsetPreset)
titleLabelInset = MaterialEdgeInsetPresetToValue(titleLabelInsetPreset)
}
}
/**
:name: titleLabelInset
*/
public var titleLabelInset: UIEdgeInsets = MaterialEdgeInsetsToValue(.Square2) {
public var titleLabelInset: UIEdgeInsets = MaterialEdgeInsetPresetToValue(.Square2) {
didSet {
reloadView()
}
......@@ -199,16 +199,16 @@ public class ImageCardView : MaterialPulseView {
/**
:name: detailLabelInsets
*/
public var detailLabelInsetPreset: MaterialEdgeInsets = .None {
public var detailLabelInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
detailLabelInset = MaterialEdgeInsetsToValue(detailLabelInsetPreset)
detailLabelInset = MaterialEdgeInsetPresetToValue(detailLabelInsetPreset)
}
}
/**
:name: detailLabelInset
*/
public var detailLabelInset: UIEdgeInsets = MaterialEdgeInsetsToValue(.Square2) {
public var detailLabelInset: UIEdgeInsets = MaterialEdgeInsetPresetToValue(.Square2) {
didSet {
reloadView()
}
......@@ -227,16 +227,16 @@ public class ImageCardView : MaterialPulseView {
/**
:name: leftButtonsInsets
*/
public var leftButtonsInsetPreset: MaterialEdgeInsets = .None {
public var leftButtonsInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
leftButtonsInset = MaterialEdgeInsetsToValue(leftButtonsInsetPreset)
leftButtonsInset = MaterialEdgeInsetPresetToValue(leftButtonsInsetPreset)
}
}
/**
:name: leftButtonsInset
*/
public var leftButtonsInset: UIEdgeInsets = MaterialEdgeInsetsToValue(.None) {
public var leftButtonsInset: UIEdgeInsets = MaterialEdgeInsetPresetToValue(.None) {
didSet {
reloadView()
}
......@@ -259,16 +259,16 @@ public class ImageCardView : MaterialPulseView {
/**
:name: rightButtonsInsets
*/
public var rightButtonsInsetPreset: MaterialEdgeInsets = .None {
public var rightButtonsInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
rightButtonsInset = MaterialEdgeInsetsToValue(rightButtonsInsetPreset)
rightButtonsInset = MaterialEdgeInsetPresetToValue(rightButtonsInsetPreset)
}
}
/**
:name: rightButtonsInset
*/
public var rightButtonsInset: UIEdgeInsets = MaterialEdgeInsetsToValue(.None) {
public var rightButtonsInset: UIEdgeInsets = MaterialEdgeInsetPresetToValue(.None) {
didSet {
reloadView()
}
......
Sources/MaterialButton.swift
......@@ -276,9 +276,9 @@ public class MaterialButton : UIButton {
/**
:name: contentInsets
*/
public var contentInsetPreset: MaterialEdgeInsets {
public var contentInsetPreset: MaterialEdgeInsetPreset {
didSet {
let value: UIEdgeInsets = MaterialEdgeInsetsToValue(contentInsetPreset)
let value: UIEdgeInsets = MaterialEdgeInsetPresetToValue(contentInsetPreset)
contentEdgeInsets = UIEdgeInsetsMake(value.top, value.left, value.bottom, value.right)
}
}
......
Sources/MaterialEdgeInsets.swift → Sources/MaterialEdgeInsetPreset.swift
......@@ -18,7 +18,7 @@
import UIKit
public enum MaterialEdgeInsets {
public enum MaterialEdgeInsetPreset {
case None
// square
......@@ -56,9 +56,9 @@ public enum MaterialEdgeInsets {
}
/**
:name: MaterialEdgeInsetsToValue
:name: MaterialEdgeInsetPresetToValue
*/
public func MaterialEdgeInsetsToValue(inset: MaterialEdgeInsets) -> UIEdgeInsets {
public func MaterialEdgeInsetPresetToValue(inset: MaterialEdgeInsetPreset) -> UIEdgeInsets {
switch inset {
case .None:
return UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
......
Sources/NavigationBarView.swift
......@@ -31,16 +31,16 @@ public class NavigationBarView : MaterialView {
/**
:name: contentInsets
*/
public var contentInsetPreset: MaterialEdgeInsets = .None {
public var contentInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
contentInset = MaterialEdgeInsetsToValue(contentInsetPreset)
contentInset = MaterialEdgeInsetPresetToValue(contentInsetPreset)
}
}
/**
:name: contentInset
*/
public var contentInset: UIEdgeInsets = MaterialEdgeInsetsToValue(.Square2) {
public var contentInset: UIEdgeInsets = MaterialEdgeInsetPresetToValue(.Square2) {
didSet {
reloadView()
}
......@@ -49,9 +49,9 @@ public class NavigationBarView : MaterialView {
/**
:name: titleLabelInsets
*/
public var titleLabelInsetPreset: MaterialEdgeInsets = .None {
public var titleLabelInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
titleLabelInset = MaterialEdgeInsetsToValue(titleLabelInsetPreset)
titleLabelInset = MaterialEdgeInsetPresetToValue(titleLabelInsetPreset)
}
}
......@@ -77,16 +77,16 @@ public class NavigationBarView : MaterialView {
/**
:name: detailLabelInsets
*/
public var detailLabelInsetPreset: MaterialEdgeInsets = .None {
public var detailLabelInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
detailLabelInset = MaterialEdgeInsetsToValue(detailLabelInsetPreset)
detailLabelInset = MaterialEdgeInsetPresetToValue(detailLabelInsetPreset)
}
}
/**
:name: detailLabelInset
*/
public var detailLabelInset: UIEdgeInsets = MaterialEdgeInsetsToValue(.None) {
public var detailLabelInset: UIEdgeInsets = MaterialEdgeInsetPresetToValue(.None) {
didSet {
reloadView()
}
......@@ -105,9 +105,9 @@ public class NavigationBarView : MaterialView {
/**
:name: leftButtonsInsets
*/
public var leftButtonsInsetPreset: MaterialEdgeInsets = .None {
public var leftButtonsInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
leftButtonsInset = MaterialEdgeInsetsToValue(leftButtonsInsetPreset)
leftButtonsInset = MaterialEdgeInsetPresetToValue(leftButtonsInsetPreset)
}
}
......@@ -137,9 +137,9 @@ public class NavigationBarView : MaterialView {
/**
:name: rightButtonsInsets
*/
public var rightButtonsInsetPreset: MaterialEdgeInsets = .None {
public var rightButtonsInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
rightButtonsInset = MaterialEdgeInsetsToValue(rightButtonsInsetPreset)
rightButtonsInset = MaterialEdgeInsetPresetToValue(rightButtonsInsetPreset)
}
}
......
Sources/TextView.swift
......@@ -272,9 +272,9 @@ public class TextView: UITextView {
/**
:name: textContainerInset
*/
public var textContainerInsetPreset: MaterialEdgeInsets = .None {
public var textContainerInsetPreset: MaterialEdgeInsetPreset = .None {
didSet {
textContainerInset = MaterialEdgeInsetsToValue(textContainerInsetPreset)
textContainerInset = MaterialEdgeInsetPresetToValue(textContainerInsetPreset)
}
}
......
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