From bfe209305d489de1b9c1ee40deb44c0211a0df8c Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 11 Mar 2024 15:36:40 -0500 Subject: [PATCH 1/2] added heightConstraint for the twobutton Signed-off-by: Matt Bruce --- .../HorizontalCombinationViews/TwoButtonView.swift | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift index 4785cfb9..34e0bd11 100644 --- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift +++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift @@ -17,11 +17,11 @@ import VDS open var viewModel: TwoButtonViewModel! open var delegateObject: MVMCoreUIDelegateObject? open var additionalData: [AnyHashable : Any]? - + open var primaryButton = PillButton() open var secondaryButton = PillButton() private var buttonGroup = VDS.ButtonGroup() - + private var heightConstraint: NSLayoutConstraint? //-------------------------------------------------- // MARK: - Lifecycle //-------------------------------------------------- @@ -34,6 +34,7 @@ import VDS buttonGroup.alignment = .center buttonGroup.rowQuantityPhone = 2 buttonGroup.rowQuantityTablet = 2 + heightConstraint = height(constant: VDS.Button.Size.large.height, priority: .defaultHigh) } //-------------------------------------------------- @@ -70,6 +71,8 @@ import VDS if buttons.count != buttonGroup.buttons.count { buttonGroup.buttons = buttons } + + heightConstraint?.constant = primaryButton.size == .small || secondaryButton.size == .small ? VDS.Button.Size.small.height : VDS.Button.Size.large.height } //-------------------------------------------------- From 5ba126038367d836c9f875c42c54d1064d3967ef Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 11 Mar 2024 16:44:53 -0500 Subject: [PATCH 2/2] updated to required Signed-off-by: Matt Bruce --- .../Molecules/HorizontalCombinationViews/TwoButtonView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift index 34e0bd11..536bc16b 100644 --- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift +++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TwoButtonView.swift @@ -34,7 +34,7 @@ import VDS buttonGroup.alignment = .center buttonGroup.rowQuantityPhone = 2 buttonGroup.rowQuantityTablet = 2 - heightConstraint = height(constant: VDS.Button.Size.large.height, priority: .defaultHigh) + heightConstraint = height(constant: VDS.Button.Size.large.height, priority: .required) } //--------------------------------------------------