19078 - List - Three Column - International Data - Updated to latest

MVMCoreUI.xcodeproj/project.pbxproj

@@ -134,8 +134,8 @@
 		8D24041123E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D24041023E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift */; };
 		8D24041523E7FC0B009E23BE /* ListLeftVariableIconWithRightCaretModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D24041423E7FC0B009E23BE /* ListLeftVariableIconWithRightCaretModel.swift */; };
 		8D448E5524050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D448E5424050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift */; };
-		8DFBDE1D24288958007F3433 /* ListThreeColumnInternationalDataDividerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DFBDE1C24288958007F3433 /* ListThreeColumnInternationalDataDividerModel.swift */; };
+		8DFB6D8B242A137600A3F715 /* ListThreeColumnInternationalDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DFB6D8A242A137600A3F715 /* ListThreeColumnInternationalDataModel.swift */; };
-		8DFBDE1F24288965007F3433 /* ListThreeColumnInternationalDataDivider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DFBDE1E24288965007F3433 /* ListThreeColumnInternationalDataDivider.swift */; };
+		8DFB6D8D242A138000A3F715 /* ListThreeColumnInternationalData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DFB6D8C242A138000A3F715 /* ListThreeColumnInternationalData.swift */; };
 		942C372E241149170066E45E /* NHaasGroteskDSStd-75Bd.otf in Resources */ = {isa = PBXBuildFile; fileRef = 942C372C241149170066E45E /* NHaasGroteskDSStd-75Bd.otf */; };
 		942C372F241149170066E45E /* NHaasGroteskDSStd-55Rg.otf in Resources */ = {isa = PBXBuildFile; fileRef = 942C372D241149170066E45E /* NHaasGroteskDSStd-55Rg.otf */; };
 		942C378C2412F4FA0066E45E /* ModalMoleculeListTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 942C378B2412F4FA0066E45E /* ModalMoleculeListTemplate.swift */; };
@@ -521,8 +521,8 @@
 		8D24041023E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableIconWithRightCaret.swift; sourceTree = "<group>"; };
 		8D24041423E7FC0B009E23BE /* ListLeftVariableIconWithRightCaretModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableIconWithRightCaretModel.swift; sourceTree = "<group>"; };
 		8D448E5424050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListOneColumnFullWidthTextAllTextAndLinksModel.swift; sourceTree = "<group>"; };
-		8DFBDE1C24288958007F3433 /* ListThreeColumnInternationalDataDividerModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListThreeColumnInternationalDataDividerModel.swift; sourceTree = "<group>"; };
+		8DFB6D8A242A137600A3F715 /* ListThreeColumnInternationalDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListThreeColumnInternationalDataModel.swift; sourceTree = "<group>"; };
-		8DFBDE1E24288965007F3433 /* ListThreeColumnInternationalDataDivider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListThreeColumnInternationalDataDivider.swift; sourceTree = "<group>"; };
+		8DFB6D8C242A138000A3F715 /* ListThreeColumnInternationalData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListThreeColumnInternationalData.swift; sourceTree = "<group>"; };
 		9402C34F23A2CEA3004B974C /* LeftRightLabelModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LeftRightLabelModel.swift; sourceTree = "<group>"; };
 		942C372C241149170066E45E /* NHaasGroteskDSStd-75Bd.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NHaasGroteskDSStd-75Bd.otf"; sourceTree = "<group>"; };
 		942C372D241149170066E45E /* NHaasGroteskDSStd-55Rg.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NHaasGroteskDSStd-55Rg.otf"; sourceTree = "<group>"; };
@@ -923,6 +923,7 @@
 				52267A0623FFE25000906CBA /* ListOneColumnFullWidthTextAllTextAndLinks.swift */,
 				8D084ACF2410BF4800951227 /* ListOneColumnFullWidthTextBodyTextModel.swift */,
 				8D084AD12410BF7600951227 /* ListOneColumnFullWidthTextBodyText.swift */,
+				8DFB6D89242A134600A3F715 /* ThreeColumn */,
 			);
 			path = OneColumn;
 			sourceTree = "<group>";
