Merge branch 'feature/icon_update' into 'develop'

Feature/icon update

See merge request BPHV_MIPS/mvm_core_ui!564

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)
+            set(tabItemAppearance: appearance.stackedLayoutAppearance, model: model)
-            setTabBarItemColors(appearance.inlineLayoutAppearance, model: model)
+            set(tabItemAppearance: appearance.inlineLayoutAppearance, model: model)
-            setTabBarItemColors(appearance.compactInlineLayoutAppearance, 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) {
+    private func set(tabItemAppearance: UITabBarItemAppearance, model: TabBarModel) {
-        itemAppearance.normal.iconColor = model.unSelectedColor.uiColor
+        tabItemAppearance.normal.iconColor = model.unSelectedColor.uiColor
-        itemAppearance.normal.titleTextAttributes = [NSAttributedString.Key.foregroundColor: 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)
-        itemAppearance.selected.iconColor = model.selectedColor.uiColor
+
-        itemAppearance.selected.titleTextAttributes = [NSAttributedString.Key.foregroundColor: model.selectedColor.uiColor]
+        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

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
     }
     

MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m

@@ -1089,7 +1089,6 @@ CGFloat const PanelAnimationDuration = 0.2;
     if ([self.rightPanelButton respondsToSelector:@selector(setIconColor:)]) {
         [((UIBarButtonItem <MVMCoreUIPanelButtonProtocol>*)self.rightPanelButton) setIconColor:color];
     }
-    [self.backButton setTintColor:color];
 }
 
 @end

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"
     }
   ],

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"
     }
   ],