Reuse OudsAlertStatus in list items, progress indicators and tags

florentmaitre · florentmaitre · commit 734801539b71 · 2026-08-03T13:55:59.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
@@ -55,26 +55,30 @@ 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)
+        defaultIconContentDescriptionProvider: (@Composable (OudsAlertStatus) -> String) = { stringResource(R.string.core_common_warning_a11y) },
+        val layeredTintedPainter: Boolean = true
+    ) : OudsAlertStatus(defaultIconPainterProvider, defaultIconContentDescriptionProvider)
 
     companion object {
 
         @Composable
-        protected fun getDefaultIconPainter(status: OudsAlertStatus): Painter? {
+        internal fun getDefaultIconPainter(status: OudsAlertStatus): 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 (!status.layeredTintedPainter) {
+                        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
@@ -97,14 +101,14 @@ internal sealed class OudsAlertStatus(
     /**
      * The asset color associated with this status.
      */
-    val assetColor
+    val assetColor: Color
         @Composable
         get() = with(OudsTheme.colorScheme.content) {
             when (this@OudsAlertStatus) {
                 is Neutral -> default
                 is Accent -> status.accent
                 is Positive -> status.positive
-                is Warning -> Color.Unspecified
+                is Warning -> if (layeredTintedPainter) Color.Unspecified else status.warning
                 is Negative -> status.negative
                 is Info -> status.info
             }
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
@@ -67,7 +67,6 @@ import com.orange.ouds.core.theme.OudsTheme
 import com.orange.ouds.core.theme.takeUnlessHairline
 import com.orange.ouds.core.theme.value
 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
@@ -725,41 +724,34 @@ enum class OudsListItemIconSize {
 }
 
 internal 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) }
-    );
+    Negative({ stringResource(R.string.core_common_error_a11y) }),
 
-    val tint
+    Positive,
+
+    Info,
+
+    Warning({ stringResource(R.string.core_common_warning_a11y) });
+
+    private fun toAlertStatus(): OudsAlertStatus {
+        return when (this) {
+            Negative -> OudsAlertStatus.Negative()
+            Positive -> OudsAlertStatus.Positive()
+            Info -> OudsAlertStatus.Info()
+            Warning -> OudsAlertStatus.Warning()
+        }
+    }
+
+    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(toAlertStatus()).orElse {
+            error("No painter for status ${this::class.simpleName}")
         }
+
+    val tint
+        @Composable
+        get() = toAlertStatus().assetColor
 }
 
 /**
@@ -978,7 +970,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,
@@ -1160,7 +1152,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/OudsProgressIndicator.kt b/core/src/main/java/com/orange/ouds/core/component/OudsProgressIndicator.kt
@@ -67,21 +67,23 @@ enum class OudsProgressIndicatorStatus {
      * Use when the process involves caution, validation, or potentially disruptive actions.
      */
     Warning;
-    
+
     /**
      * The color associated with this status.
      */
     @Composable
     fun color(): Color {
-        return with(OudsTheme.colorScheme.content) {
-            when (this@OudsProgressIndicatorStatus) {
-                Neutral -> default
-                Accent -> status.accent
-                Negative -> status.negative
-                Positive -> status.positive
-                Info -> status.info
-                Warning -> status.warning
-            }
+        return toAlertStatus().assetColor
+    }
+
+    private fun toAlertStatus(): OudsAlertStatus {
+        return when (this) {
+            Negative -> OudsAlertStatus.Negative()
+            Positive -> OudsAlertStatus.Positive()
+            Info -> OudsAlertStatus.Info()
+            Warning -> OudsAlertStatus.Warning(layeredTintedPainter = false)
+            Accent -> OudsAlertStatus.Accent()
+            Neutral -> OudsAlertStatus.Neutral()
         }
     }
 }
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
@@ -241,7 +241,7 @@ sealed interface OudsSmallListItemLeading : OudsListItemLeadingTrailing {
         ) : this({ bitmap }, { contentDescription }, tinted, null)
 
         private constructor(status: OudsListItemIconStatus) : this(
-            { status.painterProvider() },
+            { status.painter },
             { status.contentDescriptionProvider() },
             true,
             status
@@ -393,7 +393,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)
 
         /**
          * Creates an instance of [OudsSmallListItemTrailing.Icon] representing an info status.
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
@@ -54,7 +53,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
@@ -174,7 +172,7 @@ fun OudsTag(
                                 }
                                 .padding(all = assetPadding),
                             extraParameters = OudsTagAsset.ExtraParameters(
-                                tint = assetColor(status = status, appearance = appearance, enabled = enabled, isBullet = isBulletAsset),
+                                tint = assetColor(status = status, appearance = appearance, enabled = enabled),
                                 status = status,
                                 appearance = appearance,
                                 enabled = enabled
@@ -260,22 +258,13 @@ private fun backgroundColor(status: OudsTagStatus, appearance: OudsTagAppearance
 }
 
 @Composable
-private fun assetColor(status: OudsTagStatus, appearance: OudsTagAppearance, enabled: Boolean, isBullet: Boolean): Color {
+private fun assetColor(status: OudsTagStatus, appearance: OudsTagAppearance, enabled: Boolean): Color {
     return when (appearance) {
         OudsTagAppearance.Emphasized -> contentColor(status = status, appearance = appearance, hasLoader = false, enabled = enabled)
-        OudsTagAppearance.Muted -> when {
-            !enabled -> OudsTheme.colorScheme.content.onAction.disabled
-            !isBullet && status is OudsTagStatus.Warning -> Color.Unspecified // Case of two colors icon. Colors are managed by the `LayeredTintedPainter`.
-            else -> with(OudsTheme.colorScheme.content) {
-                when (status) {
-                    is OudsTagStatus.Accent -> this.status.accent
-                    is OudsTagStatus.Info -> this.status.info
-                    is OudsTagStatus.Negative -> this.status.negative
-                    is OudsTagStatus.Neutral -> default
-                    is OudsTagStatus.Positive -> this.status.positive
-                    is OudsTagStatus.Warning -> this.status.warning
-                }
-            }
+        OudsTagAppearance.Muted -> if (!enabled) {
+            OudsTheme.colorScheme.content.onAction.disabled
+        } else {
+            status.toAlertStatus(appearance, enabled).assetColor
         }
     }
 }
@@ -510,9 +499,7 @@ sealed interface OudsTagAsset : OudsPolymorphicComponentContent {
             OudsTagAsset.ExtraParameters::class.java,
             { icon ->
                 with(icon.extraParameters) {
-                    status.getDefaultIconPainter(appearance, enabled).orElse {
-                        error("No default icon for status ${status::class.simpleName}")
-                    }
+                    status.getPainter(appearance = appearance, enabled = enabled)
                 }
             },
             { icon -> icon.extraParameters.status.defaultIconContentDescription }
@@ -564,13 +551,31 @@ enum class OudsTagSize {
  */
 sealed class OudsTagStatus(val asset: OudsTagAsset? = null) {
 
-    @Composable
-    internal open fun getDefaultIconPainter(appearance: OudsTagAppearance, enabled: Boolean): Painter? = null
+    internal fun toAlertStatus(appearance: OudsTagAppearance, enabled: Boolean): OudsAlertStatus {
+        return when (this) {
+            is Neutral -> OudsAlertStatus.Neutral()
+            is Accent -> OudsAlertStatus.Accent()
+            is Positive -> OudsAlertStatus.Positive()
+            is Warning -> {
+                val layeredTintedPainter = appearance != OudsTagAppearance.Emphasized && enabled && asset !is OudsTagAsset.Bullet
+                OudsAlertStatus.Warning(layeredTintedPainter = layeredTintedPainter)
+            }
+            is Negative -> OudsAlertStatus.Negative()
+            is Info -> OudsAlertStatus.Info()
+        }
+    }
 
     internal open val defaultIconContentDescription: String
         @Composable
         get() = ""
 
+    @Composable
+    internal fun getPainter(appearance: OudsTagAppearance, enabled: Boolean): Painter {
+        return OudsAlertStatus.getDefaultIconPainter(status = toAlertStatus(appearance, enabled)).orElse {
+            error("No painter for status ${this::class.simpleName}")
+        }
+    }
+
     /**
      * 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.
@@ -633,10 +638,6 @@ 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)
     }
 
     /**
@@ -658,10 +659,6 @@ 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)
     }
 
     /**
@@ -684,20 +681,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)
@@ -723,10 +706,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)
