diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift index 1068f350..1cf06325 100644 --- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift +++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift @@ -40,9 +40,9 @@ import Foundation if #available(iOS 13.0, *) { let appearance = UITabBarAppearance() appearance.backgroundColor = model.backgroundColor?.uiColor - setTabBarItemColors(appearance.stackedLayoutAppearance, model: model) - setTabBarItemColors(appearance.inlineLayoutAppearance, model: model) - setTabBarItemColors(appearance.compactInlineLayoutAppearance, model: model) + set(tabItemAppearance: appearance.stackedLayoutAppearance, model: model) + set(tabItemAppearance: appearance.inlineLayoutAppearance, model: model) + set(tabItemAppearance: appearance.compactInlineLayoutAppearance, model: model) standardAppearance = appearance } else { // Fallback on earlier versions @@ -57,6 +57,8 @@ import Foundation var tabs: [UITabBarItem] = [] for (index, tab) in model.tabs.enumerated() { let tabBarItem = UITabBarItem(title: tab.title, image: MVMCoreCache.shared()?.getImageFromRegisteredBundles(tab.image), tag: index) + tabBarItem.titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -3) + tabBarItem.setTitleTextAttributes([NSAttributedString.Key.font: MFFonts.mfFontTXRegular(8)], for: .normal) tabs.append(tabBarItem) } setItems(tabs, animated: false) @@ -65,12 +67,14 @@ import Foundation /// Sets the item colors. @available(iOS 13.0, *) - private func setTabBarItemColors(_ itemAppearance: UITabBarItemAppearance, model: TabBarModel) { - itemAppearance.normal.iconColor = model.unSelectedColor.uiColor - itemAppearance.normal.titleTextAttributes = [NSAttributedString.Key.foregroundColor: model.unSelectedColor.uiColor] - - itemAppearance.selected.iconColor = model.selectedColor.uiColor - itemAppearance.selected.titleTextAttributes = [NSAttributedString.Key.foregroundColor: model.selectedColor.uiColor] + private func set(tabItemAppearance: UITabBarItemAppearance, model: TabBarModel) { + tabItemAppearance.normal.iconColor = model.unSelectedColor.uiColor + tabItemAppearance.normal.titleTextAttributes = [NSAttributedString.Key.foregroundColor: model.unSelectedColor.uiColor, NSAttributedString.Key.font: MFFonts.mfFontTXRegular(8)] + tabItemAppearance.normal.titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -3) + + tabItemAppearance.selected.iconColor = model.selectedColor.uiColor + tabItemAppearance.selected.titleTextAttributes = [NSAttributedString.Key.foregroundColor: model.selectedColor.uiColor, NSAttributedString.Key.font: MFFonts.mfFontTXRegular(8)] + tabItemAppearance.selected.titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -3) } // MARK: - UITabBarDelegate diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/LabelBarButtonItem.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/LabelBarButtonItem.swift index a2c18e08..989148d1 100644 --- a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/LabelBarButtonItem.swift +++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/LabelBarButtonItem.swift @@ -18,7 +18,7 @@ import Foundation let actionObject = ActionDelegate() let button = self.init(title: title, style: .plain, target: actionObject, action: #selector(actionObject.callActionBlock(_:))) button.actionDelegate = actionObject - button.setTitleTextAttributes([NSAttributedString.Key.font: Styler.Font.RegularBodySmall], for: .normal) + button.setTitleTextAttributes([NSAttributedString.Key.font: Styler.Font.RegularBodySmall.getFont()], for: .normal) return button } diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m index 2a98a418..03a9f9d5 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m @@ -1089,7 +1089,6 @@ CGFloat const PanelAnimationDuration = 0.2; if ([self.rightPanelButton respondsToSelector:@selector(setIconColor:)]) { [((UIBarButtonItem *)self.rightPanelButton) setIconColor:color]; } - [self.backButton setTintColor:color]; } @end diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back-1.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back-1.png new file mode 100644 index 00000000..3fae0595 Binary files /dev/null and b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back-1.png differ diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back-2.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back-2.png new file mode 100644 index 00000000..48ad2176 Binary files /dev/null and b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back-2.png differ diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back.png new file mode 100644 index 00000000..2238b469 Binary files /dev/null and b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back.png differ diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json index 65a64dfd..753f15c2 100644 --- a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json +++ b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "nav_back.png", + "filename" : "Back.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "nav_back@2x.png", + "filename" : "Back-1.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "nav_back@3x.png", + "filename" : "Back-2.png", "scale" : "3x" } ], diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png deleted file mode 100644 index 2592ddda..00000000 Binary files a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png and /dev/null differ diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@2x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@2x.png deleted file mode 100644 index 077a411d..00000000 Binary files a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@2x.png and /dev/null differ diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png deleted file mode 100644 index f2ac8c73..00000000 Binary files a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png and /dev/null differ diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-1.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-1.png new file mode 100644 index 00000000..b89b3636 Binary files /dev/null and b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-1.png differ diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-2.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-2.png new file mode 100644 index 00000000..db8470f7 Binary files /dev/null and b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-2.png differ diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close.png new file mode 100644 index 00000000..f45880aa Binary files /dev/null and b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close.png differ diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json index d328ed8e..795c8827 100644 --- a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json +++ b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "nav_close.png", + "filename" : "Close.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "nav_close@2x.png", + "filename" : "Close-1.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "nav_close@3x.png", + "filename" : "Close-2.png", "scale" : "3x" } ], diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close.png deleted file mode 100644 index e04a9996..00000000 Binary files a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close.png and /dev/null differ diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@2x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@2x.png deleted file mode 100644 index f8876428..00000000 Binary files a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@2x.png and /dev/null differ diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@3x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@3x.png deleted file mode 100644 index b2e9d7df..00000000 Binary files a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@3x.png and /dev/null differ