Merge branch 'feature/atomic_vds_buttonGroup' into feature/vds_batch_two

# Conflicts:
#	MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>

MVMCoreUI.xcodeproj/project.pbxproj

@@ -171,7 +171,6 @@
 		608211282AC6B57E00C3FC39 /* MVMCoreUILoggingHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 608211262AC6AF8200C3FC39 /* MVMCoreUILoggingHandler.swift */; };
 		7199C8162A4F3A64001568B7 /* AccessibilityHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7199C8152A4F3A64001568B7 /* AccessibilityHandler.swift */; };
 		71BE969E2AD96BE6000B5DB7 /* RotorHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71BE969D2AD96BE6000B5DB7 /* RotorHandler.swift */; };
-		608211282AC6B57E00C3FC39 /* MVMCoreUILoggingHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 608211262AC6AF8200C3FC39 /* MVMCoreUILoggingHandler.swift */; };
 		8D070BB0241B56530099AC56 /* ListRightVariableTotalDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D070BAF241B56530099AC56 /* ListRightVariableTotalDataModel.swift */; };
 		8D070BB2241B56AD0099AC56 /* ListRightVariableTotalData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D070BB1241B56AD0099AC56 /* ListRightVariableTotalData.swift */; };
 		8D084AD02410BF4800951227 /* ListOneColumnFullWidthTextBodyTextModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D084ACF2410BF4800951227 /* ListOneColumnFullWidthTextBodyTextModel.swift */; };
@@ -300,8 +299,8 @@
 		AFA4935729EE3DCC001A9663 /* AlertDelegateProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA4935629EE3DCC001A9663 /* AlertDelegateProtocol.swift */; };
 		AFE4A1D127DFB5EE00C458D0 /* VDSColorTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AFE4A1D027DFB5EE00C458D0 /* VDSColorTokens.xcframework */; };
 		AFE4A1D627DFBB6F00C458D0 /* UINavigationController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFE4A1D527DFBB6F00C458D0 /* UINavigationController+Extension.swift */; };
-		B4CC8FBF29DF34730005D28B /* BadgeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4CC8FBE29DF34730005D28B /* BadgeModel.swift */; };
 		B4CC8FBD29DF34680005D28B /* Badge.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4CC8FBC29DF34680005D28B /* Badge.swift */; };
+		B4CC8FBF29DF34730005D28B /* BadgeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4CC8FBE29DF34730005D28B /* BadgeModel.swift */; };
 		BB105859248DEFF70069D008 /* UICollectionViewLeftAlignedLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB105858248DEFF60069D008 /* UICollectionViewLeftAlignedLayout.swift */; };
 		BB1D17E0244EAA30001D2002 /* ListDeviceComplexButtonMediumModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1D17DF244EAA30001D2002 /* ListDeviceComplexButtonMediumModel.swift */; };
 		BB1D17E2244EAA46001D2002 /* ListDeviceComplexButtonMedium.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1D17E1244EAA46001D2002 /* ListDeviceComplexButtonMedium.swift */; };
@@ -574,10 +573,12 @@
 		EA41F4AC2787927100F5B377 /* DynamicRuleFormFieldEffectModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA41F4AB2787927100F5B377 /* DynamicRuleFormFieldEffectModel.swift */; };
 		EA5124FD243601600051A3A4 /* BGImageHeadlineBodyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5124FC243601600051A3A4 /* BGImageHeadlineBodyButton.swift */; };
 		EA5124FF2436018E0051A3A4 /* BGImageHeadlineBodyButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5124FE2436018E0051A3A4 /* BGImageHeadlineBodyButtonModel.swift */; };
+		EA6E8B952B504A43000139B4 /* ButtonGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA6E8B942B504A43000139B4 /* ButtonGroup.swift */; };
+		EA6E8B972B504A4D000139B4 /* ButtonGroupModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA6E8B962B504A4D000139B4 /* ButtonGroupModel.swift */; };
 		EA7E67742758310500ABF773 /* EnableFormFieldEffectModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA7E67732758310500ABF773 /* EnableFormFieldEffectModel.swift */; };
 		EA7E67762758365300ABF773 /* UIUpdatableModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA7E67752758365300ABF773 /* UIUpdatableModelProtocol.swift */; };
