for custom colors
This commit is contained in:
parent
39f7c4c6f4
commit
876ec4597d
@ -61,11 +61,6 @@ public class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupW
|
|||||||
public var disabledTextColor_inverted: Color?
|
public var disabledTextColor_inverted: Color?
|
||||||
public var disabledBorderColor_inverted: Color?
|
public var disabledBorderColor_inverted: Color?
|
||||||
|
|
||||||
//--------------------------------------------------
|
|
||||||
// MARK: - Default Button Facades
|
|
||||||
//--------------------------------------------------
|
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Methods
|
// MARK: - Methods
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
@ -130,10 +125,15 @@ public class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupW
|
|||||||
/// Defines the default appearance for the primary style.
|
/// Defines the default appearance for the primary style.
|
||||||
func setPrimaryFacade() {
|
func setPrimaryFacade() {
|
||||||
|
|
||||||
enabledFillColor = Color(uiColor: .mvmBlack)
|
if enabledFillColor == nil && enabledTextColor == nil {
|
||||||
enabledTextColor = Color(uiColor: .mvmWhite)
|
enabledFillColor = Color(uiColor: .mvmBlack)
|
||||||
disabledFillColor = Color(uiColor: .mvmCoolGray6)
|
enabledTextColor = Color(uiColor: .mvmWhite)
|
||||||
disabledTextColor = Color(uiColor: .mvmWhite)
|
}
|
||||||
|
|
||||||
|
if disabledFillColor == nil && disabledTextColor == nil {
|
||||||
|
disabledFillColor = Color(uiColor: .mvmCoolGray6)
|
||||||
|
disabledTextColor = Color(uiColor: .mvmWhite)
|
||||||
|
}
|
||||||
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)
|
||||||
@ -143,10 +143,15 @@ public class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupW
|
|||||||
/// Defines the default appearance for the Secondary style.
|
/// Defines the default appearance for the Secondary style.
|
||||||
func setSecondaryFacade() {
|
func setSecondaryFacade() {
|
||||||
|
|
||||||
enabledTextColor = Color(uiColor: .mvmBlack)
|
if enabledTextColor == nil && enabledBorderColor == nil {
|
||||||
enabledBorderColor = Color(uiColor: .mvmBlack)
|
enabledTextColor = Color(uiColor: .mvmBlack)
|
||||||
disabledTextColor = Color(uiColor: .mvmCoolGray6)
|
enabledBorderColor = Color(uiColor: .mvmBlack)
|
||||||
disabledBorderColor = Color(uiColor: .mvmCoolGray6)
|
}
|
||||||
|
|
||||||
|
if disabledTextColor == nil && disabledBorderColor == nil {
|
||||||
|
disabledTextColor = Color(uiColor: .mvmCoolGray6)
|
||||||
|
disabledBorderColor = Color(uiColor: .mvmCoolGray6)
|
||||||
|
}
|
||||||
enabledTextColor_inverted = Color(uiColor: .mvmWhite)
|
enabledTextColor_inverted = Color(uiColor: .mvmWhite)
|
||||||
enabledBorderColor_inverted = Color(uiColor: .mvmWhite)
|
enabledBorderColor_inverted = Color(uiColor: .mvmWhite)
|
||||||
disabledTextColor_inverted = Color(uiColor: .mvmCoolGray6)
|
disabledTextColor_inverted = Color(uiColor: .mvmCoolGray6)
|
||||||
@ -168,6 +173,12 @@ public class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupW
|
|||||||
case size
|
case size
|
||||||
case facade
|
case facade
|
||||||
case groupName
|
case groupName
|
||||||
|
case fillColor
|
||||||
|
case textColor
|
||||||
|
case borderColor
|
||||||
|
case disabledFillColor
|
||||||
|
case disabledTextColor
|
||||||
|
case disabledBorderColor
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
@ -200,6 +211,13 @@ public class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupW
|
|||||||
if let groupName = try typeContainer.decodeIfPresent(String.self, forKey: .groupName) {
|
if let groupName = try typeContainer.decodeIfPresent(String.self, forKey: .groupName) {
|
||||||
self.groupName = groupName
|
self.groupName = groupName
|
||||||
}
|
}
|
||||||
|
|
||||||
|
enabledFillColor = try typeContainer.decodeIfPresent(Color.self, forKey: .fillColor)
|
||||||
|
enabledTextColor = try typeContainer.decodeIfPresent(Color.self, forKey: .textColor)
|
||||||
|
enabledBorderColor = try typeContainer.decodeIfPresent(Color.self, forKey: .borderColor)
|
||||||
|
disabledFillColor = try typeContainer.decodeIfPresent(Color.self, forKey: .disabledFillColor)
|
||||||
|
disabledTextColor = try typeContainer.decodeIfPresent(Color.self, forKey: .disabledTextColor)
|
||||||
|
disabledBorderColor = try typeContainer.decodeIfPresent(Color.self, forKey: .disabledBorderColor)
|
||||||
}
|
}
|
||||||
|
|
||||||
public func encode(to encoder: Encoder) throws {
|
public func encode(to encoder: Encoder) throws {
|
||||||
@ -210,6 +228,12 @@ public class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupW
|
|||||||
try container.encode(isInverted, forKey: .inverted)
|
try container.encode(isInverted, forKey: .inverted)
|
||||||
try container.encodeModel(action, forKey: .action)
|
try container.encodeModel(action, forKey: .action)
|
||||||
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
|
||||||
|
try container.encodeIfPresent(enabledFillColor, forKey: .fillColor)
|
||||||
|
try container.encodeIfPresent(enabledTextColor, forKey: .textColor)
|
||||||
|
try container.encodeIfPresent(enabledBorderColor, forKey: .borderColor)
|
||||||
|
try container.encodeIfPresent(disabledFillColor, forKey: .disabledFillColor)
|
||||||
|
try container.encodeIfPresent(disabledTextColor, forKey: .disabledTextColor)
|
||||||
|
try container.encodeIfPresent(disabledBorderColor, forKey: .disabledBorderColor)
|
||||||
try container.encodeIfPresent(style, forKey: .style)
|
try container.encodeIfPresent(style, forKey: .style)
|
||||||
try container.encodeIfPresent(size, forKey: .size)
|
try container.encodeIfPresent(size, forKey: .size)
|
||||||
try container.encodeIfPresent(groupName, forKey: .groupName)
|
try container.encodeIfPresent(groupName, forKey: .groupName)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user