Review: Create an interface implemented by all color nested classes

Orange-OpenSource · Nov 8, 2024 · d3ea127 · d3ea127
1 parent d09bf1d
commit d3ea127
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 90 deletions.
diff --git a/core/src/main/java/com/orange/ouds/core/theme/OudsColorScheme.kt b/core/src/main/java/com/orange/ouds/core/theme/OudsColorScheme.kt
@@ -20,6 +20,14 @@ import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.Stable
 import androidx.compose.ui.graphics.Color
 import com.orange.ouds.theme.tokens.OudsColorKeyToken
+import com.orange.ouds.theme.tokens.OudsColorKeyToken.Action
+import com.orange.ouds.theme.tokens.OudsColorKeyToken.Always
+import com.orange.ouds.theme.tokens.OudsColorKeyToken.Background
+import com.orange.ouds.theme.tokens.OudsColorKeyToken.Border
+import com.orange.ouds.theme.tokens.OudsColorKeyToken.Brand
+import com.orange.ouds.theme.tokens.OudsColorKeyToken.Content
+import com.orange.ouds.theme.tokens.OudsColorKeyToken.Decorative
+import com.orange.ouds.theme.tokens.OudsColorKeyToken.Elevation
 import com.orange.ouds.theme.tokens.semantic.OudsColorSemanticTokens
 
 data class OudsColorScheme(
@@ -1085,81 +1093,20 @@ val OudsColorSemanticTokens.materialDarkColorScheme: ColorScheme
     )
 
 /**
- * Converts an OUDS action color token to the local color value provided by the theme.
+ * Converts an OUDS color token to the local color value provided by the theme.
  */
-val OudsColorKeyToken.Action.value: Color
+val OudsColorKeyToken.value: Color
     @ReadOnlyComposable
     @Composable
-    get() = OudsTheme.colorScheme.fromToken(this)
-
-/**
- * Converts an OUDS always color token to the local color value provided by the theme.
- */
-val OudsColorKeyToken.Always.value: Color
-    @ReadOnlyComposable
-    @Composable
-    get() = OudsTheme.colorScheme.fromToken(this)
-
-/**
- * Converts an OUDS background color token to the local color value provided by the theme.
- */
-val OudsColorKeyToken.Background.value: Color
-    @ReadOnlyComposable
-    @Composable
-    get() = OudsTheme.colorScheme.fromToken(this)
-
-/**
- * Converts an OUDS border color token to the local color value provided by the theme.
- */
-val OudsColorKeyToken.Border.value: Color
-    @ReadOnlyComposable
-    @Composable
-    get() = OudsTheme.colorScheme.fromToken(this)
-
-/**
- * Converts an OUDS brand color token to the local color value provided by the theme.
- */
-val OudsColorKeyToken.Brand.value: Color
-    @ReadOnlyComposable
-    @Composable
-    get() = OudsTheme.colorScheme.fromToken(this)
-
-/**
- * Converts an OUDS content color token to the local color value provided by the theme.
- */
-val OudsColorKeyToken.Content.value: Color
-    @ReadOnlyComposable
-    @Composable
-    get() = OudsTheme.colorScheme.fromToken(this)
-
-/**
- * Converts an OUDS elevation color token to the local color value provided by the theme.
- */
-val OudsColorKeyToken.Elevation.value: Color
-    @ReadOnlyComposable
-    @Composable
-    get() = OudsTheme.colorScheme.fromToken(this)
-
-/**
- * Converts an OUDS gradient color token to the local color value provided by the theme.
- */
-val OudsColorKeyToken.Gradient.value: Color
-    @ReadOnlyComposable
-    @Composable
-    get() = OudsTheme.colorScheme.fromToken(this)
-
-/**
- * Converts an OUDS decorative color token to the local color value provided by the theme.
- */
-val OudsColorKeyToken.Decorative.value: Color
-    @ReadOnlyComposable
-    @Composable
-    get() = OudsTheme.colorScheme.fromToken(this)
-
-/**
- * Converts an OUDS transparent color token to the local color value provided by the theme.
- */
-val OudsColorKeyToken.Transparent.value: Color
-    @ReadOnlyComposable
-    @Composable
-    get() = OudsTheme.colorScheme.fromToken(this)
+    get() = when (this) {
+        is Action -> OudsTheme.colorScheme.fromToken(this)
+        is Always -> OudsTheme.colorScheme.fromToken(this)
+        is Background -> OudsTheme.colorScheme.fromToken(this)
+        is Border -> OudsTheme.colorScheme.fromToken(this)
+        is Brand -> OudsTheme.colorScheme.fromToken(this)
+        is Content -> OudsTheme.colorScheme.fromToken(this)
+        is Decorative -> OudsTheme.colorScheme.fromToken(this)
+        is Elevation -> OudsTheme.colorScheme.fromToken(this)
+        is OudsColorKeyToken.Transparent -> OudsTheme.colorScheme.fromToken(this)
+        is OudsColorKeyToken.Gradient -> OudsTheme.colorScheme.fromToken(this)
+    }
diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsColorKeyToken.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/OudsColorKeyToken.kt
@@ -12,12 +12,13 @@
 
 package com.orange.ouds.theme.tokens
 
