more additions for radio label

MVMCoreUI.xcodeproj/project.pbxproj

@@ -87,6 +87,8 @@
 		0A41BA6E2344FCD400D4C0BC /* CATransaction+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A41BA6D2344FCD400D4C0BC /* CATransaction+Extension.swift */; };
 		0A41BA7F23453A6400D4C0BC /* TextEntryField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A41BA7E23453A6400D4C0BC /* TextEntryField.swift */; };
 		0A5D59C223AD2F5700EFD9E9 /* AppleGuidelinesProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A5D59C123AD2F5700EFD9E9 /* AppleGuidelinesProtocol.swift */; };
+		0A6682A22434DB4F00AD3CA1 /* ListLeftVariableRadioButtonBodyText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6682A12434DB4F00AD3CA1 /* ListLeftVariableRadioButtonBodyText.swift */; };
+		0A6682A42434DB8D00AD3CA1 /* ListLeftVariableRadioButtonBodyTextModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6682A32434DB8D00AD3CA1 /* ListLeftVariableRadioButtonBodyTextModel.swift */; };
 		0A69F611241BDEA700F7231B /* RuleAnyRequiredModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A69F610241BDEA700F7231B /* RuleAnyRequiredModel.swift */; };
 		0A6BF4722360C56C0028F841 /* BaseDropdownEntryField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6BF4712360C56C0028F841 /* BaseDropdownEntryField.swift */; };
 		0A7BAD74232A8DC700FB8E22 /* HeadlineBodyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7BAD73232A8DC700FB8E22 /* HeadlineBodyButton.swift */; };
@@ -468,6 +470,8 @@
 		0A41BA6D2344FCD400D4C0BC /* CATransaction+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CATransaction+Extension.swift"; sourceTree = "<group>"; };
 		0A41BA7E23453A6400D4C0BC /* TextEntryField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextEntryField.swift; sourceTree = "<group>"; };
 		0A5D59C123AD2F5700EFD9E9 /* AppleGuidelinesProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppleGuidelinesProtocol.swift; sourceTree = "<group>"; };
+		0A6682A12434DB4F00AD3CA1 /* ListLeftVariableRadioButtonBodyText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableRadioButtonBodyText.swift; sourceTree = "<group>"; };
+		0A6682A32434DB8D00AD3CA1 /* ListLeftVariableRadioButtonBodyTextModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableRadioButtonBodyTextModel.swift; sourceTree = "<group>"; };
 		0A69F610241BDEA700F7231B /* RuleAnyRequiredModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuleAnyRequiredModel.swift; sourceTree = "<group>"; };
 		0A6BF4712360C56C0028F841 /* BaseDropdownEntryField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseDropdownEntryField.swift; sourceTree = "<group>"; };
 		0A7BAD73232A8DC700FB8E22 /* HeadlineBodyButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadlineBodyButton.swift; sourceTree = "<group>"; };
@@ -1224,6 +1228,8 @@
 				522679BF23FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift */,
 				8D24041423E7FC0B009E23BE /* ListLeftVariableIconWithRightCaretModel.swift */,
 				8D24041023E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift */,
+				0A6682A32434DB8D00AD3CA1 /* ListLeftVariableRadioButtonBodyTextModel.swift */,
+				0A6682A12434DB4F00AD3CA1 /* ListLeftVariableRadioButtonBodyText.swift */,
 			);
 			path = LeftVariable;
 			sourceTree = "<group>";
@@ -1904,6 +1910,7 @@
 				D2E1FADB2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift in Sources */,
 				D27CD40E2322EEAF00C1DC07 /* TabsTableViewCell.swift in Sources */,
 				D224799B231965AD003FCCF9 /* AccordionMoleculeTableViewCell.swift in Sources */,
+				0A6682A42434DB8D00AD3CA1 /* ListLeftVariableRadioButtonBodyTextModel.swift in Sources */,
 				D22D1F1F220343560077CEC0 /* MVMCoreUICheckMarkView.m in Sources */,
 				D2E2A99423D8CCBC000B42E6 /* HeadlineBodyLinkModel.swift in Sources */,
 				01004F3022721C3800991ECC /* RadioButton.swift in Sources */,
@@ -2177,6 +2184,7 @@
 				525019DD2406430800EED91C /* ListProgressBarDataModel.swift in Sources */,
 				C6FA7D5223C77A4A00A3614A /* UnOrderedList.swift in Sources */,
 				01509D8F2327EC6F00EF99AA /* MoleculeTableViewCell.swift in Sources */,
+				0A6682A22434DB4F00AD3CA1 /* ListLeftVariableRadioButtonBodyText.swift in Sources */,
 				0105618D224BBE7700E1557D /* FormValidator.swift in Sources */,
 				01509D912327ECE600EF99AA /* CornerLabels.swift in Sources */,
 				D22D1F1B220341F60077CEC0 /* MVMCoreUICheckBox.m in Sources */,

MVMCoreUI/Atomic/Atoms/Buttons/RadioButton.swift

