Merge branch 'feature/list_rightvariable_totaldata' into 'develop'

Feature/list rightvariable totaldata

See merge request BPHV_MIPS/mvm_core_ui!310

MVMCoreUI.xcodeproj/project.pbxproj

@@ -127,6 +127,8 @@
 		526A265E240D200500B0D828 /* ListTwoColumnCompareChanges.swift in Sources */ = {isa = PBXBuildFile; fileRef = 526A265D240D200500B0D828 /* ListTwoColumnCompareChanges.swift */; };
 		52B201D224081CFB00D2011E /* ListLeftVariableRadioButtonAndPaymentMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B201D024081CFB00D2011E /* ListLeftVariableRadioButtonAndPaymentMethod.swift */; };
 		52B201D324081CFB00D2011E /* ListLeftVariableRadioButtonAndPaymentMethodModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B201D124081CFB00D2011E /* ListLeftVariableRadioButtonAndPaymentMethodModel.swift */; };
+		8D070BB0241B56530099AC56 /* ListRightVariableTotalDataCaretModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D070BAF241B56530099AC56 /* ListRightVariableTotalDataCaretModel.swift */; };
+		8D070BB2241B56AD0099AC56 /* ListRightVariableTotalDataCaret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D070BB1241B56AD0099AC56 /* ListRightVariableTotalDataCaret.swift */; };
 		8D084AD02410BF4800951227 /* ListOneColumnFullWidthTextBodyTextModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D084ACF2410BF4800951227 /* ListOneColumnFullWidthTextBodyTextModel.swift */; };
 		8D084AD22410BF7600951227 /* ListOneColumnFullWidthTextBodyText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D084AD12410BF7600951227 /* ListOneColumnFullWidthTextBodyText.swift */; };
 		8D24041123E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D24041023E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift */; };
@@ -499,6 +501,8 @@
 		526A265D240D200500B0D828 /* ListTwoColumnCompareChanges.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListTwoColumnCompareChanges.swift; sourceTree = "<group>"; };
 		52B201D024081CFB00D2011E /* ListLeftVariableRadioButtonAndPaymentMethod.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListLeftVariableRadioButtonAndPaymentMethod.swift; sourceTree = "<group>"; };
 		52B201D124081CFB00D2011E /* ListLeftVariableRadioButtonAndPaymentMethodModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListLeftVariableRadioButtonAndPaymentMethodModel.swift; sourceTree = "<group>"; };
+		8D070BAF241B56530099AC56 /* ListRightVariableTotalDataCaretModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariableTotalDataCaretModel.swift; sourceTree = "<group>"; };
+		8D070BB1241B56AD0099AC56 /* ListRightVariableTotalDataCaret.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariableTotalDataCaret.swift; sourceTree = "<group>"; };
 		8D084ACF2410BF4800951227 /* ListOneColumnFullWidthTextBodyTextModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListOneColumnFullWidthTextBodyTextModel.swift; sourceTree = "<group>"; };
 		8D084AD12410BF7600951227 /* ListOneColumnFullWidthTextBodyText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListOneColumnFullWidthTextBodyText.swift; sourceTree = "<group>"; };
 		8D24041023E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableIconWithRightCaret.swift; sourceTree = "<group>"; };
@@ -941,6 +945,8 @@
 			children = (
 				AA11A42023F15D7000D7962F /* ListRightVariablePaymentsModel.swift */,
 				AA11A41E23F15D3100D7962F /* ListRightVariablePayments.swift */,
+				8D070BAF241B56530099AC56 /* ListRightVariableTotalDataCaretModel.swift */,
+				8D070BB1241B56AD0099AC56 /* ListRightVariableTotalDataCaret.swift */,
 				C7F8012223E846C300396FBD /* ListRVWheelModel.swift */,
 				C7F8012023E8303200396FBD /* ListRVWheel.swift */,
 			);
