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.

Sign up for GitHub

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 IJ Platform 24.1 #318

Merged
merged 2 commits into from
Mar 11, 2024
Merged

Update IJ Platform 24.1 #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dc7f25
Use typography APIs in samples, reduce duplication in bridge
rock3r Mar 11, 2024
3ae79da
Update IJP to 241.14494.17-EAP-SNAPSHOT
rock3r Mar 11, 2024
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 gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ commonmark = "0.21.0"
composeDesktop = "1.6.10-dev1490"
detekt = "1.23.4"
dokka = "1.8.20"
idea = "241.14024.14-EAP-SNAPSHOT"
idea = "241.14494.17-EAP-SNAPSHOT"
ideaGradlePlugin = "1.17.1"
jna = "5.14.0"
kotlin = "1.8.21"
Expand Down
2 changes: 1 addition & 1 deletion ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingBridgeService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ internal class SwingBridgeService(scope: CoroutineScope) {
val themeDefinition = createBridgeThemeDefinition(TextStyle.Default)

BridgeThemeData(
themeDefinition = createBridgeThemeDefinition(TextStyle.Default),
themeDefinition = themeDefinition,
componentStyling =
createBridgeComponentStyling(
theme = themeDefinition,
Expand Down
22 changes: 7 additions & 15 deletions ...main/kotlin/org/jetbrains/jewel/samples/ideplugin/releasessample/ReleasesSampleCompose.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ import com.intellij.util.ui.JBUI
import icons.JewelIcons
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import kotlinx.datetime.toJavaLocalDate
import org.jetbrains.jewel.bridge.medium
import org.jetbrains.jewel.bridge.regular
import org.jetbrains.jewel.bridge.retrieveColorOrUnspecified
import org.jetbrains.jewel.bridge.retrieveTextStyle
import org.jetbrains.jewel.bridge.toComposeColor
import org.jetbrains.jewel.foundation.lazy.SelectableLazyColumn
import org.jetbrains.jewel.foundation.lazy.SelectionMode
Expand All @@ -87,6 +87,7 @@ import org.jetbrains.jewel.ui.component.IconButton
import org.jetbrains.jewel.ui.component.PopupMenu
import org.jetbrains.jewel.ui.component.Text
import org.jetbrains.jewel.ui.component.TextField
import org.jetbrains.jewel.ui.component.Typography
import org.jetbrains.jewel.ui.component.VerticalScrollbar
import org.jetbrains.jewel.ui.component.items
import org.jetbrains.jewel.ui.painter.rememberResourcePainterProvider
Expand Down Expand Up @@ -253,7 +254,7 @@ private fun ItemTag(
) {
Text(
text = text,
fontSize = JBFont.medium().size2D.sp,
style = Typography.medium(),
color = foregroundColor,
modifier = modifier
.background(backgroundColor, shape)
Expand Down Expand Up @@ -506,24 +507,15 @@ private fun ItemDetailsText(selectedItem: ContentItem) {
Modifier.padding(horizontal = 20.dp, vertical = 12.dp),
verticalArrangement = Arrangement.spacedBy(6.dp),
) {
Text(
selectedItem.displayText,
style = runBlocking {
retrieveTextStyle(
key = "Label.font",
bold = true,
size = JBFont.h1().size2D.sp,
)
},
)
Text(selectedItem.displayText, style = Typography.h1TextStyle())

val formatter =
remember(Locale.current) { DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM) }
val releaseDate = selectedItem.releaseDate
if (releaseDate != null) {
Text(
text = "Released on ${formatter.format(releaseDate.toJavaLocalDate())}",
fontSize = getCommentFontSize(),
style = Typography.medium(),
color = JBUI.CurrentTheme.Label.disabledForeground().toComposeColor(),
)
}
Expand Down Expand Up @@ -558,7 +550,7 @@ private fun AndroidStudioReleaseDetails(item: ContentItem.AndroidStudio) {
private fun TextWithLabel(labelText: String, valueText: String) {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
Text(labelText)
Text(valueText, fontWeight = FontWeight.W600)
Text(valueText, style = Typography.regular().copy(fontWeight = FontWeight.Bold))
}
}

Expand Down
4 changes: 2 additions & 2 deletions .../standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/ComponentsView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import org.jetbrains.jewel.foundation.modifier.trackActivation
import org.jetbrains.jewel.foundation.theme.JewelTheme
import org.jetbrains.jewel.samples.standalone.StandaloneSampleIcons
Expand All @@ -26,6 +25,7 @@ import org.jetbrains.jewel.ui.component.Icon
import org.jetbrains.jewel.ui.component.SelectableIconButton
import org.jetbrains.jewel.ui.component.Text
import org.jetbrains.jewel.ui.component.Tooltip
import org.jetbrains.jewel.ui.component.Typography
import org.jetbrains.jewel.ui.component.styling.LocalIconButtonStyle
import org.jetbrains.jewel.ui.painter.hints.Size
import org.jetbrains.jewel.ui.painter.hints.Stroke
Expand Down Expand Up @@ -64,7 +64,7 @@ fun ComponentsToolBar() {
@Composable
fun ComponentView(view: ViewInfo) {
Column(Modifier.fillMaxSize().padding(24.dp), verticalArrangement = Arrangement.spacedBy(24.dp)) {
Text(view.title, fontSize = 20.sp)
Text(view.title, style = Typography.h1TextStyle())
view.content()
}
}
4 changes: 2 additions & 2 deletions ...les/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/WelcomeView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import org.jetbrains.jewel.foundation.modifier.trackActivation
import org.jetbrains.jewel.foundation.theme.JewelTheme
import org.jetbrains.jewel.samples.standalone.IntUiThemes
Expand All @@ -26,6 +25,7 @@ import org.jetbrains.jewel.ui.component.CheckboxRow
import org.jetbrains.jewel.ui.component.Icon
import org.jetbrains.jewel.ui.component.RadioButtonChip
import org.jetbrains.jewel.ui.component.Text
import org.jetbrains.jewel.ui.component.Typography
import org.jetbrains.jewel.ui.component.styling.LocalCheckboxStyle
import org.jetbrains.jewel.ui.painter.hints.Selected
import org.jetbrains.jewel.ui.painter.rememberResourcePainterProvider
Expand All @@ -51,7 +51,7 @@ fun WelcomeView() {
contentScale = ContentScale.Crop,
)

Text("Meet Jewel", fontSize = 20.sp)
Text("Meet Jewel", style = Typography.h1TextStyle())

Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
Text("Theme:")
Expand Down