Skip to content

M
Material
Commit 72c27d79 by Daniel Dahan
Options

Merge pull request #246 from zgosalvez/development 

Added customising bottom border colors.
parents f627f85b 13c7ebda
Showing with 137 additions and 61 deletions
Sources/TextField.swift
...@@ -300,7 +300,33 @@ public class TextField : UITextField { ...@@ -300,7 +300,33 @@ public class TextField : UITextField {
bottomBorderLayer. bottomBorderLayer.
*/ */
@IBInspectable public var bottomBorderLayerDistance: CGFloat = 4 @IBInspectable public var bottomBorderLayerDistance: CGFloat = 4
/// The color of the bottomBorderLayer when the textField is not active.
@IBInspectable public var bottomBorderColor: UIColor? {
didSet {
MaterialAnimation.animationDisabled { [unowned self] in
self.bottomBorderLayer.backgroundColor = self.bottomBorderColor?.CGColor
}
}
}
/// The color of the bottomBorderLayer when the textField is active.
@IBInspectable public var bottomBorderTitleActiveColor: UIColor?
/**
The color of the bottomBorderLayer when the detailLabelHidden property is
set to false.
*/
@IBInspectable public var bottomBorderDetailActiveColor: UIColor? {
didSet {
if !detailLabelHidden {
MaterialAnimation.animationDisabled { [unowned self] in
self.bottomBorderLayer.backgroundColor = self.bottomBorderDetailActiveColor?.CGColor
}
}
}
}
/** /**
The title UILabel that is displayed when there is text. The The title UILabel that is displayed when there is text. The
titleLabel text value is updated with the placeholder text titleLabel text value is updated with the placeholder text
...@@ -313,14 +339,16 @@ public class TextField : UITextField { ...@@ -313,14 +339,16 @@ public class TextField : UITextField {
} }
/// The color of the titleLabel text when the textField is not active. /// The color of the titleLabel text when the textField is not active.
@IBInspectable public var titleLabelColor: UIColor? { @IBInspectable public var titleLabelColor: UIColor? {
didSet { didSet {
titleLabel?.textColor = titleLabelColor titleLabel?.textColor = titleLabelColor
MaterialAnimation.animationDisabled { [unowned self] in MaterialAnimation.animationDisabled { [unowned self] in
self.bottomBorderLayer.backgroundColor = self.titleLabelColor?.CGColor if nil != self.bottomBorderTitleActiveColor {
} self.bottomBorderLayer.backgroundColor = self.titleLabelColor?.CGColor
} }
} }
}
}
/// The color of the titleLabel text when the textField is active. /// The color of the titleLabel text when the textField is active.
@IBInspectable public var titleLabelActiveColor: UIColor? @IBInspectable public var titleLabelActiveColor: UIColor?
...@@ -352,16 +380,18 @@ public class TextField : UITextField { ...@@ -352,16 +380,18 @@ public class TextField : UITextField {
The color of the detailLabel text when the detailLabelHidden property The color of the detailLabel text when the detailLabelHidden property
is set to false. is set to false.
*/ */
@IBInspectable public var detailLabelActiveColor: UIColor? { @IBInspectable public var detailLabelActiveColor: UIColor? {
didSet { didSet {
if !detailLabelHidden { if !detailLabelHidden {
detailLabel?.textColor = detailLabelActiveColor detailLabel?.textColor = detailLabelActiveColor
MaterialAnimation.animationDisabled { [unowned self] in MaterialAnimation.animationDisabled { [unowned self] in
self.bottomBorderLayer.backgroundColor = self.detailLabelActiveColor?.CGColor if nil != self.bottomBorderDetailActiveColor {
} self.bottomBorderLayer.backgroundColor = self.detailLabelActiveColor?.CGColor
} }
} }
} }
}
}
/** /**
A property that sets the distance between the textField and A property that sets the distance between the textField and
...@@ -378,23 +408,40 @@ public class TextField : UITextField { ...@@ -378,23 +408,40 @@ public class TextField : UITextField {
/** /**
:name: detailLabelHidden :name: detailLabelHidden
*/ */
@IBInspectable public var detailLabelHidden: Bool = true { @IBInspectable public var detailLabelHidden: Bool = true {
didSet { didSet {
if detailLabelHidden { if detailLabelHidden {
detailLabel?.textColor = titleLabelColor detailLabel?.textColor = titleLabelColor
MaterialAnimation.animationDisabled { [unowned self] in MaterialAnimation.animationDisabled { [unowned self] in
self.bottomBorderLayer.backgroundColor = self.editing ? self.titleLabelActiveColor?.CGColor : self.titleLabelColor?.CGColor var activeColor: CGColor? = self.titleLabelActiveColor?.CGColor
} var inactiveColor: CGColor? = self.titleLabelColor?.CGColor
hideDetailLabel()
} else { if let bottomBorderColor: CGColor = self.bottomBorderTitleActiveColor?.CGColor {
detailLabel?.textColor = detailLabelActiveColor activeColor = bottomBorderColor
MaterialAnimation.animationDisabled { [unowned self] in }
self.bottomBorderLayer.backgroundColor = self.detailLabelActiveColor?.CGColor
} if let bottomBorderColor: CGColor = self.bottomBorderColor?.CGColor {
showDetailLabel() inactiveColor = bottomBorderColor
} }
}
} self.bottomBorderLayer.backgroundColor = self.editing ? activeColor : inactiveColor
}
hideDetailLabel()
} else {
detailLabel?.textColor = detailLabelActiveColor
MaterialAnimation.animationDisabled { [unowned self] in
var activeColor: CGColor? = self.detailLabelActiveColor?.CGColor
if let bottomBorderColor: CGColor = self.bottomBorderDetailActiveColor?.CGColor {
activeColor = bottomBorderColor
}
self.bottomBorderLayer.backgroundColor = activeColor
}
showDetailLabel()
}
}
}
/// A wrapper for searchBar.placeholder. /// A wrapper for searchBar.placeholder.
@IBInspectable public override var placeholder: String? { @IBInspectable public override var placeholder: String? {
...@@ -532,22 +579,40 @@ public class TextField : UITextField { ...@@ -532,22 +579,40 @@ public class TextField : UITextField {
} }
/// Ahdnler when text value changed. /// Ahdnler when text value changed.
internal func textFieldValueChanged() { internal func textFieldValueChanged() {
if detailLabelAutoHideEnabled && !detailLabelHidden { if detailLabelAutoHideEnabled && !detailLabelHidden {
detailLabelHidden = true detailLabelHidden = true
MaterialAnimation.animationDisabled { [unowned self] in MaterialAnimation.animationDisabled { [unowned self] in
self.bottomBorderLayer.backgroundColor = self.titleLabelActiveColor?.CGColor var activeColor: CGColor? = self.titleLabelActiveColor?.CGColor
}
} if let bottomBorderColor: CGColor = self.bottomBorderTitleActiveColor?.CGColor {
} activeColor = bottomBorderColor
}
self.bottomBorderLayer.backgroundColor = activeColor
}
}
}
/// Handler for text editing began. /// Handler for text editing began.
internal func textFieldDidBegin() { internal func textFieldDidBegin() {
titleLabel?.textColor = titleLabelActiveColor titleLabel?.textColor = titleLabelActiveColor
MaterialAnimation.animationDisabled { [unowned self] in MaterialAnimation.animationDisabled { [unowned self] in
self.bottomBorderLayer.backgroundColor = self.detailLabelHidden ? self.titleLabelActiveColor?.CGColor : self.detailLabelActiveColor?.CGColor var titleActiveColor: CGColor? = self.titleLabelActiveColor?.CGColor
} var detailActiveColor: CGColor? = self.detailLabelActiveColor?.CGColor
}
if let bottomBorderColor: CGColor = self.bottomBorderTitleActiveColor?.CGColor {
titleActiveColor = bottomBorderColor
}
if let bottomBorderColor: CGColor = self.bottomBorderDetailActiveColor?.CGColor {
detailActiveColor = bottomBorderColor
}
self.bottomBorderLayer.backgroundColor = self.detailLabelHidden ? titleActiveColor : detailActiveColor
}
}
/// Handler for text changed. /// Handler for text changed.
internal func textFieldDidChange() { internal func textFieldDidChange() {
...@@ -560,17 +625,28 @@ public class TextField : UITextField { ...@@ -560,17 +625,28 @@ public class TextField : UITextField {
} }
/// Handler for text editing ended. /// Handler for text editing ended.
internal func textFieldDidEnd() { internal func textFieldDidEnd() {
if 0 < text?.utf16.count { if 0 < text?.utf16.count {
showTitleLabel() showTitleLabel()
} else if 0 == text?.utf16.count { } else if 0 == text?.utf16.count {
hideTitleLabel() hideTitleLabel()
} }
titleLabel?.textColor = titleLabelColor titleLabel?.textColor = titleLabelColor
MaterialAnimation.animationDisabled { [unowned self] in MaterialAnimation.animationDisabled { [unowned self] in
self.bottomBorderLayer.backgroundColor = self.detailLabelHidden ? self.titleLabelColor?.CGColor : self.detailLabelActiveColor?.CGColor var borderColor: CGColor? = self.titleLabelColor?.CGColor
} var detailActiveColor: CGColor? = self.detailLabelActiveColor?.CGColor
}
if let bottomBorderColor: CGColor = self.bottomBorderColor?.CGColor {
borderColor = bottomBorderColor
}
if let bottomBorderColor: CGColor = self.bottomBorderDetailActiveColor?.CGColor {
detailActiveColor = bottomBorderColor
}
self.bottomBorderLayer.backgroundColor = self.detailLabelHidden ? borderColor : detailActiveColor
}
}
/// Manages the layout for the shape of the view instance. /// Manages the layout for the shape of the view instance.
internal func layoutShape() { internal func layoutShape() {
......
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