Skip to content

Commit dc42745

Browse files
pylapppylapp
committed
refactor: rename *Spacing*Tokens and *Sizing*Tokens to *Space*Tokens and *Size*Tokens (#237)
Signed-off-by: Pierre-Yves Lapersonne <[email protected]>
1 parent ede91b2 commit dc42745

36 files changed

+622
-628
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313

1414
### Changed
1515

16+
- [Library] Rename `*Spacing*Tokens` and `*Sizing*Tokens` to `*Space*Tokens` and `*Size*Tokens` ([#237](https://github.com/Orange-OpenSource/ouds-ios/issues/237))
1617
- [Library] Update `ElevationRawTokens` (tokenator *20241022174330*)
1718
- [Library] Update `DimensionRawTokens` (tokenator *20241022132646*)
1819
- [Tool] Improve configuration of SwiftLint, update to v0.57.0 ([#77](https://github.com/Orange-OpenSource/ouds-ios/pull/77))

‎OUDS/Core/OUDS/Sources/OUDSTheme/OUDSTheme+ComponentTokens/OUDSTheme+ButtonsComponentTokens.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import OUDSTokensSemantic
2222
/// **Warning: These are random and dumb values**
2323
extension OUDSTheme: ButtonsComponentTokens {
2424

25-
@objc open var buttonInternalSpacing: SpacingPaddingInlineSemanticToken { spacePaddingInlineShort }
25+
@objc open var buttonInternalSpacing: SpacePaddingInlineSemanticToken { spacePaddingInlineShort }
2626

2727
@objc open var buttonBorderStyle: BorderStyleSemanticToken { borderStyleDefault }
2828
@objc open var buttonBorderColor: ColorSemanticToken { colorBorderDefault }
@@ -32,8 +32,8 @@ extension OUDSTheme: ButtonsComponentTokens {
3232
@objc open var buttonForegroundColor: ColorSemanticToken { colorContentBrandPrimary }
3333
@objc open var buttonBackgroundColor: ColorSemanticToken { colorBackgroundBrandPrimary }
3434

35-
@objc open var buttonWidth: SizingSemanticToken { DimensionRawTokens.dimension3000 }
36-
@objc open var buttonHeight: SizingSemanticToken { DimensionRawTokens.dimension1000 }
35+
@objc open var buttonWidth: SizeSemanticToken { DimensionRawTokens.dimension3000 }
36+
@objc open var buttonHeight: SizeSemanticToken { DimensionRawTokens.dimension1000 }
3737

3838
@objc open var buttonTypography: MultipleTypographyTokens { typeDisplayMedium }
3939
}

‎OUDS/Core/OUDS/Sources/OUDSTheme/OUDSTheme+SemanticTokens/OUDSTheme+SizingSemanticTokens.swift

+54-58
Original file line numberDiff line numberDiff line change
@@ -18,84 +18,80 @@ import OUDSTokensSemantic
1818
// ଘ( ･ω･)_/ﾟ･:*:･｡☆
1919
// [File to generate with the tokenator]
2020

21-
// swiftlint:disable line_length
22-
23-
/// Defines basic values common to all themes for `SizingSemanticTokens`.
21+
/// Defines basic values common to all themes for `SizeSemanticTokens`.
2422
/// These values can be overriden inside `OUDSTheme` subclasses (in extensions or not, in the same module or not) thanks to the `@objc open` combination.
25-
extension OUDSTheme: SizingSemanticTokens {
23+
extension OUDSTheme: SizeSemanticTokens {
2624

2725
// MARK: - Semantic token - Sizing - Icon with typography
2826

29-
@objc open var sizeIconWithHeadingXLargeShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension650) }
30-
@objc open var sizeIconWithHeadingXLargeMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension600, regular: DimensionRawTokens.dimension700) }
31-
@objc open var sizeIconWithHeadingXLargeTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension650, regular: DimensionRawTokens.dimension800) }
27+
@objc open var sizeIconWithHeadingXLargeShort: MultipleSizeTokens { MultipleSizeTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension650) }
28+
@objc open var sizeIconWithHeadingXLargeMedium: MultipleSizeTokens { MultipleSizeTokens(compact: DimensionRawTokens.dimension600, regular: DimensionRawTokens.dimension700) }
29+
@objc open var sizeIconWithHeadingXLargeTall: MultipleSizeTokens { MultipleSizeTokens(compact: DimensionRawTokens.dimension650, regular: DimensionRawTokens.dimension800) }
3230

33-
@objc open var sizeIconWithHeadingLargeShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension500, regular: DimensionRawTokens.dimension550) }
34-
@objc open var sizeIconWithHeadingLargeMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension600) }
35-
@objc open var sizeIconWithHeadingLargeTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension600, regular: DimensionRawTokens.dimension650) }
31+
@objc open var sizeIconWithHeadingLargeShort: MultipleSizeTokens { MultipleSizeTokens(compact: DimensionRawTokens.dimension500, regular: DimensionRawTokens.dimension550) }
32+
@objc open var sizeIconWithHeadingLargeMedium: MultipleSizeTokens { MultipleSizeTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension600) }
33+
@objc open var sizeIconWithHeadingLargeTall: MultipleSizeTokens { MultipleSizeTokens(compact: DimensionRawTokens.dimension600, regular: DimensionRawTokens.dimension650) }
3634