@@ -28,7 +28,7 @@ import UIKit
     }
 
     lazy public var radioGroupName: String? = {
-         [unowned self] in return radioModel?.fieldKey
+        return radioModel?.fieldKey
     }()
 
     lazy public var radioButtonSelectionHelper: RadioButtonSelectionHelper? = {

MVMCoreUI/Atomic/MoleculeObjectMapping.swift

@@ -136,13 +136,14 @@ import Foundation
         MoleculeObjectMapping.shared()?.register(viewClass: ListTwoColumnCompareChanges.self, viewModelClass: ListTwoColumnCompareChangesModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListTwoColumnPriceDetails.self, viewModelClass: ListTwoColumnPriceDetailsModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListTwoColumnPriceDescription.self, viewModelClass: ListTwoColumnPriceDescriptionModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableIconWithRightCaret.self, viewModelClass: ListLeftVariableIconWithRightCaretModel.self)
 
         // Designed Section Dividers
         MoleculeObjectMapping.shared()?.register(viewClass: ListFourColumnDataUsageDivider.self, viewModelClass: ListFourColumnDataUsageDividerModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListThreeColumnPlanDataDivider.self, viewModelClass: ListThreeColumnPlanDataDividerModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListOneColumnTextWithWhitespaceDividerShort.self, viewModelClass: ListOneColumnTextWithWhitespaceDividerShortModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListOneColumnTextWithWhitespaceDividerTall.self, viewModelClass: ListOneColumnTextWithWhitespaceDividerTallModel.self)
-        MoleculeObjectMapping.shared()?.register(viewClass: ListOneColumnFullWidthTextDividerSubsection.self, viewModelClass: ListOneColumnFullWidthTextDividerSubsectionModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableRadioButtonBodyText.self, viewModelClass: ListLeftVariableRadioButtonBodyTextModel.self)
 
         // Designed Headers
         MoleculeObjectMapping.shared()?.register(viewClass: HeadersH2NoButtonsBodyText.self, viewModelClass: HeadersH2NoButtonsBodyTextModel.self)

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonBodyText.swift

@@ -0,0 +1,67 @@
+//
+//  ListLeftVariableRadioButtonBodyText.swift
+//  MVMCoreUI
+//
+//  Created by Kevin Christiano on 4/1/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import UIKit
+
+
+open class ListLeftVariableRadioButtonBodyText: TableViewCell {
+    //-----------------------------------------------------
+    // MARK: - Outlets
+    //-----------------------------------------------------
+    
+    let radioButton = RadioButton(frame: .zero)
+    let headlineBody = HeadlineBody()
+    var stack: Stack<StackModel>
+    
+    //-----------------------------------------------------
+    // MARK: - Initializers
+    //-----------------------------------------------------
+    
+    public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        stack = Stack<StackModel>.createStack(with: [(view: radioButton, model: StackItemModel(horizontalAlignment: .fill)),
+                                                     (view: headlineBody, model: StackItemModel(horizontalAlignment: .leading))],
+                                              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()
+        
+        addMolecule(stack)
+        stack.restack()
+    }
+    
+    //----------------------------------------------------
+    // 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? ListLeftVariableRadioButtonBodyTextModel else { return }
+        
+        radioButton.set(with: model.radioButton, delegateObject, additionalData)
+        headlineBody.set(with: model.headlineBody, delegateObject, additionalData)
+    }
+    
+    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+        return 90
+    }
+    
+    public override func didSelectCell(at index: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
+        radioButton.tapAction()
+    }
+}

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonBodyTextModel.swift

@@ -0,0 +1,59 @@
+//
+//  ListLeftVariableRadioButtonBodyTextModel.swift
+//  MVMCoreUI
+//
+//  Created by Kevin Christiano on 4/1/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+
+open class ListLeftVariableRadioButtonBodyTextModel: ListItemModel, MoleculeModelProtocol {
+    //-----------------------------------------------------
+    // MARK: - Properties
+    //-----------------------------------------------------
+    
+    public static var identifier: String = "listLVRBBdy"
+    public var radioButton: RadioButtonModel
+    public var headlineBody: HeadlineBodyModel
+            
+    //-----------------------------------------------------
+    // MARK: - Initializer
+    //-----------------------------------------------------
+    
+    public init(radioButton: RadioButtonModel, headlineBody: HeadlineBodyModel) {
+        self.radioButton = radioButton
+        self.headlineBody = headlineBody
+        super.init()
+    }
+    
+    //-----------------------------------------------------
+    // MARK: - Keys
+    //-----------------------------------------------------
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case radioButton
+        case headlineBody
+    }
+    
+    //-----------------------------------------------------
+    // MARK: - Codec
+    //-----------------------------------------------------
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        radioButton = try typeContainer.decode(RadioButtonModel.self, forKey: .radioButton)
+        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(radioButton, forKey: .radioButton)
+        try container.encode(headlineBody, forKey: .headlineBody)
+    }
+}

MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift

@@ -8,7 +8,23 @@
 
 import Foundation
 
+
 @objcMembers open class HeadlineBodyModel: MoleculeModelProtocol {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
+    public static var identifier: String = "headlineBody"
+    public var moleculeName: String = HeadlineBodyModel.identifier
+    public var headline: LabelModel?
+    public var body: LabelModel?
+    public var style: Style?
+    public var backgroundColor: Color?
+    
+    //--------------------------------------------------
+    // MARK: - Enum
+    //--------------------------------------------------
+    
     /// Convenience styles for common situations.
     public enum Style: String, Codable {
         case landingHeader
@@ -17,12 +33,9 @@ import Foundation
         case item
     }
     
-    public static var identifier: String = "headlineBody"
+    //--------------------------------------------------
-    public var moleculeName: String = HeadlineBodyModel.identifier
+    // MARK: - Initializers
-    public var headline: LabelModel?
+    //--------------------------------------------------
-    public var body: LabelModel?
-    public var style: Style?
-    public var backgroundColor: Color?
 
     public init(headline: LabelModel) {
         self.headline = headline