[#139] Remove web-specific grid raw tokens and non-max-min-width grid semantic tokens

CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - [Library] Rename of typography font weight raw tokens
+- [Library] Remove web-specific grid tokens, keep compact/regular widths ([#147](https://github.com/Orange-OpenSource/ouds-ios/pull/147))
 - [Library] Rename dimension semantic tokens to apply T-Shirt size rules ([#130](https://github.com/Orange-OpenSource/ouds-ios/issues/130))
 - [Library] Rename `SizingCompositeSemanticToken` to `MultipleSizingSemanticToken` to keep "composite" word for *Figma* design system
 - [Library] Rename `ColorCompositeSemanticToken` to `MultipleColorRawToken` to keep "composite" word for *Figma* design system

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

@@ -24,7 +24,6 @@ extension OUDSTheme: GridSemanticTokens {
 
     // MARK: Semantic token - Grid - iOS Extra compact
 
-    @objc open var gridExtraCompactWidth: GridExtraCompactSemanticToken { GridRawTokens.gridWidth100 }
     @objc open var gridExtraCompactMinWidth: GridExtraCompactSemanticToken { GridRawTokens.gridMinWidthExtraCompact }
     @objc open var gridExtraCompactMaxWidth: GridExtraCompactSemanticToken { GridRawTokens.gridMaxWidthExtraCompact }
     @objc open var gridExtraCompactMargin: GridExtraCompactSemanticToken { GridRawTokens.gridMargin100 }
@@ -33,7 +32,6 @@ extension OUDSTheme: GridSemanticTokens {
 
     // MARK: Semantic token - Grid - iOS Compact
 
-    @objc open var gridCompactWidth: GridExtraCompactSemanticToken { GridRawTokens.gridWidth200 }
     @objc open var gridCompactMinWidth: GridCompactSemanticToken { GridRawTokens.gridMinWidthCompact }
     @objc open var gridCompactMaxWidth: GridCompactSemanticToken { GridRawTokens.gridMaxWidthCompact }
     @objc open var gridCompactMargin: GridCompactSemanticToken { GridRawTokens.gridMargin300 }
@@ -42,7 +40,6 @@ extension OUDSTheme: GridSemanticTokens {
 
     // MARK: Semantic token - Grid - iOS Regular
 
-    @objc open var gridRegularWidth: GridExtraCompactSemanticToken { GridRawTokens.gridWidth400 }
     @objc open var gridRegularMinWidth: GridRegularSemanticToken { GridRawTokens.gridMinWidthRegular }
     @objc open var gridRegularMaxWidth: GridRegularSemanticToken { GridRawTokens.gridMaxWidthRegular }
     @objc open var gridRegularMargin: GridRegularSemanticToken { GridRawTokens.gridMargin500 }

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

@@ -19,21 +19,18 @@ extension MockTheme {
 
     static let mockThemeGridRawToken: GridRawToken = 3630
 
-    override var gridExtraCompactWidth: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
     override var gridExtraCompactMinWidth: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
     override var gridExtraCompactMaxWidth: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
     override var gridExtraCompactMargin: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
     override var gridExtraCompactColumnGap: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
     override var gridExtraCompactColumnCount: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
 
-    override var gridCompactWidth: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
     override var gridCompactMinWidth: GridCompactSemanticToken { Self.mockThemeGridRawToken }
     override var gridCompactMaxWidth: GridCompactSemanticToken { Self.mockThemeGridRawToken }
     override var gridCompactMargin: GridCompactSemanticToken { Self.mockThemeGridRawToken }
     override var gridCompactColumnGap: GridCompactSemanticToken { Self.mockThemeGridRawToken }
     override var gridCompactColumnCount: GridCompactSemanticToken { Self.mockThemeGridRawToken }
 
-    override var gridRegularWidth: GridExtraCompactSemanticToken { Self.mockThemeGridRawToken }
     override var gridRegularMinWidth: GridRegularSemanticToken { Self.mockThemeGridRawToken }
     override var gridRegularMaxWidth: GridRegularSemanticToken { Self.mockThemeGridRawToken }
     override var gridRegularMargin: GridRegularSemanticToken { Self.mockThemeGridRawToken }

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

@@ -28,11 +28,6 @@ final class TestThemeOverrideOfGridSemanticTokens: XCTestCase {
         inheritedTheme = MockTheme()
     }
 
-    func testInheritedThemeCanOverrideSemanticTokenGridIOSExtraCompactDesignWidth() throws {
-        XCTAssertNotEqual(inheritedTheme.gridExtraCompactWidth, abstractTheme.gridExtraCompactWidth)
-        XCTAssertTrue(inheritedTheme.gridExtraCompactWidth == MockTheme.mockThemeGridRawToken)
-    }
-
     func testInheritedThemeCanOverrideSemanticTokenGridIOSExtraCompactMinWidth() throws {
         XCTAssertNotEqual(inheritedTheme.gridExtraCompactMinWidth, abstractTheme.gridExtraCompactMinWidth)
         XCTAssertTrue(inheritedTheme.gridExtraCompactMinWidth == MockTheme.mockThemeGridRawToken)
@@ -58,11 +53,6 @@ final class TestThemeOverrideOfGridSemanticTokens: XCTestCase {
         XCTAssertTrue(inheritedTheme.gridExtraCompactColumnCount == MockTheme.mockThemeGridRawToken)
     }
 
-    func testInheritedThemeCanOverrideSemanticTokenGridIOSCompactDesignWidth() throws {
-        XCTAssertNotEqual(inheritedTheme.gridCompactWidth, abstractTheme.gridCompactWidth)
-        XCTAssertTrue(inheritedTheme.gridCompactWidth == MockTheme.mockThemeGridRawToken)
-    }
-
     func testInheritedThemeCanOverrideSemanticTokenGridIOSCompactMinWidth() throws {
         XCTAssertNotEqual(inheritedTheme.gridCompactMinWidth, abstractTheme.gridCompactMinWidth)
         XCTAssertTrue(inheritedTheme.gridCompactMinWidth == MockTheme.mockThemeGridRawToken)
@@ -88,11 +78,6 @@ final class TestThemeOverrideOfGridSemanticTokens: XCTestCase {
         XCTAssertTrue(inheritedTheme.gridCompactColumnCount == MockTheme.mockThemeGridRawToken)
     }
 
-    func testInheritedThemeCanOverrideSemanticTokenGridIOSRegularDesignWidth() throws {
-        XCTAssertNotEqual(inheritedTheme.gridRegularWidth, abstractTheme.gridRegularWidth)
-        XCTAssertTrue(inheritedTheme.gridRegularWidth == MockTheme.mockThemeGridRawToken)
-    }
-
     func testInheritedThemeCanOverrideSemanticTokenGridIOSRegularMinWidth() throws {
         XCTAssertNotEqual(inheritedTheme.gridRegularMinWidth, abstractTheme.gridRegularMinWidth)
         XCTAssertTrue(inheritedTheme.gridRegularMinWidth == MockTheme.mockThemeGridRawToken)

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

@@ -20,42 +20,14 @@ extension GridRawTokens {
     /// Double type because used below for computations with Double values, output of the parser
     public static let dimensionBase: Double = 4
 
-    // MARK: Primitive token - Grid - Design width
-
-    public static let gridWidth100: GridRawToken = 320
-    public static let gridWidth200: GridRawToken = 390
-    public static let gridWidth300: GridRawToken = 480
-    public static let gridWidth400: GridRawToken = 768
-    public static let gridWidth500: GridRawToken = 1024
-    public static let gridWidth600: GridRawToken = 1440
-    public static let gridWidth700: GridRawToken = 1680
-    public static let gridWidth800: GridRawToken = 1920
-
     // MARK: Primitive token - Grid - Min width
 
-    public static let gridMinWidth100: GridRawToken = 1
-    public static let gridMinWidth200: GridRawToken = 390
-    public static let gridMinWidth300: GridRawToken = 480
-    public static let gridMinWidth400: GridRawToken = 736
-    public static let gridMinWidth500: GridRawToken = 1024
-    public static let gridMinWidth600: GridRawToken = 1320
-    public static let gridMinWidth700: GridRawToken = 1640
-    public static let gridMinWidth800: GridRawToken = 1880
     public static let gridMinWidthExtraCompact: GridRawToken = 320
     public static let gridMinWidthCompact: GridRawToken = 390
     public static let gridMinWidthRegular: GridRawToken = 736
 
     // MARK: Primitive token - Grid - Max width
 
-    public static let gridMaxWidth100: GridRawToken = 389
-    public static let gridMaxWidth200: GridRawToken = 479
-    public static let gridMaxWidth300: GridRawToken = 735
-    public static let gridMaxWidth400: GridRawToken = 1023
-    public static let gridMaxWidth500: GridRawToken = 1339
-    public static let gridMaxWidth600: GridRawToken = 1639
-    public static let gridMaxWidth650: GridRawToken = 1680
-    public static let gridMaxWidth700: GridRawToken = 1879
-    public static let gridMaxWidth800: GridRawToken = 1920
     public static let gridMaxWidthExtraCompact: GridRawToken = 389
     public static let gridMaxWidthCompact: GridRawToken = 852
     public static let gridMaxWidthRegular: GridRawToken = 1336
@@ -110,7 +82,6 @@ extension GridRawTokens {
 
     // MARK: Primitive token - Grid - Composite - iOS Regular
 
-    public static let gridRegularWidth: GridRawToken = gridWidth400
     public static let gridRegularMinWidth: GridRawToken = gridMinWidthCompact
     public static let gridRegularMaxWidth: GridRawToken = gridMaxWidthCompact
     public static let gridRegularMargin: GridRawToken = gridMargin500

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

@@ -23,88 +23,6 @@ final class GridRawTokensTests: XCTestCase {
 
     // MARK: - Primitive token - Grid - Design Width
 
-    func testGridRawTokenGridDesignWidth100LessThanGridDesignWidth200() throws {
-        XCTAssertLessThan(GridRawTokens.gridWidth100, GridRawTokens.gridWidth200)
-    }
-
-    func testGridRawTokenGridDesignWidth100LessThanGridDesignWidth300() throws {
-        XCTAssertLessThan(GridRawTokens.gridWidth100, GridRawTokens.gridWidth300)
-    }
-
-    func testGridRawTokenGridDesignWidth100LessThanGridDesignWidth400() throws {
-        XCTAssertLessThan(GridRawTokens.gridWidth100, GridRawTokens.gridWidth400)
-    }
-
-    func testGridRawTokenGridDesignWidth100LessThanGridDesignWidth500() throws {
-        XCTAssertLessThan(GridRawTokens.gridWidth100, GridRawTokens.gridWidth500)
-    }
-
-    func testGridRawTokenGridDesignWidth100LessThanGridDesignWidth600() throws {
-        XCTAssertLessThan(GridRawTokens.gridWidth100, GridRawTokens.gridWidth600)
-    }
-
-    func testGridRawTokenGridDesignWidth100LessThanGridDesignWidth700() throws {
-        XCTAssertLessThan(GridRawTokens.gridWidth100, GridRawTokens.gridWidth700)
-    }
-
-    func testGridRawTokenGridDesignWidth100LessThanGridDesignWidth800() throws {
-        XCTAssertLessThan(GridRawTokens.gridWidth100, GridRawTokens.gridWidth800)
-    }
-
-    func testGridRawTokenGridDesignWidth200LessThanGridDesignWidth300() throws {
-        XCTAssertLessThan(GridRawTokens.gridWidth200, GridRawTokens.gridWidth300)
-    }
-
-    func testGridRawTokenGridDesignWidth200LessThanGridDesignWidth400() throws {
-        XCTAssertLessThan(GridRawTokens.gridWidth200, GridRawTokens.gridWidth400)
-    }
-
-    func testGridRawTokenGridDesignWidth200LessThanGridDesignWidth500() throws {
-        XCTAssertLessThan(GridRawTokens.gridWidth200, GridRawTokens.gridWidth500)
-    }
-
-    func testGridRawTokenGridDesignWidth200LessThanGridDesignWidth600() throws {
-        XCTAssertLessThan(GridRawTokens.gridWidth200, GridRawTokens.gridWidth600)
-    }
-
-    func testGridRawTokenGridDesignWidth200LessThanGridDesignWidth700() throws {
-        XCTAssertLessThan(GridRawTokens.gridWidth200, GridRawTokens.gridWidth700)
-    }
-
-    func testGridRawTokenGridDesignWidth200LessThanGridDesignWidth800() throws {
-        XCTAssertLessThan(GridRawTokens.gridWidth200, GridRawTokens.gridWidth800)
-    }
-
-    // MARK: - Primitive token - Grid - Min width
-
-    func testGridRawTokenGridMinWidth100LessThanGridMinWidth200() throws {
-        XCTAssertLessThan(GridRawTokens.gridMinWidth100, GridRawTokens.gridMinWidth200)
-    }
-
-    func testGridRawTokenGridMinWidth200LessThanGridMinWidth300() throws {
-        XCTAssertLessThan(GridRawTokens.gridMinWidth200, GridRawTokens.gridMinWidth300)
-    }
-
-    func testGridRawTokenGridMinWidth300LessThanGridMinWidth400() throws {
-        XCTAssertLessThan(GridRawTokens.gridMinWidth300, GridRawTokens.gridMinWidth400)
-    }
-
-    func testGridRawTokenGridMinWidth400LessThanGridMinWidth500() throws {
-        XCTAssertLessThan(GridRawTokens.gridMinWidth400, GridRawTokens.gridMinWidth500)
-    }
-
-    func testGridRawTokenGridMinWidth500LessThanGridMinWidth600() throws {
-        XCTAssertLessThan(GridRawTokens.gridMinWidth500, GridRawTokens.gridMinWidth600)
-    }
-
-    func testGridRawTokenGridMinWidth600LessThanGridMinWidth700() throws {
-        XCTAssertLessThan(GridRawTokens.gridMinWidth600, GridRawTokens.gridMinWidth700)
-    }
-
-    func testGridRawTokenGridMinWidth700LessThanGridMinWidth800() throws {
-        XCTAssertLessThan(GridRawTokens.gridMinWidth700, GridRawTokens.gridMinWidth800)
-    }
-
     func testGridRawTokenGridMinWidthExtraCompactLessThanGridMinWidthCompact() throws {
         XCTAssertLessThan(GridRawTokens.gridMinWidthExtraCompact, GridRawTokens.gridMinWidthCompact)
     }
@@ -119,38 +37,7 @@ final class GridRawTokensTests: XCTestCase {
 
     // MARK: - Primitive token - Grid - Max width
 
-    func testGridRawTokenGridMaxWidth100LessThanGridMaxWidth200() throws {
-        XCTAssertLessThan(GridRawTokens.gridMaxWidth100, GridRawTokens.gridMaxWidth200)
-    }
-
-    func testGridRawTokenGridMaxWidth200LessThanGridMaxWidth300() throws {
-        XCTAssertLessThan(GridRawTokens.gridMaxWidth200, GridRawTokens.gridMaxWidth300)
-    }
-
-    func testGridRawTokenGridMaxWidth300LessThanGridMaxWidth400() throws {
-        XCTAssertLessThan(GridRawTokens.gridMaxWidth300, GridRawTokens.gridMaxWidth400)
-    }
-
-    func testGridRawTokenGridMaxWidth400LessThanGridMaxWidth500() throws {
-        XCTAssertLessThan(GridRawTokens.gridMaxWidth400, GridRawTokens.gridMaxWidth500)
-    }
-
-    func testGridRawTokenGridMaxWidth500LessThanGridMaxWidth600() throws {
-        XCTAssertLessThan(GridRawTokens.gridMaxWidth500, GridRawTokens.gridMaxWidth600)
-    }
-
-    func testGridRawTokenGridMaxWidth600LessThanGridMaxWidth650() throws {
-        XCTAssertLessThan(GridRawTokens.gridMaxWidth600, GridRawTokens.gridMaxWidth650)
-    }
-
-    func testGridRawTokenGridMaxWidth650LessThanGridMaxWidth700() throws {
-        XCTAssertLessThan(GridRawTokens.gridMaxWidth650, GridRawTokens.gridMaxWidth700)
-    }
-
-    func testGridRawTokenGridMaxWidth700LessThanGridMaxWidth800() throws {
-        XCTAssertLessThan(GridRawTokens.gridMaxWidth700, GridRawTokens.gridMaxWidth800)
-    }
-
+
     func testGridRawTokenGridMaxWidthExtraCompactLessThanGridMaxWidthCompact() throws {
         XCTAssertLessThan(GridRawTokens.gridMaxWidthExtraCompact, GridRawTokens.gridMaxWidthCompact)
     }

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

@@ -22,7 +22,6 @@ public protocol GridSemanticTokens {
 
     // MARK: Semantic token - Grid - iOS Extra compact
 
-    var gridExtraCompactWidth: GridExtraCompactSemanticToken { get }
     var gridExtraCompactMinWidth: GridExtraCompactSemanticToken { get }
     var gridExtraCompactMaxWidth: GridExtraCompactSemanticToken { get }
     var gridExtraCompactMargin: GridExtraCompactSemanticToken { get }
@@ -31,7 +30,6 @@ public protocol GridSemanticTokens {
 
     // MARK: Semantic token - Grid - iOS Compact
 
-    var gridCompactWidth: GridCompactSemanticToken { get }
     var gridCompactMinWidth: GridCompactSemanticToken { get }
     var gridCompactMaxWidth: GridCompactSemanticToken { get }
     var gridCompactMargin: GridCompactSemanticToken { get }
@@ -40,7 +38,6 @@ public protocol GridSemanticTokens {
 
     // MARK: Semantic token - Grid - iOS Regular
 
-    var gridRegularWidth: GridRegularSemanticToken { get }
     var gridRegularMinWidth: GridRegularSemanticToken { get }
     var gridRegularMaxWidth: GridRegularSemanticToken { get }
     var gridRegularMargin: GridRegularSemanticToken { get }