Commit 62d6d3b1 by Daniel Dahan

updated default colors and sizes, and added help properties to set the values when active

parent 867fc755
...@@ -158,6 +158,11 @@ class ViewController: UIViewController, TextFieldDelegate { ...@@ -158,6 +158,11 @@ class ViewController: UIViewController, TextFieldDelegate {
emailField.delegate = self emailField.delegate = self
emailField.clearButtonMode = .WhileEditing emailField.clearButtonMode = .WhileEditing
emailField.placeholderColor = MaterialColor.amber.darken4
emailField.placeholderActiveColor = MaterialColor.pink.base
emailField.detailColor = MaterialColor.indigo.accent1
emailField.dividerColor = MaterialColor.cyan.base
view.addSubview(emailField) view.addSubview(emailField)
} }
......
...@@ -194,7 +194,7 @@ under the TextField. ...@@ -194,7 +194,7 @@ under the TextField.
![MaterialTextField](http://www.cosmicmind.io/MK/MaterialTextField.gif) ![MaterialTextField](http://www.cosmicmind.io/MK/MaterialTextField.gif)
[Learn More About TextField](https://github.com/CosmicMind/Material/wiki/TextField) [Learn More About TextField](http://cosmicmind.sandbox.local/material/textfield)
<a name="textview"></a> <a name="textview"></a>
#### TextView #### TextView
......
...@@ -126,7 +126,13 @@ public class MTextField : UITextField { ...@@ -126,7 +126,13 @@ public class MTextField : UITextField {
@IBInspectable public var dividerActiveHeight: CGFloat = 2 @IBInspectable public var dividerActiveHeight: CGFloat = 2
/// Sets the divider and tintColor. /// Sets the divider and tintColor.
@IBInspectable public var dividerColor: UIColor = MaterialColor.darkText.dividers @IBInspectable public var dividerColor: UIColor = MaterialColor.darkText.dividers {
didSet {
if !editing {
divider.backgroundColor = dividerColor.CGColor
}
}
}
/// The placeholderLabel font value. /// The placeholderLabel font value.
@IBInspectable public override var font: UIFont? { @IBInspectable public override var font: UIFont? {
...@@ -159,10 +165,26 @@ public class MTextField : UITextField { ...@@ -159,10 +165,26 @@ public class MTextField : UITextField {
@IBInspectable public private(set) lazy var placeholderLabel: UILabel = UILabel(frame: CGRectZero) @IBInspectable public private(set) lazy var placeholderLabel: UILabel = UILabel(frame: CGRectZero)
/// Placeholder textColor. /// Placeholder textColor.
@IBInspectable public var placeholderColor: UIColor = MaterialColor.darkText.others @IBInspectable public var placeholderColor: UIColor = MaterialColor.darkText.others {
didSet {
if !editing {
if let v: String = placeholder {
placeholderLabel.attributedText = NSAttributedString(string: v, attributes: [NSForegroundColorAttributeName: placeholderColor])
}
}
}
}
/// Placeholder active textColor. /// Placeholder active textColor.
@IBInspectable public var placeholderActiveColor: UIColor = MaterialColor.blue.base @IBInspectable public var placeholderActiveColor: UIColor = MaterialColor.blue.base {
didSet {
if editing {
if let v: String = placeholder {
placeholderLabel.attributedText = NSAttributedString(string: v, attributes: [NSForegroundColorAttributeName: placeholderActiveColor])
}
}
}
}
/// The detailLabel UILabel that is displayed. /// The detailLabel UILabel that is displayed.
@IBInspectable public private(set) lazy var detailLabel: UILabel = UILabel(frame: CGRectZero) @IBInspectable public private(set) lazy var detailLabel: UILabel = UILabel(frame: CGRectZero)
...@@ -182,7 +204,13 @@ public class MTextField : UITextField { ...@@ -182,7 +204,13 @@ public class MTextField : UITextField {
} }
/// Detail textColor. /// Detail textColor.
@IBInspectable public var detailColor: UIColor = MaterialColor.darkText.others @IBInspectable public var detailColor: UIColor = MaterialColor.darkText.others {
didSet {
if let v: String = detailLabel.text {
detailLabel.attributedText = NSAttributedString(string: v, attributes: [NSForegroundColorAttributeName: detailColor])
}
}
}
/// Handles the textAlignment of the placeholderLabel. /// Handles the textAlignment of the placeholderLabel.
public override var textAlignment: NSTextAlignment { public override var textAlignment: NSTextAlignment {
...@@ -403,7 +431,7 @@ public class MTextField : UITextField { ...@@ -403,7 +431,7 @@ public class MTextField : UITextField {
/// Prepares the divider. /// Prepares the divider.
private func prepareDivider() { private func prepareDivider() {
divider.backgroundColor = MaterialColor.darkText.dividers.CGColor dividerColor = MaterialColor.darkText.dividers
layer.addSublayer(divider) layer.addSublayer(divider)
} }
......
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