@@ -1807,6 +1813,7 @@
 			files = (
 				5248BFED23F12E350059236A /* ListThreeColumnPlanDataDividerModel.swift in Sources */,
 				0A5D59C223AD2F5700EFD9E9 /* AppleGuidelinesProtocol.swift in Sources */,
+				8D070BB0241B56530099AC56 /* ListRightVariableTotalDataCaretModel.swift in Sources */,
 				943784F5236B77BB006A1E82 /* GraphView.swift in Sources */,
 				31BE15CC23D8924D00452370 /* CheckboxModel.swift in Sources */,
 				94C661DA23CCF4FB00D9FE5B /* UIColor+Extension.swift in Sources */,
@@ -2018,6 +2025,7 @@
 				C695A68123C9830D00BFB94E /* NumberedListModel.swift in Sources */,
 				01EB3684236097C0006832FA /* MoleculeModelProtocol.swift in Sources */,
 				D27CD4102339057800C1DC07 /* EyebrowHeadlineBodyLink.swift in Sources */,
+				8D070BB2241B56AD0099AC56 /* ListRightVariableTotalDataCaret.swift in Sources */,
 				D29DF11D21E684A9003B2FB9 /* MVMCoreUISplitViewController.m in Sources */,
 				D243859923A16B1800332775 /* Container.swift in Sources */,
 				D2C521A923EDE79E00CA2634 /* ViewController.swift in Sources */,

MVMCoreUI/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift

@@ -0,0 +1,69 @@
+//
+//  ListRightVariableTotalData.swift
+//  MVMCoreUI
+//
+//  Created by Kruthika KP on 02/03/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers open class ListRightVariableTotalData: TableViewCell {
+    
+    //-----------------------------------------------------
+    // MARK: - Outlets
+    //-----------------------------------------------------
+    var stack: Stack<StackModel>
+    let leftLabel = Label.commonLabelB1(true)
+    let rightLabel = Label.commonLabelB2(true)
+    let bar = Line()
+    
+    //-----------------------------------------------------
+    // MARK: - Initializers
+    //-----------------------------------------------------
+    
+    public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        stack = Stack<StackModel>.createStack(with: [(view: leftLabel, model: StackItemModel(horizontalAlignment: .leading)),
+                                                     (view: bar, model: StackItemModel(horizontalAlignment: .trailing)),
+                                                     (view: rightLabel, model: StackItemModel(horizontalAlignment: .fill))],
+                                              axis: .horizontal)
+        bar.widthAnchor.constraint(equalToConstant: 20).isActive = true
+        
+        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()
+        rightLabel.setContentCompressionResistancePriority(UILayoutPriority(901), for: .horizontal)
+        addMolecule(stack)
+    }
+    
+    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?){
+        super.set(with: model, delegateObject, additionalData)
+        guard let model = model as? ListRightVariableTotalDataModel else { return}
+        leftLabel.set(with: model.leftLabel, delegateObject, additionalData)
+        rightLabel.set(with: model.rightLabel, delegateObject, additionalData)
+        bar.set(with: model.bar, delegateObject, additionalData)
+        stack.restack()
+    }
+    
+    open override class func estimatedHeight(with molecule: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat?{
+        return 90
+    }
+    
+    open override func reset() {
+        super.reset()
+        leftLabel.styleB1(true)
+        rightLabel.styleB2(true)
+        bar.setStyle(.heavy)
+    }
+}
+

MVMCoreUI/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalDataCaret.swift

