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

dynamic

Browse Source
This commit is contained in:
Kevin G Christiano 2020-12-23 09:59:38 -05:00
parent f040331b2c
commit 57a3b92bb5
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift
View File

@ -71,13 +71,17 @@ import UIKit
public var showError: Bool { public var showError: Bool {
get { return entryFieldContainer.showError } get { return entryFieldContainer.showError }
set (error) { set (error) {
self.feedback = error ? entryFieldModel?.errorMessage : entryFieldModel?.feedback self.feedback = error ? errorMessage : entryFieldModel?.feedback
self.feedbackLabel.textColor = error ? entryFieldModel?.errorTextColor?.uiColor ?? .mvmBlack : .mvmBlack self.feedbackLabel.textColor = error ? entryFieldModel?.errorTextColor?.uiColor ?? .mvmBlack : .mvmBlack
self.entryFieldContainer.showError = error self.entryFieldContainer.showError = error
self.entryFieldModel?.showError = error self.entryFieldModel?.showError = error
} }
} }
var errorMessage: String {
(entryFieldModel?.dynamicErrorMessage != nil ? entryFieldModel?.dynamicErrorMessage : entryFieldModel?.errorMessage) ?? ""
}
/// Toggles original or locked UI. /// Toggles original or locked UI.
public var isLocked: Bool { public var isLocked: Bool {
get { return entryFieldContainer.isLocked } get { return entryFieldContainer.isLocked }
@ -326,7 +330,9 @@ import UIKit
self.isSelected = true self.isSelected = true
} }
showError = model.isValid! if model.dynamicErrorMessage != nil {
showError = model.isValid!
}
} }
open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? { open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {

2
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryFieldModel.swift
View File

@ -21,6 +21,7 @@ import Foundation
public var backgroundColor: Color? public var backgroundColor: Color?
public var title: String? public var title: String?
public var feedback: String? public var feedback: String?
public var dynamicErrorMessage: String?
public var errorMessage: String? public var errorMessage: String?
public var errorTextColor: Color? public var errorTextColor: Color?
public var enabled: Bool = true public var enabled: Bool = true
@ -67,6 +68,7 @@ import Foundation
//-------------------------------------------------- //--------------------------------------------------
public func formFieldValue() -> AnyHashable? { public func formFieldValue() -> AnyHashable? {
dynamicErrorMessage = nil
return text return text
} }

2
MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
View File

@ -166,7 +166,7 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
let entryFieldModel = formValidator?.fields[fieldKey] as? EntryFieldModel let entryFieldModel = formValidator?.fields[fieldKey] as? EntryFieldModel
else { continue } else { continue }
entryFieldModel.errorMessage = userError entryFieldModel.dynamicErrorMessage = userError
entryFieldModel.isValid = true entryFieldModel.isValid = true
entryFieldModel.text = "" entryFieldModel.text = ""