Skip to content

Expose properties that used for platform integration as @InternalComposeUiApi #3128

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

Draft
Ivan Matkov (MatkovIvan) wants to merge 1 commit into
base: jb-main
Choose a base branch
from
+7 −3
Draft

Expose properties that used for platform integration as @InternalComposeUiApi #3128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions compose/ui/ui-text/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ androidXMultiplatform {

// TODO: Align it with AOSP or make explicit
configureEach {
languageSettings.optIn("androidx.compose.ui.InternalComposeUiApi")
languageSettings.optIn("androidx.compose.ui.text.ExperimentalTextApi")
}
}
Expand Down
9 changes: 6 additions & 3 deletions compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/LineHeightStyle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package androidx.compose.ui.text.style

import androidx.compose.ui.InternalComposeUiApi
import androidx.compose.ui.text.PlatformParagraphStyle
import androidx.compose.ui.text.internal.checkPrecondition
import kotlin.jvm.JvmInline
Expand Down Expand Up @@ -206,11 +207,13 @@ class LineHeightStyle(val alignment: Alignment, val trim: Trim, val mode: Mode)
val None = Trim(0)
}

internal fun isTrimFirstLineTop(): Boolean {
@InternalComposeUiApi

@igordmn Igor Demin (igordmn) Jun 17, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay to merge together with #3126.

Better to not merge separatelly

fun isTrimFirstLineTop(): Boolean {
return value and FlagTrimTop > 0
}

internal fun isTrimLastLineBottom(): Boolean {
@InternalComposeUiApi
fun isTrimLastLineBottom(): Boolean {
return value and FlagTrimBottom > 0
}
}
Expand All @@ -222,7 +225,7 @@ class LineHeightStyle(val alignment: Alignment, val trim: Trim, val mode: Mode)
* 0f (inclusive) and 1f (inclusive).
*/
@kotlin.jvm.JvmInline
value class Alignment constructor(internal val topRatio: Float) {
value class Alignment constructor(@property:InternalComposeUiApi val topRatio: Float) {

init {
checkPrecondition(topRatio in 0f..1f || topRatio == -1f) {
Expand Down
Loading