@@ -0,0 +1,68 @@
+//
+//  ListRightVariableTotalData.swift
+//  MVMCoreUI
+//
+//  Created by Kruthika KP on 02/03/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers open class ListRightVariableTotalData: TableViewCell {
+    
+    //-----------------------------------------------------
+    // MARK: - Outlets
+    //-----------------------------------------------------
+    public var stack: Stack<StackModel>
+    public let leftLabel = Label.commonLabelB1(true)
+    public let rightLabel = Label.commonLabelB2(true)
+    public let bar = Line()
+    
+    //-----------------------------------------------------
+    // MARK: - Initializers
+    //-----------------------------------------------------
+    
+    public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        stack = Stack<StackModel>.createStack(with: [(view: leftLabel, model: StackItemModel(horizontalAlignment: .leading)),
+                                                     (view: bar, model: StackItemModel(horizontalAlignment: .fill)),
+                                                     (view: rightLabel, model: StackItemModel(spacing: 4, horizontalAlignment: .fill))],
+                                              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()
+        bar.setStyle(.heavy)
+        bar.widthAnchor.constraint(equalToConstant: 20).isActive = true
+        rightLabel.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal)
+        addMolecule(stack)
+        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? ListRightVariableTotalDataModel else { return }
+        leftLabel.set(with: model.leftLabel, delegateObject, additionalData)
+        rightLabel.set(with: model.rightLabel, delegateObject, additionalData)
+        bar.set(with: model.bar, delegateObject, additionalData)
+    }
+    
+    open override class func estimatedHeight(with molecule: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat?{
+        return 70
+    }
+    
+    open override func reset() {
+        super.reset()
+        leftLabel.styleB1(true)
+        rightLabel.styleB2(true)
+        bar.setStyle(.heavy)
+    }
+}

MVMCoreUI/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalDataCaretModel.swift

@@ -0,0 +1,57 @@
+//
+//  ListRightVariableTotalDataModel.swift
+//  MVMCoreUI
+//
+//  Created by Kruthika KP on 02/03/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public class ListRightVariableTotalDataModel: ListItemModel, MoleculeModelProtocol {
+    
+    public static var identifier: String = "listRVLine"
+    public var leftLabel: LabelModel
+    public var rightLabel: LabelModel
+    public var bar: LineModel
+    
+    override public func setDefaults() {
+        super.setDefaults()
+        rightLabel.hero = 0
+        bar.type = .heavy
+        if bar.backgroundColor == nil {
+            bar.backgroundColor = Color(uiColor: .mvmBlue)
+        }
+    }
+    
+    public init (leftLabel: LabelModel, rightlabel:LabelModel, bar: LineModel){
+        self.leftLabel = leftLabel
+        self.rightLabel = rightlabel
+        self.bar = bar
+        super.init()
+    }
+    
+    private enum CodingKeys: String, CodingKey{
+        case moleculeName
+        case leftLabel
+        case rightLabel
+        case bar
+    }
+    
+    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)
+        bar = try typeContainer.decode(LineModel.self, forKey: .bar)
+        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)
+        try container.encode(bar, forKey: .bar)
+    }
+}

MVMCoreUI/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalDataModel.swift

@@ -0,0 +1,49 @@
+//
+//  ListRightVariableTotalDataModel.swift
+//  MVMCoreUI
+//
+//  Created by Kruthika KP on 02/03/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public class ListRightVariableTotalDataModel: ListItemModel, MoleculeModelProtocol {
+    
+    public static var identifier: String = "listRVLine"
+    public var leftLabel: LabelModel
+    public var rightLabel: LabelModel
+    public var bar : LineModel
+    
+    public init (leftLabel: LabelModel, rightlabel:LabelModel, bar: LineModel){
+        self.leftLabel = leftLabel
+        self.rightLabel = rightlabel
+        self.bar = bar
+        super.init()
+    }
+    
+    private enum CodingKeys: String, CodingKey{
+        case moleculeName
+        case leftLabel
+        case rightLabel
+        case bar
+    }
+    
+    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)
+        bar = try typeContainer.decode(LineModel.self, forKey: .bar)
+        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)
+        try container.encode(bar, forKey: .bar)
+        
+    }
+}

MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift

@@ -80,7 +80,7 @@ import Foundation
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: AccordionMoleculeTableViewCell.self, viewModelClass: AccordionListItemModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: TabsTableViewCell.self, viewModelClass: TabsListItemModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListProgressBarData.self, viewModelClass: ListProgressBarDataModel.self)
-
+        MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListRightVariableTotalData.self, viewModelClass: ListRightVariableTotalDataModel.self)
         
         // Other Items
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: MoleculeStackItem.self, viewModelClass: MoleculeStackItemModel.self)