Merge branch 'feature/list_twocolumn_pricedescription' into 'develop'

Feature/list twocolumn pricedescription

See merge request BPHV_MIPS/mvm_core_ui!302

MVMCoreUI.xcodeproj/project.pbxproj

@@ -201,6 +201,8 @@
 		D22D1F562204CE5D0077CEC0 /* MVMCoreUIStackableViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = D22D1F542204CE5D0077CEC0 /* MVMCoreUIStackableViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D22D1F572204CE5D0077CEC0 /* MVMCoreUIStackableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D22D1F552204CE5D0077CEC0 /* MVMCoreUIStackableViewController.m */; };
 		D22D8395241FB41200D3DF69 /* UIStackView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D22D8394241FB41200D3DF69 /* UIStackView+Extension.swift */; };
+		D236E5B4241FEB1000C38625 /* ListTwoColumnPriceDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = D236E5B2241FEB1000C38625 /* ListTwoColumnPriceDescription.swift */; };
+		D236E5B5241FEB1000C38625 /* ListTwoColumnPriceDescriptionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D236E5B3241FEB1000C38625 /* ListTwoColumnPriceDescriptionModel.swift */; };
 		D243859923A16B1800332775 /* Container.swift in Sources */ = {isa = PBXBuildFile; fileRef = D243859823A16B1800332775 /* Container.swift */; };
 		D256E9932412880000360572 /* Header.swift in Sources */ = {isa = PBXBuildFile; fileRef = D256E9922412880000360572 /* Header.swift */; };
 		D260105323CEA61600764D80 /* ToggleModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D260105223CEA61600764D80 /* ToggleModel.swift */; };
