Skip to content

Follow up to Skiko/1209 #3157

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

Open
ApoloApps wants to merge 2 commits into
base: jb-main
Choose a base branch
from
Open

Follow up to Skiko/1209 #3157

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
c09d522
Migrate to new FontWeight and FontStyle APIs in Skiko
ApoloApps Jun 25, 2026
8913f41
Update to Skiko 0.151.0
ApoloApps Jun 25, 2026
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
3 changes: 2 additions & 1 deletion ...i/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/DesktopFont.desktop.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import org.jetbrains.skia.Data
import org.jetbrains.skia.FontMgr
import org.jetbrains.skia.FontSlant
import org.jetbrains.skia.FontStyle as SkFontStyle
import org.jetbrains.skia.FontWeight as SkFontWeight
import org.jetbrains.skia.FontWidth
import org.jetbrains.skia.Typeface as SkTypeface

Expand Down Expand Up @@ -226,7 +227,7 @@ private fun typefaceResource(resourceName: String): SkTypeface {

private val Font.skFontStyle: SkFontStyle
get() = SkFontStyle(
weight = weight.weight,
weight = SkFontWeight(weight.weight),
width = FontWidth.NORMAL,
slant = if (style == FontStyle.Italic) FontSlant.ITALIC else FontSlant.UPRIGHT
)
Expand Down
2 changes: 1 addition & 1 deletion .../src/desktopMain/kotlin/androidx/compose/ui/text/platform/JetBrainsRuntimeFontFamilies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ internal object JetBrainsRuntimeFontFamilies {
// We need to parse the typeface to extract its weight and style
val typeface = FontMgr.default.makeFromFile(absolutePath)
?: error("makeFromFile $absolutePath failed")
val weight = FontWeight(typeface.fontStyle.weight)
val weight = FontWeight(typeface.fontStyle.weight.value)
val style = when (typeface.fontStyle.slant) {
FontSlant.UPRIGHT -> FontStyle.Normal
FontSlant.ITALIC, FontSlant.OBLIQUE -> FontStyle.Italic
Expand Down
3 changes: 2 additions & 1 deletion ...e/ui/ui-text/src/nativeMain/kotlin/androidx/compose/ui/text/platform/NativeFont.native.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import kotlin.experimental.ExperimentalNativeApi
import org.jetbrains.skia.Data
import org.jetbrains.skia.FontMgr
import org.jetbrains.skia.FontSlant
import org.jetbrains.skia.FontWeight
import org.jetbrains.skia.FontWidth

@OptIn(ExperimentalTextApi::class)
Expand All @@ -45,7 +46,7 @@ internal actual fun loadTypeface(font: Font): SkTypeface {

private val Font.skFontStyle: SkFontStyle
get() = SkFontStyle(
weight = weight.weight,
weight = FontWeight(weight.weight),
width = FontWidth.NORMAL,
slant = if (style == FontStyle.Italic) FontSlant.ITALIC else FontSlant.UPRIGHT
)
Expand Down
3 changes: 2 additions & 1 deletion compose/ui/ui-text/src/webMain/kotlin/androidx/compose/ui/text/platform/WebFont.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import androidx.compose.ui.text.font.FontStyle
import org.jetbrains.skia.Data
import org.jetbrains.skia.FontMgr
import org.jetbrains.skia.FontSlant
import org.jetbrains.skia.FontWeight
import org.jetbrains.skia.FontWidth
import org.jetbrains.skiko.OS
import org.jetbrains.skiko.hostOs
Expand All @@ -41,7 +42,7 @@ internal actual fun loadTypeface(font: Font): SkTypeface {

private val Font.skFontStyle: SkFontStyle
get() = SkFontStyle(
weight = weight.weight,
weight = FontWeight(weight.weight),
width = FontWidth.NORMAL,
slant = if (style == FontStyle.Italic) FontSlant.ITALIC else FontSlant.UPRIGHT
)
Expand Down
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 @@ -78,7 +78,7 @@ protobuf = "4.28.2"
paparazzi = "1.0.0"
paparazziNative = "2022.1.1-canary-f5f9f71"
shadow = "8.1.1"
skiko = "0.150.0"
skiko = "0.151.0"
spdxGradlePlugin = "0.6.0"
sqldelight = "1.3.0"
retrofit = "2.12.0"
Expand Down