Merge branch 'feature/list_onecolumn_fullwidthtext_bodytextonly' into 'develop'

ListOneColumnFullWidthTextAllTextAndLinks

See merge request BPHV_MIPS/mvm_core_ui!273

MVMCoreUI.xcodeproj/project.pbxproj

@@ -98,10 +98,12 @@
 		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 */; };
+		52267A0723FFE25000906CBA /* ListOneColumnFullWidthTextAllTextAndLinks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52267A0623FFE25000906CBA /* ListOneColumnFullWidthTextAllTextAndLinks.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 */; };
 		8D24041523E7FC0B009E23BE /* ListLeftVariableIconWithRightCaretModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D24041423E7FC0B009E23BE /* ListLeftVariableIconWithRightCaretModel.swift */; };
+		8D448E5524050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D448E5424050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift */; };
 		9432A79F23DB47BA00719041 /* EntryFieldContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9432A79E23DB47BA00719041 /* EntryFieldContainer.swift */; };
 		943784F5236B77BB006A1E82 /* GraphView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943784F3236B77BB006A1E82 /* GraphView.swift */; };
 		943784F6236B77BB006A1E82 /* GraphViewAnimationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943784F4236B77BB006A1E82 /* GraphViewAnimationHandler.swift */; };
@@ -430,10 +432,12 @@
 		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>"; };
+		52267A0623FFE25000906CBA /* ListOneColumnFullWidthTextAllTextAndLinks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListOneColumnFullWidthTextAllTextAndLinks.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>"; };
 		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>"; };
 		9402C34F23A2CEA3004B974C /* LeftRightLabelModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LeftRightLabelModel.swift; sourceTree = "<group>"; };
 		9432A79E23DB47BA00719041 /* EntryFieldContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EntryFieldContainer.swift; sourceTree = "<group>"; };
 		943784F3236B77BB006A1E82 /* GraphView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GraphView.swift; sourceTree = "<group>"; };
@@ -768,6 +772,15 @@
 			path = Views;
 			sourceTree = "<group>";
 		};
+		52267A0523FFE0A900906CBA /* OneColumn */ = {
+			isa = PBXGroup;
+			children = (
+				8D448E5424050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift */,
+				52267A0623FFE25000906CBA /* ListOneColumnFullWidthTextAllTextAndLinks.swift */,
+			);
+			path = OneColumn;
+			sourceTree = "<group>";
+		};
 		946EE1B5237B663A0036751F /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -1011,6 +1024,7 @@
 		D22B38EC23F4E10700490EF6 /* SectionDividers */ = {
 			isa = PBXGroup;
 			children = (
+				52267A0523FFE0A900906CBA /* OneColumn */,
 				D22B38ED23F4E11100490EF6 /* ThreeColumn */,
 			);
 			path = SectionDividers;
@@ -1778,6 +1792,7 @@
 				014AA72423C501E2006F3E93 /* MoleculeContainerModel.swift in Sources */,
 				D29DF28321E7AB24003B2FB9 /* MVMCoreUICommonViewsUtility.m in Sources */,
 				011B58F223A2AE2C0085F53C /* DropDownListItemModel.swift in Sources */,
+				8D448E5524050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift in Sources */,
 				94C2D9842386F3F80006CF46 /* LabelAttributeModel.swift in Sources */,
 				944589212385D6E900DE9FD4 /* DashLineModel.swift in Sources */,
 				D2E2A99623D8CF85000B42E6 /* HeadlineBodyLinkToggleModel.swift in Sources */,
@@ -1855,6 +1870,7 @@
 				012A88F123985E0100FE3DA1 /* Color.swift in Sources */,
 				012A889C23889E8400FE3DA1 /* TemplateModelProtocol.swift in Sources */,
 				D29770FC21F7C77400B2F0D0 /* MVMCoreUITextFieldView.m in Sources */,
+				52267A0723FFE25000906CBA /* ListOneColumnFullWidthTextAllTextAndLinks.swift in Sources */,
 				C003506123AA94CD00B6AC29 /* Button.swift in Sources */,
 				DBC4391B224421A0001AB423 /* CaretLink.swift in Sources */,
 				0198F7A82256A80B0066C936 /* MFRadioButton.m in Sources */,

MVMCoreUI/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift

@@ -0,0 +1,65 @@
+//
+//  ListOneColumnFullWidthTextAllTextAndLinks.swift
+//  MVMCoreUI
+//
+//  Created by Kruthika KP on 14/02/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers public class ListOneColumnFullWidthTextAllTextAndLinks: TableViewCell {
+    
+    //-----------------------------------------------------
+    // MARK: - Outlets
+    //-----------------------------------------------------
+    
+    let stack = Stack<StackModel>(frame: .zero)
+    let eyebrow = Label.commonLabelB3(true)
+    let headline = Label.commonLabelH3(true)
+    let subHeadline = Label.commonLabelB1(true)
+    let body = Label.commonLabelB2(true)
+    let link = Link()
+    
+    //-----------------------------------------------------
+    // MARK: - View Lifecycle
+    //-------------------------------------------------------
+    override open func setupView() {
+        super.setupView()
+        stack.stackItems = [StackItem(andContain: eyebrow),
+                            StackItem(andContain: headline),
+                            StackItem(andContain: subHeadline),
+                            StackItem(andContain: body),
+                            StackItem(andContain: link)]
+        addMolecule(stack)
+    }
+    
+    open override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?){
+        super.setWithModel(model, delegateObject, additionalData)
+        guard let model = model as? ListOneColumnFullWidthTextAllTextAndLinksModel else { return}
+        eyebrow.setWithModel(model.eyebrow, delegateObject, additionalData)
+        headline.setWithModel(model.headline, delegateObject, additionalData)
+        subHeadline.setWithModel(model.subHeadline, delegateObject, additionalData)
+        body.setWithModel(model.body, delegateObject, additionalData)
+        link.setWithModel(model.link, delegateObject, additionalData)
+        let stackModel = StackModel(molecules: [StackItemModel(spacing: 2, gone: !eyebrow.hasText),
+                                                StackItemModel(spacing: 2, gone: !headline.hasText),
+                                                StackItemModel(spacing: 2, gone: !subHeadline.hasText),
+                                                StackItemModel(spacing: 2, gone: !body.hasText),
+                                                StackItemModel(spacing: 2, gone: (link.titleLabel?.text?.count ?? 0) == 0)])
+        stack.model = stackModel
+        stack.restack()
+    }
+    
+    open override class func estimatedHeight(forRow molecule: MoleculeModelProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat?{
+        return 90
+    }
+    
+    open override func reset() {
+        super.reset()
+        eyebrow.styleB3(true)
+        headline.styleH3(true)
+        subHeadline.styleB1(true)
+        body.styleB2(true)
+    }
+}

