feat(Fonts): IOS-9162 Update token weights for native components (#288)

* IOS-9162 Updated font weights from mistica-design. * IOS-9162 Updated font weight in some components still using medium weight.
Telefonica · Jul 24, 2023 · c926e4a · c926e4a
1 parent 13556ea
commit c926e4a
Show file tree

Hide file tree

Showing 46 changed files with 26 additions and 11 deletions.
diff --git a/Sources/Mistica/Components/Badge/NovumBarButtonItem.swift b/Sources/Mistica/Components/Badge/NovumBarButtonItem.swift
@@ -22,7 +22,7 @@ public func createNovumTabBarItem(badgeValue: UInt = 0) -> UITabBarItem {
     }
 
     let badgeTextAttributes = [
-        NSAttributedString.Key.font: UIFont.textPreset1(weight: .medium),
+        NSAttributedString.Key.font: UIFont.textPreset1(weight: .indicator),
         NSAttributedString.Key.foregroundColor: UIColor.textPrimaryInverse
     ]
 

diff --git a/Sources/Mistica/Components/Crouton/Domain/CroutonConfig.swift b/Sources/Mistica/Components/Crouton/Domain/CroutonConfig.swift
@@ -94,7 +94,7 @@ private extension Button.Style {
         OverriddenSizes(
             insets: Constants.insets,
             minimumWidth: Constants.minimumWidth,
-            font: .textPreset3(weight: .medium)
+            font: .textPreset3(weight: .link)
         )
     }
 }
