Clean up and list item convenience

MVMCoreUI.xcodeproj/project.pbxproj

@@ -54,7 +54,7 @@
 		01E569D3223FFFA500327251 /* ThreeLayerViewController.swift in Headers */ = {isa = PBXBuildFile; fileRef = D2A5146A2214905000345BFB /* ThreeLayerViewController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		01EB3684236097C0006832FA /* MoleculeModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EB3683236097C0006832FA /* MoleculeModelProtocol.swift */; };
 		01EB368F23609801006832FA /* LabelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EB368823609801006832FA /* LabelModel.swift */; };
-		01EB369023609801006832FA /* ListItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EB368923609801006832FA /* ListItemModel.swift */; };
+		01EB369023609801006832FA /* MoleculeListItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EB368923609801006832FA /* MoleculeListItemModel.swift */; };
 		01EB369223609801006832FA /* MoleculeStackModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EB368B23609801006832FA /* MoleculeStackModel.swift */; };
 		01EB369323609801006832FA /* HeaderModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EB368C23609801006832FA /* HeaderModel.swift */; };
 		01EB369423609801006832FA /* HeadlineBodyModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EB368D23609801006832FA /* HeadlineBodyModel.swift */; };
@@ -169,6 +169,7 @@
 		D260D7B622D68514007E7233 /* MVMCoreUIPagingProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = D260D7B522D68509007E7233 /* MVMCoreUIPagingProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D268C70C2386DFFD007F2C1C /* MoleculeStackItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EB368A23609801006832FA /* MoleculeStackItemModel.swift */; };
 		D268C70E238C22D7007F2C1C /* DropDownFilterTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D268C70D238C22D7007F2C1C /* DropDownFilterTableViewCell.swift */; };
+		D26C5A6B23F4A40D007AEECE /* ListItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D26C5A6A23F4A40D007AEECE /* ListItemModel.swift */; };
 		D274CA332236A78900B01B62 /* FooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D274CA322236A78900B01B62 /* FooterView.swift */; };
 		D2755D7B23689C7500485468 /* TableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2755D7A23689C7500485468 /* TableViewCell.swift */; };
 		D27CD40E2322EEAF00C1DC07 /* TabsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D27CD40D2322EEAF00C1DC07 /* TabsTableViewCell.swift */; };
