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

Padding changes for button

Browse Source
This commit is contained in:
Sumanth Nadigadda 2022-04-30 00:00:57 +05:30
parent db7bc5be2b
commit c2ac51c18c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
View File

@ -151,6 +151,7 @@ open class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupWat
if enabledTextColor == nil && enabledBorderColor == nil { if enabledTextColor == nil && enabledBorderColor == nil {
enabledTextColor = Color(uiColor: VDSColor.elementsPrimaryOnlight) enabledTextColor = Color(uiColor: VDSColor.elementsPrimaryOnlight)
enabledFillColor = Color(uiColor: UIColor.clear)
enabledBorderColor = Color(uiColor: VDSColor.elementsPrimaryOnlight) enabledBorderColor = Color(uiColor: VDSColor.elementsPrimaryOnlight)
} }
@ -160,7 +161,7 @@ open class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupWat
} }
enabledTextColor_inverted = Color(uiColor: VDSColor.elementsPrimaryOndark) enabledTextColor_inverted = Color(uiColor: VDSColor.elementsPrimaryOndark)
enabledFillColor_inverted = Color(uiColor: UIColor.clear) enabledFillColor_inverted = Color(uiColor: VDSColor.elementsPrimaryOnlight)
enabledBorderColor_inverted = Color(uiColor: VDSColor.elementsPrimaryOndark) enabledBorderColor_inverted = Color(uiColor: VDSColor.elementsPrimaryOndark)
disabledTextColor_inverted = Color(uiColor: VDSColor.interactiveDisabledOndark) disabledTextColor_inverted = Color(uiColor: VDSColor.interactiveDisabledOndark)
disabledBorderColor_inverted = Color(uiColor: VDSColor.interactiveDisabledOndark) disabledBorderColor_inverted = Color(uiColor: VDSColor.interactiveDisabledOndark)

11
MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
View File

@ -154,8 +154,8 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
horizontalPadding = Padding.Four horizontalPadding = Padding.Four
break break
case .tiny: case .tiny:
verticalPadding = getInnerPadding() verticalPadding = Padding.One
horizontalPadding = getInnerPadding() horizontalPadding = Padding.Two
break break
} }
return UIEdgeInsets(top: verticalPadding, left: horizontalPadding, bottom: verticalPadding, right: horizontalPadding) return UIEdgeInsets(top: verticalPadding, left: horizontalPadding, bottom: verticalPadding, right: horizontalPadding)
@ -211,7 +211,9 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
if let contraint = buttonModel?.width, widthConstraint == nil { if let contraint = buttonModel?.width, widthConstraint == nil {
widthConstraint = widthAnchor.constraint(equalToConstant: contraint) widthConstraint = widthAnchor.constraint(equalToConstant: contraint)
widthConstraint?.isActive = true widthConstraint?.isActive = true
minimumWidthConstraint?.isActive = false } else {
minimumWidthConstraint = widthAnchor.constraint(greaterThanOrEqualToConstant: buttonSize.minimumWidth())
minimumWidthConstraint?.isActive = true
} }
} }
@ -223,9 +225,6 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
titleLabel?.textAlignment = .center titleLabel?.textAlignment = .center
contentHorizontalAlignment = .center contentHorizontalAlignment = .center
stylePrimary() stylePrimary()
minimumWidthConstraint = widthAnchor.constraint(greaterThanOrEqualToConstant: buttonSize.minimumWidth())
minimumWidthConstraint?.isActive = true
} }
//-------------------------------------------------- //--------------------------------------------------