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

Digital ACT191 story - Monarch Testing

Browse Source
This commit is contained in:
Scott Pfeil 2024-04-09 17:07:14 -04:00
parent add7eee2f7
commit 9446899ca7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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: VDSColor.elementsPrimaryOnlight) return Color(uiColor: UIColor.mfGet(forHex: "#FF1129"))
} }
set { set {
_selectedColor = newValue _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) // Must be capped to 0...(tabs.count - 1)
open var selectedTab: Int = 0 open var selectedTab: Int = 0

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
} }