Merge branch 'feature/Headers_H2_NoButtons_BodyText' into 'develop'

Feature/headers h2 no buttons body text

See merge request BPHV_MIPS/mvm_core_ui!293

MVMCoreUI.xcodeproj/project.pbxproj

@@ -175,6 +175,8 @@
 		AA11A42123F15D7000D7962F /* ListRightVariablePaymentsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA11A42023F15D7000D7962F /* ListRightVariablePaymentsModel.swift */; };
 		BB47A586241615EF002BB23C /* ListOneColumnFullWidthTextDividerSubsectionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB47A585241615EF002BB23C /* ListOneColumnFullWidthTextDividerSubsectionModel.swift */; };
 		BB47A588241615FA002BB23C /* ListOneColumnFullWidthTextDividerSubsection.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB47A587241615FA002BB23C /* ListOneColumnFullWidthTextDividerSubsection.swift */; };
+		AAA74A172410C04600080241 /* HeadersH2NoButtonsBodyText.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA74A162410C04600080241 /* HeadersH2NoButtonsBodyText.swift */; };
+		AAA74A192410C05800080241 /* HeadersH2NoButtonsBodyTextModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA74A182410C05800080241 /* HeadersH2NoButtonsBodyTextModel.swift */; };
 		C003506123AA94CD00B6AC29 /* Button.swift in Sources */ = {isa = PBXBuildFile; fileRef = C003506023AA94CD00B6AC29 /* Button.swift */; };
 		C07065C42395677300FBF997 /* Link.swift in Sources */ = {isa = PBXBuildFile; fileRef = C07065C32395677300FBF997 /* Link.swift */; };
 		C695A67F23C9830600BFB94E /* UnOrderedListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C695A67E23C9830600BFB94E /* UnOrderedListModel.swift */; };
