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

bringing borderwidth in.

Browse Source
This commit is contained in:
Kevin G Christiano 2020-04-30 15:48:30 -04:00
parent 2f6fa19233
commit cbcb1c37c0
2 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,8 @@ public class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupW
enabledFillColor_inverted: Color(uiColor: .mvmWhite), enabledFillColor_inverted: Color(uiColor: .mvmWhite),
enabledTextColor_inverted: Color(uiColor: .mvmBlack), enabledTextColor_inverted: Color(uiColor: .mvmBlack),
disabledFillColor_inverted: Color(uiColor: .mvmCoolGray6), disabledFillColor_inverted: Color(uiColor: .mvmCoolGray6),
disabledTextColor_inverted: Color(uiColor: .mvmBlack)) disabledTextColor_inverted: Color(uiColor: .mvmBlack),
borderWidth: 0)
private var secondaryFacade = Facade(enabledFillColor: Color(uiColor: .mvmWhite), private var secondaryFacade = Facade(enabledFillColor: Color(uiColor: .mvmWhite),
enabledTextColor: Color(uiColor: .mvmBlack), enabledTextColor: Color(uiColor: .mvmBlack),
@ -70,7 +71,8 @@ public class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupW
enabledBorderColor_inverted: Color(uiColor: .mvmWhite), enabledBorderColor_inverted: Color(uiColor: .mvmWhite),
disabledFillColor_inverted: Color(uiColor: .mvmWhite), disabledFillColor_inverted: Color(uiColor: .mvmWhite),
disabledTextColor_inverted: Color(uiColor: .mvmCoolGray6), disabledTextColor_inverted: Color(uiColor: .mvmCoolGray6),
disabledBorderColor_inverted: Color(uiColor: .mvmCoolGray6)) disabledBorderColor_inverted: Color(uiColor: .mvmCoolGray6),
borderWidth: 1)
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Methods // MARK: - Methods

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

@ -31,6 +31,28 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
case standard = 42 case standard = 42
} }
//--------------------------------------------------
// MARK: - Computed Properties
//--------------------------------------------------
public var enabledTitleColor: UIColor? {
get { return titleColor(for: .normal) }
set { setTitleColor(newValue, for: .normal) }
}
public var disabledTitleColor: UIColor? {
get { return titleColor(for: .disabled) }
set { setTitleColor(newValue, for: .disabled) }
}
public var borderColor: UIColor? {
get {
guard let currentColor = layer.borderColor else { return nil }
return UIColor(cgColor: currentColor)
}
set { layer.borderColor = newValue?.cgColor}
}
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Methods // MARK: - Methods
//-------------------------------------------------- //--------------------------------------------------
@ -39,9 +61,9 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
public func stylePrimary() { public func stylePrimary() {
buttonModel?.style = .primary buttonModel?.style = .primary
setTitleColor(buttonModel?.facade?.enabled.text ?? .mvmWhite, for: .normal) enabledTitleColor = buttonModel?.facade?.enabled.text ?? .mvmWhite
setTitleColor(buttonModel?.facade?.disabled.text ?? .mvmWhite, for: .disabled) disabledTitleColor = buttonModel?.facade?.disabled.text ?? .mvmWhite
layer.borderWidth = 0 layer.borderWidth = buttonModel?.facade?.getBorderWidth() ?? 0
backgroundColor = isEnabled ? buttonModel?.facade?.enabled.fill ?? .mvmBlack : buttonModel?.facade?.enabled.fill ?? .mvmCoolGray6 backgroundColor = isEnabled ? buttonModel?.facade?.enabled.fill ?? .mvmBlack : buttonModel?.facade?.enabled.fill ?? .mvmCoolGray6
} }
@ -49,16 +71,11 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
public func styleSecondary() { public func styleSecondary() {
buttonModel?.style = .secondary buttonModel?.style = .secondary
setTitleColor(buttonModel?.facade?.enabled.text ?? .mvmBlack, for: .normal) enabledTitleColor = buttonModel?.facade?.enabled.text ?? .mvmBlack
setTitleColor(buttonModel?.facade?.disabled.text ?? .mvmCoolGray6, for: .disabled) disabledTitleColor = buttonModel?.facade?.disabled.text ?? .mvmCoolGray6
backgroundColor = .clear backgroundColor = .clear
layer.borderWidth = 1 layer.borderWidth = buttonModel?.facade?.getBorderWidth() ?? 1
borderColor = isEnabled ? buttonModel?.facade?.enabled.border ?? .mvmBlack : buttonModel?.facade?.enabled.border ?? .mvmCoolGray6
if isEnabled {
layer.borderColor = buttonModel?.facade?.enabled.border?.cgColor ?? UIColor.mvmBlack.cgColor
} else {
layer.borderColor = buttonModel?.facade?.enabled.border?.cgColor ?? UIColor.mvmCoolGray6.cgColor
}
} }
/// Styles the button based on the model style /// Styles the button based on the model style
@ -73,11 +90,11 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
} }
if let titleColor = buttonModel?.facade?.enabled.text { if let titleColor = buttonModel?.facade?.enabled.text {
setTitleColor(titleColor, for: .normal) enabledTitleColor = titleColor
} }
if let disabledTitleColor = buttonModel?.facade?.disabled.text { if let disabledTitleColor = buttonModel?.facade?.disabled.text {
setTitleColor(disabledTitleColor, for: .disabled) self.disabledTitleColor = disabledTitleColor
} }
if isEnabled { if isEnabled {
@ -86,17 +103,17 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
} }
if let borderColor = buttonModel?.facade?.enabled.border { if let borderColor = buttonModel?.facade?.enabled.border {
layer.borderWidth = 1 layer.borderWidth = buttonModel?.facade?.getBorderWidth() ?? 1
layer.borderColor = borderColor.cgColor self.borderColor = borderColor
} }
} else { } else {
if let fillColor = buttonModel?.facade?.disabled.fill { if let fillColor = buttonModel?.facade?.disabled.fill {
backgroundColor = fillColor backgroundColor = fillColor
} }
if let borderColor = buttonModel?.facade?.disabledBorderColor { if let borderColor = buttonModel?.facade?.disabled.border {
layer.borderWidth = 1 layer.borderWidth = buttonModel?.facade?.getBorderWidth() ?? 1
layer.borderColor = borderColor.cgColor self.borderColor = borderColor
} }
} }
} }