From 42b2b5980c838b2067b8b0246502f57747779f11 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 7 Jul 2025 16:14:20 +0200
Subject: [PATCH] Use color from Semantics.

---
 .../atomic/atoms/MatrixBadgeAtom.kt            | 18 +++++++-----------
 .../designsystem/theme/ColorAliases.kt         | 18 ------------------
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/MatrixBadgeAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/MatrixBadgeAtom.kt
index 51507064eb..227e2f27cc 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/MatrixBadgeAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/MatrixBadgeAtom.kt
@@ -14,10 +14,6 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.designsystem.components.Badge
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.badgeNegativeBackgroundColor
-import io.element.android.libraries.designsystem.theme.badgeNegativeContentColor
-import io.element.android.libraries.designsystem.theme.badgeNeutralBackgroundColor
-import io.element.android.libraries.designsystem.theme.badgeNeutralContentColor
 
 object MatrixBadgeAtom {
     data class MatrixBadgeData(
@@ -39,21 +35,21 @@ object MatrixBadgeAtom {
     ) {
         val backgroundColor = when (data.type) {
             Type.Positive -> ElementTheme.colors.bgBadgeAccent
-            Type.Neutral -> ElementTheme.colors.badgeNeutralBackgroundColor
-            Type.Negative -> ElementTheme.colors.badgeNegativeBackgroundColor
+            Type.Neutral -> ElementTheme.colors.bgBadgeDefault
+            Type.Negative -> ElementTheme.colors.bgCriticalSubtle
             Type.Info -> ElementTheme.colors.bgBadgeInfo
         }
         val textColor = when (data.type) {
             Type.Positive -> ElementTheme.colors.textBadgeAccent
-            Type.Neutral -> ElementTheme.colors.badgeNeutralContentColor
-            Type.Negative -> ElementTheme.colors.badgeNegativeContentColor
+            Type.Neutral -> ElementTheme.colors.textPrimary
+            Type.Negative -> ElementTheme.colors.textCriticalPrimary
             Type.Info -> ElementTheme.colors.textBadgeInfo
         }
         val iconColor = when (data.type) {
-            Type.Positive -> ElementTheme.colors.textBadgeAccent
-            Type.Neutral -> ElementTheme.colors.iconSecondary
+            Type.Positive -> ElementTheme.colors.iconAccentPrimary
+            Type.Neutral -> ElementTheme.colors.iconPrimary
             Type.Negative -> ElementTheme.colors.iconCriticalPrimary
-            Type.Info -> ElementTheme.colors.textBadgeInfo
+            Type.Info -> ElementTheme.colors.iconInfoPrimary
         }
         Badge(
             text = data.text,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt
index 4a5aee2f06..e0ec0322c4 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt
@@ -77,24 +77,6 @@ val SemanticColors.mentionPillText
 val SemanticColors.bigCheckmarkBorderColor
     get() = if (isLight) LightColorTokens.colorGray400 else DarkColorTokens.colorGray400
 
-// Badge colors
-
-@OptIn(CoreColorToken::class)
-val SemanticColors.badgeNeutralBackgroundColor
-    get() = if (isLight) LightColorTokens.colorAlphaGray300 else DarkColorTokens.colorAlphaGray300
-
-@OptIn(CoreColorToken::class)
-val SemanticColors.badgeNeutralContentColor
-    get() = if (isLight) LightColorTokens.colorGray1100 else DarkColorTokens.colorGray1100
-
-@OptIn(CoreColorToken::class)
-val SemanticColors.badgeNegativeBackgroundColor
-    get() = if (isLight) LightColorTokens.colorAlphaRed300 else DarkColorTokens.colorAlphaRed300
-
-@OptIn(CoreColorToken::class)
-val SemanticColors.badgeNegativeContentColor
-    get() = if (isLight) LightColorTokens.colorRed1100 else DarkColorTokens.colorRed1100
-
 @OptIn(CoreColorToken::class)
 val SemanticColors.pinnedMessageBannerIndicator
     get() = if (isLight) LightColorTokens.colorAlphaGray600 else DarkColorTokens.colorAlphaGray600