Skip to content

Use border instead of underline #74

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

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

Use border instead of underline #74

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
971ba5e
Improve way to set correct underline color
Luckcheese Dec 4, 2020
f880200
Add flag to print border instead of underline
Luckcheese Dec 4, 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
32 changes: 20 additions & 12 deletions Pod/PinCodeTextField.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ import UIKit
@IBInspectable public var characterBackgroundColor: UIColor = UIColor.clear
@IBInspectable public var characterBackgroundCornerRadius: CGFloat = 0
@IBInspectable public var highlightInputUnderline: Bool = false

@IBInspectable public var showBorderInsteadOfUnderline: Bool = false

//MARK: Customizable from code
public var keyboardType: UIKeyboardType = UIKeyboardType.alphabet
public var keyboardAppearance: UIKeyboardAppearance = UIKeyboardAppearance.default
Expand Down Expand Up @@ -207,22 +208,26 @@ import UIKit
}
}

private func underlineColorForIndex(_ index: Int) -> UIColor {
(!highlightInputUnderline || !isInput(index)) && isPlaceholder(index)
? underlineColor
: updatedUnderlineColor
}

private func updateUnderlines() {
for label in labels {
let index = labels.firstIndex(of: label) ?? 0
if (!highlightInputUnderline || !isInput(index)) && isPlaceholder(index) {
underlines[index].backgroundColor = underlineColor
}
else{
underlines[index].backgroundColor = updatedUnderlineColor
}
for (index, underline) in underlines.enumerated() {
underline.backgroundColor = underlineColorForIndex(index)
}
}

private func updateBackgrounds() {
for background in backgrounds {
for (index, background) in backgrounds.enumerated() {
background.backgroundColor = characterBackgroundColor
background.layer.cornerRadius = characterBackgroundCornerRadius
if showBorderInsteadOfUnderline {
background.layer.borderWidth = underlineHeight
background.layer.borderColor = underlineColorForIndex(index).cgColor
}
}
}

Expand Down Expand Up @@ -274,9 +279,12 @@ import UIKit
let underlineY = bounds.height / 2 + totalLabelHeight / 2 + underlineVMargin

for i in 0..<underlines.count {
let underline = underlines[i]
if !showBorderInsteadOfUnderline {
let underline = underlines[i]
underline.frame = CGRect(x: currentUnderlineX, y: underlineY, width: underlineWidth, height: underlineHeight)
}

let background = backgrounds[i]
underline.frame = CGRect(x: currentUnderlineX, y: underlineY, width: underlineWidth, height: underlineHeight)
background.frame = CGRect(x: currentUnderlineX, y: 0, width: underlineWidth, height: bounds.height)
currentUnderlineX += underlineWidth + underlineHSpacing
}
Expand Down