@@ -384,7 +385,7 @@
 		01C851D223CF9E740021F976 /* LabelToggleModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelToggleModel.swift; sourceTree = "<group>"; };
 		01EB3683236097C0006832FA /* MoleculeModelProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoleculeModelProtocol.swift; sourceTree = "<group>"; };
 		01EB368823609801006832FA /* LabelModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LabelModel.swift; sourceTree = "<group>"; };
-		01EB368923609801006832FA /* ListItemModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListItemModel.swift; sourceTree = "<group>"; };
+		01EB368923609801006832FA /* MoleculeListItemModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoleculeListItemModel.swift; sourceTree = "<group>"; };
 		01EB368A23609801006832FA /* MoleculeStackItemModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoleculeStackItemModel.swift; sourceTree = "<group>"; };
 		01EB368B23609801006832FA /* MoleculeStackModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoleculeStackModel.swift; sourceTree = "<group>"; };
 		01EB368C23609801006832FA /* HeaderModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeaderModel.swift; sourceTree = "<group>"; };
@@ -489,6 +490,7 @@
 		D260D7B022D65BDD007E7233 /* MVMCoreUIPageControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUIPageControl.m; sourceTree = "<group>"; };
 		D260D7B522D68509007E7233 /* MVMCoreUIPagingProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIPagingProtocol.h; sourceTree = "<group>"; };
 		D268C70D238C22D7007F2C1C /* DropDownFilterTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DropDownFilterTableViewCell.swift; sourceTree = "<group>"; };
+		D26C5A6A23F4A40D007AEECE /* ListItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListItemModel.swift; sourceTree = "<group>"; };
 		D274CA322236A78900B01B62 /* FooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FooterView.swift; sourceTree = "<group>"; };
 		D2755D7A23689C7500485468 /* TableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewCell.swift; sourceTree = "<group>"; };
 		D27CD40D2322EEAF00C1DC07 /* TabsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsTableViewCell.swift; sourceTree = "<group>"; };
@@ -927,8 +929,8 @@
 		D22479912316A9EF003FCCF9 /* Items */ = {
 			isa = PBXGroup;
 			children = (
-				D2755D7A23689C7500485468 /* TableViewCell.swift */,
+				D26C5A6A23F4A40D007AEECE /* ListItemModel.swift */,
-				01EB368923609801006832FA /* ListItemModel.swift */,
+				01EB368923609801006832FA /* MoleculeListItemModel.swift */,
 				01509D8E2327EC6F00EF99AA /* MoleculeTableViewCell.swift */,
 				012A88C1238D7BCA00FE3DA1 /* CarouselItemModel.swift */,
 				D2A6390422CBCE160052ED1F /* MoleculeCollectionViewCell.swift */,
@@ -1430,6 +1432,7 @@
 				D2B18B7E2360913400A9AEDC /* Control.swift */,
 				D2B18B802360945C00A9AEDC /* View.swift */,
 				0AE14F63238315D2005417F8 /* TextField.swift */,
+				D2755D7A23689C7500485468 /* TableViewCell.swift */,
 				0A5D59C323AD488600EFD9E9 /* Protocols */,
 			);
 			path = BaseClasses;
@@ -1682,7 +1685,7 @@
 				012A88EC238F084D00FE3DA1 /* FooterModel.swift in Sources */,
 				D2A514672213885800345BFB /* HeaderView.swift in Sources */,
 				D29E28D823D21AB800ACEA85 /* StringAndMoleculeView.swift in Sources */,
-				01EB369023609801006832FA /* ListItemModel.swift in Sources */,
+				01EB369023609801006832FA /* MoleculeListItemModel.swift in Sources */,
 				D28A838323CCBD3F00DFE4FC /* CircleProgressModel.swift in Sources */,
 				D268C70C2386DFFD007F2C1C /* MoleculeStackItemModel.swift in Sources */,
 				DBEFFA04225A829700230692 /* Label.swift in Sources */,
@@ -1792,6 +1795,7 @@
 				D20A9A5E2243D3E300ADE781 /* TwoButtonView.swift in Sources */,
 				D2B1E3E522F37D6A0065F95C /* ImageHeadlineBody.swift in Sources */,
 				0A21DB94235E24ED00C160A2 /* DigitEntryField.swift in Sources */,
+				D26C5A6B23F4A40D007AEECE /* ListItemModel.swift in Sources */,
 				0A21DB8D235E06EF00C160A2 /* MFDigitTextField.m in Sources */,
 				94AF4A4323E9D19E00676048 /* MFCaretView.m in Sources */,
 				943784F6236B77BB006A1E82 /* GraphViewAnimationHandler.swift in Sources */,

MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaret.swift

@@ -29,9 +29,6 @@ import UIKit
     
     override open func setupView() {
         super.setupView()
-        guard leftImage.superview == nil else {
-            return
-        }
         stack.translatesAutoresizingMaskIntoConstraints = false
         stack.stackItems = [StackItem(andContain: leftImage),StackItem(andContain: leftLabel),StackItem(andContain: rightLabel)]
         contentView.addSubview(stack)

MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretModel.swift

@@ -8,25 +8,14 @@
 
 import Foundation
 
-public class ListLeftVariableIconWithRightCaretModel: ContainerModel, ListItemModelProtocol {
+public class ListLeftVariableIconWithRightCaretModel: ListItemModel, MoleculeModelProtocol {
-    
-    public var line: LineModel?
-    public var style: String? = "standard"
-    public var hideArrow: Bool? = false
-    public var backgroundColor: Color?
-    public var action: ActionModelProtocol?
     public static var identifier: String = "listLVImg"
     public var image: ImageViewModel
     public var leftLabel: LabelModel
     public var rightLabel: LabelModel
     
-    func setDefaults() {
+    override public func setDefaults() {
-        if useHorizontalMargins == nil {
+        super.setDefaults()
-            useHorizontalMargins = true
-        }
-        if useVerticalMargins == nil {
-            useVerticalMargins = true
-        }
         if image.height == nil {
             image.height = 30.0
         }
@@ -37,7 +26,6 @@ public class ListLeftVariableIconWithRightCaretModel: ContainerModel, ListItemMo
         self.leftLabel = leftLabel
         self.rightLabel = rightLabel
         super.init()
-        setDefaults()
     }
     
     private enum CodingKeys: String, CodingKey {
@@ -45,8 +33,6 @@ public class ListLeftVariableIconWithRightCaretModel: ContainerModel, ListItemMo
         case leftLabel
         case rightLabel
         case image
-        case action
-        case backgroundColor
     }
     
     required public init(from decoder: Decoder) throws {
@@ -54,10 +40,7 @@ public class ListLeftVariableIconWithRightCaretModel: ContainerModel, ListItemMo
         leftLabel = try typeContainer.decode(LabelModel.self, forKey: .leftLabel)
         rightLabel = try typeContainer.decode(LabelModel.self, forKey: .rightLabel)
         image = try typeContainer.decode(ImageViewModel.self, forKey: .image)
-        action = try typeContainer.decodeModelIfPresent(codingKey: .action, typeCodingKey: ActionCodingKey.actionType)
-        backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         try super.init(from: decoder)
-        setDefaults()
     }
     
     public  override func encode(to encoder: Encoder) throws {
@@ -67,8 +50,6 @@ public class ListLeftVariableIconWithRightCaretModel: ContainerModel, ListItemMo
         try container.encode(leftLabel, forKey: .leftLabel)
         try container.encode(rightLabel, forKey: .rightLabel)
         try container.encode(image, forKey: .image)
-        try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
-        try container.encodeModelIfPresent(action, forKey: .action)
     }
 }
 

MVMCoreUI/Molecules/DesignedComponents/SectionDividers/ThreeColumn/ListThreeColumnPlanDataDivider.swift

@@ -23,9 +23,7 @@ import Foundation
     
     open override func setupView() {
         super.setupView()
-        guard leftHeadlineBody.superview == nil else {
+
-            return
-        }
         //using stackItems to align the three headlineBody
         stack.translatesAutoresizingMaskIntoConstraints = false
         stack.stackItems = [StackItem(andContain: leftHeadlineBody),StackItem(andContain: centerHeadLineBody),StackItem(andContain: rightHeadLineBody)]

MVMCoreUI/Molecules/DesignedComponents/SectionDividers/ThreeColumn/ListThreeColumnPlanDataDividerModel.swift

@@ -8,11 +8,7 @@
 
 import UIKit
 
-public class ListThreeColumnPlanDataDividerModel: ContainerModel, ListItemModelProtocol {
+public class ListThreeColumnPlanDataDividerModel: ListItemModel, MoleculeModelProtocol {
-    public var hideArrow: Bool?
-    public var style: String? = "tallDivider"
-    public var line: LineModel?
-    public var backgroundColor: Color?
     public static var identifier: String = "list3CHBDiv"
     public var leftHeadlineBody: HeadlineBodyModel
     public var centerHeadlineBody: HeadlineBodyModel
@@ -27,13 +23,9 @@ public class ListThreeColumnPlanDataDividerModel: ContainerModel, ListItemModelP
     }
     
     /// Defaults to set
-    func setDefaults() {
+    override public func setDefaults() {
-        if useHorizontalMargins == nil {
+        super.setDefaults()
-            useHorizontalMargins = true
+        style = "tallDivider"
-        }
-        if useVerticalMargins == nil {
-            useVerticalMargins = true
-        }
     }
     
     private enum CodingKeys: String, CodingKey {
@@ -41,7 +33,6 @@ public class ListThreeColumnPlanDataDividerModel: ContainerModel, ListItemModelP
         case leftHeadlineBody
         case centerHeadlineBody
         case rightHeadlineBody
-        case backgroundColor
     }
     
     required public init(from decoder: Decoder) throws {
@@ -49,9 +40,7 @@ public class ListThreeColumnPlanDataDividerModel: ContainerModel, ListItemModelP
         leftHeadlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .leftHeadlineBody)
         centerHeadlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .centerHeadlineBody)
         rightHeadlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .rightHeadlineBody)
-        backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         try super.init(from: decoder)
-        setDefaults()
     }
     
     public override func encode(to encoder: Encoder) throws {
@@ -61,7 +50,6 @@ public class ListThreeColumnPlanDataDividerModel: ContainerModel, ListItemModelP
         try container.encode(leftHeadlineBody, forKey: .leftHeadlineBody)
         try container.encode(centerHeadlineBody, forKey: .centerHeadlineBody)
         try container.encode(rightHeadlineBody, forKey: .rightHeadlineBody)
-        try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
     }
 }
 

MVMCoreUI/Molecules/Items/AccordionListItemModel.swift

@@ -8,28 +8,28 @@
 
 import UIKit
 
-class AccordionListItemModel: MoleculeContainerModel, ListItemModelProtocol {
+class AccordionListItemModel: MoleculeListItemModel {
-    public static var identifier: String = "accordionListItem"
+    override public class var identifier: String {
-    public var molecules: [ListItemModelProtocol]
+        return "accordionListItem"
-    public var backgroundColor: Color?
+    }    
+    public var molecules: [ListItemModelProtocol & MoleculeModelProtocol]
     public var hideLineWhenExpanded: Bool = false
-    public var hideArrow: Bool? = true
-    public var line: LineModel?
 
     private enum CodingKeys: String, CodingKey {
         case moleculeName
         case molecules
-        case backgroundColor
+        case molecule
         case hideLineWhenExpanded
-        case hideArrow
+    }
-        case line
+    
+    public override func setDefaults() {
+        super.setDefaults()
+        hideArrow = true
     }
 
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        molecules = try typeContainer.decodeMolecules(codingKey: .molecules) as! [ListItemModelProtocol]
+        molecules = try typeContainer.decodeMolecules(codingKey: .molecules) as! [ListItemModelProtocol & MoleculeModelProtocol]
-        backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
-        line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line)
         if let hideLine = try typeContainer.decodeIfPresent(Bool.self, forKey: .hideLineWhenExpanded) {
             hideLineWhenExpanded = hideLine
         }
@@ -41,8 +41,6 @@ class AccordionListItemModel: MoleculeContainerModel, ListItemModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encodeModels(molecules, forKey: .molecules)
-        try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeIfPresent(hideLineWhenExpanded, forKey: .hideLineWhenExpanded)
-        try container.encodeIfPresent(line, forKey: .line)
     }
 }

MVMCoreUI/Molecules/Items/AccordionMoleculeTableViewCell.swift

@@ -9,7 +9,9 @@
 import UIKit
 
 @objcMembers public class AccordionMoleculeTableViewCell: MoleculeTableViewCell {
-    var accordionListItemModel: AccordionListItemModel?
+    var accordionListItemModel: AccordionListItemModel? {
+        return listItemModel as? AccordionListItemModel
+    }
     let accordionButton = createAccordionButton()
     
     static func createAccordionButton() -> MFCustomButton {
@@ -30,10 +32,14 @@ import UIKit
     override public func didSelectCell(at index: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
         accordionButton.isSelected = !accordionButton.isSelected
         accordionButton.setTitle(accordionButton.isSelected ? "-" : "+", for: .normal)
-        guard let molecules = accordionListItemModel?.molecules else {
+        guard let model = accordionListItemModel else {
             return
         }
         
+        guard let json = model.toJSON(),
+            let molecules = json.optionalArrayForKey("molecules") as? [[AnyHashable: Any]]
+            else { return }
+
         if accordionButton.isSelected {
             delegateObject?.moleculeDelegate?.addMolecules(molecules, sender: self, animation: .automatic)
         } else {

MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift

@@ -24,9 +24,7 @@ import UIKit
     
     override public func setupView() {
         super.setupView()
-        
+                
-        guard dropDown.superview == nil else { return }
-        
         addMolecule(dropDown)
         dropDown.observeDropdownChange = { [weak self] oldValue, newValue in
             

MVMCoreUI/Molecules/Items/DropDownListItemModel.swift

@@ -8,43 +8,31 @@
 
 import Foundation
 
-@objcMembers public class DropDownListItemModel: ContainerModel, ListItemModelProtocol {
+@objcMembers public class DropDownListItemModel: ListItemModel, MoleculeModelProtocol {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
     
     public static var identifier: String = "dropDownListItem"
-    public var molecules: [[ListItemModelProtocol]]
+    public var molecules: [[ListItemModelProtocol & MoleculeModelProtocol]]
     public var dropDown: ItemDropdownEntryFieldModel
-    public var backgroundColor: Color?
-    public var line: LineModel? = LineModel(type: .none)
-    public var hideArrow: Bool? = true
     
     /// Defaults to set
-    func setDefaults() {
+    public override func setDefaults() {
-        if useHorizontalMargins == nil {
+        super.setDefaults()
-            useHorizontalMargins = true
+        hideArrow = true
-        }
+        line = LineModel(type: .none)
-        if useVerticalMargins == nil {
+        style = "sectionFooter"
-            useVerticalMargins = true
-        }
-        if topMarginPadding == nil {
-            topMarginPadding = 24
-        }
-        if bottomMarginPadding == nil {
-            bottomMarginPadding = 0
-        }
     }
 
     //--------------------------------------------------
     // MARK: - Initializer
     //--------------------------------------------------
     
-    public init(molecules: [[ListItemModelProtocol]], dropDown: ItemDropdownEntryFieldModel) {
+    public init(molecules: [[ListItemModelProtocol & MoleculeModelProtocol]], dropDown: ItemDropdownEntryFieldModel) {
         self.molecules = molecules
         self.dropDown = dropDown
         super.init()
-        setDefaults()
     }
     
     //--------------------------------------------------
@@ -55,8 +43,6 @@ import Foundation
         case moleculeName
         case molecules
         case dropDown
-        case line
-        case backgroundColor
     }
     
     //--------------------------------------------------
@@ -65,16 +51,9 @@ import Foundation
 
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        molecules = try typeContainer.decodeMolecules2D(codingKey: .molecules) as? [[ListItemModelProtocol]] ?? [[]]
+        molecules = try typeContainer.decodeMolecules2D(codingKey: .molecules) as? [[ListItemModelProtocol & MoleculeModelProtocol]] ?? [[]]
         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)
-        setDefaults()
     }
 
     public override func encode(to encoder: Encoder) throws {
@@ -83,7 +62,5 @@ import Foundation
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encodeModels2D(molecules, forKey: .molecules) 
         try container.encode(dropDown, forKey: .dropDown)
-        try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
-        try container.encodeIfPresent(line, forKey: .line)
     }
 }

MVMCoreUI/Molecules/Items/ListItemModel.swift

@@ -1,25 +1,22 @@
 //
-//  ListItem.swift
+//  BaseListItemModel.swift
 //  MVMCoreUI
 //
-//  Created by Suresh, Kamlesh on 10/3/19.
+//  Created by Scott Pfeil on 2/12/20.
-//  Copyright © 2019 Suresh, Kamlesh. All rights reserved.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
+//  A base class that has common list item boilerplate model stuffs.
 
 import Foundation
-import MVMCore
 
-@objcMembers public class ListItemModel: MoleculeContainerModel, ListItemModelProtocol {
+@objcMembers public class ListItemModel: ContainerModel, ListItemModelProtocol {
-    
-    public static var identifier: String = "listItem"
     public var backgroundColor: Color?
     public var action: ActionModelProtocol?
     public var hideArrow: Bool?
     public var line: LineModel?
-    public var style: String? = "standard"
+    public var style: String?
 
     private enum CodingKeys: String, CodingKey {
-        case moleculeName
         case backgroundColor
         case action
         case hideArrow
@@ -28,23 +25,20 @@ import MVMCore
     }
     
     /// Defaults to set
-    func setDefaults() {
+    public func setDefaults() {
         if useHorizontalMargins == nil {
             useHorizontalMargins = true
         }
         if useVerticalMargins == nil {
             useVerticalMargins = true
         }
-        if topMarginPadding == nil {
+        if style == nil {
-            topMarginPadding = 24
+            style = "standard"
-        }
-        if bottomMarginPadding == nil {
-            bottomMarginPadding = 24
         }
     }
     
-    public override init(with moleculeModel: MoleculeModelProtocol) {
+    public override init() {
-        super.init(with: moleculeModel)
+        super.init()
         setDefaults()
     }
 
@@ -54,9 +48,7 @@ import MVMCore
         action = try typeContainer.decodeModelIfPresent(codingKey: .action, typeCodingKey: ActionCodingKey.actionType)
         hideArrow = try typeContainer.decodeIfPresent(Bool.self, forKey: .hideArrow)
         line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line)
-        if let style = try typeContainer.decodeIfPresent(String.self, forKey: .style) {
+        style = try typeContainer.decodeIfPresent(String.self, forKey: .style)
-            self.style = style
-        }
         try super.init(from: decoder)
         setDefaults()
     }
@@ -64,7 +56,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.encode(moleculeName, forKey: .moleculeName)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeModelIfPresent(action, forKey: .action)
         try container.encodeIfPresent(hideArrow, forKey: .hideArrow)

MVMCoreUI/Molecules/Items/MoleculeListItemModel.swift

@@ -0,0 +1,41 @@
+//
+//  ListItem.swift
+//  MVMCoreUI
+//
+//  Created by Suresh, Kamlesh on 10/3/19.
+//  Copyright © 2019 Suresh, Kamlesh. All rights reserved.
+//
+
+import Foundation
+import MVMCore
+
+@objcMembers public class MoleculeListItemModel: ListItemModel, MoleculeModelProtocol {
+    public class var identifier: String {
+        return "listItem"
+    }
+    public var molecule: MoleculeModelProtocol
+
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case molecule
+    }
+    
+    public init(with moleculeModel: MoleculeModelProtocol) {
+        molecule = moleculeModel
+        super.init()
+    }
+
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        molecule = try typeContainer.decodeMolecule(codingKey: .molecule)
+        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.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeModel(molecule, forKey: .molecule)
+    }
+}
+

MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift

@@ -16,7 +16,7 @@ import UIKit
     public override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.setWithModel(model, delegateObject, additionalData)
         
-        guard let model = model as? ListItemModel else { return }
+        guard let model = model as? MoleculeListItemModel else { return }
         
         if molecule != nil {
             (molecule as? ModelMoleculeViewProtocol)?.setWithModel(model.molecule, delegateObject, additionalData)
@@ -29,7 +29,7 @@ import UIKit
     }
 
     public override class func nameForReuse(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> String? {
-       guard let moleculeModel = (model as? ListItemModel)?.molecule else { return "\(self)<>" }
+       guard let moleculeModel = (model as? MoleculeListItemModel)?.molecule else { return "\(self)<>" }
         
         let className = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(moleculeModel) as? ModelMoleculeViewProtocol.Type
         let moleculeName = className?.nameForReuse(moleculeModel, delegateObject) ?? moleculeModel.moleculeName ?? ""

MVMCoreUI/Molecules/Items/TabsListItemModel.swift

@@ -8,39 +8,36 @@
 
 import UIKit
 
-public class TabsListItemModel: ContainerModel, ListItemModelProtocol {
+public class TabsListItemModel: ListItemModel, MoleculeModelProtocol {
     public static var identifier: String = "tabsListItem"
     var tabs: TabsModel
-    var molecules: [[ListItemModelProtocol]]
+    var molecules: [[ListItemModelProtocol & MoleculeModelProtocol]]
-    
-    public var backgroundColor: Color?
-    public var hideArrow: Bool? = true
-    public var line: LineModel? = LineModel(type: .standard)
 
     private enum CodingKeys: String, CodingKey {
         case moleculeName
         case tabs
         case molecules
-        case backgroundColor
-        case line
     }
     
-    public init(with tabs: TabsModel, molecules: [[ListItemModelProtocol]]) {
+    public override func setDefaults() {
+        super.setDefaults()
+        hideArrow = true
+        action = nil
+        style = nil
+        topMarginPadding = 8
+        bottomMarginPadding = 0
+    }
+    
+    public init(with tabs: TabsModel, molecules: [[ListItemModelProtocol & MoleculeModelProtocol]]) {
         self.tabs = tabs
         self.molecules = molecules
         super.init()
-        self.topMarginPadding = 8
-        self.bottomMarginPadding = 0
     }
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         tabs = try typeContainer.decode(TabsModel.self, forKey: .tabs)
-        molecules = try typeContainer.decodeMolecules2D(codingKey: .molecules) as! [[ListItemModelProtocol]]
+        molecules = try typeContainer.decodeMolecules2D(codingKey: .molecules) as! [[ListItemModelProtocol & MoleculeModelProtocol]]
-        backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
-        if let lineModel = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line) {
-            line = lineModel
-        }
         try super.init(from: decoder)
     }
               
@@ -50,7 +47,5 @@ public class TabsListItemModel: ContainerModel, ListItemModelProtocol {
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(tabs, forKey: .tabs)
         try container.encodeModels2D(molecules, forKey: .molecules)
-        try container.encode(backgroundColor, forKey: .backgroundColor)
-        try container.encodeIfPresent(line, forKey: .line)
     }
 }

MVMCoreUI/Molecules/Items/TabsTableViewCell.swift

@@ -9,7 +9,9 @@
 import UIKit
 
 @objcMembers public class TabsTableViewCell: TableViewCell {
-    var tabsListItemModel: TabsListItemModel?
+    var tabsListItemModel: TabsListItemModel? {
+        return listItemModel as? TabsListItemModel
+    }
     let tabs = TopTabbar(frame: .zero)
     var delegateObject: MVMCoreUIDelegateObject?
     var previousTabIndex = 0
@@ -17,11 +19,7 @@ import UIKit
     // MARK: - MFViewProtocol
     override public func setupView() {
         super.setupView()
-        guard tabs.superview == nil else {
-            return
-        }
         tabs.paddingBeforeFirstTab = false
-        
         tabs.translatesAutoresizingMaskIntoConstraints = false
         tabs.delegate = self
         tabs.datasource = self
@@ -48,11 +46,18 @@ import UIKit
         super.reset()
         tabs.reset()
     }
+    
+    public override class func estimatedHeight(forRow molecule: MoleculeModelProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+        return 46
+    }
 }
 
 extension TabsTableViewCell: TopTabbarDelegate {
     public func shouldSelectItem(at index: Int, topTabbar: TopTabbar) -> Bool {
-        if let molecules = tabsListItemModel?.molecules[topTabbar.selectedIndex] {
+        if let model = tabsListItemModel,
+            let json = model.toJSON(),
+            let json2d = json.optionalArrayForKey("molecules") as? [[[AnyHashable: Any]]] {
+            let molecules = json2d[topTabbar.selectedIndex]
             delegateObject?.moleculeDelegate?.removeMolecules(molecules, sender: self, animation: index < tabs.selectedIndex ? .right : .left)
         }
         previousTabIndex = tabs.selectedIndex
@@ -60,7 +65,10 @@ extension TabsTableViewCell: TopTabbarDelegate {
     }
 
     public func topTabbar(_ topTabbar: TopTabbar, didSelectItemAt index: Int) {
-        if let molecules = tabsListItemModel?.molecules[index] {
+        if let model = tabsListItemModel,
+        let json = model.toJSON(),
+            let json2d = json.optionalArrayForKey("molecules") as? [[[AnyHashable: Any]]] {
+            let molecules = json2d[index]
             delegateObject?.moleculeDelegate?.addMolecules(molecules, sender: self, animation: index < previousTabIndex ? .left : .right)
         }
     }

MVMCoreUI/OtherHandlers/ModelMoleculeDelegateProtocol.swift

@@ -23,8 +23,8 @@ public protocol MoleculeDelegateProtocol {
     func removeMolecules(_ molecules: [[AnyHashable : Any]], sender: UITableViewCell, animation: UITableView.RowAnimation)
 
     //optional
-    func addMolecules(_ molecules: [ListItemModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation)
+    func addMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation)
-    func removeMolecules(_ molecules: [ListItemModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation)
+    func removeMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation)
 }
 
 extension MoleculeDelegateProtocol {
@@ -40,11 +40,11 @@ extension MoleculeDelegateProtocol {
         // Do nothing
     }
     
-    public func addMolecules(_ molecules: [ListItemModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation) { 
+    public func addMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation) {
         // Do nothing
     }
     
-    public func removeMolecules(_ molecules: [ListItemModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation) {
+    public func removeMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation) {
         // Do nothing
     }
 }

MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift

@@ -74,7 +74,7 @@ import Foundation
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListLeftVariableIconWithRightCaret.self, viewModelClass: ListLeftVariableIconWithRightCaretModel.self)
 
         // List items
-        MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: MoleculeTableViewCell.self, viewModelClass: ListItemModel.self)
+        MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: MoleculeTableViewCell.self, viewModelClass: MoleculeListItemModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: DropDownFilterTableViewCell.self, viewModelClass: DropDownListItemModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: AccordionMoleculeTableViewCell.self, viewModelClass: AccordionListItemModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: TabsTableViewCell.self, viewModelClass: TabsListItemModel.self)

MVMCoreUI/Templates/ListPageTemplateModel.swift

@@ -20,7 +20,7 @@ import Foundation
     public var isAtomicTabs: Bool?
 
     public var header: MoleculeModelProtocol?
-    public var molecules: [ListItemModelProtocol]?
+    public var molecules: [ListItemModelProtocol & MoleculeModelProtocol]?
     public var footer: MoleculeModelProtocol?
     public var line: LineModel?
 
@@ -28,7 +28,7 @@ import Foundation
     // MARK: - Initializer
     //--------------------------------------------------
     
-    public init(pageType: String, screenHeading: String?, molecules: [ListItemModelProtocol]) {
+    public init(pageType: String, screenHeading: String?, molecules: [ListItemModelProtocol & MoleculeModelProtocol]) {
         self.pageType = pageType
         self.screenHeading = screenHeading
         self.molecules = molecules
@@ -57,7 +57,7 @@ import Foundation
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         pageType = try typeContainer.decode(String.self, forKey: .pageType)
         screenHeading = try typeContainer.decodeIfPresent(String.self, forKey: .screenHeading)
-        molecules = try typeContainer.decodeMoleculesIfPresent(codingKey: .molecules) as? [ListItemModelProtocol]
+        molecules = try typeContainer.decodeMoleculesIfPresent(codingKey: .molecules) as? [ListItemModelProtocol & MoleculeModelProtocol]
         isAtomicTabs = try typeContainer.decodeIfPresent(Bool.self, forKey: .isAtomicTabs)
         header = try typeContainer.decodeMoleculeIfPresent(codingKey: .header)
         footer = try typeContainer.decodeMoleculeIfPresent(codingKey: .footer)

MVMCoreUI/Templates/MoleculeListTemplate.swift

@@ -13,7 +13,7 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
     // MARK: - Stored Properties
     //--------------------------------------------------
     
-    public var moleculesInfo: [(identifier: String, class: AnyClass, molecule: ListItemModelProtocol)]?
+    public var moleculesInfo: [(identifier: String, class: AnyClass, molecule: (ListItemModelProtocol & MoleculeModelProtocol))]?
     
     var observer: NSKeyValueObservation?
     
@@ -176,10 +176,10 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
     
     public override func addMolecules(_ molecules: [[AnyHashable: Any]], sender: UITableViewCell, animation: UITableView.RowAnimation) {
         
-        var tmpMolecules = [ListItemModelProtocol]()
+        var tmpMolecules = [ListItemModelProtocol & MoleculeModelProtocol]()
         
         molecules.forEach { molecule in
-            if let data = try? JSONSerialization.data(withJSONObject: molecule), let listItemModel = try? JSONDecoder().decode(ListItemModel.self, from: data) {
+            if let data = try? JSONSerialization.data(withJSONObject: molecule), let listItemModel = try? JSONDecoder().decode(MoleculeListItemModel.self, from: data) {
                 tmpMolecules.append(listItemModel)
             }
         }
@@ -205,10 +205,11 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
     
     public override func removeMolecules(_ molecules: [[AnyHashable: Any]], sender: UITableViewCell, animation: UITableView.RowAnimation) {
         
-        var tmpMolecules = [ListItemModelProtocol]()
+        var tmpMolecules = [ListItemModelProtocol & MoleculeModelProtocol]()
         
         molecules.forEach { molecule in
-            if let data = try? JSONSerialization.data(withJSONObject: molecule), let listItemModel = try? JSONDecoder().decode(ListItemModel.self, from: data) {
+            if let data = try? JSONSerialization.data(withJSONObject: molecule),
+                let listItemModel = try? JSONDecoder().decode(MoleculeListItemModel.self, from: data) {
                 tmpMolecules.append(listItemModel)
             }
         }
@@ -230,7 +231,7 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
         view.layoutIfNeeded()
     }
     
-    public func addMolecules(_ molecules: [ListItemModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation) {
+    public func addMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation) {
         
         // This dispatch is needed to fix a race condition that can occur if this function is called during the table setup.
         DispatchQueue.main.async {
@@ -252,7 +253,7 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
         }
     }
     
-    public func removeMolecules(_ molecules: [ListItemModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation) {
+    public func removeMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation) {
         
         var indexPaths: [IndexPath] = []
         //TODO: cehck for molecule protocola eqality
@@ -274,7 +275,7 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
     //--------------------------------------------------
     
     /// Returns the (identifier, class) of the molecule for the given map.
-    func getMoleculeInfo(with listItem: ListItemModelProtocol?) -> (identifier: String, class: AnyClass, molecule: ListItemModelProtocol)? {
+    func getMoleculeInfo(with listItem: (ListItemModelProtocol & MoleculeModelProtocol)?) -> (identifier: String, class: AnyClass, molecule: ListItemModelProtocol & MoleculeModelProtocol)? {
         
         guard let listItem = listItem,
             let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(listItem),
@@ -285,9 +286,9 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
     }
     
     /// Sets up the molecule list and ensures no errors loading all content.
-    func getMoleculeInfoList() -> [(identifier: String, class: AnyClass, molecule: ListItemModelProtocol)]? {
+    func getMoleculeInfoList() -> [(identifier: String, class: AnyClass, molecule: (ListItemModelProtocol & MoleculeModelProtocol))]? {
         
-        var moleculeList: [(identifier: String, class: AnyClass, molecule: ListItemModelProtocol)] = []
+        var moleculeList: [(identifier: String, class: AnyClass, molecule: ListItemModelProtocol & MoleculeModelProtocol)] = []
         
         if let molecules = templateModel?.molecules {
             for molecule in molecules {