Skip to content

Commit 37891af

Browse files
pylapppylapp
authored
refactor: add factor base in raw tokens, code cleanup (#132) (#133)
Ddd back factor base in raw tokens to be aligned with parser output, code cleanup Signed-off-by: Pierre-Yves Lapersonne <[email protected]>
1 parent 7624a2c commit 37891af

File tree

15 files changed

+167
-175
lines changed

15 files changed

+167
-175
lines changed

‎CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2626
- [Library] Rename `SizingCompositeSemanticToken` to `MultipleSizingTokens` to keep "composite" word for *Figma* design system
2727
- [Library] Rename `ColorCompositeSemanticToken` to `MultipleColorTokens` to keep "composite" word for *Figma* design system
2828
- [Library] Elevation colors have been merged into "multiple" objects colors to have less variables and manage color schemes
29+
- [Library] Rename `ColorCompositeSemanticToken` to `MultipleColorSemanticToken` to keep "composite" word for *Figma* design system
30+
- [Library] Elevation colors have been merged into composite colors to have less variables and manage color schemes
31+
- [Library] Rename `SpacingCompositeSemanticToken` to `MultipleSpacingTokens` to keep "composite" word for *Figma* design system
32+
- [Library] Rename `SizingCompositeSemanticToken` to `MultipleSizingTokens` to keep "composite" word for *Figma* design system
33+
- [Library] Rename `ColorCompositeSemanticToken` to `MultipleColorTokens` to keep "composite" word for *Figma* design system
34+
- [Library] Elevation colors have been merged into "multiple" objects colors to have less variables and manage color schemes
2935
- [Library] Update color semantic tokens to better manage light and dark modes values
3036
- [Library] Update elevation colors focus light and dark
3137
- [Library] Rename space padding inline component tokens by removing "component" word
@@ -38,7 +44,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3844

3945
### Removed
4046

41-
- [Library] Remove some base multiplier factor from raw tokens
4247
- [Library] Remove raw tokens `elevationZIndex` ([#119](https://github.com/Orange-OpenSource/ouds-ios/issues/119))
4348

4449
### Fixed

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

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ extension OUDSTheme: FormsTextInputComponentTokens {
2424

2525
@objc open var ftiTitleFontWeight: TypographyFontWeightSemanticToken { fontWeightHeading }
2626
@objc open var ftiTitleFontSize: TypographyFontSizeSemanticToken { fontSizeLabelLarge }
27+
2728
@objc open var ftiTitleColor: ColorSemanticToken { MultipleColorTokens(light: ColorRawTokens.colorFunctionalLightGray80, dark: ColorRawTokens.colorFunctionalDarkGray640) }
2829

2930
@objc open var ftiSubtitleFontWeight: TypographyFontWeightSemanticToken { fontWeightDisplay }

‎OUDS/Core/Themes/Inverse/Tests/TestInverseThemeElevation.swift

+8
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ final class TestInverseThemeElevationColors: XCTestCase {
2626
}
2727

2828
func testElevationColorsEquality() throws {
29+
XCTAssertEqual(inverseTheme.elevationColorNone.light, inverseTheme.elevationColorNone.dark)
30+
XCTAssertEqual(inverseTheme.elevationColorRaised.light, inverseTheme.elevationColorRaised.dark)
31+
XCTAssertEqual(inverseTheme.elevationColorDrag.light, inverseTheme.elevationColorDrag.dark)
32+
XCTAssertEqual(inverseTheme.elevationColorOverlayDefault.light, inverseTheme.elevationColorOverlayDefault.dark)
33+
XCTAssertEqual(inverseTheme.elevationColorOverlayEmphasized.light, inverseTheme.elevationColorOverlayEmphasized.dark)
34+
XCTAssertEqual(inverseTheme.elevationColorStickyDefault.light, inverseTheme.elevationColorStickyDefault.dark)
35+
XCTAssertEqual(inverseTheme.elevationColorStickyEmphasized.light, inverseTheme.elevationColorStickyEmphasized.dark)
36+
XCTAssertEqual(inverseTheme.elevationColorStickyNavigationScrolled.light, inverseTheme.elevationColorStickyNavigationScrolled.dark)
2937
XCTAssertEqual(inverseTheme.elevationColorFocus.light, inverseTheme.elevationColorFocus.dark)
3038
}
3139

‎OUDS/Core/Tokens/RawTokens/Sources/Values/BorderRawTokens+Values.swift

+22-19
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,33 @@
1717
/// Extracted in this separated file to help the *Figma* JSON to Swift parser to generate files to include easily.
1818
extension BorderRawTokens {
1919

20+
/// Double type because used below for computations with Double values, output of the parser
21+
public static let borderBase: Double = 4
22+
2023
// MARK: Primitive token - Border - Width
2124

22-
public static let borderWidth0: BorderWidthRawToken = 4 * 0
23-
public static let borderWidth25: BorderWidthRawToken = 4 * 0.25
24-
public static let borderWidth50: BorderWidthRawToken = 4 * 0.5
25-
public static let borderWidth75: BorderWidthRawToken = 4 * 0.75
26-
public static let borderWidth100: BorderWidthRawToken = 4 * 1
27-
public static let borderWidth150: BorderWidthRawToken = 4 * 1.5
28-
public static let borderWidth200: BorderWidthRawToken = 4 * 2
25+
public static let borderWidth0: BorderWidthRawToken = borderBase * 0
26+
public static let borderWidth25: BorderWidthRawToken = borderBase * 0.25
27+
public static let borderWidth50: BorderWidthRawToken = borderBase * 0.5
28+
public static let borderWidth75: BorderWidthRawToken = borderBase * 0.75
29+
public static let borderWidth100: BorderWidthRawToken = borderBase * 1
30+
public static let borderWidth150: BorderWidthRawToken = borderBase * 1.5
31+
public static let borderWidth200: BorderWidthRawToken = borderBase * 2
2932

3033
// MARK: Primitive token - Border - Radius
3134

32-
public static let borderRadius0: BorderRadiusRawToken = 4 * 0
33-
public static let borderRadius25: BorderRadiusRawToken = 4 * 0.25
34-
public static let borderRadius50: BorderRadiusRawToken = 4 * 0.5
35-
public static let borderRadius75: BorderRadiusRawToken = 4 * 0.75
36-
public static let borderRadius100: BorderRadiusRawToken = 4 * 1
37-
public static let borderRadius150: BorderRadiusRawToken = 4 * 1.5
38-
public static let borderRadius200: BorderRadiusRawToken = 4 * 2
39-
public static let borderRadius300: BorderRadiusRawToken = 4 * 3
40-
public static let borderRadius400: BorderRadiusRawToken = 4 * 4
41-
public static let borderRadius500: BorderRadiusRawToken = 4 * 5
42-
public static let borderRadius600: BorderRadiusRawToken = 4 * 6
43-
public static let borderRadius800: BorderRadiusRawToken = 4 * 8
35+
public static let borderRadius0: BorderRadiusRawToken = borderBase * 0
36+
public static let borderRadius25: BorderRadiusRawToken = borderBase * 0.25
37+
public static let borderRadius50: BorderRadiusRawToken = borderBase * 0.5
38+
public static let borderRadius75: BorderRadiusRawToken = borderBase * 0.75
39+
public static let borderRadius100: BorderRadiusRawToken = borderBase * 1
40+
public static let borderRadius150: BorderRadiusRawToken = borderBase * 1.5
41+
public static let borderRadius200: BorderRadiusRawToken = borderBase * 2
42+
public static let borderRadius300: BorderRadiusRawToken = borderBase * 3
43+
public static let borderRadius400: BorderRadiusRawToken = borderBase * 4
44+
public static let borderRadius500: BorderRadiusRawToken = borderBase * 5
45+
public static let borderRadius600: BorderRadiusRawToken = borderBase * 6
46+
public static let borderRadius800: BorderRadiusRawToken = borderBase * 8
4447

4548
// MARK: Primitive token - Border - Style
4649

‎OUDS/Core/Tokens/RawTokens/Sources/Values/DimensionRawTokens+Values.swift

+36-33
Original file line numberDiff line numberDiff line change
@@ -17,39 +17,42 @@
1717
/// Extracted in a separated file to help the *Figma* JSON to Swift parser to generate files to include easily.
1818
extension DimensionRawTokens {
1919

20+
/// Double type because used below for computations with Double values, output of the parser
21+
public static let dimensionBase: Double = 4
22+
2023
// MARK: Primitive token - Dimension
2124

22-
public static let dimension0: DimensionRawToken = 4 * 0
23-
public static let dimension25: DimensionRawToken = 4 * 0.5
24-
public static let dimension50: DimensionRawToken = 4 * 1
25-
public static let dimension75: DimensionRawToken = 4 * 1.5
26-
public static let dimension100: DimensionRawToken = 4 * 2
27-
public static let dimension150: DimensionRawToken = 4 * 3
28-
public static let dimension200: DimensionRawToken = 4 * 4
29-
public static let dimension250: DimensionRawToken = 4 * 5
30-
public static let dimension300: DimensionRawToken = 4 * 6
31-
public static let dimension350: DimensionRawToken = 4 * 7
32-
public static let dimension400: DimensionRawToken = 4 * 8
33-
public static let dimension450: DimensionRawToken = 4 * 9
34-
public static let dimension500: DimensionRawToken = 4 * 10
35-
public static let dimension550: DimensionRawToken = 4 * 11
36-
public static let dimension600: DimensionRawToken = 4 * 12
37-
public static let dimension650: DimensionRawToken = 4 * 13
38-
public static let dimension700: DimensionRawToken = 4 * 14
39-
public static let dimension750: DimensionRawToken = 4 * 15
40-
public static let dimension800: DimensionRawToken = 4 * 16
41-
public static let dimension900: DimensionRawToken = 4 * 18
42-
public static let dimension1000: DimensionRawToken = 4 * 20
43-
public static let dimension1200: DimensionRawToken = 4 * 24
44-
public static let dimension1400: DimensionRawToken = 4 * 28
45-
public static let dimension1600: DimensionRawToken = 4 * 32
46-
public static let dimension1800: DimensionRawToken = 4 * 36
47-
public static let dimension2000: DimensionRawToken = 4 * 40
48-
public static let dimension3000: DimensionRawToken = 4 * 80
49-
public static let dimension4000: DimensionRawToken = 4 * 120
50-
public static let dimension5000: DimensionRawToken = 4 * 140
51-
public static let dimension6000: DimensionRawToken = 4 * 160
52-
public static let dimension7000: DimensionRawToken = 4 * 180
53-
public static let dimension9000: DimensionRawToken = 4 * 220
54-
public static let dimension11000: DimensionRawToken = 4 * 260
25+
public static let dimension0: DimensionRawToken = dimensionBase * 0
26+
public static let dimension25: DimensionRawToken = dimensionBase * 0.5
27+
public static let dimension50: DimensionRawToken = dimensionBase * 1
28+
public static let dimension75: DimensionRawToken = dimensionBase * 1.5
29+
public static let dimension100: DimensionRawToken = dimensionBase * 2
30+
public static let dimension150: DimensionRawToken = dimensionBase * 3
31+
public static let dimension200: DimensionRawToken = dimensionBase * 4
32+
public static let dimension250: DimensionRawToken = dimensionBase * 5
33+
public static let dimension300: DimensionRawToken = dimensionBase * 6
34+
public static let dimension350: DimensionRawToken = dimensionBase * 7
35+
public static let dimension400: DimensionRawToken = dimensionBase * 8
36+
public static let dimension450: DimensionRawToken = dimensionBase * 9
37+
public static let dimension500: DimensionRawToken = dimensionBase * 10
38+
public static let dimension550: DimensionRawToken = dimensionBase * 11
39+
public static let dimension600: DimensionRawToken = dimensionBase * 12
40+
public static let dimension650: DimensionRawToken = dimensionBase * 13
41+
public static let dimension700: DimensionRawToken = dimensionBase * 14
42+
public static let dimension750: DimensionRawToken = dimensionBase * 15
43+
public static let dimension800: DimensionRawToken = dimensionBase * 16
44+
public static let dimension900: DimensionRawToken = dimensionBase * 18
45+
public static let dimension1000: DimensionRawToken = dimensionBase * 20
46+
public static let dimension1200: DimensionRawToken = dimensionBase * 24
47+
public static let dimension1400: DimensionRawToken = dimensionBase * 28
48+
public static let dimension1600: DimensionRawToken = dimensionBase * 32
49+
public static let dimension1800: DimensionRawToken = dimensionBase * 36
50+
public static let dimension2000: DimensionRawToken = dimensionBase * 40
51+
public static let dimension3000: DimensionRawToken = dimensionBase * 80
52+
public static let dimension4000: DimensionRawToken = dimensionBase * 120
53+
public static let dimension5000: DimensionRawToken = dimensionBase * 140
54+
public static let dimension6000: DimensionRawToken = dimensionBase * 160
55+
public static let dimension7000: DimensionRawToken = dimensionBase * 180
56+
public static let dimension9000: DimensionRawToken = dimensionBase * 220
57+
public static let dimension11000: DimensionRawToken = dimensionBase * 260
5558
}

‎OUDS/Core/Tokens/RawTokens/Sources/Values/GridRawTokens+Values.swift

+21-18
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
/// Extracted in a separated file to help the *Figma* JSON to Swift parser to generate files to include easily.
1818
extension GridRawTokens {
1919

20+
/// Double type because used below for computations with Double values, output of the parser
21+
public static let dimensionBase: Double = 4
22+
2023
// MARK: Primitive token - Grid - Design width
2124

2225
public static let gridWidth100: GridRawToken = 320
@@ -59,27 +62,27 @@ extension GridRawTokens {
5962

6063
// MARK: Primitive token - Grid - Margin
6164

62-
public static let gridMargin100: GridRawToken = 4 * 4
63-
public static let gridMargin300: GridRawToken = 4 * 6
64-
public static let gridMargin400: GridRawToken = 4 * 7
65-
public static let gridMargin500: GridRawToken = 4 * 8
66-
public static let gridMargin600: GridRawToken = 4 * 9
67-
public static let gridMargin700: GridRawToken = 4 * 10
68-
public static let gridMargin900: GridRawToken = 4 * 12
69-
public static let gridMargin1000: GridRawToken = 4 * 13
70-
public static let gridMargin1100: GridRawToken = 4 * 14
71-
public static let gridMargin1700: GridRawToken = 4 * 20
72-
public static let gridMargin2500: GridRawToken = 4 * 28
65+
public static let gridMargin100: GridRawToken = dimensionBase * 4
66+
public static let gridMargin300: GridRawToken = dimensionBase * 6
67+
public static let gridMargin400: GridRawToken = dimensionBase * 7
68+
public static let gridMargin500: GridRawToken = dimensionBase * 8
69+
public static let gridMargin600: GridRawToken = dimensionBase * 9
70+
public static let gridMargin700: GridRawToken = dimensionBase * 10
71+
public static let gridMargin900: GridRawToken = dimensionBase * 12
72+
public static let gridMargin1000: GridRawToken = dimensionBase * 13
73+
public static let gridMargin1100: GridRawToken = dimensionBase * 14
74+
public static let gridMargin1700: GridRawToken = dimensionBase * 20
75+
public static let gridMargin2500: GridRawToken = dimensionBase * 28
7376

7477
// MARK: Primitive token - Grid - Column gap
7578

76-
public static let gridColumnGap10: GridRawToken = 4 * 0.25
77-
public static let gridColumnGap100: GridRawToken = 4 * 2
78-
public static let gridColumnGap200: GridRawToken = 4 * 4
79-
public static let gridColumnGap300: GridRawToken = 4 * 5
80-
public static let gridColumnGap400: GridRawToken = 4 * 6
81-
public static let gridColumnGap600: GridRawToken = 4 * 8
82-
public static let gridColumnGap700: GridRawToken = 4 * 10
79+
public static let gridColumnGap10: GridRawToken = dimensionBase * 0.25
80+
public static let gridColumnGap100: GridRawToken = dimensionBase * 2
81+
public static let gridColumnGap200: GridRawToken = dimensionBase * 4
82+
public static let gridColumnGap300: GridRawToken = dimensionBase * 5
83+
public static let gridColumnGap400: GridRawToken = dimensionBase * 6
84+
public static let gridColumnGap600: GridRawToken = dimensionBase * 8
85+
public static let gridColumnGap700: GridRawToken = dimensionBase * 10
8386

8487
// MARK: Primitive token - Grid - Column count
8588

0 commit comments

Comments
 (0)