Merge branch 'bugfix/font_update' into 'release/10_0_0'
3.0 font updates See merge request BPHV_MIPS/mvm_core_ui!857
This commit is contained in:
commit
7bcdb0e92f
@ -58,11 +58,11 @@ import VDSColorTokens
|
|||||||
/// Sets the item colors.
|
/// Sets the item colors.
|
||||||
private func set(tabItemAppearance: UITabBarItemAppearance, model: TabBarModel) {
|
private func set(tabItemAppearance: UITabBarItemAppearance, model: TabBarModel) {
|
||||||
tabItemAppearance.normal.iconColor = model.unSelectedColor.uiColor
|
tabItemAppearance.normal.iconColor = model.unSelectedColor.uiColor
|
||||||
tabItemAppearance.normal.titleTextAttributes = [NSAttributedString.Key.foregroundColor: model.unSelectedColor.uiColor, NSAttributedString.Key.font: MFFonts.mfFontTXRegular(10)]
|
tabItemAppearance.normal.titleTextAttributes = [NSAttributedString.Key.foregroundColor: model.unSelectedColor.uiColor, NSAttributedString.Key.font: MFFonts.mfFontTXBold(10)]
|
||||||
tabItemAppearance.normal.titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -3)
|
tabItemAppearance.normal.titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -3)
|
||||||
|
|
||||||
tabItemAppearance.selected.iconColor = model.selectedColor.uiColor
|
tabItemAppearance.selected.iconColor = model.selectedColor.uiColor
|
||||||
tabItemAppearance.selected.titleTextAttributes = [NSAttributedString.Key.foregroundColor: model.selectedColor.uiColor, NSAttributedString.Key.font: MFFonts.mfFontTXRegular(10)]
|
tabItemAppearance.selected.titleTextAttributes = [NSAttributedString.Key.foregroundColor: model.selectedColor.uiColor, NSAttributedString.Key.font: MFFonts.mfFontTXBold(10)]
|
||||||
tabItemAppearance.selected.titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -3)
|
tabItemAppearance.selected.titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -3)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -66,7 +66,7 @@ public extension UINavigationController {
|
|||||||
/// Convenience function for setting the navigation bar ui
|
/// Convenience function for setting the navigation bar ui
|
||||||
func setNavigationBarUI(with model: NavigationItemModelProtocol) {
|
func setNavigationBarUI(with model: NavigationItemModelProtocol) {
|
||||||
let navigationBar = navigationBar
|
let navigationBar = navigationBar
|
||||||
let font = MFStyler.fontBoldBodySmall(false)
|
let font = MFStyler.fontBoldBodyLarge(false)
|
||||||
let backgroundColor = model.backgroundColor?.uiColor
|
let backgroundColor = model.backgroundColor?.uiColor
|
||||||
let tint = model.tintColor.uiColor
|
let tint = model.tintColor.uiColor
|
||||||
navigationBar.tintColor = tint
|
navigationBar.tintColor = tint
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user