Merge branch 'develop' into feature/radio_swatches

# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj

MVMCoreUI.xcodeproj/project.pbxproj

@@ -180,6 +180,10 @@
 		94FB966323D797DA003D482B /* MFTextButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 94FB966123D797DA003D482B /* MFTextButton.m */; };
 		AA11A41F23F15D3100D7962F /* ListRightVariablePayments.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA11A41E23F15D3100D7962F /* ListRightVariablePayments.swift */; };
 		AA11A42123F15D7000D7962F /* ListRightVariablePaymentsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA11A42023F15D7000D7962F /* ListRightVariablePaymentsModel.swift */; };
+		AA1EC59724373985003D6F50 /* ListThreeColumnSpeedTestDividerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA1EC59624373985003D6F50 /* ListThreeColumnSpeedTestDividerModel.swift */; };
+		AA1EC59924373994003D6F50 /* ListThreeColumnSpeedTestDivider.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA1EC59824373994003D6F50 /* ListThreeColumnSpeedTestDivider.swift */; };
+		AA56A20F243C5EE900303286 /* ListTwoColumnSubsectionDividerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA56A20E243C5EE900303286 /* ListTwoColumnSubsectionDividerModel.swift */; };
+		AA56A211243C5EFC00303286 /* ListTwoColumnSubsectionDivider.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA56A210243C5EFC00303286 /* ListTwoColumnSubsectionDivider.swift */; };
 		AAA74A172410C04600080241 /* HeadersH2NoButtonsBodyText.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA74A162410C04600080241 /* HeadersH2NoButtonsBodyText.swift */; };
 		AAA74A192410C05800080241 /* HeadersH2NoButtonsBodyTextModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA74A182410C05800080241 /* HeadersH2NoButtonsBodyTextModel.swift */; };
 		AAB9C10824346F4B00151545 /* RadioSwatches.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAB9C10724346F4B00151545 /* RadioSwatches.swift */; };
@@ -195,6 +199,8 @@
 		BB6C6AC1242232DF005F7224 /* ListOneColumnTextWithWhitespaceDividerTall.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6C6ABF242232DF005F7224 /* ListOneColumnTextWithWhitespaceDividerTall.swift */; };
 		BB6C6AC824225290005F7224 /* ListOneColumnTextWithWhitespaceDividerShort.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6C6AC62422528F005F7224 /* ListOneColumnTextWithWhitespaceDividerShort.swift */; };
 		BB6C6AC924225290005F7224 /* ListOneColumnTextWithWhitespaceDividerShortModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6C6AC72422528F005F7224 /* ListOneColumnTextWithWhitespaceDividerShortModel.swift */; };
+		BBBBC87C24374A4900B0F079 /* ListThreeColumnBillChangesDivider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBBC87A24374A4900B0F079 /* ListThreeColumnBillChangesDivider.swift */; };
+		BBBBC87D24374A4900B0F079 /* ListThreeColumnBillChangesDividerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBBC87B24374A4900B0F079 /* ListThreeColumnBillChangesDividerModel.swift */; };
 		C003506123AA94CD00B6AC29 /* Button.swift in Sources */ = {isa = PBXBuildFile; fileRef = C003506023AA94CD00B6AC29 /* Button.swift */; };
 		C07065C42395677300FBF997 /* Link.swift in Sources */ = {isa = PBXBuildFile; fileRef = C07065C32395677300FBF997 /* Link.swift */; };
 		C695A67F23C9830600BFB94E /* UnOrderedListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C695A67E23C9830600BFB94E /* UnOrderedListModel.swift */; };
