new molecules to model

MVMCoreUI.xcodeproj/project.pbxproj

@@ -150,6 +150,7 @@
 		D28A838D23CCDCC200DFE4FC /* PrimaryButton+MoleculeProtocolExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A838C23CCDCC200DFE4FC /* PrimaryButton+MoleculeProtocolExtension.swift */; };
 		D28A838F23CCDEDE00DFE4FC /* TwoButtonViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A838E23CCDEDE00DFE4FC /* TwoButtonViewModel.swift */; };
 		D28A839123CD4FD400DFE4FC /* CornerLabelsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A839023CD4FD400DFE4FC /* CornerLabelsModel.swift */; };
+		D28A839323CE828900DFE4FC /* HeadlineBodyCaretLinkImageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A839223CE828900DFE4FC /* HeadlineBodyCaretLinkImageModel.swift */; };
 		D296E14722A5984C0051EBE7 /* MVMCoreUIViewConstrainingProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = D296E14622A597490051EBE7 /* MVMCoreUIViewConstrainingProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D29770C821F7C4AE00B2F0D0 /* TopLabelsView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */; };
 		D29770C921F7C4AE00B2F0D0 /* TopLabelsView.h in Headers */ = {isa = PBXBuildFile; fileRef = D29770C721F7C4AE00B2F0D0 /* TopLabelsView.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -418,6 +419,7 @@
 		D28A838C23CCDCC200DFE4FC /* PrimaryButton+MoleculeProtocolExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PrimaryButton+MoleculeProtocolExtension.swift"; sourceTree = "<group>"; };
 		D28A838E23CCDEDE00DFE4FC /* TwoButtonViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwoButtonViewModel.swift; sourceTree = "<group>"; };
 		D28A839023CD4FD400DFE4FC /* CornerLabelsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CornerLabelsModel.swift; sourceTree = "<group>"; };
+		D28A839223CE828900DFE4FC /* HeadlineBodyCaretLinkImageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadlineBodyCaretLinkImageModel.swift; sourceTree = "<group>"; };
 		D296E14622A597490051EBE7 /* MVMCoreUIViewConstrainingProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIViewConstrainingProtocol.h; sourceTree = "<group>"; };
 		D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopLabelsView.m; sourceTree = "<group>"; };
 		D29770C721F7C4AE00B2F0D0 /* TopLabelsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopLabelsView.h; sourceTree = "<group>"; };
@@ -760,6 +762,7 @@
 				01EB368D23609801006832FA /* HeadlineBodyModel.swift */,
 				D22479952316AF6D003FCCF9 /* HeadlineBodyTextButton.swift */,
 				D27CD40F2339057800C1DC07 /* EyebrowHeadlineBodyLink.swift */,
+				D28A839223CE828900DFE4FC /* HeadlineBodyCaretLinkImageModel.swift */,
 				C7192E7C23C301750050C2A0 /* HeadLineBodyCaretLinkImage.swift */,
 			);
 			path = VerticalCombinationViews;
@@ -1536,6 +1539,7 @@
 				0198F79F225679880066C936 /* FormValidationProtocol.swift in Sources */,
 				D243859923A16B1800332775 /* Container.swift in Sources */,
 				D29DF29821E7ADB8003B2FB9 /* MFScrollingViewController.m in Sources */,
+				D28A839323CE828900DFE4FC /* HeadlineBodyCaretLinkImageModel.swift in Sources */,
 				D29770C821F7C4AE00B2F0D0 /* TopLabelsView.m in Sources */,
 				01EB369323609801006832FA /* HeaderModel.swift in Sources */,
 				D2E1FADF2268B8E700AEFD8C /* ThreeLayerTableViewController.swift in Sources */,

MVMCoreUI/Molecules/VerticalCombinationViews/HeadLineBodyCaretLinkImage.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-@objcMembers public class HeadLineBodyCaretLinkImage: ViewConstrainingView {
+@objcMembers public class HeadLineBodyCaretLinkImage: View {
 
     let headlineBody = HeadlineBody(frame: .zero)
     let caretButton = CaretButton(frame: .zero)
@@ -34,7 +34,7 @@ import Foundation
         }
         let view = MVMCoreUICommonViewsUtility.commonView()
         addSubview(view)
-        pinView(toSuperView: view)
+        NSLayoutConstraint.constraintPinSubview(toSuperview: view)
         view.addSubview(headlineBody)
         view.addSubview(caretButton)
         
@@ -78,7 +78,16 @@ import Foundation
         backgroundImageView.reset()
     }
     
-    public override class func estimatedHeight(forRow json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
+    public override class func estimatedHeight(forRow molecule: MoleculeProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
         return 320
     }
+    
+    public override func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
+        super.setWithModel(model, delegateObject, additionalData)
+        guard let model = model as? HeadlineBodyCaretLinkImageModel else { return }
+        headlineBody.setWithModel(model.headlineBody, delegateObject, additionalData)
+        caretButton.setWithModel(model.caretLink, delegateObject, additionalData)
+        backgroundImageView.setWithModel(model.image, delegateObject, additionalData)
+    }
 }
+

MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyCaretLinkImageModel.swift

@@ -0,0 +1,17 @@
+//
+//  headlineBodyCaretLinkImageModel.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 1/14/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import UIKit
+
+public class HeadlineBodyCaretLinkImageModel: MoleculeProtocol {
+    public static var identifier: String = "headlineBodyCaretLinkImageMolecule"
+    public var backgroundColor: Color?
+    public var caretLink: LinkModel?
+    public var headlineBody: HeadlineBodyModel
+    public var image: ImageViewModel
+}

MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift

@@ -25,10 +25,13 @@ import Foundation
         ModelRegistry.register(ScrollerModel.self)
         ModelRegistry.register(CornerLabelsModel.self)
         ModelRegistry.register(LineModel.self)
+        ModelRegistry.register(CircleProgressModel.self)
+        ModelRegistry.register(HeadlineBodyCaretLinkImageModel.self)
         // buttons
         ModelRegistry.register(ButtonModel.self)
         ModelRegistry.register(TwoButtonViewModel.self)
         ModelRegistry.register(LinkModel.self)
+        ModelRegistry.register(CaretLinkModel.self)
         // list items
         ModelRegistry.register(ListItemModel.self)
         ModelRegistry.register(DropDownListItemModel.self)