[JEWEL-1131] Implement badge component #3365
+1,302
−4
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package org.jetbrains.jewel.bridge.theme | ||
|
|
||
| import androidx.compose.foundation.layout.PaddingValues | ||
| import androidx.compose.foundation.shape.CornerSize | ||
| import androidx.compose.ui.graphics.takeOrElse | ||
| import androidx.compose.ui.unit.DpSize | ||
| import androidx.compose.ui.unit.dp | ||
| import org.jetbrains.jewel.bridge.createVerticalBrush | ||
| import org.jetbrains.jewel.bridge.retrieveColorOrUnspecified | ||
| import org.jetbrains.jewel.bridge.retrieveColorsOrUnspecified | ||
| import org.jetbrains.jewel.ui.component.styling.BadgeColors | ||
| import org.jetbrains.jewel.ui.component.styling.BadgeMetrics | ||
| import org.jetbrains.jewel.ui.component.styling.BadgeStyle | ||
|
|
||
| // Note: there isn't a badge spec in the IntelliJ Platform LaF, so we're deriving | ||
| // this from similar small promotional UI elements. | ||
| // Badges are small colored elements used to display promotional text like "New", "Beta", etc. | ||
| internal fun readBadgeStyle(): BadgeStyle { | ||
| val normalBackground = | ||
| retrieveColorsOrUnspecified("Button.startBackground", "Button.endBackground").createVerticalBrush() | ||
|
|
||
| val normalContent = retrieveColorOrUnspecified("Label.foreground") | ||
| val disabledContent = retrieveColorOrUnspecified("Label.disabledForeground").takeOrElse { normalContent } | ||
|
|
||
| val colors = | ||
| BadgeColors( | ||
| background = normalBackground, | ||
| backgroundDisabled = normalBackground, | ||
| backgroundFocused = normalBackground, | ||
| backgroundPressed = normalBackground, | ||
| backgroundHovered = normalBackground, | ||
| content = normalContent, | ||
| contentDisabled = disabledContent, | ||
| contentFocused = normalContent, | ||
| contentPressed = normalContent, | ||
| contentHovered = normalContent, | ||
| ) | ||
|
|
||
| return BadgeStyle( | ||
| colors = colors, | ||
| metrics = | ||
| BadgeMetrics( | ||
| cornerSize = CornerSize(0.dp), | ||
|
Collaborator
There was a problem hiding this comment. Badges are only available as pills, as per specs; not sure why the corner size is zero where it should be 100%: 
|
||
| padding = PaddingValues(horizontal = 6.dp, vertical = 2.dp), | ||
| minSize = DpSize(32.dp, 18.dp), | ||
|
Comment on lines
+44
to
+45
Collaborator
There was a problem hiding this comment. 
There should be no min width, and the height is fixed at 16.dp (not a minimum). Also no vertical padding — I assume we should centre the Text vertically instead. |
||
| ), | ||
| ) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package org.jetbrains.jewel.intui.standalone.styling | ||
|
|
||
| import androidx.compose.foundation.layout.PaddingValues | ||
| import androidx.compose.foundation.shape.CornerSize | ||
| import androidx.compose.ui.graphics.Brush | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.graphics.SolidColor | ||
| import androidx.compose.ui.unit.DpSize | ||
| import androidx.compose.ui.unit.dp | ||
| import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme | ||
| import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme | ||
| import org.jetbrains.jewel.ui.component.styling.BadgeColors | ||
| import org.jetbrains.jewel.ui.component.styling.BadgeMetrics | ||
| import org.jetbrains.jewel.ui.component.styling.BadgeStyle | ||
|
|
||
| public fun BadgeStyle.Companion.light( | ||
| colors: BadgeColors = BadgeColors.light(), | ||
| metrics: BadgeMetrics = BadgeMetrics.defaults(), | ||
| ): BadgeStyle = BadgeStyle(colors = colors, metrics = metrics) | ||
|
|
||
| public fun BadgeStyle.Companion.dark( | ||
| colors: BadgeColors = BadgeColors.dark(), | ||
| metrics: BadgeMetrics = BadgeMetrics.defaults(), | ||
| ): BadgeStyle = BadgeStyle(colors = colors, metrics = metrics) | ||
|
Comment on lines
+16
to
+24
Collaborator
There was a problem hiding this comment. From the specs, we have 6 default badge styles (blue, bluePrimary, green, greenPrimary, purple, gray) — plus the disabled state, which is the same for all of them: 
So we should have a |
||
|
|
||
| public fun BadgeColors.Companion.light( | ||
| background: Brush = SolidColor(IntUiLightTheme.colors.blue(4)), | ||
| backgroundDisabled: Brush = SolidColor(IntUiLightTheme.colors.gray(12)), | ||
| backgroundFocused: Brush = SolidColor(IntUiLightTheme.colors.blue(5)), | ||
| backgroundPressed: Brush = SolidColor(IntUiLightTheme.colors.blue(6)), | ||
| backgroundHovered: Brush = SolidColor(IntUiLightTheme.colors.blue(5)), | ||
| content: Color = IntUiLightTheme.colors.gray(14), | ||
| contentDisabled: Color = IntUiLightTheme.colors.gray(8), | ||
| contentFocused: Color = IntUiLightTheme.colors.gray(14), | ||
| contentPressed: Color = IntUiLightTheme.colors.gray(14), | ||
| contentHovered: Color = IntUiLightTheme.colors.gray(14), | ||
| ): BadgeColors = | ||
|
Comment on lines
+26
to
+37
Collaborator
There was a problem hiding this comment. QQ: Where have you found those values? They don't match StandAlone/IDE: 
|
||
| BadgeColors( | ||
| background = background, | ||
| backgroundDisabled = backgroundDisabled, | ||
| backgroundFocused = backgroundFocused, | ||
| backgroundPressed = backgroundPressed, | ||
| backgroundHovered = backgroundHovered, | ||
| content = content, | ||
| contentDisabled = contentDisabled, | ||
| contentFocused = contentFocused, | ||
| contentPressed = contentPressed, | ||
| contentHovered = contentHovered, | ||
| ) | ||
|
|
||
| public fun BadgeColors.Companion.dark( | ||
| background: Brush = SolidColor(IntUiDarkTheme.colors.blue(6)), | ||
| backgroundDisabled: Brush = SolidColor(IntUiDarkTheme.colors.gray(3)), | ||
| backgroundFocused: Brush = SolidColor(IntUiDarkTheme.colors.blue(5)), | ||
| backgroundPressed: Brush = SolidColor(IntUiDarkTheme.colors.blue(7)), | ||
| backgroundHovered: Brush = SolidColor(IntUiDarkTheme.colors.blue(5)), | ||
| content: Color = IntUiDarkTheme.colors.gray(14), | ||
| contentDisabled: Color = IntUiDarkTheme.colors.gray(8), | ||
| contentFocused: Color = IntUiDarkTheme.colors.gray(14), | ||
| contentPressed: Color = IntUiDarkTheme.colors.gray(14), | ||
| contentHovered: Color = IntUiDarkTheme.colors.gray(14), | ||
| ): BadgeColors = | ||
| BadgeColors( | ||
| background = background, | ||
| backgroundDisabled = backgroundDisabled, | ||
| backgroundFocused = backgroundFocused, | ||
| backgroundPressed = backgroundPressed, | ||
| backgroundHovered = backgroundHovered, | ||
| content = content, | ||
| contentDisabled = contentDisabled, | ||
| contentFocused = contentFocused, | ||
| contentPressed = contentPressed, | ||
| contentHovered = contentHovered, | ||
| ) | ||
|
|
||
| public fun BadgeMetrics.Companion.defaults( | ||
| cornerSize: CornerSize = CornerSize(0.dp), | ||
| padding: PaddingValues = PaddingValues(horizontal = 6.dp, vertical = 2.dp), | ||
| minSize: DpSize = DpSize(32.dp, 18.dp), | ||
| ): BadgeMetrics = BadgeMetrics(cornerSize = cornerSize, padding = padding, minSize = minSize) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These seem all wrong, according to the specs:
Please do triple check the keys in the spec are correct since the Swing impl is notorious for not following specs — 1:1 fidelity to the actual implementation trumps specs