-		EA985C402970939A00F2FF2E /* TileletModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C3F2970939A00F2FF2E /* TileletModel.swift */; };
 		EA985C3E2970938F00F2FF2E /* Tilelet.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C3D2970938F00F2FF2E /* Tilelet.swift */; };
+		EA985C402970939A00F2FF2E /* TileletModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C3F2970939A00F2FF2E /* TileletModel.swift */; };
 		EA985C602970A3F000F2FF2E /* VDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA985C5F2970A3F000F2FF2E /* VDS.framework */; };
 		EA985C642970A40E00F2FF2E /* VDSTypographyTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA985C632970A40E00F2FF2E /* VDSTypographyTokens.xcframework */; };
 		EA985C852981AA9C00F2FF2E /* VDS-Enums+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C842981AA9C00F2FF2E /* VDS-Enums+Codable.swift */; };
@@ -763,7 +764,6 @@
 		608211262AC6AF8200C3FC39 /* MVMCoreUILoggingHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUILoggingHandler.swift; sourceTree = "<group>"; };
 		7199C8152A4F3A64001568B7 /* AccessibilityHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessibilityHandler.swift; sourceTree = "<group>"; };
 		71BE969D2AD96BE6000B5DB7 /* RotorHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RotorHandler.swift; sourceTree = "<group>"; };
-		608211262AC6AF8200C3FC39 /* MVMCoreUILoggingHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUILoggingHandler.swift; sourceTree = "<group>"; };
 		8D070BAF241B56530099AC56 /* ListRightVariableTotalDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariableTotalDataModel.swift; sourceTree = "<group>"; };
 		8D070BB1241B56AD0099AC56 /* ListRightVariableTotalData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariableTotalData.swift; sourceTree = "<group>"; };
 		8D084ACF2410BF4800951227 /* ListOneColumnFullWidthTextBodyTextModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListOneColumnFullWidthTextBodyTextModel.swift; sourceTree = "<group>"; };
@@ -892,8 +892,8 @@
 		AFA4935629EE3DCC001A9663 /* AlertDelegateProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertDelegateProtocol.swift; sourceTree = "<group>"; };
 		AFE4A1D027DFB5EE00C458D0 /* VDSColorTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSColorTokens.xcframework; path = ../SharedFrameworks/VDSColorTokens.xcframework; sourceTree = "<group>"; };
 		AFE4A1D527DFBB6F00C458D0 /* UINavigationController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UINavigationController+Extension.swift"; sourceTree = "<group>"; };
-		B4CC8FBE29DF34730005D28B /* BadgeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BadgeModel.swift; sourceTree = "<group>"; };
 		B4CC8FBC29DF34680005D28B /* Badge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Badge.swift; sourceTree = "<group>"; };
+		B4CC8FBE29DF34730005D28B /* BadgeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BadgeModel.swift; sourceTree = "<group>"; };
 		BB105858248DEFF60069D008 /* UICollectionViewLeftAlignedLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UICollectionViewLeftAlignedLayout.swift; sourceTree = "<group>"; };
 		BB1D17DF244EAA30001D2002 /* ListDeviceComplexButtonMediumModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListDeviceComplexButtonMediumModel.swift; sourceTree = "<group>"; };
 		BB1D17E1244EAA46001D2002 /* ListDeviceComplexButtonMedium.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListDeviceComplexButtonMedium.swift; sourceTree = "<group>"; };
@@ -1167,6 +1167,8 @@
 		EA41F4AB2787927100F5B377 /* DynamicRuleFormFieldEffectModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DynamicRuleFormFieldEffectModel.swift; sourceTree = "<group>"; };
 		EA5124FC243601600051A3A4 /* BGImageHeadlineBodyButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BGImageHeadlineBodyButton.swift; sourceTree = "<group>"; };
 		EA5124FE2436018E0051A3A4 /* BGImageHeadlineBodyButtonModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BGImageHeadlineBodyButtonModel.swift; sourceTree = "<group>"; };
+		EA6E8B942B504A43000139B4 /* ButtonGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonGroup.swift; sourceTree = "<group>"; };
+		EA6E8B962B504A4D000139B4 /* ButtonGroupModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonGroupModel.swift; sourceTree = "<group>"; };
 		EA7E67732758310500ABF773 /* EnableFormFieldEffectModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnableFormFieldEffectModel.swift; sourceTree = "<group>"; };
 		EA7E67752758365300ABF773 /* UIUpdatableModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIUpdatableModelProtocol.swift; sourceTree = "<group>"; };
 		EA985C3D2970938F00F2FF2E /* Tilelet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tilelet.swift; sourceTree = "<group>"; };
@@ -2198,6 +2200,8 @@
 				DBC4391A224421A0001AB423 /* CaretLink.swift */,
 				D28A838A23CCDA6B00DFE4FC /* ButtonModel.swift */,
 				D2E2A99E23E07F8A000B42E6 /* PillButton.swift */,
