Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the distance between flag/code and phone number for iOS 13+ #165

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Fix the distance between flag/code and phone number for iOS 13+ #165

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5487f00
Fix phone number distance from flag
Ku6ep Jun 11, 2020
0b44645
Merge pull request #1 from Ku6ep/fix/fix_phone_number_distance
Ku6ep Jun 11, 2020
daa2fdc
Update podspec
Ku6ep Jun 11, 2020
13a4955
Update FlagPhoneNumber.podspec
Ku6ep Jun 11, 2020
aac4f57
Merge pull request #2 from Ku6ep/fix/fix_phone_number_distance
Ku6ep Jun 11, 2020
c5e4581
Update FlagPhoneNumber.podspec
Ku6ep Jun 11, 2020
1bb0a59
Change Podspec file
Ku6ep Jun 11, 2020
f796002
Add new podspec
Ku6ep Jun 11, 2020
d12ca5c
Fix changes
Ku6ep Jun 11, 2020
32774c6
Return original podspec
Ku6ep Jun 11, 2020
2a1b113
Make distance bigger
Ku6ep Jun 11, 2020
5e248b9
Fix error
Ku6ep Jun 11, 2020
0fb1525
Fix wrong position. Add space via padding for text field
Ku6ep Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions Sources/FPNTextField.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ open class FPNTextField: UITextField {

private var flagWidthConstraint: NSLayoutConstraint?
private var flagHeightConstraint: NSLayoutConstraint?
private var padding = UIEdgeInsets(top: 0, left: 70, bottom: 0, right: 5)

/// The size of the leftView
private var leftViewSize: CGSize {
Expand Down Expand Up @@ -48,6 +49,20 @@ open class FPNTextField: UITextField {
}
}

override open func textRect(forBounds bounds: CGRect) -> CGRect {
super.textRect(forBounds: bounds)
return bounds.inset(by: padding)
}

override open func placeholderRect(forBounds bounds: CGRect) -> CGRect {
super.placeholderRect(forBounds: bounds)
return bounds.inset(by: padding)
}

override open func editingRect(forBounds bounds: CGRect) -> CGRect {
super.editingRect(forBounds: bounds)
return bounds.inset(by: padding)
}
/// Present in the placeholder an example of a phone number according to the selected country code.
/// If false, you can set your own placeholder. Set to true by default.
@objc open var hasPhoneNumberExample: Bool = true {
Expand Down Expand Up @@ -150,8 +165,7 @@ open class FPNTextField: UITextField {

NSLayoutConstraint(item: flagButton, attribute: .centerY, relatedBy: .equal, toItem: leftView, attribute: .centerY, multiplier: 1, constant: 0).isActive = true

NSLayoutConstraint(item: flagButton, attribute: .leading, relatedBy: .equal, toItem: leftView, attribute: .leading, multiplier: 1, constant: 0).isActive = true
NSLayoutConstraint(item: phoneCodeTextField, attribute: .leading, relatedBy: .equal, toItem: flagButton, attribute: .trailing, multiplier: 1, constant: 0).isActive = true
NSLayoutConstraint(item: phoneCodeTextField, attribute: .leading, relatedBy: .equal, toItem: flagButton, attribute: .trailing, multiplier: 1, constant: 0).isActive = true
NSLayoutConstraint(item: phoneCodeTextField, attribute: .trailing, relatedBy: .equal, toItem: leftView, attribute: .trailing, multiplier: 1, constant: 0).isActive = true
NSLayoutConstraint(item: phoneCodeTextField, attribute: .top, relatedBy: .equal, toItem: leftView, attribute: .top, multiplier: 1, constant: 0).isActive = true
NSLayoutConstraint(item: phoneCodeTextField, attribute: .bottom, relatedBy: .equal, toItem: leftView, attribute: .bottom, multiplier: 1, constant: 0).isActive = true
Expand Down Expand Up @@ -378,6 +392,7 @@ open class FPNTextField: UITextField {

if let phoneCode = selectedCountry?.phoneCode {
phoneCodeTextField.text = phoneCode
padding = UIEdgeInsets(top: 0, left: CGFloat(70 + (phoneCode.count-2) * 10), bottom: 0, right: 5)
}

if hasPhoneNumberExample == true {
Expand Down