diff --git a/CHANGELOG.md b/CHANGELOG.md index b5e328dbf..50ea3f04d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,13 +8,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- [Library] Color some enw semantic tokens `colorContentStatus*`, `colorContentOnBrand*`, `colorContentOnStatus*`, `colorGradient*`, `colorBorder*` +- [Library] Color some new semantic tokens `colorContentStatus*`, `colorContentOnBrand*`, `colorContentOnStatus*`, `colorGradient*`, `colorBorder*`, `colorContentOnAction*` - [Tool] Add UI tests in CI/CD pipelines ([#298](https://github.com/Orange-OpenSource/ouds-ios/issues/298)) - [DemoApp] Add more UI tests on demo app ([#154](https://github.com/Orange-OpenSource/ouds-ios/issues/154)) ### Changed -- [DemoApp] Update color pages +- [DemoApp] Update color page - [Library] Update `ColorSemanticTokens` tokens (tokenator *20241127112301*) - [Library] Update `SpaceSemanticTokens` tokens (tokenator *20241127074206*) - [Library] Update `SizeSemanticTokens` with rename of tokens (tokenator *20241126134156*) diff --git a/OUDS/Core/OUDS/Sources/OUDSTheme/OUDSTheme+SemanticTokens/OUDSTheme+ColorMultipleSemanticTokens.swift b/OUDS/Core/OUDS/Sources/OUDSTheme/OUDSTheme+SemanticTokens/OUDSTheme+ColorMultipleSemanticTokens.swift index 3d5eccf18..19c3d6ebc 100644 --- a/OUDS/Core/OUDS/Sources/OUDSTheme/OUDSTheme+SemanticTokens/OUDSTheme+ColorMultipleSemanticTokens.swift +++ b/OUDS/Core/OUDS/Sources/OUDSTheme/OUDSTheme+SemanticTokens/OUDSTheme+ColorMultipleSemanticTokens.swift @@ -21,6 +21,7 @@ import OUDSTokensSemantic // swiftlint:disable line_length // swiftlint:disable identifier_name +// swiftlint:disable file_length /// Defines wrapper objects for `ColorSemanticToken`. /// These values can be overriden inside `OUDSTheme` subclasses (in extensions or not, in the same module or not) thanks to the `@objc open` combination. @@ -36,7 +37,7 @@ extension OUDSTheme: ColorMultipleSemanticTokens { @objc open var colorBgSecondary: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorBgSecondaryLight, dark: colorBgSecondaryDark) } @objc open var colorBgTertiary: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorBgTertiaryLight, dark: colorBgTertiaryDark) } - + @objc open var colorBgEmphasized: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorBgEmphasizedLight, dark: colorBgEmphasizedDark) } // WARNING: #124 - Colors to use are part of Orange Theme so are not reachable at this level, as a workaround add raw values @@ -165,7 +166,6 @@ extension OUDSTheme: ColorMultipleSemanticTokens { @objc open var colorContentOnStatusWarningMutedOnBgEmphasized: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorContentOnStatusWarningMutedOnBgEmphasizedLight, dark: colorContentOnStatusWarningMutedOnBgEmphasizedDark) } - // MARK: Semantic token - Colors - Border @objc open var colorBorderDefault: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorBorderDefaultLight, dark: colorBorderDefaultDark) } @@ -177,7 +177,7 @@ extension OUDSTheme: ColorMultipleSemanticTokens { @objc open var colorBorderEmphasizedOnBgEmphasized: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorBorderEmphasizedOnBgEmphasizedLight, dark: colorBorderEmphasizedOnBgEmphasizedDark) } @objc open var colorBorderFocus: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorBorderFocusLight, dark: colorBorderFocusDark) } - + @objc open var colorBorderFocusInset: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorBorderFocusInsetLight, dark: colorBorderFocusInsetDark) } @objc open var colorBorderFocusInsetOnBgEmphasized: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorBorderFocusInsetOnBgEmphasizedLight, dark: colorBorderFocusInsetOnBgEmphasizedDark) } @@ -263,7 +263,7 @@ extension OUDSTheme: ColorMultipleSemanticTokens { @objc open var colorAlwaysWarning: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorAlwaysWarningLight, dark: colorAlwaysWarningDark) } @objc open var colorAlwaysNegative: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorAlwaysNegativeLight, dark: colorAlwaysNegativeDark) } - + @objc open var colorAlwaysPositive: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorAlwaysPositiveLight, dark: colorAlwaysPositiveDark) } @objc open var colorAlwaysInfo: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorAlwaysInfoLight, dark: colorAlwaysInfoDark) } @@ -271,19 +271,19 @@ extension OUDSTheme: ColorMultipleSemanticTokens { @objc open var colorAlwaysAccent: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorAlwaysAccentLight, dark: colorAlwaysAccentDark) } @objc open var colorAlwaysOnAccent: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorAlwaysOnAccentLight, dark: colorAlwaysOnAccentDark) } - + @objc open var colorAlwaysOnBlack: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorAlwaysOnBlackLight, dark: colorAlwaysOnBlackDark) } - + @objc open var colorAlwaysOnInfo: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorAlwaysOnInfoLight, dark: colorAlwaysOnInfoDark) } - + @objc open var colorAlwaysOnNegative: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorAlwaysOnNegativeLight, dark: colorAlwaysOnNegativeDark) } - + @objc open var colorAlwaysOnPositive: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorAlwaysOnPositiveLight, dark: colorAlwaysOnPositiveDark) } - + @objc open var colorAlwaysOnWarning: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorAlwaysOnWarningLight, dark: colorAlwaysOnWarningDark) } - + @objc open var colorAlwaysOnWhite: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorAlwaysOnWhiteLight, dark: colorAlwaysOnWhiteDark) } - + // MARK: Semantic token - Colors - Transparent @objc open var colorTransparentDefault: MultipleColorSemanticTokens { MultipleColorSemanticTokens(ColorRawTokens.colorTransparentBlack0) } @@ -498,15 +498,15 @@ extension OUDSTheme: ColorMultipleSemanticTokens { @objc open var colorChartSequentialAccent5Tint800: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorChartSequentialAccent5Tint800Light, dark: colorChartSequentialAccent5Tint800Dark) } @objc open var colorChartSequentialAccent5Tint900: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorChartSequentialAccent5Tint900Light, dark: colorChartSequentialAccent5Tint900Dark) } - + // MARK: - Semantic token - Colors - Gradient - + @objc open var colorGradientSkeletonMiddle: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorGradientSkeletonMiddleLight, dark: colorGradientSkeletonMiddleDark) } - + @objc open var colorGradientSkeletonMiddleOnBgEmphasized: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorGradientSkeletonMiddleOnBgEmphasizedLight, dark: colorGradientSkeletonMiddleOnBgEmphasizedDark) } - + @objc open var colorGradientSkeletonStartEnd: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorGradientSkeletonMiddleOnBgEmphasizedLight, dark: colorGradientSkeletonMiddleOnBgEmphasizedDark) } - + @objc open var colorGradientSkeletonStartEndOnBgEmphasized: MultipleColorSemanticTokens { MultipleColorSemanticTokens(light: colorGradientSkeletonStartEndOnBgEmphasizedLight, dark: colorGradientSkeletonStartEndOnBgEmphasizedDark) } } diff --git a/OUDS/Core/OUDS/Tests/OUDSTheme/MockThemes/MockTheme+ColorSemanticTokens.swift b/OUDS/Core/OUDS/Tests/OUDSTheme/MockThemes/MockTheme+ColorSemanticTokens.swift index 142162338..ba05c19a7 100644 --- a/OUDS/Core/OUDS/Tests/OUDSTheme/MockThemes/MockTheme+ColorSemanticTokens.swift +++ b/OUDS/Core/OUDS/Tests/OUDSTheme/MockThemes/MockTheme+ColorSemanticTokens.swift @@ -95,7 +95,7 @@ extension MockTheme { override open var colorContentStatusNegative: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } override open var colorContentStatusAccent: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } - + // MARK: Semantic token - Colors - Content - On Action override open var colorContentOnActionDisabled: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } @@ -243,7 +243,7 @@ extension MockTheme { override open var colorAlwaysWarning: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } override open var colorAlwaysNegative: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } - + override open var colorAlwaysPositive: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } override open var colorAlwaysInfo: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } @@ -251,19 +251,19 @@ extension MockTheme { override open var colorAlwaysAccent: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } override open var colorAlwaysOnAccent: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } - + override open var colorAlwaysOnBlack: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } - + override open var colorAlwaysOnInfo: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } - + override open var colorAlwaysOnNegative: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } - + override open var colorAlwaysOnPositive: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } - + override open var colorAlwaysOnWarning: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } - + override open var colorAlwaysOnWhite: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } - + // MARK: Semantic token - Colors - Transparent override open var colorTransparentDefault: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } @@ -473,15 +473,15 @@ extension MockTheme { override open var colorChartSequentialAccent5Tint900: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } // MARK: - Semantic token - Colors - Gradient - + override open var colorGradientSkeletonMiddle: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } - + override open var colorGradientSkeletonMiddleOnBgEmphasized: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } - + override open var colorGradientSkeletonStartEnd: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } - + override open var colorGradientSkeletonStartEndOnBgEmphasized: MultipleColorSemanticTokens { Self.mockThemeMultipleColorSemanticTokens } - + // MARK: - Color Tokens overridings // MARK: Semantic token - Colors - Background @@ -577,7 +577,7 @@ extension MockTheme { override open var colorContentBrandPrimaryOnBgEmphasizedLight: ColorSemanticToken { Self.mockThemeSemanticColorTokens } override open var colorContentBrandPrimaryOnBgEmphasizedDark: ColorSemanticToken { Self.mockThemeSemanticColorTokens } - + override open var colorContentStatusPositiveLight: ColorSemanticToken { Self.mockThemeSemanticColorTokens } override open var colorContentStatusPositiveDark: ColorSemanticToken { Self.mockThemeSemanticColorTokens } @@ -703,7 +703,7 @@ extension MockTheme { override open var colorAlwaysNegativeLight: ColorSemanticToken { Self.mockThemeSemanticColorTokens } override open var colorAlwaysNegativeDark: ColorSemanticToken { Self.mockThemeSemanticColorTokens } - + override open var colorAlwaysPositiveLight: ColorSemanticToken { Self.mockThemeSemanticColorTokens } override open var colorAlwaysPositiveDark: ColorSemanticToken { Self.mockThemeSemanticColorTokens } @@ -715,25 +715,25 @@ extension MockTheme { override open var colorAlwaysOnAccentLight: ColorSemanticToken { Self.mockThemeSemanticColorTokens } override open var colorAlwaysOnAccentDark: ColorSemanticToken { Self.mockThemeSemanticColorTokens } - + override open var colorAlwaysOnBlackLight: ColorSemanticToken { Self.mockThemeSemanticColorTokens } override open var colorAlwaysOnBlackDark: ColorSemanticToken { Self.mockThemeSemanticColorTokens } - + override open var colorAlwaysOnInfoLight: ColorSemanticToken { Self.mockThemeSemanticColorTokens } override open var colorAlwaysOnInfoDark: ColorSemanticToken { Self.mockThemeSemanticColorTokens } - + override open var colorAlwaysOnNegativeLight: ColorSemanticToken { Self.mockThemeSemanticColorTokens } override open var colorAlwaysOnNegativeDark: ColorSemanticToken { Self.mockThemeSemanticColorTokens } - + override open var colorAlwaysOnPositiveLight: ColorSemanticToken { Self.mockThemeSemanticColorTokens } override open var colorAlwaysOnPositiveDark: ColorSemanticToken { Self.mockThemeSemanticColorTokens } - + override open var colorAlwaysOnWarningLight: ColorSemanticToken { Self.mockThemeSemanticColorTokens } override open var colorAlwaysOnWarningDark: ColorSemanticToken { Self.mockThemeSemanticColorTokens } - + override open var colorAlwaysOnWhiteLight: ColorSemanticToken { Self.mockThemeSemanticColorTokens } override open var colorAlwaysOnWhiteDark: ColorSemanticToken { Self.mockThemeSemanticColorTokens } - + // MARK: Semantic token - Colors - Transparent override open var colorTransparentDefaultLight: ColorSemanticToken { Self.mockThemeSemanticColorTokens } @@ -1041,7 +1041,7 @@ extension MockTheme { override open var colorChartSequentialAccent5Tint900Light: ColorSemanticToken { Self.mockThemeSemanticColorTokens } override open var colorChartSequentialAccent5Tint900Dark: ColorSemanticToken { Self.mockThemeSemanticColorTokens } - + // MARK: Semantic token - Colors - Content - On Action override open var colorContentOnActionDisabledLight: ColorSemanticToken { Self.mockThemeSemanticColorTokens } diff --git a/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfColorMultipleSemanticTokens.swift b/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfColorMultipleSemanticTokens.swift index 141fe5554..458ec678c 100644 --- a/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfColorMultipleSemanticTokens.swift +++ b/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfColorMultipleSemanticTokens.swift @@ -190,8 +190,8 @@ final class TestThemeOverrideOfColorMultipleSemanticTokens: XCTestCase { XCTAssertNotEqual(inheritedTheme.colorContentBrandPrimaryOnBgEmphasized, abstractTheme.colorContentBrandPrimaryOnBgEmphasized) XCTAssertTrue(inheritedTheme.colorContentBrandPrimaryOnBgEmphasized == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } - - func testInheritedThemeCanOverrideSemanticTokenColorContentStatusPositive() throws { + + func testInheritedThemeCanOverideSemanticTokenColorContentStatusPositive() throws { XCTAssertNotEqual(inheritedTheme.colorContentStatusPositive, abstractTheme.colorContentStatusPositive) XCTAssertTrue(inheritedTheme.colorContentStatusPositive == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } @@ -217,7 +217,7 @@ final class TestThemeOverrideOfColorMultipleSemanticTokens: XCTestCase { } // MARK: Semantic token - Colors - Content - On Action - + func testInheritedThemeCanOverrideSemanticTokenColorContentOnActionDisabled() throws { XCTAssertNotEqual(inheritedTheme.colorContentOnActionDisabled, abstractTheme.colorContentOnActionDisabled) XCTAssertTrue(inheritedTheme.colorContentOnActionDisabled == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) @@ -389,7 +389,7 @@ final class TestThemeOverrideOfColorMultipleSemanticTokens: XCTestCase { XCTAssertNotEqual(inheritedTheme.colorBorderFocus, abstractTheme.colorBorderFocus) XCTAssertTrue(inheritedTheme.colorBorderFocus == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } - + func testInheritedThemeCanOverrideSemanticTokenColorBorderFocusInset() throws { XCTAssertNotEqual(inheritedTheme.colorBorderFocusInset, abstractTheme.colorBorderFocusInset) XCTAssertTrue(inheritedTheme.colorBorderFocusInset == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) @@ -420,16 +420,6 @@ final class TestThemeOverrideOfColorMultipleSemanticTokens: XCTestCase { XCTAssertTrue(inheritedTheme.colorBorderOnBrandPrimary == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } - func testInheritedThemeCanOverrideSemanticTokenColorBorderBrandPrimaryOnBgEmphasized() throws { - XCTAssertNotEqual(inheritedTheme.colorBorderBrandPrimaryOnBgEmphasized, abstractTheme.colorBorderBrandPrimaryOnBgEmphasized) - XCTAssertTrue(inheritedTheme.colorBorderBrandPrimaryOnBgEmphasized == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) - } - - func testInheritedThemeCanOverrideSemanticTokenColorBorderBrandPrimary() throws { - XCTAssertNotEqual(inheritedTheme.colorBorderBrandPrimary, abstractTheme.colorBorderBrandPrimary) - XCTAssertTrue(inheritedTheme.colorBorderBrandPrimary == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) - } - // MARK: Semantic token - Colors - Action func testInheritedThemeCanOverrideSemanticTokenColorActionSelected() throws { @@ -603,7 +593,7 @@ final class TestThemeOverrideOfColorMultipleSemanticTokens: XCTestCase { XCTAssertNotEqual(inheritedTheme.colorAlwaysNegative, abstractTheme.colorAlwaysNegative) XCTAssertTrue(inheritedTheme.colorAlwaysNegative == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } - + func testInheritedThemeCanOverrideSemanticTokenColorAlwaysPositive() throws { XCTAssertNotEqual(inheritedTheme.colorAlwaysPositive, abstractTheme.colorAlwaysPositive) XCTAssertTrue(inheritedTheme.colorAlwaysPositive == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) @@ -623,37 +613,37 @@ final class TestThemeOverrideOfColorMultipleSemanticTokens: XCTestCase { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnAccent, abstractTheme.colorAlwaysOnAccent) XCTAssertTrue(inheritedTheme.colorAlwaysOnAccent == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } - + func testInheritedThemeCanOverrideSemanticTokenColorAlwaysOnBlack() throws { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnBlack, abstractTheme.colorAlwaysOnBlack) XCTAssertTrue(inheritedTheme.colorAlwaysOnBlack == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } - + func testInheritedThemeCanOverrideSemanticTokenColorAlwaysOnInfo() throws { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnInfo, abstractTheme.colorAlwaysOnInfo) XCTAssertTrue(inheritedTheme.colorAlwaysOnInfo == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } - + func testInheritedThemeCanOverrideSemanticTokenColorAlwaysOnNegative() throws { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnNegative, abstractTheme.colorAlwaysOnNegative) XCTAssertTrue(inheritedTheme.colorAlwaysOnNegative == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } - + func testInheritedThemeCanOverrideSemanticTokenColorAlwaysOnPositive() throws { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnPositive, abstractTheme.colorAlwaysOnPositive) XCTAssertTrue(inheritedTheme.colorAlwaysOnPositive == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } - + func testInheritedThemeCanOverrideSemanticTokenColorAlwaysOnWarning() throws { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnWarning, abstractTheme.colorAlwaysOnWarning) XCTAssertTrue(inheritedTheme.colorAlwaysOnWarning == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } - + func testInheritedThemeCanOverrideSemanticTokenColorAlwaysOnWhite() throws { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnWhite, abstractTheme.colorAlwaysOnWhite) XCTAssertTrue(inheritedTheme.colorAlwaysOnWhite == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } - + // MARK: Semantic token - Colors - Transparent func testInheritedThemeCanOverrideSemanticTokenColorTransparentDefault() throws { @@ -1161,24 +1151,24 @@ final class TestThemeOverrideOfColorMultipleSemanticTokens: XCTestCase { XCTAssertNotEqual(inheritedTheme.colorChartSequentialAccent5Tint900, abstractTheme.colorChartSequentialAccent5Tint900) XCTAssertTrue(inheritedTheme.colorChartSequentialAccent5Tint900 == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } - + // MARK: - Semantic token - Colors - Gradient - + func testInheritedThemeCanOverrideSemanticTokenColorColorGradientSkeletonMiddle() throws { XCTAssertNotEqual(inheritedTheme.colorGradientSkeletonMiddle, abstractTheme.colorGradientSkeletonMiddle) XCTAssertTrue(inheritedTheme.colorGradientSkeletonMiddle == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } - + func testInheritedThemeCanOverrideSemanticTokenColorColorGradientSkeletonMiddleOnBgEmphasized() throws { XCTAssertNotEqual(inheritedTheme.colorGradientSkeletonMiddleOnBgEmphasized, abstractTheme.colorGradientSkeletonMiddleOnBgEmphasized) XCTAssertTrue(inheritedTheme.colorGradientSkeletonMiddleOnBgEmphasized == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } - + func testInheritedThemeCanOverrideSemanticTokenColorColorGradientSkeletonStartEnd() throws { XCTAssertNotEqual(inheritedTheme.colorGradientSkeletonStartEnd, abstractTheme.colorGradientSkeletonStartEnd) XCTAssertTrue(inheritedTheme.colorGradientSkeletonStartEnd == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) } - + func testInheritedThemeCanOverrideSemanticTokenColorColorGradientSkeletonStartEndOnBgEmphasized() throws { XCTAssertNotEqual(inheritedTheme.colorGradientSkeletonStartEndOnBgEmphasized, abstractTheme.colorGradientSkeletonMiddle) XCTAssertTrue(inheritedTheme.colorGradientSkeletonStartEndOnBgEmphasized == OtherMockTheme.otherMockThemeMultipleColorSemanticTokens) diff --git a/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfColorSemanticTokens.swift b/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfColorSemanticTokens.swift index 6aee4d090..5f4bbb0a1 100644 --- a/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfColorSemanticTokens.swift +++ b/OUDS/Core/OUDS/Tests/OUDSTheme/TestThemeOverrideOfColorSemanticTokens.swift @@ -339,7 +339,7 @@ final class TestThemeOverrideOfColorSemanticTokens: XCTestCase { XCTAssertNotEqual(inheritedTheme.colorContentBrandPrimaryOnBgEmphasizedDark, abstractTheme.colorContentBrandPrimaryOnBgEmphasizedDark) XCTAssertTrue(inheritedTheme.colorContentBrandPrimaryOnBgEmphasizedDark == OtherMockTheme.otherMockThemeSemanticColorToken) } - + func testInheritedThemeCanOverrideSemanticTokenColorContentStatusPositiveLight() throws { XCTAssertNotEqual(inheritedTheme.colorContentStatusPositiveLight, abstractTheme.colorContentStatusPositiveLight) XCTAssertTrue(inheritedTheme.colorContentStatusPositiveLight == OtherMockTheme.otherMockThemeSemanticColorToken) @@ -815,7 +815,7 @@ final class TestThemeOverrideOfColorSemanticTokens: XCTestCase { XCTAssertNotEqual(inheritedTheme.colorAlwaysAccentDark, abstractTheme.colorAlwaysAccentDark) XCTAssertTrue(inheritedTheme.colorAlwaysAccentDark == OtherMockTheme.otherMockThemeSemanticColorToken) } - + func testInheritedThemeCanOverrideSemanticTokenColorAlwaysOnAccentLight() throws { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnAccentLight, abstractTheme.colorAlwaysOnAccentLight) XCTAssertTrue(inheritedTheme.colorAlwaysOnAccentLight == OtherMockTheme.otherMockThemeSemanticColorToken) @@ -835,7 +835,7 @@ final class TestThemeOverrideOfColorSemanticTokens: XCTestCase { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnBlackDark, abstractTheme.colorAlwaysOnBlackDark) XCTAssertTrue(inheritedTheme.colorAlwaysOnBlackDark == OtherMockTheme.otherMockThemeSemanticColorToken) } - + func testInheritedThemeCanOverrideSemanticTokenColorAlwaysOnInfoLight() throws { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnInfoLight, abstractTheme.colorAlwaysOnInfoLight) XCTAssertTrue(inheritedTheme.colorAlwaysOnInfoLight == OtherMockTheme.otherMockThemeSemanticColorToken) @@ -845,7 +845,7 @@ final class TestThemeOverrideOfColorSemanticTokens: XCTestCase { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnInfoDark, abstractTheme.colorAlwaysOnInfoDark) XCTAssertTrue(inheritedTheme.colorAlwaysOnInfoDark == OtherMockTheme.otherMockThemeSemanticColorToken) } - + func testInheritedThemeCanOverrideSemanticTokenColorAlwaysOnNegativeLight() throws { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnNegativeLight, abstractTheme.colorAlwaysOnNegativeLight) XCTAssertTrue(inheritedTheme.colorAlwaysOnNegativeLight == OtherMockTheme.otherMockThemeSemanticColorToken) @@ -855,7 +855,7 @@ final class TestThemeOverrideOfColorSemanticTokens: XCTestCase { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnNegativeDark, abstractTheme.colorAlwaysOnNegativeDark) XCTAssertTrue(inheritedTheme.colorAlwaysOnNegativeDark == OtherMockTheme.otherMockThemeSemanticColorToken) } - + func testInheritedThemeCanOverrideSemanticTokenColorAlwaysOnPositiveLight() throws { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnPositiveLight, abstractTheme.colorAlwaysOnPositiveLight) XCTAssertTrue(inheritedTheme.colorAlwaysOnPositiveLight == OtherMockTheme.otherMockThemeSemanticColorToken) @@ -865,7 +865,7 @@ final class TestThemeOverrideOfColorSemanticTokens: XCTestCase { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnPositiveDark, abstractTheme.colorAlwaysOnPositiveDark) XCTAssertTrue(inheritedTheme.colorAlwaysOnPositiveDark == OtherMockTheme.otherMockThemeSemanticColorToken) } - + func testInheritedThemeCanOverrideSemanticTokenColorAlwaysOnWarningLight() throws { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnWarningLight, abstractTheme.colorAlwaysOnWarningLight) XCTAssertTrue(inheritedTheme.colorAlwaysOnWarningLight == OtherMockTheme.otherMockThemeSemanticColorToken) @@ -875,7 +875,7 @@ final class TestThemeOverrideOfColorSemanticTokens: XCTestCase { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnWarningDark, abstractTheme.colorAlwaysOnWarningDark) XCTAssertTrue(inheritedTheme.colorAlwaysOnWarningDark == OtherMockTheme.otherMockThemeSemanticColorToken) } - + func testInheritedThemeCanOverrideSemanticTokenColorAlwaysOnWhiteLight() throws { XCTAssertNotEqual(inheritedTheme.colorAlwaysOnWhiteLight, abstractTheme.colorAlwaysOnWhiteLight) XCTAssertTrue(inheritedTheme.colorAlwaysOnWhiteLight == OtherMockTheme.otherMockThemeSemanticColorToken) @@ -1301,9 +1301,9 @@ final class TestThemeOverrideOfColorSemanticTokens: XCTestCase { XCTAssertNotEqual(inheritedTheme.colorDecorativeSkinTint900Dark, abstractTheme.colorDecorativeSkinTint900Dark) XCTAssertTrue(inheritedTheme.colorDecorativeSkinTint900Dark == OtherMockTheme.otherMockThemeSemanticColorToken) } - + // MARK: Semantic token - Colors - Chart - + func testInheritedThemeCanOverrideSemanticTokenColorChartCategoricalNeutralLight() throws { XCTAssertNotEqual(inheritedTheme.colorChartCategoricalNeutralLight, abstractTheme.colorChartCategoricalNeutralLight) XCTAssertTrue(inheritedTheme.colorChartCategoricalNeutralLight == OtherMockTheme.otherMockThemeSemanticColorToken) @@ -1895,7 +1895,7 @@ final class TestThemeOverrideOfColorSemanticTokens: XCTestCase { } // MARK: Semantic token - Colors - Content - On Action - + func testInheritedThemeCanOverrideSemanticTokenColorContentOnActionDisabledLight() throws { XCTAssertNotEqual(inheritedTheme.colorContentOnActionDisabledLight, abstractTheme.colorContentOnActionDisabledLight) XCTAssertTrue(inheritedTheme.colorContentOnActionDisabledLight == OtherMockTheme.otherMockThemeSemanticColorToken) @@ -2187,42 +2187,42 @@ final class TestThemeOverrideOfColorSemanticTokens: XCTestCase { } // MARK: - Semantic token - Colors - Gradient - + func testInheritedThemeCanOverrideSemanticTokenColorColorGradientSkeletonMiddleLight() throws { XCTAssertNotEqual(inheritedTheme.colorGradientSkeletonMiddleLight, abstractTheme.colorGradientSkeletonMiddleLight) XCTAssertTrue(inheritedTheme.colorGradientSkeletonMiddleLight == OtherMockTheme.otherMockThemeSemanticColorToken) } - + func testInheritedThemeCanOverrideSemanticTokenColorColorGradientSkeletonMiddleDark() throws { XCTAssertNotEqual(inheritedTheme.colorGradientSkeletonMiddleDark, abstractTheme.colorGradientSkeletonMiddleDark) XCTAssertTrue(inheritedTheme.colorGradientSkeletonMiddleDark == OtherMockTheme.otherMockThemeSemanticColorToken) } - + func testInheritedThemeCanOverrideSemanticTokenColorColorGradientSkeletonMiddleOnBgEmphasizedLight() throws { XCTAssertNotEqual(inheritedTheme.colorGradientSkeletonMiddleOnBgEmphasizedLight, abstractTheme.colorGradientSkeletonMiddleOnBgEmphasizedLight) XCTAssertTrue(inheritedTheme.colorGradientSkeletonMiddleOnBgEmphasizedLight == OtherMockTheme.otherMockThemeSemanticColorToken) } - + func testInheritedThemeCanOverrideSemanticTokenColorColorGradientSkeletonMiddleOnBgEmphasizedDark() throws { XCTAssertNotEqual(inheritedTheme.colorGradientSkeletonMiddleOnBgEmphasizedDark, abstractTheme.colorGradientSkeletonMiddleOnBgEmphasizedDark) XCTAssertTrue(inheritedTheme.colorGradientSkeletonMiddleOnBgEmphasizedDark == OtherMockTheme.otherMockThemeSemanticColorToken) } - + func testInheritedThemeCanOverrideSemanticTokenColorColorGradientSkeletonStartEndLight() throws { XCTAssertNotEqual(inheritedTheme.colorGradientSkeletonStartEndLight, abstractTheme.colorGradientSkeletonStartEndLight) XCTAssertTrue(inheritedTheme.colorGradientSkeletonStartEndLight == OtherMockTheme.otherMockThemeSemanticColorToken) } - + func testInheritedThemeCanOverrideSemanticTokenColorColorGradientSkeletonStartEndDark() throws { XCTAssertNotEqual(inheritedTheme.colorGradientSkeletonStartEndDark, abstractTheme.colorGradientSkeletonStartEndDark) XCTAssertTrue(inheritedTheme.colorGradientSkeletonStartEndDark == OtherMockTheme.otherMockThemeSemanticColorToken) } - + func testInheritedThemeCanOverrideSemanticTokenColorColorGradientSkeletonStartEndOnBgEmphasizedLight() throws { XCTAssertNotEqual(inheritedTheme.colorGradientSkeletonStartEndOnBgEmphasizedLight, inheritedTheme.colorGradientSkeletonStartEndOnBgEmphasizedLight) XCTAssertTrue(inheritedTheme.colorGradientSkeletonStartEndOnBgEmphasizedLight == OtherMockTheme.otherMockThemeSemanticColorToken) } - + func testInheritedThemeCanOverrideSemanticTokenColorColorGradientSkeletonStartEndOnBgEmphasizedDark() throws { XCTAssertNotEqual(inheritedTheme.colorGradientSkeletonStartEndOnBgEmphasizedDark, inheritedTheme.colorGradientSkeletonStartEndOnBgEmphasizedDark) XCTAssertTrue(inheritedTheme.colorGradientSkeletonStartEndOnBgEmphasizedDark == OtherMockTheme.otherMockThemeSemanticColorToken) diff --git a/OUDS/Core/Tokens/SemanticTokens/Sources/Values/ColorMultipleSemanticTokens.swift b/OUDS/Core/Tokens/SemanticTokens/Sources/Values/ColorMultipleSemanticTokens.swift index d839e48ac..fa241796d 100644 --- a/OUDS/Core/Tokens/SemanticTokens/Sources/Values/ColorMultipleSemanticTokens.swift +++ b/OUDS/Core/Tokens/SemanticTokens/Sources/Values/ColorMultipleSemanticTokens.swift @@ -18,6 +18,7 @@ // swiftlint:disable missing_docs // swiftlint:disable identifier_name // swiftlint:disable line_length +// swiftlint:disable file_length /// This is a group of semantic tokens for **colors** but using ``MultipleColorSemanticTokens``. /// @@ -119,63 +120,63 @@ public protocol ColorMultipleSemanticTokens { var colorContentStatusNegative: MultipleColorSemanticTokens { get } var colorContentStatusAccent: MultipleColorSemanticTokens { get } - + var colorContentOnActionDisabled: MultipleColorSemanticTokens { get } var colorContentOnActionDisabledOnBgEmphasized: MultipleColorSemanticTokens { get } - + var colorContentOnActionNegative: MultipleColorSemanticTokens { get } - + var colorContentOnActionPrimaryEnabled: MultipleColorSemanticTokens { get } - + var colorContentOnActionPrimaryEnabledOnBgEmphasized: MultipleColorSemanticTokens { get } - + var colorContentOnActionPrimaryFocus: MultipleColorSemanticTokens { get } - + var colorContentOnActionPrimaryFocusOnBgEmphasized: MultipleColorSemanticTokens { get } - + var colorContentOnActionPrimaryHover: MultipleColorSemanticTokens { get } - + var colorContentOnActionPrimaryHoverOnBgEmphasized: MultipleColorSemanticTokens { get } var colorContentOnActionPrimaryLoading: MultipleColorSemanticTokens { get } - + var colorContentOnActionPrimaryLoadingOnBgEmphasized: MultipleColorSemanticTokens { get } - + var colorContentOnActionPrimaryPressed: MultipleColorSemanticTokens { get } - + var colorContentOnActionPrimaryPressedOnBgEmphasized: MultipleColorSemanticTokens { get } - + var colorContentOnBrandPrimary: MultipleColorSemanticTokens { get } - + var colorContentOnStatusAccentEmphasized: MultipleColorSemanticTokens { get } - + var colorContentOnStatusAccentMuted: MultipleColorSemanticTokens { get } - + var colorContentOnStatusAccentMutedOnBgEmphasized: MultipleColorSemanticTokens { get } - + var colorContentOnStatusInfoEmphasized: MultipleColorSemanticTokens { get } - + var colorContentOnStatusInfoMuted: MultipleColorSemanticTokens { get } - + var colorContentOnStatusInfoMutedOnBgEmphasized: MultipleColorSemanticTokens { get } - + var colorContentOnStatusNegativeEmphasized: MultipleColorSemanticTokens { get } - + var colorContentOnStatusNegativeMuted: MultipleColorSemanticTokens { get } - + var colorContentOnStatusNegativeMutedOnBgEmphasized: MultipleColorSemanticTokens { get } - + var colorContentOnStatusPositiveEmphasized: MultipleColorSemanticTokens { get } - + var colorContentOnStatusPositiveMuted: MultipleColorSemanticTokens { get } - + var colorContentOnStatusPositiveMutedOnBgEmphasized: MultipleColorSemanticTokens { get } - + var colorContentOnStatusWarningEmphasized: MultipleColorSemanticTokens { get } - + var colorContentOnStatusWarningMuted: MultipleColorSemanticTokens { get } - + var colorContentOnStatusWarningMutedOnBgEmphasized: MultipleColorSemanticTokens { get } // MARK: Semantic token - Colors - Border @@ -191,17 +192,17 @@ public protocol ColorMultipleSemanticTokens { var colorBorderFocus: MultipleColorSemanticTokens { get } var colorBorderFocusInset: MultipleColorSemanticTokens { get } - + var colorBorderFocusInsetOnBgEmphasized: MultipleColorSemanticTokens { get } - + var colorBorderFocusOnBgEmphasized: MultipleColorSemanticTokens { get } - + var colorBorderBrandPrimaryOnBgEmphasized: MultipleColorSemanticTokens { get } var colorBorderBrandPrimary: MultipleColorSemanticTokens { get } var colorBorderOnBrandPrimary: MultipleColorSemanticTokens { get } - + // MARK: Semantic token - Colors - Action var colorActionSelected: MultipleColorSemanticTokens { get } @@ -275,7 +276,7 @@ public protocol ColorMultipleSemanticTokens { var colorAlwaysWarning: MultipleColorSemanticTokens { get } var colorAlwaysNegative: MultipleColorSemanticTokens { get } - + var colorAlwaysPositive: MultipleColorSemanticTokens { get } var colorAlwaysInfo: MultipleColorSemanticTokens { get } @@ -283,19 +284,19 @@ public protocol ColorMultipleSemanticTokens { var colorAlwaysAccent: MultipleColorSemanticTokens { get } var colorAlwaysOnAccent: MultipleColorSemanticTokens { get } - + var colorAlwaysOnBlack: MultipleColorSemanticTokens { get } - + var colorAlwaysOnInfo: MultipleColorSemanticTokens { get } - + var colorAlwaysOnNegative: MultipleColorSemanticTokens { get } - + var colorAlwaysOnPositive: MultipleColorSemanticTokens { get } - + var colorAlwaysOnWarning: MultipleColorSemanticTokens { get } - + var colorAlwaysOnWhite: MultipleColorSemanticTokens { get } - + // MARK: Semantic token - Colors - Transparent var colorTransparentDefault: MultipleColorSemanticTokens { get } @@ -509,16 +510,16 @@ public protocol ColorMultipleSemanticTokens { var colorChartSequentialAccent5Tint800: MultipleColorSemanticTokens { get } var colorChartSequentialAccent5Tint900: MultipleColorSemanticTokens { get } - + // MARK: - Semantic token - Colors - Gradient - - var colorGradientSkeletonMiddleLight: MultipleColorSemanticTokens { get } - - var colorGradientSkeletonMiddleOnBgEmphasizedLight: MultipleColorSemanticTokens { get } - - var colorGradientSkeletonStartEndLight: MultipleColorSemanticTokens { get } - - var colorGradientSkeletonStartEndOnBgEmphasizedLight: MultipleColorSemanticTokens { get } + + var colorGradientSkeletonMiddle: MultipleColorSemanticTokens { get } + + var colorGradientSkeletonMiddleOnBgEmphasized: MultipleColorSemanticTokens { get } + + var colorGradientSkeletonStartEnd: MultipleColorSemanticTokens { get } + + var colorGradientSkeletonStartEndOnBgEmphasized: MultipleColorSemanticTokens { get } } // swiftlint:enable missing_docs diff --git a/OUDS/Core/Tokens/SemanticTokens/Sources/Values/ColorSemanticTokens.swift b/OUDS/Core/Tokens/SemanticTokens/Sources/Values/ColorSemanticTokens.swift index 797edc4ac..e837954b4 100644 --- a/OUDS/Core/Tokens/SemanticTokens/Sources/Values/ColorSemanticTokens.swift +++ b/OUDS/Core/Tokens/SemanticTokens/Sources/Values/ColorSemanticTokens.swift @@ -92,7 +92,7 @@ public protocol ColorSemanticTokens { var colorContentBrandPrimaryLight: ColorSemanticToken { get } var colorContentBrandPrimaryOnBgEmphasizedLight: ColorSemanticToken { get } - + var colorContentStatusPositiveLight: ColorSemanticToken { get } var colorContentStatusInfoLight: ColorSemanticToken { get } @@ -100,88 +100,88 @@ public protocol ColorSemanticTokens { var colorContentStatusWarningLight: ColorSemanticToken { get } var colorContentStatusNegativeLight: ColorSemanticToken { get } - - var colorContentOnActionDisabledLight: ColorSemanticToken { get }c - - var colorContentOnActionDisabledOnBgEmphasizedLight: ColorSemanticToken { get }c - - var colorContentOnActionNegativeLight: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryEnabledLight: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryEnabledOnBgEmphasizedLight: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryFocusLight: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryFocusOnBgEmphasizedLight: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryHoverLight: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryHoverOnBgEmphasizedLight: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryLoadingLight: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryLoadingOnBgEmphasizedLight: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryPressedLight: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryPressedOnBgEmphasizedLight: ColorSemanticToken { get }c - - var colorContentOnBrandPrimaryLight: ColorSemanticToken { get }c - - var colorContentOnStatusAccentEmphasizedLight: ColorSemanticToken { get }c - - var colorContentOnStatusAccentMutedLight: ColorSemanticToken { get }c - - var colorContentOnStatusAccentMutedOnBgEmphasizedLight: ColorSemanticToken { get }c - - var colorContentOnStatusInfoEmphasizedLight: ColorSemanticToken { get }c - - var colorContentOnStatusInfoMutedLight: ColorSemanticToken { get }c - - var colorContentOnStatusInfoMutedOnBgEmphasizedLight: ColorSemanticToken { get }c - - var colorContentOnStatusNegativeEmphasizedLight: ColorSemanticToken { get }c - - var colorContentOnStatusNegativeMutedLight: ColorSemanticToken { get }c - - var colorContentOnStatusNegativeMutedOnBgEmphasizedLight: ColorSemanticToken { get }c - - var colorContentOnStatusPositiveEmphasizedLight: ColorSemanticToken { get }c - - var colorContentOnStatusPositiveMutedLight: ColorSemanticToken { get }c - - var colorContentOnStatusPositiveMutedOnBgEmphasizedLight: ColorSemanticToken { get }c - - var colorContentOnStatusWarningEmphasizedLight: ColorSemanticToken { get }c - - var colorContentOnStatusWarningMutedLight: ColorSemanticToken { get }c - - var colorContentOnStatusWarningMutedOnBgEmphasizedLight: ColorSemanticToken { get }c - + + var colorContentOnActionDisabledLight: ColorSemanticToken { get } + + var colorContentOnActionDisabledOnBgEmphasizedLight: ColorSemanticToken { get } + + var colorContentOnActionNegativeLight: ColorSemanticToken { get } + + var colorContentOnActionPrimaryEnabledLight: ColorSemanticToken { get } + + var colorContentOnActionPrimaryEnabledOnBgEmphasizedLight: ColorSemanticToken { get } + + var colorContentOnActionPrimaryFocusLight: ColorSemanticToken { get } + + var colorContentOnActionPrimaryFocusOnBgEmphasizedLight: ColorSemanticToken { get } + + var colorContentOnActionPrimaryHoverLight: ColorSemanticToken { get } + + var colorContentOnActionPrimaryHoverOnBgEmphasizedLight: ColorSemanticToken { get } + + var colorContentOnActionPrimaryLoadingLight: ColorSemanticToken { get } + + var colorContentOnActionPrimaryLoadingOnBgEmphasizedLight: ColorSemanticToken { get } + + var colorContentOnActionPrimaryPressedLight: ColorSemanticToken { get } + + var colorContentOnActionPrimaryPressedOnBgEmphasizedLight: ColorSemanticToken { get } + + var colorContentOnBrandPrimaryLight: ColorSemanticToken { get } + + var colorContentOnStatusAccentEmphasizedLight: ColorSemanticToken { get } + + var colorContentOnStatusAccentMutedLight: ColorSemanticToken { get } + + var colorContentOnStatusAccentMutedOnBgEmphasizedLight: ColorSemanticToken { get } + + var colorContentOnStatusInfoEmphasizedLight: ColorSemanticToken { get } + + var colorContentOnStatusInfoMutedLight: ColorSemanticToken { get } + + var colorContentOnStatusInfoMutedOnBgEmphasizedLight: ColorSemanticToken { get } + + var colorContentOnStatusNegativeEmphasizedLight: ColorSemanticToken { get } + + var colorContentOnStatusNegativeMutedLight: ColorSemanticToken { get } + + var colorContentOnStatusNegativeMutedOnBgEmphasizedLight: ColorSemanticToken { get } + + var colorContentOnStatusPositiveEmphasizedLight: ColorSemanticToken { get } + + var colorContentOnStatusPositiveMutedLight: ColorSemanticToken { get } + + var colorContentOnStatusPositiveMutedOnBgEmphasizedLight: ColorSemanticToken { get } + + var colorContentOnStatusWarningEmphasizedLight: ColorSemanticToken { get } + + var colorContentOnStatusWarningMutedLight: ColorSemanticToken { get } + + var colorContentOnStatusWarningMutedOnBgEmphasizedLight: ColorSemanticToken { get } + // MARK: Semantic token - Colors - Border var colorBorderDefaultLight: ColorSemanticToken { get } - var colorBorderDefaultOnBgEmphasizeLight: ColorSemanticToken { get } + var colorBorderDefaultOnBgEmphasizedLight: ColorSemanticToken { get } var colorBorderEmphasizedLight: ColorSemanticToken { get } var colorBorderEmphasizedOnBgEmphasizedLight: ColorSemanticToken { get } - var colorBorderFocusLight: MultipleColorSemanticTokens { get } - - var colorBorderFocusInsetLight: MultipleColorSemanticTokens { get } - - var colorBorderFocusInsetOnBgEmphasizedLight: MultipleColorSemanticTokens { get } - - var colorBorderFocusOnBgEmphasizedLight: MultipleColorSemanticTokens { get } - + var colorBorderFocusLight: ColorSemanticToken { get } + + var colorBorderFocusInsetLight: ColorSemanticToken { get } + + var colorBorderFocusInsetOnBgEmphasizedLight: ColorSemanticToken { get } + + var colorBorderFocusOnBgEmphasizedLight: ColorSemanticToken { get } + var colorBorderBrandPrimaryOnBgEmphasizedLight: ColorSemanticToken { get } - - var colorBorderBrandPrimaryLight: MultipleColorSemanticTokens { get } - var colorBorderOnBrandPrimaryLight: MultipleColorSemanticTokens { get } + var colorBorderBrandPrimaryLight: ColorSemanticToken { get } + + var colorBorderOnBrandPrimaryLight: ColorSemanticToken { get } // MARK: Semantic token - Colors - Action @@ -254,25 +254,25 @@ public protocol ColorSemanticTokens { var colorAlwaysWarningLight: ColorSemanticToken { get } var colorAlwaysNegativeLight: ColorSemanticToken { get } - + var colorAlwaysPositiveLight: ColorSemanticToken { get } var colorAlwaysInfoLight: ColorSemanticToken { get } var colorAlwaysAccentLight: ColorSemanticToken { get } - + var colorAlwaysOnAccentLight: ColorSemanticToken { get } - + var colorAlwaysOnBlackLight: ColorSemanticToken { get } - + var colorAlwaysOnInfoLight: ColorSemanticToken { get } - + var colorAlwaysOnNegativeLight: ColorSemanticToken { get } - + var colorAlwaysOnPositiveLight: ColorSemanticToken { get } - + var colorAlwaysOnWarningLight: ColorSemanticToken { get } - + var colorAlwaysOnWhiteLight: ColorSemanticToken { get } // MARK: Semantic token - Colors - Transparent @@ -490,15 +490,15 @@ public protocol ColorSemanticTokens { var colorChartSequentialAccent5Tint900Light: ColorSemanticToken { get } // MARK: - Semantic token - Colors - Gradient - + var colorGradientSkeletonMiddleLight: ColorSemanticToken { get } - + var colorGradientSkeletonMiddleOnBgEmphasizedLight: ColorSemanticToken { get } - + var colorGradientSkeletonStartEndLight: ColorSemanticToken { get } - + var colorGradientSkeletonStartEndOnBgEmphasizedLight: ColorSemanticToken { get } - + // MARK: - Dark values // MARK: Semantic token - Colors - Background @@ -564,7 +564,7 @@ public protocol ColorSemanticTokens { var colorContentBrandPrimaryDark: ColorSemanticToken { get } var colorContentBrandPrimaryOnBgEmphasizedDark: ColorSemanticToken { get } - + var colorContentStatusPositiveDark: ColorSemanticToken { get } var colorContentStatusInfoDark: ColorSemanticToken { get } @@ -573,64 +573,64 @@ public protocol ColorSemanticTokens { var colorContentStatusNegativeDark: ColorSemanticToken { get } - var colorContentOnActionDisabledDark: ColorSemanticToken { get }c - - var colorContentOnActionDisabledOnBgEmphasizedDark: ColorSemanticToken { get }c - - var colorContentOnActionNegativeDark: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryEnabledDark: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryEnabledOnBgEmphasizedDark: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryFocusDark: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryFocusOnBgEmphasizedDark: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryHoverDark: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryHoverOnBgEmphasizedDark: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryLoadingDark: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryLoadingOnBgEmphasizedDark: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryPressedDark: ColorSemanticToken { get }c - - var colorContentOnActionPrimaryPressedOnBgEmphasizedDark: ColorSemanticToken { get }c - - var colorContentOnBrandPrimaryDark: ColorSemanticToken { get }c - - var colorContentOnStatusAccentEmphasizedDark: ColorSemanticToken { get }c - - var colorContentOnStatusAccentMutedDark: ColorSemanticToken { get }c - - var colorContentOnStatusAccentMutedOnBgEmphasizedDark: ColorSemanticToken { get }c - - var colorContentOnStatusInfoEmphasizedDark: ColorSemanticToken { get }c - - var colorContentOnStatusInfoMutedDark: ColorSemanticToken { get }c - - var colorContentOnStatusInfoMutedOnBgEmphasizedDark: ColorSemanticToken { get }c - - var colorContentOnStatusNegativeEmphasizedDark: ColorSemanticToken { get }c - - var colorContentOnStatusNegativeMutedDark: ColorSemanticToken { get }c - - var colorContentOnStatusNegativeMutedOnBgEmphasizedDark: ColorSemanticToken { get }c - - var colorContentOnStatusPositiveEmphasizedDark: ColorSemanticToken { get }c - - var colorContentOnStatusPositiveMutedDark: ColorSemanticToken { get }c - - var colorContentOnStatusPositiveMutedOnBgEmphasizedDark: ColorSemanticToken { get }c - - var colorContentOnStatusWarningEmphasizedDark: ColorSemanticToken { get }c - - var colorContentOnStatusWarningMutedDark: ColorSemanticToken { get }c - - var colorContentOnStatusWarningMutedOnBgEmphasizedDark: ColorSemanticToken { get }c - + var colorContentOnActionDisabledDark: ColorSemanticToken { get } + + var colorContentOnActionDisabledOnBgEmphasizedDark: ColorSemanticToken { get } + + var colorContentOnActionNegativeDark: ColorSemanticToken { get } + + var colorContentOnActionPrimaryEnabledDark: ColorSemanticToken { get } + + var colorContentOnActionPrimaryEnabledOnBgEmphasizedDark: ColorSemanticToken { get } + + var colorContentOnActionPrimaryFocusDark: ColorSemanticToken { get } + + var colorContentOnActionPrimaryFocusOnBgEmphasizedDark: ColorSemanticToken { get } + + var colorContentOnActionPrimaryHoverDark: ColorSemanticToken { get } + + var colorContentOnActionPrimaryHoverOnBgEmphasizedDark: ColorSemanticToken { get } + + var colorContentOnActionPrimaryLoadingDark: ColorSemanticToken { get } + + var colorContentOnActionPrimaryLoadingOnBgEmphasizedDark: ColorSemanticToken { get } + + var colorContentOnActionPrimaryPressedDark: ColorSemanticToken { get } + + var colorContentOnActionPrimaryPressedOnBgEmphasizedDark: ColorSemanticToken { get } + + var colorContentOnBrandPrimaryDark: ColorSemanticToken { get } + + var colorContentOnStatusAccentEmphasizedDark: ColorSemanticToken { get } + + var colorContentOnStatusAccentMutedDark: ColorSemanticToken { get } + + var colorContentOnStatusAccentMutedOnBgEmphasizedDark: ColorSemanticToken { get } + + var colorContentOnStatusInfoEmphasizedDark: ColorSemanticToken { get } + + var colorContentOnStatusInfoMutedDark: ColorSemanticToken { get } + + var colorContentOnStatusInfoMutedOnBgEmphasizedDark: ColorSemanticToken { get } + + var colorContentOnStatusNegativeEmphasizedDark: ColorSemanticToken { get } + + var colorContentOnStatusNegativeMutedDark: ColorSemanticToken { get } + + var colorContentOnStatusNegativeMutedOnBgEmphasizedDark: ColorSemanticToken { get } + + var colorContentOnStatusPositiveEmphasizedDark: ColorSemanticToken { get } + + var colorContentOnStatusPositiveMutedDark: ColorSemanticToken { get } + + var colorContentOnStatusPositiveMutedOnBgEmphasizedDark: ColorSemanticToken { get } + + var colorContentOnStatusWarningEmphasizedDark: ColorSemanticToken { get } + + var colorContentOnStatusWarningMutedDark: ColorSemanticToken { get } + + var colorContentOnStatusWarningMutedOnBgEmphasizedDark: ColorSemanticToken { get } + // MARK: Semantic token - Colors - Border var colorBorderDefaultDark: ColorSemanticToken { get } @@ -641,19 +641,19 @@ public protocol ColorSemanticTokens { var colorBorderEmphasizedOnBgEmphasizedDark: ColorSemanticToken { get } - var colorBorderFocusDark: MultipleColorSemanticTokens { get } - - var colorBorderFocusInsetDark: MultipleColorSemanticTokens { get } - - var colorBorderFocusInsetOnBgEmphasizedDark: MultipleColorSemanticTokens { get } - - var colorBorderFocusOnBgEmphasizedDark: MultipleColorSemanticTokens { get } - + var colorBorderFocusDark: ColorSemanticToken { get } + + var colorBorderFocusInsetDark: ColorSemanticToken { get } + + var colorBorderFocusInsetOnBgEmphasizedDark: ColorSemanticToken { get } + + var colorBorderFocusOnBgEmphasizedDark: ColorSemanticToken { get } + var colorBorderBrandPrimaryOnBgEmphasizedDark: ColorSemanticToken { get } - - var colorBorderBrandPrimaryDark: MultipleColorSemanticTokens { get } - var colorBorderOnBrandPrimaryDark: MultipleColorSemanticTokens { get } + var colorBorderBrandPrimaryDark: ColorSemanticToken { get } + + var colorBorderOnBrandPrimaryDark: ColorSemanticToken { get } // MARK: Semantic token - Colors - Action @@ -726,25 +726,25 @@ public protocol ColorSemanticTokens { var colorAlwaysWarningDark: ColorSemanticToken { get } var colorAlwaysNegativeDark: ColorSemanticToken { get } - + var colorAlwaysPositiveDark: ColorSemanticToken { get } var colorAlwaysInfoDark: ColorSemanticToken { get } var colorAlwaysAccentDark: ColorSemanticToken { get } - + var colorAlwaysOnAccentDark: ColorSemanticToken { get } - + var colorAlwaysOnBlackDark: ColorSemanticToken { get } - + var colorAlwaysOnInfoDark: ColorSemanticToken { get } - + var colorAlwaysOnNegativeDark: ColorSemanticToken { get } - + var colorAlwaysOnPositiveDark: ColorSemanticToken { get } - + var colorAlwaysOnWarningDark: ColorSemanticToken { get } - + var colorAlwaysOnWhiteDark: ColorSemanticToken { get } // MARK: Semantic token - Colors - Transparent @@ -960,15 +960,15 @@ public protocol ColorSemanticTokens { var colorChartSequentialAccent5Tint800Dark: ColorSemanticToken { get } var colorChartSequentialAccent5Tint900Dark: ColorSemanticToken { get } - + // MARK: - Semantic token - Colors - Gradient - + var colorGradientSkeletonMiddleDark: ColorSemanticToken { get } - + var colorGradientSkeletonMiddleOnBgEmphasizedDark: ColorSemanticToken { get } - + var colorGradientSkeletonStartEndDark: ColorSemanticToken { get } - + var colorGradientSkeletonStartEndOnBgEmphasizedDark: ColorSemanticToken { get } } diff --git a/Showcase/Showcase/Pages/Tokens/Color/NamedColor/NamedColor+Content.swift b/Showcase/Showcase/Pages/Tokens/Color/NamedColor/NamedColor+Content.swift index 3be173e2a..8e8bee33c 100644 --- a/Showcase/Showcase/Pages/Tokens/Color/NamedColor/NamedColor+Content.swift +++ b/Showcase/Showcase/Pages/Tokens/Color/NamedColor/NamedColor+Content.swift @@ -14,6 +14,9 @@ import OUDS import OUDSTokensSemantic +// swiftlint:disable identifier_name +// swiftlint:disable function_body_length + extension NamedColor { enum Content: String, CaseIterable { @@ -59,7 +62,7 @@ extension NamedColor { case colorContentOnStatusWarningEmphasized case colorContentOnStatusWarningMuted case colorContentOnStatusWarningMutedOnBgEmphasized - + func token(from theme: OUDSTheme) -> MultipleColorSemanticTokens { switch self { case .colorContentDefault: @@ -146,8 +149,10 @@ extension NamedColor { return theme.colorContentOnStatusWarningMuted case .colorContentOnStatusWarningMutedOnBgEmphasized: return theme.colorContentOnStatusWarningMutedOnBgEmphasized - } } } } + +// swiftlint:enable identifier_name +// swiftlint:enable function_body_length