Skip to content

Commit 8707970

Browse files
Tayebsed93pylapp
Tayebsed93
and
pylapp
authored
refactor: remove web-specific grid raw tokens and non-max-min-width grid semantic tokens (#139) (#147)
Remove grid tokens, both raw and semantic versions, not used for iOS Reviewed-by: Pierre-Yves Lapersonne <[email protected]> Co-authored-by: Tayeb Sedraia <[email protected]> Co-authored-by: Pierre-Yves Lapersonne <[email protected]> Signed-off-by: Pierre-Yves Lapersonne <[email protected]>
1 parent fa7b851 commit 8707970

File tree

7 files changed

+1
-167
lines changed

7 files changed

+1
-167
lines changed

‎CHANGELOG.md

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

2020
### Changed
2121

22+
- [Library] Remove web-specific grid tokens, keep compact/regular widths ([#147](https://github.com/Orange-OpenSource/ouds-ios/pull/147))
2223
- [Library] Rename of typography font weight raw tokens
2324
- [Library] Rename dimension semantic tokens to apply T-Shirt size rules ([#130](https://github.com/Orange-OpenSource/ouds-ios/issues/130))
2425
- [Library] Rename `SizingCompositeSemanticToken` to `MultipleSizingSemanticToken` to keep "composite" word for *Figma* design system

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

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

2525
// MARK: Semantic token - Grid - iOS Extra compact
2626

27-
@objc open var gridExtraCompactWidth: GridExtraCompactSemanticToken { GridRawTokens.gridWidth100 }
2827
@objc open var gridExtraCompactMinWidth: GridExtraCompactSemanticToken { GridRawTokens.gridMinWidthExtraCompact }
2928
@objc open var gridExtraCompactMaxWidth: GridExtraCompactSemanticToken { GridRawTokens.gridMaxWidthExtraCompact }
3029
@objc open var gridExtraCompactMargin: GridExtraCompactSemanticToken { GridRawTokens.gridMargin100 }
@@ -33,7 +32,6 @@ extension OUDSTheme: GridSemanticTokens {
3332

3433
// MARK: Semantic token - Grid - iOS Compact
3534

36-
@objc open var gridCompactWidth: GridExtraCompactSemanticToken { GridRawTokens.gridWidth200 }
3735
@objc open var gridCompactMinWidth: GridCompactSemanticToken { GridRawTokens.gridMinWidthCompact }
3836
@objc open var gridCompactMaxWidth: GridCompactSemanticToken { GridRawTokens.gridMaxWidthCompact }
3937
@objc open var gridCompactMargin: GridCompactSemanticToken { GridRawTokens.gridMargin300 }
@@ -42,7 +40,6 @@ extension OUDSTheme: GridSemanticTokens {
4240

4341
// MARK: Semantic token - Grid - iOS Regular
4442

45-
@objc open var gridRegularWidth: GridExtraCompactSemanticToken { GridRawTokens.gridWidth400 }
4643
@objc open var gridRegularMinWidth: GridRegularSemanticToken { GridRawTokens.gridMinWidthRegular }
4744
@objc open var gridRegularMaxWidth: GridRegularSemanticToken { GridRawTokens.gridMaxWidthRegular }
4845
@objc open var gridRegularMargin: GridRegularSemanticToken { GridRawTokens.gridMargin500 }

‎OUDS/Core/OUDS/Tests/OUDSTheme/MockTheme/MockTheme+GridSemanticTokens.swift

-3
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,18 @@ extension MockTheme {
1919

2020
static let mockThemeGridRawToken: GridRawToken = 3630
2121

22-
override var gridExtraCompactWidth: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
2322
override var gridExtraCompactMinWidth: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
2423
override var gridExtraCompactMaxWidth: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
2524
override var gridExtraCompactMargin: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
2625
override var gridExtraCompactColumnGap: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
2726
override var gridExtraCompactColumnCount: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
2827

29-
override var gridCompactWidth: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
3028
override var gridCompactMinWidth: GridCompactSemanticToken { Self.mockThemeGridRawToken }
3129
override var gridCompactMaxWidth: GridCompactSemanticToken { Self.mockThemeGridRawToken }
3230
override var gridCompactMargin: GridCompactSemanticToken { Self.mockThemeGridRawToken }
3331
override var gridCompactColumnGap: GridCompactSemanticToken { Self.mockThemeGridRawToken }
3432
override var gridCompactColumnCount: GridCompactSemanticToken { Self.mockThemeGridRawToken }
3533

36-
override var gridRegularWidth: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
3734
override var gridRegularMinWidth: GridRegularSemanticToken { Self.mockThemeGridRawToken }
3835
override var gridRegularMaxWidth: GridRegularSemanticToken { Self.mockThemeGridRawToken }
3936
override var gridRegularMargin: GridRegularSemanticToken { Self.mockThemeGridRawToken }

‎OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfGridSemanticTokens.swift

-15
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ final class TestThemeOverrideOfGridSemanticTokens: XCTestCase {
2828
inheritedTheme = MockTheme()
2929
}
3030

31-
func testInheritedThemeCanOverrideSemanticTokenGridIOSExtraCompactDesignWidth() throws {
32-
XCTAssertNotEqual(inheritedTheme.gridExtraCompactWidth, abstractTheme.gridExtraCompactWidth)
33-
XCTAssertTrue(inheritedTheme.gridExtraCompactWidth == MockTheme.mockThemeGridRawToken)
34-
}
35-
3631
func testInheritedThemeCanOverrideSemanticTokenGridIOSExtraCompactMinWidth() throws {
3732
XCTAssertNotEqual(inheritedTheme.gridExtraCompactMinWidth, abstractTheme.gridExtraCompactMinWidth)
3833
XCTAssertTrue(inheritedTheme.gridExtraCompactMinWidth == MockTheme.mockThemeGridRawToken)
@@ -58,11 +53,6 @@ final class TestThemeOverrideOfGridSemanticTokens: XCTestCase {
5853
XCTAssertTrue(inheritedTheme.gridExtraCompactColumnCount == MockTheme.mockThemeGridRawToken)
5954
}
6055

61-
func testInheritedThemeCanOverrideSemanticTokenGridIOSCompactDesignWidth() throws {
62-
XCTAssertNotEqual(inheritedTheme.gridCompactWidth, abstractTheme.gridCompactWidth)
63-
XCTAssertTrue(inheritedTheme.gridCompactWidth == MockTheme.mockThemeGridRawToken)
64-
}
65-
6656
func testInheritedThemeCanOverrideSemanticTokenGridIOSCompactMinWidth() throws {
6757
XCTAssertNotEqual(inheritedTheme.gridCompactMinWidth, abstractTheme.gridCompactMinWidth)
6858
XCTAssertTrue(inheritedTheme.gridCompactMinWidth == MockTheme.mockThemeGridRawToken)
@@ -88,11 +78,6 @@ final class TestThemeOverrideOfGridSemanticTokens: XCTestCase {
8878
XCTAssertTrue(inheritedTheme.gridCompactColumnCount == MockTheme.mockThemeGridRawToken)
8979
}
9080

91-
func testInheritedThemeCanOverrideSemanticTokenGridIOSRegularDesignWidth() throws {
92-
XCTAssertNotEqual(inheritedTheme.gridRegularWidth, abstractTheme.gridRegularWidth)
93-
XCTAssertTrue(inheritedTheme.gridRegularWidth == MockTheme.mockThemeGridRawToken)
94-
}
95-
9681
func testInheritedThemeCanOverrideSemanticTokenGridIOSRegularMinWidth() throws {
9782
XCTAssertNotEqual(inheritedTheme.gridRegularMinWidth, abstractTheme.gridRegularMinWidth)
9883
XCTAssertTrue(inheritedTheme.gridRegularMinWidth == MockTheme.mockThemeGridRawToken)

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

-29
Original file line numberDiff line numberDiff line change
@@ -20,42 +20,14 @@ extension GridRawTokens {
2020
/// Double type because used below for computations with Double values, output of the parser
2121
public static let dimensionBase: Double = 4
2222

23-
// MARK: Primitive token - Grid - Design width
24-
25-
public static let gridWidth100: GridRawToken = 320
26-
public static let gridWidth200: GridRawToken = 390
27-
public static let gridWidth300: GridRawToken = 480
28-
public static let gridWidth400: GridRawToken = 768
29-
public static let gridWidth500: GridRawToken = 1024
30-
public static let gridWidth600: GridRawToken = 1440
31-
public static let gridWidth700: GridRawToken = 1680
32-
public static let gridWidth800: GridRawToken = 1920
33-
3423
// MARK: Primitive token - Grid - Min width
3524

36-
public static let gridMinWidth100: GridRawToken = 1
37-
public static let gridMinWidth200: GridRawToken = 390
38-
public static let gridMinWidth300: GridRawToken = 480
39-
public static let gridMinWidth400: GridRawToken = 736
40-
public static let gridMinWidth500: GridRawToken = 1024
41-
public static let gridMinWidth600: GridRawToken = 1320
42-
public static let gridMinWidth700: GridRawToken = 1640
43-
public static let gridMinWidth800: GridRawToken = 1880
4425
public static let gridMinWidthExtraCompact: GridRawToken = 320
4526
public static let gridMinWidthCompact: GridRawToken = 390
4627
public static let gridMinWidthRegular: GridRawToken = 736
4728

4829
// MARK: Primitive token - Grid - Max width
4930

50-
public static let gridMaxWidth100: GridRawToken = 389
51-
public static let gridMaxWidth200: GridRawToken = 479
52-
public static let gridMaxWidth300: GridRawToken = 735
53-
public static let gridMaxWidth400: GridRawToken = 1023
54-
public static let gridMaxWidth500: GridRawToken = 1339
55-
public static let gridMaxWidth600: GridRawToken = 1639
56-
public static let gridMaxWidth650: GridRawToken = 1680
57-
public static let gridMaxWidth700: GridRawToken = 1879
58-
public static let gridMaxWidth800: GridRawToken = 1920
5931
public static let gridMaxWidthExtraCompact: GridRawToken = 389
6032
public static let gridMaxWidthCompact: GridRawToken = 852
6133
public static let gridMaxWidthRegular: GridRawToken = 1336
@@ -110,7 +82,6 @@ extension GridRawTokens {
11082

11183
// MARK: Primitive token - Grid - Composite - iOS Regular
11284

113-
public static let gridRegularWidth: GridRawToken = gridWidth400
11485
public static let gridRegularMinWidth: GridRawToken = gridMinWidthCompact
11586
public static let gridRegularMaxWidth: GridRawToken = gridMaxWidthCompact
11687
public static let gridRegularMargin: GridRawToken = gridMargin500

‎OUDS/Core/Tokens/RawTokens/Tests/GridRawTokensTests.swift

-114
Original file line numberDiff line numberDiff line change
@@ -23,88 +23,6 @@ final class GridRawTokensTests: XCTestCase {
2323

2424
// MARK: - Primitive token - Grid - Design Width
2525

26-
func testGridRawTokenGridDesignWidth100LessThanGridDesignWidth200() throws {
27-
XCTAssertLessThan(GridRawTokens.gridWidth100, GridRawTokens.gridWidth200)
28-
}
29-
30-
func testGridRawTokenGridDesignWidth100LessThanGridDesignWidth300() throws {
31-
XCTAssertLessThan(GridRawTokens.gridWidth100, GridRawTokens.gridWidth300)
32-
}
33-
34-
func testGridRawTokenGridDesignWidth100LessThanGridDesignWidth400() throws {
35-
XCTAssertLessThan(GridRawTokens.gridWidth100, GridRawTokens.gridWidth400)
36-
}
37-
38-
func testGridRawTokenGridDesignWidth100LessThanGridDesignWidth500() throws {
39-
XCTAssertLessThan(GridRawTokens.gridWidth100, GridRawTokens.gridWidth500)
40-
}
41-
42-
func testGridRawTokenGridDesignWidth100LessThanGridDesignWidth600() throws {
43-
XCTAssertLessThan(GridRawTokens.gridWidth100, GridRawTokens.gridWidth600)
44-
}
45-
46-
func testGridRawTokenGridDesignWidth100LessThanGridDesignWidth700() throws {
47-
XCTAssertLessThan(GridRawTokens.gridWidth100, GridRawTokens.gridWidth700)
48-
}
49-
50-
func testGridRawTokenGridDesignWidth100LessThanGridDesignWidth800() throws {
51-
XCTAssertLessThan(GridRawTokens.gridWidth100, GridRawTokens.gridWidth800)
52-
}
53-
54-
func testGridRawTokenGridDesignWidth200LessThanGridDesignWidth300() throws {
55-
XCTAssertLessThan(GridRawTokens.gridWidth200, GridRawTokens.gridWidth300)
56-
}
57-
58-
func testGridRawTokenGridDesignWidth200LessThanGridDesignWidth400() throws {
59-
XCTAssertLessThan(GridRawTokens.gridWidth200, GridRawTokens.gridWidth400)
60-
}
61-
62-
func testGridRawTokenGridDesignWidth200LessThanGridDesignWidth500() throws {
63-
XCTAssertLessThan(GridRawTokens.gridWidth200, GridRawTokens.gridWidth500)
64-
}
65-
66-
func testGridRawTokenGridDesignWidth200LessThanGridDesignWidth600() throws {
67-
XCTAssertLessThan(GridRawTokens.gridWidth200, GridRawTokens.gridWidth600)
68-
}
69-
70-
func testGridRawTokenGridDesignWidth200LessThanGridDesignWidth700() throws {
71-
XCTAssertLessThan(GridRawTokens.gridWidth200, GridRawTokens.gridWidth700)
72-
}
73-
74-
func testGridRawTokenGridDesignWidth200LessThanGridDesignWidth800() throws {
75-
XCTAssertLessThan(GridRawTokens.gridWidth200, GridRawTokens.gridWidth800)
76-
}
77-
78-
// MARK: - Primitive token - Grid - Min width
79-
80-
func testGridRawTokenGridMinWidth100LessThanGridMinWidth200() throws {
81-
XCTAssertLessThan(GridRawTokens.gridMinWidth100, GridRawTokens.gridMinWidth200)
82-
}
83-
84-
func testGridRawTokenGridMinWidth200LessThanGridMinWidth300() throws {
85-
XCTAssertLessThan(GridRawTokens.gridMinWidth200, GridRawTokens.gridMinWidth300)
86-
}
87-
88-
func testGridRawTokenGridMinWidth300LessThanGridMinWidth400() throws {
89-
XCTAssertLessThan(GridRawTokens.gridMinWidth300, GridRawTokens.gridMinWidth400)
90-
}
91-
92-
func testGridRawTokenGridMinWidth400LessThanGridMinWidth500() throws {
93-
XCTAssertLessThan(GridRawTokens.gridMinWidth400, GridRawTokens.gridMinWidth500)
94-
}
95-
96-
func testGridRawTokenGridMinWidth500LessThanGridMinWidth600() throws {
97-
XCTAssertLessThan(GridRawTokens.gridMinWidth500, GridRawTokens.gridMinWidth600)
98-
}
99-
100-
func testGridRawTokenGridMinWidth600LessThanGridMinWidth700() throws {
101-
XCTAssertLessThan(GridRawTokens.gridMinWidth600, GridRawTokens.gridMinWidth700)
102-
}
103-
104-
func testGridRawTokenGridMinWidth700LessThanGridMinWidth800() throws {
105-
XCTAssertLessThan(GridRawTokens.gridMinWidth700, GridRawTokens.gridMinWidth800)
106-
}
107-
10826
func testGridRawTokenGridMinWidthExtraCompactLessThanGridMinWidthCompact() throws {
10927
XCTAssertLessThan(GridRawTokens.gridMinWidthExtraCompact, GridRawTokens.gridMinWidthCompact)
11028
}
@@ -119,38 +37,6 @@ final class GridRawTokensTests: XCTestCase {
11937

12038
// MARK: - Primitive token - Grid - Max width
12139

122-
func testGridRawTokenGridMaxWidth100LessThanGridMaxWidth200() throws {
123-
XCTAssertLessThan(GridRawTokens.gridMaxWidth100, GridRawTokens.gridMaxWidth200)
124-
}
125-
126-
func testGridRawTokenGridMaxWidth200LessThanGridMaxWidth300() throws {
127-
XCTAssertLessThan(GridRawTokens.gridMaxWidth200, GridRawTokens.gridMaxWidth300)
128-
}
129-
130-
func testGridRawTokenGridMaxWidth300LessThanGridMaxWidth400() throws {
131-
XCTAssertLessThan(GridRawTokens.gridMaxWidth300, GridRawTokens.gridMaxWidth400)
132-
}
133-
134-
func testGridRawTokenGridMaxWidth400LessThanGridMaxWidth500() throws {
135-
XCTAssertLessThan(GridRawTokens.gridMaxWidth400, GridRawTokens.gridMaxWidth500)
136-
}
137-
138-
func testGridRawTokenGridMaxWidth500LessThanGridMaxWidth600() throws {
139-
XCTAssertLessThan(GridRawTokens.gridMaxWidth500, GridRawTokens.gridMaxWidth600)
140-
}
141-
142-
func testGridRawTokenGridMaxWidth600LessThanGridMaxWidth650() throws {
143-
XCTAssertLessThan(GridRawTokens.gridMaxWidth600, GridRawTokens.gridMaxWidth650)
144-
}
145-
146-
func testGridRawTokenGridMaxWidth650LessThanGridMaxWidth700() throws {
147-
XCTAssertLessThan(GridRawTokens.gridMaxWidth650, GridRawTokens.gridMaxWidth700)
148-
}
149-
150-
func testGridRawTokenGridMaxWidth700LessThanGridMaxWidth800() throws {
151-
XCTAssertLessThan(GridRawTokens.gridMaxWidth700, GridRawTokens.gridMaxWidth800)
152-
}
153-
15440
func testGridRawTokenGridMaxWidthExtraCompactLessThanGridMaxWidthCompact() throws {
15541
XCTAssertLessThan(GridRawTokens.gridMaxWidthExtraCompact, GridRawTokens.gridMaxWidthCompact)
15642
}

‎OUDS/Core/Tokens/SemanticTokens/Sources/Values/GridSemanticTokens.swift

-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public protocol GridSemanticTokens {
2222

2323
// MARK: Semantic token - Grid - iOS Extra compact
2424

25-
var gridExtraCompactWidth: GridExtraCompactSemanticToken { get }
2625
var gridExtraCompactMinWidth: GridExtraCompactSemanticToken { get }
2726
var gridExtraCompactMaxWidth: GridExtraCompactSemanticToken { get }
2827
var gridExtraCompactMargin: GridExtraCompactSemanticToken { get }
@@ -31,7 +30,6 @@ public protocol GridSemanticTokens {
3130

3231
// MARK: Semantic token - Grid - iOS Compact
3332

34-
var gridCompactWidth: GridCompactSemanticToken { get }
3533
var gridCompactMinWidth: GridCompactSemanticToken { get }
3634
var gridCompactMaxWidth: GridCompactSemanticToken { get }
3735
var gridCompactMargin: GridCompactSemanticToken { get }
@@ -40,7 +38,6 @@ public protocol GridSemanticTokens {
4038

4139
// MARK: Semantic token - Grid - iOS Regular
4240

43-
var gridRegularWidth: GridRegularSemanticToken { get }
4441
var gridRegularMinWidth: GridRegularSemanticToken { get }
4542
var gridRegularMaxWidth: GridRegularSemanticToken { get }
4643
var gridRegularMargin: GridRegularSemanticToken { get }

0 commit comments

Comments
 (0)