37-
@objc open var sizeIconWithHeadingMediumShort: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension400, regular: DimensionRawTokens.dimension500) }
38-
@objc open var sizeIconWithHeadingMediumMedium: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension500, regular: DimensionRawTokens.dimension550) }
39-
@objc open var sizeIconWithHeadingMediumTall: MultipleSizingTokens { MultipleSizingTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension600) }
35+
@objc open var sizeIconWithHeadingMediumShort: MultipleSizeTokens { MultipleSizeTokens(compact: DimensionRawTokens.dimension400, regular: DimensionRawTokens.dimension500) }
36+
@objc open var sizeIconWithHeadingMediumMedium: MultipleSizeTokens { MultipleSizeTokens(compact: DimensionRawTokens.dimension500, regular: DimensionRawTokens.dimension550) }
37+
@objc open var sizeIconWithHeadingMediumTall: MultipleSizeTokens { MultipleSizeTokens(compact: DimensionRawTokens.dimension550, regular: DimensionRawTokens.dimension600) }
4038

41-
@objc open var sizeIconWithHeadingSmallShort: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension400) }
42-
@objc open var sizeIconWithHeadingSmallMedium: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension500) }
43-
@objc open var sizeIconWithHeadingSmallTall: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension550) }
39+
@objc open var sizeIconWithHeadingSmallShort: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension400) }
40+
@objc open var sizeIconWithHeadingSmallMedium: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension500) }
41+
@objc open var sizeIconWithHeadingSmallTall: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension550) }
4442

45-
@objc open var sizeIconWithBodyLargeShort: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension250) }
46-
@objc open var sizeIconWithBodyLargeMedium: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension300) }
47-
@objc open var sizeIconWithBodyLargeTall: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension350) }
43+
@objc open var sizeIconWithBodyLargeShort: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension250) }
44+
@objc open var sizeIconWithBodyLargeMedium: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension300) }
45+
@objc open var sizeIconWithBodyLargeTall: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension350) }
4846

49-
@objc open var sizeIconWithBodyMediumShort: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension200) }
50-
@objc open var sizeIconWithBodyMediumMedium: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension250) }
51-
@objc open var sizeIconWithBodyMediumTall: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension300) }
47+
@objc open var sizeIconWithBodyMediumShort: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension200) }
48+
@objc open var sizeIconWithBodyMediumMedium: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension250) }
49+
@objc open var sizeIconWithBodyMediumTall: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension300) }
5250

53-
@objc open var sizeIconWithBodySmallShort: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension150) }
54-
@objc open var sizeIconWithBodySmallMedium: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension200) }
55-
@objc open var sizeIconWithBodySmallTall: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension250) }
51+
@objc open var sizeIconWithBodySmallShort: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension150) }
52+
@objc open var sizeIconWithBodySmallMedium: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension200) }
53+
@objc open var sizeIconWithBodySmallTall: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension250) }
5654

57-
@objc open var sizeIconWithLabelXLargeSizeShort: SizingSemanticToken { dimensionXS }
58-
@objc open var sizeIconWithLabelXLargeSizeMedium: SizingSemanticToken { dimensionMD }
59-
@objc open var sizeIconWithLabelXLargeSizeTall: SizingSemanticToken { dimensionLG }
55+
@objc open var sizeIconWithLabelXLargeSizeShort: SizeSemanticToken { dimensionXS }
56+
@objc open var sizeIconWithLabelXLargeSizeMedium: SizeSemanticToken { dimensionMD }
57+
@objc open var sizeIconWithLabelXLargeSizeTall: SizeSemanticToken { dimensionLG }
6058

61-
@objc open var sizeIconWithLabelLargeSizeShorter: SizingSemanticToken { dimension4XS }
62-
@objc open var sizeIconWithLabelLargeSizeShort: SizingSemanticToken { dimension3XS }
63-
@objc open var sizeIconWithLabelLargeSizeMedium: SizingSemanticToken { dimension2XS }
64-
@objc open var sizeIconWithLabelLargeSizeTall: SizingSemanticToken { dimensionXS }
65-
@objc open var sizeIconWithLabelLargeSizeTaller: SizingSemanticToken { dimensionLG }
59+
@objc open var sizeIconWithLabelLargeSizeShorter: SizeSemanticToken { dimension4XS }
60+
@objc open var sizeIconWithLabelLargeSizeShort: SizeSemanticToken { dimension3XS }
61+
@objc open var sizeIconWithLabelLargeSizeMedium: SizeSemanticToken { dimension2XS }
62+
@objc open var sizeIconWithLabelLargeSizeTall: SizeSemanticToken { dimensionXS }
63+
@objc open var sizeIconWithLabelLargeSizeTaller: SizeSemanticToken { dimensionLG }
6664