-object OudsColorKeyToken {
-    enum class Transparent {
+sealed interface OudsColorKeyToken {
+
+    enum class Transparent : OudsColorKeyToken {
         TransparentDefault,
     }
 
-    enum class Action {
+    enum class Action : OudsColorKeyToken {
         Disabled,
         DisabledOnBgEmphasized,
         NegativeEnabled,
@@ -51,7 +52,7 @@ object OudsColorKeyToken {
         VisitedOnBgEmphasized,
     }
 
-    enum class Always {
+    enum class Always : OudsColorKeyToken {
         Accent,
         Black,
         Info,
@@ -68,7 +69,7 @@ object OudsColorKeyToken {
         White,
     }
 
-    enum class Background {
+    enum class Background : OudsColorKeyToken {
         BrandPrimary,
         Emphasized,
         Primary,
@@ -93,7 +94,7 @@ object OudsColorKeyToken {
         Tertiary,
     }
 
-    enum class Border {
+    enum class Border : OudsColorKeyToken {
         BrandPrimary,
         BrandPrimaryOnBgEmphasized,
         Default,
@@ -107,7 +108,7 @@ object OudsColorKeyToken {
         OnBrandPrimary,
     }
 
-    enum class Brand {
+    enum class Brand : OudsColorKeyToken {
         AccentDefault,
         AccentHigh,
         AccentHighest,
@@ -145,7 +146,7 @@ object OudsColorKeyToken {
         WarningLowest,
     }
 
-    enum class Content {
+    enum class Content : OudsColorKeyToken {
         BrandPrimary,
         BrandPrimaryOnBgEmphasized,
         Default,
@@ -189,7 +190,7 @@ object OudsColorKeyToken {
         StatusWarning,
     }
 
-    enum class Elevation {
+    enum class Elevation : OudsColorKeyToken {
         Drag,
         DragOnBgEmphasized,
         DragOnBgSecondary,
@@ -205,14 +206,14 @@ object OudsColorKeyToken {
         RaisedOnBgSecondary,
     }
 
-    enum class Gradient {
+    enum class Gradient : OudsColorKeyToken {
         SkeletonMiddle,
         SkeletonMiddleOnBgEmphasized,
         SkeletonStartEnd,
         SkeletonStartEndOnBgEmphasized,
     }
 
-    enum class Decorative {
+    enum class Decorative : OudsColorKeyToken {
         Accent1Default,
         Accent1Emphasized,
         Accent1Muted,

diff --git a/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsButtonTokens.kt b/theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsButtonTokens.kt
@@ -19,10 +19,10 @@ import com.orange.ouds.theme.tokens.OudsSpaceKeyToken
 import com.orange.ouds.theme.tokens.OudsTypographyKeyToken
 
 open class OudsButtonTokens(
-    val containerColor: OudsColorKeyToken.Background = OudsColorKeyToken.Background.BrandPrimary,
-    val contentColor: OudsColorKeyToken.Content = OudsColorKeyToken.Content.BrandPrimary,
-    val disabledContainerColor: OudsColorKeyToken.Action = OudsColorKeyToken.Action.Disabled,
-    val disabledContentColor: OudsColorKeyToken.Content = OudsColorKeyToken.Content.Disabled,
+    val containerColor: OudsColorKeyToken = OudsColorKeyToken.Background.BrandPrimary,
+    val contentColor: OudsColorKeyToken = OudsColorKeyToken.Content.BrandPrimary,
+    val disabledContainerColor: OudsColorKeyToken = OudsColorKeyToken.Action.Disabled,
+    val disabledContentColor: OudsColorKeyToken = OudsColorKeyToken.Content.Disabled,
     val cornerRadius: OudsBorderRadiusKeyToken = OudsBorderRadiusKeyToken.None,
     val defaultElevation: OudsElevationKeyToken = OudsElevationKeyToken.None,
     val pressedElevation: OudsElevationKeyToken = OudsElevationKeyToken.None,