mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/DigitEntryField' into 'develop'

Browse Source 
DigitEntryField was not showing errors

See merge request BPHV_MIPS/mvm_core_ui!811
This commit is contained in:
Bruce, Matt R 2022-03-11 14:29:48 +00:00
commit 3e6c2f1702
2 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitBox.swift
View File

@ -38,29 +38,6 @@ import UIKit
// Default dimensions of the DigitBox
static let size: CGSize = CGSize(width: 39, height: 44)
//--------------------------------------------------
// MARK: - Computed Properties
//--------------------------------------------------
public override var showError: Bool {
get { super.showError }
set (error) {
DispatchQueue.main.async { [weak self] in
guard let self = self else { return }
self.borderStrokeColor = error ? .mvmOrange : .mvmCoolGray3
let barHeight: CGFloat = self.showError ? 4 : 1
self.bottomBar?.frame = CGRect(x: 0, y: self.bounds.height - barHeight, width: self.bounds.width, height: barHeight)
self.bottomBar?.backgroundColor = self.showError ? UIColor.mvmOrange.cgColor : UIColor.mvmBlack.cgColor
self.setNeedsDisplay()
self.layoutIfNeeded()
}
super.showError = error
}
}
//--------------------------------------------------
// MARK: - Delegate
//--------------------------------------------------

11
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift
View File

@ -105,7 +105,7 @@ import UIKit
super.isLocked = locked
}
}
public override var placeholder: String? {
get {
var string = ""
@ -311,7 +311,6 @@ import UIKit
//--------------------------------------------------
@objc override func startEditing() {
selectedDigitBox?.isSelected = true
selectedDigitBox?.digitField.becomeFirstResponder()
}
@ -328,7 +327,6 @@ import UIKit
}
@objc public override func dismissFieldInput(_ sender: Any?) {
digitBoxes.forEach {
if $0.isSelected {
$0.digitField.resignFirstResponder()
@ -398,7 +396,6 @@ extension DigitEntryField {
digitEntryModel?.text = text
return false
}
return true
}
@ -411,9 +408,9 @@ extension DigitEntryField {
}
@objc public func textFieldDidBeginEditing(_ textField: UITextField) {
digitBoxes.forEach {
if $0.digitField === textField {
startEditing()
selectedDigitBox = $0
$0.isSelected = true
return
@ -429,15 +426,15 @@ extension DigitEntryField {
}
@objc public func textFieldDidEndEditing(_ textField: UITextField) {
// There should only be one digitBox to deselect.
selectedDigitBox?.isSelected = false
selectedDigitBox = nil
if !switchFieldsAutomatically && validateWhenDoneEditing {
validateText()
endInputing()
}
proprietorTextDelegate?.textFieldDidEndEditing?(textField)
}