From 9a62ae69877633c3f9c90e64516f3233e31e780f Mon Sep 17 00:00:00 2001 From: "Bruce, Matt R" Date: Fri, 11 Mar 2022 14:29:46 +0000 Subject: [PATCH] DigitEntryField was not showing errors --- .../FormFields/TextFields/DigitBox.swift | 23 ------------------- .../TextFields/DigitEntryField.swift | 11 ++++----- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitBox.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitBox.swift index 912b0891..399cedac 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitBox.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitBox.swift @@ -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 //-------------------------------------------------- diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift index c70d458e..a0de9d1f 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift @@ -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) }