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

VDS button component changes

Browse Source
This commit is contained in:
Sumanth Nadigadda 2022-04-21 19:36:39 +05:30
parent 27289f1ac8
commit 064533950e
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,7 +262,7 @@ open class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupWat
} }
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
self.width = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .width) width = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .width)
} }
open func encode(to encoder: Encoder) throws { open func encode(to encoder: Encoder) throws {

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

@ -7,7 +7,7 @@
// //
import UIKit import UIKit
import VDSColorTokens
open class PillButton: Button, MVMCoreUIViewConstrainingProtocol { open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
//-------------------------------------------------- //--------------------------------------------------
@ -78,17 +78,17 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
enabledTitleColor = buttonModel?.enabledColors.text ?? .mvmWhite enabledTitleColor = buttonModel?.enabledColors.text ?? .mvmWhite
disabledTitleColor = buttonModel?.disabledColors.text ?? .mvmWhite disabledTitleColor = buttonModel?.disabledColors.text ?? .mvmWhite
layer.borderWidth = 0 layer.borderWidth = 0
backgroundColor = isEnabled ? buttonModel?.enabledColors.fill ?? .mvmBlack : buttonModel?.disabledColors.fill ?? .mvmCoolGray6 backgroundColor = isEnabled ? buttonModel?.enabledColors.fill ?? Color(uiColor: VDSColor.elementsPrimaryOnlight).uiColor : buttonModel?.disabledColors.fill ?? Color(uiColor: VDSColor.elementsPrimaryOndark).uiColor
} }
/// The secondary styling for a button. Should be used for secondary buttons /// The secondary styling for a button. Should be used for secondary buttons
public func styleSecondary() { public func styleSecondary() {
enabledTitleColor = buttonModel?.enabledColors.text ?? .mvmBlack enabledTitleColor = buttonModel?.enabledColors.text ?? Color(uiColor: VDSColor.elementsPrimaryOnlight).uiColor
disabledTitleColor = buttonModel?.disabledColors.text ?? .mvmCoolGray6 disabledTitleColor = buttonModel?.disabledColors.text ?? Color(uiColor: VDSColor.elementsPrimaryOndark).uiColor
backgroundColor = .clear backgroundColor = .clear
layer.borderWidth = buttonModel?.inverted ?? false ? 0 : 1 layer.borderWidth = buttonModel?.inverted ?? false ? 0 : 1
borderColor = isEnabled ? buttonModel?.enabledColors.border ?? .mvmBlack : buttonModel?.disabledColors.border ?? .mvmCoolGray6 borderColor = isEnabled ? buttonModel?.enabledColors.border ?? Color(uiColor: VDSColor.elementsPrimaryOnlight).uiColor : buttonModel?.disabledColors.border ?? Color(uiColor: VDSColor.elementsPrimaryOndark).uiColor
} }
/// Styles the button based on the model style /// Styles the button based on the model style
@ -236,8 +236,6 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
super.updateView(size) super.updateView(size)
self.size = size self.size = size
invalidateIntrinsicContentSize()
switch buttonSize { switch buttonSize {
case .tiny: case .tiny:
titleLabel?.font = Styler.Font.BoldMicro.getFont() titleLabel?.font = Styler.Font.BoldMicro.getFont()
@ -250,7 +248,7 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
layer.cornerRadius = getInnerPadding() layer.cornerRadius = getInnerPadding()
contentEdgeInsets = getContentEdgeInsets() contentEdgeInsets = getContentEdgeInsets()
if let contraint = buttonModel?.width { if let contraint = buttonModel?.width, contraint != widthConstraint?.constant {
widthConstraint = widthAnchor.constraint(equalToConstant: contraint) widthConstraint = widthAnchor.constraint(equalToConstant: contraint)
widthConstraint?.isActive = true widthConstraint?.isActive = true
} }

2
MVMCoreUI/Styles/Styler.swift
View File

@ -191,7 +191,7 @@ open class Styler {
case .small: case .small:
return 32 return 32
case .tiny: case .tiny:
return 26 return 20
} }
} }
} }