diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift index b984a9da..6e8cb4a7 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: VDSColor.elementsPrimaryOnlight) + return Color(uiColor: UIColor.mfGet(forHex: "#FF1129")) } set { _selectedColor = newValue @@ -54,7 +54,7 @@ open class TabBarModel: MoleculeModelProtocol { } } - open var style: NavigationItemStyle? = .dark + open var style: NavigationItemStyle? = .light // Must be capped to 0...(tabs.count - 1) open var selectedTab: Int = 0 diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift index d39cdeaf..406fe56f 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 }