Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tokens and remove colors.textPlaceholder #103

Merged
merged 2 commits into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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 Semantic Colors - Dark HC.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 Semantic Colors - 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 Semantic Colors - Light HC.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 Semantic Colors - 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 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.
4 changes: 2 additions & 2 deletions compound/screenshots/Material3 Colors - Dark HC.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/Material3 Colors - 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/Material3 Colors - Light HC.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/Material3 Colors - 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 @@ -52,15 +52,15 @@ fun SemanticColors.toMaterialColorScheme(): ColorScheme {
surface = textOnSolidPrimary,
onSurface = textPrimary,
surfaceVariant = LightColorTokens.colorGray300,
onSurfaceVariant = textSecondary,
onSurfaceVariant = iconSecondary,
surfaceTint = LightColorTokens.colorGray1000,
inverseSurface = LightColorTokens.colorGray1300,
inverseOnSurface = textOnSolidPrimary,
error = bgCriticalPrimary,
onError = textOnSolidPrimary,
errorContainer = LightColorTokens.colorRed400,
onErrorContainer = textCriticalPrimary,
outline = textPlaceholder,
outline = iconSecondary,
outlineVariant = LightColorTokens.colorAlphaGray400,
scrim = textPrimary,
)
Expand All @@ -84,15 +84,15 @@ fun SemanticColors.toMaterialColorScheme(): ColorScheme {
surface = textOnSolidPrimary,
onSurface = textPrimary,
surfaceVariant = DarkColorTokens.colorGray300,
onSurfaceVariant = textSecondary,
onSurfaceVariant = iconSecondary,
surfaceTint = DarkColorTokens.colorGray1000,
inverseSurface = DarkColorTokens.colorGray1300,
inverseOnSurface = textOnSolidPrimary,
error = bgCriticalPrimary,
onError = textOnSolidPrimary,
errorContainer = DarkColorTokens.colorRed400,
onErrorContainer = textCriticalPrimary,
outline = textPlaceholder,
outline = iconSecondary,
outlineVariant = DarkColorTokens.colorAlphaGray400,
scrim = bgSubtleSecondary,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -396,12 +396,18 @@
@Composable fun Quote(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_quote)
}
@Composable fun RaisedHandSolid(): ImageVector {

Check warning on line 399 in compound/src/main/kotlin/io/element/android/compound/tokens/generated/CompoundIcons.kt

View check run for this annotation

Codecov / codecov/patch

compound/src/main/kotlin/io/element/android/compound/tokens/generated/CompoundIcons.kt#L399

Added line #L399 was not covered by tests
return ImageVector.vectorResource(R.drawable.ic_compound_raised_hand_solid)
}
@Composable fun Reaction(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_reaction)
}
@Composable fun ReactionAdd(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_reaction_add)
}
@Composable fun ReactionSolid(): ImageVector {

Check warning on line 408 in compound/src/main/kotlin/io/element/android/compound/tokens/generated/CompoundIcons.kt

View check run for this annotation

Codecov / codecov/patch

compound/src/main/kotlin/io/element/android/compound/tokens/generated/CompoundIcons.kt#L408

Added line #L408 was not covered by tests
return ImageVector.vectorResource(R.drawable.ic_compound_reaction_solid)
}
@Composable fun Reply(): ImageVector {
return ImageVector.vectorResource(R.drawable.ic_compound_reply)
}
Expand Down Expand Up @@ -678,8 +684,10 @@
Public(),
QrCode(),
Quote(),
RaisedHandSolid(),
Reaction(),
ReactionAdd(),
ReactionSolid(),
Reply(),
Restart(),
Room(),
Expand Down Expand Up @@ -855,8 +863,10 @@
R.drawable.ic_compound_public,
R.drawable.ic_compound_qr_code,
R.drawable.ic_compound_quote,
R.drawable.ic_compound_raised_hand_solid,
R.drawable.ic_compound_reaction,
R.drawable.ic_compound_reaction_add,
R.drawable.ic_compound_reaction_solid,
R.drawable.ic_compound_reply,
R.drawable.ic_compound_restart,
R.drawable.ic_compound_room,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,6 @@ Elevation: Default (Level 1). */
val textLinkExternal: Color,
/** For use as text color on top of high-contrast solid backgrounds like primary, accent, or destructive actions. */
val textOnSolidPrimary: Color,
/** Use for placeholder text. Placeholder text should be non-essential. Do not rely exclusively on it. */
val textPlaceholder: Color,
/** Highest contrast text. */
val textPrimary: Color,
/** Lowest contrast text. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ val compoundColorsDark = SemanticColors(
textInfoPrimary = DarkColorTokens.colorBlue900,
textLinkExternal = DarkColorTokens.colorBlue900,
textOnSolidPrimary = DarkColorTokens.colorThemeBg,
textPlaceholder = DarkColorTokens.colorGray800,
textPrimary = DarkColorTokens.colorGray1400,
textSecondary = DarkColorTokens.colorGray900,
textSuccessPrimary = DarkColorTokens.colorGreen900,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ val compoundColorsHcDark = SemanticColors(
textInfoPrimary = DarkHcColorTokens.colorBlue900,
textLinkExternal = DarkHcColorTokens.colorBlue900,
textOnSolidPrimary = DarkHcColorTokens.colorThemeBg,
textPlaceholder = DarkHcColorTokens.colorGray800,
textPrimary = DarkHcColorTokens.colorGray1400,
textSecondary = DarkHcColorTokens.colorGray900,
textSuccessPrimary = DarkHcColorTokens.colorGreen900,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ val compoundColorsLight = SemanticColors(
textInfoPrimary = LightColorTokens.colorBlue900,
textLinkExternal = LightColorTokens.colorBlue900,
textOnSolidPrimary = LightColorTokens.colorThemeBg,
textPlaceholder = LightColorTokens.colorGray800,
textPrimary = LightColorTokens.colorGray1400,
textSecondary = LightColorTokens.colorGray900,
textSuccessPrimary = LightColorTokens.colorGreen900,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ val compoundColorsHcLight = SemanticColors(
textInfoPrimary = LightHcColorTokens.colorBlue900,
textLinkExternal = LightHcColorTokens.colorBlue900,
textOnSolidPrimary = LightHcColorTokens.colorThemeBg,
textPlaceholder = LightHcColorTokens.colorGray800,
textPrimary = LightHcColorTokens.colorGray1400,
textSecondary = LightHcColorTokens.colorGray900,
textSuccessPrimary = LightHcColorTokens.colorGreen900,
Expand Down
Loading
Loading