chore: update tokens (#229)

Orange-OpenSource · Dec 12, 2024 · 9781d24 · 9781d24
1 parent 42b6e5f
commit 9781d24
Show file tree

Hide file tree

Showing 56 changed files with 1,477 additions and 2,544 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -17,7 +17,6 @@ app/src/main/res/drawable/ic_chevron_down.xml
 app/src/main/res/drawable/ic_component_atom.xml
 app/src/main/res/drawable/ic_copy.xml
 app/src/main/res/drawable/ic_design_token_figma.xml
-app/src/main/res/drawable/ic_design_token_figma_no_padding.xml
 app/src/main/res/drawable/ic_dimension.xml
 app/src/main/res/drawable/ic_filter_effects.xml
 app/src/main/res/drawable/ic_info.xml

diff --git a/app/src/main/java/com/orange/ouds/app/ui/BottomBar.kt b/app/src/main/java/com/orange/ouds/app/ui/BottomBar.kt
@@ -23,13 +23,16 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import com.orange.ouds.app.R
+import com.orange.ouds.core.theme.value
 import com.orange.ouds.core.utilities.OudsPreview
 import com.orange.ouds.foundation.utilities.UiModePreviews
+import com.orange.ouds.theme.tokens.OudsColorKeyToken
 
 @Composable
 fun BottomBar(currentRoute: String, navigateToRoute: (String) -> Unit) {
     val items = BottomBarItem.entries.toTypedArray()
     NavigationBar(
+        containerColor = OudsColorKeyToken.Background.Secondary.value, //TODO Temporary color. Waiting for Material colors from Maxime.
         content = {
             items.forEach { item ->
                 NavigationBarItem(

diff --git a/app/src/main/java/com/orange/ouds/app/ui/components/ComponentsScreen.kt b/app/src/main/java/com/orange/ouds/app/ui/components/ComponentsScreen.kt
@@ -51,7 +51,7 @@ fun ComponentsScreen() {
                     .padding(top = OudsSpaceKeyToken.Fixed.Medium.value)
                     .width(OudsGridKeyToken.Margin.value)
                     .height(OudsGridKeyToken.ColumnGap.value)
-                    .background(OudsColorKeyToken.Background.Brand.Primary.value)
+                    .background(OudsColorKeyToken.Content.Brand.Primary.value)
             )
         }
     }

diff --git a/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenCategory.kt b/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenCategory.kt
@@ -64,11 +64,10 @@ sealed class TokenCategory<T>(
             TokenProperty.ColorAlways,
             TokenProperty.ColorBackground,
             TokenProperty.ColorBorder,
-            TokenProperty.ColorBrand,
             TokenProperty.ColorContent,
             TokenProperty.ColorDecorative,
-            TokenProperty.ColorElevation,
-            TokenProperty.ColorGradient,
+            TokenProperty.ColorOverlay,
+            TokenProperty.ColorSurface,
         )
     )
 
@@ -87,24 +86,18 @@ sealed class TokenCategory<T>(
                 TokenProperty.SpaceScaled,
                 TokenProperty.SpaceFixed,
                 TokenProperty.SpacePaddingInline,
-                TokenProperty.SpacePaddingInlineWithIcon,
-                TokenProperty.SpacePaddingInlineWithArrow,
                 TokenProperty.SpacePaddingStack,
-                TokenProperty.SpacePaddingStackWithIcon,
                 TokenProperty.SpacePaddingInset,
                 TokenProperty.SpaceColumnGap,
-                TokenProperty.SpaceColumnGapWithIcon,
-                TokenProperty.SpaceColumnGapWithArrow,
                 TokenProperty.SpaceRowGap,
-                TokenProperty.SpaceRowGapWithIcon
             ),
         )
 
         data object Size : TokenCategory<Size>(
             R.string.app_tokens_dimension_size_label,
             R.drawable.ic_dimension,
             R.string.app_tokens_dimension_size_description_text,
-            getTokenValueCode<OudsSizeKeyToken.Icon.Decorative.Shortest>(),
+            getTokenValueCode<OudsSizeKeyToken.Icon.Decorative.ExtraExtraSmall>(),
             listOf(TokenProperty.SizeIconDecorative, TokenProperty.SizeIconWithText),
         )
     }
@@ -129,7 +122,7 @@ sealed class TokenCategory<T>(
         R.string.app_tokens_opacity_label,
         R.drawable.ic_filter_effects,
         R.string.app_tokens_opacity_description_text,
-        getTokenValueCode<OudsOpacityKeyToken.Transparent>(),
+        getTokenValueCode<OudsOpacityKeyToken.Invisible>(),
         listOf(TokenProperty.Opacity)
     )
 

diff --git a/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenCategoryDetailScreen.kt b/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenCategoryDetailScreen.kt
@@ -211,8 +211,8 @@ private fun TokenIllustration(tokenProperty: TokenProperty<*>, token: Token<*>)
     is TokenProperty.BorderWidth -> BorderIllustrationBox(width = token.value() as Dp)
     is TokenProperty.BorderRadius -> BorderIllustrationBox(shape = RoundedCornerShape(token.value() as Dp))
     is TokenProperty.BorderStyle -> BorderIllustrationBox(style = token.value() as OudsBorderStyle)
-    is TokenProperty.ColorAction, TokenProperty.ColorAlways, TokenProperty.ColorBackground, TokenProperty.ColorBorder, TokenProperty.ColorBrand, TokenProperty.ColorContent,
-    TokenProperty.ColorElevation, TokenProperty.ColorGradient, TokenProperty.ColorDecorative -> BorderIllustrationBox(backgroundColor = token.value() as Color)
+    is TokenProperty.ColorAction, TokenProperty.ColorAlways, TokenProperty.ColorBackground, TokenProperty.ColorBorder, TokenProperty.ColorContent,
+    TokenProperty.ColorDecorative, TokenProperty.ColorOverlay, TokenProperty.ColorSurface -> BorderIllustrationBox(backgroundColor = token.value() as Color)
     is TokenProperty.Opacity -> OpacityIllustrationBox(opacity = token.value() as Float)
     is TokenProperty.Elevation -> ElevationIllustrationSurface(elevation = token.value() as Dp)
     is TokenProperty.SizeIconDecorative -> SizeIconDecorativeIllustrationBox(size = token.value() as Dp)
@@ -222,13 +222,9 @@ private fun TokenIllustration(tokenProperty: TokenProperty<*>, token: Token<*>)
         contentAlignment = Alignment.Center
     )
     TokenProperty.SpacePaddingInline -> SpaceIllustrationBox(size = token.value() as Dp)
