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

Monarch colors

Browse Source
This commit is contained in:
Scott Pfeil 2024-04-23 17:00:22 -04:00
parent 056e56c15d
commit b8526ac8e1
5 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift
View File

@ -34,7 +34,7 @@ open class TabBarModel: MoleculeModelProtocol {
if let selectedColor = _selectedColor { return selectedColor } if let selectedColor = _selectedColor { return selectedColor }
if let style = style, if let style = style,
style == .dark { return Color(uiColor: VDSColor.elementsPrimaryOndark) } style == .dark { return Color(uiColor: VDSColor.elementsPrimaryOndark) }
return Color(uiColor: UIColor.mfGet(forHex: "#FF1129")) return Color(uiColor: UIColor.monarchRed)
} }
set { set {
_selectedColor = newValue _selectedColor = newValue

4
MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift
View File

@ -106,7 +106,7 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
_tintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .tintColor) _tintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .tintColor)
if let line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line) { if let line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line) {
//self.line = line self.line = line
} }
if let hidesSystemBackButton = try typeContainer.decodeIfPresent(Bool.self, forKey: .hidesSystemBackButton) { if let hidesSystemBackButton = try typeContainer.decodeIfPresent(Bool.self, forKey: .hidesSystemBackButton) {
self.hidesSystemBackButton = hidesSystemBackButton self.hidesSystemBackButton = hidesSystemBackButton
@ -116,7 +116,7 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc
additionalLeftButtons = try typeContainer.decodeModelsIfPresent(codingKey: .additionalLeftButtons) additionalLeftButtons = try typeContainer.decodeModelsIfPresent(codingKey: .additionalLeftButtons)
additionalRightButtons = try typeContainer.decodeModelsIfPresent(codingKey: .additionalRightButtons) additionalRightButtons = try typeContainer.decodeModelsIfPresent(codingKey: .additionalRightButtons)
titleView = try typeContainer.decodeModelIfPresent(codingKey: .titleView) titleView = try typeContainer.decodeModelIfPresent(codingKey: .titleView)
//style = try typeContainer.decodeIfPresent(NavigationItemStyle.self, forKey: .style) style = try typeContainer.decodeIfPresent(NavigationItemStyle.self, forKey: .style)
if let titleOffset = try typeContainer.decodeIfPresent(UIOffset.self, forKey: .titleOffset) { if let titleOffset = try typeContainer.decodeIfPresent(UIOffset.self, forKey: .titleOffset) {
self.titleOffset = titleOffset self.titleOffset = titleOffset
} }

17
MVMCoreUI/Categories/UIColor+Extension.swift
View File

@ -54,7 +54,10 @@ extension UIColor {
"coolGray10": (.mvmCoolGray10, "#333333"), "coolGray10": (.mvmCoolGray10, "#333333"),
"upGold1": (.vzupGold1, "#F9D542"), "upGold1": (.vzupGold1, "#F9D542"),
"upGold2": (.vzupGold2, "#F4CA53"), "upGold2": (.vzupGold2, "#F4CA53"),
"upGold3": (.vzupGold3, "#CC9B2D")] "upGold3": (.vzupGold3, "#CC9B2D"),
"monarchRed": (.monarchRed, "#f50a23"),
"monarchStone": (.monarchStone, "#f3ede0"),
]
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Helper // MARK: - Helper
@ -84,7 +87,7 @@ extension UIColor {
/// HEX: #D52B1E /// HEX: #D52B1E
public static let mvmRed = UIColor.assetColor(named: "red") public static let mvmRed = UIColor.assetColor(named: "red")
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Pink // MARK: - Pink
//-------------------------------------------------- //--------------------------------------------------
@ -222,6 +225,16 @@ extension UIColor {
/// HEX: #CC9B2D /// HEX: #CC9B2D
public static let vzupGold3 = UIColor.assetColor(named: "upGold3") public static let vzupGold3 = UIColor.assetColor(named: "upGold3")
//--------------------------------------------------
// MARK: - Monarch
//--------------------------------------------------
/// HEX: #f50a23
@objc public static let monarchRed = UIColor.assetColor(named: "monarchRed")
/// HEX: #f3ede0
@objc public static let monarchStone = UIColor.assetColor(named: "monarchStone")
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Functions // MARK: - Functions
//-------------------------------------------------- //--------------------------------------------------

20
MVMCoreUI/Categories/colors.xcassets/monarchRed.colorset/Contents.json Normal file
View File

@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x23",
"green" : "0x0A",
"red" : "0xF5"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

20
MVMCoreUI/Categories/colors.xcassets/monarchStone.colorset/Contents.json Normal file
View File

@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xE0",
"green" : "0xED",
"red" : "0xF3"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}