From 2e2a6e3abb31b48bd20df979c5c0d4bc19f29199 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 24 Mar 2026 15:59:50 +0100 Subject: [PATCH] Import compound token v8.0.0 ./tools/compound/import_tokens.sh -b v8.0.0 --- .../compound/tokens/generated/CompoundIcons.kt | 10 ++++++++++ .../compound/tokens/generated/SemanticColors.kt | 6 +++--- .../compound/tokens/generated/SemanticColorsDark.kt | 9 ++++++--- .../tokens/generated/SemanticColorsDarkHc.kt | 9 ++++++--- .../tokens/generated/SemanticColorsLight.kt | 9 ++++++--- .../tokens/generated/SemanticColorsLightHc.kt | 9 ++++++--- .../src/main/res/drawable/ic_compound_ai.xml | 9 +++++++++ .../res/drawable/ic_compound_device_passkey.xml | 13 +++++++++++++ .../src/main/res/drawable/ic_compound_folder.xml | 9 +++++++++ 9 files changed, 68 insertions(+), 15 deletions(-) create mode 100644 libraries/compound/src/main/res/drawable/ic_compound_ai.xml create mode 100644 libraries/compound/src/main/res/drawable/ic_compound_device_passkey.xml create mode 100644 libraries/compound/src/main/res/drawable/ic_compound_folder.xml diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/CompoundIcons.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/CompoundIcons.kt index 456ffcf625..c5ac159b5a 100644 --- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/CompoundIcons.kt +++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/CompoundIcons.kt @@ -148,6 +148,9 @@ object CompoundIcons { @Composable fun Delete(): ImageVector { return ImageVector.vectorResource(R.drawable.ic_compound_delete) } + @Composable fun DevicePasskey(): ImageVector { + return ImageVector.vectorResource(R.drawable.ic_compound_device_passkey) + } @Composable fun Devices(): ImageVector { return ImageVector.vectorResource(R.drawable.ic_compound_devices) } @@ -226,6 +229,9 @@ object CompoundIcons { @Composable fun Filter(): ImageVector { return ImageVector.vectorResource(R.drawable.ic_compound_filter) } + @Composable fun Folder(): ImageVector { + return ImageVector.vectorResource(R.drawable.ic_compound_folder) + } @Composable fun Forward(): ImageVector { return ImageVector.vectorResource(R.drawable.ic_compound_forward) } @@ -738,6 +744,7 @@ object CompoundIcons { Copy(), DarkMode(), Delete(), + DevicePasskey(), Devices(), DialPad(), Document(), @@ -764,6 +771,7 @@ object CompoundIcons { FileError(), Files(), Filter(), + Folder(), Forward(), FullScreen(), Grid(), @@ -965,6 +973,7 @@ object CompoundIcons { R.drawable.ic_compound_copy, R.drawable.ic_compound_dark_mode, R.drawable.ic_compound_delete, + R.drawable.ic_compound_device_passkey, R.drawable.ic_compound_devices, R.drawable.ic_compound_dial_pad, R.drawable.ic_compound_document, @@ -991,6 +1000,7 @@ object CompoundIcons { R.drawable.ic_compound_file_error, R.drawable.ic_compound_files, R.drawable.ic_compound_filter, + R.drawable.ic_compound_folder, R.drawable.ic_compound_forward, R.drawable.ic_compound_full_screen, R.drawable.ic_compound_grid, diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColors.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColors.kt index 4c9b20ef9f..1e3c97d179 100644 --- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColors.kt +++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColors.kt @@ -49,12 +49,12 @@ data class SemanticColors( val bgActionTertiaryRest: Color, /** Background colour for tertiary actions. State: Selected */ val bgActionTertiarySelected: Color, - /** Badge accent background colour */ val bgBadgeAccent: Color, - /** Badge default background colour */ + val bgBadgeCritical: Color, val bgBadgeDefault: Color, - /** Badge info background colour */ val bgBadgeInfo: Color, + val bgBadgePrimary: Color, + val bgBadgeSecondary: Color, /** Default global background for the user interface. Elevation: Default (Level 0) */ val bgCanvasDefault: Color, /** Default global background for the user interface. Elevation: Level 1. */ diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDark.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDark.kt index 9ad028f507..adeed8d5a3 100644 --- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDark.kt +++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDark.kt @@ -37,9 +37,12 @@ val compoundColorsDark = SemanticColors( bgActionTertiaryHovered = DarkColorTokens.colorGray300, bgActionTertiaryRest = DarkColorTokens.colorThemeBg, bgActionTertiarySelected = DarkColorTokens.colorGray400, - bgBadgeAccent = DarkColorTokens.colorAlphaGreen500, - bgBadgeDefault = DarkColorTokens.colorAlphaGray500, - bgBadgeInfo = DarkColorTokens.colorAlphaBlue500, + bgBadgeAccent = DarkColorTokens.colorGreen400, + bgBadgeCritical = DarkColorTokens.colorRed300, + bgBadgeDefault = DarkColorTokens.colorThemeBg, + bgBadgeInfo = DarkColorTokens.colorBlue400, + bgBadgePrimary = DarkColorTokens.colorGray1400, + bgBadgeSecondary = DarkColorTokens.colorGray400, bgCanvasDefault = DarkColorTokens.colorThemeBg, bgCanvasDefaultLevel1 = DarkColorTokens.colorGray300, bgCanvasDisabled = DarkColorTokens.colorGray200, diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDarkHc.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDarkHc.kt index 9af9edd913..9bab04f833 100644 --- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDarkHc.kt +++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDarkHc.kt @@ -37,9 +37,12 @@ val compoundColorsHcDark = SemanticColors( bgActionTertiaryHovered = DarkHcColorTokens.colorGray300, bgActionTertiaryRest = DarkHcColorTokens.colorThemeBg, bgActionTertiarySelected = DarkHcColorTokens.colorGray400, - bgBadgeAccent = DarkHcColorTokens.colorAlphaGreen500, - bgBadgeDefault = DarkHcColorTokens.colorAlphaGray500, - bgBadgeInfo = DarkHcColorTokens.colorAlphaBlue500, + bgBadgeAccent = DarkHcColorTokens.colorGreen400, + bgBadgeCritical = DarkHcColorTokens.colorRed300, + bgBadgeDefault = DarkHcColorTokens.colorThemeBg, + bgBadgeInfo = DarkHcColorTokens.colorBlue400, + bgBadgePrimary = DarkHcColorTokens.colorGray1400, + bgBadgeSecondary = DarkHcColorTokens.colorGray400, bgCanvasDefault = DarkHcColorTokens.colorThemeBg, bgCanvasDefaultLevel1 = DarkHcColorTokens.colorGray300, bgCanvasDisabled = DarkHcColorTokens.colorGray200, diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLight.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLight.kt index 6569f5a676..033efc63ef 100644 --- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLight.kt +++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLight.kt @@ -37,9 +37,12 @@ val compoundColorsLight = SemanticColors( bgActionTertiaryHovered = LightColorTokens.colorGray300, bgActionTertiaryRest = LightColorTokens.colorThemeBg, bgActionTertiarySelected = LightColorTokens.colorGray400, - bgBadgeAccent = LightColorTokens.colorAlphaGreen400, - bgBadgeDefault = LightColorTokens.colorAlphaGray400, - bgBadgeInfo = LightColorTokens.colorAlphaBlue400, + bgBadgeAccent = LightColorTokens.colorGreen400, + bgBadgeCritical = LightColorTokens.colorRed300, + bgBadgeDefault = LightColorTokens.colorThemeBg, + bgBadgeInfo = LightColorTokens.colorBlue400, + bgBadgePrimary = LightColorTokens.colorGray1400, + bgBadgeSecondary = LightColorTokens.colorGray400, bgCanvasDefault = LightColorTokens.colorThemeBg, bgCanvasDefaultLevel1 = LightColorTokens.colorThemeBg, bgCanvasDisabled = LightColorTokens.colorGray200, diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLightHc.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLightHc.kt index 8a8fa44e61..c1f677d156 100644 --- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLightHc.kt +++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLightHc.kt @@ -37,9 +37,12 @@ val compoundColorsHcLight = SemanticColors( bgActionTertiaryHovered = LightHcColorTokens.colorGray300, bgActionTertiaryRest = LightHcColorTokens.colorThemeBg, bgActionTertiarySelected = LightHcColorTokens.colorGray400, - bgBadgeAccent = LightHcColorTokens.colorAlphaGreen400, - bgBadgeDefault = LightHcColorTokens.colorAlphaGray400, - bgBadgeInfo = LightHcColorTokens.colorAlphaBlue400, + bgBadgeAccent = LightHcColorTokens.colorGreen400, + bgBadgeCritical = LightHcColorTokens.colorRed300, + bgBadgeDefault = LightHcColorTokens.colorThemeBg, + bgBadgeInfo = LightHcColorTokens.colorBlue400, + bgBadgePrimary = LightHcColorTokens.colorGray1400, + bgBadgeSecondary = LightHcColorTokens.colorGray400, bgCanvasDefault = LightHcColorTokens.colorThemeBg, bgCanvasDefaultLevel1 = LightHcColorTokens.colorThemeBg, bgCanvasDisabled = LightHcColorTokens.colorGray200, diff --git a/libraries/compound/src/main/res/drawable/ic_compound_ai.xml b/libraries/compound/src/main/res/drawable/ic_compound_ai.xml new file mode 100644 index 0000000000..2832283061 --- /dev/null +++ b/libraries/compound/src/main/res/drawable/ic_compound_ai.xml @@ -0,0 +1,9 @@ + + + diff --git a/libraries/compound/src/main/res/drawable/ic_compound_device_passkey.xml b/libraries/compound/src/main/res/drawable/ic_compound_device_passkey.xml new file mode 100644 index 0000000000..a4784792a3 --- /dev/null +++ b/libraries/compound/src/main/res/drawable/ic_compound_device_passkey.xml @@ -0,0 +1,13 @@ + + + + diff --git a/libraries/compound/src/main/res/drawable/ic_compound_folder.xml b/libraries/compound/src/main/res/drawable/ic_compound_folder.xml new file mode 100644 index 0000000000..9250d4780b --- /dev/null +++ b/libraries/compound/src/main/res/drawable/ic_compound_folder.xml @@ -0,0 +1,9 @@ + + +