From 45188f624d7f36a4cc905d7ef9db0da91732438e Mon Sep 17 00:00:00 2001 From: Pierre-Yves Lapersonne Date: Mon, 7 Oct 2024 11:22:44 +0200 Subject: [PATCH] refactor: version of October 7th update for sizing semantic tokens (#173) Closes #173 Signed-off-by: Pierre-Yves Lapersonne --- CHANGELOG.md | 7 +- .../OUDSTheme+SizingSemanticTokens.swift | 90 ++++---- .../MockTheme+SizingSemanticTokens.swift | 90 ++++---- .../MockTheme+SpacingSemanticTokens.swift | 4 +- ...tThemeOverrideOfSizingSemanticTokens.swift | 210 +++++++++--------- ...ThemeOverrideOfSpacingSemanticTokens.swift | 5 - .../Sources/Values/SizingSemanticTokens.swift | 90 ++++---- 7 files changed, 248 insertions(+), 248 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6260236169..7b72df24ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- [Library] Any semantic tokens of spacing, `isIcon` and `isArrow` are now `withIcon` and `withArrow` (update of October 7th) -- [Library] Update semantic tokens for spacing (October 47h) ([#174](https://github.com/Orange-OpenSource/ouds-ios/issues/174)) +- [Library] Any semantic token of sizing `TypeXXX` has been replaced by `TypeSizeXXX` (update of October 7th) +- [Library] Any semantic tokens of sizing `WithTypeXXX` has been replaced by `TypzeXXX` (update of October 7th) +- [Library] Update semantic tokens for sizing (October 7th) ([#173](https://github.com/Orange-OpenSource/ouds-ios/issues/173)) +- [Library] Any semantic tokens of spacing `isIcon` and `isArrow` are now `withIcon` and `withArrow` (update of October 7th) +- [Library] Update semantic tokens for spacing (October 4th) ([#174](https://github.com/Orange-OpenSource/ouds-ios/issues/174)) - [Library] Update semantic tokens for spacing (October 4th) ([#156](https://github.com/Orange-OpenSource/ouds-ios/issues/156)) - [Library] Update raw tokens for dimensions (October 7th) ([#169](https://github.com/Orange-OpenSource/ouds-ios/issues/169)) diff --git a/OUDS/Core/OUDS/Sources/OUDSTheme/OUDSTheme+SemanticTokens/OUDSTheme+SizingSemanticTokens.swift b/OUDS/Core/OUDS/Sources/OUDSTheme/OUDSTheme+SemanticTokens/OUDSTheme+SizingSemanticTokens.swift index 5279d8085c..9621425a42 100644 --- a/OUDS/Core/OUDS/Sources/OUDSTheme/OUDSTheme+SemanticTokens/OUDSTheme+SizingSemanticTokens.swift +++ b/OUDS/Core/OUDS/Sources/OUDSTheme/OUDSTheme+SemanticTokens/OUDSTheme+SizingSemanticTokens.swift @@ -35,51 +35,51 @@ extension OUDSTheme: SizingSemanticTokens { // MARK: - Semantic token - Sizing - Icon with typography - @objc open var sizeIconWithTypeHeadingSmallShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension400, regular: DimensionRawTokens.dimension400) } - @objc open var sizeIconWithTypeHeadingSmallMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension500, regular: DimensionRawTokens.dimension500) } - @objc open var sizeIconWithTypeHeadingSmallTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension550) } - - @objc open var sizeIconWithTypeHeadingMediumShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension400, regular: DimensionRawTokens.dimension500) } - @objc open var sizeIconWithTypeHeadingMediumMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension500, regular: DimensionRawTokens.dimension550) } - @objc open var sizeIconWithTypeHeadingMediumTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension600) } - - @objc open var sizeIconWithTypeHeadingLargeShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension500, regular: DimensionRawTokens.dimension550) } - @objc open var sizeIconWithTypeHeadingLargeMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension600) } - @objc open var sizeIconWithTypeHeadingLargeTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension600, regular: DimensionRawTokens.dimension650) } - - @objc open var sizeIconWithTypeHeadingXLargeShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension650) } - @objc open var sizeIconWithTypeHeadingXLargeMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension600, regular: DimensionRawTokens.dimension700) } - @objc open var sizeIconWithTypeHeadingXLargeTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension650) } - - @objc open var sizeIconWithTypeBodySmallShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension150, regular: DimensionRawTokens.dimension150 ) } - @objc open var sizeIconWithTypeBodySmallMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension200, regular: DimensionRawTokens.dimension200 ) } - @objc open var sizeIconWithTypeBodySmallTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension250, regular: DimensionRawTokens.dimension250 ) } - - @objc open var sizeIconWithTypeBodyMediumShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension200, regular: DimensionRawTokens.dimension200 ) } - @objc open var sizeIconWithTypeBodyMediumMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension250, regular: DimensionRawTokens.dimension250 ) } - @objc open var sizeIconWithTypeBodyMediumTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension300, regular: DimensionRawTokens.dimension300 ) } - - @objc open var sizeIconWithTypeBodyLargeShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension250, regular: DimensionRawTokens.dimension250 ) } - @objc open var sizeIconWithTypeBodyLargeMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension300, regular: DimensionRawTokens.dimension300 ) } - @objc open var sizeIconWithTypeBodyLargeTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension350, regular: DimensionRawTokens.dimension350 ) } - - @objc open var sizeIconWithTypeLabelSmallShort: SizingSemanticToken { dimension6XS } - @objc open var sizeIconWithTypeLabelSmallMedium: SizingSemanticToken { dimension5XS } - @objc open var sizeIconWithTypeLabelSmallTall: SizingSemanticToken { dimension4XS } - - @objc open var sizeIconWithTypeLabelMediumShort: SizingSemanticToken { dimension5XS } - @objc open var sizeIconWithTypeLabelMediumMedium: SizingSemanticToken { dimension4XS } - @objc open var sizeIconWithTypeLabelMediumTall: SizingSemanticToken { dimension3XS } - - @objc open var sizeIconWithTypeLabelLargeShorter: SizingSemanticToken { dimension4XS } - @objc open var sizeIconWithTypeLabelLargeShort: SizingSemanticToken { dimension3XS } - @objc open var sizeIconWithTypeLabelLargeMedium: SizingSemanticToken { dimension2XS } - @objc open var sizeIconWithTypeLabelLargeTall: SizingSemanticToken { dimensionXS } - @objc open var sizeIconWithTypeLabelLargeTaller: SizingSemanticToken { dimensionLG } - - @objc open var sizeIconWithTypeLabelXLargeShort: SizingSemanticToken { dimensionXS } - @objc open var sizeIconWithTypeLabelXLargeMedium: SizingSemanticToken { dimensionMD } - @objc open var sizeIconWithTypeLabelXLargeTall: SizingSemanticToken { dimensionLG } + @objc open var sizeIconWithHeadingSmallShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension400, regular: DimensionRawTokens.dimension400) } + @objc open var sizeIconWithHeadingSmallMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension500, regular: DimensionRawTokens.dimension500) } + @objc open var sizeIconWithHeadingSmallTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension550) } + + @objc open var sizeIconWithHeadingMediumShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension400, regular: DimensionRawTokens.dimension500) } + @objc open var sizeIconWithHeadingMediumMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension500, regular: DimensionRawTokens.dimension550) } + @objc open var sizeIconWithHeadingMediumTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension600) } + + @objc open var sizeIconWithHeadingLargeShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension500, regular: DimensionRawTokens.dimension550) } + @objc open var sizeIconWithHeadingLargeMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension600) } + @objc open var sizeIconWithHeadingLargeTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension600, regular: DimensionRawTokens.dimension650) } + + @objc open var sizeIconWithHeadingXLargeShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension650) } + @objc open var sizeIconWithHeadingXLargeMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension600, regular: DimensionRawTokens.dimension700) } + @objc open var sizeIconWithHeadingXLargeTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension650) } + + @objc open var sizeIconWithBodySmallShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension150, regular: DimensionRawTokens.dimension150 ) } + @objc open var sizeIconWithBodySmallMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension200, regular: DimensionRawTokens.dimension200 ) } + @objc open var sizeIconWithBodySmallTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension250, regular: DimensionRawTokens.dimension250 ) } + + @objc open var sizeIconWithBodyMediumShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension200, regular: DimensionRawTokens.dimension200 ) } + @objc open var sizeIconWithBodyMediumMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension250, regular: DimensionRawTokens.dimension250 ) } + @objc open var sizeIconWithBodyMediumTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension300, regular: DimensionRawTokens.dimension300 ) } + + @objc open var sizeIconWithBodyLargeShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension250, regular: DimensionRawTokens.dimension250 ) } + @objc open var sizeIconWithBodyLargeMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension300, regular: DimensionRawTokens.dimension300 ) } + @objc open var sizeIconWithBodyLargeTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension350, regular: DimensionRawTokens.dimension350 ) } + + @objc open var sizeIconWithLabelSmallSizeShort: SizingSemanticToken { dimension6XS } + @objc open var sizeIconWithLabelSmallSizeMedium: SizingSemanticToken { dimension5XS } + @objc open var sizeIconWithLabelSmallSizeTall: SizingSemanticToken { dimension4XS } + + @objc open var sizeIconWithLabelMediumSizeShort: SizingSemanticToken { dimension5XS } + @objc open var sizeIconWithLabelMediumSizeMedium: SizingSemanticToken { dimension4XS } + @objc open var sizeIconWithLabelMediumSizeTall: SizingSemanticToken { dimension3XS } + + @objc open var sizeIconWithLabelLargeSizeShorter: SizingSemanticToken { dimension4XS } + @objc open var sizeIconWithLabelLargeSizeShort: SizingSemanticToken { dimension3XS } + @objc open var sizeIconWithLabelLargeSizeMedium: SizingSemanticToken { dimension2XS } + @objc open var sizeIconWithLabelLargeSizeTall: SizingSemanticToken { dimensionXS } + @objc open var sizeIconWithLabelLargeSizeTaller: SizingSemanticToken { dimensionLG } + + @objc open var sizeIconWithLabelXLargeSizeShort: SizingSemanticToken { dimensionXS } + @objc open var sizeIconWithLabelXLargeSizeMedium: SizingSemanticToken { dimensionMD } + @objc open var sizeIconWithLabelXLargeSizeTall: SizingSemanticToken { dimensionLG } // MARK: - Semantic token - Sizing - Max width typography diff --git a/OUDS/Core/OUDS/Tests/OUDSTheme/MockTheme/MockTheme+SizingSemanticTokens.swift b/OUDS/Core/OUDS/Tests/OUDSTheme/MockTheme/MockTheme+SizingSemanticTokens.swift index 3795a9de93..41389dbda2 100644 --- a/OUDS/Core/OUDS/Tests/OUDSTheme/MockTheme/MockTheme+SizingSemanticTokens.swift +++ b/OUDS/Core/OUDS/Tests/OUDSTheme/MockTheme/MockTheme+SizingSemanticTokens.swift @@ -31,51 +31,51 @@ extension MockTheme { // MARK: - Semantic token - Sizing - Icon with typography - override var sizeIconWithTypeHeadingSmallShort: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - override var sizeIconWithTypeHeadingSmallMedium: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - override var sizeIconWithTypeHeadingSmallTall: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - - override var sizeIconWithTypeHeadingMediumShort: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - override var sizeIconWithTypeHeadingMediumMedium: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - override var sizeIconWithTypeHeadingMediumTall: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - - override var sizeIconWithTypeHeadingLargeShort: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - override var sizeIconWithTypeHeadingLargeMedium: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - override var sizeIconWithTypeHeadingLargeTall: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - - override var sizeIconWithTypeHeadingXLargeShort: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - override var sizeIconWithTypeHeadingXLargeMedium: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - override var sizeIconWithTypeHeadingXLargeTall: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - - override var sizeIconWithTypeBodySmallShort: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - override var sizeIconWithTypeBodySmallMedium: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - override var sizeIconWithTypeBodySmallTall: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - - override var sizeIconWithTypeBodyMediumShort: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - override var sizeIconWithTypeBodyMediumMedium: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - override var sizeIconWithTypeBodyMediumTall: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - - override var sizeIconWithTypeBodyLargeShort: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - override var sizeIconWithTypeBodyLargeMedium: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - override var sizeIconWithTypeBodyLargeTall: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } - - override var sizeIconWithTypeLabelSmallShort: SizingSemanticToken { Self.mockThemeSizeRawToken } - override var sizeIconWithTypeLabelSmallMedium: SizingSemanticToken { Self.mockThemeSizeRawToken } - override var sizeIconWithTypeLabelSmallTall: SizingSemanticToken { Self.mockThemeSizeRawToken } - - override var sizeIconWithTypeLabelMediumShort: SizingSemanticToken { Self.mockThemeSizeRawToken } - override var sizeIconWithTypeLabelMediumMedium: SizingSemanticToken { Self.mockThemeSizeRawToken } - override var sizeIconWithTypeLabelMediumTall: SizingSemanticToken { Self.mockThemeSizeRawToken } - - override var sizeIconWithTypeLabelLargeShorter: SizingSemanticToken { Self.mockThemeSizeRawToken } - override var sizeIconWithTypeLabelLargeShort: SizingSemanticToken { Self.mockThemeSizeRawToken } - override var sizeIconWithTypeLabelLargeMedium: SizingSemanticToken { Self.mockThemeSizeRawToken } - override var sizeIconWithTypeLabelLargeTall: SizingSemanticToken { Self.mockThemeSizeRawToken } - override var sizeIconWithTypeLabelLargeTaller: SizingSemanticToken { Self.mockThemeSizeRawToken } - - override var sizeIconWithTypeLabelXLargeShort: SizingSemanticToken { Self.mockThemeSizeRawToken } - override var sizeIconWithTypeLabelXLargeMedium: SizingSemanticToken { Self.mockThemeSizeRawToken } - override var sizeIconWithTypeLabelXLargeTall: SizingSemanticToken { Self.mockThemeSizeRawToken } + override var sizeIconWithHeadingSmallShort: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + override var sizeIconWithHeadingSmallMedium: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + override var sizeIconWithHeadingSmallTall: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + + override var sizeIconWithHeadingMediumShort: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + override var sizeIconWithHeadingMediumMedium: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + override var sizeIconWithHeadingMediumTall: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + + override var sizeIconWithHeadingLargeShort: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + override var sizeIconWithHeadingLargeMedium: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + override var sizeIconWithHeadingLargeTall: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + + override var sizeIconWithHeadingXLargeShort: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + override var sizeIconWithHeadingXLargeMedium: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + override var sizeIconWithHeadingXLargeTall: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + + override var sizeIconWithBodySmallShort: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + override var sizeIconWithBodySmallMedium: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + override var sizeIconWithBodySmallTall: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + + override var sizeIconWithBodyMediumShort: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + override var sizeIconWithBodyMediumMedium: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + override var sizeIconWithBodyMediumTall: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + + override var sizeIconWithBodyLargeShort: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + override var sizeIconWithBodyLargeMedium: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + override var sizeIconWithBodyLargeTall: MultipleSizingTokens { Self.mockThemeSizeCompositeToken } + + override var sizeIconWithLabelSmallSizeShort: SizingSemanticToken { Self.mockThemeSizeRawToken } + override var sizeIconWithLabelSmallSizeMedium: SizingSemanticToken { Self.mockThemeSizeRawToken } + override var sizeIconWithLabelSmallSizeTall: SizingSemanticToken { Self.mockThemeSizeRawToken } + + override var sizeIconWithLabelMediumSizeShort: SizingSemanticToken { Self.mockThemeSizeRawToken } + override var sizeIconWithLabelMediumSizeMedium: SizingSemanticToken { Self.mockThemeSizeRawToken } + override var sizeIconWithLabelMediumSizeTall: SizingSemanticToken { Self.mockThemeSizeRawToken } + + override var sizeIconWithLabelLargeSizeShorter: SizingSemanticToken { Self.mockThemeSizeRawToken } + override var sizeIconWithLabelLargeSizeShort: SizingSemanticToken { Self.mockThemeSizeRawToken } + override var sizeIconWithLabelLargeSizeMedium: SizingSemanticToken { Self.mockThemeSizeRawToken } + override var sizeIconWithLabelLargeSizeTall: SizingSemanticToken { Self.mockThemeSizeRawToken } + override var sizeIconWithLabelLargeSizeTaller: SizingSemanticToken { Self.mockThemeSizeRawToken } + + override var sizeIconWithLabelXLargeSizeShort: SizingSemanticToken { Self.mockThemeSizeRawToken } + override var sizeIconWithLabelXLargeSizeMedium: SizingSemanticToken { Self.mockThemeSizeRawToken } + override var sizeIconWithLabelXLargeSizeTall: SizingSemanticToken { Self.mockThemeSizeRawToken } // MARK: - Semantic token - Sizing - Max width typography diff --git a/OUDS/Core/OUDS/Tests/OUDSTheme/MockTheme/MockTheme+SpacingSemanticTokens.swift b/OUDS/Core/OUDS/Tests/OUDSTheme/MockTheme/MockTheme+SpacingSemanticTokens.swift index fb81fd6d14..0d9a780284 100644 --- a/OUDS/Core/OUDS/Tests/OUDSTheme/MockTheme/MockTheme+SpacingSemanticTokens.swift +++ b/OUDS/Core/OUDS/Tests/OUDSTheme/MockTheme/MockTheme+SpacingSemanticTokens.swift @@ -82,6 +82,7 @@ extension MockTheme { override var spacePaddingBlockMedium: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } override var spacePaddingBlockTall: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } override var spacePaddingBlockTaller: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } + override var spacePaddingBlockWithIconNone: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } override var spacePaddingBlockWithIconShortest: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } override var spacePaddingBlockWithIconShorter: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } @@ -110,12 +111,13 @@ extension MockTheme { override var spaceColumnGapShort: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } override var spaceColumnGapMedium: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } override var spaceColumnGapTall: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } - override var spaceColumnGapTaller: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } + override var spaceColumnGapWithIconNone: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } override var spaceColumnGapWithIconShorter: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } override var spaceColumnGapWithIconShort: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } override var spaceColumnGapWithIconMedium: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } override var spaceColumnGapWithIconTall: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } + override var spaceColumnGapWithArrowNone: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } override var spaceColumnGapWithArrowShorter: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } override var spaceColumnGapWithArrowShort: SpacingPaddingInlineSemanticToken { Self.mockThemeSpaceRawToken } diff --git a/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfSizingSemanticTokens.swift b/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfSizingSemanticTokens.swift index 6cc9af19cd..c52489ec3d 100644 --- a/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfSizingSemanticTokens.swift +++ b/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfSizingSemanticTokens.swift @@ -69,179 +69,179 @@ final class TestThemeOverrideOfSizingSemanticTokens: XCTestCase { // MARK: - Semantic token - Sizing - Icon with typography - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeHeadingSmallShort() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeHeadingSmallShort, abstractTheme.sizeIconWithTypeHeadingSmallShort) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeHeadingSmallShort == MockTheme.mockThemeSizeCompositeToken) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithHeadingSmallShort() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithHeadingSmallShort, abstractTheme.sizeIconWithHeadingSmallShort) + XCTAssertTrue(inheritedTheme.sizeIconWithHeadingSmallShort == MockTheme.mockThemeSizeCompositeToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeHeadingSmallMedium() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeHeadingSmallMedium, abstractTheme.sizeIconWithTypeHeadingSmallMedium) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeHeadingSmallMedium == MockTheme.mockThemeSizeCompositeToken) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithHeadingSmallMedium() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithHeadingSmallMedium, abstractTheme.sizeIconWithHeadingSmallMedium) + XCTAssertTrue(inheritedTheme.sizeIconWithHeadingSmallMedium == MockTheme.mockThemeSizeCompositeToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeHeadingSmallTall() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeHeadingSmallTall, abstractTheme.sizeIconWithTypeHeadingSmallTall) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeHeadingSmallTall == MockTheme.mockThemeSizeCompositeToken) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithHeadingSmallTall() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithHeadingSmallTall, abstractTheme.sizeIconWithHeadingSmallTall) + XCTAssertTrue(inheritedTheme.sizeIconWithHeadingSmallTall == MockTheme.mockThemeSizeCompositeToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeHeadingMediumShort() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeHeadingMediumShort, abstractTheme.sizeIconWithTypeHeadingMediumShort) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeHeadingMediumShort == MockTheme.mockThemeSizeCompositeToken) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithHeadingMediumShort() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithHeadingMediumShort, abstractTheme.sizeIconWithHeadingMediumShort) + XCTAssertTrue(inheritedTheme.sizeIconWithHeadingMediumShort == MockTheme.mockThemeSizeCompositeToken) } - func testInheritedThemeCanOverrideSemanticTokenSizIconWithTypeHeadingMediumMedium() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeHeadingMediumMedium, abstractTheme.sizeIconWithTypeHeadingMediumMedium) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeHeadingMediumMedium == MockTheme.mockThemeSizeCompositeToken) + func testInheritedThemeCanOverrideSemanticTokenSizIconWithHeadingMediumMedium() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithHeadingMediumMedium, abstractTheme.sizeIconWithHeadingMediumMedium) + XCTAssertTrue(inheritedTheme.sizeIconWithHeadingMediumMedium == MockTheme.mockThemeSizeCompositeToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeHeadingMediumTall() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeHeadingMediumTall, abstractTheme.sizeIconWithTypeHeadingMediumTall) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeHeadingMediumTall == MockTheme.mockThemeSizeCompositeToken) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithHeadingMediumTall() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithHeadingMediumTall, abstractTheme.sizeIconWithHeadingMediumTall) + XCTAssertTrue(inheritedTheme.sizeIconWithHeadingMediumTall == MockTheme.mockThemeSizeCompositeToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeHeadingLargeShort() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeHeadingLargeShort, abstractTheme.sizeIconWithTypeHeadingLargeShort) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeHeadingLargeShort == MockTheme.mockThemeSizeCompositeToken) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithHeadingLargeShort() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithHeadingLargeShort, abstractTheme.sizeIconWithHeadingLargeShort) + XCTAssertTrue(inheritedTheme.sizeIconWithHeadingLargeShort == MockTheme.mockThemeSizeCompositeToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeHeadingLargeMedium() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeHeadingLargeMedium, abstractTheme.sizeIconWithTypeHeadingLargeMedium) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeHeadingLargeMedium == MockTheme.mockThemeSizeCompositeToken) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithHeadingLargeMedium() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithHeadingLargeMedium, abstractTheme.sizeIconWithHeadingLargeMedium) + XCTAssertTrue(inheritedTheme.sizeIconWithHeadingLargeMedium == MockTheme.mockThemeSizeCompositeToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeHeadingLargeTall() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeHeadingLargeTall, abstractTheme.sizeIconWithTypeHeadingLargeTall) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeHeadingLargeTall == MockTheme.mockThemeSizeCompositeToken) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithHeadingLargeTall() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithHeadingLargeTall, abstractTheme.sizeIconWithHeadingLargeTall) + XCTAssertTrue(inheritedTheme.sizeIconWithHeadingLargeTall == MockTheme.mockThemeSizeCompositeToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeHeadingXLargeShort() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeHeadingXLargeShort, abstractTheme.sizeIconWithTypeHeadingXLargeShort) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeHeadingXLargeShort == MockTheme.mockThemeSizeCompositeToken) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithHeadingXLargeShort() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithHeadingXLargeShort, abstractTheme.sizeIconWithHeadingXLargeShort) + XCTAssertTrue(inheritedTheme.sizeIconWithHeadingXLargeShort == MockTheme.mockThemeSizeCompositeToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeHeadingXLargeMedium() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeHeadingXLargeMedium, abstractTheme.sizeIconWithTypeHeadingXLargeMedium) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeHeadingXLargeMedium == MockTheme.mockThemeSizeCompositeToken) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithHeadingXLargeMedium() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithHeadingXLargeMedium, abstractTheme.sizeIconWithHeadingXLargeMedium) + XCTAssertTrue(inheritedTheme.sizeIconWithHeadingXLargeMedium == MockTheme.mockThemeSizeCompositeToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeHeadingXLargeTall() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeHeadingXLargeTall, abstractTheme.sizeIconWithTypeHeadingXLargeTall) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeHeadingXLargeTall == MockTheme.mockThemeSizeCompositeToken) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithHeadingXLargeTall() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithHeadingXLargeTall, abstractTheme.sizeIconWithHeadingXLargeTall) + XCTAssertTrue(inheritedTheme.sizeIconWithHeadingXLargeTall == MockTheme.mockThemeSizeCompositeToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeBodySmallShort() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeBodySmallShort, abstractTheme.sizeIconWithTypeBodySmallShort) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeBodySmallShort.isEqual(MockTheme.mockThemeSizeCompositeToken)) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithBodySmallShort() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithBodySmallShort, abstractTheme.sizeIconWithBodySmallShort) + XCTAssertTrue(inheritedTheme.sizeIconWithBodySmallShort.isEqual(MockTheme.mockThemeSizeCompositeToken)) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeBodySmallMedium() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeBodySmallMedium, abstractTheme.sizeIconWithTypeBodySmallMedium) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeBodySmallMedium.isEqual(MockTheme.mockThemeSizeCompositeToken)) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithBodySmallMedium() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithBodySmallMedium, abstractTheme.sizeIconWithBodySmallMedium) + XCTAssertTrue(inheritedTheme.sizeIconWithBodySmallMedium.isEqual(MockTheme.mockThemeSizeCompositeToken)) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeBodySmallTall() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeBodySmallTall, abstractTheme.sizeIconWithTypeBodySmallTall) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeBodySmallTall.isEqual(MockTheme.mockThemeSizeCompositeToken)) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithBodySmallTall() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithBodySmallTall, abstractTheme.sizeIconWithBodySmallTall) + XCTAssertTrue(inheritedTheme.sizeIconWithBodySmallTall.isEqual(MockTheme.mockThemeSizeCompositeToken)) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeBodyMediumShort() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeBodyMediumShort, abstractTheme.sizeIconWithTypeBodyMediumShort) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeBodyMediumShort.isEqual(MockTheme.mockThemeSizeCompositeToken)) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithBodyMediumShort() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithBodyMediumShort, abstractTheme.sizeIconWithBodyMediumShort) + XCTAssertTrue(inheritedTheme.sizeIconWithBodyMediumShort.isEqual(MockTheme.mockThemeSizeCompositeToken)) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeBodyMediumMedium() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeBodyMediumMedium, abstractTheme.sizeIconWithTypeBodyMediumMedium) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeBodyMediumMedium.isEqual(MockTheme.mockThemeSizeCompositeToken)) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithBodyMediumMedium() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithBodyMediumMedium, abstractTheme.sizeIconWithBodyMediumMedium) + XCTAssertTrue(inheritedTheme.sizeIconWithBodyMediumMedium.isEqual(MockTheme.mockThemeSizeCompositeToken)) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeBodyMediumTall() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeBodyMediumTall, abstractTheme.sizeIconWithTypeBodyMediumTall) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeBodyMediumTall.isEqual(MockTheme.mockThemeSizeCompositeToken)) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithBodyMediumTall() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithBodyMediumTall, abstractTheme.sizeIconWithBodyMediumTall) + XCTAssertTrue(inheritedTheme.sizeIconWithBodyMediumTall.isEqual(MockTheme.mockThemeSizeCompositeToken)) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeBodyLargeShort() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeBodyLargeShort, abstractTheme.sizeIconWithTypeBodyLargeShort) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeBodyLargeShort.isEqual(MockTheme.mockThemeSizeCompositeToken)) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithBodyLargeShort() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithBodyLargeShort, abstractTheme.sizeIconWithBodyLargeShort) + XCTAssertTrue(inheritedTheme.sizeIconWithBodyLargeShort.isEqual(MockTheme.mockThemeSizeCompositeToken)) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeBodyLargeMedium() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeBodyLargeMedium, abstractTheme.sizeIconWithTypeBodyLargeMedium) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeBodyLargeMedium.isEqual(MockTheme.mockThemeSizeCompositeToken)) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithBodyLargeMedium() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithBodyLargeMedium, abstractTheme.sizeIconWithBodyLargeMedium) + XCTAssertTrue(inheritedTheme.sizeIconWithBodyLargeMedium.isEqual(MockTheme.mockThemeSizeCompositeToken)) } - func testInheritedThemeCanOverrideSemanticTokenSizeIconWithTypeBodyLargeTall() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeBodyLargeTall, abstractTheme.sizeIconWithTypeBodyLargeTall) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeBodyLargeTall.isEqual(MockTheme.mockThemeSizeCompositeToken)) + func testInheritedThemeCanOverrideSemanticTokenSizeIconWithBodyLargeTall() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithBodyLargeTall, abstractTheme.sizeIconWithBodyLargeTall) + XCTAssertTrue(inheritedTheme.sizeIconWithBodyLargeTall.isEqual(MockTheme.mockThemeSizeCompositeToken)) } - func testInheritedThemeCanOverrideSemanticTokenSizeWithTypeLabelSmallShort() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeLabelSmallShort, abstractTheme.sizeIconWithTypeLabelSmallShort) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeLabelSmallShort == MockTheme.mockThemeSizeRawToken) + func testInheritedThemeCanOverrideSemanticTokenSizeWithLabelSmallShort() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithLabelSmallSizeShort, abstractTheme.sizeIconWithLabelSmallSizeShort) + XCTAssertTrue(inheritedTheme.sizeIconWithLabelSmallSizeShort == MockTheme.mockThemeSizeRawToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeWithTypeLabelSmallMedium() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeLabelSmallMedium, abstractTheme.sizeIconWithTypeLabelSmallMedium) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeLabelSmallMedium == MockTheme.mockThemeSizeRawToken) + func testInheritedThemeCanOverrideSemanticTokenSizeWithLabelSmallMedium() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithLabelSmallSizeMedium, abstractTheme.sizeIconWithLabelSmallSizeMedium) + XCTAssertTrue(inheritedTheme.sizeIconWithLabelSmallSizeMedium == MockTheme.mockThemeSizeRawToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeWithTypeLabelSmallTall() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeLabelSmallTall, abstractTheme.sizeIconWithTypeLabelSmallTall) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeLabelSmallTall == MockTheme.mockThemeSizeRawToken) + func testInheritedThemeCanOverrideSemanticTokenSizeWithLabelSmallTall() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithLabelSmallSizeTall, abstractTheme.sizeIconWithLabelSmallSizeTall) + XCTAssertTrue(inheritedTheme.sizeIconWithLabelSmallSizeTall == MockTheme.mockThemeSizeRawToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeWithTypeLabelMediumShort() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeLabelMediumShort, abstractTheme.sizeIconWithTypeLabelMediumShort) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeLabelMediumShort == MockTheme.mockThemeSizeRawToken) + func testInheritedThemeCanOverrideSemanticTokenSizeWithLabelMediumShort() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithLabelMediumSizeShort, abstractTheme.sizeIconWithLabelMediumSizeShort) + XCTAssertTrue(inheritedTheme.sizeIconWithLabelMediumSizeShort == MockTheme.mockThemeSizeRawToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeWithTypeLabelMediumMedium() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeLabelMediumMedium, abstractTheme.sizeIconWithTypeLabelMediumMedium) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeLabelMediumMedium == MockTheme.mockThemeSizeRawToken) + func testInheritedThemeCanOverrideSemanticTokenSizeWithLabelMediumMedium() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithLabelMediumSizeMedium, abstractTheme.sizeIconWithLabelMediumSizeMedium) + XCTAssertTrue(inheritedTheme.sizeIconWithLabelMediumSizeMedium == MockTheme.mockThemeSizeRawToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeWithTypeLabelMediumTall() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeLabelMediumTall, abstractTheme.sizeIconWithTypeLabelMediumTall) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeLabelMediumTall == MockTheme.mockThemeSizeRawToken) + func testInheritedThemeCanOverrideSemanticTokenSizeWithLabelMediumTall() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithLabelMediumSizeTall, abstractTheme.sizeIconWithLabelMediumSizeTall) + XCTAssertTrue(inheritedTheme.sizeIconWithLabelMediumSizeTall == MockTheme.mockThemeSizeRawToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeWithTypeLabelLargeShorter() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeLabelLargeShorter, abstractTheme.sizeIconWithTypeLabelLargeShorter) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeLabelLargeShorter == MockTheme.mockThemeSizeRawToken) + func testInheritedThemeCanOverrideSemanticTokenSizeWithLabelLargeShorter() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithLabelLargeSizeShorter, abstractTheme.sizeIconWithLabelLargeSizeShorter) + XCTAssertTrue(inheritedTheme.sizeIconWithLabelLargeSizeShorter == MockTheme.mockThemeSizeRawToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeWithTypeLabelLargeShort() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeLabelLargeShort, abstractTheme.sizeIconWithTypeLabelLargeShort) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeLabelLargeShort == MockTheme.mockThemeSizeRawToken) + func testInheritedThemeCanOverrideSemanticTokenSizeWithLabelLargeShort() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithLabelLargeSizeShort, abstractTheme.sizeIconWithLabelLargeSizeShort) + XCTAssertTrue(inheritedTheme.sizeIconWithLabelLargeSizeShort == MockTheme.mockThemeSizeRawToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeWithTypeLabelLargeMedium() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeLabelLargeMedium, abstractTheme.sizeIconWithTypeLabelLargeMedium) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeLabelLargeMedium == MockTheme.mockThemeSizeRawToken) + func testInheritedThemeCanOverrideSemanticTokenSizeWithLabelLargeMedium() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithLabelLargeSizeMedium, abstractTheme.sizeIconWithLabelLargeSizeMedium) + XCTAssertTrue(inheritedTheme.sizeIconWithLabelLargeSizeMedium == MockTheme.mockThemeSizeRawToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeWithTypeLabelLargeTall() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeLabelLargeTall, abstractTheme.sizeIconWithTypeLabelLargeTall) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeLabelLargeTall == MockTheme.mockThemeSizeRawToken) + func testInheritedThemeCanOverrideSemanticTokenSizeWithLabelLargeTall() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithLabelLargeSizeTall, abstractTheme.sizeIconWithLabelLargeSizeTall) + XCTAssertTrue(inheritedTheme.sizeIconWithLabelLargeSizeTall == MockTheme.mockThemeSizeRawToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeWithTypeLabelLargeTaller() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeLabelLargeTaller, abstractTheme.sizeIconWithTypeLabelLargeTaller) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeLabelLargeTaller == MockTheme.mockThemeSizeRawToken) + func testInheritedThemeCanOverrideSemanticTokenSizeWithLabelLargeTaller() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithLabelLargeSizeTaller, abstractTheme.sizeIconWithLabelLargeSizeTaller) + XCTAssertTrue(inheritedTheme.sizeIconWithLabelLargeSizeTaller == MockTheme.mockThemeSizeRawToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeWithTypeLabelXLargeShort() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeLabelXLargeShort, abstractTheme.sizeIconWithTypeLabelXLargeShort) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeLabelXLargeShort == MockTheme.mockThemeSizeRawToken) + func testInheritedThemeCanOverrideSemanticTokenSizeWithLabelXLargeShort() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithLabelXLargeSizeShort, abstractTheme.sizeIconWithLabelXLargeSizeShort) + XCTAssertTrue(inheritedTheme.sizeIconWithLabelXLargeSizeShort == MockTheme.mockThemeSizeRawToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeWithTypeLabelXLargeMedium() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeLabelXLargeMedium, abstractTheme.sizeIconWithTypeLabelXLargeMedium) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeLabelXLargeMedium == MockTheme.mockThemeSizeRawToken) + func testInheritedThemeCanOverrideSemanticTokenSizeWithLabelXLargeMedium() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithLabelXLargeSizeMedium, abstractTheme.sizeIconWithLabelXLargeSizeMedium) + XCTAssertTrue(inheritedTheme.sizeIconWithLabelXLargeSizeMedium == MockTheme.mockThemeSizeRawToken) } - func testInheritedThemeCanOverrideSemanticTokenSizeWithTypeLabelXLargeTall() throws { - XCTAssertNotEqual(inheritedTheme.sizeIconWithTypeLabelXLargeTall, abstractTheme.sizeIconWithTypeLabelXLargeTall) - XCTAssertTrue(inheritedTheme.sizeIconWithTypeLabelXLargeTall == MockTheme.mockThemeSizeRawToken) + func testInheritedThemeCanOverrideSemanticTokenSizeWithLabelXLargeTall() throws { + XCTAssertNotEqual(inheritedTheme.sizeIconWithLabelXLargeSizeTall, abstractTheme.sizeIconWithLabelXLargeSizeTall) + XCTAssertTrue(inheritedTheme.sizeIconWithLabelXLargeSizeTall == MockTheme.mockThemeSizeRawToken) } // MARK: - Semantic token - Sizing - Max width diff --git a/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfSpacingSemanticTokens.swift b/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfSpacingSemanticTokens.swift index 6100fbd96e..502046954f 100644 --- a/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfSpacingSemanticTokens.swift +++ b/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfSpacingSemanticTokens.swift @@ -404,11 +404,6 @@ final class TestThemeOverrideOfSpacingSemanticTokens: XCTestCase { XCTAssertTrue(inheritedTheme.spaceColumnGapTall == MockTheme.mockThemeSpaceRawToken) } - func testInheritedThemeCanOverrideSemanticTokenSpaceColumnGapTaller() throws { - XCTAssertNotEqual(inheritedTheme.spaceColumnGapTaller, abstractTheme.spaceColumnGapTaller) - XCTAssertTrue(inheritedTheme.spaceColumnGapTaller == MockTheme.mockThemeSpaceRawToken) - } - func testInheritedThemeCanOverrideSemanticTokenSpaceColumnGapWithIconNone() throws { XCTAssertNotEqual(inheritedTheme.spaceColumnGapWithIconNone, abstractTheme.spaceColumnGapWithIconNone) XCTAssertTrue(inheritedTheme.spaceColumnGapWithIconNone == MockTheme.mockThemeSpaceRawToken) diff --git a/OUDS/Core/Tokens/SemanticTokens/Sources/Values/SizingSemanticTokens.swift b/OUDS/Core/Tokens/SemanticTokens/Sources/Values/SizingSemanticTokens.swift index 698282f0aa..95b8d88fdd 100644 --- a/OUDS/Core/Tokens/SemanticTokens/Sources/Values/SizingSemanticTokens.swift +++ b/OUDS/Core/Tokens/SemanticTokens/Sources/Values/SizingSemanticTokens.swift @@ -32,51 +32,51 @@ public protocol SizingSemanticTokens { // MARK: - Semantic token - Sizing - Icon with typography - var sizeIconWithTypeHeadingSmallShort: MultipleSizingTokens { get } - var sizeIconWithTypeHeadingSmallMedium: MultipleSizingTokens { get } - var sizeIconWithTypeHeadingSmallTall: MultipleSizingTokens { get } - - var sizeIconWithTypeHeadingMediumShort: MultipleSizingTokens { get } - var sizeIconWithTypeHeadingMediumMedium: MultipleSizingTokens { get } - var sizeIconWithTypeHeadingMediumTall: MultipleSizingTokens { get } - - var sizeIconWithTypeHeadingLargeShort: MultipleSizingTokens { get } - var sizeIconWithTypeHeadingLargeMedium: MultipleSizingTokens { get } - var sizeIconWithTypeHeadingLargeTall: MultipleSizingTokens { get } - - var sizeIconWithTypeHeadingXLargeShort: MultipleSizingTokens { get } - var sizeIconWithTypeHeadingXLargeMedium: MultipleSizingTokens { get } - var sizeIconWithTypeHeadingXLargeTall: MultipleSizingTokens { get } - - var sizeIconWithTypeBodySmallShort: MultipleSizingTokens { get } - var sizeIconWithTypeBodySmallMedium: MultipleSizingTokens { get } - var sizeIconWithTypeBodySmallTall: MultipleSizingTokens { get } - - var sizeIconWithTypeBodyMediumShort: MultipleSizingTokens { get } - var sizeIconWithTypeBodyMediumMedium: MultipleSizingTokens { get } - var sizeIconWithTypeBodyMediumTall: MultipleSizingTokens { get } - - var sizeIconWithTypeBodyLargeShort: MultipleSizingTokens { get } - var sizeIconWithTypeBodyLargeMedium: MultipleSizingTokens { get } - var sizeIconWithTypeBodyLargeTall: MultipleSizingTokens { get } - - var sizeIconWithTypeLabelSmallShort: SizingSemanticToken { get } - var sizeIconWithTypeLabelSmallMedium: SizingSemanticToken { get } - var sizeIconWithTypeLabelSmallTall: SizingSemanticToken { get } - - var sizeIconWithTypeLabelMediumShort: SizingSemanticToken { get } - var sizeIconWithTypeLabelMediumMedium: SizingSemanticToken { get } - var sizeIconWithTypeLabelMediumTall: SizingSemanticToken { get } - - var sizeIconWithTypeLabelLargeShorter: SizingSemanticToken { get } - var sizeIconWithTypeLabelLargeShort: SizingSemanticToken { get } - var sizeIconWithTypeLabelLargeMedium: SizingSemanticToken { get } - var sizeIconWithTypeLabelLargeTall: SizingSemanticToken { get } - var sizeIconWithTypeLabelLargeTaller: SizingSemanticToken { get } - - var sizeIconWithTypeLabelXLargeShort: SizingSemanticToken { get } - var sizeIconWithTypeLabelXLargeMedium: SizingSemanticToken { get } - var sizeIconWithTypeLabelXLargeTall: SizingSemanticToken { get } + var sizeIconWithHeadingSmallShort: MultipleSizingTokens { get } + var sizeIconWithHeadingSmallMedium: MultipleSizingTokens { get } + var sizeIconWithHeadingSmallTall: MultipleSizingTokens { get } + + var sizeIconWithHeadingMediumShort: MultipleSizingTokens { get } + var sizeIconWithHeadingMediumMedium: MultipleSizingTokens { get } + var sizeIconWithHeadingMediumTall: MultipleSizingTokens { get } + + var sizeIconWithHeadingLargeShort: MultipleSizingTokens { get } + var sizeIconWithHeadingLargeMedium: MultipleSizingTokens { get } + var sizeIconWithHeadingLargeTall: MultipleSizingTokens { get } + + var sizeIconWithHeadingXLargeShort: MultipleSizingTokens { get } + var sizeIconWithHeadingXLargeMedium: MultipleSizingTokens { get } + var sizeIconWithHeadingXLargeTall: MultipleSizingTokens { get } + + var sizeIconWithBodySmallShort: MultipleSizingTokens { get } + var sizeIconWithBodySmallMedium: MultipleSizingTokens { get } + var sizeIconWithBodySmallTall: MultipleSizingTokens { get } + + var sizeIconWithBodyMediumShort: MultipleSizingTokens { get } + var sizeIconWithBodyMediumMedium: MultipleSizingTokens { get } + var sizeIconWithBodyMediumTall: MultipleSizingTokens { get } + + var sizeIconWithBodyLargeShort: MultipleSizingTokens { get } + var sizeIconWithBodyLargeMedium: MultipleSizingTokens { get } + var sizeIconWithBodyLargeTall: MultipleSizingTokens { get } + + var sizeIconWithLabelSmallSizeShort: SizingSemanticToken { get } + var sizeIconWithLabelSmallSizeMedium: SizingSemanticToken { get } + var sizeIconWithLabelSmallSizeTall: SizingSemanticToken { get } + + var sizeIconWithLabelMediumSizeShort: SizingSemanticToken { get } + var sizeIconWithLabelMediumSizeMedium: SizingSemanticToken { get } + var sizeIconWithLabelMediumSizeTall: SizingSemanticToken { get } + + var sizeIconWithLabelLargeSizeShorter: SizingSemanticToken { get } + var sizeIconWithLabelLargeSizeShort: SizingSemanticToken { get } + var sizeIconWithLabelLargeSizeMedium: SizingSemanticToken { get } + var sizeIconWithLabelLargeSizeTall: SizingSemanticToken { get } + var sizeIconWithLabelLargeSizeTaller: SizingSemanticToken { get } + + var sizeIconWithLabelXLargeSizeShort: SizingSemanticToken { get } + var sizeIconWithLabelXLargeSizeMedium: SizingSemanticToken { get } + var sizeIconWithLabelXLargeSizeTall: SizingSemanticToken { get } // MARK: - Semantic token - Sizing - Max width typography