Merge branch 'feature/ListLeftVar_Checkbox-_Right_Caret' into 'develop'

Feature/list left var checkbox  right caret

See merge request BPHV_MIPS/mvm_core_ui!272

MVMCoreUI.xcodeproj/project.pbxproj

@@ -96,6 +96,8 @@
 		0AE14F64238315D2005417F8 /* TextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE14F63238315D2005417F8 /* TextField.swift */; };
 		31BE15CB23D8924D00452370 /* CheckboxLabelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31BE15C923D8924C00452370 /* CheckboxLabelModel.swift */; };
 		31BE15CC23D8924D00452370 /* CheckboxModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31BE15CA23D8924C00452370 /* CheckboxModel.swift */; };
+		522679C123FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 522679BF23FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift */; };
+		522679C223FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 522679C023FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift */; };
 		5248BFEC23F12E350059236A /* ListThreeColumnPlanDataDivider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5248BFEA23F12E350059236A /* ListThreeColumnPlanDataDivider.swift */; };
 		5248BFED23F12E350059236A /* ListThreeColumnPlanDataDividerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5248BFEB23F12E350059236A /* ListThreeColumnPlanDataDividerModel.swift */; };
 		8D24041123E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D24041023E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift */; };
@@ -424,6 +426,8 @@
 		0AE14F63238315D2005417F8 /* TextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextField.swift; sourceTree = "<group>"; };
 		31BE15C923D8924C00452370 /* CheckboxLabelModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CheckboxLabelModel.swift; sourceTree = "<group>"; };
 		31BE15CA23D8924C00452370 /* CheckboxModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CheckboxModel.swift; sourceTree = "<group>"; };
+		522679BF23FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListLeftVariableCheckboxAllTextAndLinks.swift; sourceTree = "<group>"; };
+		522679C023FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListLeftVariableCheckboxAllTextAndLinksModel.swift; sourceTree = "<group>"; };
 		5248BFEA23F12E350059236A /* ListThreeColumnPlanDataDivider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListThreeColumnPlanDataDivider.swift; sourceTree = "<group>"; };
 		5248BFEB23F12E350059236A /* ListThreeColumnPlanDataDividerModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListThreeColumnPlanDataDividerModel.swift; sourceTree = "<group>"; };
 		8D24041023E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableIconWithRightCaret.swift; sourceTree = "<group>"; };
@@ -991,6 +995,8 @@
 		D22B38EB23F4E0AE00490EF6 /* LeftVariable */ = {
 			isa = PBXGroup;
 			children = (
+				522679C023FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift */,
+				522679BF23FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift */,
 				8D24041423E7FC0B009E23BE /* ListLeftVariableIconWithRightCaretModel.swift */,
 				8D24041023E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift */,
 			);
@@ -1658,6 +1664,7 @@
 				DBC4392122491730001AB423 /* LabelWithInternalButton.swift in Sources */,
 				D224798C231450C8003FCCF9 /* HeadlineBodyToggle.swift in Sources */,
 				017BEB442362192F0024EF95 /* MVMCoreUIMoleculeMappingObject+ModelExtension.swift in Sources */,
+				522679C123FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift in Sources */,
 				9445890C2385BCE300DE9FD4 /* ProgressBarModel.swift in Sources */,
 				9445891F2385D2E900DE9FD4 /* CaretViewModel.swift in Sources */,
 				01C851D323CF9E740021F976 /* LabelToggleModel.swift in Sources */,
@@ -1785,6 +1792,7 @@
 				D2FB151B23A2B65B00C20E10 /* MoleculeContainer.swift in Sources */,
 				D2A638FD22CA98280052ED1F /* HeadlineBody.swift in Sources */,
 				D29DF16121E69996003B2FB9 /* MFViewController.m in Sources */,
+				522679C223FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift in Sources */,
 				0ABD1371237DB0450081388D /* ItemDropdownEntryField.swift in Sources */,
 				8D24041123E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift in Sources */,
 				D2E1FAE12268E81D00AEFD8C /* MoleculeListTemplate.swift in Sources */,

MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift

@@ -0,0 +1,56 @@
+//
+//  ListLeftVariableCheckboxAllTextAndLinks.swift
+//  MVMCoreUI
+//
+//  Created by Lekshmi S on 11/02/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers public class ListLeftVariableCheckboxAllTextAndLinks: TableViewCell {
+    public let checkbox = Checkbox(frame: .zero)
+    public let eyebrowHeadlineBodyLink = EyebrowHeadlineBodyLink(frame: .zero)
+    public let stack = Stack<StackModel>(frame: .zero)
+   
+    // MARK: - View Lifecycle
+    open override func updateView(_ size: CGFloat) {
+        super.updateView(size)
+        stack.updateView(size)
+    }
+    
+    override open func setupView() {
+        super.setupView()
+        stack.stackItems = [StackItem(andContain: checkbox),StackItem(andContain: eyebrowHeadlineBodyLink)]
+        contentView.addSubview(stack)
+        containerHelper.constrainView(stack)
+    }
+    
+    // MARK:- ModelMoleculeViewProtocol
+    override open func reset() {
+        super.reset()
+        stack.reset()
+    }
+    
+    // MARK:- MVMCoreUIMoleculeViewProtocol
+    public override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
+        super.setWithModel(model, delegateObject, additionalData)
+        guard let model = model as? ListLeftVariableCheckboxAllTextAndLinksModel else { return}
+        checkbox.setWithModel(model.checkbox, delegateObject, additionalData)
+        eyebrowHeadlineBodyLink.setWithModel(model.eyebrowHeadlineBodyLink, delegateObject, additionalData)
+    
+        // Create a stack model to use for the internal stack and set the alignment of labels
+        let checkbox = StackItemModel()
+        checkbox.horizontalAlignment = .fill
+        let eyebrowHeadlineBodyLink = StackItemModel()
+        eyebrowHeadlineBodyLink.horizontalAlignment = .leading
+        let stackModel = StackModel(molecules: [checkbox,eyebrowHeadlineBodyLink])
+        stackModel.axis = .horizontal
+        stack.model = stackModel
+        stack.restack()
+    }
+    
+    public override class func estimatedHeight(forRow molecule: MoleculeModelProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+        return 140
+    }
+}

MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinksModel.swift

@@ -0,0 +1,42 @@
+//
+//  ListLeftVariableCheckboxAllTextAndLinksModel.swift
+//  MVMCoreUI
+//
+//  Created by Lekshmi S on 11/02/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public class ListLeftVariableCheckboxAllTextAndLinksModel: ListItemModel, MoleculeModelProtocol {
+    public static var identifier: String = "listLVCB"
+    public var checkbox: CheckboxModel
+    public var eyebrowHeadlineBodyLink: EyebrowHeadlineBodyLinkModel
+    
+    public init(checkbox: CheckboxModel, eyebrowHeadlineBodyLink: EyebrowHeadlineBodyLinkModel) {
+        self.checkbox = checkbox
+        self.eyebrowHeadlineBodyLink = eyebrowHeadlineBodyLink
+        super.init()
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case eyebrowHeadlineBodyLink
+        case checkbox
+    }
+       
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        eyebrowHeadlineBodyLink = try typeContainer.decode(EyebrowHeadlineBodyLinkModel.self, forKey: .eyebrowHeadlineBodyLink)
+        checkbox = try typeContainer.decode(CheckboxModel.self, forKey: .checkbox)
+        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(eyebrowHeadlineBodyLink, forKey: .eyebrowHeadlineBodyLink)
+        try container.encode(checkbox, forKey: .checkbox)
+    }
+}

MVMCoreUI/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift

@@ -21,9 +21,6 @@ import UIKit
     // MARK: - MFViewProtocol
     open override func setupView() {
         super.setupView()
-        guard stack.superview == nil else {
-            return
-        }
         stack.stackItems = [StackItem(andContain: eyebrow),StackItem(andContain: headline),StackItem(andContain: body),StackItem(andContain: link)]
         addSubview(stack)
         NSLayoutConstraint.constraintPinSubview(toSuperview: stack)
@@ -47,7 +44,7 @@ import UIKit
     // MARK:- ModelMoleculeViewProtocol
     open override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
         super.setWithModel(model, delegateObject, additionalData)
-        eyebrow.setWithModel(casteModel?.eyeBrow, delegateObject, additionalData)
+        eyebrow.setWithModel(casteModel?.eyebrow, delegateObject, additionalData)
         headline.setWithModel(casteModel?.headline, delegateObject, additionalData)
         body.setWithModel(casteModel?.body, delegateObject, additionalData)
         link.setWithModel(casteModel?.link, delegateObject, additionalData)

MVMCoreUI/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLinkModel.swift

@@ -8,11 +8,11 @@
 
 import Foundation
 
-struct EyebrowHeadlineBodyLinkModel: MoleculeModelProtocol {
+public struct EyebrowHeadlineBodyLinkModel: MoleculeModelProtocol {
-    static var identifier: String = "eyebrowHeadlineBodyLink"
+    public static var identifier: String = "eyebrowHeadlineBodyLink"
-    var backgroundColor: Color?
+    public var moleculeName: String? = EyebrowHeadlineBodyLinkModel.identifier
-    var moleculeName: String? = EyebrowHeadlineBodyLinkModel.identifier
+    public var backgroundColor: Color?
-    public var eyeBrow: LabelModel?
+    public var eyebrow: LabelModel?
     public var headline: LabelModel?
     public var body: LabelModel?
     public var link: LinkModel?

MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift

@@ -73,6 +73,7 @@ import Foundation
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: HeadlineBodyLinkToggle.self, viewModelClass: HeadlineBodyLinkToggleModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ActionDetailWithImage.self, viewModelClass: ActionDetailWithImageModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListLeftVariableIconWithRightCaret.self, viewModelClass: ListLeftVariableIconWithRightCaretModel.self)
+        MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListLeftVariableCheckboxAllTextAndLinks.self, viewModelClass: ListLeftVariableCheckboxAllTextAndLinksModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListRightVariablePayments.self, viewModelClass: ListRightVariablePaymentsModel.self)
 
         // List items