From ef5e04de107e1100ab0db48716032c38bf72e3bc Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Tue, 14 Jul 2020 21:24:16 -0400 Subject: [PATCH 1/3] moleculeName for encode --- .../NavigationBar/Buttons/NavigationLabelButtonModel.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationLabelButtonModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationLabelButtonModel.swift index e113c1f6..eb8e8c43 100644 --- a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationLabelButtonModel.swift +++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationLabelButtonModel.swift @@ -11,16 +11,19 @@ import Foundation public class NavigationLabelButtonModel: NavigationButtonModelProtocol, MoleculeModelProtocol { public var backgroundColor: Color? public static var identifier: String = "navigationLabelButton" + public var moleculeName: String = NavigationLabelButtonModel.identifier public var title: String public var action: ActionModelProtocol public init(with title: String, action: ActionModelProtocol) { + self.moleculeName = NavigationLabelButtonModel.identifier self.title = title self.action = action } private enum CodingKeys: String, CodingKey { + case moleculeName case title case action } @@ -33,6 +36,7 @@ public class NavigationLabelButtonModel: NavigationButtonModelProtocol, Molecule open func encode(to encoder: Encoder) throws { var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(moleculeName, forKey: .moleculeName) try container.encode(title, forKey: .title) try container.encodeModel(action, forKey: .action) } From 2e6fe01b690dc63eb5ad4ed99653597d4fd258c3 Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Wed, 15 Jul 2020 17:43:19 -0400 Subject: [PATCH 2/3] moleculeName NavigationImageButtonModel --- .../NavigationBar/Buttons/NavigationImageButtonModel.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift index 4c021d5f..91983969 100644 --- a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift +++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift @@ -10,6 +10,7 @@ import Foundation public class NavigationImageButtonModel: NavigationButtonModelProtocol, MoleculeModelProtocol { public var backgroundColor: Color? public static var identifier: String = "navigationImageButton" + public var moleculeName: String = NavigationImageButtonModel.identifier public var image: String public var action: ActionModelProtocol @@ -17,11 +18,13 @@ public class NavigationImageButtonModel: NavigationButtonModelProtocol, Molecule public init(with image: String, action: ActionModelProtocol) { self.image = image self.action = action + self.moleculeName = NavigationImageButtonModel.identifier } private enum CodingKeys: String, CodingKey { case image case action + case moleculeName } required public init(from decoder: Decoder) throws { @@ -33,6 +36,7 @@ public class NavigationImageButtonModel: NavigationButtonModelProtocol, Molecule open func encode(to encoder: Encoder) throws { var container = encoder.container(keyedBy: CodingKeys.self) try container.encode(image, forKey: .image) + try container.encode(moleculeName, forKey: .moleculeName) try container.encodeModel(action, forKey: .action) } From bb6487903b6a10f2562236c27737013787907f77 Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Wed, 15 Jul 2020 18:02:34 -0400 Subject: [PATCH 3/3] fixes --- .../NavigationBar/Buttons/NavigationImageButtonModel.swift | 2 -- .../NavigationBar/Buttons/NavigationLabelButtonModel.swift | 2 -- 2 files changed, 4 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift index 91983969..9313f9a4 100644 --- a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift +++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationImageButtonModel.swift @@ -10,7 +10,6 @@ import Foundation public class NavigationImageButtonModel: NavigationButtonModelProtocol, MoleculeModelProtocol { public var backgroundColor: Color? public static var identifier: String = "navigationImageButton" - public var moleculeName: String = NavigationImageButtonModel.identifier public var image: String public var action: ActionModelProtocol @@ -18,7 +17,6 @@ public class NavigationImageButtonModel: NavigationButtonModelProtocol, Molecule public init(with image: String, action: ActionModelProtocol) { self.image = image self.action = action - self.moleculeName = NavigationImageButtonModel.identifier } private enum CodingKeys: String, CodingKey { diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationLabelButtonModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationLabelButtonModel.swift index eb8e8c43..8d9f85ae 100644 --- a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationLabelButtonModel.swift +++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/NavigationLabelButtonModel.swift @@ -11,13 +11,11 @@ import Foundation public class NavigationLabelButtonModel: NavigationButtonModelProtocol, MoleculeModelProtocol { public var backgroundColor: Color? public static var identifier: String = "navigationLabelButton" - public var moleculeName: String = NavigationLabelButtonModel.identifier public var title: String public var action: ActionModelProtocol public init(with title: String, action: ActionModelProtocol) { - self.moleculeName = NavigationLabelButtonModel.identifier self.title = title self.action = action }