+				EA6E8B962B504A4D000139B4 /* ButtonGroupModel.swift */,
+				EA6E8B942B504A43000139B4 /* ButtonGroup.swift */,
 			);
 			path = Buttons;
 			sourceTree = "<group>";
@@ -2663,6 +2667,7 @@
 				BBC0C4FF24811DCA0087C44F /* TagModel.swift in Sources */,
 				01F2C20527C81F9700DC3D36 /* SubNavSwipeAnimator.swift in Sources */,
 				0AE277EC25D2EE310048A38D /* MultiItemDropdownEntryFieldModel.swift in Sources */,
+				EA6E8B952B504A43000139B4 /* ButtonGroup.swift in Sources */,
 				0A7BAD74232A8DC700FB8E22 /* HeadlineBodyButton.swift in Sources */,
 				3265B30424BCA749000D154B /* HeadersH1NoButtonsBodyText.swift in Sources */,
 				AAA7CD69250641F90045B959 /* HeartModel.swift in Sources */,
@@ -2940,6 +2945,7 @@
 				D264FAA3243E632F00D98315 /* ProgrammaticCollectionViewController.swift in Sources */,
 				D29DF27A21E7A533003B2FB9 /* MVMCoreUISession.m in Sources */,
 				27F9736A246750BE00CAB5C5 /* ScreenBrightnessModifierBehavior.swift in Sources */,
+				EA6E8B972B504A4D000139B4 /* ButtonGroupModel.swift in Sources */,
 				D2A5146B2214905000345BFB /* ThreeLayerViewController.swift in Sources */,
 				526A265E240D200500B0D828 /* ListTwoColumnCompareChanges.swift in Sources */,
 				B4CC8FBD29DF34680005D28B /* Badge.swift in Sources */,

MVMCoreUI/Atomic/Atoms/Buttons/ButtonGroup.swift

