Merge branch 'feature/list_threecolumn_internationaldatadivider_listitem' into 'develop'

List - Three Column - International Data

See merge request BPHV_MIPS/mvm_core_ui!357

MVMCoreUI.xcodeproj/project.pbxproj

@@ -135,6 +135,8 @@
 		8D448E5524050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D448E5424050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift */; };
 		8D4687E2242E2DE400802879 /* ListFourColumnDataUsageListItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D4687E1242E2DE400802879 /* ListFourColumnDataUsageListItemModel.swift */; };
 		8D4687E4242E2DF300802879 /* ListFourColumnDataUsageListItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D4687E3242E2DF300802879 /* ListFourColumnDataUsageListItem.swift */; };
+		8DD1E36E243B3CFB00D8F2DF /* ListThreeColumnInternationalDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DD1E36D243B3CFB00D8F2DF /* ListThreeColumnInternationalDataModel.swift */; };
+		8DD1E370243B3D0500D8F2DF /* ListThreeColumnInternationalData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DD1E36F243B3D0500D8F2DF /* 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 */; };
@@ -530,6 +532,8 @@
 		8D448E5424050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListOneColumnFullWidthTextAllTextAndLinksModel.swift; sourceTree = "<group>"; };
 		8D4687E1242E2DE400802879 /* ListFourColumnDataUsageListItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListFourColumnDataUsageListItemModel.swift; sourceTree = "<group>"; };
 		8D4687E3242E2DF300802879 /* ListFourColumnDataUsageListItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListFourColumnDataUsageListItem.swift; sourceTree = "<group>"; };
+		8DD1E36D243B3CFB00D8F2DF /* ListThreeColumnInternationalDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListThreeColumnInternationalDataModel.swift; sourceTree = "<group>"; };
+		8DD1E36F243B3D0500D8F2DF /* 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>"; };
@@ -982,6 +986,15 @@
 			path = TwoColumn;
 			sourceTree = "<group>";
 		};
+		8DD1E36C243B3CD900D8F2DF /* ThreeColumn */ = {
+			isa = PBXGroup;
+			children = (
+				8DD1E36D243B3CFB00D8F2DF /* ListThreeColumnInternationalDataModel.swift */,
+				8DD1E36F243B3D0500D8F2DF /* ListThreeColumnInternationalData.swift */,
+			);
+			path = ThreeColumn;
+			sourceTree = "<group>";
+		};
 		94C01508242155FE005811A9 /* Actions */ = {
 			isa = PBXGroup;
 			children = (
@@ -1248,9 +1261,10 @@
 		D22B38EA23F4E08B00490EF6 /* List */ = {
 			isa = PBXGroup;
 			children = (
-				D20492F12434CB5F00A5EED6 /* FourColumn */,
-				D22D8396241FDE4700D3DF69 /* TwoColumn */,
 				52267A0523FFE0A900906CBA /* OneColumn */,
+				D22D8396241FDE4700D3DF69 /* TwoColumn */,
+				8DD1E36C243B3CD900D8F2DF /* ThreeColumn */,
+				D20492F12434CB5F00A5EED6 /* FourColumn */,
 				AA4FC2A323F4F69600E251DB /* RightVariable */,
 				D22B38EB23F4E0AE00490EF6 /* LeftVariable */,
 			);
@@ -2079,6 +2093,7 @@
 				D260105D23D0BCD400764D80 /* Stack.swift in Sources */,
 				0A7EF85D23D8A95600B2AAD1 /* TextEntryFieldModel.swift in Sources */,
 				BB54C5212434D92F0038326C /* ListRightVariableButtonAllTextAndLinksModel.swift in Sources */,
+				8DD1E370243B3D0500D8F2DF /* ListThreeColumnInternationalData.swift in Sources */,
 				D2D6CD4222E78FAB00D701B8 /* ThreeLayerTemplate.swift in Sources */,
 				01EB368F23609801006832FA /* LabelModel.swift in Sources */,
 				942C378E2412F5B60066E45E /* ModalMoleculeStackTemplate.swift in Sources */,
@@ -2162,6 +2177,7 @@
 				D27CD4102339057800C1DC07 /* EyebrowHeadlineBodyLink.swift in Sources */,
 				8D070BB2241B56AD0099AC56 /* ListRightVariableTotalData.swift in Sources */,
 				D29DF11D21E684A9003B2FB9 /* MVMCoreUISplitViewController.m in Sources */,
+				8DD1E36E243B3CFB00D8F2DF /* ListThreeColumnInternationalDataModel.swift in Sources */,
 				D243859923A16B1800332775 /* Container.swift in Sources */,
 				D2C521A923EDE79E00CA2634 /* ViewController.swift in Sources */,
 				D260105B23D0BB7100764D80 /* StackModelProtocol.swift in Sources */,

MVMCoreUI/Atomic/MoleculeObjectMapping.swift

@@ -140,6 +140,7 @@ import Foundation
         MoleculeObjectMapping.shared()?.register(viewClass: ListTwoColumnCompareChanges.self, viewModelClass: ListTwoColumnCompareChangesModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListTwoColumnPriceDetails.self, viewModelClass: ListTwoColumnPriceDetailsModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListTwoColumnPriceDescription.self, viewModelClass: ListTwoColumnPriceDescriptionModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListThreeColumnInternationalData.self, viewModelClass: ListThreeColumnInternationalDataModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListFourColumnDataUsageListItem.self, viewModelClass: ListFourColumnDataUsageListItemModel.self)
 
         // Designed Section Dividers

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

@@ -0,0 +1,73 @@
+//
+//  ListThreeColumnInternationalData.swift
+//  MVMCoreUI
+//
+//  Created by Kruthika KP on 06/04/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers public class ListThreeColumnInternationalData: TableViewCell {
+    
+    //-----------------------------------------------------
+    // MARK: - Outlets
+    //-----------------------------------------------------
+    open var stack: Stack<StackModel>
+    public let leftLabel = Label.createLabelRegularBodySmall(true)
+    public let centerLabel = Label.createLabelRegularBodySmall(true)
+    public let rightLabel = Label.createLabelRegularBodySmall(true)
+    public let arrow = Arrow(frame: .zero)
+    public let arrowAndLabel2Stack: Stack<StackModel>
+
+    //-----------------------------------------------------
+    // MARK: - Initializers
+    //-----------------------------------------------------
+    public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        arrowAndLabel2Stack = Stack<StackModel>.createStack(with: [(view: arrow, model: StackItemModel(horizontalAlignment: .fill)),
+               (view: centerLabel, model: StackItemModel(horizontalAlignment: .leading))],
+                                                            axis: .horizontal, spacing: 4)
+        centerLabel.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal)
+        centerLabel.setContentHuggingPriority(UILayoutPriority(rawValue: 900), for: .horizontal)
+        stack = Stack<StackModel>.createStack(with: [(view: leftLabel, model: StackItemModel(percent: 30, horizontalAlignment: .leading)),
+                                                     (view: arrowAndLabel2Stack, model: StackItemModel(percent: 50, horizontalAlignment: .fill)),
+                                                     (view: rightLabel, model: StackItemModel(percent:20,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
+    //-----------------------------------------------------
+    override open func setupView() {
+        super.setupView()
+        addMolecule(stack)
+        arrow.pinHeightAndWidth()
+        arrowAndLabel2Stack.restack()
+        stack.restack()
+    }
+    
+    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
+        super.set(with: model, delegateObject, additionalData)
+        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)
+    }
+    
+    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+        return 90
+    }
+    
+    open override func reset() {
+        super.reset()
+        leftLabel.styleRegularBodySmall(true)
+        centerLabel.styleRegularBodySmall(true)
+        rightLabel.styleRegularBodySmall(true)
+    }
+}

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

@@ -0,0 +1,52 @@
+//
+//  ListThreeColumnInternationalDataModel.swift
+//  MVMCoreUI
+//
+//  Created by Kruthika KP on 06/04/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public class ListThreeColumnInternationalDataModel: ListItemModel, MoleculeModelProtocol {
+    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, arrow:ArrowModel) {
+        self.leftLabel = leftLabel
+        self.centerLabel = centerLabel
+        self.rightLabel = rightLabel
+        self.arrow = arrow
+        super.init()
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case leftLabel
+        case centerLabel
+        case rightLabel
+        case arrow
+    }
+    
+    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)
+        arrow = try typeContainer.decode(ArrowModel.self, forKey: .arrow)
+        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)
+        try container.encode(arrow, forKey: .arrow)
+    }
+}