From 11aaedfa6b6b54d54e2a979ee65ee7cf81daf14c Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Fri, 24 Jan 2020 13:25:59 -0500 Subject: [PATCH] pr fixes --- MVMCoreUI/Molecules/Items/CarouselItemModel.swift | 2 -- MVMCoreUI/Molecules/Items/DropDownListItemModel.swift | 3 ++- MVMCoreUI/Molecules/Items/ListItemModel.swift | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/MVMCoreUI/Molecules/Items/CarouselItemModel.swift b/MVMCoreUI/Molecules/Items/CarouselItemModel.swift index 4f4c3b58..f2c88e9b 100644 --- a/MVMCoreUI/Molecules/Items/CarouselItemModel.swift +++ b/MVMCoreUI/Molecules/Items/CarouselItemModel.swift @@ -21,7 +21,6 @@ import Foundation case backgroundColor case peakingUI case peakingArrowColor - case molecule } required public init(from decoder: Decoder) throws { @@ -40,6 +39,5 @@ import Foundation try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) try container.encodeIfPresent(peakingUI, forKey: .peakingUI) try container.encodeIfPresent(peakingArrowColor, forKey: .peakingArrowColor) - try container.encodeModel(molecule, forKey: .molecule) } } diff --git a/MVMCoreUI/Molecules/Items/DropDownListItemModel.swift b/MVMCoreUI/Molecules/Items/DropDownListItemModel.swift index 5120eb0f..35f69b51 100644 --- a/MVMCoreUI/Molecules/Items/DropDownListItemModel.swift +++ b/MVMCoreUI/Molecules/Items/DropDownListItemModel.swift @@ -52,8 +52,8 @@ import Foundation //-------------------------------------------------- private enum CodingKeys: String, CodingKey { + case moleculeName case molecules - case molecule case dropDown case line case backgroundColor @@ -80,6 +80,7 @@ import Foundation public override func encode(to encoder: Encoder) throws { try super.encode(to: encoder) var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(moleculeName, forKey: .moleculeName) try container.encodeModels2D(molecules, forKey: .molecules) try container.encode(dropDown, forKey: .dropDown) try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) diff --git a/MVMCoreUI/Molecules/Items/ListItemModel.swift b/MVMCoreUI/Molecules/Items/ListItemModel.swift index a5490651..ffb0eb35 100644 --- a/MVMCoreUI/Molecules/Items/ListItemModel.swift +++ b/MVMCoreUI/Molecules/Items/ListItemModel.swift @@ -21,7 +21,6 @@ import MVMCore private enum CodingKeys: String, CodingKey { case moleculeName case backgroundColor - case molecule case action case hideArrow case line @@ -65,8 +64,6 @@ import MVMCore public override func encode(to encoder: Encoder) throws { try super.encode(to: encoder) var container = encoder.container(keyedBy: CodingKeys.self) - try container.encodeModel(molecule, forKey: .molecule) - try container.encode(moleculeName, forKey: .moleculeName) try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) try container.encodeModelIfPresent(action, forKey: .action)