@@ -965,6 +966,16 @@
 			path = TwoColumn;
 			sourceTree = "<group>";
 		};
+		8DFB6D89242A134600A3F715 /* ThreeColumn */ = {
+			isa = PBXGroup;
+			children = (
+				8DFB6D8A242A137600A3F715 /* ListThreeColumnInternationalDataModel.swift */,
+				8DFB6D8C242A138000A3F715 /* ListThreeColumnInternationalData.swift */,
+			);
+			name = ThreeColumn;
+			path = ../ThreeColumn;
+			sourceTree = "<group>";
+		};
 		94C01508242155FE005811A9 /* Actions */ = {
 			isa = PBXGroup;
 			children = (
@@ -1231,8 +1242,6 @@
 			children = (
 				5248BFEB23F12E350059236A /* ListThreeColumnPlanDataDividerModel.swift */,
 				5248BFEA23F12E350059236A /* ListThreeColumnPlanDataDivider.swift */,
-				8DFBDE1C24288958007F3433 /* ListThreeColumnInternationalDataDividerModel.swift */,
-				8DFBDE1E24288965007F3433 /* ListThreeColumnInternationalDataDivider.swift */,
 			);
 			path = ThreeColumn;
 			sourceTree = "<group>";
@@ -1884,6 +1893,7 @@
 				D28A838123CCB0D800DFE4FC /* AccordionListItemModel.swift in Sources */,
 				DBC4391822442197001AB423 /* CaretView.swift in Sources */,
 				C07065C42395677300FBF997 /* Link.swift in Sources */,
+				8DFB6D8D242A138000A3F715 /* ListThreeColumnInternationalData.swift in Sources */,
 				0A69F611241BDEA700F7231B /* RuleAnyRequiredModel.swift in Sources */,
 				D29770F221F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m in Sources */,
 				D29B771022C281F400D6ACE0 /* ModuleMolecule.swift in Sources */,
@@ -1915,7 +1925,6 @@
 				BB47A588241615FA002BB23C /* ListOneColumnFullWidthTextDividerSubsection.swift in Sources */,
 				012A88C8238DB02000FE3DA1 /* ModelMoleculeDelegateProtocol.swift in Sources */,
 				0A7EF86123D8AC2500B2AAD1 /* DigitEntryFieldModel.swift in Sources */,
-				8DFBDE1D24288958007F3433 /* ListThreeColumnInternationalDataDividerModel.swift in Sources */,
 				DBC4392122491730001AB423 /* LabelWithInternalButton.swift in Sources */,
 				D224798C231450C8003FCCF9 /* HeadlineBodyToggle.swift in Sources */,
 				017BEB442362192F0024EF95 /* MVMCoreUIMoleculeMappingObject+ModelExtension.swift in Sources */,
@@ -2130,7 +2139,6 @@
 				948DB67E2326DCD90011F916 /* MultiProgress.swift in Sources */,
 				013F801923FB4A8E00AD8013 /* UIContentMode+Extension.swift in Sources */,
 				525239C22407BD1000454969 /* ListTwoColumnPriceDetails.swift in Sources */,
-				8DFBDE1F24288965007F3433 /* ListThreeColumnInternationalDataDivider.swift in Sources */,
 				D2A5146122121FBF00345BFB /* MoleculeStackTemplate.swift in Sources */,
 				D2E2A9A323E096B1000B42E6 /* DisableableModelProtocol.swift in Sources */,
 				D29DF11821E6805F003B2FB9 /* NSLayoutConstraint+MFConvenience.m in Sources */,
@@ -2157,6 +2165,7 @@
 				D2B18B922361E65A00A9AEDC /* CoreUIObject.swift in Sources */,
 				D29DF2BE21E7BEA4003B2FB9 /* TopTabbar.m in Sources */,
 				014AA72E23C5059B006F3E93 /* StackCenteredPageTemplateModel.swift in Sources */,
+				8DFB6D8B242A137600A3F715 /* ListThreeColumnInternationalDataModel.swift in Sources */,
 				D2A514632213643100345BFB /* MoleculeStackCenteredTemplate.swift in Sources */,
 				011D959D2404536F000E3791 /* RuleAnyValueChangedModel.swift in Sources */,
 				D260105923D0A92900764D80 /* ContainerProtocol.swift in Sources */,

MVMCoreUI/Molecules/DesignedComponents/List/ThreeColumn/ListThreeColumnInternationalData.swift

@@ -1,28 +1,34 @@
 //
-//  ListThreeColumnInternationalDataDivider.swift
+//  ListThreeColumnInternationalData.swift
 //  MVMCoreUI
 //
-//  Created by Kruthika KP on 23/03/20.
+//  Created by Kruthika KP on 24/03/20.
 //  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
 
 import Foundation
 
-@objcMembers open class ListThreeColumnInternationalDataDivider: TableViewCell {
+
+@objcMembers public class ListThreeColumnInternationalData: TableViewCell {
     
     //-----------------------------------------------------
     // MARK: - Outlets
     //-----------------------------------------------------
-    let leftLabel = Label.createLabelBoldBodySmall(true)
-    let centerLabel = Label.createLabelBoldBodySmall(true)
-    let rightLabel = Label.createLabelBoldBodySmall(true)
     var stack: Stack<StackModel>
+    let leftLabel = Label.createLabelRegularBodySmall(true)
+    let centerLabel = Label.createLabelRegularBodySmall(true)
+    let rightLabel = Label.createLabelRegularBodySmall(true)
+    let arrow = Arrow(frame: .zero)
     
+    //-----------------------------------------------------
+    // MARK: - Initializers
+    //-----------------------------------------------------
     public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
-        stack = Stack<StackModel>.createStack(with: [(view: leftLabel, model: StackItemModel(percent: 33, horizontalAlignment: .leading)),
+        stack = Stack<StackModel>.createStack(with: [(view: leftLabel, model: StackItemModel(percent: 30, horizontalAlignment: .leading)),
-                                                     (view: centerLabel, model: StackItemModel(percent: 34, horizontalAlignment: .leading)),
+                                                     (view: arrow, model: StackItemModel(percent: 4, horizontalAlignment: .trailing)),
-                                                     (view: rightLabel, model: StackItemModel(percent: 33, horizontalAlignment: .center))],
+                                                     (view: centerLabel, model: StackItemModel(percent: 46, horizontalAlignment: .leading)),
-                                              axis: .horizontal)
+                                                     (view: rightLabel, model: StackItemModel(percent:30,horizontalAlignment: .center))],
+                                                     axis: .horizontal,spacing: 2)
         super.init(style: style, reuseIdentifier: reuseIdentifier)
     }
     
@@ -31,37 +37,34 @@ import Foundation
     }
     
     //-----------------------------------------------------
-    // MARK: - MFViewProtocol
+    // MARK: - View Lifecycle
     //-----------------------------------------------------
-    open override func setupView() {
+    override open func setupView() {
         super.setupView()
         addMolecule(stack)
-        stack.restack()
+        arrow.pinHeightAndWidth()
     }
     
-    //-----------------------------------------------------
+    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?){
-    // 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? ListThreeColumnInternationalDataDividerModel else { return }
+        guard let model = model as? ListThreeColumnInternationalDataModel else { return }
         leftLabel.set(with: model.leftLabel, delegateObject, additionalData)
         centerLabel.set(with: model.centerLabel, delegateObject, additionalData)
         rightLabel.set(with: model.rightLabel, delegateObject, additionalData)
+        arrow.set(with: model.arrow, delegateObject, additionalData)
+        stack.restack()
     }
     
-    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
+    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
-        return 121
+        return 90
     }
     
-    //-----------------------------------------------------
+    open override func reset() {
-    // MARK: - MVMCoreUIMoleculeViewProtocol
-    //-----------------------------------------------------
-    override open func reset() {
         super.reset()
-        leftLabel.styleBoldBodySmall(true)
+        leftLabel.styleRegularBodySmall(true)
-        centerLabel.styleBoldBodySmall(true)
+        centerLabel.styleRegularBodySmall(true)
-        rightLabel.styleBoldBodySmall(true)
+        rightLabel.styleRegularBodySmall(true)
+        arrow.reset()
     }
+    
 }
-

MVMCoreUI/Molecules/DesignedComponents/List/ThreeColumn/ListThreeColumnInternationalDataModel.swift

@@ -1,36 +1,41 @@
 //
-//  ListThreeColumnInternationalDataDividerModel.swift
+//  ListThreeColumnInternationalDataModel.swift
 //  MVMCoreUI
 //
-//  Created by Kruthika KP on 23/03/20.
+//  Created by Kruthika KP on 24/03/20.
 //  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
 
 import Foundation
 
-public class ListThreeColumnInternationalDataDividerModel : ListItemModel, MoleculeModelProtocol {
+public class ListThreeColumnInternationalDataModel: ListItemModel, MoleculeModelProtocol {
-    public static var identifier: String = "list3CIntDataDiv"
+    
+    public static var identifier: String = "list3CIntData"
     public var leftLabel: LabelModel
     public var centerLabel: LabelModel
     public var rightLabel: LabelModel
+    public var arrow: ArrowModel
     
-    public init (leftLabel:LabelModel, centerLabel:LabelModel, rightLabel:LabelModel) {
+    public init(leftLabel:LabelModel, centerLabel:LabelModel, rightLabel:LabelModel,arrow:ArrowModel){
         self.leftLabel = leftLabel
         self.centerLabel = centerLabel
         self.rightLabel = rightLabel
+        self.arrow = arrow
         super.init()
     }
     
-    override public func setDefaults() {
+    public override func setDefaults() {
         super.setDefaults()
-        style = "tallDivider"
+        arrow.degrees = 50
+        arrow.color = Color.init(uiColor: .mvmGreen)
     }
     
-    private enum CodingKeys: String, CodingKey {
+    private enum CodingKeys: String, CodingKey{
         case moleculeName
         case leftLabel
         case centerLabel
         case rightLabel
+        case arrow
     }
     
     required public init(from decoder: Decoder) throws {
@@ -38,15 +43,17 @@ public class ListThreeColumnInternationalDataDividerModel : ListItemModel, Molec
         leftLabel = try typeContainer.decode(LabelModel.self, forKey: .leftLabel)
         centerLabel = try typeContainer.decode(LabelModel.self, forKey: .centerLabel)
         rightLabel = try typeContainer.decode(LabelModel.self, forKey: .rightLabel)
+        arrow = try typeContainer.decode(ArrowModel.self, forKey: .arrow)
         try super.init(from: decoder)
     }
     
-    public override func encode(to encoder: Encoder) throws {
+    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)
+        try container.encode(arrow, forKey: .arrow)
     }
 }

MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift

@@ -110,6 +110,7 @@ import Foundation
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListTwoColumnCompareChanges.self, viewModelClass: ListTwoColumnCompareChangesModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListTwoColumnPriceDetails.self, viewModelClass: ListTwoColumnPriceDetailsModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListTwoColumnPriceDescription.self, viewModelClass: ListTwoColumnPriceDescriptionModel.self)
+        MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListThreeColumnInternationalData.self, viewModelClass: ListThreeColumnInternationalDataModel.self)
 
         // Designed Section Dividers
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListFourColumnDataUsageDivider.self, viewModelClass: ListFourColumnDataUsageDividerModel.self)
@@ -117,7 +118,6 @@ import Foundation
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListOneColumnTextWithWhitespaceDividerShort.self, viewModelClass: ListOneColumnTextWithWhitespaceDividerShortModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListOneColumnTextWithWhitespaceDividerTall.self, viewModelClass: ListOneColumnTextWithWhitespaceDividerTallModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListOneColumnFullWidthTextDividerSubsection.self, viewModelClass: ListOneColumnFullWidthTextDividerSubsectionModel.self)
-        MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListThreeColumnInternationalDataDivider.self, viewModelClass: ListThreeColumnInternationalDataDividerModel.self)
 
         // Designed Headers
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: HeadersH2NoButtonsBodyText.self, viewModelClass: HeadersH2NoButtonsBodyTextModel.self)