diff --git a/Sources/Mistica/Components/NavigationBar/UINavigationBar+Mistica.swift b/Sources/Mistica/Components/NavigationBar/UINavigationBar+Mistica.swift
@@ -14,7 +14,7 @@ public extension UINavigationBar {
     }
 
     class var misticaTitleTextAttributes: [NSAttributedString.Key: Any] {
-        textAttributes(for: .textPreset4(weight: .medium, constrainedToPreferredSize: .large), color: UIColor.textNavigationBarPrimary)
+        textAttributes(for: .textPreset4(weight: .navigationBar, constrainedToPreferredSize: .large), color: UIColor.textNavigationBarPrimary)
     }
 
     func applyMisticaStyle() {

diff --git a/Sources/Mistica/Components/ViewStates/LoadErrorViewController.swift b/Sources/Mistica/Components/ViewStates/LoadErrorViewController.swift
@@ -82,15 +82,15 @@ private extension LoadErrorViewController {
     }
 
     func setUpTitleText() {
-        titleTextLabel.font = .textPreset4(weight: .medium)
+        titleTextLabel.font = .textPreset4(weight: .cardTitle)
         titleTextLabel.textColor = .textPrimary
         titleTextLabel.textAlignment = .center
         titleTextLabel.numberOfLines = 0
         titleTextLabel.text = titleText
     }
 
     func setUpDescriptionText() {
-        descriptionLabel.font = .textPreset3(weight: .medium)
+        descriptionLabel.font = .textPreset3(weight: .regular)
         descriptionLabel.textColor = .textSecondary
         descriptionLabel.textAlignment = .center
         descriptionLabel.numberOfLines = 0

diff --git a/Sources/MisticaCommon/Controls/MisticaAppearance.swift b/Sources/MisticaCommon/Controls/MisticaAppearance.swift
@@ -86,11 +86,11 @@ private extension MisticaAppearance {
 
         let normalTextAttributes = [
             NSAttributedString.Key.foregroundColor: textColor,
-            NSAttributedString.Key.font: UIFont.textPreset2(weight: .medium)
+            NSAttributedString.Key.font: UIFont.textPreset2(weight: .tabsLabel)
         ]
         let selectedTextAttributes = [
             NSAttributedString.Key.foregroundColor: selectedTextColor,
-            NSAttributedString.Key.font: UIFont.textPreset2(weight: .medium)
+            NSAttributedString.Key.font: UIFont.textPreset2(weight: .tabsLabel)
         ]
 
         segmentedControlAppearance.setTitleTextAttributes(normalTextAttributes, for: .normal)

diff --git a/Sources/MisticaCommon/Fonts/Brands/BlauFontWeights.swift b/Sources/MisticaCommon/Fonts/Brands/BlauFontWeights.swift
@@ -11,9 +11,11 @@ import Foundation
 struct BlauFontWeights: MisticaFontWeights {
     public var cardTitle: MisticaFontWeightType = .regular
     public var button: MisticaFontWeightType = .medium
+    public var tabsLabel: MisticaFontWeightType = .medium
     public var link: MisticaFontWeightType = .medium
     public var title1: MisticaFontWeightType = .medium
     public var indicator: MisticaFontWeightType = .medium
+    public var navigationBar: MisticaFontWeightType = .medium
     public var text5: MisticaFontWeightType = .light
     public var text6: MisticaFontWeightType = .light
     public var text7: MisticaFontWeightType = .light

diff --git a/Sources/MisticaCommon/Fonts/Brands/MovistarFontWeights.swift b/Sources/MisticaCommon/Fonts/Brands/MovistarFontWeights.swift
@@ -11,9 +11,11 @@ import Foundation
 struct MovistarFontWeights: MisticaFontWeights {
     public var cardTitle: MisticaFontWeightType = .bold
     public var button: MisticaFontWeightType = .medium
+    public var tabsLabel: MisticaFontWeightType = .medium
     public var link: MisticaFontWeightType = .medium
     public var title1: MisticaFontWeightType = .medium
     public var indicator: MisticaFontWeightType = .medium
+    public var navigationBar: MisticaFontWeightType = .medium
     public var text5: MisticaFontWeightType = .bold
     public var text6: MisticaFontWeightType = .bold
     public var text7: MisticaFontWeightType = .bold

diff --git a/Sources/MisticaCommon/Fonts/Brands/O2FontWeights.swift b/Sources/MisticaCommon/Fonts/Brands/O2FontWeights.swift
@@ -11,9 +11,11 @@ import Foundation
 struct O2FontWeights: MisticaFontWeights {
     public var cardTitle: MisticaFontWeightType = .regular
     public var button: MisticaFontWeightType = .medium
+    public var tabsLabel: MisticaFontWeightType = .medium
     public var link: MisticaFontWeightType = .medium
     public var title1: MisticaFontWeightType = .medium
     public var indicator: MisticaFontWeightType = .medium
+    public var navigationBar: MisticaFontWeightType = .medium
     public var text5: MisticaFontWeightType = .light
     public var text6: MisticaFontWeightType = .light
     public var text7: MisticaFontWeightType = .light

diff --git a/Sources/MisticaCommon/Fonts/Brands/VivoFontWeights.swift b/Sources/MisticaCommon/Fonts/Brands/VivoFontWeights.swift
@@ -11,9 +11,11 @@ import Foundation
 struct VivoFontWeights: MisticaFontWeights {
     public var cardTitle: MisticaFontWeightType = .regular
     public var button: MisticaFontWeightType = .medium
+    public var tabsLabel: MisticaFontWeightType = .medium
     public var link: MisticaFontWeightType = .medium
     public var title1: MisticaFontWeightType = .medium
     public var indicator: MisticaFontWeightType = .medium
+    public var navigationBar: MisticaFontWeightType = .medium
     public var text5: MisticaFontWeightType = .light
     public var text6: MisticaFontWeightType = .light
     public var text7: MisticaFontWeightType = .light

diff --git a/Sources/MisticaCommon/Fonts/Brands/VivoNewFontWeights.swift b/Sources/MisticaCommon/Fonts/Brands/VivoNewFontWeights.swift
@@ -11,9 +11,11 @@ import Foundation
 struct VivoNewFontWeights: MisticaFontWeights {
     public var cardTitle: MisticaFontWeightType = .regular
     public var button: MisticaFontWeightType = .regular
+    public var tabsLabel: MisticaFontWeightType = .regular
     public var link: MisticaFontWeightType = .regular
     public var title1: MisticaFontWeightType = .regular
     public var indicator: MisticaFontWeightType = .regular
+    public var navigationBar: MisticaFontWeightType = .regular
     public var text5: MisticaFontWeightType = .regular
     public var text6: MisticaFontWeightType = .regular
     public var text7: MisticaFontWeightType = .regular

diff --git a/Sources/MisticaCommon/Fonts/FontStyle+Weights.swift b/Sources/MisticaCommon/Fonts/FontStyle+Weights.swift
@@ -25,7 +25,7 @@ public extension FontStyle {
     }
 
     enum TextPreset2Weight: CaseIterable {
-        case regular, medium, button, indicator, link
+        case regular, medium, button, indicator, link, tabsLabel
 
         var value: MisticaFontWeightType {
             switch self {
@@ -34,32 +34,35 @@ public extension FontStyle {
             case .button: return MisticaConfig.currentFontWeights.button
             case .indicator: return MisticaConfig.currentFontWeights.indicator
             case .link: return MisticaConfig.currentFontWeights.link
+            case .tabsLabel: return MisticaConfig.currentFontWeights.tabsLabel
             }
         }
     }
 
     enum TextPreset3Weight: CaseIterable {
-        case light, regular, medium, button
+        case light, regular, medium, button, link
 
         var value: MisticaFontWeightType {
             switch self {
             case .light: return .light
             case .regular: return .regular
             case .medium: return .medium
             case .button: return MisticaConfig.currentFontWeights.button
+            case .link: return MisticaConfig.currentFontWeights.link
             }
         }
     }
 
     enum TextPreset4Weight: CaseIterable {
-        case light, regular, medium, cardTitle
+        case light, regular, medium, cardTitle, navigationBar
 
         var value: MisticaFontWeightType {
             switch self {
             case .light: return .light
             case .regular: return .regular
             case .medium: return .medium
             case .cardTitle: return MisticaConfig.currentFontWeights.cardTitle
+            case .navigationBar: return MisticaConfig.currentFontWeights.navigationBar
             }
         }
     }

diff --git a/Sources/MisticaCommon/Fonts/MisticaFontWeights.swift b/Sources/MisticaCommon/Fonts/MisticaFontWeights.swift
@@ -11,9 +11,11 @@ import UIKit
 public protocol MisticaFontWeights {
     var cardTitle: MisticaFontWeightType { get }
     var button: MisticaFontWeightType { get }
+    var tabsLabel: MisticaFontWeightType { get }
     var link: MisticaFontWeightType { get }
     var title1: MisticaFontWeightType { get }
     var indicator: MisticaFontWeightType { get }
+    var navigationBar: MisticaFontWeightType { get }
     var text5: MisticaFontWeightType { get }
     var text6: MisticaFontWeightType { get }
     var text7: MisticaFontWeightType { get }

diff --git a/Sources/MisticaSwiftUI/Styleguide/Components/NavigationView+Styleguide.swift b/Sources/MisticaSwiftUI/Styleguide/Components/NavigationView+Styleguide.swift
@@ -74,7 +74,7 @@ private var hiddenTitleTextAttributes: [NSAttributedString.Key: Any] {
 
 private var misticaTitleTextAttributes: [NSAttributedString.Key: Any] {
     textAttributes(
-        for: .textPreset4(weight: .medium, constrainedToPreferredSize: .large),
+        for: .textPreset4(weight: .navigationBar, constrainedToPreferredSize: .large),
         color: .textNavigationBarPrimary
     )
 }

diff --git a/...onTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-blau-dark-style.png b/...onTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-blau-dark-style.png
diff --git a/...aCommonTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-blau-style.png b/...aCommonTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-blau-style.png
diff --git a/...sts/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-movistar-dark-style.png b/...sts/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-movistar-dark-style.png
diff --git a/...monTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-movistar-style.png b/...monTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-movistar-style.png
diff --git a/...mmonTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-o2-dark-style.png b/...mmonTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-o2-dark-style.png
diff --git a/...icaCommonTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-o2-style.png b/...icaCommonTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-o2-style.png
diff --git a/...onTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-vivo-dark-style.png b/...onTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-vivo-dark-style.png
diff --git a/...aCommonTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-vivo-style.png b/...aCommonTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-vivo-style.png
diff --git a/...ests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-vivoNew-dark-style.png b/...ests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-vivoNew-dark-style.png
diff --git a/...mmonTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-vivoNew-style.png b/...mmonTests/Fonts/__Snapshots__/FontToolkitTests/testFonts.with-vivoNew-style.png
diff --git a/...UI/__Snapshots__/ControlsTests/testSegmentedControl.with-vivoNew-dark-style.png b/...UI/__Snapshots__/ControlsTests/testSegmentedControl.with-vivoNew-dark-style.png
diff --git a/...ests/UI/__Snapshots__/ControlsTests/testSegmentedControl.with-vivoNew-style.png b/...ests/UI/__Snapshots__/ControlsTests/testSegmentedControl.with-vivoNew-style.png
diff --git a/...CroutonTests/testCriticalCroutonWithLongActionTitle.with-vivoNew-dark-style.png b/...CroutonTests/testCriticalCroutonWithLongActionTitle.with-vivoNew-dark-style.png
diff --git a/...ts__/CroutonTests/testCriticalCroutonWithLongActionTitle.with-vivoNew-style.png b/...ts__/CroutonTests/testCriticalCroutonWithLongActionTitle.with-vivoNew-style.png
diff --git a/...routonTests/testCriticalCroutonWithShortActionTitle.with-vivoNew-dark-style.png b/...routonTests/testCriticalCroutonWithShortActionTitle.with-vivoNew-dark-style.png
diff --git a/...s__/CroutonTests/testCriticalCroutonWithShortActionTitle.with-vivoNew-style.png b/...s__/CroutonTests/testCriticalCroutonWithShortActionTitle.with-vivoNew-style.png
diff --git a/...s__/CroutonTests/testInfoCroutonWithLongActionTitle.with-vivoNew-dark-style.png b/...s__/CroutonTests/testInfoCroutonWithLongActionTitle.with-vivoNew-dark-style.png
diff --git a/...pshots__/CroutonTests/testInfoCroutonWithLongActionTitle.with-vivoNew-style.png b/...pshots__/CroutonTests/testInfoCroutonWithLongActionTitle.with-vivoNew-style.png
diff --git a/...__/CroutonTests/testInfoCroutonWithShortActionTitle.with-vivoNew-dark-style.png b/...__/CroutonTests/testInfoCroutonWithShortActionTitle.with-vivoNew-dark-style.png
diff --git a/...shots__/CroutonTests/testInfoCroutonWithShortActionTitle.with-vivoNew-style.png b/...shots__/CroutonTests/testInfoCroutonWithShortActionTitle.with-vivoNew-style.png
diff --git a/.../UI/__Snapshots__/LoadErrorViewControllerTests/testEmptyDescriptionAction.1.png b/.../UI/__Snapshots__/LoadErrorViewControllerTests/testEmptyDescriptionAction.1.png
diff --git a/...s/MisticaTests/UI/__Snapshots__/LoadErrorViewControllerTests/testNoAction.1.png b/...s/MisticaTests/UI/__Snapshots__/LoadErrorViewControllerTests/testNoAction.1.png
diff --git a/Tests/MisticaTests/UI/__Snapshots__/LoadErrorViewControllerTests/testNoTitle.1.png b/Tests/MisticaTests/UI/__Snapshots__/LoadErrorViewControllerTests/testNoTitle.1.png
diff --git a/.../__Snapshots__/LoadErrorViewControllerTests/testStyles.with-blau-dark-style.png b/.../__Snapshots__/LoadErrorViewControllerTests/testStyles.with-blau-dark-style.png
diff --git a/...ts/UI/__Snapshots__/LoadErrorViewControllerTests/testStyles.with-blau-style.png b/...ts/UI/__Snapshots__/LoadErrorViewControllerTests/testStyles.with-blau-style.png
diff --git a/...napshots__/LoadErrorViewControllerTests/testStyles.with-movistar-dark-style.png b/...napshots__/LoadErrorViewControllerTests/testStyles.with-movistar-dark-style.png
diff --git a/...I/__Snapshots__/LoadErrorViewControllerTests/testStyles.with-movistar-style.png b/...I/__Snapshots__/LoadErrorViewControllerTests/testStyles.with-movistar-style.png
diff --git a/...UI/__Snapshots__/LoadErrorViewControllerTests/testStyles.with-o2-dark-style.png b/...UI/__Snapshots__/LoadErrorViewControllerTests/testStyles.with-o2-dark-style.png
diff --git a/...ests/UI/__Snapshots__/LoadErrorViewControllerTests/testStyles.with-o2-style.png b/...ests/UI/__Snapshots__/LoadErrorViewControllerTests/testStyles.with-o2-style.png
diff --git a/.../__Snapshots__/LoadErrorViewControllerTests/testStyles.with-vivo-dark-style.png b/.../__Snapshots__/LoadErrorViewControllerTests/testStyles.with-vivo-dark-style.png
diff --git a/...ts/UI/__Snapshots__/LoadErrorViewControllerTests/testStyles.with-vivo-style.png b/...ts/UI/__Snapshots__/LoadErrorViewControllerTests/testStyles.with-vivo-style.png
diff --git a/...Snapshots__/LoadErrorViewControllerTests/testStyles.with-vivoNew-dark-style.png b/...Snapshots__/LoadErrorViewControllerTests/testStyles.with-vivoNew-dark-style.png
diff --git a/...UI/__Snapshots__/LoadErrorViewControllerTests/testStyles.with-vivoNew-style.png b/...UI/__Snapshots__/LoadErrorViewControllerTests/testStyles.with-vivoNew-style.png