From 0c84f7391c233ddcb7a5739b2df5b6a14df9e3fc Mon Sep 17 00:00:00 2001 From: Pierre-Yves Lapersonne Date: Thu, 30 Jan 2025 14:29:08 +0100 Subject: [PATCH] =?UTF-8?q?chore(=F0=9F=A4=96):=20update=20`CheckRadioComp?= =?UTF-8?q?onentTokens`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tokens library v0.4.1 Signed-off-by: Pierre-Yves Lapersonne --- ...emeCheckRadioComponentTokensProvider.swift | 2 +- ...rangeTheme+CheckRadioComponentTokens.swift | 15 +++++--------- ...ckTheme+AllCheckRadioComponentTokens.swift | 2 +- ...meOverrideOCheckRadioComponentTokens.swift | 20 +++++++++---------- .../Values/CheckRadioComponentTokens.swift | 10 +++++----- .../OUDSTokensComponent.md | 2 +- .../_OUDSTokensRaw.docc/OUDSTokensRaw.md | 2 +- .../OUDSTokensSemantic.md | 2 +- 8 files changed, 25 insertions(+), 30 deletions(-) diff --git a/OUDS/Core/Themes/Orange/Sources/Providers/ComponentTokens/OrangeThemeCheckRadioComponentTokensProvider.swift b/OUDS/Core/Themes/Orange/Sources/Providers/ComponentTokens/OrangeThemeCheckRadioComponentTokensProvider.swift index bdce0f4f1..b0da58e1e 100644 --- a/OUDS/Core/Themes/Orange/Sources/Providers/ComponentTokens/OrangeThemeCheckRadioComponentTokensProvider.swift +++ b/OUDS/Core/Themes/Orange/Sources/Providers/ComponentTokens/OrangeThemeCheckRadioComponentTokensProvider.swift @@ -35,7 +35,7 @@ import OUDSTokensSemantic /// /// // Then override the radio / check component tokens you want. /// -/// override var checkRadioSize: SizeSemanticToken { sizes.sizeIconWithLabelLargeSizeXl } +/// override var checkRadioSizeSelector: SizeSemanticToken { sizes.sizeIconWithLabelLargeSizeXl } /// /// override var checkRadioSizeMaxHeightAssetsContainer: DimensionRawToken { DimensionRawTokens.dimension1000 } /// diff --git a/OUDS/Core/Themes/Orange/Sources/Values/ComponentTokens/OrangeTheme+CheckRadioComponentTokens.swift b/OUDS/Core/Themes/Orange/Sources/Values/ComponentTokens/OrangeTheme+CheckRadioComponentTokens.swift index 07ec798ac..ceaa3226f 100644 --- a/OUDS/Core/Themes/Orange/Sources/Values/ComponentTokens/OrangeTheme+CheckRadioComponentTokens.swift +++ b/OUDS/Core/Themes/Orange/Sources/Values/ComponentTokens/OrangeTheme+CheckRadioComponentTokens.swift @@ -16,15 +16,10 @@ import OUDSTokensComponent import OUDSTokensRaw import OUDSTokensSemantic -// ଘ( ･ω･)_/ﾟ･:*:･｡☆ -// [File to generate with the tokenator] -// Values are not the expected ones, manual fixes have been added -// Create an issue for update https://github.com/Orange-OpenSource/ouds-ios/issues/new?template=token_update.yml - extension OrangeThemeCheckRadioComponentTokensProvider: CheckRadioComponentTokens { - @objc open var checkRadioSize: SizeSemanticToken { sizes.sizeIconWithLabelLargeSizeSm } - @objc open var checkRadioSizeMinHeightSelectorOnly: DimensionRawToken { DimensionRawTokens.dimension600 } - @objc open var checkRadioSizeMinWidthSelectorOnly: DimensionRawToken { DimensionRawTokens.dimension600 } - @objc open var checkRadioSizeMaxHeightSelectorOnly: DimensionRawToken { DimensionRawTokens.dimension600 } - @objc open var checkRadioSizeMaxHeightAssetsContainer: DimensionRawToken { DimensionRawTokens.dimension1200 } + @objc open var checkRadioSizeMaxHeightAssetsContainer: SizeSemanticToken { DimensionRawTokens.dimension1200 } + @objc open var checkRadioSizeMaxHeightSelectorOnly: SizeSemanticToken { DimensionRawTokens.dimension600 } + @objc open var checkRadioSizeMinHeightSelectorOnly: SizeSemanticToken { DimensionRawTokens.dimension600 } + @objc open var checkRadioSizeMinWidthSelectorOnly: SizeSemanticToken { DimensionRawTokens.dimension600 } + @objc open var checkRadioSizeSelector: SizeSemanticToken { sizes.sizeIconWithLabelLargeSizeSm } } diff --git a/OUDS/Core/Themes/Orange/Tests/Values/ComponentTokens/MockTheme/MockTheme+AllCheckRadioComponentTokens.swift b/OUDS/Core/Themes/Orange/Tests/Values/ComponentTokens/MockTheme/MockTheme+AllCheckRadioComponentTokens.swift index 76ad8f125..571288c4c 100644 --- a/OUDS/Core/Themes/Orange/Tests/Values/ComponentTokens/MockTheme/MockTheme+AllCheckRadioComponentTokens.swift +++ b/OUDS/Core/Themes/Orange/Tests/Values/ComponentTokens/MockTheme/MockTheme+AllCheckRadioComponentTokens.swift @@ -34,7 +34,7 @@ final class MockThemeCheckRadioComponentTokenProvider: OrangeThemeCheckRadioComp // MARK: - Badge component tokens - override public var checkRadioSize: SizeSemanticToken { Self.mockThemeCheckRadioSize } + override public var checkRadioSizeSelector: SizeSemanticToken { Self.mockThemeCheckRadioSize } override public var checkRadioSizeMinHeightSelectorOnly: DimensionRawToken { Self.mockThemeCheckRadioDimension } override public var checkRadioSizeMinWidthSelectorOnly: DimensionRawToken { Self.mockThemeCheckRadioDimension } override public var checkRadioSizeMaxHeightSelectorOnly: DimensionRawToken { Self.mockThemeCheckRadioDimension } diff --git a/OUDS/Core/Themes/Orange/Tests/Values/ComponentTokens/TestThemeOverrideOCheckRadioComponentTokens.swift b/OUDS/Core/Themes/Orange/Tests/Values/ComponentTokens/TestThemeOverrideOCheckRadioComponentTokens.swift index 43da2fd95..96885897f 100644 --- a/OUDS/Core/Themes/Orange/Tests/Values/ComponentTokens/TestThemeOverrideOCheckRadioComponentTokens.swift +++ b/OUDS/Core/Themes/Orange/Tests/Values/ComponentTokens/TestThemeOverrideOCheckRadioComponentTokens.swift @@ -32,30 +32,30 @@ final class TestThemeOverrideOfCheckRadioComponentTokens: XCTestCase { // MARK: - Sizes func testInheritedThemeCanOverrideCheckRadioComponentTokenSize() throws { - XCTAssertNotEqual(inheritedTheme.checkRadio.checkRadioSize, abstractTheme.checkRadio.checkRadioSize) - XCTAssertTrue(inheritedTheme.checkRadio.checkRadioSize == MockThemeCheckRadioComponentTokenProvider.mockThemeCheckRadioSize) + XCTAssertNotEqual(inheritedTheme.checkRadio.checkRadioSizeSelector, abstractTheme.checkRadio.checkRadioSizeSelector) + XCTAssertTrue(inheritedTheme.checkRadio.checkRadioSizeSelector == MockThemeCheckRadioComponentTokenProvider.mockThemecheckRadioSize) } // MARK: - Dimensions func testInheritedThemeCanOverrideCheckRadioComponentTokenSizeMinHeightSelectorOnly() throws { - XCTAssertNotEqual(inheritedTheme.checkRadio.checkRadioSizeMinHeightSelectorOnly, abstractTheme.checkRadio.checkRadioSizeMinHeightSelectorOnly) - XCTAssertTrue(inheritedTheme.checkRadio.checkRadioSizeMinHeightSelectorOnly == MockThemeCheckRadioComponentTokenProvider.mockThemeCheckRadioDimension) + XCTAssertNotEqual(inheritedTheme.checkRadio.checkRadioSizeSelectorMinHeightSelectorOnly, abstractTheme.checkRadio.checkRadioSizeSelectorMinHeightSelectorOnly) + XCTAssertTrue(inheritedTheme.checkRadio.checkRadioSizeSelectorMinHeightSelectorOnly == MockThemeCheckRadioComponentTokenProvider.mockThemeCheckRadioDimension) } func testInheritedThemeCanOverrideCheckRadioComponentTokenSizeMinWidthSelectorOnly() throws { - XCTAssertNotEqual(inheritedTheme.checkRadio.checkRadioSizeMinWidthSelectorOnly, abstractTheme.checkRadio.checkRadioSizeMinWidthSelectorOnly) - XCTAssertTrue(inheritedTheme.checkRadio.checkRadioSizeMinWidthSelectorOnly == MockThemeCheckRadioComponentTokenProvider.mockThemeCheckRadioDimension) + XCTAssertNotEqual(inheritedTheme.checkRadio.checkRadioSizeSelectorMinWidthSelectorOnly, abstractTheme.checkRadio.checkRadioSizeSelectorMinWidthSelectorOnly) + XCTAssertTrue(inheritedTheme.checkRadio.checkRadioSizeSelectorMinWidthSelectorOnly == MockThemeCheckRadioComponentTokenProvider.mockThemeCheckRadioDimension) } func testInheritedThemeCanOverrideCheckRadioComponentTokenSizeMaxHeightSelectorOnly() throws { - XCTAssertNotEqual(inheritedTheme.checkRadio.checkRadioSizeMaxHeightSelectorOnly, abstractTheme.checkRadio.checkRadioSizeMaxHeightSelectorOnly) - XCTAssertTrue(inheritedTheme.checkRadio.checkRadioSizeMaxHeightSelectorOnly == MockThemeCheckRadioComponentTokenProvider.mockThemeCheckRadioDimension) + XCTAssertNotEqual(inheritedTheme.checkRadio.checkRadioSizeSelectorMaxHeightSelectorOnly, abstractTheme.checkRadio.checkRadioSizeSelectorMaxHeightSelectorOnly) + XCTAssertTrue(inheritedTheme.checkRadio.checkRadioSizeSelectorMaxHeightSelectorOnly == MockThemeCheckRadioComponentTokenProvider.mockThemeCheckRadioDimension) } func testInheritedThemeCanOverrideCheckRadioComponentTokenSizeMaxHeightAssetsContainer() throws { - XCTAssertNotEqual(inheritedTheme.checkRadio.checkRadioSizeMaxHeightAssetsContainer, abstractTheme.checkRadio.checkRadioSizeMaxHeightAssetsContainer) - XCTAssertTrue(inheritedTheme.checkRadio.checkRadioSizeMaxHeightAssetsContainer == MockThemeCheckRadioComponentTokenProvider.mockThemeCheckRadioDimension) + XCTAssertNotEqual(inheritedTheme.checkRadio.checkRadioSizeSelectorMaxHeightAssetsContainer, abstractTheme.checkRadio.checkRadioSizeSelectorMaxHeightAssetsContainer) + XCTAssertTrue(inheritedTheme.checkRadio.checkRadioSizeSelectorMaxHeightAssetsContainer == MockThemeCheckRadioComponentTokenProvider.mockThemeCheckRadioDimension) } } diff --git a/OUDS/Core/Tokens/ComponentTokens/Sources/Values/CheckRadioComponentTokens.swift b/OUDS/Core/Tokens/ComponentTokens/Sources/Values/CheckRadioComponentTokens.swift index 35e9bc3a1..242a1f616 100644 --- a/OUDS/Core/Tokens/ComponentTokens/Sources/Values/CheckRadioComponentTokens.swift +++ b/OUDS/Core/Tokens/ComponentTokens/Sources/Values/CheckRadioComponentTokens.swift @@ -28,14 +28,14 @@ public protocol CheckRadioComponentTokens { // MARK: - Sizes - var checkRadioSize: SizeSemanticToken { get } + var checkRadioSizeSelector: SizeSemanticToken { get } // MARK: - Dimensions - var checkRadioSizeMinHeightSelectorOnly: DimensionRawToken { get } - var checkRadioSizeMinWidthSelectorOnly: DimensionRawToken { get } - var checkRadioSizeMaxHeightSelectorOnly: DimensionRawToken { get } - var checkRadioSizeMaxHeightAssetsContainer: DimensionRawToken { get } + var checkRadioSizeMinHeightSelectorOnly: SizeSemanticToken { get } + var checkRadioSizeMinWidthSelectorOnly: SizeSemanticToken { get } + var checkRadioSizeMaxHeightSelectorOnly: SizeSemanticToken { get } + var checkRadioSizeMaxHeightAssetsContainer: SizeSemanticToken { get } } // swiftlint:enable missing_docs diff --git a/OUDS/Core/Tokens/ComponentTokens/Sources/_OUDSTokensComponent.docc/OUDSTokensComponent.md b/OUDS/Core/Tokens/ComponentTokens/Sources/_OUDSTokensComponent.docc/OUDSTokensComponent.md index 92bdea1da..69bf372b5 100644 --- a/OUDS/Core/Tokens/ComponentTokens/Sources/_OUDSTokensComponent.docc/OUDSTokensComponent.md +++ b/OUDS/Core/Tokens/ComponentTokens/Sources/_OUDSTokensComponent.docc/OUDSTokensComponent.md @@ -7,7 +7,7 @@ They can be seen as a kind of bridge between components and in the end primitive ``` -🧱 Tokens version: v0.4.0 +🧱 Tokens version: v0.4.1 ``` Thus if a component need to change for example its _background color_, and if a _component token_ is used for it, then only the value of this _token_ should be changed without any modification on the _component_ definition. diff --git a/OUDS/Core/Tokens/RawTokens/Sources/_OUDSTokensRaw.docc/OUDSTokensRaw.md b/OUDS/Core/Tokens/RawTokens/Sources/_OUDSTokensRaw.docc/OUDSTokensRaw.md index 3057f5cf7..df2912eec 100644 --- a/OUDS/Core/Tokens/RawTokens/Sources/_OUDSTokensRaw.docc/OUDSTokensRaw.md +++ b/OUDS/Core/Tokens/RawTokens/Sources/_OUDSTokensRaw.docc/OUDSTokensRaw.md @@ -6,7 +6,7 @@ _Raw tokens_ are smallest _tokens_ possible. They are associated to raw values a ``` -🧱 Tokens version: v0.4.0 +🧱 Tokens version: v0.4.1 ``` In fact, we choose to use as most as possible primitive types for raw values, like `Int`, `Double`, `CGFloat` or `String` so as to handle the smallest types with few impacts on the memory for ecodesign principles. Indeed with hundreds of raw tokens, it will be more efficient to store primitive small types than Swift `struct` or `class` objects. Keeping primitive types helps today to expose objects using Objective-C runtime. diff --git a/OUDS/Core/Tokens/SemanticTokens/Sources/_OUDSTokensSemantic.docc/OUDSTokensSemantic.md b/OUDS/Core/Tokens/SemanticTokens/Sources/_OUDSTokensSemantic.docc/OUDSTokensSemantic.md index 2e12b5d1b..283ba0266 100644 --- a/OUDS/Core/Tokens/SemanticTokens/Sources/_OUDSTokensSemantic.docc/OUDSTokensSemantic.md +++ b/OUDS/Core/Tokens/SemanticTokens/Sources/_OUDSTokensSemantic.docc/OUDSTokensSemantic.md @@ -7,7 +7,7 @@ They can be seen as an high level of usage with functional meanings. ``` -🧱 Tokens version: v0.4.0 +🧱 Tokens version: v0.4.1 ``` If we need for example to change a warning color for a button (which has its component tokens, see [OUDSTokensComponent](https://ios.unified-design-system.orange.com/documentation/oudstokenscomponent/)), supposing this color is defined as a _semantic token_, we only have to change its assigned value and all components using the _semantic token_ won't be impacted in their definition. In fact, semantic tokens are here to bring meaning, semantic, between raw values and components.