@@ -581,6 +587,10 @@
 		94FB966123D797DA003D482B /* MFTextButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFTextButton.m; sourceTree = "<group>"; };
 		AA11A41E23F15D3100D7962F /* ListRightVariablePayments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariablePayments.swift; sourceTree = "<group>"; };
 		AA11A42023F15D7000D7962F /* ListRightVariablePaymentsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariablePaymentsModel.swift; sourceTree = "<group>"; };
+		AA1EC59624373985003D6F50 /* ListThreeColumnSpeedTestDividerModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListThreeColumnSpeedTestDividerModel.swift; sourceTree = "<group>"; };
+		AA1EC59824373994003D6F50 /* ListThreeColumnSpeedTestDivider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListThreeColumnSpeedTestDivider.swift; sourceTree = "<group>"; };
+		AA56A20E243C5EE900303286 /* ListTwoColumnSubsectionDividerModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListTwoColumnSubsectionDividerModel.swift; sourceTree = "<group>"; };
+		AA56A210243C5EFC00303286 /* ListTwoColumnSubsectionDivider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListTwoColumnSubsectionDivider.swift; sourceTree = "<group>"; };
 		AAA74A162410C04600080241 /* HeadersH2NoButtonsBodyText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH2NoButtonsBodyText.swift; sourceTree = "<group>"; };
 		AAA74A182410C05800080241 /* HeadersH2NoButtonsBodyTextModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH2NoButtonsBodyTextModel.swift; sourceTree = "<group>"; };
 		AAB9C10724346F4B00151545 /* RadioSwatches.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioSwatches.swift; sourceTree = "<group>"; };
@@ -596,6 +606,8 @@
 		BB6C6ABF242232DF005F7224 /* ListOneColumnTextWithWhitespaceDividerTall.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListOneColumnTextWithWhitespaceDividerTall.swift; sourceTree = "<group>"; };
 		BB6C6AC62422528F005F7224 /* ListOneColumnTextWithWhitespaceDividerShort.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListOneColumnTextWithWhitespaceDividerShort.swift; sourceTree = "<group>"; };
 		BB6C6AC72422528F005F7224 /* ListOneColumnTextWithWhitespaceDividerShortModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListOneColumnTextWithWhitespaceDividerShortModel.swift; sourceTree = "<group>"; };
+		BBBBC87A24374A4900B0F079 /* ListThreeColumnBillChangesDivider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListThreeColumnBillChangesDivider.swift; sourceTree = "<group>"; };
+		BBBBC87B24374A4900B0F079 /* ListThreeColumnBillChangesDividerModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListThreeColumnBillChangesDividerModel.swift; sourceTree = "<group>"; };
 		C003506023AA94CD00B6AC29 /* Button.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Button.swift; sourceTree = "<group>"; };
 		C07065C32395677300FBF997 /* Link.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Link.swift; sourceTree = "<group>"; };
 		C695A67E23C9830600BFB94E /* UnOrderedListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UnOrderedListModel.swift; sourceTree = "<group>"; };
@@ -989,13 +1001,6 @@
 			path = OneColumn;
 			sourceTree = "<group>";
 		};
-		526A265A240D1FCE00B0D828 /* TwoColumn */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = TwoColumn;
-			sourceTree = "<group>";
-		};
 		8DD1E36C243B3CD900D8F2DF /* ThreeColumn */ = {
 			isa = PBXGroup;
 			children = (
@@ -1055,6 +1060,15 @@
 			path = RightVariable;
 			sourceTree = "<group>";
 		};
+		AA56A20D243C5EDA00303286 /* TwoColumn */ = {
+			isa = PBXGroup;
+			children = (
+				AA56A20E243C5EE900303286 /* ListTwoColumnSubsectionDividerModel.swift */,
+				AA56A210243C5EFC00303286 /* ListTwoColumnSubsectionDivider.swift */,
+			);
+			path = TwoColumn;
+			sourceTree = "<group>";
+		};
 		AA56A26D243CAB0800303286 /* Selectors */ = {
 			isa = PBXGroup;
 			children = (
@@ -1312,9 +1326,9 @@
 			isa = PBXGroup;
 			children = (
 				525665CB24211FD5007BF25F /* OneColumn */,
-				526A265A240D1FCE00B0D828 /* TwoColumn */,
+				AA56A20D243C5EDA00303286 /* TwoColumn */,
-				525019E3240684E500EED91C /* FourColumn */,
 				D22B38ED23F4E11100490EF6 /* ThreeColumn */,
+				525019E3240684E500EED91C /* FourColumn */,
 			);
 			path = SectionDividers;
 			sourceTree = "<group>";
@@ -1322,10 +1336,14 @@
 		D22B38ED23F4E11100490EF6 /* ThreeColumn */ = {
 			isa = PBXGroup;
 			children = (
+				BBBBC87B24374A4900B0F079 /* ListThreeColumnBillChangesDividerModel.swift */,
+				BBBBC87A24374A4900B0F079 /* ListThreeColumnBillChangesDivider.swift */,
 				5248BFEB23F12E350059236A /* ListThreeColumnPlanDataDividerModel.swift */,
 				5248BFEA23F12E350059236A /* ListThreeColumnPlanDataDivider.swift */,
 				8D3BA9BC2433787000D341BA /* ListThreeColumnInternationalDataDividerModel.swift */,
 				8D3BA9BE2433789900D341BA /* ListThreeColumnInternationalDataDivider.swift */,
+				AA1EC59624373985003D6F50 /* ListThreeColumnSpeedTestDividerModel.swift */,
+				AA1EC59824373994003D6F50 /* ListThreeColumnSpeedTestDivider.swift */,
 			);
 			path = ThreeColumn;
 			sourceTree = "<group>";
@@ -1981,6 +1999,7 @@
 				D29770F221F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m in Sources */,
 				D29B771022C281F400D6ACE0 /* ModuleMolecule.swift in Sources */,
 				D28A838923CCCFCB00DFE4FC /* LinkModel.swift in Sources */,
+				AA56A20F243C5EE900303286 /* ListTwoColumnSubsectionDividerModel.swift in Sources */,
 				AAB9C10824346F4B00151545 /* RadioSwatches.swift in Sources */,
 				94C2D9A923872E5E0006CF46 /* LabelAttributeImageModel.swift in Sources */,
 				DBC4391922442197001AB423 /* DashLine.swift in Sources */,
@@ -2029,6 +2048,7 @@
 				011D9602240DA20A000E3791 /* FormRuleWatcherFieldProtocol.swift in Sources */,
 				D260106323D0C05000764D80 /* StackItemModel.swift in Sources */,
 				D2E2A99823D8D63C000B42E6 /* ActionDetailWithImageModel.swift in Sources */,
+				BBBBC87D24374A4900B0F079 /* ListThreeColumnBillChangesDividerModel.swift in Sources */,
 				D2E2A99D23DA3217000B42E6 /* UIStackViewAlignment+Extension.swift in Sources */,
 				01EB369423609801006832FA /* HeadlineBodyModel.swift in Sources */,
 				D2A92884241ACB25004E01C6 /* ProgrammaticScrollViewController.swift in Sources */,
@@ -2036,6 +2056,7 @@
 				D2E2A99F23E07F8A000B42E6 /* PillButton.swift in Sources */,
 				D2C5001921F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.m in Sources */,
 				D29DF12E21E6851E003B2FB9 /* MVMCoreUITopAlertView.m in Sources */,
+				AA1EC59724373985003D6F50 /* ListThreeColumnSpeedTestDividerModel.swift in Sources */,
 				D29DF2CF21E7C104003B2FB9 /* MFLoadingViewController.m in Sources */,
 				D28A837B23C928DA00DFE4FC /* MoleculeListCellProtocol.swift in Sources */,
 				014AA72F23C5059B006F3E93 /* ThreeLayerPageTemplateModel.swift in Sources */,
@@ -2123,6 +2144,7 @@
 				8DD1E370243B3D0500D8F2DF /* ListThreeColumnInternationalData.swift in Sources */,
 				D2D6CD4222E78FAB00D701B8 /* ThreeLayerTemplate.swift in Sources */,
 				01EB368F23609801006832FA /* LabelModel.swift in Sources */,
+				AA1EC59924373994003D6F50 /* ListThreeColumnSpeedTestDivider.swift in Sources */,
 				942C378E2412F5B60066E45E /* ModalMoleculeStackTemplate.swift in Sources */,
 				8D4687E4242E2DF300802879 /* ListFourColumnDataUsageListItem.swift in Sources */,
 				01F2A03223A4498200D954D8 /* CaretLinkModel.swift in Sources */,
@@ -2210,6 +2232,7 @@
 				D260105B23D0BB7100764D80 /* StackModelProtocol.swift in Sources */,
 				D29DF29821E7ADB8003B2FB9 /* MFScrollingViewController.m in Sources */,
 				D28A839323CE828900DFE4FC /* HeadlineBodyCaretLinkImageModel.swift in Sources */,
+				BBBBC87C24374A4900B0F079 /* ListThreeColumnBillChangesDivider.swift in Sources */,
 				D29770C821F7C4AE00B2F0D0 /* TopLabelsView.m in Sources */,
 				D260105F23D0BFFC00764D80 /* StackItem.swift in Sources */,
 				9432A79F23DB47BA00719041 /* EntryFieldContainer.swift in Sources */,
@@ -2223,6 +2246,7 @@
 				D20A9A5E2243D3E300ADE781 /* TwoButtonView.swift in Sources */,
 				D2B1E3E522F37D6A0065F95C /* ImageHeadlineBody.swift in Sources */,
 				0A21DB94235E24ED00C160A2 /* DigitEntryField.swift in Sources */,
+				AA56A211243C5EFC00303286 /* ListTwoColumnSubsectionDivider.swift in Sources */,
 				52B201D224081CFB00D2011E /* ListLeftVariableRadioButtonAndPaymentMethod.swift in Sources */,
 				D26C5A6B23F4A40D007AEECE /* ListItemModel.swift in Sources */,
 				0A21DB8D235E06EF00C160A2 /* MFDigitTextField.m in Sources */,

MVMCoreUI/Atomic/MoleculeObjectMapping.swift

@@ -153,7 +153,10 @@ import Foundation
         MoleculeObjectMapping.shared()?.register(viewClass: ListOneColumnTextWithWhitespaceDividerShort.self, viewModelClass: ListOneColumnTextWithWhitespaceDividerShortModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListOneColumnTextWithWhitespaceDividerTall.self, viewModelClass: ListOneColumnTextWithWhitespaceDividerTallModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListOneColumnFullWidthTextDividerSubsection.self, viewModelClass: ListOneColumnFullWidthTextDividerSubsectionModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListTwoColumnSubsectionDivider.self, viewModelClass: ListTwoColumnSubsectionDividerModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListThreeColumnInternationalDataDivider.self, viewModelClass: ListThreeColumnInternationalDataDividerModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListThreeColumnSpeedTestDivider.self, viewModelClass: ListThreeColumnSpeedTestDividerModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListThreeColumnBillChangesDivider.self, viewModelClass: ListThreeColumnBillChangesDividerModel.self)
 
         // Designed Headers
         MoleculeObjectMapping.shared()?.register(viewClass: HeadersH2NoButtonsBodyText.self, viewModelClass: HeadersH2NoButtonsBodyTextModel.self)

MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/ThreeColumn/ListThreeColumnBillChangesDivider.swift

@@ -0,0 +1,56 @@
+//
+//  ListThreeColumnBillChangesDivider.swift
+//  MVMCoreUI
+//
+//  Created by Dhamodaram Nandi on 20/03/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+@objcMembers open class ListThreeColumnBillChangesDivider: TableViewCell {
+    
+    public let leftLabel = Label.createLabelBoldBodySmall(true)
+    public let centerLabel = Label.createLabelBoldBodySmall(true)
+    public let rightLabel = Label.createLabelBoldBodySmall(true)
+    var stack: Stack<StackModel>
+    
+    // MARK: - Initializers
+    public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        stack = Stack<StackModel>.createStack(with: [(view: leftLabel, model: StackItemModel(percent: 44, horizontalAlignment:                                                        .leading)),
+                                                     (view: centerLabel, model: StackItemModel(percent: 33, horizontalAlignment: .leading)),
+                                                     (view: rightLabel, model: StackItemModel(percent: 23, horizontalAlignment: .leading))],
+                                              axis: .horizontal)
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+    }
+    
+    public required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    // MARK: - MFViewProtocol
+    open override func setupView() {
+        super.setupView()
+        addMolecule(stack)
+        stack.restack()
+    }
+    
+    // MARK: - ModelMoleculeViewProtocol
+    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
+        super.set(with: model, delegateObject, additionalData)
+        guard let model = model as? ListThreeColumnBillChangesDividerModel else { return }
+        leftLabel.set(with: model.leftLabel, delegateObject, additionalData)
+        centerLabel.set(with: model.centerLabel, delegateObject, additionalData)
+        rightLabel.set(with: model.rightLabel, delegateObject, additionalData)
+    }
+    
+    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
+        return 120
+    }
+    
+    open override func reset() {
+        super.reset()
+        leftLabel.styleBoldBodySmall(true)
+        centerLabel.styleBoldBodySmall(true)
+        rightLabel.styleBoldBodySmall(true)
+    }
+}

MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/ThreeColumn/ListThreeColumnBillChangesDividerModel.swift

@@ -0,0 +1,52 @@
+//
+//  ListThreeColumnBillChangesDividerModel.swift
+//  MVMCoreUI
+//
+//  Created by Dhamodaram Nandi on 20/03/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+public class ListThreeColumnBillChangesDividerModel: ListItemModel, MoleculeModelProtocol {
+    public static var identifier: String = "list3CBillChgDiv"
+    public var leftLabel: LabelModel
+    public var centerLabel: LabelModel
+    public var rightLabel: LabelModel
+    
+    public init(leftLabel: LabelModel, centerLabel:LabelModel, rightLabel: LabelModel) {
+        self.leftLabel = leftLabel
+        self.centerLabel = centerLabel
+        self.rightLabel = rightLabel
+        super.init()
+    }
+    
+    /// Defaults to set
+    override public func setDefaults() {
+        super.setDefaults()
+        style = "tallDivider"
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case leftLabel
+        case centerLabel
+        case rightLabel
+    }
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        leftLabel = try typeContainer.decode(LabelModel.self, forKey: .leftLabel)
+        centerLabel = try typeContainer.decode(LabelModel.self, forKey: .centerLabel)
+        rightLabel = try typeContainer.decode(LabelModel.self, forKey: .rightLabel)
+        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.encode(leftLabel, forKey: .leftLabel)
+        try container.encode(centerLabel, forKey: .centerLabel)
+        try container.encode(rightLabel, forKey: .rightLabel)
+    }
+}

MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/ThreeColumn/ListThreeColumnSpeedTestDivider.swift

@@ -0,0 +1,63 @@
+//
+//  ListThreeColumnSpeedTestDivider.swift
+//  MVMCoreUI
+//
+//  Created by Lekshmi S on 03/04/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers open class ListThreeColumnSpeedTestDivider: TableViewCell {
+    
+    //-------------------------------------------------------
+    // MARK: - Outlets
+    //-------------------------------------------------------
+    let leftLabel = Label.createLabelBoldBodySmall(true)
+    let centerLabel = Label.createLabelBoldBodySmall(true)
+    let rightLabel = Label.createLabelBoldBodySmall(true)
+    var stack: Stack<StackModel>
+    
+    //-------------------------------------------------------
+    // MARK: - Initializers
+    //-------------------------------------------------------
+    public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        stack = Stack<StackModel>.createStack(with: [(view: leftLabel, model: StackItemModel(percent: 37, horizontalAlignment: .leading)), (view: centerLabel, model: StackItemModel(percent: 33, horizontalAlignment: .leading)), (view: rightLabel, model: StackItemModel(percent: 30, horizontalAlignment: .leading))], axis: .horizontal)
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+    }
+    
+    public required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    //-------------------------------------------------------
+    // MARK: - View Lifecycle
+    //-------------------------------------------------------
+    open override func setupView() {
+        super.setupView()
+        addMolecule(stack)
+        stack.restack()
+    }
+    
+   //------------------------------------------------------
+    // MARK: - Molecule
+    //------------------------------------------------------
+    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
+        super.set(with: model, delegateObject, additionalData)
+        guard let model = model as? ListThreeColumnSpeedTestDividerModel else { return }
+        leftLabel.set(with: model.leftLabel, delegateObject, additionalData)
+        centerLabel.set(with: model.centerLabel, delegateObject, additionalData)
+        rightLabel.set(with: model.rightLabel, delegateObject, additionalData)
+    }
+    
+    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
+        return 121
+    }
+    
+    open override func reset() {
+        super.reset()
+        leftLabel.styleBoldBodySmall(true)
+        centerLabel.styleBoldBodySmall(true)
+        rightLabel.styleBoldBodySmall(true)
+    }
+}

MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/ThreeColumn/ListThreeColumnSpeedTestDividerModel.swift

@@ -0,0 +1,53 @@
+//
+//  ListThreeColumnSpeedTestDividerModel.swift
+//  MVMCoreUI
+//
+//  Created by Lekshmi S on 03/04/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public class ListThreeColumnSpeedTestDividerModel: ListItemModel, MoleculeModelProtocol {
+    public static var identifier: String = "list3CSpdTstDiv"
+    public var leftLabel: LabelModel
+    public var centerLabel: LabelModel
+    public var rightLabel: LabelModel
+    
+    public init(leftLabel: LabelModel, centerLabel: LabelModel, rightLabel: LabelModel) {
+        self.leftLabel = leftLabel
+        self.centerLabel = centerLabel
+        self.rightLabel = rightLabel
+        super.init()
+    }
+    
+    /// Defaults to set
+    override public func setDefaults() {
+        super.setDefaults()
+        style = "tallDivider"
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case leftLabel
+        case centerLabel
+        case rightLabel
+    }
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        leftLabel = try typeContainer.decode(LabelModel.self, forKey: .leftLabel)
+        centerLabel = try typeContainer.decode(LabelModel.self, forKey: .centerLabel)
+        rightLabel = try typeContainer.decode(LabelModel.self, forKey: .rightLabel)
+        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.encode(leftLabel, forKey: .leftLabel)
+        try container.encode(centerLabel, forKey: .centerLabel)
+        try container.encode(rightLabel, forKey: .rightLabel)
+    }
+}

MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/TwoColumn/ListTwoColumnSubsectionDivider.swift

@@ -0,0 +1,62 @@
+//
+//  ListTwoColumnSubsectionDivider.swift
+//  MVMCoreUI
+//
+//  Created by Lekshmi S on 07/04/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers open class ListTwoColumnSubsectionDivider: TableViewCell {
+    
+   //--------------------------------------------------
+    // MARK: - Outlets
+    //--------------------------------------------------
+    let leftLabel = Label.createLabelBoldBodySmall(true)
+    let rightLabel = Label.createLabelBoldBodySmall(true)
+    var stack: Stack<StackModel>
+    
+    //-------------------------------------------------------
+    // MARK: - Initializers
+    //-------------------------------------------------------
+    public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        stack = Stack<StackModel>.createStack(with: [(view: leftLabel, model: StackItemModel(percent: 75, horizontalAlignment: .leading)),
+                                                     (view: rightLabel, model: StackItemModel(percent: 25, horizontalAlignment: .leading))],
+                                              axis: .horizontal)
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+    }
+    
+    public required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    //-------------------------------------------------------
+    // MARK: - View Lifecycle
+    //-------------------------------------------------------
+    open override func setupView() {
+        super.setupView()
+        addMolecule(stack)
+        stack.restack()
+    }
+    
+    //----------------------------------------------------
+    // MARK: - Molecule
+    //------------------------------------------------------
+    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
+        super.set(with: model, delegateObject, additionalData)
+        guard let model = model as? ListTwoColumnSubsectionDividerModel else { return }
+        leftLabel.set(with: model.leftLabel, delegateObject, additionalData)
+        rightLabel.set(with: model.rightLabel, delegateObject, additionalData)
+    }
+    
+    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
+        return 121
+    }
+    
+    open override func reset() {
+        super.reset()
+        leftLabel.styleBoldBodySmall(true)
+        rightLabel.styleBoldBodySmall(true)
+    }
+}

MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/TwoColumn/ListTwoColumnSubsectionDividerModel.swift

@@ -0,0 +1,48 @@
+//
+//  ListTwoColumnSubsectionDividerModel.swift
+//  MVMCoreUI
+//
+//  Created by Lekshmi S on 07/04/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public class ListTwoColumnSubsectionDividerModel: ListItemModel, MoleculeModelProtocol {
+    public static var identifier: String = "list2CSbscDiv"
+    public var leftLabel: LabelModel
+    public var rightLabel: LabelModel
+    
+    public init(leftLabel: LabelModel, rightLabel: LabelModel) {
+        self.leftLabel = leftLabel
+        self.rightLabel = rightLabel
+        super.init()
+    }
+    
+    /// Defaults to set
+    override public func setDefaults() {
+        super.setDefaults()
+        style = "tallDivider"
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case leftLabel
+        case rightLabel
+    }
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        leftLabel = try typeContainer.decode(LabelModel.self, forKey: .leftLabel)
+        rightLabel = try typeContainer.decode(LabelModel.self, forKey: .rightLabel)
+        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.encode(leftLabel, forKey: .leftLabel)
+        try container.encode(rightLabel, forKey: .rightLabel)
+    }
+}

MVMCoreUI/BaseControllers/ViewController.swift

@@ -92,12 +92,8 @@ import UIKit
             MVMCoreDispatchUtility.performBlock(onMainThread: {
                 self.handleNewDataAndUpdateUI()
                 // If the screen is showing, can update the navigation controller.
-                if let navigationController = self.manager?.navigationController,
+                if MVMCoreUIUtility.getCurrentVisibleController() == self.manager ?? self {
-                    self.manager!.getCurrentViewController() == self {
+                    self.setNavigationController()
-                    self.set(navigationController: navigationController)
-                } else if let navigationController = self.navigationController,
-                    self == MVMCoreUIUtility.getCurrentVisibleController() {
-                    self.set(navigationController: navigationController)
                 }
             })
         } catch {
@@ -177,18 +173,19 @@ import UIKit
     }
     
     // MARK: - Navigation Item (Move to model base)