@@ -0,0 +1,69 @@
+//
+//  ButtonGroup.swift
+//  MVMCoreUI
+//
+//  Created by Matt Bruce on 1/11/24.
+//  Copyright © 2024 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+import UIKit
+import VDS
+
+@objcMembers open class ButtonGroup: VDS.ButtonGroup, VDSMoleculeViewProtocol {
+    
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    open var viewModel: ButtonGroupModel!
+    open var delegateObject: MVMCoreUIDelegateObject?
+    open var additionalData: [AnyHashable : Any]?
+    
+    //--------------------------------------------------
+    // MARK: - MoleculeViewProtocol
+    //--------------------------------------------------
+    
+    public static func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+        guard let model = model as? ButtonGroupModel,
+              let buttonModel = model.buttons.first
+        else { return 0 }
+        
+        return PillButton.estimatedHeight(with: buttonModel, delegateObject)
+    }
+    
+    public func viewModelDidUpdate() {
+        var buttonBases = [ButtonBase]()
+        viewModel.buttons.forEach { buttonModel in
+            if let buttonBaseType = try? ModelRegistry.getHandler(buttonModel) as? MoleculeViewProtocol.Type,
+               let button = buttonBaseType.init(model: buttonModel, delegateObject, additionalData) as? VDS.ButtonBase {
+                buttonBases.append(button)
+            }
+        }
+        surface = viewModel.surface
+        isEnabled = viewModel.enabled
+        alignment = viewModel.alignment
+        rowQuantityPhone = viewModel.rowQuantityPhone
+        rowQuantityTablet = viewModel.rowQuantityTablet
+        if let childWidthValue = viewModel.childWidthValue {
+            childWidth = .value(childWidthValue)
+        } else if let childWidthPercentage = viewModel.childWidthPercentage {
+            childWidth = .percentage(childWidthPercentage)
+        }
+        buttons = buttonBases
+    }
+    
+    //--------------------------------------------------
+    // MARK: - MVMCoreUIViewConstrainingProtocol
+    //--------------------------------------------------
+    
+    open func horizontalAlignment() -> UIStackView.Alignment {
+        return .center
+    }
+    
+    //--------------------------------------------------
+    // MARK: - MVMCoreViewProtocol
+    //--------------------------------------------------
+    public func updateView(_ size: CGFloat) {
+        setNeedsUpdate()
+    }
+}

MVMCoreUI/Atomic/Atoms/Buttons/ButtonGroupModel.swift

@@ -0,0 +1,80 @@
+//
+//  ButtonGroupModel.swift
+//  MVMCoreUI
+//
+//  Created by Matt Bruce on 1/11/24.
+//  Copyright © 2024 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+import VDS
+
+public class ButtonGroupModel: MoleculeModelProtocol {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
+    public static var identifier: String = "buttonGroup"
+    public var id: String = UUID().uuidString
+    public var backgroundColor: Color?
+    
+    //--------------------------------------------------
+    // MARK: - VDS Properties
+    //--------------------------------------------------
+    public var buttons: [ButtonModelProtocol & MoleculeModelProtocol]
+    public var alignment: VDS.ButtonGroup.Alignment = .center
+    public var rowQuantityPhone: Int = 0
+    public var rowQuantityTablet: Int = 0
+    public var childWidthValue: CGFloat?
+    public var childWidthPercentage: CGFloat?
+    public var surface: VDS.Surface = .light
+    public var enabled: Bool = true
+    //--------------------------------------------------
+    // MARK: - Keys
+    //--------------------------------------------------
+    
+    private enum CodingKeys: String, CodingKey {
+        case id
+        case moleculeName
+        case backgroundColor
+        case buttons
+        case alignment
+        case rowQuantityPhone
+        case rowQuantityTablet
+        case childWidthValue
+        case childWidthPercentage
+        case surface
+        case enabled
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Codec
+    //--------------------------------------------------
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
+        surface = try typeContainer.decodeIfPresent(Surface.self, forKey: .surface) ?? .light
+        enabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .enabled) ?? true
+        buttons = try typeContainer.decodeModels(codingKey: .buttons)
+        alignment = try typeContainer.decodeIfPresent(VDS.ButtonGroup.Alignment.self, forKey: .alignment) ?? .center
+        rowQuantityPhone = try typeContainer.decodeIfPresent(Int.self, forKey: .rowQuantityPhone) ?? 0
+        rowQuantityTablet = try typeContainer.decodeIfPresent(Int.self, forKey: .rowQuantityTablet) ?? 0
+        childWidthValue = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .childWidthValue)
+        childWidthPercentage = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .childWidthPercentage)
+    }
+    
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(id, forKey: .id)
+        try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encode(surface, forKey: .surface)
+        try container.encode(enabled, forKey: .enabled)
+        try container.encodeModels(buttons, forKey: .buttons)
+        try container.encode(alignment, forKey: .alignment)
+        try container.encode(rowQuantityPhone, forKey: .rowQuantityPhone)
+        try container.encode(rowQuantityTablet, forKey: .rowQuantityTablet)
+        try container.encodeIfPresent(childWidthValue, forKey: .childWidthValue)
+        try container.encodeIfPresent(childWidthPercentage, forKey: .childWidthPercentage)
+    }
+}

MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift

@@ -11,6 +11,7 @@ import VDS
 
 extension VDS.Surface: Codable {}
 extension VDS.Badge.FillColor: Codable {}
+extension VDS.ButtonGroup.Alignment: Codable {}
 extension VDS.Icon.Name: Codable {}
 extension VDS.Icon.Size: Codable {}
 extension VDS.TileContainer.BackgroundColor: Codable {}

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift

@@ -9,104 +9,32 @@
 import UIKit
 import VDS
 
-@objcMembers open class TwoButtonView: View, MVMCoreUIViewConstrainingProtocol {
+@objcMembers open class TwoButtonView: VDS.View, VDSMoleculeViewProtocol {
+      
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
+    open var viewModel: TwoButtonViewModel!
+    open var delegateObject: MVMCoreUIDelegateObject?
+    open var additionalData: [AnyHashable : Any]?
 
-    open var primaryButton: PillButton = PillButton()
+    open var primaryButton = PillButton()
-    open var secondaryButton: PillButton = PillButton()
+    open var secondaryButton = PillButton()
-    private var stack = UIStackView()
+    private var buttonGroup = VDS.ButtonGroup()
-    
-    //--------------------------------------------------
-    // MARK: - Constraints
-    //--------------------------------------------------
-    
-    private var equalWidthConstraint: NSLayoutConstraint?
         
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
     
-    public func setDefaultAppearance() {
+    open override func setup() {
-        primaryButton.use = .primary
+        super.setup()
-        secondaryButton.use = .secondary
-    }
-    
-    open override func updateView(_ size: CGFloat) {
-        super.updateView(size)
-        
-        primaryButton.updateView(size)
-        secondaryButton.updateView(size)
-    }
-    
-    open override func setupView() {
-        super.setupView()
-        
-        stack.translatesAutoresizingMaskIntoConstraints = false
         isAccessibilityElement = false
-        addSubview(stack)
+        addSubview(buttonGroup)
-        stack.addArrangedSubview(secondaryButton)
+        buttonGroup.pinToSuperView()
-        stack.addArrangedSubview(primaryButton)
+        buttonGroup.alignment = .center
-        NSLayoutConstraint.constraintPinSubview(toSuperview: stack)
+        buttonGroup.rowQuantityPhone = 2
-        stack.axis = .horizontal
+        buttonGroup.rowQuantityTablet = 2
-        stack.spacing = Padding.Component.gutterForApplicationWidth
+        buttonGroup.childWidth = .percentage(50)
-        equalWidthConstraint = secondaryButton.widthAnchor.constraint(equalTo: primaryButton.widthAnchor, multiplier: 1)
-        equalWidthConstraint?.isActive = true
-    }
-    
-    //--------------------------------------------------
-    // MARK: - Stack Manipulation
-    //--------------------------------------------------
-    
-    public func showPrimaryButton() {
-        
-        if !stack.arrangedSubviews.contains(primaryButton) {
-            stack.addArrangedSubview(primaryButton)
-            primaryButton.isHidden = false
-        }
-        
-        if secondaryButton.superview != nil {
-            equalWidthConstraint?.isActive = true
-        }
-        
-        primaryButton.isAccessibilityElement = true
-    }
-    
-    public func showSecondaryButton() {
-        
-        if !stack.arrangedSubviews.contains(secondaryButton) {
-            stack.insertArrangedSubview(secondaryButton, at: 0)
-            secondaryButton.isHidden = false
-        }
-        
-        if primaryButton.superview != nil {
-            equalWidthConstraint?.isActive = true
-        }
-        
-        secondaryButton.isAccessibilityElement = true
-    }
-    
-    public func hidePrimaryButton() {
-        
-        if primaryButton.superview != nil {
-            stack.removeArrangedSubview(primaryButton)
-            primaryButton.isHidden = true
-        }
-        
-        primaryButton.isAccessibilityElement = false
-        equalWidthConstraint?.isActive = false
-    }
-    
-    public func hideSecondaryButton() {
-        
-        if secondaryButton.superview != nil {
-            stack.removeArrangedSubview(secondaryButton)
-            secondaryButton.isHidden = true
-        }
-        
-        secondaryButton.isAccessibilityElement = false
-        equalWidthConstraint?.isActive = false
     }
         
     //--------------------------------------------------
@@ -115,12 +43,14 @@ import VDS
     
     open override func reset() {
         super.reset()
-        
+        primaryButton.reset()
-        setDefaultAppearance()
+        secondaryButton.reset()
+        primaryButton.use = .primary
+        secondaryButton.use = .secondary
+        buttonGroup.reset()
     }
     
-    public override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+    public static func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
-        
         guard let model = model as? TwoButtonViewModel,
             let buttonModel = model.primaryButton ?? model.secondaryButton
             else { return 0 }
@@ -128,25 +58,21 @@ import VDS
         return PillButton.estimatedHeight(with: buttonModel, delegateObject)
     }
 
-    public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+    public func viewModelDidUpdate() {
-        super.set(with: model, delegateObject, additionalData)
+        var buttons = [PillButton]()
-        
+        if let secondaryModel = viewModel.secondaryButton {
-        guard let model = model as? TwoButtonViewModel else { return }
-        
-        if let secondaryModel = model.secondaryButton {
-            showSecondaryButton()
             secondaryButton.set(with: secondaryModel, delegateObject, additionalData)
-        } else {
+            buttons.append(secondaryButton)
-            hideSecondaryButton()
         }
         
-        if let primaryModel = model.primaryButton {
+        if let primaryModel = viewModel.primaryButton {
-            showPrimaryButton()
             primaryButton.set(with: primaryModel, delegateObject, additionalData)
-        } else {
+            buttons.append(primaryButton)
-            hidePrimaryButton()
         }
+        
+        buttonGroup.buttons = buttons
     }
+
     //--------------------------------------------------
     // MARK: - MVMCoreUIViewConstrainingProtocol
     //--------------------------------------------------
@@ -154,4 +80,11 @@ import VDS
     open func horizontalAlignment() -> UIStackView.Alignment {
         return .center
     }
+    
+    //--------------------------------------------------
+    // MARK: - MVMCoreViewProtocol
+    //--------------------------------------------------
+    public func updateView(_ size: CGFloat) {
+        setNeedsUpdate()
+    }
 }

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoLinkView.swift

@@ -7,77 +7,79 @@
 //
 
 import Foundation
+import VDS
 
+@objcMembers open class TwoLinkView: VDS.View, VDSMoleculeViewProtocol {
     
-@objcMembers open class TwoLinkView: View, MVMCoreUIViewConstrainingProtocol {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
+    open var viewModel: TwoLinkViewModel!
+    open var delegateObject: MVMCoreUIDelegateObject?
+    open var additionalData: [AnyHashable : Any]?
 
     open var leftLink = Link()
     open var rightLink = Link()
-    private var stack = UIStackView()
+    private var buttonGroup = VDS.ButtonGroup()
+    private var buttons: [Link] = []
+    
+    //--------------------------------------------------
+    // MARK: - Lifecycle
+    //--------------------------------------------------
+    
+    open override func setup() {
+        super.setup()
+        isAccessibilityElement = false
+        addSubview(buttonGroup)
+        buttonGroup.pinToSuperView()
+        buttonGroup.alignment = .center
+        buttonGroup.rowQuantityPhone = 2
+        buttonGroup.rowQuantityTablet = 2
+        buttonGroup.childWidth = .percentage(50)
+    }
 
     //--------------------------------------------------
     // MARK: - MVMCoreViewProtocol
     //--------------------------------------------------
-    
+    open override func reset() {
-    open override func updateView(_ size: CGFloat) {
+        super.reset()
-        super.updateView(size)
+        leftLink.reset()
-        stack.updateView(size)
+        rightLink.reset()
+        buttonGroup.reset()
     }
 
-    open override func setupView() {
+    open func updateView(_ size: CGFloat) { }
-        super.setupView()
-        
-        stack.translatesAutoresizingMaskIntoConstraints = false
-        addSubview(stack)
-        stack.addArrangedSubview(leftLink)
-        stack.addArrangedSubview(rightLink)
-        NSLayoutConstraint.constraintPinSubview(toSuperview: stack)
-        stack.axis = .horizontal
-        stack.spacing = 8
-    }
 
     //--------------------------------------------------
     // MARK: - Stack Manipulation
     //--------------------------------------------------
     
     public func showRightLink() {
-        if !stack.arrangedSubviews.contains(rightLink) {
+        if !buttons.contains(rightLink) {
-            stack.addArrangedSubview(rightLink)
+            buttons.insert(rightLink, at: buttons.count)
-            rightLink.isHidden = false
         }
+        buttonGroup.buttons = buttons
     }
     
     public func showLeftLink() {
-        if !stack.arrangedSubviews.contains(leftLink) {
+        if !buttons.contains(leftLink) {
-            stack.insertArrangedSubview(leftLink, at: 0)
+            buttons.insert(leftLink, at: 0)
-            leftLink.isHidden = false
         }
+        buttonGroup.buttons = buttons
     }
     
     public func hideRightLink() {
-        if rightLink.superview != nil {
+        if let index = buttons.firstIndex(of: rightLink) {
-            stack.removeArrangedSubview(rightLink)
+            buttons.remove(at: index)
-            rightLink.isHidden = true
         }
+        buttonGroup.buttons = buttons
     }
     
     public func hideLeftLink() {
-        if leftLink.superview != nil {
+        if let index = buttons.firstIndex(of: leftLink) {
-            stack.removeArrangedSubview(leftLink)
+            buttons.remove(at: index)
-            leftLink.isHidden = true
         }
-    }
+        buttonGroup.buttons = buttons
-    
-    //--------------------------------------------------
-    // MARK: - MoleculeViewProtocol
-    //--------------------------------------------------
-    
-    open override func reset() {
-        super.reset()
-        stack.reset()
     }
        
     //--------------------------------------------------
@@ -92,27 +94,26 @@ import Foundation
     // MARK: - MoleculeViewProtocol
     //--------------------------------------------------
     
-    public override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+    public static func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
-        return 16
+        guard let model = model as? TwoButtonViewModel,
+            let buttonModel = model.primaryButton ?? model.secondaryButton
+            else { return 0 }
+        
+        return PillButton.estimatedHeight(with: buttonModel, delegateObject)
     }
 
-    public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+    public func viewModelDidUpdate() {
-        super.set(with: model, delegateObject, additionalData)
+        if let model = viewModel.leftLink {
-        
-        guard let model = model as? TwoLinkViewModel else { return }
-        
-        if let model = model.leftLink {
-            showLeftLink()
             leftLink.set(with: model, delegateObject, additionalData)
-        } else {
+            buttons.append(leftLink)
-            hideLeftLink()
         }
         
-        if let model = model.rightLink {
+        if let model = viewModel.rightLink {
-            showRightLink()
             rightLink.set(with: model, delegateObject, additionalData)
-        } else {
+            buttons.append(rightLink)
-            hideRightLink()
         }
+        
+        buttonGroup.buttons = buttons
     }
+
 }

MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift

@@ -36,6 +36,7 @@ open class CoreUIModelMapping: ModelMapping {
         ModelRegistry.register(handler: ExternalLink.self, for: ExternalLinkModel.self)
         ModelRegistry.register(handler: Link.self, for: LinkModel.self)
         ModelRegistry.register(handler: CaretLink.self, for: CaretLinkModel.self)
+        ModelRegistry.register(handler: ButtonGroup.self, for: ButtonGroupModel.self)
 
         // MARK:- Entry Field
         ModelRegistry.register(handler: TextEntryField.self, for: TextEntryFieldModel.self)