diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift index 13c43afc..c74c3946 100644 --- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift +++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift @@ -34,7 +34,7 @@ open class TabBarModel: MoleculeModelProtocol { if let selectedColor = _selectedColor { return selectedColor } if let style = style, style == .dark { return Color(uiColor: VDSColor.elementsPrimaryOndark) } - return Color(uiColor: UIColor.mfGet(forHex: "#FF1129")) + return Color(uiColor: UIColor.monarchRed) } set { _selectedColor = newValue diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift index 2846d164..67fc779f 100644 --- a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift +++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift @@ -106,7 +106,7 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) _tintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .tintColor) 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) { self.hidesSystemBackButton = hidesSystemBackButton @@ -116,7 +116,7 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc additionalLeftButtons = try typeContainer.decodeModelsIfPresent(codingKey: .additionalLeftButtons) additionalRightButtons = try typeContainer.decodeModelsIfPresent(codingKey: .additionalRightButtons) 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) { self.titleOffset = titleOffset } diff --git a/MVMCoreUI/Categories/UIColor+Extension.swift b/MVMCoreUI/Categories/UIColor+Extension.swift index f4ef0f7f..854726bb 100644 --- a/MVMCoreUI/Categories/UIColor+Extension.swift +++ b/MVMCoreUI/Categories/UIColor+Extension.swift @@ -54,7 +54,10 @@ extension UIColor { "coolGray10": (.mvmCoolGray10, "#333333"), "upGold1": (.vzupGold1, "#F9D542"), "upGold2": (.vzupGold2, "#F4CA53"), - "upGold3": (.vzupGold3, "#CC9B2D")] + "upGold3": (.vzupGold3, "#CC9B2D"), + "monarchRed": (.monarchRed, "#f50a23"), + "monarchStone": (.monarchStone, "#f3ede0"), + ] //-------------------------------------------------- // MARK: - Helper @@ -84,7 +87,7 @@ extension UIColor { /// HEX: #D52B1E public static let mvmRed = UIColor.assetColor(named: "red") - + //-------------------------------------------------- // MARK: - Pink //-------------------------------------------------- @@ -222,6 +225,16 @@ extension UIColor { /// HEX: #CC9B2D 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 //-------------------------------------------------- diff --git a/MVMCoreUI/Categories/colors.xcassets/monarchRed.colorset/Contents.json b/MVMCoreUI/Categories/colors.xcassets/monarchRed.colorset/Contents.json new file mode 100644 index 00000000..5f3b4048 --- /dev/null +++ b/MVMCoreUI/Categories/colors.xcassets/monarchRed.colorset/Contents.json @@ -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 + } +} diff --git a/MVMCoreUI/Categories/colors.xcassets/monarchStone.colorset/Contents.json b/MVMCoreUI/Categories/colors.xcassets/monarchStone.colorset/Contents.json new file mode 100644 index 00000000..ead33d73 --- /dev/null +++ b/MVMCoreUI/Categories/colors.xcassets/monarchStone.colorset/Contents.json @@ -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 + } +}