MVMCoreUI/Molecules/DesignedComponents/SectionDividers/OneColumn/ListOneColumnFullWidthTextAllTextAndLinksModel.swift

@@ -0,0 +1,57 @@
+//
+//  ListOneColumnFullWidthTextAllTextAndLinksModel.swift
+//  MVMCoreUI
+//
+//  Created by Kruthika KP on 14/02/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public class ListOneColumnFullWidthTextAllTextAndLinksModel: ListItemModel, MoleculeModelProtocol {
+    public static var identifier: String = "list1CTxt"
+    public var eyebrow: LabelModel?
+    public var headline : LabelModel?
+    public var subHeadline: LabelModel?
+    public var body: LabelModel?
+    public var link : LinkModel?
+    
+    public init(eyebrow: LabelModel? = nil, headline: LabelModel? = nil, subHeadline: LabelModel? = nil, body: LabelModel? = nil, link: LinkModel? = nil) {
+        self.eyebrow = eyebrow
+        self.headline = headline
+        self.subHeadline = subHeadline
+        self.body = body
+        self.link = link
+        super.init()
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case eyebrow
+        case headline
+        case subHeadline
+        case body
+        case link
+    }
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        eyebrow = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .eyebrow)
+        headline = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .headline)
+        subHeadline = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .subHeadline)
+        body = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .body)
+        link = try typeContainer.decodeIfPresent(LinkModel.self, forKey: .link)
+        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.encodeIfPresent(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(eyebrow, forKey: .eyebrow)
+        try container.encodeIfPresent(headline, forKey: .headline)
+        try container.encodeIfPresent(subHeadline, forKey: .subHeadline)
+        try container.encodeIfPresent(body, forKey: .body)
+        try container.encodeIfPresent(link, forKey: .link)
+    }
+}

MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift

@@ -55,6 +55,8 @@ import Foundation
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: StringAndMoleculeView.self, viewModelClass: StringAndMoleculeModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ImageHeadlineBody.self, viewModelClass: ImageHeadlineBodyModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListThreeColumnPlanDataDivider.self, viewModelClass: ListThreeColumnPlanDataDividerModel.self)
+        MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListOneColumnFullWidthTextAllTextAndLinks.self, viewModelClass: ListOneColumnFullWidthTextAllTextAndLinksModel.self)
+        
     
 
         // Vertical Combination Molecules