mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 15:44:54 +00:00
Import Compound tokens from v10.2.3 (#7272)
* Import Compound tokens from `v10.2.3` * Remove manually added `bgSubtleTertiary` semantic color: it's in Compound now * Bump enterprise module to a compatible commit
This commit is contained in:
committed by
GitHub
parent
adc1b50492
commit
0cd163a680
File diff suppressed because one or more lines are too long
+20
-2
@@ -29,6 +29,8 @@ data class SemanticColors(
|
||||
val bgAccentRest: Color,
|
||||
/** Background colour for accent or brand actions. State: Selected */
|
||||
val bgAccentSelected: Color,
|
||||
/** Accent colour, subtle shade for Text buttons Hover/press */
|
||||
val bgAccentSubtle: Color,
|
||||
/** Background colour for primary actions. State: Disabled. */
|
||||
val bgActionPrimaryDisabled: Color,
|
||||
/** Background colour for primary actions. State: Hover. */
|
||||
@@ -83,12 +85,20 @@ data class SemanticColors(
|
||||
val bgDecorative6: Color,
|
||||
/** Subtle background colour for informational elements. State: Rest. */
|
||||
val bgInfoSubtle: Color,
|
||||
/** Medium contrast surfaces. Elevation: Default (Level 2). */
|
||||
/** Medium contrast surfaces. Elevation: Default (Level 3). */
|
||||
val bgSubtlePrimary: Color,
|
||||
/** Low contrast surfaces. Elevation: Default (Level 1). */
|
||||
/** Low contrast surfaces. Elevation: Default (Level 2). */
|
||||
val bgSubtleSecondary: Color,
|
||||
/** Lower contrast surfaces. Elevation: Level 0. */
|
||||
val bgSubtleSecondaryLevel0: Color,
|
||||
/** Lowest contrast surfaces. Elevation: Default (Level 1). */
|
||||
val bgSubtleTertiary: Color,
|
||||
/** Hovered Background for success states */
|
||||
val bgSuccessHovered: Color,
|
||||
/** Pressed Background for success states */
|
||||
val bgSuccessPressed: Color,
|
||||
/** Default Background for success states */
|
||||
val bgSuccessRest: Color,
|
||||
/** Subtle background colour for success state elements. State: Rest. */
|
||||
val bgSuccessSubtle: Color,
|
||||
/** Accent borders for containers */
|
||||
@@ -113,6 +123,8 @@ data class SemanticColors(
|
||||
val borderInteractivePrimary: Color,
|
||||
/** ⚠️ Lowest contrast for non-accessible interactive element borders, <3:1. Only use for non-essential borders. Do not rely exclusively on them. State: Rest. */
|
||||
val borderInteractiveSecondary: Color,
|
||||
/** Border success state */
|
||||
val borderSuccessPrimary: Color,
|
||||
/** Subtle border colour for success state elements. */
|
||||
val borderSuccessSubtle: Color,
|
||||
/** Background gradient stop for super and send buttons */
|
||||
@@ -173,6 +185,8 @@ data class SemanticColors(
|
||||
val iconTertiary: Color,
|
||||
/** Translucent version of tertiary icon. Refer to it for intended use. */
|
||||
val iconTertiaryAlpha: Color,
|
||||
/** Warning icon */
|
||||
val iconWarningPrimary: Color,
|
||||
/** Used to separate core sections of the UI as well as containers */
|
||||
val separatorPrimary: Color,
|
||||
/** Secondary shade for separating sections of components or list items */
|
||||
@@ -181,6 +195,8 @@ data class SemanticColors(
|
||||
val textActionAccent: Color,
|
||||
/** Default text colour for plain actions. */
|
||||
val textActionPrimary: Color,
|
||||
/** Text label success state */
|
||||
val textActionSuccess: Color,
|
||||
/** Badge accent text colour */
|
||||
val textBadgeAccent: Color,
|
||||
/** Badge info text colour */
|
||||
@@ -213,6 +229,8 @@ data class SemanticColors(
|
||||
val textSecondary: Color,
|
||||
/** Accent text colour for success state elements. */
|
||||
val textSuccessPrimary: Color,
|
||||
/** Warning text */
|
||||
val textWarningPrimary: Color,
|
||||
/** True for light theme, false for dark theme. */
|
||||
val isLight: Boolean,
|
||||
)
|
||||
|
||||
+9
@@ -27,6 +27,7 @@ val compoundColorsDark = SemanticColors(
|
||||
bgAccentPressed = DarkColorTokens.colorGreen1100,
|
||||
bgAccentRest = DarkColorTokens.colorGreen900,
|
||||
bgAccentSelected = DarkColorTokens.colorAlphaGreen300,
|
||||
bgAccentSubtle = DarkColorTokens.colorGreen200,
|
||||
bgActionPrimaryDisabled = DarkColorTokens.colorGray700,
|
||||
bgActionPrimaryHovered = DarkColorTokens.colorGray1200,
|
||||
bgActionPrimaryPressed = DarkColorTokens.colorGray1100,
|
||||
@@ -60,6 +61,10 @@ val compoundColorsDark = SemanticColors(
|
||||
bgSubtlePrimary = DarkColorTokens.colorGray400,
|
||||
bgSubtleSecondary = DarkColorTokens.colorGray300,
|
||||
bgSubtleSecondaryLevel0 = DarkColorTokens.colorThemeBg,
|
||||
bgSubtleTertiary = DarkColorTokens.colorGray100,
|
||||
bgSuccessHovered = DarkColorTokens.colorGreen1000,
|
||||
bgSuccessPressed = DarkColorTokens.colorGreen1100,
|
||||
bgSuccessRest = DarkColorTokens.colorGreen900,
|
||||
bgSuccessSubtle = DarkColorTokens.colorGreen200,
|
||||
borderAccentPrimary = DarkColorTokens.colorGreen900,
|
||||
borderAccentSubtle = DarkColorTokens.colorGreen700,
|
||||
@@ -72,6 +77,7 @@ val compoundColorsDark = SemanticColors(
|
||||
borderInteractiveHovered = DarkColorTokens.colorGray1100,
|
||||
borderInteractivePrimary = DarkColorTokens.colorGray800,
|
||||
borderInteractiveSecondary = DarkColorTokens.colorGray600,
|
||||
borderSuccessPrimary = DarkColorTokens.colorGreen900,
|
||||
borderSuccessSubtle = DarkColorTokens.colorGreen500,
|
||||
gradientActionStop1 = DarkColorTokens.colorGreen1100,
|
||||
gradientActionStop2 = DarkColorTokens.colorGreen900,
|
||||
@@ -102,10 +108,12 @@ val compoundColorsDark = SemanticColors(
|
||||
iconSuccessPrimary = DarkColorTokens.colorGreen900,
|
||||
iconTertiary = DarkColorTokens.colorGray800,
|
||||
iconTertiaryAlpha = DarkColorTokens.colorAlphaGray800,
|
||||
iconWarningPrimary = DarkColorTokens.colorOrange900,
|
||||
separatorPrimary = DarkColorTokens.colorGray400,
|
||||
separatorSecondary = DarkColorTokens.colorGray300,
|
||||
textActionAccent = DarkColorTokens.colorGreen900,
|
||||
textActionPrimary = DarkColorTokens.colorGray1400,
|
||||
textActionSuccess = DarkColorTokens.colorGreen900,
|
||||
textBadgeAccent = DarkColorTokens.colorGreen1100,
|
||||
textBadgeInfo = DarkColorTokens.colorBlue1100,
|
||||
textCriticalPrimary = DarkColorTokens.colorRed900,
|
||||
@@ -122,5 +130,6 @@ val compoundColorsDark = SemanticColors(
|
||||
textPrimary = DarkColorTokens.colorGray1400,
|
||||
textSecondary = DarkColorTokens.colorGray900,
|
||||
textSuccessPrimary = DarkColorTokens.colorGreen900,
|
||||
textWarningPrimary = DarkColorTokens.colorOrange900,
|
||||
isLight = false,
|
||||
)
|
||||
|
||||
+9
@@ -27,6 +27,7 @@ val compoundColorsHcDark = SemanticColors(
|
||||
bgAccentPressed = DarkHcColorTokens.colorGreen1100,
|
||||
bgAccentRest = DarkHcColorTokens.colorGreen900,
|
||||
bgAccentSelected = DarkHcColorTokens.colorAlphaGreen300,
|
||||
bgAccentSubtle = DarkHcColorTokens.colorGreen200,
|
||||
bgActionPrimaryDisabled = DarkHcColorTokens.colorGray700,
|
||||
bgActionPrimaryHovered = DarkHcColorTokens.colorGray1200,
|
||||
bgActionPrimaryPressed = DarkHcColorTokens.colorGray1100,
|
||||
@@ -60,6 +61,10 @@ val compoundColorsHcDark = SemanticColors(
|
||||
bgSubtlePrimary = DarkHcColorTokens.colorGray400,
|
||||
bgSubtleSecondary = DarkHcColorTokens.colorGray300,
|
||||
bgSubtleSecondaryLevel0 = DarkHcColorTokens.colorThemeBg,
|
||||
bgSubtleTertiary = DarkHcColorTokens.colorGray100,
|
||||
bgSuccessHovered = DarkHcColorTokens.colorGreen1000,
|
||||
bgSuccessPressed = DarkHcColorTokens.colorGreen1100,
|
||||
bgSuccessRest = DarkHcColorTokens.colorGreen900,
|
||||
bgSuccessSubtle = DarkHcColorTokens.colorGreen200,
|
||||
borderAccentPrimary = DarkHcColorTokens.colorGreen900,
|
||||
borderAccentSubtle = DarkHcColorTokens.colorGreen700,
|
||||
@@ -72,6 +77,7 @@ val compoundColorsHcDark = SemanticColors(
|
||||
borderInteractiveHovered = DarkHcColorTokens.colorGray1100,
|
||||
borderInteractivePrimary = DarkHcColorTokens.colorGray800,
|
||||
borderInteractiveSecondary = DarkHcColorTokens.colorGray600,
|
||||
borderSuccessPrimary = DarkHcColorTokens.colorGreen900,
|
||||
borderSuccessSubtle = DarkHcColorTokens.colorGreen500,
|
||||
gradientActionStop1 = DarkHcColorTokens.colorGreen1100,
|
||||
gradientActionStop2 = DarkHcColorTokens.colorGreen900,
|
||||
@@ -102,10 +108,12 @@ val compoundColorsHcDark = SemanticColors(
|
||||
iconSuccessPrimary = DarkHcColorTokens.colorGreen900,
|
||||
iconTertiary = DarkHcColorTokens.colorGray800,
|
||||
iconTertiaryAlpha = DarkHcColorTokens.colorAlphaGray800,
|
||||
iconWarningPrimary = DarkHcColorTokens.colorOrange900,
|
||||
separatorPrimary = DarkHcColorTokens.colorGray400,
|
||||
separatorSecondary = DarkHcColorTokens.colorGray300,
|
||||
textActionAccent = DarkHcColorTokens.colorGreen900,
|
||||
textActionPrimary = DarkHcColorTokens.colorGray1400,
|
||||
textActionSuccess = DarkHcColorTokens.colorGreen900,
|
||||
textBadgeAccent = DarkHcColorTokens.colorGreen1100,
|
||||
textBadgeInfo = DarkHcColorTokens.colorBlue1100,
|
||||
textCriticalPrimary = DarkHcColorTokens.colorRed900,
|
||||
@@ -122,5 +130,6 @@ val compoundColorsHcDark = SemanticColors(
|
||||
textPrimary = DarkHcColorTokens.colorGray1400,
|
||||
textSecondary = DarkHcColorTokens.colorGray900,
|
||||
textSuccessPrimary = DarkHcColorTokens.colorGreen900,
|
||||
textWarningPrimary = DarkHcColorTokens.colorOrange900,
|
||||
isLight = false,
|
||||
)
|
||||
|
||||
+9
@@ -27,6 +27,7 @@ val compoundColorsLight = SemanticColors(
|
||||
bgAccentPressed = LightColorTokens.colorGreen1100,
|
||||
bgAccentRest = LightColorTokens.colorGreen900,
|
||||
bgAccentSelected = LightColorTokens.colorAlphaGreen300,
|
||||
bgAccentSubtle = LightColorTokens.colorGreen200,
|
||||
bgActionPrimaryDisabled = LightColorTokens.colorGray700,
|
||||
bgActionPrimaryHovered = LightColorTokens.colorGray1200,
|
||||
bgActionPrimaryPressed = LightColorTokens.colorGray1100,
|
||||
@@ -60,6 +61,10 @@ val compoundColorsLight = SemanticColors(
|
||||
bgSubtlePrimary = LightColorTokens.colorGray400,
|
||||
bgSubtleSecondary = LightColorTokens.colorGray300,
|
||||
bgSubtleSecondaryLevel0 = LightColorTokens.colorGray300,
|
||||
bgSubtleTertiary = LightColorTokens.colorGray100,
|
||||
bgSuccessHovered = LightColorTokens.colorGreen1000,
|
||||
bgSuccessPressed = LightColorTokens.colorGreen1100,
|
||||
bgSuccessRest = LightColorTokens.colorGreen900,
|
||||
bgSuccessSubtle = LightColorTokens.colorGreen200,
|
||||
borderAccentPrimary = LightColorTokens.colorGreen900,
|
||||
borderAccentSubtle = LightColorTokens.colorGreen700,
|
||||
@@ -72,6 +77,7 @@ val compoundColorsLight = SemanticColors(
|
||||
borderInteractiveHovered = LightColorTokens.colorGray1100,
|
||||
borderInteractivePrimary = LightColorTokens.colorGray800,
|
||||
borderInteractiveSecondary = LightColorTokens.colorGray600,
|
||||
borderSuccessPrimary = LightColorTokens.colorGreen900,
|
||||
borderSuccessSubtle = LightColorTokens.colorGreen500,
|
||||
gradientActionStop1 = LightColorTokens.colorGreen500,
|
||||
gradientActionStop2 = LightColorTokens.colorGreen700,
|
||||
@@ -102,10 +108,12 @@ val compoundColorsLight = SemanticColors(
|
||||
iconSuccessPrimary = LightColorTokens.colorGreen900,
|
||||
iconTertiary = LightColorTokens.colorGray800,
|
||||
iconTertiaryAlpha = LightColorTokens.colorAlphaGray800,
|
||||
iconWarningPrimary = LightColorTokens.colorOrange900,
|
||||
separatorPrimary = LightColorTokens.colorGray400,
|
||||
separatorSecondary = LightColorTokens.colorGray300,
|
||||
textActionAccent = LightColorTokens.colorGreen900,
|
||||
textActionPrimary = LightColorTokens.colorGray1400,
|
||||
textActionSuccess = LightColorTokens.colorGreen900,
|
||||
textBadgeAccent = LightColorTokens.colorGreen1100,
|
||||
textBadgeInfo = LightColorTokens.colorBlue1100,
|
||||
textCriticalPrimary = LightColorTokens.colorRed900,
|
||||
@@ -122,5 +130,6 @@ val compoundColorsLight = SemanticColors(
|
||||
textPrimary = LightColorTokens.colorGray1400,
|
||||
textSecondary = LightColorTokens.colorGray900,
|
||||
textSuccessPrimary = LightColorTokens.colorGreen900,
|
||||
textWarningPrimary = LightColorTokens.colorOrange900,
|
||||
isLight = true,
|
||||
)
|
||||
|
||||
+9
@@ -27,6 +27,7 @@ val compoundColorsHcLight = SemanticColors(
|
||||
bgAccentPressed = LightHcColorTokens.colorGreen1100,
|
||||
bgAccentRest = LightHcColorTokens.colorGreen900,
|
||||
bgAccentSelected = LightHcColorTokens.colorAlphaGreen300,
|
||||
bgAccentSubtle = LightHcColorTokens.colorGreen200,
|
||||
bgActionPrimaryDisabled = LightHcColorTokens.colorGray700,
|
||||
bgActionPrimaryHovered = LightHcColorTokens.colorGray1200,
|
||||
bgActionPrimaryPressed = LightHcColorTokens.colorGray1100,
|
||||
@@ -60,6 +61,10 @@ val compoundColorsHcLight = SemanticColors(
|
||||
bgSubtlePrimary = LightHcColorTokens.colorGray400,
|
||||
bgSubtleSecondary = LightHcColorTokens.colorGray300,
|
||||
bgSubtleSecondaryLevel0 = LightHcColorTokens.colorGray300,
|
||||
bgSubtleTertiary = LightHcColorTokens.colorGray100,
|
||||
bgSuccessHovered = LightHcColorTokens.colorGreen1000,
|
||||
bgSuccessPressed = LightHcColorTokens.colorGreen1100,
|
||||
bgSuccessRest = LightHcColorTokens.colorGreen900,
|
||||
bgSuccessSubtle = LightHcColorTokens.colorGreen200,
|
||||
borderAccentPrimary = LightHcColorTokens.colorGreen900,
|
||||
borderAccentSubtle = LightHcColorTokens.colorGreen700,
|
||||
@@ -72,6 +77,7 @@ val compoundColorsHcLight = SemanticColors(
|
||||
borderInteractiveHovered = LightHcColorTokens.colorGray1100,
|
||||
borderInteractivePrimary = LightHcColorTokens.colorGray800,
|
||||
borderInteractiveSecondary = LightHcColorTokens.colorGray600,
|
||||
borderSuccessPrimary = LightHcColorTokens.colorGreen900,
|
||||
borderSuccessSubtle = LightHcColorTokens.colorGreen500,
|
||||
gradientActionStop1 = LightHcColorTokens.colorGreen500,
|
||||
gradientActionStop2 = LightHcColorTokens.colorGreen700,
|
||||
@@ -102,10 +108,12 @@ val compoundColorsHcLight = SemanticColors(
|
||||
iconSuccessPrimary = LightHcColorTokens.colorGreen900,
|
||||
iconTertiary = LightHcColorTokens.colorGray800,
|
||||
iconTertiaryAlpha = LightHcColorTokens.colorAlphaGray800,
|
||||
iconWarningPrimary = LightHcColorTokens.colorOrange900,
|
||||
separatorPrimary = LightHcColorTokens.colorGray400,
|
||||
separatorSecondary = LightHcColorTokens.colorGray300,
|
||||
textActionAccent = LightHcColorTokens.colorGreen900,
|
||||
textActionPrimary = LightHcColorTokens.colorGray1400,
|
||||
textActionSuccess = LightHcColorTokens.colorGreen900,
|
||||
textBadgeAccent = LightHcColorTokens.colorGreen1100,
|
||||
textBadgeInfo = LightHcColorTokens.colorBlue1100,
|
||||
textCriticalPrimary = LightHcColorTokens.colorRed900,
|
||||
@@ -122,5 +130,6 @@ val compoundColorsHcLight = SemanticColors(
|
||||
textPrimary = LightHcColorTokens.colorGray1400,
|
||||
textSecondary = LightHcColorTokens.colorGray900,
|
||||
textSuccessPrimary = LightHcColorTokens.colorGreen900,
|
||||
textWarningPrimary = LightHcColorTokens.colorOrange900,
|
||||
isLight = true,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user