@@ -570,6 +572,8 @@
 		D22D1F542204CE5D0077CEC0 /* MVMCoreUIStackableViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIStackableViewController.h; sourceTree = "<group>"; };
 		D22D1F552204CE5D0077CEC0 /* MVMCoreUIStackableViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUIStackableViewController.m; sourceTree = "<group>"; };
 		D22D8394241FB41200D3DF69 /* UIStackView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIStackView+Extension.swift"; sourceTree = "<group>"; };
+		D236E5B2241FEB1000C38625 /* ListTwoColumnPriceDescription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListTwoColumnPriceDescription.swift; sourceTree = "<group>"; };
+		D236E5B3241FEB1000C38625 /* ListTwoColumnPriceDescriptionModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListTwoColumnPriceDescriptionModel.swift; sourceTree = "<group>"; };
 		D243859823A16B1800332775 /* Container.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Container.swift; sourceTree = "<group>"; };
 		D256E9922412880000360572 /* Header.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Header.swift; sourceTree = "<group>"; };
 		D260105223CEA61600764D80 /* ToggleModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToggleModel.swift; sourceTree = "<group>"; };
@@ -1177,6 +1181,8 @@
 		D22D8396241FDE4700D3DF69 /* TwoColumn */ = {
 			isa = PBXGroup;
 			children = (
+				D236E5B3241FEB1000C38625 /* ListTwoColumnPriceDescriptionModel.swift */,
+				D236E5B2241FEB1000C38625 /* ListTwoColumnPriceDescription.swift */,
 				526A265B240D1FF700B0D828 /* ListTwoColumnCompareChangesModel.swift */,
 				526A265D240D200500B0D828 /* ListTwoColumnCompareChanges.swift */,
 				525239BF2407BCFF00454969 /* ListTwoColumnPriceDetailsModel.swift */,
@@ -1832,6 +1838,7 @@
 				D29DF11721E6805F003B2FB9 /* UIColor+MFConvenience.m in Sources */,
 				D2B18B7F2360913400A9AEDC /* Control.swift in Sources */,
 				011D95A924057AC7000E3791 /* FormActionFieldProtocol.swift in Sources */,
+				D236E5B4241FEB1000C38625 /* ListTwoColumnPriceDescription.swift in Sources */,
 				0AA33B3A2398524F0067DD0F /* Toggle.swift in Sources */,
 				D29DF12F21E6851E003B2FB9 /* MVMCoreUITopAlertMainView.m in Sources */,
 				942C378C2412F4FA0066E45E /* ModalMoleculeListTemplate.swift in Sources */,
@@ -2063,6 +2070,7 @@
 				D29DF29C21E7ADB9003B2FB9 /* MFProgrammaticTableViewController.m in Sources */,
 				0A7EF86323D8AFA000B2AAD1 /* BaseDropdownEntryFieldModel.swift in Sources */,
 				0A1214A022C11A18007C7030 /* ActionDetailWithImage.swift in Sources */,
+				D236E5B5241FEB1000C38625 /* ListTwoColumnPriceDescriptionModel.swift in Sources */,
 				D2B18B922361E65A00A9AEDC /* CoreUIObject.swift in Sources */,
 				D29DF2BE21E7BEA4003B2FB9 /* TopTabbar.m in Sources */,
 				014AA72E23C5059B006F3E93 /* StackCenteredPageTemplateModel.swift in Sources */,

MVMCoreUI/Atoms/Views/Label/LabelAttributeModel.swift

@@ -32,7 +32,7 @@ import Foundation
     var location: Int
     var length: Int
 
-    init(_ location: Int, _ length: Int) {
+    public init(_ location: Int, _ length: Int) {
         self.location = location
         self.length = length
     }

MVMCoreUI/Atoms/Views/Label/LabelAttributeStrikeThroughModel.swift

@@ -19,4 +19,8 @@ import UIKit
     public override func encode(to encoder: Encoder) throws {
         try super.encode(to: encoder)
     }
+    
+    public override init(_ location: Int, _ length: Int) {
+        super.init(location, length)
+    }
 }

MVMCoreUI/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDescription.swift

@@ -0,0 +1,94 @@
+//
+//  ListTwoColumnPriceDescription.swift
+//  MVMCoreUI
+//
+//  Created by Kruthika KP on 24/02/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers open class ListTwoColumnPriceDescription: TableViewCell {
+    
+    //-----------------------------------------------------
+    // MARK: - Outlets
+    //-------------------------------------------------------
+    public let leftHeadline = Label.commonLabelB1(true)
+    public let leftBody = Label.commonLabelB2(true)
+    public let rightLabel = Label.commonLabelB2(true)
+    public let rightSubLabel = Label.commonLabelB2(true)
+    
+    public let view = MVMCoreUICommonViewsUtility.commonView()
+    public let leftVerticalStack: UIStackView
+    public let rightVerticalStack: UIStackView
+    
+    //------------------------------------------------------
+    // MARK: - Initializers
+    //------------------------------------------------------
+    public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        leftVerticalStack = UIStackView(arrangedSubviews: [leftHeadline, leftBody])
+        leftVerticalStack.axis = .vertical
+        leftVerticalStack.alignment = .leading
+        rightVerticalStack = UIStackView(arrangedSubviews: [rightLabel, rightSubLabel])
+        rightVerticalStack.axis = .vertical
+        rightVerticalStack.alignment = .trailing
+        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 updateView(_ size: CGFloat) {
+        super.updateView(size)
+        leftVerticalStack.updateView(size)
+        rightVerticalStack.updateView(size)
+    }
+    
+    override open func setupView() {
+        super.setupView()
+        contentView.addSubview(view)
+        containerHelper.constrainView(view)
+        
+        leftVerticalStack.translatesAutoresizingMaskIntoConstraints = false
+        rightVerticalStack.translatesAutoresizingMaskIntoConstraints = false
+        rightLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
+        rightSubLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
+        view.addSubview(leftVerticalStack)
+        view.addSubview(rightVerticalStack)
+        NSLayoutConstraint.pinViews(leftView: leftVerticalStack, rightView: rightVerticalStack, alignTop: true)
+        
+        leftHeadline.numberOfLines = 1
+        rightLabel.numberOfLines = 1
+        rightSubLabel.numberOfLines = 1
+    }
+    //----------------------------------------------------
+    // 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? ListTwoColumnPriceDescriptionModel else { return }
+        leftHeadline.set(with: model.leftHeadline, delegateObject, additionalData)
+        leftBody.set(with: model.leftBody, delegateObject, additionalData)
+        rightLabel.set(with: model.rightLabel, delegateObject, additionalData)
+        rightSubLabel.set(with: model.rightSubLabel, delegateObject, additionalData)
+    }
+    
+    open override class func estimatedHeight(with molecule: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+        return 80
+    }
+    
+    override open func reset() {
+        super.reset()
+        leftVerticalStack.reset()
+        rightVerticalStack.reset()
+        leftHeadline.styleB1(true)
+        leftBody.styleB2(true)
+        rightLabel.styleB2(true)
+        rightSubLabel.styleB2(true)
+    }
+}

