Skip to content

Commit

Permalink
Merge pull request #107 from element-hq/update-tokens-in-alphabetical…
Browse files Browse the repository at this point in the history
…-order

Import new tokens, sorted with alphabetical ordering
  • Loading branch information
jmartinesp authored Nov 19, 2024
2 parents 125dd54 + a0a006d commit 4e5e67f
Show file tree
Hide file tree
Showing 25 changed files with 1,309 additions and 1,146 deletions.
4 changes: 2 additions & 2 deletions compound/screenshots/Compound Icons - Dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions compound/screenshots/Compound Icons - Light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions compound/screenshots/Compound Icons - Rtl.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions compound/screenshots/Compound Vector Icons - Dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions compound/screenshots/Compound Vector Icons - Light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ object CompoundIcons {
@Composable fun ArrowUpRight(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_arrow_up_right)
}
@Composable fun AskToJoin(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_ask_to_join)
}
@Composable fun AskToJoinSolid(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_ask_to_join_solid)
}
@Composable fun Attachment(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_attachment)
}
Expand Down Expand Up @@ -174,6 +180,9 @@ object CompoundIcons {
@Composable fun Expand(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_expand)
}
@Composable fun Explore(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_explore)
}
@Composable fun ExportArchive(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_export_archive)
}
Expand Down Expand Up @@ -204,6 +213,9 @@ object CompoundIcons {
@Composable fun Grid(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_grid)
}
@Composable fun Group(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_group)
}
@Composable fun Help(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_help)
}
Expand Down Expand Up @@ -270,6 +282,9 @@ object CompoundIcons {
@Composable fun Link(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_link)
}
@Composable fun Linux(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_linux)
}
@Composable fun ListBulleted(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_list_bulleted)
}
Expand Down Expand Up @@ -297,6 +312,9 @@ object CompoundIcons {
@Composable fun LockSolid(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_lock_solid)
}
@Composable fun Mac(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_mac)
}
@Composable fun MarkAsRead(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_mark_as_read)
}
Expand Down Expand Up @@ -387,6 +405,15 @@ object CompoundIcons {
@Composable fun Preferences(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_preferences)
}
@Composable fun PresenceOutline8X8(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_presence_outline_8_x_8)
}
@Composable fun PresenceSolid8X8(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_presence_solid_8_x_8)
}
@Composable fun PresenceStrikethrough8X8(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_presence_strikethrough_8_x_8)
}
@Composable fun Public(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_public)
}
Expand Down Expand Up @@ -561,6 +588,9 @@ object CompoundIcons {
@Composable fun WebBrowser(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_web_browser)
}
@Composable fun Windows(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_windows)
}

