From 904f8a35a262f931f0dd16dc0e718d2f02770258 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Wed, 15 Apr 2020 13:00:04 -0400 Subject: [PATCH] reverting change --- MVMCoreUI/Atomic/Atoms/TextFields/DateDropdownEntryField.swift | 1 + MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift | 2 +- MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/DateDropdownEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/DateDropdownEntryField.swift index 1c2fef83..9860cd5b 100644 --- a/MVMCoreUI/Atomic/Atoms/TextFields/DateDropdownEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/TextFields/DateDropdownEntryField.swift @@ -31,6 +31,7 @@ import UIKit return formatter }() + /// Update the property value to alter the format of how the date is presented. public var dateFormat: String = "MMM d, y" { didSet { dateFormatter.dateFormat = dateFormat } } diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift index 5e874936..d5abbe9f 100644 --- a/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift @@ -67,7 +67,7 @@ import UIKit public var showError: Bool { get { return entryFieldContainer.showError } set (error) { - self.feedback = error ? entryFieldModel?.errorMessage : entryFieldModel?.informativeMessage + self.feedback = error ? entryFieldModel?.errorMessage : entryFieldModel?.feedback self.entryFieldContainer.showError = error } } diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift index 1f0e3d78..0da17d96 100644 --- a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift +++ b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift @@ -87,7 +87,6 @@ import Foundation } feedback = try typeContainer.decodeIfPresent(String.self, forKey: .feedback) - informativeMessage = feedback if let errorMessage = try typeContainer.decodeIfPresent(String.self, forKey: .errorMessage) { self.errorMessage = errorMessage