67-
@objc open var sizeIconWithLabelMediumSizeShort: SizingSemanticToken { dimension5XS }
68-
@objc open var sizeIconWithLabelMediumSizeMedium: SizingSemanticToken { dimension4XS }
69-
@objc open var sizeIconWithLabelMediumSizeTall: SizingSemanticToken { dimension3XS }
65+
@objc open var sizeIconWithLabelMediumSizeShort: SizeSemanticToken { dimension5XS }
66+
@objc open var sizeIconWithLabelMediumSizeMedium: SizeSemanticToken { dimension4XS }
67+
@objc open var sizeIconWithLabelMediumSizeTall: SizeSemanticToken { dimension3XS }
7068

71-
@objc open var sizeIconWithLabelSmallSizeShort: SizingSemanticToken { dimension6XS }
72-
@objc open var sizeIconWithLabelSmallSizeMedium: SizingSemanticToken { dimension5XS }
73-
@objc open var sizeIconWithLabelSmallSizeTall: SizingSemanticToken { dimension4XS }
69+
@objc open var sizeIconWithLabelSmallSizeShort: SizeSemanticToken { dimension6XS }
70+
@objc open var sizeIconWithLabelSmallSizeMedium: SizeSemanticToken { dimension5XS }
71+
@objc open var sizeIconWithLabelSmallSizeTall: SizeSemanticToken { dimension4XS }
7472

7573
// MARK: - Semantic token - Sizing - Icon decorative
7674

77-
@objc open var sizeIconDecorativeShortest: SizingSemanticToken { DimensionRawTokens.dimension200 }
78-
@objc open var sizeIconDecorativeShorter: SizingSemanticToken { DimensionRawTokens.dimension300 }
79-
@objc open var sizeIconDecorativeShort: SizingSemanticToken { DimensionRawTokens.dimension400 }
80-
@objc open var sizeIconDecorativeMedium: SizingSemanticToken { DimensionRawTokens.dimension500 }
81-
@objc open var sizeIconDecorativeTall: SizingSemanticToken { DimensionRawTokens.dimension600 }
82-
@objc open var sizeIconDecorativeTaller: SizingSemanticToken { DimensionRawTokens.dimension700 }
83-
@objc open var sizeIconDecorativeTallest: SizingSemanticToken { DimensionRawTokens.dimension900 }
75+
@objc open var sizeIconDecorativeShortest: SizeSemanticToken { DimensionRawTokens.dimension200 }
76+
@objc open var sizeIconDecorativeShorter: SizeSemanticToken { DimensionRawTokens.dimension300 }
77+
@objc open var sizeIconDecorativeShort: SizeSemanticToken { DimensionRawTokens.dimension400 }
78+
@objc open var sizeIconDecorativeMedium: SizeSemanticToken { DimensionRawTokens.dimension500 }
79+
@objc open var sizeIconDecorativeTall: SizeSemanticToken { DimensionRawTokens.dimension600 }
80+
@objc open var sizeIconDecorativeTaller: SizeSemanticToken { DimensionRawTokens.dimension700 }
81+
@objc open var sizeIconDecorativeTallest: SizeSemanticToken { DimensionRawTokens.dimension900 }
8482

8583
// MARK: - Semantic token - Sizing - Max width typography
8684

87-
@objc open var sizeMaxWidthTypeDisplaySmall: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension9000) }
88-
@objc open var sizeMaxWidthTypeDisplayMedium: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension9000) }
89-
@objc open var sizeMaxWidthTypeDisplayLarge: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension9000) }
85+
@objc open var sizeMaxWidthTypeDisplaySmall: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension9000) }
86+
@objc open var sizeMaxWidthTypeDisplayMedium: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension9000) }
87+
@objc open var sizeMaxWidthTypeDisplayLarge: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension9000) }
9088

91-
@objc open var sizeMaxWidthTypeHeadingXLarge: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension9000) }
92-
@objc open var sizeMaxWidthTypeHeadingLarge: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension9000) }
93-
@objc open var sizeMaxWidthTypeHeadingMedium: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension9000) }
94-
@objc open var sizeMaxWidthTypeHeadingSmall: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension6000) }
89+
@objc open var sizeMaxWidthTypeHeadingXLarge: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension9000) }
90+
@objc open var sizeMaxWidthTypeHeadingLarge: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension9000) }
91+
@objc open var sizeMaxWidthTypeHeadingMedium: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension9000) }
92+
@objc open var sizeMaxWidthTypeHeadingSmall: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension6000) }
9593

96-
@objc open var sizeMaxWidthTypeBodySmall: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension6000) }
97-
@objc open var sizeMaxWidthTypeBodyMedium: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension6000) }
98-
@objc open var sizeMaxWidthTypeBodyLarge: MultipleSizingTokens { MultipleSizingTokens(DimensionRawTokens.dimension6000) }
94+
@objc open var sizeMaxWidthTypeBodySmall: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension6000) }
95+
@objc open var sizeMaxWidthTypeBodyMedium: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension6000) }
96+
@objc open var sizeMaxWidthTypeBodyLarge: MultipleSizeTokens { MultipleSizeTokens(DimensionRawTokens.dimension6000) }
9997
}
100-
101-
// swiftlint:enable line_length

0 commit comments

Comments
 (0)