val all @Composable get() = persistentListOf<ImageVector>(
Admin(),
Expand All @@ -569,6 +599,8 @@ object CompoundIcons {
ArrowRight(),
ArrowUp(),
ArrowUpRight(),
AskToJoin(),
AskToJoinSolid(),
Attachment(),
Block(),
Bold(),
Expand Down Expand Up @@ -610,6 +642,7 @@ object CompoundIcons {
EndCall(),
Error(),
Expand(),
Explore(),
ExportArchive(),
Extensions(),
ExtensionsSolid(),
Expand All @@ -620,6 +653,7 @@ object CompoundIcons {
Filter(),
Forward(),
Grid(),
Group(),
Help(),
HelpSolid(),
History(),
Expand All @@ -642,6 +676,7 @@ object CompoundIcons {
Labs(),
Leave(),
Link(),
Linux(),
ListBulleted(),
ListNumbered(),
LocationNavigator(),
Expand All @@ -651,6 +686,7 @@ object CompoundIcons {
Lock(),
LockOff(),
LockSolid(),
Mac(),
MarkAsRead(),
MarkAsUnread(),
MarkThreadsAsRead(),
Expand Down Expand Up @@ -681,6 +717,9 @@ object CompoundIcons {
PollsEnd(),
PopOut(),
Preferences(),
PresenceOutline8X8(),
PresenceSolid8X8(),
PresenceStrikethrough8X8(),
Public(),
QrCode(),
Quote(),
Expand Down Expand Up @@ -739,6 +778,7 @@ object CompoundIcons {
VolumeOnSolid(),
Warning(),
WebBrowser(),
Windows(),
)

val allResIds get() = persistentListOf(
Expand All @@ -748,6 +788,8 @@ object CompoundIcons {
R.drawable.ic_compound_arrow_right,
R.drawable.ic_compound_arrow_up,
R.drawable.ic_compound_arrow_up_right,
R.drawable.ic_compound_ask_to_join,
R.drawable.ic_compound_ask_to_join_solid,
R.drawable.ic_compound_attachment,
R.drawable.ic_compound_block,
R.drawable.ic_compound_bold,
Expand Down Expand Up @@ -789,6 +831,7 @@ object CompoundIcons {
R.drawable.ic_compound_end_call,
R.drawable.ic_compound_error,
R.drawable.ic_compound_expand,
R.drawable.ic_compound_explore,
R.drawable.ic_compound_export_archive,
R.drawable.ic_compound_extensions,
R.drawable.ic_compound_extensions_solid,
Expand All @@ -799,6 +842,7 @@ object CompoundIcons {
R.drawable.ic_compound_filter,
R.drawable.ic_compound_forward,
R.drawable.ic_compound_grid,
R.drawable.ic_compound_group,
R.drawable.ic_compound_help,
R.drawable.ic_compound_help_solid,
R.drawable.ic_compound_history,
Expand All @@ -821,6 +865,7 @@ object CompoundIcons {
R.drawable.ic_compound_labs,
R.drawable.ic_compound_leave,
R.drawable.ic_compound_link,
R.drawable.ic_compound_linux,
R.drawable.ic_compound_list_bulleted,
R.drawable.ic_compound_list_numbered,
R.drawable.ic_compound_location_navigator,
Expand All @@ -830,6 +875,7 @@ object CompoundIcons {
R.drawable.ic_compound_lock,
R.drawable.ic_compound_lock_off,
R.drawable.ic_compound_lock_solid,
R.drawable.ic_compound_mac,
R.drawable.ic_compound_mark_as_read,
R.drawable.ic_compound_mark_as_unread,
R.drawable.ic_compound_mark_threads_as_read,
Expand Down Expand Up @@ -860,6 +906,9 @@ object CompoundIcons {
R.drawable.ic_compound_polls_end,
R.drawable.ic_compound_pop_out,
R.drawable.ic_compound_preferences,
R.drawable.ic_compound_presence_outline_8_x_8,
R.drawable.ic_compound_presence_solid_8_x_8,
R.drawable.ic_compound_presence_strikethrough_8_x_8,
R.drawable.ic_compound_public,
R.drawable.ic_compound_qr_code,
R.drawable.ic_compound_quote,
Expand Down Expand Up @@ -918,5 +967,6 @@ object CompoundIcons {
R.drawable.ic_compound_volume_on_solid,
R.drawable.ic_compound_warning,
R.drawable.ic_compound_web_browser,
R.drawable.ic_compound_windows,
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ data class SemanticColors(
/** Default global background for the user interface.
Elevation: Default (Level 0) */
val bgCanvasDefault: Color,
/** Default global background for the user interface.
Elevation: Level 1. */
val bgCanvasDefaultLevel1: Color,
/** Default background for disabled elements. There's no minimum contrast requirement. */
val bgCanvasDisabled: Color,
/** High-contrast background color for critical state. State: Hover. */
Expand Down Expand Up @@ -89,6 +92,9 @@ Elevation: Default (Level 2). */
/** Low contrast surfaces.
Elevation: Default (Level 1). */
val bgSubtleSecondary: Color,
/** Lower contrast surfaces.
Elevation: Level 0. */
val bgSubtleSecondaryLevel0: Color,
/** Subtle background colour for success state elements. State: Rest. */
val bgSuccessSubtle: Color,
/** High-contrast border for critical state. State: Hover. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ val compoundColorsDark = SemanticColors(
bgActionSecondaryPressed = DarkColorTokens.colorAlphaGray300,
bgActionSecondaryRest = DarkColorTokens.colorThemeBg,
bgCanvasDefault = DarkColorTokens.colorThemeBg,
bgCanvasDefaultLevel1 = DarkColorTokens.colorGray300,
bgCanvasDisabled = DarkColorTokens.colorGray200,
bgCriticalHovered = DarkColorTokens.colorRed1000,
bgCriticalPrimary = DarkColorTokens.colorRed900,
Expand All @@ -58,6 +59,7 @@ val compoundColorsDark = SemanticColors(
bgInfoSubtle = DarkColorTokens.colorBlue200,
bgSubtlePrimary = DarkColorTokens.colorGray400,
bgSubtleSecondary = DarkColorTokens.colorGray300,
bgSubtleSecondaryLevel0 = DarkColorTokens.colorThemeBg,
bgSuccessSubtle = DarkColorTokens.colorGreen200,
borderCriticalHovered = DarkColorTokens.colorRed1000,
borderCriticalPrimary = DarkColorTokens.colorRed900,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ val compoundColorsHcDark = SemanticColors(
bgActionSecondaryPressed = DarkHcColorTokens.colorAlphaGray300,
bgActionSecondaryRest = DarkHcColorTokens.colorThemeBg,
bgCanvasDefault = DarkHcColorTokens.colorThemeBg,
bgCanvasDefaultLevel1 = DarkHcColorTokens.colorGray300,
bgCanvasDisabled = DarkHcColorTokens.colorGray200,
bgCriticalHovered = DarkHcColorTokens.colorRed1000,
bgCriticalPrimary = DarkHcColorTokens.colorRed900,
Expand All @@ -58,6 +59,7 @@ val compoundColorsHcDark = SemanticColors(
bgInfoSubtle = DarkHcColorTokens.colorBlue200,
bgSubtlePrimary = DarkHcColorTokens.colorGray400,
bgSubtleSecondary = DarkHcColorTokens.colorGray300,
bgSubtleSecondaryLevel0 = DarkHcColorTokens.colorThemeBg,
bgSuccessSubtle = DarkHcColorTokens.colorGreen200,
borderCriticalHovered = DarkHcColorTokens.colorRed1000,
borderCriticalPrimary = DarkHcColorTokens.colorRed900,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ val compoundColorsLight = SemanticColors(
bgActionSecondaryPressed = LightColorTokens.colorAlphaGray300,
bgActionSecondaryRest = LightColorTokens.colorThemeBg,
bgCanvasDefault = LightColorTokens.colorThemeBg,
bgCanvasDefaultLevel1 = LightColorTokens.colorThemeBg,
bgCanvasDisabled = LightColorTokens.colorGray200,
bgCriticalHovered = LightColorTokens.colorRed1000,
bgCriticalPrimary = LightColorTokens.colorRed900,
Expand All @@ -58,6 +59,7 @@ val compoundColorsLight = SemanticColors(
bgInfoSubtle = LightColorTokens.colorBlue200,
bgSubtlePrimary = LightColorTokens.colorGray400,
bgSubtleSecondary = LightColorTokens.colorGray300,
bgSubtleSecondaryLevel0 = LightColorTokens.colorGray300,
bgSuccessSubtle = LightColorTokens.colorGreen200,
borderCriticalHovered = LightColorTokens.colorRed1000,
borderCriticalPrimary = LightColorTokens.colorRed900,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ val compoundColorsHcLight = SemanticColors(
bgActionSecondaryPressed = LightHcColorTokens.colorAlphaGray300,
bgActionSecondaryRest = LightHcColorTokens.colorThemeBg,
bgCanvasDefault = LightHcColorTokens.colorThemeBg,
bgCanvasDefaultLevel1 = LightHcColorTokens.colorThemeBg,
bgCanvasDisabled = LightHcColorTokens.colorGray200,
bgCriticalHovered = LightHcColorTokens.colorRed1000,
bgCriticalPrimary = LightHcColorTokens.colorRed900,
Expand All @@ -58,6 +59,7 @@ val compoundColorsHcLight = SemanticColors(
bgInfoSubtle = LightHcColorTokens.colorBlue200,
bgSubtlePrimary = LightHcColorTokens.colorGray400,
bgSubtleSecondary = LightHcColorTokens.colorGray300,
bgSubtleSecondaryLevel0 = LightHcColorTokens.colorGray300,
bgSuccessSubtle = LightHcColorTokens.colorGreen200,
borderCriticalHovered = LightHcColorTokens.colorRed1000,
borderCriticalPrimary = LightHcColorTokens.colorRed900,
Expand Down
Loading

0 comments on commit 4e5e67f

Please sign in to comment.