Skip to content

M
Material
Commit 7c2198ec by Daniel Dahan
Options

development: progression with TextField

parent dfcc3fbd
Showing with 162 additions and 91 deletions
Examples/Programmatic/TextField/TextField.xcodeproj/project.pbxproj
......@@ -107,6 +107,7 @@
TargetAttributes = {
96090AE31D9CDD2E00709CA6 = {
CreatedOnToolsVersion = 8.0;
DevelopmentTeam = 9Z76XCNLGL;
ProvisioningStyle = Automatic;
};
};
......@@ -262,7 +263,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 9Z76XCNLGL;
INFOPLIST_FILE = TextField/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.cosmicmind.TextField;
......@@ -275,7 +276,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 9Z76XCNLGL;
INFOPLIST_FILE = TextField/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.cosmicmind.TextField;
......
Examples/Programmatic/TextField/TextField/ViewController.swift
......@@ -40,9 +40,9 @@ class ViewController: UIViewController {
super.viewDidLoad()
view.backgroundColor = .white
// prepareNameField()
prepareNameField()
prepareEmailField()
// preparePasswordField()
preparePasswordField()
prepareResignResponderButton()
}
......@@ -68,36 +68,39 @@ class ViewController: UIViewController {
}
private func prepareNameField() {
let d: CGFloat = 40
let d: CGFloat = 32
nameField = TextField()
nameField.text = "Daniel Dahan"
nameField.placeholder = "Name"
nameField.detail = "Your given name"
nameField.detailLabel.text = "Your given name"
nameField.textAlignment = .center
nameField.clearButtonMode = .whileEditing
// Size the TextField to the maximum width, less 40 pixels on either side
// with a top margin of 40 pixels.
view.layout(nameField).top(d).horizontally(left: d, right: d)
let leftView = UIImageView()
leftView.image = Icon.email?.tint(with: Color.cyan.base)
nameField.leftView = leftView
nameField.leftViewMode = .always
view.layout(nameField).top(100).horizontally(left: d, right: d).height(d)
}
private func prepareEmailField() {
let d: CGFloat = 32
let leftView = UIImageView(frame: CGRect(x: 0, y: 0, width: d, height: d))
leftView.image = Icon.email?.tint(with: Color.cyan.base)
leftView.contentMode = .center
emailField = ErrorTextField(frame: CGRect(x: 40, y: 120, width: view.width - 80, height: d))
emailField.placeholder = "Email"
emailField.detail = "Error, incorrect email"
emailField = ErrorTextField(frame: CGRect(x: d, y: 200, width: view.width - (2 * d), height: d))
emailField.placeholderLabel.text = "Email"
emailField.detailLabel.text = "Error, incorrect email"
emailField.isClearIconButtonEnabled = true
emailField.delegate = self
let leftView = UIImageView()
leftView.image = Icon.email?.tint(with: Color.cyan.base)
emailField.leftView = leftView
emailField.leftViewMode = .always
emailField.divider.contentEdgeInsets.left = d
// emailField.placeholderNormalColor = Color.amber.darken4
// emailField.placeholderActiveColor = Color.pink.base
......@@ -107,20 +110,24 @@ class ViewController: UIViewController {
}
private func preparePasswordField() {
let d: CGFloat = 40
let d: CGFloat = 32
passwordField = TextField()
passwordField.placeholder = "Password"
passwordField.detail = "At least 8 characters"
passwordField.placeholderLabel.text = "Password"
passwordField.detailLabel.text = "At least 8 characters"
passwordField.clearButtonMode = .whileEditing
passwordField.isVisibilityIconButtonEnabled = true
let leftView = UIImageView()
leftView.image = Icon.email?.tint(with: Color.cyan.base)
passwordField.leftView = leftView
passwordField.leftViewMode = .always
// Setting the visibilityIconButton color.
passwordField.visibilityIconButton?.tintColor = Color.green.base.withAlphaComponent(passwordField.isSecureTextEntry ? 0.38 : 0.54)
// Size the TextField to the maximum width, less 40 pixels on either side
// with a top margin of 200 pixels.
view.layout(passwordField).top(200).horizontally(left: d, right: d)
view.layout(passwordField).top(300).horizontally(left: d, right: d).height(d)
}
}
......
Sources/iOS/SearchBar.swift
......@@ -42,6 +42,15 @@ public protocol SearchBarDelegate {
optional func searchBar(searchBar: SearchBar, didChange textField: UITextField, with text: String?)
/**
A delegation method that is executed when the textField will clear.
- Parameter searchBar: A SearchBar.
- Parameter willClear textField: A UITextField.
- Parameter with text: An optional String.
*/
@objc
optional func searchBar(searchBar: SearchBar, willClear textField: UITextField, with text: String?)
/**
A delegation method that is executed when the textField is cleared.
- Parameter searchBar: A SearchBar.
- Parameter didClear textField: A UITextField.
......@@ -175,8 +184,13 @@ open class SearchBar: Bar {
/// Clears the textField text.
@objc
internal func handleClearButton() {
delegate?.searchBar?(searchBar: self, didClear: textField, with: textField.text)
let text = textField.text
delegate?.searchBar?(searchBar: self, willClear: textField, with: text)
textField.text = nil
delegate?.searchBar?(searchBar: self, didClear: textField, with: text)
}
// Live updates the search results.
......
Sources/iOS/TextField.swift
......@@ -32,7 +32,32 @@ import UIKit
private var TextFieldContext: UInt8 = 0
public protocol TextFieldDelegate: UITextFieldDelegate {}
@objc(TextFieldDelegate)
public protocol TextFieldDelegate: UITextFieldDelegate {
/**
A delegation method that is executed when the textField changed.
- Parameter textField: A UITextField.
- Parameter didChange text: An optional String.
*/
@objc
optional func textField(textField: UITextField, didChange text: String?)
/**
A delegation method that is executed when the textField will clear.
- Parameter textField: A UITextField.
- Parameter willClear text: An optional String.
*/
@objc
optional func textField(textField: UITextField, willClear text: String?)
/**
A delegation method that is executed when the textField is cleared.
- Parameter textField: A UITextField.
- Parameter didClear text: An optional String.
*/
@objc
optional func textField(textField: UITextField, didClear text: String?)
}
open class TextField: UITextField {
/// Default size when using AutoLayout.
......@@ -47,6 +72,14 @@ open class TextField: UITextField {
/// A Boolean that indicates if the TextField is in an animating state.
open internal(set) var isAnimating = false
/// The leftView width value.
open var leftViewWidth: CGFloat {
return leftViewOffset + height
}
/// The leftView width value.
open var leftViewOffset: CGFloat = 16
/// Divider normal height.
@IBInspectable
open var dividerNormalHeight: CGFloat = 1
......@@ -112,32 +145,18 @@ open class TextField: UITextField {
}
set(value) {
placeholderLabel.text = value
guard let v = value else {
return
}
placeholderLabel.attributedText = NSAttributedString(string: v, attributes: [NSForegroundColorAttributeName: placeholderNormalColor])
}
}
/// The placeholder UILabel.
@IBInspectable
open private(set) var placeholderLabel: UILabel!
open private(set) lazy var placeholderLabel: UILabel = UILabel()
/// Placeholder normal text
@IBInspectable
open var placeholderNormalColor = Color.darkText.others {
didSet {
guard !isEditing else {
return
}
guard let v = placeholder else {
return
}
placeholderLabel.attributedText = NSAttributedString(string: v, attributes: [NSForegroundColorAttributeName: placeholderNormalColor])
updatePlaceholderLabelColor()
}
}
......@@ -146,16 +165,7 @@ open class TextField: UITextField {
open var placeholderActiveColor = Color.blue.base {
didSet {
tintColor = placeholderActiveColor
guard isEditing else {
return
}
guard let v = placeholder else {
return
}
placeholderLabel.attributedText = NSAttributedString(string: v, attributes: [NSForegroundColorAttributeName: placeholderActiveColor])
updatePlaceholderLabelColor()
}
}
......@@ -182,7 +192,7 @@ open class TextField: UITextField {
@IBInspectable
open var detailColor = Color.darkText.others {
didSet {
updateDetailLabelAttributedText()
updateDetailLabelColor()
}
}
......@@ -225,11 +235,13 @@ open class TextField: UITextField {
clearIconButton = IconButton(image: Icon.cm.clear, tintColor: placeholderNormalColor)
clearIconButton!.contentEdgeInsets = .zero
clearIconButton!.pulseAnimation = .center
clearIconButton!.pulseAnimation = .none
clearButtonMode = .never
rightViewMode = .whileEditing
rightView = clearIconButton
isClearIconButtonAutoHandled = isClearIconButtonAutoHandled ? true : false
layoutButton(button: clearIconButton)
}
}
......@@ -266,12 +278,14 @@ open class TextField: UITextField {
visibilityIconButton = IconButton(image: Icon.visibility, tintColor: placeholderNormalColor.withAlphaComponent(isSecureTextEntry ? 0.38 : 0.54))
visibilityIconButton!.contentEdgeInsets = .zero
visibilityIconButton!.pulseAnimation = .center
visibilityIconButton!.pulseAnimation = .none
isSecureTextEntry = true
clearButtonMode = .never
rightViewMode = .whileEditing
rightView = visibilityIconButton
isVisibilityIconButtonAutoHandled = isVisibilityIconButtonAutoHandled ? true : false
layoutButton(button: visibilityIconButton)
}
}
......@@ -307,17 +321,20 @@ open class TextField: UITextField {
}
open override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
guard "detailLabel.text" == keyPath else {
guard "placeholderLabel.text" == keyPath || "detailLabel.text" == keyPath else {
super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
return
}
updateDetailLabelAttributedText()
layoutDetailLabel()
updatePlaceholderLabelColor()
updateDetailLabelColor()
layoutToSize()
}
deinit {
removeObserver(self, forKeyPath: "detailLabel.text")
removeObserver(self, forKeyPath: "placeholderLabel.text")
}
/**
......@@ -347,8 +364,13 @@ open class TextField: UITextField {
open override func layoutSubviews() {
super.layoutSubviews()
layoutToSize()
layoutDivider()
guard !isAnimating else {
return
}
layoutToSize()
}
open override func layoutSublayers(of layer: CALayer) {
......@@ -380,8 +402,14 @@ open class TextField: UITextField {
guard true == delegate?.textFieldShouldClear?(self) else {
return
}
let t = text
(delegate as? TextFieldDelegate)?.textField?(textField: self, willClear: t)
text = nil
(delegate as? TextFieldDelegate)?.textField?(textField: self, didClear: t)
}
/// Handles the visibilityIconButton TouchUpInside event.
......@@ -419,15 +447,12 @@ open class TextField: UITextField {
/// Ensures that the components are sized correctly.
open func layoutToSize() {
guard !isAnimating else {
return
}
layoutPlaceholderLabel()
layoutPlaceholderLabel()
layoutDetailLabel()
layoutButton(button: clearIconButton)
layoutButton(button: visibilityIconButton)
}
layoutLeftView()
}
/// Layout the divider.
open func layoutDivider() {
......@@ -436,20 +461,19 @@ open class TextField: UITextField {
/// Layout the placeholderLabel.
open func layoutPlaceholderLabel() {
if !isEditing && true == text?.isEmpty && isPlaceholderAnimated {
if let v = leftView?.width {
placeholderLabel.frame = CGRect(x: v, y: bounds.origin.y, width: bounds.width - v, height: bounds.height)
} else {
placeholderLabel.frame = bounds
}
let x = leftViewWidth
divider.contentEdgeInsets.left = x
if !isEditing && true == text?.isEmpty && isPlaceholderAnimated {
placeholderLabel.frame = CGRect(x: x, y: bounds.origin.y, width: bounds.width - x, height: bounds.height)
} else if placeholderLabel.transform.isIdentity {
placeholderLabel.frame = bounds
placeholderLabel.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
placeholderLabel.frame = CGRect(x: x, y: bounds.origin.y, width: bounds.width - x, height: bounds.height)
placeholderLabel.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
switch textAlignment {
case .left, .natural:
placeholderLabel.x = 0
placeholderLabel.x = x
case .right:
placeholderLabel.x = width - placeholderLabel.width
placeholderLabel.x = width - placeholderLabel.width - x
default:break
}
placeholderLabel.y = -placeholderLabel.height + placeholderVerticalOffset
......@@ -457,25 +481,24 @@ open class TextField: UITextField {
} else {
switch textAlignment {
case .left, .natural:
placeholderLabel.x = 0
placeholderLabel.x = x
case .right:
placeholderLabel.x = width - placeholderLabel.width
placeholderLabel.x = width - placeholderLabel.width - x
case .center:
placeholderLabel.center.x = width / 2
placeholderLabel.center.x = (width + x) / 2
default:break
}
placeholderLabel.width = width * 0.75
placeholderLabel.width = (width - x) * 0.75
}
}
/// Layout the detailLabel.
open func layoutDetailLabel() {
guard let v = divider.line else {
return
}
let h: CGFloat = nil == detail ? 12 : detailLabel.font.stringSize(string: detail!, constrainedToWidth: Double(width)).height
detailLabel.frame = CGRect(x: 0, y: v.y + detailVerticalOffset, width: width, height: h)
let c = divider.contentEdgeInsets
detailLabel.sizeToFit()
detailLabel.x = c.left
detailLabel.y = height + detailVerticalOffset
detailLabel.width = width - c.left - c.right
}
/// Layout the a button.
......@@ -486,6 +509,17 @@ open class TextField: UITextField {
button?.frame = CGRect(x: width - height, y: 0, width: height, height: height)
}
/// Layout the leftView.
open func layoutLeftView() {
guard let v = leftView else {
return
}
v.width = leftViewWidth
v.height = height
v.contentMode = .center
}
/// The animation for the divider when editing begins.
open func dividerEditingDidBeginAnimation() {
......@@ -518,13 +552,16 @@ open class TextField: UITextField {
return
}
let x = s.leftViewWidth
s.divider.contentEdgeInsets.left = x
s.placeholderLabel.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
switch s.textAlignment {
case .left, .natural:
s.placeholderLabel.x = 0
s.placeholderLabel.x = x
case .right:
s.placeholderLabel.x = s.width - s.placeholderLabel.width
s.placeholderLabel.x = s.width - s.placeholderLabel.width - x
default:break
}
......@@ -547,9 +584,12 @@ open class TextField: UITextField {
guard let s = self else {
return
}
let x = s.leftViewWidth
s.divider.contentEdgeInsets.left = x
s.placeholderLabel.transform = CGAffineTransform.identity
s.placeholderLabel.x = s.leftView?.width ?? 0
s.placeholderLabel.x = x
s.placeholderLabel.y = 0
s.placeholderLabel.textColor = s.placeholderNormalColor
}) { [weak self] _ in
......@@ -567,10 +607,10 @@ open class TextField: UITextField {
/// Prepares the placeholderLabel.
private func preparePlaceholderLabel() {
placeholderLabel = UILabel()
placeholderNormalColor = Color.darkText.others
placeholderNormalColor = Color.darkText.others
font = RobotoFont.regular(with: 16)
addSubview(placeholderLabel)
addObserver(self, forKeyPath: "placeholderLabel.text", options: [], context: &TextFieldContext)
}
/// Prepares the detailLabel.
......@@ -593,8 +633,17 @@ open class TextField: UITextField {
textAlignment = .rightToLeft == UIApplication.shared.userInterfaceLayoutDirection ? .right : .left
}
/// Updates the placeholderLabel attributedText.
private func updatePlaceholderLabelColor() {
guard let v = placeholder else {
return
}
placeholderLabel.attributedText = NSAttributedString(string: v, attributes: [NSForegroundColorAttributeName: isEditing ? placeholderActiveColor : placeholderNormalColor])
}
/// Updates the detailLabel attributedText.
private func updateDetailLabelAttributedText() {
private func updateDetailLabelColor() {
guard let v = detail else {
return
}
......
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