-    open func set(navigationController: UINavigationController?) {
+    open func setNavigationController() {
         guard let navigationItemModel = pageModel?.navigationItem,
-            let navigationController = navigationController else {
+            let navigationController = manager?.navigationController ?? navigationController else {
             MVMCoreUISession.sharedGlobal()?.splitViewController?.parent?.setNeedsStatusBarAppearanceUpdate()
             return
         }
+        let viewController = manager ?? self
         if navigationController == MVMCoreUISplitViewController.main()?.navigationController,
-            navigationController.topViewController == self {
+            navigationController.topViewController == viewController {
             MVMCoreUISession.sharedGlobal()?.splitViewController?.setupPanels()
             showBottomProgressBar()
         }
-        NavigationController.set(navigationController: navigationController, navigationItemModel: navigationItemModel, viewController: self)
+        NavigationController.set(navigationController: navigationController, navigationItemModel: navigationItemModel, viewController: viewController)
     }
     
     // Eventually will be moved to server
@@ -294,10 +291,8 @@ import UIKit
     open override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
-        // Update the navigation bar ui when view is appearing unless in a manager. The manager is expected to handle.
+        // Update the navigation bar ui when view is appearing
-        if manager == nil {
+        setNavigationController()
-            set(navigationController: navigationController)
-        }
     }
     
     open override func viewDidAppear(_ animated: Bool) {
@@ -330,9 +325,6 @@ import UIKit
     
     // MARK: - MVMCoreViewManagerViewControllerProtocol
     open func viewControllerReady(inManager manager: UIViewController & MVMCoreViewManagerProtocol) {
-        if initialLoadFinished {
-            set(navigationController: manager.navigationController)
-        }
         // Janky way to track current page.
         MVMCoreUISession.sharedGlobal()?.currentPageType = pageType
         MVMCoreUILoggingHandler.shared()?.defaultLogPageState(forController: self)

MVMCoreUI/Containers/NavigationController.swift

@@ -40,7 +40,7 @@ import UIKit
         return navigationController
     }
     
-    public static func set(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, viewController: (UIViewController & MVMCoreViewControllerProtocol)) {
+    public static func set(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, viewController: UIViewController) {
         viewController.navigationItem.title = navigationItemModel.title
         viewController.navigationItem.accessibilityLabel = navigationItemModel.title
         viewController.navigationItem.hidesBackButton = !navigationItemModel.systemBackButton
@@ -58,7 +58,7 @@ import UIKit
         if navigationController == MVMCoreUISession.sharedGlobal()?.navigationController,
             navigationController.topViewController == viewController {
             // Update line.
-            MVMCoreUISession.sharedGlobal()?.navigationController?.separatorView?.set(with: navigationItemModel.line ?? LineModel(type: .standard), viewController.delegateObject?() as? MVMCoreUIDelegateObject, nil)
+            MVMCoreUISession.sharedGlobal()?.navigationController?.separatorView?.setStyle(navigationItemModel.line?.type ?? .standard)
         }
         
         if navigationController == MVMCoreUISplitViewController.main()?.navigationController,

MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m

@@ -153,11 +153,11 @@ CGFloat const PanelAnimationDuration = 0.2;
 - (IBAction)leftPanelButtonPressed:(id)sender {
     [MVMCoreDispatchUtility performBlockOnMainThread:^{
         UIViewController *viewController = self.navigationController.topViewController;
-
+        UIViewController *detailViewController = [self getCurrentDetailViewController];
         // If Viewcontroller confirms to protocol and implements the the method leftPanelButtonPressed
-        if ([viewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)]
+        if ([detailViewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)]
-            && [viewController respondsToSelector:@selector(isOverridingLeftButton)]
+            && [detailViewController respondsToSelector:@selector(isOverridingLeftButton)]
-            && [((UIViewController <MVMCoreUIDetailViewProtocol> *)viewController) isOverridingLeftButton]) {
+            && [((UIViewController <MVMCoreUIDetailViewProtocol> *)detailViewController) isOverridingLeftButton]) {
             return;
         }
         
@@ -175,9 +175,9 @@ CGFloat const PanelAnimationDuration = 0.2;
 
 - (IBAction)backButtonPressed:(id)sender {
     [MVMCoreDispatchUtility performBlockOnMainThread:^{
-        UIViewController *viewController = self.navigationController.topViewController;
+        UIViewController *detailViewController = [self getCurrentDetailViewController];
-        if ([viewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)] && [viewController respondsToSelector:@selector(backButtonPressed)]) {
+        if ([detailViewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)] && [detailViewController respondsToSelector:@selector(backButtonPressed)]) {
-            [((UIViewController <MVMCoreUIDetailViewProtocol> *)viewController) backButtonPressed];
+            [((UIViewController <MVMCoreUIDetailViewProtocol> *)detailViewController) backButtonPressed];
         } else {
             [[MVMCoreNavigationHandler sharedNavigationHandler] popTopViewControllerAnimated:YES];
         }
@@ -187,11 +187,12 @@ CGFloat const PanelAnimationDuration = 0.2;
 - (IBAction)rightPanelButtonPressed:(id)sender {
     [MVMCoreDispatchUtility performBlockOnMainThread:^{
         UIViewController *viewController = self.navigationController.topViewController;
+        UIViewController *detailViewController = [self getCurrentDetailViewController];
 
         // If Viewcontroller confirms to protocol and implements the the method rightPanelButtonPressed
-        if ([viewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)]
+        if ([detailViewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)]
-            && [viewController respondsToSelector:@selector(isOverridingRightButton)]
+            && [detailViewController respondsToSelector:@selector(isOverridingRightButton)]
-            && [((UIViewController <MVMCoreUIDetailViewProtocol> *)viewController) isOverridingRightButton]) {
+            && [((UIViewController <MVMCoreUIDetailViewProtocol> *)detailViewController) isOverridingRightButton]) {
             return;
         }