-    TokenProperty.SpacePaddingInlineWithIcon, TokenProperty.SpaceColumnGapWithIcon -> SpaceWithIconIllustrationRow(size = token.value() as Dp)
-    TokenProperty.SpacePaddingInlineWithArrow, TokenProperty.SpaceColumnGapWithArrow -> SpaceWithArrowIllustrationRow(size = token.value() as Dp)
     TokenProperty.SpacePaddingInset -> SpacePaddingInsetIllustrationBox(size = token.value() as Dp)
     TokenProperty.SpacePaddingStack -> SpaceIllustrationBox(size = token.value() as Dp, orientation = SpaceOrientation.Vertical)
     TokenProperty.SpaceRowGap -> SpaceIllustrationBox(size = token.value() as Dp, orientation = SpaceOrientation.Vertical, contentAlignment = Alignment.Center)
-    TokenProperty.SpaceRowGapWithIcon -> SpaceWithIconIllustrationColumn(size = token.value() as Dp, verticalArrangement = Arrangement.Bottom)
-    TokenProperty.SpacePaddingStackWithIcon -> SpaceWithIconIllustrationColumn(size = token.value() as Dp)
     TokenProperty.Typography, TokenProperty.Grid -> Unit
 }
 
@@ -277,7 +273,7 @@ private fun CodeColumn(codeExample: String, modifier: Modifier = Modifier) {
                         stateDescription = linkStateDescription
                     },
                 verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(OudsSpaceKeyToken.PaddingInline.WithArrow.Short.value)
