From 3eb97d65c92a33264c0e0149228e7c461f0de144 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Fri, 24 Jan 2020 15:06:45 -0500 Subject: [PATCH] fixing reuse error in setWithModel --- MVMCoreUI/Atoms/TextFields/EntryField.swift | 11 ++++++++--- MVMCoreUI/Atoms/TextFields/EntryFieldModel.swift | 8 ++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/MVMCoreUI/Atoms/TextFields/EntryField.swift b/MVMCoreUI/Atoms/TextFields/EntryField.swift index e70a2df0..82cc69f6 100644 --- a/MVMCoreUI/Atoms/TextFields/EntryField.swift +++ b/MVMCoreUI/Atoms/TextFields/EntryField.swift @@ -249,11 +249,16 @@ import UIKit entryFieldContainer.setWithModel(model, delegateObject, additionalData) title = model.title - isEnabled = model.isEnabled feedback = model.feedback errorMessage = model.errorMessage - isLocked = model.isLocked - isSelected = model.isSelected + isEnabled = model.isEnabled + + if let isLocked = model.isLocked { + self.isLocked = isLocked + + } else if let isSelected = model.isSelected{ + self.isSelected = isSelected + } if let fieldKey = model.fieldKey { self.fieldKey = fieldKey diff --git a/MVMCoreUI/Atoms/TextFields/EntryFieldModel.swift b/MVMCoreUI/Atoms/TextFields/EntryFieldModel.swift index 70c1c0e3..5f60081e 100644 --- a/MVMCoreUI/Atoms/TextFields/EntryFieldModel.swift +++ b/MVMCoreUI/Atoms/TextFields/EntryFieldModel.swift @@ -24,8 +24,8 @@ import Foundation public var feedback: String? public var errorMessage: String = "" public var isEnabled: Bool = true - public var isLocked: Bool = false - public var isSelected: Bool = false + public var isLocked: Bool? + public var isSelected: Bool? public var fieldKey: String? public var isValid: Bool? public var isRequired: Bool? @@ -60,8 +60,8 @@ import Foundation feedback = try typeContainer.decodeIfPresent(String.self, forKey: .feedback) errorMessage = try typeContainer.decodeIfPresent(String.self, forKey: .errorMessage) ?? "" isEnabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .isEnabled) ?? true - isLocked = try typeContainer.decodeIfPresent(Bool.self, forKey: .isLocked) ?? false - isSelected = try typeContainer.decodeIfPresent(Bool.self, forKey: .isSelected) ?? false + isLocked = try typeContainer.decodeIfPresent(Bool.self, forKey: .isLocked) + isSelected = try typeContainer.decodeIfPresent(Bool.self, forKey: .isSelected) fieldKey = try typeContainer.decodeIfPresent(String.self, forKey: .fieldKey) isValid = try typeContainer.decodeIfPresent(Bool.self, forKey: .isValid) }