MVMCoreUI/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDescriptionModel.swift

@@ -0,0 +1,66 @@
+//
+//  ListTwoColumnPriceDescriptionModel.swift
+//  MVMCoreUI
+//
+//  Created by Kruthika KP on 26/02/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public class ListTwoColumnPriceDescriptionModel: ListItemModel, MoleculeModelProtocol {
+    public static var identifier: String = "list2CTxtPrc1"
+    public var leftHeadline: LabelModel
+    public var leftBody: LabelModel
+    public var rightLabel: LabelModel
+    public var rightSubLabel: LabelModel
+    
+    override public func setDefaults() {
+        super.setDefaults()
+        rightLabel.hero = 0
+        if rightSubLabel.textColor == nil {
+            rightSubLabel.textColor = Color(uiColor: .mvmCoolGray6)
+        }
+        if rightSubLabel.attributes == nil {
+            rightSubLabel.attributes = [LabelAttributeStrikeThroughModel(0, rightSubLabel.text.count)]
+        }
+    }
+    
+    public init(leftHeadline: LabelModel,leftBody: LabelModel, rightLabel: LabelModel, rightSubLabel: LabelModel) {
+        self.leftHeadline = leftHeadline
+        self.leftBody = leftBody
+        self.rightLabel = rightLabel
+        self.rightSubLabel = rightSubLabel
+        super.init()
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case leftHeadline
+        case leftBody
+        case rightLabel
+        case rightSubLabel
+    }
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        leftHeadline = try typeContainer.decode(LabelModel.self, forKey: .leftHeadline)
+        leftBody = try typeContainer.decode(LabelModel.self, forKey: .leftBody)
+        rightLabel = try typeContainer.decode(LabelModel.self, forKey: .rightLabel)
+        rightSubLabel = try typeContainer.decode(LabelModel.self, forKey: .rightSubLabel)
+        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(leftHeadline, forKey: .leftHeadline)
+        try container.encode(leftBody, forKey: .leftBody)
+        try container.encode(rightLabel, forKey: .rightLabel)
+        try container.encode(rightSubLabel, forKey: .rightSubLabel)
+    }
+}
+
+
+

MVMCoreUI/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDetails.swift

@@ -23,6 +23,7 @@ import UIKit
         contentView.addSubview(view)
         containerHelper.constrainView(view)
         rightLabel.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal)
+        rightLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
     }
     
     open override func updateView(_ size: CGFloat) {

MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift

@@ -114,6 +114,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)
         // TODO: Need model
         MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping.setObject(DigitEntryField.self, forKey: "digitTextField" as NSString)
         MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping.setObject(DateDropdownEntryField.self, forKey: "dateDropdownEntryField" as NSString)

MVMCoreUI/Templates/MoleculeListTemplate.swift

@@ -137,12 +137,12 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
         
         (moleculeCell as? ModelMoleculeViewProtocol)?.set(with: moleculeInfo.molecule, delegate, nil)
         moleculeCell?.updateView(tableView.bounds.width)
-        
+        // Neded to fix an apple defect where the cell is not the correct size on certain devices for certain cells
+        cell.layoutIfNeeded()
         return cell
     }
     
     open override func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
-        
         if let protocolCell = cell as? MoleculeListCellProtocol {
             protocolCell.willDisplay()
         }