fix: typeLabelDefaultXLarge not using typeRegular300 (#590) (#591)

Signed-off-by: Pierre-Yves Lapersonne <[email protected]>

Author: pylapp

CHANGELOG.md

@@ -38,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- [Library] Font composite semantic token `typeLabelDefaultXLarge` ([#590](https://github.com/Orange-OpenSource/ouds-ios/issues/590))
 - [Library] Remove extra padding in `ControlItem` ([#572](https://github.com/Orange-OpenSource/ouds-ios/issues/572))
 - [Library] Adjust vertical alignment of text labels according to their height in ContolItem ([#550](https://github.com/Orange-OpenSource/ouds-ios/issues/550))
 - [Library] Add accessibility label to vocalize the IconOnly button style ([#460](https://github.com/Orange-OpenSource/ouds-ios/issues/460))

DesignToolbox/DesignToolbox/Resources/Assets.xcassets/AppIconRelease.appiconset/UDSDemo-A_SQR.png

@@ -51,7 +51,7 @@ extension OrangeThemeFontSemanticTokensProvider: FontCompositeSemanticTokens {
 
     // MARK: - Semantic tokens - Typography - Composites - Label
 
-    @objc open var typeLabelDefaultXLarge: MultipleFontCompositeRawTokens { MultipleFontCompositeRawTokens(FontRawTokens.typeRegular250) } // NOTE: .typeRegular300 in Figjam but undefined
+    @objc open var typeLabelDefaultXLarge: MultipleFontCompositeRawTokens { MultipleFontCompositeRawTokens(FontRawTokens.typeRegular300) }
     @objc open var typeLabelDefaultLarge: MultipleFontCompositeRawTokens { MultipleFontCompositeRawTokens(FontRawTokens.typeBold250) }
     @objc open var typeLabelDefaultMedium: MultipleFontCompositeRawTokens { MultipleFontCompositeRawTokens(FontRawTokens.typeRegular200) }
     @objc open var typeLabelDefaultSmall: MultipleFontCompositeRawTokens { MultipleFontCompositeRawTokens(FontRawTokens.typeRegular150) }

DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_InverseTheme_Dark.labelDefaultXLarge.png

@@ -31,6 +31,8 @@ extension FontRawTokens {
 
     public static let typeRegular250 = FontCompositeRawToken(size: fontSize250, lineHeight: fontLineHeight350, weight: fontWeight400, letterSpacing: fontLetterSpacing250)
 
+    public static let typeRegular300 = FontCompositeRawToken(size: fontSize300, lineHeight: fontLineHeight450, weight: fontWeight400, letterSpacing: fontLetterSpacing300)
+
     public static let typeBold150 = FontCompositeRawToken(size: fontSize150, lineHeight: fontLineHeight250, weight: fontWeight700, letterSpacing: fontLetterSpacing150)
 
     public static let typeBold175 = FontCompositeRawToken(size: fontSize175, lineHeight: fontLineHeight250, weight: fontWeight700, letterSpacing: fontLetterSpacing175)

DesignToolbox/DesignToolboxSnapshotsTests/__Snapshots__/Tokens/__Snapshots__/OUDSTokensFontUITests/test_InverseTheme_Light.labelDefaultXLarge.png

@@ -1145,6 +1145,10 @@ struct FontRawTokensTests {
         #expect(FontRawTokens.typeRegular200 <| FontRawTokens.typeRegular250)
     }
 
+    @Test func fontRawTokensTypeRegular250LessThanTypeRegular300() throws {
+        #expect(FontRawTokens.typeRegular250 <| FontRawTokens.typeRegular300)
+    }
+
     @Test func fontRawTokensTypeBold150LessThanTypeBold175() throws {
         #expect(FontRawTokens.typeBold150 <| FontRawTokens.typeBold175)
     }
@@ -1257,6 +1261,7 @@ struct FontRawTokensTests {
         #expect(FontRawTokens.typeRegular175 != FontRawTokens.typeBold1850)
 
         #expect(FontRawTokens.typeRegular200 != FontRawTokens.typeRegular250)
+        #expect(FontRawTokens.typeRegular200 != FontRawTokens.typeRegular300)
         #expect(FontRawTokens.typeRegular200 != FontRawTokens.typeBold150)
         #expect(FontRawTokens.typeRegular200 != FontRawTokens.typeBold175)
         #expect(FontRawTokens.typeRegular200 != FontRawTokens.typeBold200)
@@ -1275,6 +1280,7 @@ struct FontRawTokensTests {
         #expect(FontRawTokens.typeRegular200 != FontRawTokens.typeBold1450)
         #expect(FontRawTokens.typeRegular200 != FontRawTokens.typeBold1850)
 
+        #expect(FontRawTokens.typeRegular250 != FontRawTokens.typeRegular300)
         #expect(FontRawTokens.typeRegular250 != FontRawTokens.typeBold150)
         #expect(FontRawTokens.typeRegular250 != FontRawTokens.typeBold175)
         #expect(FontRawTokens.typeRegular250 != FontRawTokens.typeBold200)
@@ -1293,6 +1299,24 @@ struct FontRawTokensTests {
         #expect(FontRawTokens.typeRegular250 != FontRawTokens.typeBold1450)
         #expect(FontRawTokens.typeRegular250 != FontRawTokens.typeBold1850)
 
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold150)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold175)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold200)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold250)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold300)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold350)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold450)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold550)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold650)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold750)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold850)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold950)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold1050)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold1150)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold1250)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold1450)
+        #expect(FontRawTokens.typeRegular300 != FontRawTokens.typeBold1850)
+
         #expect(FontRawTokens.typeBold150 != FontRawTokens.typeBold175)
         #expect(FontRawTokens.typeBold150 != FontRawTokens.typeBold200)
         #expect(FontRawTokens.typeBold150 != FontRawTokens.typeBold250)