Reuse OudsAlertStatus in list items and tags

florentmaitre · florentmaitre · commit 321887ecdda2 · 2026-07-20T14:51:10.000+02:00
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsAlert.kt b/core/src/main/java/com/orange/ouds/core/component/OudsAlert.kt
@@ -56,25 +56,28 @@ internal sealed class OudsAlertStatus(
     class Warning(
         defaultIconPainterProvider: (@Composable (OudsAlertStatus) -> Painter?) = { getDefaultIconPainter(it) },
         defaultIconContentDescriptionProvider: (@Composable (OudsAlertStatus) -> String) = { stringResource(R.string.core_common_warning_a11y) }
-    ) :
-        OudsAlertStatus(defaultIconPainterProvider, defaultIconContentDescriptionProvider)
+    ) : OudsAlertStatus(defaultIconPainterProvider, defaultIconContentDescriptionProvider)
 
     companion object {
 
         @Composable
-        protected fun getDefaultIconPainter(status: OudsAlertStatus): Painter? {
+        internal fun getDefaultIconPainter(status: OudsAlertStatus, layeredTintedWarningPainter: Boolean = true): Painter? {
             return when (status) {
                 is Negative -> painterResource(OudsTheme.drawableResources.component.alert.importantFill)
                 is Positive -> painterResource(OudsTheme.drawableResources.component.alert.tickConfirmationFill)
                 is Info -> painterResource(OudsTheme.drawableResources.component.alert.infoFill)
                 is Warning -> {
-                    val iconTokens = OudsTheme.componentsTokens.icon
-                    LayeredTintedPainter(
-                        backPainter = painterResource(id = OudsTheme.drawableResources.component.alert.warningExternalShape),
-                        backPainterColor = iconTokens.colorContentStatusWarningExternalShape.value,
-                        frontPainter = painterResource(id = OudsTheme.drawableResources.component.alert.warningInternalShape),
-                        frontPainterColor = iconTokens.colorContentStatusWarningInternalShape.value
-                    )
+                    if (!layeredTintedWarningPainter) {
+                        painterResource(id = OudsTheme.drawableResources.component.alert.warningExternalShape)
+                    } else {
+                        val iconTokens = OudsTheme.componentsTokens.icon
+                        LayeredTintedPainter(
+                            backPainter = painterResource(id = OudsTheme.drawableResources.component.alert.warningExternalShape),
+                            backPainterColor = iconTokens.colorContentStatusWarningExternalShape.value,
+                            frontPainter = painterResource(id = OudsTheme.drawableResources.component.alert.warningInternalShape),
+                            frontPainterColor = iconTokens.colorContentStatusWarningInternalShape.value
+                        )
+                    }
                 }
                 is Accent,
                 is Neutral -> null
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsListItem.kt b/core/src/main/java/com/orange/ouds/core/component/OudsListItem.kt
@@ -64,7 +64,6 @@ import com.orange.ouds.core.theme.LocalThemeSettings
 import com.orange.ouds.core.theme.OudsTheme
 import com.orange.ouds.core.theme.takeUnlessHairline
 import com.orange.ouds.core.utilities.CheckerboardPainter
-import com.orange.ouds.core.utilities.LayeredTintedPainter
 import com.orange.ouds.core.utilities.OudsPreview
 import com.orange.ouds.core.utilities.OudsPreviewDevice
 import com.orange.ouds.core.utilities.OudsPreviewLightDark
@@ -617,42 +616,25 @@ enum class OudsListItemIconSize {
         }
 }
 
-enum class OudsListItemIconStatus(
-    val painterProvider: @Composable () -> Painter,
-    val contentDescriptionProvider: (@Composable () -> String) = { "" }
-) {
-    Negative(
-        { painterResource(OudsTheme.drawableResources.component.alert.importantFill) },
-        { stringResource(R.string.core_common_error_a11y) }
-    ),
-
-    Positive({ painterResource(OudsTheme.drawableResources.component.alert.tickConfirmationFill) }),
-
-    Info({ painterResource(OudsTheme.drawableResources.component.alert.infoFill) }),
-
-    Warning(
-        {
-            val iconTokens = OudsTheme.components.icon
-            LayeredTintedPainter(
-                backPainter = painterResource(id = OudsTheme.drawableResources.component.alert.warningExternalShape),
-                backPainterColor = iconTokens.color.content.status.warning.externalShape,
-                frontPainter = painterResource(id = OudsTheme.drawableResources.component.alert.warningInternalShape),
-                frontPainterColor = iconTokens.color.content.status.warning.internalShape
-            )
-        },
-        { stringResource(R.string.core_common_warning_a11y) }
-    );
+enum class OudsListItemIconStatus(private val alertStatus: OudsAlertStatus, val contentDescriptionProvider: (@Composable () -> String) = { "" }) {
 
-    val tint
+    Negative(OudsAlertStatus.Negative(), { stringResource(R.string.core_common_error_a11y) }),
+
+    Positive(OudsAlertStatus.Positive()),
+
+    Info(OudsAlertStatus.Info()),
+
+    Warning(OudsAlertStatus.Warning(), { stringResource(R.string.core_common_warning_a11y) });
+
+    val painter: Painter
         @Composable
-        get() = with(OudsTheme.colorScheme.content) {
-            when (this@OudsListItemIconStatus) {
-                Positive -> status.positive
-                Warning -> Color.Unspecified
-                Negative -> status.negative
-                Info -> status.info
-            }
+        get() = OudsAlertStatus.getDefaultIconPainter(alertStatus).orElse {
+            error("No painter for status ${this::class.simpleName}")
         }
+
+    val tint
+        @Composable
+        get() = alertStatus.assetColor
 }
 
 enum class OudsListItemImageFormat {
@@ -828,7 +810,7 @@ sealed interface OudsListItemLeading : OudsListItemLeadingTrailing {
         ) : this({ bitmap as Any }, { contentDescription }, tinted, size, null)
 
         private constructor(size: OudsListItemIconSize, status: OudsListItemIconStatus) : this(
-            { status.painterProvider() },
+            { status.painter },
             { status.contentDescriptionProvider() },
             true,
             size,
@@ -987,7 +969,7 @@ sealed interface OudsListItemTrailing : OudsListItemLeadingTrailing {
         ) : this({ bitmap as Any }, { contentDescription }, tinted, size, null)
 
         private constructor(size: OudsListItemIconSize, status: OudsListItemIconStatus) : this(
-            { status.painterProvider() },
+            { status.painter },
             { status.contentDescriptionProvider() },
             true,
             size,
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsSmallListItem.kt b/core/src/main/java/com/orange/ouds/core/component/OudsSmallListItem.kt
@@ -227,7 +227,7 @@ sealed interface OudsSmallListItemLeading : OudsListItemLeadingTrailing {
         ) : this({ bitmap }, { contentDescription }, tinted, null)
 
         private constructor(status: OudsListItemIconStatus) : this(
-            { status.painterProvider() },
+            { status.painter },
             { status.contentDescriptionProvider() },
             true,
             status
@@ -361,7 +361,7 @@ sealed interface OudsSmallListItemTrailing : OudsListItemLeadingTrailing {
             bitmap: ImageBitmap, contentDescription: String, tinted: Boolean = true
         ) : this({ bitmap }, { contentDescription }, tinted, null)
 
-        private constructor(status: OudsListItemIconStatus) : this(status.painterProvider, status.contentDescriptionProvider, true, status)
+        private constructor(status: OudsListItemIconStatus) : this({ status.painter }, status.contentDescriptionProvider, true, status)
 
         // TODO KDoc
         object Info : Icon(OudsListItemIconStatus.Info)
diff --git a/core/src/main/java/com/orange/ouds/core/component/OudsTag.kt b/core/src/main/java/com/orange/ouds/core/component/OudsTag.kt
@@ -36,7 +36,6 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.semantics
@@ -55,7 +54,6 @@ import com.orange.ouds.core.extensions.iconSize
 import com.orange.ouds.core.theme.OudsTheme
 import com.orange.ouds.core.theme.value
 import com.orange.ouds.core.utilities.CheckedContent
-import com.orange.ouds.core.utilities.LayeredTintedPainter
 import com.orange.ouds.core.utilities.OudsPreview
 import com.orange.ouds.core.utilities.OudsPreviewLightDark
 import com.orange.ouds.core.utilities.PreviewGrid
@@ -565,10 +563,15 @@ enum class OudsTagSize {
  *
  * @property asset The asset to be displayed in the tag, or `null` if there is no asset.
  */
-sealed class OudsTagStatus(val asset: OudsTagAsset? = null) {
+sealed class OudsTagStatus(private val alertStatus: OudsAlertStatus, val asset: OudsTagAsset? = null) {
 
     @Composable
-    internal open fun getDefaultIconPainter(appearance: OudsTagAppearance, enabled: Boolean): Painter? = null
+    internal fun getDefaultIconPainter(appearance: OudsTagAppearance, enabled: Boolean): Painter? {
+        return OudsAlertStatus.getDefaultIconPainter(
+            status = alertStatus,
+            layeredTintedWarningPainter = appearance != OudsTagAppearance.Emphasized && enabled
+        )
+    }
 
     internal open val defaultIconContentDescription: String
         @Composable
@@ -578,7 +581,7 @@ sealed class OudsTagStatus(val asset: OudsTagAsset? = null) {
      * Default or inactive status. Used for standard labels, categories, or when no specific status needs to be communicated.
      * Its [asset] can be an [OudsTagAsset.Bullet], an [OudsTagAsset.Icon] or `null` if no asset is needed.
      */
-    class Neutral internal constructor(asset: OudsTagAsset?) : OudsTagStatus(asset) {
+    class Neutral internal constructor(asset: OudsTagAsset?) : OudsTagStatus(OudsAlertStatus.Neutral(), asset) {
         /**
          * Creates an instance of [OudsTagStatus.Neutral] with a bullet.
          */
@@ -600,7 +603,7 @@ sealed class OudsTagStatus(val asset: OudsTagAsset? = null) {
      * Invites users to explore and engage with new offerings, creating an exciting and engaging experience.
      * Its [asset] can be an [OudsTagAsset.Bullet], an [OudsTagAsset.Icon] or `null` if no asset is needed.
      */
-    class Accent internal constructor(asset: OudsTagAsset?) : OudsTagStatus(asset) {
+    class Accent internal constructor(asset: OudsTagAsset?) : OudsTagStatus(OudsAlertStatus.Accent(), asset) {
         /**
          * Creates an instance of [OudsTagStatus.Accent] with a bullet.
          */
@@ -621,7 +624,7 @@ sealed class OudsTagStatus(val asset: OudsTagAsset? = null) {
      * Indicates success, confirmation, or a positive status. This functional status is commonly used to highlight completed actions or approved items.
      * Its [asset] can be an [OudsTagAsset.Bullet], an [OudsTagAsset.Icon.Default] or `null` if no asset is needed.
      */
-    class Positive internal constructor(asset: OudsTagAsset?) : OudsTagStatus(asset) {
+    class Positive internal constructor(asset: OudsTagAsset?) : OudsTagStatus(OudsAlertStatus.Positive(), asset) {
         /**
          * Creates an instance of [OudsTagStatus.Positive] with a bullet.
          */
@@ -636,17 +639,13 @@ sealed class OudsTagStatus(val asset: OudsTagAsset? = null) {
          * Creates an instance of [OudsTagStatus.Positive] with no asset.
          */
         constructor() : this(null)
-
-        @Composable
-        override fun getDefaultIconPainter(appearance: OudsTagAppearance, enabled: Boolean) =
-            painterResource(OudsTheme.drawableResources.component.alert.tickConfirmationFill)
     }
 
     /**
      * Conveys informational messages or supplementary details. This functional status is used for neutral, helpful, or contextual information.
      * Its [asset] can be an [OudsTagAsset.Bullet], an [OudsTagAsset.Icon.Default] or `null` if no asset is needed.
      */
-    class Info internal constructor(asset: OudsTagAsset?) : OudsTagStatus(asset) {
+    class Info internal constructor(asset: OudsTagAsset?) : OudsTagStatus(OudsAlertStatus.Info(), asset) {
         /**
          * Creates an instance of [OudsTagStatus.Info] with a bullet.
          */
@@ -661,17 +660,13 @@ sealed class OudsTagStatus(val asset: OudsTagAsset? = null) {
          * Creates an instance of [OudsTagStatus.Info] with no asset.
          */
         constructor() : this(null)
-
-        @Composable
-        override fun getDefaultIconPainter(appearance: OudsTagAppearance, enabled: Boolean) =
-            painterResource(OudsTheme.drawableResources.component.alert.infoFill)
     }
 
     /**
      * Signals caution or a potentially risky situation. This functional status is used to draw attention to items requiring user awareness or intervention.
      * Its [asset] can be an [OudsTagAsset.Bullet], an [OudsTagAsset.Icon.Default] or `null` if no asset is needed.
      */
-    class Warning internal constructor(asset: OudsTagAsset?) : OudsTagStatus(asset) {
+    class Warning internal constructor(asset: OudsTagAsset?) : OudsTagStatus(OudsAlertStatus.Warning(), asset) {
         /**
          * Creates an instance of [OudsTagStatus.Warning] with a bullet.
          */
@@ -687,20 +682,6 @@ sealed class OudsTagStatus(val asset: OudsTagAsset? = null) {
          */
         constructor() : this(null)
 
-        @Composable
-        override fun getDefaultIconPainter(appearance: OudsTagAppearance, enabled: Boolean): Painter {
-            val iconTokens = OudsTheme.componentsTokens.icon
-            return when {
-                appearance == OudsTagAppearance.Emphasized || !enabled -> painterResource(id = OudsTheme.drawableResources.component.alert.warningExternalShape)
-                else -> LayeredTintedPainter(
-                    backPainter = painterResource(id = OudsTheme.drawableResources.component.alert.warningExternalShape),
-                    backPainterColor = iconTokens.colorContentStatusWarningExternalShape.value,
-                    frontPainter = painterResource(id = OudsTheme.drawableResources.component.alert.warningInternalShape),
-                    frontPainterColor = iconTokens.colorContentStatusWarningInternalShape.value
-                )
-            }
-        }
-
         override val defaultIconContentDescription
             @Composable
             get() = stringResource(id = R.string.core_common_warning_a11y)
@@ -710,7 +691,7 @@ sealed class OudsTagStatus(val asset: OudsTagAsset? = null) {
      * Represents errors, critical issues, or urgent attention needed. This functional status is used to highlight problems or failed actions.
      * Its [asset] can be an [OudsTagAsset.Bullet], an [OudsTagAsset.Icon.Default] or `null` if no asset is needed.
      */
-    class Negative internal constructor(asset: OudsTagAsset?) : OudsTagStatus(asset) {
+    class Negative internal constructor(asset: OudsTagAsset?) : OudsTagStatus(OudsAlertStatus.Negative(), asset) {
         /**
          * Creates an instance of [OudsTagStatus.Negative] with a bullet.
          */
@@ -726,10 +707,6 @@ sealed class OudsTagStatus(val asset: OudsTagAsset? = null) {
          */
         constructor() : this(null)
 
-        @Composable
-        override fun getDefaultIconPainter(appearance: OudsTagAppearance, enabled: Boolean) =
-            painterResource(OudsTheme.drawableResources.component.alert.importantFill)
-
         override val defaultIconContentDescription
             @Composable
             get() = stringResource(id = R.string.core_common_error_a11y)
