mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/two_button_fixes' into 'feature/coding'

Browse Source 
Feature/two button fixes

See merge request BPHV_MIPS/mvm_core_ui!226
This commit is contained in:
Pfeil, Scott Robert 2020-01-17 14:54:41 -05:00
commit efda18c0ee
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atoms/Buttons/ButtonModel.swift
View File

@ -23,7 +23,7 @@ public class ButtonModel: MoleculeProtocol {
public var backgroundColor: Color?
public var title: String
public var action: ActionProtocol
public var style: ButtonStyle? = .primary
public var style: ButtonStyle?
public var size: ButtonSize? = .standard
public var required: Bool?
public var requiredGroups: [String]?

10
MVMCoreUI/Molecules/HorizontalCombinationViews/TwoButtonView.swift
View File

@ -92,9 +92,9 @@ import UIKit
viewForButtons.addSubview(primaryButton)
viewForButtons.addSubview(secondaryButton)
secondaryButton.widthAnchor.constraint(equalTo: primaryButton.widthAnchor, multiplier: 1).isActive = true
NSLayoutConstraint.constraintPinSubview(primaryButton, pinTop: true, pinBottom: true, pinLeft: true, pinRight: false)
NSLayoutConstraint.constraintPinSubview(secondaryButton, pinTop: true, pinBottom: false, pinLeft: false, pinRight: true)
let constraint = secondaryButton.leadingAnchor.constraint(equalTo: primaryButton.trailingAnchor, constant: 10)
NSLayoutConstraint.constraintPinSubview(secondaryButton, pinTop: true, pinBottom: true, pinLeft: true, pinRight: false)
NSLayoutConstraint.constraintPinSubview(primaryButton, pinTop: true, pinBottom: true, pinLeft: false, pinRight: true)
let constraint = primaryButton.leadingAnchor.constraint(equalTo: secondaryButton.trailingAnchor, constant: 10)
constraint.priority = UILayoutPriority(900)
constraint.isActive = true
}
@ -257,6 +257,10 @@ import UIKit
primaryButton?.isHidden = true
secondaryButton?.isHidden = true
}
override open func horizontalAlignment() -> UIStackView.Alignment {
return .center
}
}
// MARK: - Deprecate