diff --git a/MVMCoreUI/Molecules/Items/DropDownListItemModel.swift.orig b/MVMCoreUI/Molecules/Items/DropDownListItemModel.swift.orig deleted file mode 100644 index e702000b..00000000 --- a/MVMCoreUI/Molecules/Items/DropDownListItemModel.swift.orig +++ /dev/null @@ -1,55 +0,0 @@ -// -// DropDownListItemModel.swift -// MVMCoreUI -// -// Created by Suresh, Kamlesh on 12/12/19. -// Copyright © 2019 Verizon Wireless. All rights reserved. -// - -import Foundation - -@objcMembers public class DropDownListItemModel: ContainerModel, ListItemModelProtocol { - public static var identifier: String = "dropDownListItem" - public var molecules: [[ListItemModelProtocol]] - public var dropDown: ItemDropdownEntryFieldModel - public var backgroundColor: Color? - public var line: LineModel? = LineModel(type: .none) - public var hideArrow: Bool? = true - -<<<<<<< HEAD - public init(molecule: MoleculeModelProtocol, molecules: [[ListItemModelProtocol]], dropDown: ItemDropdownEntryFieldModel) { -======= - public init(molecules: [[ListItemModelProtocol]], dropDown: DropDownModel) { ->>>>>>> remotes/origin/feature/coding - self.molecules = molecules - self.dropDown = dropDown - super.init() - } - - private enum CodingKeys: String, CodingKey { - case molecules - case dropDown - case line - case backgroundColor - } - - required public init(from decoder: Decoder) throws { - let typeContainer = try decoder.container(keyedBy: CodingKeys.self) - molecules = try typeContainer.decodeMolecules2D(codingKey: .molecules) as! [[ListItemModelProtocol]] - dropDown = try typeContainer.decode(ItemDropdownEntryFieldModel.self, forKey: .dropDown) - if let lineModel = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line) { - line = lineModel - } - backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) - try super.init(from: decoder) - } - - public override func encode(to encoder: Encoder) throws { - try super.encode(to: encoder) - var container = encoder.container(keyedBy: CodingKeys.self) - try container.encodeModels2D(molecules, forKey: .molecules) - try container.encode(dropDown, forKey: .dropDown) - try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) - try container.encodeIfPresent(line, forKey: .line) - } -}