@@ -550,6 +552,8 @@
 		AA11A42023F15D7000D7962F /* ListRightVariablePaymentsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariablePaymentsModel.swift; sourceTree = "<group>"; };
 		BB47A585241615EF002BB23C /* ListOneColumnFullWidthTextDividerSubsectionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListOneColumnFullWidthTextDividerSubsectionModel.swift; sourceTree = "<group>"; };
 		BB47A587241615FA002BB23C /* ListOneColumnFullWidthTextDividerSubsection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListOneColumnFullWidthTextDividerSubsection.swift; sourceTree = "<group>"; };
+		AAA74A162410C04600080241 /* HeadersH2NoButtonsBodyText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH2NoButtonsBodyText.swift; sourceTree = "<group>"; };
+		AAA74A182410C05800080241 /* HeadersH2NoButtonsBodyTextModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH2NoButtonsBodyTextModel.swift; sourceTree = "<group>"; };
 		C003506023AA94CD00B6AC29 /* Button.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Button.swift; sourceTree = "<group>"; };
 		C07065C32395677300FBF997 /* Link.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Link.swift; sourceTree = "<group>"; };
 		C695A67E23C9830600BFB94E /* UnOrderedListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UnOrderedListModel.swift; sourceTree = "<group>"; };
@@ -885,6 +889,15 @@
 			path = Link;
 			sourceTree = "<group>";
 		};
+		5206F150241144A900658DC5 /* Headers */ = {
+			isa = PBXGroup;
+			children = (
+				AAA74A182410C05800080241 /* HeadersH2NoButtonsBodyTextModel.swift */,
+				AAA74A162410C04600080241 /* HeadersH2NoButtonsBodyText.swift */,
+			);
+			path = Headers;
+			sourceTree = "<group>";
+		};
 		52267A0523FFE0A900906CBA /* OneColumn */ = {
 			isa = PBXGroup;
 			children = (
@@ -1138,6 +1151,7 @@
 		D22B38E923F4E07800490EF6 /* DesignedComponents */ = {
 			isa = PBXGroup;
 			children = (
+				5206F150241144A900658DC5 /* Headers */,
 				525239C32407FFCC00454969 /* LockUps */,
 				D22B38EC23F4E10700490EF6 /* SectionDividers */,
 				D22B38EA23F4E08B00490EF6 /* List */,
@@ -1923,6 +1937,7 @@
 				01EB369223609801006832FA /* MoleculeStackModel.swift in Sources */,
 				012CA99E2385A2D3003F810F /* MFView+ModelExtension.swift in Sources */,
 				011D9626240EBB16000E3791 /* RadioButtonLabelModel.swift in Sources */,
+				AAA74A192410C05800080241 /* HeadersH2NoButtonsBodyTextModel.swift in Sources */,
 				D282AABA224131D100C46919 /* MFTransparentGIFView.swift in Sources */,
 				944589232385DA9600DE9FD4 /* ImageViewModel.swift in Sources */,
 				D213347723843825008E41B3 /* Line.swift in Sources */,
@@ -2019,6 +2034,7 @@
 				D2FB151B23A2B65B00C20E10 /* MoleculeContainer.swift in Sources */,
 				D2A638FD22CA98280052ED1F /* HeadlineBody.swift in Sources */,
 				D29DF16121E69996003B2FB9 /* MFViewController.m in Sources */,
+				AAA74A172410C04600080241 /* HeadersH2NoButtonsBodyText.swift in Sources */,
 				522679C223FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift in Sources */,
 				8D084AD02410BF4800951227 /* ListOneColumnFullWidthTextBodyTextModel.swift in Sources */,
 				0ABD1371237DB0450081388D /* ItemDropdownEntryField.swift in Sources */,

MVMCoreUI/Molecules/DesignedComponents/Headers/HeadersH2NoButtonsBodyText.swift

@@ -0,0 +1,43 @@
+//
+//  HeadersH2NoButtonsBodyText.swift
+//  MVMCoreUI
+//
+//  Created by Lekshmi S on 05/03/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers open class HeadersH2NoButtonsBodyText: HeaderView {
+    //--------------------------------------------------
+    // MARK: - Outlets
+    //--------------------------------------------------
+    let headlineBody = HeadlineBody(frame: .zero)
+    
+    //-------------------------------------------------------
+    // MARK: - View Lifecycle
+    //-------------------------------------------------------
+    open override func setupView() {
+        super.setupView()
+        headlineBody.stylePageHeader()
+        addMolecule(headlineBody)
+    }
+    
+    //----------------------------------------------------
+    // 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? HeadersH2NoButtonsBodyTextModel else { return }
+        headlineBody.set(with: model.headlineBody, delegateObject, additionalData)
+    }
+    
+    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+        return 121
+    }
+    
+    open override func reset() {
+        super.reset()
+        headlineBody.stylePageHeader()
+    }
+}

MVMCoreUI/Molecules/DesignedComponents/Headers/HeadersH2NoButtonsBodyTextModel.swift

@@ -0,0 +1,55 @@
+//
+//  HeadersH2NoButtonsBodyTextModel.swift
+//  MVMCoreUI
+//
+//  Created by Lekshmi S on 05/03/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public class HeadersH2NoButtonsBodyTextModel: HeaderModel, MoleculeModelProtocol {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    public static var identifier: String = "headerH2"
+    public var headlineBody: HeadlineBodyModel
+    
+    //--------------------------------------------------
+    // MARK: - Initializer
+    //--------------------------------------------------
+    public init(headlineBody: HeadlineBodyModel) {
+        self.headlineBody = headlineBody
+        super.init()
+    }
+
+    public override func setDefaults() {
+        super.setDefaults()
+        topMarginPadding = PaddingDefaultVerticalSpacing3
+        bottomMarginPadding = PaddingDefaultVerticalSpacing3
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Keys
+    //--------------------------------------------------
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case headlineBody
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Codec
+    //--------------------------------------------------
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        headlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .headlineBody)
+        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(headlineBody, forKey: .headlineBody)
+    }
+}

MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBody.swift

@@ -46,7 +46,7 @@ open class HeadlineBody: View {
     func stylePageHeader() {
         headlineLabel.styleH2(true)
         messageLabel.styleB2(true)
-        spaceBetweenLabelsConstant = PaddingTwo
+        spaceBetweenLabelsConstant = PaddingOne
     }
     
     func styleListItem() {

MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift

@@ -116,6 +116,9 @@ import Foundation
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListThreeColumnPlanDataDivider.self, viewModelClass: ListThreeColumnPlanDataDividerModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: ListOneColumnFullWidthTextDividerSubsection.self, viewModelClass: ListOneColumnFullWidthTextDividerSubsectionModel.self)
 
+        // Designed Headers
+        MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: HeadersH2NoButtonsBodyText.self, viewModelClass: HeadersH2NoButtonsBodyTextModel.self)
+
         // TODO: Need model
         MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping.setObject(MVMCoreUIPageControl.self, forKey: "barsPager" as NSString)