+                horizontalArrangement = Arrangement.spacedBy(OudsSpaceKeyToken.PaddingInline.Short.value)
             ) {
                 Text(
                     text = stringResource(R.string.app_tokens_viewCodeExample_label),
@@ -286,7 +282,7 @@ private fun CodeColumn(codeExample: String, modifier: Modifier = Modifier) {
                 Icon(
                     modifier = Modifier.rotate(linkArrowRotation),
                     painter = painterResource(R.drawable.ic_chevron_down),
-                    tint = OudsColorKeyToken.Brand.Primary.Default.value,
+                    tint = OudsColorKeyToken.Content.Brand.Primary.value,
                     contentDescription = null
                 )
             }

diff --git a/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenProperty.kt b/app/src/main/java/com/orange/ouds/app/ui/tokens/TokenProperty.kt
@@ -74,12 +74,6 @@ sealed class TokenProperty<T>(
         categoryClass = TokenCategory.Color::class
     )
 
-    data object ColorBrand : TokenProperty<TokenCategory.Color>(
-        nameRes = R.string.app_tokens_color_brand_label,
-        tokens = OudsColorKeyToken.Brand::class.getTokens(),
-        categoryClass = TokenCategory.Color::class
-    )
-
     data object ColorContent : TokenProperty<TokenCategory.Color>(
         nameRes = R.string.app_tokens_color_content_label,
         tokens = OudsColorKeyToken.Content::class.getTokens(),
@@ -92,15 +86,15 @@ sealed class TokenProperty<T>(
         categoryClass = TokenCategory.Color::class
     )
 
-    data object ColorElevation : TokenProperty<TokenCategory.Color>(
-        nameRes = R.string.app_tokens_color_elevation_label,
-        tokens = OudsColorKeyToken.Elevation::class.getTokens(),
+    data object ColorOverlay : TokenProperty<TokenCategory.Color>(
+        nameRes = R.string.app_tokens_color_overlay_label,
+        tokens = OudsColorKeyToken.Overlay::class.getTokens(),
         categoryClass = TokenCategory.Color::class
     )
 
-    data object ColorGradient : TokenProperty<TokenCategory.Color>(
-        nameRes = R.string.app_tokens_color_gradient_label,
-        tokens = OudsColorKeyToken.Gradient::class.getTokens(),
+    data object ColorSurface : TokenProperty<TokenCategory.Color>(
+        nameRes = R.string.app_tokens_color_surface_label,
+        tokens = OudsColorKeyToken.Surface::class.getTokens(),
         categoryClass = TokenCategory.Color::class
     )
 
@@ -154,18 +148,6 @@ sealed class TokenProperty<T>(
         categoryClass = TokenCategory.Dimension.Space::class
     )
 
-    data object SpaceColumnGapWithIcon : TokenProperty<TokenCategory.Dimension.Space>(
-        nameRes = R.string.app_tokens_dimension_space_columnGapWithIcon_label,
-        tokens = OudsSpaceKeyToken.ColumnGap.WithIcon::class.getTokens(),
-        categoryClass = TokenCategory.Dimension.Space::class
-    )
-
-    data object SpaceColumnGapWithArrow : TokenProperty<TokenCategory.Dimension.Space>(
-        nameRes = R.string.app_tokens_dimension_space_columnGapWithArrow_label,
-        tokens = OudsSpaceKeyToken.ColumnGap.WithArrow::class.getTokens(),
-        categoryClass = TokenCategory.Dimension.Space::class
-    )
-
     data object SpaceFixed : TokenProperty<TokenCategory.Dimension.Space>(
         nameRes = R.string.app_tokens_dimension_space_fixed_label,
         tokens = OudsSpaceKeyToken.Fixed::class.getTokens(),
@@ -178,18 +160,6 @@ sealed class TokenProperty<T>(
         categoryClass = TokenCategory.Dimension.Space::class
     )
 
-    data object SpacePaddingInlineWithIcon : TokenProperty<TokenCategory.Dimension.Space>(
-        nameRes = R.string.app_tokens_dimension_space_paddingInlineWithIcon_label,
-        tokens = OudsSpaceKeyToken.PaddingInline.WithIcon::class.getTokens(),
-        categoryClass = TokenCategory.Dimension.Space::class
-    )
-
-    data object SpacePaddingInlineWithArrow : TokenProperty<TokenCategory.Dimension.Space>(
-        nameRes = R.string.app_tokens_dimension_space_paddingInlineWithArrow_label,
-        tokens = OudsSpaceKeyToken.PaddingInline.WithArrow::class.getTokens(),
-        categoryClass = TokenCategory.Dimension.Space::class
-    )
-
     data object SpacePaddingInset : TokenProperty<TokenCategory.Dimension.Space>(
         nameRes = R.string.app_tokens_dimension_space_paddingInset_label,
         tokens = OudsSpaceKeyToken.Inset::class.getTokens(),
@@ -202,24 +172,12 @@ sealed class TokenProperty<T>(
         categoryClass = TokenCategory.Dimension.Space::class
     )
 
-    data object SpacePaddingStackWithIcon : TokenProperty<TokenCategory.Dimension.Space>(
-        nameRes = R.string.app_tokens_dimension_space_paddingStackWithIcon_label,
-        tokens = OudsSpaceKeyToken.PaddingBlock.WithIcon::class.getTokens(),
-        categoryClass = TokenCategory.Dimension.Space::class
-    )
-
     data object SpaceRowGap : TokenProperty<TokenCategory.Dimension.Space>(
         nameRes = R.string.app_tokens_dimension_space_rowGap_label,
         tokens = OudsSpaceKeyToken.RowGap::class.getTokens(recursive = false),
         categoryClass = TokenCategory.Dimension.Space::class
     )
 
-    data object SpaceRowGapWithIcon : TokenProperty<TokenCategory.Dimension.Space>(
-        nameRes = R.string.app_tokens_dimension_space_rowGapWithIcon_label,
-        tokens = OudsSpaceKeyToken.RowGap.WithIcon::class.getTokens(),
-        categoryClass = TokenCategory.Dimension.Space::class
-    )
-
     data object SpaceScaled : TokenProperty<TokenCategory.Dimension.Space>(
         nameRes = R.string.app_tokens_dimension_space_scaled_label,
         tokens = OudsSpaceKeyToken.Scaled::class.getTokens(),