From 07923a3b42a9789fdc79b5242f1cb1c75f0ba1fe Mon Sep 17 00:00:00 2001 From: boosted-bot Date: Wed, 11 Dec 2024 12:02:40 +0100 Subject: [PATCH 1/7] chore: update tokens --- .../ouds/tokens/global/raw/BorderRawTokens.kt | 1 + .../ouds/tokens/global/raw/ColorRawTokens.kt | 74 +++++-- .../tokens/global/raw/OpacityRawTokens.kt | 31 ++- .../global/raw/OrangeBrandColorRawTokens.kt | 2 +- .../semantic/OudsBorderSemanticTokens.kt | 32 +-- .../semantic/OudsColorActionSemanticTokens.kt | 100 ++++----- .../semantic/OudsColorAlwaysSemanticTokens.kt | 37 +--- .../semantic/OudsColorBgSemanticTokens.kt | 52 +---- .../semantic/OudsColorBorderSemanticTokens.kt | 34 ++-- .../OudsColorContentSemanticTokens.kt | 124 ++++-------- .../OudsColorDecorativeSemanticTokens.kt | 120 +++++------ .../OudsColorOpacitySemanticTokens.kt | 23 +++ .../OudsColorOverlaySemanticTokens.kt | 27 +++ .../OudsColorSurfaceSemanticTokens.kt | 46 +++++ .../tokens/semantic/OudsFontSemanticTokens.kt | 160 +++++++-------- .../tokens/semantic/OudsGridSemanticTokens.kt | 24 +-- .../semantic/OudsOpacitySemanticTokens.kt | 12 +- .../tokens/semantic/OudsSizeSemanticTokens.kt | 166 +++++++-------- .../semantic/OudsSpaceSemanticTokens.kt | 189 ++++++++---------- 19 files changed, 620 insertions(+), 634 deletions(-) create mode 100644 theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOpacitySemanticTokens.kt create mode 100644 theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOverlaySemanticTokens.kt create mode 100644 theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorSurfaceSemanticTokens.kt diff --git a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/BorderRawTokens.kt b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/BorderRawTokens.kt index 5783175a..41b4999e 100644 --- a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/BorderRawTokens.kt +++ b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/BorderRawTokens.kt @@ -36,6 +36,7 @@ object BorderRawTokens { const val borderWidth50 = borderBase * 0.5f // 2 const val borderWidth75 = borderBase * 0.75f // 3 const val borderWidth100 = borderBase * 1f // 4 + const val borderWidth125 = borderBase * 1.25f // 5 const val borderWidth150 = borderBase * 1.5f // 6 const val borderWidth200 = borderBase * 2f // 8 } \ No newline at end of file diff --git a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/ColorRawTokens.kt b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/ColorRawTokens.kt index 2467eac1..586daf5a 100644 --- a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/ColorRawTokens.kt +++ b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/ColorRawTokens.kt @@ -131,24 +131,58 @@ object ColorRawTokens { val colorFunctionalSun800 = Color(0xff665100) val colorFunctionalSun900 = Color(0xff3d3100) val colorFunctionalWhite = Color(0xffffffff) - val colorTransparentBlack0 = Color(0x00000000) - val colorTransparentBlack100 = Color(0x0a000000) - val colorTransparentBlack200 = Color(0x14000000) - val colorTransparentBlack300 = Color(0x29000000) - val colorTransparentBlack400 = Color(0x3d000000) - val colorTransparentBlack500 = Color(0x52000000) - val colorTransparentBlack600 = Color(0x7a000000) - val colorTransparentBlack700 = Color(0xa3000000) - val colorTransparentBlack800 = Color(0xe0000000) - val colorTransparentBlack900 = Color(0xff000000) - val colorTransparentWhite0 = Color(0x00ffffff) - val colorTransparentWhite100 = Color(0x0affffff) - val colorTransparentWhite200 = Color(0x14ffffff) - val colorTransparentWhite300 = Color(0x29ffffff) - val colorTransparentWhite400 = Color(0x3dffffff) - val colorTransparentWhite500 = Color(0x52ffffff) - val colorTransparentWhite600 = Color(0x7affffff) - val colorTransparentWhite700 = Color(0xa3ffffff) - val colorTransparentWhite800 = Color(0xe0ffffff) - val colorTransparentWhite900 = Color(0xffffffff) + val colorOpacityBlack0 = Color(0x00000000) + val colorOpacityBlack40 = Color(0x0a000000) + val colorOpacityBlack80 = Color(0x14000000) + val colorOpacityBlack120 = Color(0x1f000000) + val colorOpacityBlack160 = Color(0x29000000) + val colorOpacityBlack200 = Color(0x33000000) + val colorOpacityBlack240 = Color(0x3d000000) + val colorOpacityBlack280 = Color(0x47000000) + val colorOpacityBlack320 = Color(0x52000000) + val colorOpacityBlack360 = Color(0x5c000000) + val colorOpacityBlack400 = Color(0x66000000) + val colorOpacityBlack440 = Color(0x70000000) + val colorOpacityBlack480 = Color(0x7a000000) + val colorOpacityBlack520 = Color(0x85000000) + val colorOpacityBlack560 = Color(0x8f000000) + val colorOpacityBlack600 = Color(0x99000000) + val colorOpacityBlack640 = Color(0xa3000000) + val colorOpacityBlack680 = Color(0xad000000) + val colorOpacityBlack720 = Color(0xb8000000) + val colorOpacityBlack760 = Color(0xc2000000) + val colorOpacityBlack800 = Color(0xcc000000) + val colorOpacityBlack840 = Color(0xd6000000) + val colorOpacityBlack880 = Color(0xe0000000) + val colorOpacityBlack920 = Color(0xeb000000) + val colorOpacityBlack960 = Color(0xf5000000) + val colorOpacityDodgerBlue = Color(0x1426b2ff) + val colorOpacityMalachite = Color(0x1f3de35a) + val colorOpacityScarlet = Color(0x14ea0305) + val colorOpacitySun = Color(0x29ffd000) + val colorOpacityWhite0 = Color(0x00ffffff) + val colorOpacityWhite40 = Color(0x0affffff) + val colorOpacityWhite80 = Color(0x14ffffff) + val colorOpacityWhite120 = Color(0x1fffffff) + val colorOpacityWhite160 = Color(0x29ffffff) + val colorOpacityWhite200 = Color(0x33ffffff) + val colorOpacityWhite240 = Color(0x3dffffff) + val colorOpacityWhite280 = Color(0x47ffffff) + val colorOpacityWhite320 = Color(0x52ffffff) + val colorOpacityWhite360 = Color(0x5cffffff) + val colorOpacityWhite400 = Color(0x66ffffff) + val colorOpacityWhite440 = Color(0x70ffffff) + val colorOpacityWhite480 = Color(0x7affffff) + val colorOpacityWhite520 = Color(0x85ffffff) + val colorOpacityWhite560 = Color(0x8fffffff) + val colorOpacityWhite600 = Color(0x99ffffff) + val colorOpacityWhite640 = Color(0xa3ffffff) + val colorOpacityWhite680 = Color(0xadffffff) + val colorOpacityWhite720 = Color(0xb8ffffff) + val colorOpacityWhite760 = Color(0xc2ffffff) + val colorOpacityWhite800 = Color(0xccffffff) + val colorOpacityWhite840 = Color(0xd6ffffff) + val colorOpacityWhite880 = Color(0xe0ffffff) + val colorOpacityWhite920 = Color(0xebffffff) + val colorOpacityWhite960 = Color(0xf5ffffff) } \ No newline at end of file diff --git a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OpacityRawTokens.kt b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OpacityRawTokens.kt index 5a4633f1..24f0d318 100644 --- a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OpacityRawTokens.kt +++ b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OpacityRawTokens.kt @@ -14,13 +14,28 @@ package com.orange.ouds.tokens.global.raw object OpacityRawTokens { const val opacity0 = 0f - const val opacity100 = 0.04f - const val opacity200 = 0.08f - const val opacity300 = 0.16f - const val opacity400 = 0.24f - const val opacity500 = 0.32f - const val opacity600 = 0.48f - const val opacity700 = 0.64f + const val opacity40 = 0.04f + const val opacity80 = 0.08f + const val opacity120 = 0.12f + const val opacity160 = 0.16f + const val opacity200 = 0.2f + const val opacity240 = 0.24f + const val opacity280 = 0.28f + const val opacity320 = 0.32f + const val opacity360 = 0.36f + const val opacity400 = 0.4f + const val opacity440 = 0.44f + const val opacity480 = 0.48f + const val opacity520 = 0.52f + const val opacity560 = 0.56f + const val opacity600 = 0.6f + const val opacity640 = 0.64f + const val opacity680 = 0.68f + const val opacity720 = 0.72f + const val opacity760 = 0.76f const val opacity800 = 0.8f - const val opacity900 = 1f + const val opacity880 = 0.88f + const val opacity920 = 0.92f + const val opacity960 = 0.96f + const val opacity1000 = 1f } \ No newline at end of file diff --git a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OrangeBrandColorRawTokens.kt b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OrangeBrandColorRawTokens.kt index da3604f0..58d4a131 100644 --- a/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OrangeBrandColorRawTokens.kt +++ b/global-raw-tokens/src/main/java/com/orange/ouds/tokens/global/raw/OrangeBrandColorRawTokens.kt @@ -21,7 +21,7 @@ object OrangeBrandColorRawTokens { val colorOrange300 = Color(0xffffa554) val colorOrange400 = Color(0xffff9433) val colorOrange500 = Color(0xffff7900) - val colorOrange550 = Color(0xfff16e00) + val colorOrange550 = Color(0xfff15e00) val colorOrange600 = Color(0xffe86e00) val colorOrange700 = Color(0xffb55600) val colorOrange800 = Color(0xff8c4300) diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsBorderSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsBorderSemanticTokens.kt index ae4dd5e9..3cbd8a14 100644 --- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsBorderSemanticTokens.kt +++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsBorderSemanticTokens.kt @@ -15,20 +15,20 @@ package com.orange.ouds.theme.tokens.semantic import com.orange.ouds.tokens.global.raw.BorderRawTokens data class OudsBorderSemanticTokens( - val radiusDefault: Float = BorderRawTokens.borderRadius0, - val radiusMedium: Float = BorderRawTokens.borderRadius150, - val radiusNone: Float = BorderRawTokens.borderRadius0, - val radiusPill: Float = BorderRawTokens.borderRadius9999, - val radiusShort: Float = BorderRawTokens.borderRadius75, - val radiusTall: Float = BorderRawTokens.borderRadius300, - val styleDefault: String = BorderRawTokens.borderStyleSolid, - val styleDrag: String = BorderRawTokens.borderStyleDashed, - val widthDefault: Float = BorderRawTokens.borderWidth25, - val widthFocus: Float = BorderRawTokens.borderWidth50, - val widthFocusInset: Float = BorderRawTokens.borderWidth100, - val widthMedium: Float = BorderRawTokens.borderWidth50, - val widthNone: Float = BorderRawTokens.borderWidth0, - val widthThick: Float = BorderRawTokens.borderWidth75, - val widthThicker: Float = BorderRawTokens.borderWidth100, - val widthThin: Float = BorderRawTokens.borderWidth25 + val radiusDefault: Float = BorderRawTokens.borderRadius0, + val radiusMedium: Float = BorderRawTokens.borderRadius150, + val radiusNone: Float = BorderRawTokens.borderRadius0, + val radiusPill: Float = BorderRawTokens.borderRadius9999, + val radiusShort: Float = BorderRawTokens.borderRadius75, + val radiusTall: Float = BorderRawTokens.borderRadius300, + val styleDefault: String = BorderRawTokens.borderStyleSolid, + val styleDrag: String = BorderRawTokens.borderStyleDashed, + val widthDefault: Float = BorderRawTokens.borderWidth25, + val widthFocus: Float = BorderRawTokens.borderWidth125, + val widthFocusInset: Float = BorderRawTokens.borderWidth50, + val widthMedium: Float = BorderRawTokens.borderWidth50, + val widthNone: Float = BorderRawTokens.borderWidth0, + val widthThick: Float = BorderRawTokens.borderWidth75, + val widthThicker: Float = BorderRawTokens.borderWidth100, + val widthThin: Float = BorderRawTokens.borderWidth25 ) diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorActionSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorActionSemanticTokens.kt index c25343d0..76c9f7c3 100644 --- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorActionSemanticTokens.kt +++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorActionSemanticTokens.kt @@ -17,66 +17,42 @@ import com.orange.ouds.tokens.global.raw.ColorRawTokens import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens data class OudsColorActionSemanticTokens( - val actionDisabledLight: Color = ColorRawTokens.colorFunctionalLightGray400, - val actionDisabledOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray400, - val actionNegativeEnabledLight: Color = ColorRawTokens.colorFunctionalScarlet600, - val actionNegativeFocusLight: Color = ColorRawTokens.colorFunctionalScarlet700, - val actionNegativeHoverLight: Color = ColorRawTokens.colorFunctionalScarlet700, - val actionNegativeLoadingLight: Color = ColorRawTokens.colorFunctionalScarlet800, - val actionNegativePressedLight: Color = ColorRawTokens.colorFunctionalScarlet800, - val actionNegativeEnabledDark: Color = ColorRawTokens.colorFunctionalScarlet600, - val actionNegativeFocusDark: Color = ColorRawTokens.colorFunctionalScarlet700, - val actionNegativeHoverDark: Color = ColorRawTokens.colorFunctionalScarlet700, - val actionNegativeLoadingDark: Color = ColorRawTokens.colorFunctionalScarlet800, - val actionNegativePressedDark: Color = ColorRawTokens.colorFunctionalScarlet800, - val actionPrimaryEnabledLight: Color = ColorRawTokens.colorFunctionalBlack, - val actionPrimaryEnabledOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160, - val actionPrimaryFocusLight: Color = ColorRawTokens.colorFunctionalDarkGray400, - val actionPrimaryFocusOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray560, - val actionPrimaryHoverLight: Color = ColorRawTokens.colorFunctionalDarkGray400, - val actionPrimaryHoverOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray560, - val actionPrimaryLoadingLight: Color = OrangeBrandColorRawTokens.colorOrange550, - val actionPrimaryLoadingOnBgEmphasizedLight: Color = OrangeBrandColorRawTokens.colorOrange500, - val actionPrimaryPressedLight: Color = OrangeBrandColorRawTokens.colorOrange550, - val actionPrimaryPressedOnBgEmphasizedLight: Color = OrangeBrandColorRawTokens.colorOrange500, - val actionPrimaryEnabledDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val actionPrimaryEnabledOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val actionPrimaryFocusDark: Color = ColorRawTokens.colorFunctionalLightGray560, - val actionPrimaryFocusOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray560, - val actionPrimaryHoverDark: Color = ColorRawTokens.colorFunctionalLightGray560, - val actionPrimaryHoverOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray560, - val actionPrimaryLoadingDark: Color = OrangeBrandColorRawTokens.colorOrange500, - val actionPrimaryLoadingOnBgEmphasizedDark: Color = OrangeBrandColorRawTokens.colorOrange500, - val actionPrimaryPressedDark: Color = OrangeBrandColorRawTokens.colorOrange500, - val actionPrimaryPressedOnBgEmphasizedDark: Color = OrangeBrandColorRawTokens.colorOrange500, - val actionSecondaryEnabledLight: Color = ColorRawTokens.colorFunctionalLightGray80, - val actionSecondaryEnabledOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray720, - val actionSecondaryFocusLight: Color = ColorRawTokens.colorFunctionalLightGray160, - val actionSecondaryFocusOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray640, - val actionSecondaryHoverLight: Color = ColorRawTokens.colorFunctionalLightGray160, - val actionSecondaryHoverOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray640, - val actionSecondaryLoadingLight: Color = ColorRawTokens.colorFunctionalLightGray160, - val actionSecondaryLoadingOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray640, - val actionSecondaryPressedLight: Color = ColorRawTokens.colorFunctionalLightGray160, - val actionSecondaryPressedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray640, - val actionSecondaryEnabledDark: Color = ColorRawTokens.colorFunctionalDarkGray720, - val actionSecondaryEnabledOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray720, - val actionSecondaryFocusDark: Color = ColorRawTokens.colorFunctionalDarkGray640, - val actionSecondaryFocusOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray640, - val actionSecondaryHoverDark: Color = ColorRawTokens.colorFunctionalDarkGray640, - val actionSecondaryHoverOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray640, - val actionSecondaryLoadingDark: Color = ColorRawTokens.colorFunctionalDarkGray640, - val actionSecondaryLoadingOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray640, - val actionSecondaryPressedDark: Color = ColorRawTokens.colorFunctionalDarkGray640, - val actionSecondaryPressedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray640, - val actionSelectedLight: Color = OrangeBrandColorRawTokens.colorOrange550, - val actionSelectedOnBgEmphasizedLight: Color = OrangeBrandColorRawTokens.colorOrange500, - val actionVisitedLight: Color = ColorRawTokens.colorDecorativeAmethyst600, - val actionVisitedOnBgEmphasizedLight: Color = ColorRawTokens.colorDecorativeAmethyst400, - val actionDisabledDark: Color = ColorRawTokens.colorFunctionalDarkGray400, - val actionDisabledOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray400, - val actionSelectedDark: Color = OrangeBrandColorRawTokens.colorOrange500, - val actionSelectedOnBgEmphasizedDark: Color = OrangeBrandColorRawTokens.colorOrange500, - val actionVisitedDark: Color = ColorRawTokens.colorDecorativeAmethyst400, - val actionVisitedOnBgEmphasizedDark: Color = ColorRawTokens.colorDecorativeAmethyst400 + val actionDisabledLight: Color = ColorRawTokens.colorOpacityBlack200, + val actionEnabledLight: Color = ColorRawTokens.colorFunctionalBlack, + val actionFocusLight: Color = ColorRawTokens.colorOpacityBlack680, + val actionHighlightedLight: Color = ColorRawTokens.colorFunctionalBlack, + val actionHoverLight: Color = ColorRawTokens.colorOpacityBlack680, + val actionLoadingLight: Color = OrangeBrandColorRawTokens.colorOrange550, + val actionNegativeEnabledLight: Color = ColorRawTokens.colorFunctionalScarlet600, + val actionNegativeFocusLight: Color = ColorRawTokens.colorFunctionalScarlet700, + val actionNegativeHoverLight: Color = ColorRawTokens.colorFunctionalScarlet700, + val actionNegativeLoadingLight: Color = ColorRawTokens.colorFunctionalScarlet800, + val actionNegativePressedLight: Color = ColorRawTokens.colorFunctionalScarlet800, + val actionNegativeEnabledDark: Color = ColorRawTokens.colorFunctionalScarlet300, + val actionNegativeFocusDark: Color = ColorRawTokens.colorFunctionalScarlet200, + val actionNegativeHoverDark: Color = ColorRawTokens.colorFunctionalScarlet200, + val actionNegativeLoadingDark: Color = ColorRawTokens.colorFunctionalScarlet100, + val actionNegativePressedDark: Color = ColorRawTokens.colorFunctionalScarlet100, + val actionPressedLight: Color = OrangeBrandColorRawTokens.colorOrange550, + val actionSelectedLight: Color = OrangeBrandColorRawTokens.colorOrange550, + val actionSupportEnabledLight: Color = ColorRawTokens.colorOpacityBlack40, + val actionSupportFocusLight: Color = ColorRawTokens.colorOpacityBlack80, + val actionSupportHoverLight: Color = ColorRawTokens.colorOpacityBlack80, + val actionSupportLoadingLight: Color = ColorRawTokens.colorOpacityBlack80, + val actionSupportPressedLight: Color = ColorRawTokens.colorOpacityBlack80, + val actionSupportEnabledDark: Color = ColorRawTokens.colorOpacityWhite40, + val actionSupportFocusDark: Color = ColorRawTokens.colorOpacityWhite80, + val actionSupportHoverDark: Color = ColorRawTokens.colorOpacityWhite80, + val actionSupportLoadingDark: Color = ColorRawTokens.colorOpacityWhite80, + val actionSupportPressedDark: Color = ColorRawTokens.colorOpacityWhite80, + val actionVisitedLight: Color = ColorRawTokens.colorDecorativeAmethyst600, + val actionDisabledDark: Color = ColorRawTokens.colorOpacityWhite200, + val actionEnabledDark: Color = ColorRawTokens.colorFunctionalLightGray160, + val actionFocusDark: Color = ColorRawTokens.colorOpacityWhite640, + val actionHighlightedDark: Color = ColorRawTokens.colorFunctionalLightGray160, + val actionHoverDark: Color = ColorRawTokens.colorOpacityWhite640, + val actionLoadingDark: Color = OrangeBrandColorRawTokens.colorOrange500, + val actionPressedDark: Color = OrangeBrandColorRawTokens.colorOrange500, + val actionSelectedDark: Color = OrangeBrandColorRawTokens.colorOrange500, + val actionVisitedDark: Color = ColorRawTokens.colorDecorativeAmethyst400 ) diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorAlwaysSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorAlwaysSemanticTokens.kt index 61f88937..75792fba 100644 --- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorAlwaysSemanticTokens.kt +++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorAlwaysSemanticTokens.kt @@ -14,35 +14,14 @@ package com.orange.ouds.theme.tokens.semantic import androidx.compose.ui.graphics.Color import com.orange.ouds.tokens.global.raw.ColorRawTokens -import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens data class OudsColorAlwaysSemanticTokens( - val alwaysAccentLight: Color = ColorRawTokens.colorFunctionalSun500, - val alwaysBlackLight: Color = ColorRawTokens.colorFunctionalBlack, - val alwaysInfoLight: Color = ColorRawTokens.colorFunctionalDodgerBlue500, - val alwaysNegativeLight: Color = ColorRawTokens.colorFunctionalScarlet600, - val alwaysOnAccentLight: Color = ColorRawTokens.colorFunctionalBlack, - val alwaysOnBlackLight: Color = ColorRawTokens.colorFunctionalWhite, - val alwaysOnInfoLight: Color = ColorRawTokens.colorFunctionalBlack, - val alwaysOnNegativeLight: Color = ColorRawTokens.colorFunctionalWhite, - val alwaysOnPositiveLight: Color = ColorRawTokens.colorFunctionalBlack, - val alwaysOnWarningLight: Color = ColorRawTokens.colorFunctionalBlack, - val alwaysOnWhiteLight: Color = ColorRawTokens.colorFunctionalBlack, - val alwaysPositiveLight: Color = ColorRawTokens.colorFunctionalMalachite500, - val alwaysWarningLight: Color = ColorRawTokens.colorFunctionalSun500, - val alwaysWhiteLight: Color = ColorRawTokens.colorFunctionalWhite, - val alwaysAccentDark: Color = ColorRawTokens.colorFunctionalSun500, - val alwaysBlackDark: Color = ColorRawTokens.colorFunctionalBlack, - val alwaysInfoDark: Color = ColorRawTokens.colorFunctionalDodgerBlue500, - val alwaysNegativeDark: Color = ColorRawTokens.colorFunctionalScarlet600, - val alwaysOnAccentDark: Color = ColorRawTokens.colorFunctionalDarkGray880, - val alwaysOnBlackDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val alwaysOnInfoDark: Color = ColorRawTokens.colorFunctionalDarkGray880, - val alwaysOnNegativeDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val alwaysOnPositiveDark: Color = ColorRawTokens.colorFunctionalDarkGray880, - val alwaysOnWarningDark: Color = ColorRawTokens.colorFunctionalDarkGray880, - val alwaysOnWhiteDark: Color = ColorRawTokens.colorFunctionalDarkGray880, - val alwaysPositiveDark: Color = ColorRawTokens.colorFunctionalMalachite500, - val alwaysWarningDark: Color = ColorRawTokens.colorFunctionalSun500, - val alwaysWhiteDark: Color = ColorRawTokens.colorFunctionalWhite + val alwaysBlackLight: Color = ColorRawTokens.colorFunctionalBlack, + val alwaysOnBlackLight: Color = ColorRawTokens.colorFunctionalWhite, + val alwaysOnWhiteLight: Color = ColorRawTokens.colorFunctionalBlack, + val alwaysWhiteLight: Color = ColorRawTokens.colorFunctionalWhite, + val alwaysBlackDark: Color = ColorRawTokens.colorFunctionalBlack, + val alwaysOnBlackDark: Color = ColorRawTokens.colorFunctionalLightGray160, + val alwaysOnWhiteDark: Color = ColorRawTokens.colorFunctionalBlack, + val alwaysWhiteDark: Color = ColorRawTokens.colorFunctionalWhite ) diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBgSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBgSemanticTokens.kt index 69bd1e03..31a8794e 100644 --- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBgSemanticTokens.kt +++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBgSemanticTokens.kt @@ -17,48 +17,12 @@ import com.orange.ouds.tokens.global.raw.ColorRawTokens import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens data class OudsColorBgSemanticTokens( - val bgBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange550, - val bgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray880, - val bgPrimaryLight: Color = ColorRawTokens.colorFunctionalWhite, - val bgSecondaryLight: Color = ColorRawTokens.colorFunctionalLightGray80, - val bgStatusAccentEmphasizedLight: Color = ColorRawTokens.colorFunctionalSun500, - val bgStatusAccentMutedLight: Color = OrangeBrandColorRawTokens.colorWarmGray100, - val bgStatusAccentMutedOnBgEmphasizedLight: Color = OrangeBrandColorRawTokens.colorWarmGray900, - val bgStatusInfoEmphasizedLight: Color = ColorRawTokens.colorFunctionalDodgerBlue500, - val bgStatusInfoMutedLight: Color = ColorRawTokens.colorFunctionalDodgerBlue100, - val bgStatusInfoMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDodgerBlue900, - val bgStatusNegativeEmphasizedLight: Color = ColorRawTokens.colorFunctionalScarlet600, - val bgStatusNegativeMutedLight: Color = ColorRawTokens.colorFunctionalScarlet100, - val bgStatusNegativeMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalScarlet900, - val bgStatusNeutralLight: Color = ColorRawTokens.colorFunctionalLightGray80, - val bgStatusNeutralOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray720, - val bgStatusPositiveEmphasizedLight: Color = ColorRawTokens.colorFunctionalMalachite500, - val bgStatusPositiveMutedLight: Color = ColorRawTokens.colorFunctionalMalachite100, - val bgStatusPositiveMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalMalachite900, - val bgStatusWarningEmphasizedLight: Color = ColorRawTokens.colorFunctionalSun500, - val bgStatusWarningMutedLight: Color = ColorRawTokens.colorFunctionalSun100, - val bgStatusWarningMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalSun900, - val bgStatusAccentEmphasizedDark: Color = ColorRawTokens.colorFunctionalSun500, - val bgStatusAccentMutedDark: Color = OrangeBrandColorRawTokens.colorWarmGray900, - val bgStatusAccentMutedOnBgEmphasizedDark: Color = OrangeBrandColorRawTokens.colorWarmGray900, - val bgStatusInfoEmphasizedDark: Color = ColorRawTokens.colorFunctionalDodgerBlue500, - val bgStatusInfoMutedDark: Color = ColorRawTokens.colorFunctionalDodgerBlue900, - val bgStatusInfoMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDodgerBlue900, - val bgStatusNegativeEmphasizedDark: Color = ColorRawTokens.colorFunctionalScarlet600, - val bgStatusNegativeMutedDark: Color = ColorRawTokens.colorFunctionalScarlet900, - val bgStatusNegativeMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalScarlet900, - val bgStatusNeutralDark: Color = ColorRawTokens.colorFunctionalDarkGray720, - val bgStatusNeutralOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray720, - val bgStatusPositiveEmphasizedDark: Color = ColorRawTokens.colorFunctionalMalachite500, - val bgStatusPositiveMutedDark: Color = ColorRawTokens.colorFunctionalMalachite900, - val bgStatusPositiveMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalMalachite900, - val bgStatusWarningEmphasizedDark: Color = ColorRawTokens.colorFunctionalSun500, - val bgStatusWarningMutedDark: Color = ColorRawTokens.colorFunctionalSun900, - val bgStatusWarningMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalSun900, - val bgTertiaryLight: Color = OrangeBrandColorRawTokens.colorWarmGray100, - val bgBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500, - val bgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray640, - val bgPrimaryDark: Color = ColorRawTokens.colorFunctionalDarkGray880, - val bgSecondaryDark: Color = ColorRawTokens.colorFunctionalDarkGray800, - val bgTertiaryDark: Color = OrangeBrandColorRawTokens.colorWarmGray900 + val bgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray880, + val bgPrimaryLight: Color = ColorRawTokens.colorFunctionalWhite, + val bgSecondaryLight: Color = ColorRawTokens.colorFunctionalLightGray80, + val bgTertiaryLight: Color = OrangeBrandColorRawTokens.colorWarmGray100, + val bgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray640, + val bgPrimaryDark: Color = ColorRawTokens.colorFunctionalDarkGray880, + val bgSecondaryDark: Color = ColorRawTokens.colorFunctionalDarkGray800, + val bgTertiaryDark: Color = OrangeBrandColorRawTokens.colorWarmGray900 ) diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBorderSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBorderSemanticTokens.kt index 813b449b..67843fb5 100644 --- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBorderSemanticTokens.kt +++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBorderSemanticTokens.kt @@ -17,26 +17,16 @@ import com.orange.ouds.tokens.global.raw.ColorRawTokens import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens data class OudsColorBorderSemanticTokens( - val borderBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange550, - val borderBrandPrimaryOnBgEmphasizedLight: Color = OrangeBrandColorRawTokens.colorOrange500, - val borderDefaultLight: Color = ColorRawTokens.colorFunctionalLightGray400, - val borderDefaultOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray400, - val borderEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack, - val borderEmphasizedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160, - val borderFocusLight: Color = ColorRawTokens.colorFunctionalBlack, - val borderFocusInsetLight: Color = ColorRawTokens.colorFunctionalWhite, - val borderFocusInsetOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray880, - val borderFocusOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160, - val borderOnBrandPrimaryLight: Color = ColorRawTokens.colorFunctionalWhite, - val borderOnBrandPrimaryDark: Color = ColorRawTokens.colorFunctionalBlack, - val borderBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500, - val borderBrandPrimaryOnBgEmphasizedDark: Color = OrangeBrandColorRawTokens.colorOrange500, - val borderDefaultDark: Color = ColorRawTokens.colorFunctionalDarkGray400, - val borderDefaultOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray400, - val borderEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val borderEmphasizedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val borderFocusDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val borderFocusInsetDark: Color = ColorRawTokens.colorFunctionalDarkGray880, - val borderFocusInsetOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val borderFocusOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray880 + val borderBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange550, + val borderDefaultLight: Color = ColorRawTokens.colorOpacityBlack200, + val borderEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack, + val borderFocusLight: Color = ColorRawTokens.colorFunctionalBlack, + val borderFocusInsetLight: Color = ColorRawTokens.colorFunctionalWhite, + val borderOnBrandPrimaryLight: Color = ColorRawTokens.colorFunctionalBlack, + val borderOnBrandPrimaryDark: Color = ColorRawTokens.colorFunctionalBlack, + val borderBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500, + val borderDefaultDark: Color = ColorRawTokens.colorOpacityWhite200, + val borderEmphasizedDark: Color = ColorRawTokens.colorOpacityWhite920, + val borderFocusDark: Color = ColorRawTokens.colorFunctionalLightGray160, + val borderFocusInsetDark: Color = ColorRawTokens.colorFunctionalDarkGray880 ) diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorContentSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorContentSemanticTokens.kt index 459c0395..c514fbf1 100644 --- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorContentSemanticTokens.kt +++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorContentSemanticTokens.kt @@ -17,86 +17,46 @@ import com.orange.ouds.tokens.global.raw.ColorRawTokens import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens data class OudsColorContentSemanticTokens( - val contentBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange550, - val contentBrandPrimaryOnBgEmphasizedLight: Color = OrangeBrandColorRawTokens.colorOrange500, - val contentDefaultLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentDefaultOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentDisabledLight: Color = ColorRawTokens.colorFunctionalLightGray400, - val contentDisabledOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray400, - val contentMutedLight: Color = ColorRawTokens.colorFunctionalDarkGray400, - val contentMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray560, - val contentOnActionDisabledLight: Color = ColorRawTokens.colorFunctionalWhite, - val contentOnActionDisabledOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionNegativeLight: Color = ColorRawTokens.colorFunctionalWhite, - val contentOnActionPrimaryEnabledLight: Color = ColorRawTokens.colorFunctionalWhite, - val contentOnActionPrimaryEnabledOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionPrimaryFocusLight: Color = ColorRawTokens.colorFunctionalWhite, - val contentOnActionPrimaryFocusOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionPrimaryHoverLight: Color = ColorRawTokens.colorFunctionalWhite, - val contentOnActionPrimaryHoverOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionPrimaryLoadingLight: Color = ColorRawTokens.colorFunctionalWhite, - val contentOnActionPrimaryLoadingOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionPrimaryPressedLight: Color = ColorRawTokens.colorFunctionalWhite, - val contentOnActionPrimaryPressedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionPrimaryEnabledDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionPrimaryEnabledOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionPrimaryFocusDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionPrimaryFocusOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionPrimaryHoverDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionPrimaryHoverOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionPrimaryLoadingDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionPrimaryLoadingOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionPrimaryPressedDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionPrimaryPressedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionDisabledDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionDisabledOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnActionNegativeDark: Color = ColorRawTokens.colorFunctionalWhite, - val contentOnBrandPrimaryLight: Color = ColorRawTokens.colorFunctionalWhite, - val contentOnBrandPrimaryDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnStatusAccentEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnStatusAccentMutedLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnStatusAccentMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentOnStatusInfoEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnStatusInfoMutedLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnStatusInfoMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentOnStatusNegativeEmphasizedLight: Color = ColorRawTokens.colorFunctionalWhite, - val contentOnStatusNegativeMutedLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnStatusNegativeMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentOnStatusPositiveEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnStatusPositiveMutedLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnStatusPositiveMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentOnStatusWarningEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnStatusWarningMutedLight: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnStatusWarningMutedOnBgEmphasizedLight: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentOnStatusAccentEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnStatusAccentMutedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentOnStatusAccentMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentOnStatusInfoEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnStatusInfoMutedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentOnStatusInfoMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentOnStatusNegativeEmphasizedDark: Color = ColorRawTokens.colorFunctionalWhite, - val contentOnStatusNegativeMutedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentOnStatusNegativeMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentOnStatusPositiveEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnStatusPositiveMutedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentOnStatusPositiveMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentOnStatusWarningEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack, - val contentOnStatusWarningMutedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentOnStatusWarningMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentStatusInfoLight: Color = ColorRawTokens.colorFunctionalDodgerBlue500, - val contentStatusNegativeLight: Color = ColorRawTokens.colorFunctionalScarlet600, - val contentStatusPositiveLight: Color = ColorRawTokens.colorFunctionalMalachite500, - val contentStatusWarningLight: Color = ColorRawTokens.colorFunctionalSun500, - val contentStatusInfoDark: Color = ColorRawTokens.colorFunctionalDodgerBlue500, - val contentStatusNegativeDark: Color = ColorRawTokens.colorFunctionalScarlet600, - val contentStatusPositiveDark: Color = ColorRawTokens.colorFunctionalMalachite500, - val contentStatusWarningDark: Color = ColorRawTokens.colorFunctionalSun500, - val contentBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500, - val contentBrandPrimaryOnBgEmphasizedDark: Color = OrangeBrandColorRawTokens.colorOrange500, - val contentDefaultDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentDefaultOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val contentDisabledDark: Color = ColorRawTokens.colorFunctionalDarkGray400, - val contentDisabledOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalDarkGray400, - val contentMutedDark: Color = ColorRawTokens.colorFunctionalLightGray560, - val contentMutedOnBgEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray560 + val contentBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange550, + val contentDefaultLight: Color = ColorRawTokens.colorFunctionalBlack, + val contentDisabledLight: Color = ColorRawTokens.colorOpacityBlack200, + val contentMutedLight: Color = ColorRawTokens.colorOpacityBlack680, + val contentOnActionDisabledLight: Color = ColorRawTokens.colorFunctionalWhite, + val contentOnActionEnabledLight: Color = ColorRawTokens.colorFunctionalWhite, + val contentOnActionFocusLight: Color = ColorRawTokens.colorFunctionalWhite, + val contentOnActionHighlightedLight: Color = ColorRawTokens.colorFunctionalWhite, + val contentOnActionHoverLight: Color = ColorRawTokens.colorFunctionalWhite, + val contentOnActionLoadingLight: Color = ColorRawTokens.colorFunctionalWhite, + val contentOnActionNegativeLight: Color = ColorRawTokens.colorFunctionalWhite, + val contentOnActionPressedLight: Color = ColorRawTokens.colorFunctionalWhite, + val contentOnActionDisabledDark: Color = ColorRawTokens.colorFunctionalBlack, + val contentOnActionEnabledDark: Color = ColorRawTokens.colorFunctionalBlack, + val contentOnActionFocusDark: Color = ColorRawTokens.colorFunctionalBlack, + val contentOnActionHighlightedDark: Color = ColorRawTokens.colorFunctionalBlack, + val contentOnActionHoverDark: Color = ColorRawTokens.colorFunctionalBlack, + val contentOnActionLoadingDark: Color = ColorRawTokens.colorFunctionalBlack, + val contentOnActionNegativeDark: Color = ColorRawTokens.colorFunctionalBlack, + val contentOnActionPressedDark: Color = ColorRawTokens.colorFunctionalBlack, + val contentOnBrandPrimaryLight: Color = ColorRawTokens.colorFunctionalBlack, + val contentOnBrandPrimaryDark: Color = ColorRawTokens.colorFunctionalBlack, + val contentOnOverlayEmphasizedLight: Color = ColorRawTokens.colorFunctionalWhite, + val contentOnOverlayEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack, + val contentOnStatusEmphasizedLight: Color = ColorRawTokens.colorFunctionalBlack, + val contentOnStatusEmphasizedNeutralLight: Color = ColorRawTokens.colorFunctionalWhite, + val contentOnStatusMutedLight: Color = ColorRawTokens.colorFunctionalBlack, + val contentOnStatusEmphasizedDark: Color = ColorRawTokens.colorFunctionalBlack, + val contentOnStatusEmphasizedNeutralDark: Color = ColorRawTokens.colorFunctionalBlack, + val contentOnStatusMutedDark: Color = ColorRawTokens.colorFunctionalLightGray160, + val contentStatusInfoLight: Color = ColorRawTokens.colorFunctionalDodgerBlue500, + val contentStatusNegativeLight: Color = ColorRawTokens.colorFunctionalScarlet600, + val contentStatusPositiveLight: Color = ColorRawTokens.colorFunctionalMalachite500, + val contentStatusWarningLight: Color = ColorRawTokens.colorFunctionalSun500, + val contentStatusInfoDark: Color = ColorRawTokens.colorFunctionalDodgerBlue500, + val contentStatusNegativeDark: Color = ColorRawTokens.colorFunctionalScarlet600, + val contentStatusPositiveDark: Color = ColorRawTokens.colorFunctionalMalachite500, + val contentStatusWarningDark: Color = ColorRawTokens.colorFunctionalSun500, + val contentBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500, + val contentDefaultDark: Color = ColorRawTokens.colorFunctionalLightGray160, + val contentDisabledDark: Color = ColorRawTokens.colorOpacityWhite200, + val contentMutedDark: Color = ColorRawTokens.colorOpacityWhite640 ) diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorDecorativeSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorDecorativeSemanticTokens.kt index 1d08e919..010fdef0 100644 --- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorDecorativeSemanticTokens.kt +++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorDecorativeSemanticTokens.kt @@ -17,64 +17,64 @@ import com.orange.ouds.tokens.global.raw.ColorRawTokens import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens data class OudsColorDecorativeSemanticTokens( - val decorativeAccent1DefaultLight: Color = ColorRawTokens.colorDecorativeEmerald500, - val decorativeAccent1EmphasizedLight: Color = ColorRawTokens.colorDecorativeEmerald700, - val decorativeAccent1MutedLight: Color = ColorRawTokens.colorDecorativeEmerald200, - val decorativeAccent1DefaultDark: Color = ColorRawTokens.colorDecorativeEmerald500, - val decorativeAccent1EmphasizedDark: Color = ColorRawTokens.colorDecorativeEmerald700, - val decorativeAccent1MutedDark: Color = ColorRawTokens.colorDecorativeEmerald200, - val decorativeAccent2DefaultLight: Color = ColorRawTokens.colorDecorativeSky400, - val decorativeAccent2EmphasizedLight: Color = ColorRawTokens.colorDecorativeSky700, - val decorativeAccent2MutedLight: Color = ColorRawTokens.colorDecorativeSky200, - val decorativeAccent2DefaultDark: Color = ColorRawTokens.colorDecorativeSky400, - val decorativeAccent2EmphasizedDark: Color = ColorRawTokens.colorDecorativeSky700, - val decorativeAccent2MutedDark: Color = ColorRawTokens.colorDecorativeSky200, - val decorativeAccent3DefaultLight: Color = ColorRawTokens.colorFunctionalSun500, - val decorativeAccent3EmphasizedLight: Color = ColorRawTokens.colorDecorativeAmber500, - val decorativeAccent3MutedLight: Color = ColorRawTokens.colorFunctionalSun200, - val decorativeAccent3DefaultDark: Color = ColorRawTokens.colorFunctionalSun500, - val decorativeAccent3EmphasizedDark: Color = ColorRawTokens.colorDecorativeAmber500, - val decorativeAccent3MutedDark: Color = ColorRawTokens.colorFunctionalSun200, - val decorativeAccent4DefaultLight: Color = ColorRawTokens.colorDecorativeAmethyst400, - val decorativeAccent4EmphasizedLight: Color = ColorRawTokens.colorDecorativeAmethyst800, - val decorativeAccent4MutedLight: Color = ColorRawTokens.colorDecorativeAmethyst200, - val decorativeAccent4DefaultDark: Color = ColorRawTokens.colorDecorativeAmethyst400, - val decorativeAccent4EmphasizedDark: Color = ColorRawTokens.colorDecorativeAmethyst800, - val decorativeAccent4MutedDark: Color = ColorRawTokens.colorDecorativeAmethyst200, - val decorativeAccent5DefaultLight: Color = ColorRawTokens.colorDecorativeShockingPink200, - val decorativeAccent5EmphasizedLight: Color = ColorRawTokens.colorDecorativeShockingPink300, - val decorativeAccent5MutedLight: Color = ColorRawTokens.colorDecorativeShockingPink100, - val decorativeAccent5DefaultDark: Color = ColorRawTokens.colorDecorativeShockingPink200, - val decorativeAccent5EmphasizedDark: Color = ColorRawTokens.colorDecorativeShockingPink300, - val decorativeAccent5MutedDark: Color = ColorRawTokens.colorDecorativeShockingPink100, - val decorativeBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange500, - val decorativeBrandSecondaryLight: Color = ColorRawTokens.colorFunctionalBlack, - val decorativeBrandTertiaryLight: Color = ColorRawTokens.colorFunctionalWhite, - val decorativeBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500, - val decorativeBrandSecondaryDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val decorativeBrandTertiaryDark: Color = ColorRawTokens.colorFunctionalDarkGray880, - val decorativeNeutralDefaultLight: Color = ColorRawTokens.colorFunctionalDarkGray400, - val decorativeNeutralEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray640, - val decorativeNeutralMutedLight: Color = ColorRawTokens.colorFunctionalLightGray160, - val decorativeNeutralDefaultDark: Color = ColorRawTokens.colorFunctionalLightGray560, - val decorativeNeutralEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160, - val decorativeNeutralMutedDark: Color = ColorRawTokens.colorFunctionalDarkGray720, - val decorativeSkinTint100Light: Color = ColorRawTokens.colorDecorativeDeepPeach100, - val decorativeSkinTint200Light: Color = ColorRawTokens.colorDecorativeDeepPeach200, - val decorativeSkinTint300Light: Color = ColorRawTokens.colorDecorativeDeepPeach300, - val decorativeSkinTint400Light: Color = ColorRawTokens.colorDecorativeDeepPeach400, - val decorativeSkinTint500Light: Color = ColorRawTokens.colorDecorativeDeepPeach500, - val decorativeSkinTint600Light: Color = ColorRawTokens.colorDecorativeDeepPeach600, - val decorativeSkinTint700Light: Color = ColorRawTokens.colorDecorativeDeepPeach700, - val decorativeSkinTint800Light: Color = ColorRawTokens.colorDecorativeDeepPeach800, - val decorativeSkinTint900Light: Color = ColorRawTokens.colorDecorativeDeepPeach900, - val decorativeSkinTint100Dark: Color = ColorRawTokens.colorDecorativeDeepPeach100, - val decorativeSkinTint200Dark: Color = ColorRawTokens.colorDecorativeDeepPeach200, - val decorativeSkinTint300Dark: Color = ColorRawTokens.colorDecorativeDeepPeach300, - val decorativeSkinTint400Dark: Color = ColorRawTokens.colorDecorativeDeepPeach400, - val decorativeSkinTint500Dark: Color = ColorRawTokens.colorDecorativeDeepPeach500, - val decorativeSkinTint600Dark: Color = ColorRawTokens.colorDecorativeDeepPeach600, - val decorativeSkinTint700Dark: Color = ColorRawTokens.colorDecorativeDeepPeach700, - val decorativeSkinTint800Dark: Color = ColorRawTokens.colorDecorativeDeepPeach800, - val decorativeSkinTint900Dark: Color = ColorRawTokens.colorDecorativeDeepPeach900 + val decorativeAccent1DefaultLight: Color = ColorRawTokens.colorDecorativeEmerald500, + val decorativeAccent1EmphasizedLight: Color = ColorRawTokens.colorDecorativeEmerald700, + val decorativeAccent1MutedLight: Color = ColorRawTokens.colorDecorativeEmerald200, + val decorativeAccent1DefaultDark: Color = ColorRawTokens.colorDecorativeEmerald500, + val decorativeAccent1EmphasizedDark: Color = ColorRawTokens.colorDecorativeEmerald700, + val decorativeAccent1MutedDark: Color = ColorRawTokens.colorDecorativeEmerald200, + val decorativeAccent2DefaultLight: Color = ColorRawTokens.colorDecorativeSky400, + val decorativeAccent2EmphasizedLight: Color = ColorRawTokens.colorDecorativeSky700, + val decorativeAccent2MutedLight: Color = ColorRawTokens.colorDecorativeSky200, + val decorativeAccent2DefaultDark: Color = ColorRawTokens.colorDecorativeSky400, + val decorativeAccent2EmphasizedDark: Color = ColorRawTokens.colorDecorativeSky700, + val decorativeAccent2MutedDark: Color = ColorRawTokens.colorDecorativeSky200, + val decorativeAccent3DefaultLight: Color = ColorRawTokens.colorFunctionalSun500, + val decorativeAccent3EmphasizedLight: Color = ColorRawTokens.colorDecorativeAmber500, + val decorativeAccent3MutedLight: Color = ColorRawTokens.colorFunctionalSun200, + val decorativeAccent3DefaultDark: Color = ColorRawTokens.colorFunctionalSun500, + val decorativeAccent3EmphasizedDark: Color = ColorRawTokens.colorDecorativeAmber500, + val decorativeAccent3MutedDark: Color = ColorRawTokens.colorFunctionalSun200, + val decorativeAccent4DefaultLight: Color = ColorRawTokens.colorDecorativeAmethyst400, + val decorativeAccent4EmphasizedLight: Color = ColorRawTokens.colorDecorativeAmethyst800, + val decorativeAccent4MutedLight: Color = ColorRawTokens.colorDecorativeAmethyst200, + val decorativeAccent4DefaultDark: Color = ColorRawTokens.colorDecorativeAmethyst400, + val decorativeAccent4EmphasizedDark: Color = ColorRawTokens.colorDecorativeAmethyst800, + val decorativeAccent4MutedDark: Color = ColorRawTokens.colorDecorativeAmethyst200, + val decorativeAccent5DefaultLight: Color = ColorRawTokens.colorDecorativeShockingPink200, + val decorativeAccent5EmphasizedLight: Color = ColorRawTokens.colorDecorativeShockingPink300, + val decorativeAccent5MutedLight: Color = ColorRawTokens.colorDecorativeShockingPink100, + val decorativeAccent5DefaultDark: Color = ColorRawTokens.colorDecorativeShockingPink200, + val decorativeAccent5EmphasizedDark: Color = ColorRawTokens.colorDecorativeShockingPink300, + val decorativeAccent5MutedDark: Color = ColorRawTokens.colorDecorativeShockingPink100, + val decorativeBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange500, + val decorativeBrandSecondaryLight: Color = ColorRawTokens.colorFunctionalBlack, + val decorativeBrandTertiaryLight: Color = ColorRawTokens.colorFunctionalWhite, + val decorativeBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500, + val decorativeBrandSecondaryDark: Color = ColorRawTokens.colorFunctionalLightGray160, + val decorativeBrandTertiaryDark: Color = ColorRawTokens.colorFunctionalDarkGray880, + val decorativeNeutralDefaultLight: Color = ColorRawTokens.colorFunctionalDarkGray400, + val decorativeNeutralEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray640, + val decorativeNeutralMutedLight: Color = ColorRawTokens.colorFunctionalLightGray160, + val decorativeNeutralDefaultDark: Color = ColorRawTokens.colorFunctionalLightGray560, + val decorativeNeutralEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160, + val decorativeNeutralMutedDark: Color = ColorRawTokens.colorFunctionalDarkGray720, + val decorativeSkinTint100Light: Color = ColorRawTokens.colorDecorativeDeepPeach100, + val decorativeSkinTint200Light: Color = ColorRawTokens.colorDecorativeDeepPeach200, + val decorativeSkinTint300Light: Color = ColorRawTokens.colorDecorativeDeepPeach300, + val decorativeSkinTint400Light: Color = ColorRawTokens.colorDecorativeDeepPeach400, + val decorativeSkinTint500Light: Color = ColorRawTokens.colorDecorativeDeepPeach500, + val decorativeSkinTint600Light: Color = ColorRawTokens.colorDecorativeDeepPeach600, + val decorativeSkinTint700Light: Color = ColorRawTokens.colorDecorativeDeepPeach700, + val decorativeSkinTint800Light: Color = ColorRawTokens.colorDecorativeDeepPeach800, + val decorativeSkinTint900Light: Color = ColorRawTokens.colorDecorativeDeepPeach900, + val decorativeSkinTint100Dark: Color = ColorRawTokens.colorDecorativeDeepPeach100, + val decorativeSkinTint200Dark: Color = ColorRawTokens.colorDecorativeDeepPeach200, + val decorativeSkinTint300Dark: Color = ColorRawTokens.colorDecorativeDeepPeach300, + val decorativeSkinTint400Dark: Color = ColorRawTokens.colorDecorativeDeepPeach400, + val decorativeSkinTint500Dark: Color = ColorRawTokens.colorDecorativeDeepPeach500, + val decorativeSkinTint600Dark: Color = ColorRawTokens.colorDecorativeDeepPeach600, + val decorativeSkinTint700Dark: Color = ColorRawTokens.colorDecorativeDeepPeach700, + val decorativeSkinTint800Dark: Color = ColorRawTokens.colorDecorativeDeepPeach800, + val decorativeSkinTint900Dark: Color = ColorRawTokens.colorDecorativeDeepPeach900 ) diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOpacitySemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOpacitySemanticTokens.kt new file mode 100644 index 00000000..b90cecc0 --- /dev/null +++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOpacitySemanticTokens.kt @@ -0,0 +1,23 @@ +// +// Software Name: OUDS Android +// SPDX-FileCopyrightText: Copyright (c) Orange SA +// SPDX-License-Identifier: MIT +// +// This software is distributed under the MIT license, +// the text of which is available at https://opensource.org/license/MIT/ +// or see the "LICENSE" file for more details. +// +// Software description: Android library of reusable graphical components +// + +package com.orange.ouds.theme.tokens.semantic + +import androidx.compose.ui.graphics.Color +import com.orange.ouds.tokens.global.raw.ColorRawTokens + +data class OudsColorOpacitySemanticTokens( + val opacityInvisibleBlackLight: Color = ColorRawTokens.colorOpacityBlack0, + val opacityInvisibleWhiteLight: Color = ColorRawTokens.colorOpacityWhite0, + val opacityInvisibleBlackDark: Color = ColorRawTokens.colorOpacityWhite0, + val opacityInvisibleWhiteDark: Color = ColorRawTokens.colorOpacityWhite0 +) diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOverlaySemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOverlaySemanticTokens.kt new file mode 100644 index 00000000..653143bc --- /dev/null +++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorOverlaySemanticTokens.kt @@ -0,0 +1,27 @@ +// +// Software Name: OUDS Android +// SPDX-FileCopyrightText: Copyright (c) Orange SA +// SPDX-License-Identifier: MIT +// +// This software is distributed under the MIT license, +// the text of which is available at https://opensource.org/license/MIT/ +// or see the "LICENSE" file for more details. +// +// Software description: Android library of reusable graphical components +// + +package com.orange.ouds.theme.tokens.semantic + +import androidx.compose.ui.graphics.Color +import com.orange.ouds.tokens.global.raw.ColorRawTokens + +data class OudsColorOverlaySemanticTokens( + val overlayDefaultLight: Color = ColorRawTokens.colorFunctionalWhite, + val overlayDragLight: Color = ColorRawTokens.colorOpacityBlack40, + val overlayEmphasizedLight: Color = ColorRawTokens.colorFunctionalDarkGray720, + val overlayModalLight: Color = ColorRawTokens.colorFunctionalWhite, + val overlayDefaultDark: Color = ColorRawTokens.colorOpacityWhite80, + val overlayDragDark: Color = ColorRawTokens.colorOpacityWhite200, + val overlayEmphasizedDark: Color = ColorRawTokens.colorFunctionalLightGray160, + val overlayModalDark: Color = ColorRawTokens.colorFunctionalDarkGray640 +) diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorSurfaceSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorSurfaceSemanticTokens.kt new file mode 100644 index 00000000..04b70613 --- /dev/null +++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorSurfaceSemanticTokens.kt @@ -0,0 +1,46 @@ +// +// Software Name: OUDS Android +// SPDX-FileCopyrightText: Copyright (c) Orange SA +// SPDX-License-Identifier: MIT +// +// This software is distributed under the MIT license, +// the text of which is available at https://opensource.org/license/MIT/ +// or see the "LICENSE" file for more details. +// +// Software description: Android library of reusable graphical components +// + +package com.orange.ouds.theme.tokens.semantic + +import androidx.compose.ui.graphics.Color +import com.orange.ouds.tokens.global.raw.ColorRawTokens +import com.orange.ouds.tokens.global.raw.OrangeBrandColorRawTokens + +data class OudsColorSurfaceSemanticTokens( + val surfaceBrandPrimaryLight: Color = OrangeBrandColorRawTokens.colorOrange500, + val surfaceBrandPrimaryDark: Color = OrangeBrandColorRawTokens.colorOrange500, + val surfaceStatusAccentEmphasizedLight: Color = ColorRawTokens.colorFunctionalSun500, + val surfaceStatusAccentMutedLight: Color = ColorRawTokens.colorOpacitySun, + val surfaceStatusAccentEmphasizedDark: Color = ColorRawTokens.colorFunctionalSun300, + val surfaceStatusAccentMutedDark: Color = OrangeBrandColorRawTokens.colorWarmGray900, + val surfaceStatusInfoEmphasizedLight: Color = ColorRawTokens.colorFunctionalDodgerBlue500, + val surfaceStatusInfoMutedLight: Color = ColorRawTokens.colorOpacityDodgerBlue, + val surfaceStatusInfoEmphasizedDark: Color = ColorRawTokens.colorFunctionalDodgerBlue300, + val surfaceStatusInfoMutedDark: Color = ColorRawTokens.colorFunctionalDodgerBlue900, + val surfaceStatusNegativeEmphasizedLight: Color = ColorRawTokens.colorFunctionalScarlet600, + val surfaceStatusNegativeMutedLight: Color = ColorRawTokens.colorOpacityScarlet, + val surfaceStatusNegativeEmphasizedDark: Color = ColorRawTokens.colorFunctionalScarlet300, + val surfaceStatusNegativeMutedDark: Color = ColorRawTokens.colorFunctionalScarlet900, + val surfaceStatusNeutralEmphasizedLight: Color = ColorRawTokens.colorOpacityBlack840, + val surfaceStatusNeutralMutedLight: Color = ColorRawTokens.colorOpacityBlack40, + val surfaceStatusNeutralEmphasizedDark: Color = ColorRawTokens.colorOpacityWhite800, + val surfaceStatusNeutralMutedDark: Color = ColorRawTokens.colorOpacityWhite80, + val surfaceStatusPositiveEmphasizedLight: Color = ColorRawTokens.colorFunctionalMalachite500, + val surfaceStatusPositiveMutedLight: Color = ColorRawTokens.colorOpacityMalachite, + val surfaceStatusPositiveEmphasizedDark: Color = ColorRawTokens.colorFunctionalMalachite300, + val surfaceStatusPositiveMutedDark: Color = ColorRawTokens.colorFunctionalMalachite900, + val surfaceStatusWarningEmphasizedLight: Color = ColorRawTokens.colorFunctionalSun500, + val surfaceStatusWarningMutedLight: Color = ColorRawTokens.colorOpacitySun, + val surfaceStatusWarningEmphasizedDark: Color = ColorRawTokens.colorFunctionalSun300, + val surfaceStatusWarningMutedDark: Color = ColorRawTokens.colorFunctionalSun900 +) diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsFontSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsFontSemanticTokens.kt index 7f07ad04..dea90a8f 100644 --- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsFontSemanticTokens.kt +++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsFontSemanticTokens.kt @@ -15,84 +15,84 @@ package com.orange.ouds.theme.tokens.semantic import com.orange.ouds.tokens.global.raw.FontRawTokens data class OudsFontSemanticTokens( - val letterSpacingBodyLargeMobile: Float = FontRawTokens.fontLetterSpacing250, - val letterSpacingBodyLargeTablet: Float = FontRawTokens.fontLetterSpacing250, - val letterSpacingBodyMediumMobile: Float = FontRawTokens.fontLetterSpacing200, - val letterSpacingBodyMediumTablet: Float = FontRawTokens.fontLetterSpacing200, - val letterSpacingBodySmallMobile: Float = FontRawTokens.fontLetterSpacing150, - val letterSpacingBodySmallTablet: Float = FontRawTokens.fontLetterSpacing150, - val letterSpacingDisplayLargeMobile: Float = FontRawTokens.fontLetterSpacing850, - val letterSpacingDisplayLargeTablet: Float = FontRawTokens.fontLetterSpacing1450, - val letterSpacingDisplayMediumMobile: Float = FontRawTokens.fontLetterSpacing750, - val letterSpacingDisplayMediumTablet: Float = FontRawTokens.fontLetterSpacing1050, - val letterSpacingDisplaySmallMobile: Float = FontRawTokens.fontLetterSpacing650, - val letterSpacingDisplaySmallTablet: Float = FontRawTokens.fontLetterSpacing850, - val letterSpacingHeadingLargeMobile: Float = FontRawTokens.fontLetterSpacing450, - val letterSpacingHeadingLargeTablet: Float = FontRawTokens.fontLetterSpacing550, - val letterSpacingHeadingMediumMobile: Float = FontRawTokens.fontLetterSpacing350, - val letterSpacingHeadingMediumTablet: Float = FontRawTokens.fontLetterSpacing450, - val letterSpacingHeadingSmallMobile: Float = FontRawTokens.fontLetterSpacing300, - val letterSpacingHeadingSmallTablet: Float = FontRawTokens.fontLetterSpacing350, - val letterSpacingHeadingXlargeMobile: Float = FontRawTokens.fontLetterSpacing550, - val letterSpacingHeadingXlargeTablet: Float = FontRawTokens.fontLetterSpacing750, - val letterSpacingLabelLarge: Float = FontRawTokens.fontLetterSpacing250, - val letterSpacingLabelMedium: Float = FontRawTokens.fontLetterSpacing200, - val letterSpacingLabelSmall: Float = FontRawTokens.fontLetterSpacing150, - val letterSpacingLabelXlarge: Float = FontRawTokens.fontLetterSpacing300, - val lineHeightBodyLargeMobile: Int = FontRawTokens.fontLineHeight450, - val lineHeightBodyLargeTablet: Int = FontRawTokens.fontLineHeight450, - val lineHeightBodyMediumMobile: Int = FontRawTokens.fontLineHeight350, - val lineHeightBodyMediumTablet: Int = FontRawTokens.fontLineHeight350, - val lineHeightBodySmallMobile: Int = FontRawTokens.fontLineHeight250, - val lineHeightBodySmallTablet: Int = FontRawTokens.fontLineHeight250, - val lineHeightDisplayLargeMobile: Int = FontRawTokens.fontLineHeight1050, - val lineHeightDisplayLargeTablet: Int = FontRawTokens.fontLineHeight1850, - val lineHeightDisplayMediumMobile: Int = FontRawTokens.fontLineHeight950, - val lineHeightDisplayMediumTablet: Int = FontRawTokens.fontLineHeight1250, - val lineHeightDisplaySmallMobile: Int = FontRawTokens.fontLineHeight850, - val lineHeightDisplaySmallTablet: Int = FontRawTokens.fontLineHeight1050, - val lineHeightHeadingLargeMobile: Int = FontRawTokens.fontLineHeight650, - val lineHeightHeadingLargeTablet: Int = FontRawTokens.fontLineHeight750, - val lineHeightHeadingMediumMobile: Int = FontRawTokens.fontLineHeight550, - val lineHeightHeadingMediumTablet: Int = FontRawTokens.fontLineHeight650, - val lineHeightHeadingSmallMobile: Int = FontRawTokens.fontLineHeight450, - val lineHeightHeadingSmallTablet: Int = FontRawTokens.fontLineHeight550, - val lineHeightHeadingXlargeMobile: Int = FontRawTokens.fontLineHeight750, - val lineHeightHeadingXlargeTablet: Int = FontRawTokens.fontLineHeight950, - val lineHeightLabelLarge: Int = FontRawTokens.fontLineHeight450, - val lineHeightLabelMedium: Int = FontRawTokens.fontLineHeight350, - val lineHeightLabelSmall: Int = FontRawTokens.fontLineHeight250, - val lineHeightLabelXlarge: Int = FontRawTokens.fontLineHeight450, - val sizeBodyLargeMobile: Int = FontRawTokens.fontSize250, - val sizeBodyLargeTablet: Int = FontRawTokens.fontSize250, - val sizeBodyMediumMobile: Int = FontRawTokens.fontSize200, - val sizeBodyMediumTablet: Int = FontRawTokens.fontSize200, - val sizeBodySmallMobile: Int = FontRawTokens.fontSize150, - val sizeBodySmallTablet: Int = FontRawTokens.fontSize150, - val sizeDisplayLargeMobile: Int = FontRawTokens.fontSize850, - val sizeDisplayLargeTablet: Int = FontRawTokens.fontSize1450, - val sizeDisplayMediumMobile: Int = FontRawTokens.fontSize750, - val sizeDisplayMediumTablet: Int = FontRawTokens.fontSize1050, - val sizeDisplaySmallMobile: Int = FontRawTokens.fontSize650, - val sizeDisplaySmallTablet: Int = FontRawTokens.fontSize850, - val sizeHeadingLargeMobile: Int = FontRawTokens.fontSize450, - val sizeHeadingLargeTablet: Int = FontRawTokens.fontSize550, - val sizeHeadingMediumMobile: Int = FontRawTokens.fontSize350, - val sizeHeadingMediumTablet: Int = FontRawTokens.fontSize450, - val sizeHeadingSmallMobile: Int = FontRawTokens.fontSize300, - val sizeHeadingSmallTablet: Int = FontRawTokens.fontSize350, - val sizeHeadingXlargeMobile: Int = FontRawTokens.fontSize550, - val sizeHeadingXlargeTablet: Int = FontRawTokens.fontSize750, - val sizeLabelLarge: Int = FontRawTokens.fontSize250, - val sizeLabelMedium: Int = FontRawTokens.fontSize200, - val sizeLabelSmall: Int = FontRawTokens.fontSize150, - val sizeLabelXlarge: Int = FontRawTokens.fontSize300, - val weightBodyDefault: Int = FontRawTokens.fontWeight400, - val weightBodyStrong: Int = FontRawTokens.fontWeight700, - val weightDisplay: Int = FontRawTokens.fontWeight700, - val weightHeading: Int = FontRawTokens.fontWeight700, - val weightLabelDefault: Int = FontRawTokens.fontWeight400, - val weightLabelStrong: Int = FontRawTokens.fontWeight700, - val weightDefault: Int = FontRawTokens.fontWeight400, - val weightStrong: Int = FontRawTokens.fontWeight700 + val letterSpacingBodyLargeMobile: Float = FontRawTokens.fontLetterSpacing250, + val letterSpacingBodyLargeTablet: Float = FontRawTokens.fontLetterSpacing250, + val letterSpacingBodyMediumMobile: Float = FontRawTokens.fontLetterSpacing200, + val letterSpacingBodyMediumTablet: Float = FontRawTokens.fontLetterSpacing200, + val letterSpacingBodySmallMobile: Float = FontRawTokens.fontLetterSpacing150, + val letterSpacingBodySmallTablet: Float = FontRawTokens.fontLetterSpacing150, + val letterSpacingDisplayLargeMobile: Float = FontRawTokens.fontLetterSpacing850, + val letterSpacingDisplayLargeTablet: Float = FontRawTokens.fontLetterSpacing1450, + val letterSpacingDisplayMediumMobile: Float = FontRawTokens.fontLetterSpacing750, + val letterSpacingDisplayMediumTablet: Float = FontRawTokens.fontLetterSpacing1050, + val letterSpacingDisplaySmallMobile: Float = FontRawTokens.fontLetterSpacing650, + val letterSpacingDisplaySmallTablet: Float = FontRawTokens.fontLetterSpacing850, + val letterSpacingHeadingLargeMobile: Float = FontRawTokens.fontLetterSpacing450, + val letterSpacingHeadingLargeTablet: Float = FontRawTokens.fontLetterSpacing550, + val letterSpacingHeadingMediumMobile: Float = FontRawTokens.fontLetterSpacing350, + val letterSpacingHeadingMediumTablet: Float = FontRawTokens.fontLetterSpacing450, + val letterSpacingHeadingSmallMobile: Float = FontRawTokens.fontLetterSpacing300, + val letterSpacingHeadingSmallTablet: Float = FontRawTokens.fontLetterSpacing350, + val letterSpacingHeadingXlargeMobile: Float = FontRawTokens.fontLetterSpacing550, + val letterSpacingHeadingXlargeTablet: Float = FontRawTokens.fontLetterSpacing750, + val letterSpacingLabelLarge: Float = FontRawTokens.fontLetterSpacing250, + val letterSpacingLabelMedium: Float = FontRawTokens.fontLetterSpacing200, + val letterSpacingLabelSmall: Float = FontRawTokens.fontLetterSpacing150, + val letterSpacingLabelXlarge: Float = FontRawTokens.fontLetterSpacing300, + val lineHeightBodyLargeMobile: Int = FontRawTokens.fontLineHeight450, + val lineHeightBodyLargeTablet: Int = FontRawTokens.fontLineHeight450, + val lineHeightBodyMediumMobile: Int = FontRawTokens.fontLineHeight350, + val lineHeightBodyMediumTablet: Int = FontRawTokens.fontLineHeight350, + val lineHeightBodySmallMobile: Int = FontRawTokens.fontLineHeight250, + val lineHeightBodySmallTablet: Int = FontRawTokens.fontLineHeight250, + val lineHeightDisplayLargeMobile: Int = FontRawTokens.fontLineHeight1050, + val lineHeightDisplayLargeTablet: Int = FontRawTokens.fontLineHeight1850, + val lineHeightDisplayMediumMobile: Int = FontRawTokens.fontLineHeight950, + val lineHeightDisplayMediumTablet: Int = FontRawTokens.fontLineHeight1250, + val lineHeightDisplaySmallMobile: Int = FontRawTokens.fontLineHeight850, + val lineHeightDisplaySmallTablet: Int = FontRawTokens.fontLineHeight1050, + val lineHeightHeadingLargeMobile: Int = FontRawTokens.fontLineHeight650, + val lineHeightHeadingLargeTablet: Int = FontRawTokens.fontLineHeight750, + val lineHeightHeadingMediumMobile: Int = FontRawTokens.fontLineHeight550, + val lineHeightHeadingMediumTablet: Int = FontRawTokens.fontLineHeight650, + val lineHeightHeadingSmallMobile: Int = FontRawTokens.fontLineHeight450, + val lineHeightHeadingSmallTablet: Int = FontRawTokens.fontLineHeight550, + val lineHeightHeadingXlargeMobile: Int = FontRawTokens.fontLineHeight750, + val lineHeightHeadingXlargeTablet: Int = FontRawTokens.fontLineHeight950, + val lineHeightLabelLarge: Int = FontRawTokens.fontLineHeight450, + val lineHeightLabelMedium: Int = FontRawTokens.fontLineHeight350, + val lineHeightLabelSmall: Int = FontRawTokens.fontLineHeight250, + val lineHeightLabelXlarge: Int = FontRawTokens.fontLineHeight450, + val sizeBodyLargeMobile: Int = FontRawTokens.fontSize250, + val sizeBodyLargeTablet: Int = FontRawTokens.fontSize250, + val sizeBodyMediumMobile: Int = FontRawTokens.fontSize200, + val sizeBodyMediumTablet: Int = FontRawTokens.fontSize200, + val sizeBodySmallMobile: Int = FontRawTokens.fontSize150, + val sizeBodySmallTablet: Int = FontRawTokens.fontSize150, + val sizeDisplayLargeMobile: Int = FontRawTokens.fontSize850, + val sizeDisplayLargeTablet: Int = FontRawTokens.fontSize1450, + val sizeDisplayMediumMobile: Int = FontRawTokens.fontSize750, + val sizeDisplayMediumTablet: Int = FontRawTokens.fontSize1050, + val sizeDisplaySmallMobile: Int = FontRawTokens.fontSize650, + val sizeDisplaySmallTablet: Int = FontRawTokens.fontSize850, + val sizeHeadingLargeMobile: Int = FontRawTokens.fontSize450, + val sizeHeadingLargeTablet: Int = FontRawTokens.fontSize550, + val sizeHeadingMediumMobile: Int = FontRawTokens.fontSize350, + val sizeHeadingMediumTablet: Int = FontRawTokens.fontSize450, + val sizeHeadingSmallMobile: Int = FontRawTokens.fontSize300, + val sizeHeadingSmallTablet: Int = FontRawTokens.fontSize350, + val sizeHeadingXlargeMobile: Int = FontRawTokens.fontSize550, + val sizeHeadingXlargeTablet: Int = FontRawTokens.fontSize750, + val sizeLabelLarge: Int = FontRawTokens.fontSize250, + val sizeLabelMedium: Int = FontRawTokens.fontSize200, + val sizeLabelSmall: Int = FontRawTokens.fontSize150, + val sizeLabelXlarge: Int = FontRawTokens.fontSize300, + val weightBodyDefault: Int = FontRawTokens.fontWeight400, + val weightBodyStrong: Int = FontRawTokens.fontWeight700, + val weightDisplay: Int = FontRawTokens.fontWeight700, + val weightHeading: Int = FontRawTokens.fontWeight700, + val weightLabelDefault: Int = FontRawTokens.fontWeight400, + val weightLabelStrong: Int = FontRawTokens.fontWeight700, + val weightDefault: Int = FontRawTokens.fontWeight400, + val weightStrong: Int = FontRawTokens.fontWeight700 ) diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsGridSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsGridSemanticTokens.kt index df50e9d4..e01aa4ee 100644 --- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsGridSemanticTokens.kt +++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsGridSemanticTokens.kt @@ -15,16 +15,16 @@ package com.orange.ouds.theme.tokens.semantic import com.orange.ouds.tokens.global.raw.GridRawTokens data class OudsGridSemanticTokens( - val compactColumnGap: Float = GridRawTokens.gridColumnGap100, - val compactMargin: Int = GridRawTokens.gridMargin300, - val compactMaxWidth: Int = GridRawTokens.gridMaxWidthCompact, - val compactMinWidth: Int = GridRawTokens.gridMinWidthCompact, - val extraCompactColumnGap: Float = GridRawTokens.gridColumnGap100, - val extraCompactMargin: Int = GridRawTokens.gridMargin100, - val extraCompactMaxWidth: Int = GridRawTokens.gridMaxWidthExtraCompact, - val extraCompactMinWidth: Int = GridRawTokens.gridMinWidthExtraCompact, - val mediumColumnGap: Float = GridRawTokens.gridColumnGap400, - val mediumMargin: Int = GridRawTokens.gridMargin500, - val mediumMaxWidth: Int = GridRawTokens.gridMaxWidthMedium, - val mediumMinWidth: Int = GridRawTokens.gridMinWidthMedium + val compactColumnGap: Float = GridRawTokens.gridColumnGap100, + val compactMargin: Int = GridRawTokens.gridMargin300, + val compactMaxWidth: Int = GridRawTokens.gridMaxWidthCompact, + val compactMinWidth: Int = GridRawTokens.gridMinWidthCompact, + val extraCompactColumnGap: Float = GridRawTokens.gridColumnGap100, + val extraCompactMargin: Int = GridRawTokens.gridMargin100, + val extraCompactMaxWidth: Int = GridRawTokens.gridMaxWidthExtraCompact, + val extraCompactMinWidth: Int = GridRawTokens.gridMinWidthExtraCompact, + val mediumColumnGap: Float = GridRawTokens.gridColumnGap400, + val mediumMargin: Int = GridRawTokens.gridMargin500, + val mediumMaxWidth: Int = GridRawTokens.gridMaxWidthMedium, + val mediumMinWidth: Int = GridRawTokens.gridMinWidthMedium ) diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsOpacitySemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsOpacitySemanticTokens.kt index 8f276aff..af60dd62 100644 --- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsOpacitySemanticTokens.kt +++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsOpacitySemanticTokens.kt @@ -15,10 +15,10 @@ package com.orange.ouds.theme.tokens.semantic import com.orange.ouds.tokens.global.raw.OpacityRawTokens data class OudsOpacitySemanticTokens( - val medium: Float = OpacityRawTokens.opacity500, - val opaque: Float = OpacityRawTokens.opacity900, - val strong: Float = OpacityRawTokens.opacity700, - val transparent: Float = OpacityRawTokens.opacity0, - val weak: Float = OpacityRawTokens.opacity300, - val weaker: Float = OpacityRawTokens.opacity100 + val invisible: Float = OpacityRawTokens.opacity0, + val medium: Float = OpacityRawTokens.opacity320, + val opaque: Float = OpacityRawTokens.opacity1000, + val strong: Float = OpacityRawTokens.opacity640, + val weak: Float = OpacityRawTokens.opacity160, + val weaker: Float = OpacityRawTokens.opacity40 ) diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSizeSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSizeSemanticTokens.kt index 051c8c65..6182e1cb 100644 --- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSizeSemanticTokens.kt +++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSizeSemanticTokens.kt @@ -15,87 +15,87 @@ package com.orange.ouds.theme.tokens.semantic import com.orange.ouds.tokens.global.raw.DimensionRawTokens data class OudsSizeSemanticTokens( - val iconDecorativeMedium: Float = DimensionRawTokens.dimension500, - val iconDecorativeShort: Float = DimensionRawTokens.dimension400, - val iconDecorativeShorter: Float = DimensionRawTokens.dimension300, - val iconDecorativeShortest: Float = DimensionRawTokens.dimension200, - val iconDecorativeTall: Float = DimensionRawTokens.dimension600, - val iconDecorativeTaller: Float = DimensionRawTokens.dimension700, - val iconDecorativeTallest: Float = DimensionRawTokens.dimension900, - val iconWithBodyLargeSizeMediumMobile: Float = DimensionRawTokens.dimension300, - val iconWithBodyLargeSizeMediumTablet: Float = DimensionRawTokens.dimension300, - val iconWithBodyLargeSizeShortMobile: Float = DimensionRawTokens.dimension250, - val iconWithBodyLargeSizeShortTablet: Float = DimensionRawTokens.dimension250, - val iconWithBodyLargeSizeTallMobile: Float = DimensionRawTokens.dimension350, - val iconWithBodyLargeSizeTallTablet: Float = DimensionRawTokens.dimension350, - val iconWithBodyMediumSizeMediumMobile: Float = DimensionRawTokens.dimension250, - val iconWithBodyMediumSizeMediumTablet: Float = DimensionRawTokens.dimension250, - val iconWithBodyMediumSizeShortMobile: Float = DimensionRawTokens.dimension200, - val iconWithBodyMediumSizeShortTablet: Float = DimensionRawTokens.dimension200, - val iconWithBodyMediumSizeTallMobile: Float = DimensionRawTokens.dimension300, - val iconWithBodyMediumSizeTallTablet: Float = DimensionRawTokens.dimension300, - val iconWithBodySmallSizeMediumMobile: Float = DimensionRawTokens.dimension200, - val iconWithBodySmallSizeMediumTablet: Float = DimensionRawTokens.dimension200, - val iconWithBodySmallSizeShortMobile: Float = DimensionRawTokens.dimension150, - val iconWithBodySmallSizeShortTablet: Float = DimensionRawTokens.dimension150, - val iconWithBodySmallSizeTallMobile: Float = DimensionRawTokens.dimension250, - val iconWithBodySmallSizeTallTablet: Float = DimensionRawTokens.dimension250, - val iconWithHeadingLargeSizeMediumMobile: Float = DimensionRawTokens.dimension550, - val iconWithHeadingLargeSizeMediumTablet: Float = DimensionRawTokens.dimension600, - val iconWithHeadingLargeSizeShortMobile: Float = DimensionRawTokens.dimension500, - val iconWithHeadingLargeSizeShortTablet: Float = DimensionRawTokens.dimension550, - val iconWithHeadingLargeSizeTallMobile: Float = DimensionRawTokens.dimension600, - val iconWithHeadingLargeSizeTallTablet: Float = DimensionRawTokens.dimension650, - val iconWithHeadingMediumSizeMediumMobile: Float = DimensionRawTokens.dimension500, - val iconWithHeadingMediumSizeMediumTablet: Float = DimensionRawTokens.dimension550, - val iconWithHeadingMediumSizeShortMobile: Float = DimensionRawTokens.dimension400, - val iconWithHeadingMediumSizeShortTablet: Float = DimensionRawTokens.dimension500, - val iconWithHeadingMediumSizeTallMobile: Float = DimensionRawTokens.dimension550, - val iconWithHeadingMediumSizeTallTablet: Float = DimensionRawTokens.dimension600, - val iconWithHeadingSmallSizeMediumMobile: Float = DimensionRawTokens.dimension500, - val iconWithHeadingSmallSizeMediumTablet: Float = DimensionRawTokens.dimension500, - val iconWithHeadingSmallSizeShortMobile: Float = DimensionRawTokens.dimension400, - val iconWithHeadingSmallSizeShortTablet: Float = DimensionRawTokens.dimension400, - val iconWithHeadingSmallSizeTallMobile: Float = DimensionRawTokens.dimension550, - val iconWithHeadingSmallSizeTallTablet: Float = DimensionRawTokens.dimension550, - val iconWithHeadingXlargeSizeMediumMobile: Float = DimensionRawTokens.dimension600, - val iconWithHeadingXlargeSizeMediumTablet: Float = DimensionRawTokens.dimension700, - val iconWithHeadingXlargeSizeShortMobile: Float = DimensionRawTokens.dimension550, - val iconWithHeadingXlargeSizeShortTablet: Float = DimensionRawTokens.dimension650, - val iconWithHeadingXlargeSizeTallMobile: Float = DimensionRawTokens.dimension650, - val iconWithHeadingXlargeSizeTallTablet: Float = DimensionRawTokens.dimension800, - val iconWithLabelLargeSizeMedium: Float = DimensionRawTokens.dimension350, - val iconWithLabelLargeSizeShort: Float = DimensionRawTokens.dimension300, - val iconWithLabelLargeSizeShorter: Float = DimensionRawTokens.dimension250, - val iconWithLabelLargeSizeTall: Float = DimensionRawTokens.dimension400, - val iconWithLabelLargeSizeTaller: Float = DimensionRawTokens.dimension550, - val iconWithLabelMediumSizeMedium: Float = DimensionRawTokens.dimension250, - val iconWithLabelMediumSizeShort: Float = DimensionRawTokens.dimension200, - val iconWithLabelMediumSizeTall: Float = DimensionRawTokens.dimension300, - val iconWithLabelSmallSizeMedium: Float = DimensionRawTokens.dimension200, - val iconWithLabelSmallSizeShort: Float = DimensionRawTokens.dimension150, - val iconWithLabelSmallSizeTall: Float = DimensionRawTokens.dimension250, - val iconWithLabelXlargeSizeMedium: Float = DimensionRawTokens.dimension500, - val iconWithLabelXlargeSizeShort: Float = DimensionRawTokens.dimension400, - val iconWithLabelXlargeSizeTall: Float = DimensionRawTokens.dimension550, - val maxWidthTypeBodyLargeMobile: Float = DimensionRawTokens.dimension6000, - val maxWidthTypeBodyLargeTablet: Float = DimensionRawTokens.dimension6000, - val maxWidthTypeBodyMediumMobile: Float = DimensionRawTokens.dimension6000, - val maxWidthTypeBodyMediumTablet: Float = DimensionRawTokens.dimension6000, - val maxWidthTypeBodySmallMobile: Float = DimensionRawTokens.dimension6000, - val maxWidthTypeBodySmallTablet: Float = DimensionRawTokens.dimension6000, - val maxWidthTypeDisplayLargeMobile: Float = DimensionRawTokens.dimension9000, - val maxWidthTypeDisplayLargeTablet: Float = DimensionRawTokens.dimension9000, - val maxWidthTypeDisplayMediumMobile: Float = DimensionRawTokens.dimension9000, - val maxWidthTypeDisplayMediumTablet: Float = DimensionRawTokens.dimension9000, - val maxWidthTypeDisplaySmallMobile: Float = DimensionRawTokens.dimension9000, - val maxWidthTypeDisplaySmallTablet: Float = DimensionRawTokens.dimension9000, - val maxWidthTypeHeadingLargeMobile: Float = DimensionRawTokens.dimension9000, - val maxWidthTypeHeadingLargeTablet: Float = DimensionRawTokens.dimension9000, - val maxWidthTypeHeadingMediumMobile: Float = DimensionRawTokens.dimension9000, - val maxWidthTypeHeadingMediumTablet: Float = DimensionRawTokens.dimension9000, - val maxWidthTypeHeadingSmallMobile: Float = DimensionRawTokens.dimension6000, - val maxWidthTypeHeadingSmallTablet: Float = DimensionRawTokens.dimension6000, - val maxWidthTypeHeadingXlargeMobile: Float = DimensionRawTokens.dimension9000, - val maxWidthTypeHeadingXlargeTablet: Float = DimensionRawTokens.dimension9000 + val iconDecorative2xl: Float = DimensionRawTokens.dimension900, + val iconDecorative2xs: Float = DimensionRawTokens.dimension200, + val iconDecorativeLg: Float = DimensionRawTokens.dimension600, + val iconDecorativeMd: Float = DimensionRawTokens.dimension500, + val iconDecorativeSm: Float = DimensionRawTokens.dimension400, + val iconDecorativeXl: Float = DimensionRawTokens.dimension700, + val iconDecorativeXs: Float = DimensionRawTokens.dimension300, + val iconWithBodyLargeSizeLgMobile: Float = DimensionRawTokens.dimension350, + val iconWithBodyLargeSizeLgTablet: Float = DimensionRawTokens.dimension350, + val iconWithBodyLargeSizeMdMobile: Float = DimensionRawTokens.dimension300, + val iconWithBodyLargeSizeMdTablet: Float = DimensionRawTokens.dimension300, + val iconWithBodyLargeSizeSmMobile: Float = DimensionRawTokens.dimension250, + val iconWithBodyLargeSizeSmTablet: Float = DimensionRawTokens.dimension250, + val iconWithBodyMediumSizeLgMobile: Float = DimensionRawTokens.dimension300, + val iconWithBodyMediumSizeLgTablet: Float = DimensionRawTokens.dimension300, + val iconWithBodyMediumSizeMdMobile: Float = DimensionRawTokens.dimension250, + val iconWithBodyMediumSizeMdTablet: Float = DimensionRawTokens.dimension250, + val iconWithBodyMediumSizeSmMobile: Float = DimensionRawTokens.dimension200, + val iconWithBodyMediumSizeSmTablet: Float = DimensionRawTokens.dimension200, + val iconWithBodySmallSizeLgMobile: Float = DimensionRawTokens.dimension250, + val iconWithBodySmallSizeLgTablet: Float = DimensionRawTokens.dimension250, + val iconWithBodySmallSizeMdMobile: Float = DimensionRawTokens.dimension200, + val iconWithBodySmallSizeMdTablet: Float = DimensionRawTokens.dimension200, + val iconWithBodySmallSizeSmMobile: Float = DimensionRawTokens.dimension150, + val iconWithBodySmallSizeSmTablet: Float = DimensionRawTokens.dimension150, + val iconWithHeadingLargeSizeLgMobile: Float = DimensionRawTokens.dimension600, + val iconWithHeadingLargeSizeLgTablet: Float = DimensionRawTokens.dimension650, + val iconWithHeadingLargeSizeMdMobile: Float = DimensionRawTokens.dimension550, + val iconWithHeadingLargeSizeMdTablet: Float = DimensionRawTokens.dimension600, + val iconWithHeadingLargeSizeSmMobile: Float = DimensionRawTokens.dimension500, + val iconWithHeadingLargeSizeSmTablet: Float = DimensionRawTokens.dimension550, + val iconWithHeadingMediumSizeLgMobile: Float = DimensionRawTokens.dimension550, + val iconWithHeadingMediumSizeLgTablet: Float = DimensionRawTokens.dimension600, + val iconWithHeadingMediumSizeMdMobile: Float = DimensionRawTokens.dimension500, + val iconWithHeadingMediumSizeMdTablet: Float = DimensionRawTokens.dimension550, + val iconWithHeadingMediumSizeSmMobile: Float = DimensionRawTokens.dimension400, + val iconWithHeadingMediumSizeSmTablet: Float = DimensionRawTokens.dimension500, + val iconWithHeadingSmallSizeLgMobile: Float = DimensionRawTokens.dimension550, + val iconWithHeadingSmallSizeLgTablet: Float = DimensionRawTokens.dimension550, + val iconWithHeadingSmallSizeMdMobile: Float = DimensionRawTokens.dimension500, + val iconWithHeadingSmallSizeMdTablet: Float = DimensionRawTokens.dimension500, + val iconWithHeadingSmallSizeSmMobile: Float = DimensionRawTokens.dimension400, + val iconWithHeadingSmallSizeSmTablet: Float = DimensionRawTokens.dimension400, + val iconWithHeadingXlargeSizeLgMobile: Float = DimensionRawTokens.dimension650, + val iconWithHeadingXlargeSizeLgTablet: Float = DimensionRawTokens.dimension800, + val iconWithHeadingXlargeSizeMdMobile: Float = DimensionRawTokens.dimension600, + val iconWithHeadingXlargeSizeMdTablet: Float = DimensionRawTokens.dimension700, + val iconWithHeadingXlargeSizeSmMobile: Float = DimensionRawTokens.dimension550, + val iconWithHeadingXlargeSizeSmTablet: Float = DimensionRawTokens.dimension650, + val iconWithLabelLargeSizeLg: Float = DimensionRawTokens.dimension400, + val iconWithLabelLargeSizeMd: Float = DimensionRawTokens.dimension350, + val iconWithLabelLargeSizeSm: Float = DimensionRawTokens.dimension300, + val iconWithLabelLargeSizeXl: Float = DimensionRawTokens.dimension550, + val iconWithLabelLargeSizeXs: Float = DimensionRawTokens.dimension250, + val iconWithLabelMediumSizeLg: Float = DimensionRawTokens.dimension300, + val iconWithLabelMediumSizeMd: Float = DimensionRawTokens.dimension250, + val iconWithLabelMediumSizeSm: Float = DimensionRawTokens.dimension200, + val iconWithLabelSmallSizeLg: Float = DimensionRawTokens.dimension250, + val iconWithLabelSmallSizeMd: Float = DimensionRawTokens.dimension200, + val iconWithLabelSmallSizeSm: Float = DimensionRawTokens.dimension150, + val iconWithLabelXlargeSizeLg: Float = DimensionRawTokens.dimension550, + val iconWithLabelXlargeSizeMd: Float = DimensionRawTokens.dimension500, + val iconWithLabelXlargeSizeSm: Float = DimensionRawTokens.dimension400, + val maxWidthTypeBodyLargeMobile: Float = DimensionRawTokens.dimension6000, + val maxWidthTypeBodyLargeTablet: Float = DimensionRawTokens.dimension6000, + val maxWidthTypeBodyMediumMobile: Float = DimensionRawTokens.dimension6000, + val maxWidthTypeBodyMediumTablet: Float = DimensionRawTokens.dimension6000, + val maxWidthTypeBodySmallMobile: Float = DimensionRawTokens.dimension6000, + val maxWidthTypeBodySmallTablet: Float = DimensionRawTokens.dimension6000, + val maxWidthTypeDisplayLargeMobile: Float = DimensionRawTokens.dimension9000, + val maxWidthTypeDisplayLargeTablet: Float = DimensionRawTokens.dimension9000, + val maxWidthTypeDisplayMediumMobile: Float = DimensionRawTokens.dimension9000, + val maxWidthTypeDisplayMediumTablet: Float = DimensionRawTokens.dimension9000, + val maxWidthTypeDisplaySmallMobile: Float = DimensionRawTokens.dimension9000, + val maxWidthTypeDisplaySmallTablet: Float = DimensionRawTokens.dimension9000, + val maxWidthTypeHeadingLargeMobile: Float = DimensionRawTokens.dimension9000, + val maxWidthTypeHeadingLargeTablet: Float = DimensionRawTokens.dimension9000, + val maxWidthTypeHeadingMediumMobile: Float = DimensionRawTokens.dimension9000, + val maxWidthTypeHeadingMediumTablet: Float = DimensionRawTokens.dimension9000, + val maxWidthTypeHeadingSmallMobile: Float = DimensionRawTokens.dimension6000, + val maxWidthTypeHeadingSmallTablet: Float = DimensionRawTokens.dimension6000, + val maxWidthTypeHeadingXlargeMobile: Float = DimensionRawTokens.dimension9000, + val maxWidthTypeHeadingXlargeTablet: Float = DimensionRawTokens.dimension9000 ) diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSpaceSemanticTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSpaceSemanticTokens.kt index 354f81d7..d3f6e898 100644 --- a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSpaceSemanticTokens.kt +++ b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsSpaceSemanticTokens.kt @@ -15,113 +15,84 @@ package com.orange.ouds.theme.tokens.semantic import com.orange.ouds.tokens.global.raw.DimensionRawTokens data class OudsSpaceSemanticTokens( - val columnGapMedium: Float = DimensionRawTokens.dimension200, - val columnGapNone: Float = DimensionRawTokens.dimension0, - val columnGapShort: Float = DimensionRawTokens.dimension100, - val columnGapShorter: Float = DimensionRawTokens.dimension50, - val columnGapTall: Float = DimensionRawTokens.dimension300, - val columnGapTaller: Float = DimensionRawTokens.dimension400, - val columnGapWithArrowMedium: Float = DimensionRawTokens.dimension100, - val columnGapWithArrowNone: Float = DimensionRawTokens.dimension0, - val columnGapWithArrowShort: Float = DimensionRawTokens.dimension75, - val columnGapWithArrowShorter: Float = DimensionRawTokens.dimension50, - val columnGapWithArrowShortest: Float = DimensionRawTokens.dimension25, - val columnGapWithArrowTall: Float = DimensionRawTokens.dimension200, - val columnGapWithIconMedium: Float = DimensionRawTokens.dimension100, - val columnGapWithIconNone: Float = DimensionRawTokens.dimension0, - val columnGapWithIconShort: Float = DimensionRawTokens.dimension75, - val columnGapWithIconShorter: Float = DimensionRawTokens.dimension50, - val columnGapWithIconShortest: Float = DimensionRawTokens.dimension25, - val columnGapWithIconTall: Float = DimensionRawTokens.dimension200, - val fixedHuge: Float = DimensionRawTokens.dimension700, - val fixedJumbo: Float = DimensionRawTokens.dimension800, - val fixedMedium: Float = DimensionRawTokens.dimension200, - val fixedNone: Float = DimensionRawTokens.dimension0, - val fixedShort: Float = DimensionRawTokens.dimension150, - val fixedShorter: Float = DimensionRawTokens.dimension100, - val fixedShortest: Float = DimensionRawTokens.dimension50, - val fixedSmash: Float = DimensionRawTokens.dimension25, - val fixedSpacious: Float = DimensionRawTokens.dimension600, - val fixedTall: Float = DimensionRawTokens.dimension300, - val fixedTaller: Float = DimensionRawTokens.dimension400, - val fixedTallest: Float = DimensionRawTokens.dimension500, - val insetMedium: Float = DimensionRawTokens.dimension150, - val insetNone: Float = DimensionRawTokens.dimension0, - val insetShort: Float = DimensionRawTokens.dimension100, - val insetShorter: Float = DimensionRawTokens.dimension75, - val insetShortest: Float = DimensionRawTokens.dimension50, - val insetSmash: Float = DimensionRawTokens.dimension25, - val insetSpacious: Float = DimensionRawTokens.dimension500, - val insetTall: Float = DimensionRawTokens.dimension200, - val insetTaller: Float = DimensionRawTokens.dimension300, - val insetTallest: Float = DimensionRawTokens.dimension400, - val paddingBlockMedium: Float = DimensionRawTokens.dimension150, - val paddingBlockNone: Float = DimensionRawTokens.dimension0, - val paddingBlockShort: Float = DimensionRawTokens.dimension100, - val paddingBlockShorter: Float = DimensionRawTokens.dimension50, - val paddingBlockTall: Float = DimensionRawTokens.dimension200, - val paddingBlockTaller: Float = DimensionRawTokens.dimension300, - val paddingBlockTallest: Float = DimensionRawTokens.dimension400, - val paddingBlockWithIconMedium: Float = DimensionRawTokens.dimension100, - val paddingBlockWithIconNone: Float = DimensionRawTokens.dimension0, - val paddingBlockWithIconShort: Float = DimensionRawTokens.dimension75, - val paddingBlockWithIconShorter: Float = DimensionRawTokens.dimension50, - val paddingBlockWithIconShortest: Float = DimensionRawTokens.dimension25, - val paddingBlockWithIconTall: Float = DimensionRawTokens.dimension150, - val paddingBlockWithIconTaller: Float = DimensionRawTokens.dimension200, - val paddingInlineMedium: Float = DimensionRawTokens.dimension200, - val paddingInlineNone: Float = DimensionRawTokens.dimension0, - val paddingInlineShort: Float = DimensionRawTokens.dimension100, - val paddingInlineShorter: Float = DimensionRawTokens.dimension50, - val paddingInlineTall: Float = DimensionRawTokens.dimension300, - val paddingInlineTaller: Float = DimensionRawTokens.dimension350, - val paddingInlineTallest: Float = DimensionRawTokens.dimension400, - val paddingInlineWithArrowMedium: Float = DimensionRawTokens.dimension100, - val paddingInlineWithArrowNone: Float = DimensionRawTokens.dimension0, - val paddingInlineWithArrowShort: Float = DimensionRawTokens.dimension75, - val paddingInlineWithArrowShorter: Float = DimensionRawTokens.dimension50, - val paddingInlineWithArrowShortest: Float = DimensionRawTokens.dimension25, - val paddingInlineWithArrowTall: Float = DimensionRawTokens.dimension200, - val paddingInlineWithArrowTaller: Float = DimensionRawTokens.dimension250, - val paddingInlineWithArrowTallest: Float = DimensionRawTokens.dimension300, - val paddingInlineWithIconMedium: Float = DimensionRawTokens.dimension200, - val paddingInlineWithIconNone: Float = DimensionRawTokens.dimension0, - val paddingInlineWithIconShort: Float = DimensionRawTokens.dimension100, - val paddingInlineWithIconShorter: Float = DimensionRawTokens.dimension50, - val paddingInlineWithIconShortest: Float = DimensionRawTokens.dimension25, - val paddingInlineWithIconTall: Float = DimensionRawTokens.dimension250, - val paddingInlineWithIconTaller: Float = DimensionRawTokens.dimension300, - val paddingInlineWithIconTallest: Float = DimensionRawTokens.dimension350, - val rowGapMedium: Float = DimensionRawTokens.dimension100, - val rowGapNone: Float = DimensionRawTokens.dimension0, - val rowGapShort: Float = DimensionRawTokens.dimension75, - val rowGapShorter: Float = DimensionRawTokens.dimension50, - val rowGapShortest: Float = DimensionRawTokens.dimension25, - val rowGapTall: Float = DimensionRawTokens.dimension200, - val rowGapWithIconMedium: Float = DimensionRawTokens.dimension100, - val rowGapWithIconNone: Float = DimensionRawTokens.dimension0, - val rowGapWithIconShort: Float = DimensionRawTokens.dimension75, - val rowGapWithIconShorter: Float = DimensionRawTokens.dimension50, - val rowGapWithIconShortest: Float = DimensionRawTokens.dimension25, - val rowGapWithIconTall: Float = DimensionRawTokens.dimension200, - val scaledMediumMobile: Float = DimensionRawTokens.dimension200, - val scaledMediumTablet: Float = DimensionRawTokens.dimension300, - val scaledNoneMobile: Float = DimensionRawTokens.dimension0, - val scaledNoneTablet: Float = DimensionRawTokens.dimension0, - val scaledShortMobile: Float = DimensionRawTokens.dimension150, - val scaledShortTablet: Float = DimensionRawTokens.dimension200, - val scaledShorterMobile: Float = DimensionRawTokens.dimension100, - val scaledShorterTablet: Float = DimensionRawTokens.dimension150, - val scaledShortestMobile: Float = DimensionRawTokens.dimension50, - val scaledShortestTablet: Float = DimensionRawTokens.dimension100, - val scaledSmashMobile: Float = DimensionRawTokens.dimension25, - val scaledSmashTablet: Float = DimensionRawTokens.dimension50, - val scaledSpaciousMobile: Float = DimensionRawTokens.dimension600, - val scaledSpaciousTablet: Float = DimensionRawTokens.dimension700, - val scaledTallMobile: Float = DimensionRawTokens.dimension300, - val scaledTallTablet: Float = DimensionRawTokens.dimension400, - val scaledTallerMobile: Float = DimensionRawTokens.dimension400, - val scaledTallerTablet: Float = DimensionRawTokens.dimension500, - val scaledTallestMobile: Float = DimensionRawTokens.dimension500, - val scaledTallestTablet: Float = DimensionRawTokens.dimension600 + val columnGapMedium: Float = DimensionRawTokens.dimension150, + val columnGapNone: Float = DimensionRawTokens.dimension0, + val columnGapShort: Float = DimensionRawTokens.dimension100, + val columnGapShorter: Float = DimensionRawTokens.dimension75, + val columnGapShortest: Float = DimensionRawTokens.dimension50, + val columnGapSmash: Float = DimensionRawTokens.dimension25, + val columnGapTall: Float = DimensionRawTokens.dimension200, + val columnGapTaller: Float = DimensionRawTokens.dimension250, + val columnGapTallest: Float = DimensionRawTokens.dimension300, + val fixedHuge: Float = DimensionRawTokens.dimension700, + val fixedJumbo: Float = DimensionRawTokens.dimension800, + val fixedMedium: Float = DimensionRawTokens.dimension200, + val fixedNone: Float = DimensionRawTokens.dimension0, + val fixedShort: Float = DimensionRawTokens.dimension150, + val fixedShorter: Float = DimensionRawTokens.dimension100, + val fixedShortest: Float = DimensionRawTokens.dimension50, + val fixedSmash: Float = DimensionRawTokens.dimension25, + val fixedSpacious: Float = DimensionRawTokens.dimension600, + val fixedTall: Float = DimensionRawTokens.dimension300, + val fixedTaller: Float = DimensionRawTokens.dimension400, + val fixedTallest: Float = DimensionRawTokens.dimension500, + val insetMedium: Float = DimensionRawTokens.dimension150, + val insetNone: Float = DimensionRawTokens.dimension0, + val insetShort: Float = DimensionRawTokens.dimension100, + val insetShorter: Float = DimensionRawTokens.dimension75, + val insetShortest: Float = DimensionRawTokens.dimension50, + val insetSmash: Float = DimensionRawTokens.dimension25, + val insetSpacious: Float = DimensionRawTokens.dimension500, + val insetTall: Float = DimensionRawTokens.dimension200, + val insetTaller: Float = DimensionRawTokens.dimension300, + val insetTallest: Float = DimensionRawTokens.dimension400, + val paddingBlockHuge: Float = DimensionRawTokens.dimension400, + val paddingBlockMedium: Float = DimensionRawTokens.dimension150, + val paddingBlockNone: Float = DimensionRawTokens.dimension0, + val paddingBlockShort: Float = DimensionRawTokens.dimension100, + val paddingBlockShorter: Float = DimensionRawTokens.dimension75, + val paddingBlockShortest: Float = DimensionRawTokens.dimension50, + val paddingBlockSmash: Float = DimensionRawTokens.dimension25, + val paddingBlockSpacious: Float = DimensionRawTokens.dimension350, + val paddingBlockTall: Float = DimensionRawTokens.dimension200, + val paddingBlockTaller: Float = DimensionRawTokens.dimension250, + val paddingBlockTallest: Float = DimensionRawTokens.dimension300, + val paddingInlineHuge: Float = DimensionRawTokens.dimension400, + val paddingInlineMedium: Float = DimensionRawTokens.dimension150, + val paddingInlineNone: Float = DimensionRawTokens.dimension0, + val paddingInlineShort: Float = DimensionRawTokens.dimension100, + val paddingInlineShorter: Float = DimensionRawTokens.dimension75, + val paddingInlineShortest: Float = DimensionRawTokens.dimension50, + val paddingInlineSmash: Float = DimensionRawTokens.dimension25, + val paddingInlineSpacious: Float = DimensionRawTokens.dimension350, + val paddingInlineTall: Float = DimensionRawTokens.dimension200, + val paddingInlineTaller: Float = DimensionRawTokens.dimension250, + val paddingInlineTallest: Float = DimensionRawTokens.dimension300, + val rowGapMedium: Float = DimensionRawTokens.dimension150, + val rowGapNone: Float = DimensionRawTokens.dimension0, + val rowGapShort: Float = DimensionRawTokens.dimension100, + val rowGapShorter: Float = DimensionRawTokens.dimension75, + val rowGapShortest: Float = DimensionRawTokens.dimension50, + val rowGapSmash: Float = DimensionRawTokens.dimension25, + val rowGapTall: Float = DimensionRawTokens.dimension200, + val scaledMediumMobile: Float = DimensionRawTokens.dimension200, + val scaledMediumTablet: Float = DimensionRawTokens.dimension300, + val scaledNoneMobile: Float = DimensionRawTokens.dimension0, + val scaledNoneTablet: Float = DimensionRawTokens.dimension0, + val scaledShortMobile: Float = DimensionRawTokens.dimension150, + val scaledShortTablet: Float = DimensionRawTokens.dimension200, + val scaledShorterMobile: Float = DimensionRawTokens.dimension100, + val scaledShorterTablet: Float = DimensionRawTokens.dimension150, + val scaledShortestMobile: Float = DimensionRawTokens.dimension50, + val scaledShortestTablet: Float = DimensionRawTokens.dimension100, + val scaledSmashMobile: Float = DimensionRawTokens.dimension25, + val scaledSmashTablet: Float = DimensionRawTokens.dimension50, + val scaledSpaciousMobile: Float = DimensionRawTokens.dimension600, + val scaledSpaciousTablet: Float = DimensionRawTokens.dimension700, + val scaledTallMobile: Float = DimensionRawTokens.dimension300, + val scaledTallTablet: Float = DimensionRawTokens.dimension400, + val scaledTallerMobile: Float = DimensionRawTokens.dimension400, + val scaledTallerTablet: Float = DimensionRawTokens.dimension500, + val scaledTallestMobile: Float = DimensionRawTokens.dimension500, + val scaledTallestTablet: Float = DimensionRawTokens.dimension600 ) From 7554f062db3de9b73eeebc580979f82abff413d7 Mon Sep 17 00:00:00 2001 From: Pauline Auvray Date: Tue, 10 Dec 2024 11:21:53 +0100 Subject: [PATCH 2/7] Adapt code to new tokens --- .idea/inspectionProfiles/Project_Default.xml | 27 + .idea/kotlinc.xml | 2 +- NOTICE.txt | 1 - .../java/com/orange/ouds/app/ui/BottomBar.kt | 3 + .../app/ui/components/ComponentsScreen.kt | 2 +- .../ouds/app/ui/tokens/TokenCategory.kt | 15 +- .../ui/tokens/TokenCategoryDetailScreen.kt | 12 +- .../ouds/app/ui/tokens/TokenProperty.kt | 54 +- .../ouds/app/ui/tokens/TokenPropertyHeader.kt | 95 +- .../ui/tokens/TokenPropertyIllustration.kt | 89 +- .../composable/DetailScreenHeader.kt | 22 +- .../app/ui/utilities/composable/LargeCard.kt | 10 +- .../ic_design_token_figma_no_padding.xml | 22 - app/src/main/res/values/strings.xml | 16 +- .../ouds/core/component/button/OudsButton.kt | 2 - .../orange/ouds/core/theme/OudsColorScheme.kt | 975 ++++++------------ .../orange/ouds/core/theme/OudsOpacities.kt | 6 +- .../com/orange/ouds/core/theme/OudsSizes.kt | 316 +++--- .../com/orange/ouds/core/theme/OudsSpaces.kt | 205 +--- .../com/orange/ouds/core/theme/OudsTheme.kt | 59 +- .../ouds/theme/tokens/OudsColorKeyToken.kt | 432 ++------ .../ouds/theme/tokens/OudsOpacityKeyToken.kt | 4 +- .../ouds/theme/tokens/OudsSizeKeyToken.kt | 60 +- .../ouds/theme/tokens/OudsSpaceKeyToken.kt | 70 +- .../android/OudsAndroidColorDarkTokens.kt | 53 + .../android/OudsAndroidColorLightTokens.kt | 53 + .../tokens/components/OudsButtonTokens.kt | 2 +- .../semantic/OudsColorBrandSemanticTokens.kt | 90 -- .../OudsColorElevationSemanticTokens.kt | 46 - .../OudsColorGradientSemanticTokens.kt | 28 - .../semantic/OudsColorSemanticTokens.kt | 7 +- .../OudsColorTransparentSemanticTokens.kt | 22 - .../theme/orangecountry/OrangeCountryTheme.kt | 6 +- .../tokens/WhiteLabelSemanticColorTokens.kt | 4 +- 34 files changed, 876 insertions(+), 1934 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_design_token_figma_no_padding.xml create mode 100644 theme-contract/src/main/java/com/orange/ouds/theme/tokens/android/OudsAndroidColorDarkTokens.kt create mode 100644 theme-contract/src/main/java/com/orange/ouds/theme/tokens/android/OudsAndroidColorLightTokens.kt delete mode 100644 theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorBrandSemanticTokens.kt delete mode 100644 theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorElevationSemanticTokens.kt delete mode 100644 theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorGradientSemanticTokens.kt delete mode 100644 theme-contract/src/main/java/com/orange/ouds/theme/tokens/semantic/OudsColorTransparentSemanticTokens.kt diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 44ca2d9b..6195b36e 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,6 +1,30 @@