Merge "Add LineBreak API with flags in platform." into androidx-main
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/LineBreakingDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/LineBreakingDemo.kt
new file mode 100644
index 0000000..77bf51f
--- /dev/null
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/LineBreakingDemo.kt
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.foundation.demos.text
+
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.material.Slider
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.ExperimentalTextApi
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.LineBreak
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+@OptIn(ExperimentalTextApi::class)
+private val lineBreakOptions = listOf(
+ "Simple" to LineBreak.Simple,
+ "Paragraph" to LineBreak.Paragraph,
+ "Heading" to LineBreak.Heading,
+ "Custom" to LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Default
+ )
+)
+
+private val demoText = "This is an example text\n今日は自由が丘で焼き鳥を食べます。"
+private val presetNameStyle = SpanStyle(fontWeight = FontWeight.Bold, fontSize = 16.sp)
+
+@OptIn(ExperimentalTextApi::class)
+@Composable
+fun TextLineBreakingDemo() {
+ val selectedFontSize = remember { mutableStateOf(16f) }
+
+ Column(modifier = Modifier.fillMaxSize()) {
+ Text("Font size: ${selectedFontSize.value}")
+ Slider(
+ value = selectedFontSize.value,
+ onValueChange = { value -> selectedFontSize.value = value },
+ valueRange = 8f..48f
+ )
+
+ Row(Modifier.fillMaxWidth()) {
+ val textModifier = Modifier
+ .wrapContentHeight()
+ .padding(horizontal = 5.dp)
+ .border(1.dp, Color.Gray)
+
+ lineBreakOptions.forEach { (presetName, preset) ->
+ Text(
+ text = buildAnnotatedString {
+ withStyle(presetNameStyle) {
+ append(presetName)
+ append(":\n")
+ }
+ append(demoText)
+ },
+ style = TextStyle(
+ lineBreak = preset,
+ fontSize = selectedFontSize.value.sp
+ ),
+ modifier = textModifier.weight(1f)
+ )
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/TextDemos.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/TextDemos.kt
index f67371f..02b0fe2 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/TextDemos.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/TextDemos.kt
@@ -38,6 +38,7 @@
ComposableDemo("Line Height Behavior") { TextLineHeightDemo() },
ComposableDemo("Interactive text") { InteractiveTextDemo() },
ComposableDemo("Ellipsize and letterspacing") { EllipsizeWithLetterSpacing() },
+ ComposableDemo("Line breaking") { TextLineBreakingDemo() },
DemoCategory(
"Text Overflow",
listOf(
diff --git a/compose/ui/ui-text/api/1.3.0-beta03.txt b/compose/ui/ui-text/api/1.3.0-beta03.txt
index 057beaf..0f79aa3 100644
--- a/compose/ui/ui-text/api/1.3.0-beta03.txt
+++ b/compose/ui/ui-text/api/1.3.0-beta03.txt
@@ -222,8 +222,8 @@
}
@androidx.compose.runtime.Immutable public final class ParagraphStyle {
- ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method public long getLineHeight();
diff --git a/compose/ui/ui-text/api/current.txt b/compose/ui/ui-text/api/current.txt
index 057beaf..0f79aa3 100644
--- a/compose/ui/ui-text/api/current.txt
+++ b/compose/ui/ui-text/api/current.txt
@@ -222,8 +222,8 @@
}
@androidx.compose.runtime.Immutable public final class ParagraphStyle {
- ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method public long getLineHeight();
diff --git a/compose/ui/ui-text/api/public_plus_experimental_1.3.0-beta03.txt b/compose/ui/ui-text/api/public_plus_experimental_1.3.0-beta03.txt
index 6d70e25..c08cd32 100644
--- a/compose/ui/ui-text/api/public_plus_experimental_1.3.0-beta03.txt
+++ b/compose/ui/ui-text/api/public_plus_experimental_1.3.0-beta03.txt
@@ -238,10 +238,13 @@
}
@androidx.compose.runtime.Immutable public final class ParagraphStyle {
- ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ ctor @androidx.compose.ui.text.ExperimentalTextApi public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak);
ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak);
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.style.LineBreak? getLineBreak();
method public long getLineHeight();
method public androidx.compose.ui.text.style.LineHeightStyle? getLineHeightStyle();
method public androidx.compose.ui.text.PlatformParagraphStyle? getPlatformStyle();
@@ -250,6 +253,7 @@
method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle merge(optional androidx.compose.ui.text.ParagraphStyle? other);
method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+ property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.text.style.LineBreak? lineBreak;
property public final long lineHeight;
property public final androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle;
property public final androidx.compose.ui.text.PlatformParagraphStyle? platformStyle;
@@ -518,10 +522,12 @@
@androidx.compose.runtime.Immutable public final class TextStyle {
ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
- ctor @androidx.compose.ui.text.ExperimentalTextApi public TextStyle(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ ctor @androidx.compose.ui.text.ExperimentalTextApi public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak);
+ ctor @androidx.compose.ui.text.ExperimentalTextApi public TextStyle(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak);
method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
- method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.TextStyle copy(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak);
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.TextStyle copy(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak);
method @androidx.compose.ui.text.ExperimentalTextApi public float getAlpha();
method public long getBackground();
method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
@@ -534,6 +540,7 @@
method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
method public long getLetterSpacing();
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.style.LineBreak? getLineBreak();
method public long getLineHeight();
method public androidx.compose.ui.text.style.LineHeightStyle? getLineHeightStyle();
method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
@@ -565,6 +572,7 @@
property public final androidx.compose.ui.text.font.FontSynthesis? fontSynthesis;
property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
property public final long letterSpacing;
+ property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.text.style.LineBreak? lineBreak;
property public final long lineHeight;
property public final androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle;
property public final androidx.compose.ui.text.intl.LocaleList? localeList;
@@ -1373,6 +1381,66 @@
method @androidx.compose.runtime.Stable public static float lerp(float start, float stop, float fraction);
}
+ @androidx.compose.runtime.Immutable @androidx.compose.ui.text.ExperimentalTextApi public final class LineBreak {
+ ctor public LineBreak(int strategy, int strictness, int wordBreak);
+ method public androidx.compose.ui.text.style.LineBreak copy(optional int strategy, optional int strictness, optional int wordBreak);
+ method public int getStrategy();
+ method public int getStrictness();
+ method public int getWordBreak();
+ property public final int strategy;
+ property public final int strictness;
+ property public final int wordBreak;
+ field public static final androidx.compose.ui.text.style.LineBreak.Companion Companion;
+ }
+
+ public static final class LineBreak.Companion {
+ method public androidx.compose.ui.text.style.LineBreak getHeading();
+ method public androidx.compose.ui.text.style.LineBreak getParagraph();
+ method public androidx.compose.ui.text.style.LineBreak getSimple();
+ property public final androidx.compose.ui.text.style.LineBreak Heading;
+ property public final androidx.compose.ui.text.style.LineBreak Paragraph;
+ property public final androidx.compose.ui.text.style.LineBreak Simple;
+ }
+
+ @kotlin.jvm.JvmInline public static final value class LineBreak.Strategy {
+ field public static final androidx.compose.ui.text.style.LineBreak.Strategy.Companion Companion;
+ }
+
+ public static final class LineBreak.Strategy.Companion {
+ method public int getBalanced();
+ method public int getHighQuality();
+ method public int getSimple();
+ property public final int Balanced;
+ property public final int HighQuality;
+ property public final int Simple;
+ }
+
+ @kotlin.jvm.JvmInline public static final value class LineBreak.Strictness {
+ field public static final androidx.compose.ui.text.style.LineBreak.Strictness.Companion Companion;
+ }
+
+ public static final class LineBreak.Strictness.Companion {
+ method public int getDefault();
+ method public int getLoose();
+ method public int getNormal();
+ method public int getStrict();
+ property public final int Default;
+ property public final int Loose;
+ property public final int Normal;
+ property public final int Strict;
+ }
+
+ @kotlin.jvm.JvmInline public static final value class LineBreak.WordBreak {
+ field public static final androidx.compose.ui.text.style.LineBreak.WordBreak.Companion Companion;
+ }
+
+ public static final class LineBreak.WordBreak.Companion {
+ method public int getDefault();
+ method public int getPhrase();
+ property public final int Default;
+ property public final int Phrase;
+ }
+
public final class LineHeightStyle {
ctor public LineHeightStyle(float alignment, int trim);
method public float getAlignment();
diff --git a/compose/ui/ui-text/api/public_plus_experimental_current.txt b/compose/ui/ui-text/api/public_plus_experimental_current.txt
index 6d70e25..c08cd32 100644
--- a/compose/ui/ui-text/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-text/api/public_plus_experimental_current.txt
@@ -238,10 +238,13 @@
}
@androidx.compose.runtime.Immutable public final class ParagraphStyle {
- ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ ctor @androidx.compose.ui.text.ExperimentalTextApi public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak);
ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak);
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.style.LineBreak? getLineBreak();
method public long getLineHeight();
method public androidx.compose.ui.text.style.LineHeightStyle? getLineHeightStyle();
method public androidx.compose.ui.text.PlatformParagraphStyle? getPlatformStyle();
@@ -250,6 +253,7 @@
method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle merge(optional androidx.compose.ui.text.ParagraphStyle? other);
method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+ property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.text.style.LineBreak? lineBreak;
property public final long lineHeight;
property public final androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle;
property public final androidx.compose.ui.text.PlatformParagraphStyle? platformStyle;
@@ -518,10 +522,12 @@
@androidx.compose.runtime.Immutable public final class TextStyle {
ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
- ctor @androidx.compose.ui.text.ExperimentalTextApi public TextStyle(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ ctor @androidx.compose.ui.text.ExperimentalTextApi public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak);
+ ctor @androidx.compose.ui.text.ExperimentalTextApi public TextStyle(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak);
method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
- method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.TextStyle copy(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak);
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.TextStyle copy(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak);
method @androidx.compose.ui.text.ExperimentalTextApi public float getAlpha();
method public long getBackground();
method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
@@ -534,6 +540,7 @@
method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
method public long getLetterSpacing();
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.style.LineBreak? getLineBreak();
method public long getLineHeight();
method public androidx.compose.ui.text.style.LineHeightStyle? getLineHeightStyle();
method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
@@ -565,6 +572,7 @@
property public final androidx.compose.ui.text.font.FontSynthesis? fontSynthesis;
property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
property public final long letterSpacing;
+ property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.text.style.LineBreak? lineBreak;
property public final long lineHeight;
property public final androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle;
property public final androidx.compose.ui.text.intl.LocaleList? localeList;
@@ -1373,6 +1381,66 @@
method @androidx.compose.runtime.Stable public static float lerp(float start, float stop, float fraction);
}
+ @androidx.compose.runtime.Immutable @androidx.compose.ui.text.ExperimentalTextApi public final class LineBreak {
+ ctor public LineBreak(int strategy, int strictness, int wordBreak);
+ method public androidx.compose.ui.text.style.LineBreak copy(optional int strategy, optional int strictness, optional int wordBreak);
+ method public int getStrategy();
+ method public int getStrictness();
+ method public int getWordBreak();
+ property public final int strategy;
+ property public final int strictness;
+ property public final int wordBreak;
+ field public static final androidx.compose.ui.text.style.LineBreak.Companion Companion;
+ }
+
+ public static final class LineBreak.Companion {
+ method public androidx.compose.ui.text.style.LineBreak getHeading();
+ method public androidx.compose.ui.text.style.LineBreak getParagraph();
+ method public androidx.compose.ui.text.style.LineBreak getSimple();
+ property public final androidx.compose.ui.text.style.LineBreak Heading;
+ property public final androidx.compose.ui.text.style.LineBreak Paragraph;
+ property public final androidx.compose.ui.text.style.LineBreak Simple;
+ }
+
+ @kotlin.jvm.JvmInline public static final value class LineBreak.Strategy {
+ field public static final androidx.compose.ui.text.style.LineBreak.Strategy.Companion Companion;
+ }
+
+ public static final class LineBreak.Strategy.Companion {
+ method public int getBalanced();
+ method public int getHighQuality();
+ method public int getSimple();
+ property public final int Balanced;
+ property public final int HighQuality;
+ property public final int Simple;
+ }
+
+ @kotlin.jvm.JvmInline public static final value class LineBreak.Strictness {
+ field public static final androidx.compose.ui.text.style.LineBreak.Strictness.Companion Companion;
+ }
+
+ public static final class LineBreak.Strictness.Companion {
+ method public int getDefault();
+ method public int getLoose();
+ method public int getNormal();
+ method public int getStrict();
+ property public final int Default;
+ property public final int Loose;
+ property public final int Normal;
+ property public final int Strict;
+ }
+
+ @kotlin.jvm.JvmInline public static final value class LineBreak.WordBreak {
+ field public static final androidx.compose.ui.text.style.LineBreak.WordBreak.Companion Companion;
+ }
+
+ public static final class LineBreak.WordBreak.Companion {
+ method public int getDefault();
+ method public int getPhrase();
+ property public final int Default;
+ property public final int Phrase;
+ }
+
public final class LineHeightStyle {
ctor public LineHeightStyle(float alignment, int trim);
method public float getAlignment();
diff --git a/compose/ui/ui-text/api/restricted_1.3.0-beta03.txt b/compose/ui/ui-text/api/restricted_1.3.0-beta03.txt
index 057beaf..0f79aa3 100644
--- a/compose/ui/ui-text/api/restricted_1.3.0-beta03.txt
+++ b/compose/ui/ui-text/api/restricted_1.3.0-beta03.txt
@@ -222,8 +222,8 @@
}
@androidx.compose.runtime.Immutable public final class ParagraphStyle {
- ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method public long getLineHeight();
diff --git a/compose/ui/ui-text/api/restricted_current.txt b/compose/ui/ui-text/api/restricted_current.txt
index 057beaf..0f79aa3 100644
--- a/compose/ui/ui-text/api/restricted_current.txt
+++ b/compose/ui/ui-text/api/restricted_current.txt
@@ -222,8 +222,8 @@
}
@androidx.compose.runtime.Immutable public final class ParagraphStyle {
- ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method public long getLineHeight();
diff --git a/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/LineBreakSamples.kt b/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/LineBreakSamples.kt
new file mode 100644
index 0000000..91cf6d9
--- /dev/null
+++ b/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/LineBreakSamples.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.ui.text.samples
+
+import androidx.annotation.Sampled
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.text.ExperimentalTextApi
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.LineBreak
+import androidx.compose.ui.unit.sp
+
+@OptIn(ExperimentalTextApi::class)
+@Sampled
+@Composable
+fun LineBreakSample() {
+ Text(
+ text = "Title of an article",
+ style = TextStyle(
+ fontSize = 20.sp,
+ lineBreak = LineBreak.Heading
+ )
+ )
+
+ Text(
+ text = "A long paragraph in an article",
+ style = TextStyle(
+ lineBreak = LineBreak.Paragraph
+ )
+ )
+}
+
+@OptIn(ExperimentalTextApi::class)
+@Sampled
+@Composable
+fun AndroidLineBreakSample() {
+ val customTitleLineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Simple,
+ strictness = LineBreak.Strictness.Loose,
+ wordBreak = LineBreak.WordBreak.Default
+ )
+
+ Text(
+ text = "Title of an article",
+ style = TextStyle(
+ fontSize = 20.sp,
+ lineBreak = customTitleLineBreak
+ )
+ )
+
+ val defaultStrictnessParagraphLineBreak =
+ LineBreak.Paragraph.copy(strictness = LineBreak.Strictness.Default)
+
+ Text(
+ text = "A long paragraph in an article",
+ style = TextStyle(
+ lineBreak = defaultStrictnessParagraphLineBreak
+ )
+ )
+}
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/style/LineBreakTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/style/LineBreakTest.kt
new file mode 100644
index 0000000..b7769c1
--- /dev/null
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/style/LineBreakTest.kt
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.ui.text.style
+
+import androidx.compose.ui.text.ExperimentalTextApi
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SmallTest
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@OptIn(ExperimentalTextApi::class)
+@RunWith(AndroidJUnit4::class)
+@SmallTest
+class LineBreakTest {
+ @Test
+ fun equals_different_strategy_returns_false() {
+ val lineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Phrase
+ )
+ val otherLineBreak = LineBreak(
+ strategy = LineBreak.Strategy.HighQuality,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Phrase
+ )
+
+ assertThat(lineBreak.equals(otherLineBreak)).isFalse()
+ }
+
+ @Test
+ fun equals_different_style_returns_false() {
+ val lineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Phrase
+ )
+ val otherLineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Loose,
+ wordBreak = LineBreak.WordBreak.Phrase
+ )
+
+ assertThat(lineBreak.equals(otherLineBreak)).isFalse()
+ }
+
+ @Test
+ fun equals_different_wordBreak_returns_false() {
+ val lineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Phrase
+ )
+ val otherLineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Default
+ )
+
+ assertThat(lineBreak.equals(otherLineBreak)).isFalse()
+ }
+
+ @Test
+ fun equals_same_flags_returns_true() {
+ val lineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Phrase
+ )
+ val otherLineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Phrase
+ )
+
+ assertThat(lineBreak.equals(otherLineBreak)).isTrue()
+ }
+
+ @Test
+ fun hashCode_different_for_different_strategy() {
+ val lineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Phrase
+ )
+ val otherLineBreak = LineBreak(
+ strategy = LineBreak.Strategy.HighQuality,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Phrase
+ )
+
+ assertThat(lineBreak.hashCode()).isNotEqualTo(otherLineBreak.hashCode())
+ }
+
+ @Test
+ fun hashCode_different_for_different_style() {
+ val lineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Phrase
+ )
+ val otherLineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Loose,
+ wordBreak = LineBreak.WordBreak.Phrase
+ )
+
+ assertThat(lineBreak.hashCode()).isNotEqualTo(otherLineBreak.hashCode())
+ }
+
+ @Test
+ fun hashCode_different_for_different_wordBreak() {
+ val lineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Phrase
+ )
+ val otherLineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Default
+ )
+
+ assertThat(lineBreak.hashCode()).isNotEqualTo(otherLineBreak.hashCode())
+ }
+
+ @Test
+ fun hashCode_same_for_same_flags() {
+ val lineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Phrase
+ )
+ val otherLineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Phrase
+ )
+
+ assertThat(lineBreak.hashCode()).isEqualTo(otherLineBreak.hashCode())
+ }
+}
\ No newline at end of file
diff --git a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/AndroidParagraph.android.kt b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/AndroidParagraph.android.kt
index 94da64b6..314b2c5 100644
--- a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/AndroidParagraph.android.kt
+++ b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/AndroidParagraph.android.kt
@@ -39,10 +39,22 @@
import androidx.compose.ui.text.android.LayoutCompat.ALIGN_NORMAL
import androidx.compose.ui.text.android.LayoutCompat.ALIGN_OPPOSITE
import androidx.compose.ui.text.android.LayoutCompat.ALIGN_RIGHT
+import androidx.compose.ui.text.android.LayoutCompat.BREAK_STRATEGY_BALANCED
+import androidx.compose.ui.text.android.LayoutCompat.BREAK_STRATEGY_HIGH_QUALITY
+import androidx.compose.ui.text.android.LayoutCompat.BREAK_STRATEGY_SIMPLE
import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_ALIGNMENT
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_BREAK_STRATEGY
import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_JUSTIFICATION_MODE
import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_LINESPACING_MULTIPLIER
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_LINE_BREAK_STYLE
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_LINE_BREAK_WORD_STYLE
import androidx.compose.ui.text.android.LayoutCompat.JUSTIFICATION_MODE_INTER_WORD
+import androidx.compose.ui.text.android.LayoutCompat.LINE_BREAK_STYLE_LOOSE
+import androidx.compose.ui.text.android.LayoutCompat.LINE_BREAK_STYLE_NONE
+import androidx.compose.ui.text.android.LayoutCompat.LINE_BREAK_STYLE_NORMAL
+import androidx.compose.ui.text.android.LayoutCompat.LINE_BREAK_STYLE_STRICT
+import androidx.compose.ui.text.android.LayoutCompat.LINE_BREAK_WORD_STYLE_NONE
+import androidx.compose.ui.text.android.LayoutCompat.LINE_BREAK_WORD_STYLE_PHRASE
import androidx.compose.ui.text.android.TextLayout
import androidx.compose.ui.text.android.selection.WordBoundary
import androidx.compose.ui.text.android.style.IndentationFixSpan
@@ -53,6 +65,7 @@
import androidx.compose.ui.text.platform.extensions.setSpan
import androidx.compose.ui.text.platform.isIncludeFontPaddingEnabled
import androidx.compose.ui.text.platform.style.ShaderBrushSpan
+import androidx.compose.ui.text.style.LineBreak
import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextDecoration
@@ -103,6 +116,7 @@
@VisibleForTesting
internal val charSequence: CharSequence
+
init {
require(constraints.minHeight == 0 && constraints.minWidth == 0) {
"Setting Constraints.minWidth and Constraints.minHeight is not supported, " +
@@ -128,6 +142,10 @@
else -> DEFAULT_JUSTIFICATION_MODE
}
+ val breakStrategy = toLayoutBreakStrategy(style.lineBreak?.strategy)
+ val lineBreakStyle = toLayoutLineBreakStyle(style.lineBreak?.strictness)
+ val lineBreakWordStyle = toLayoutLineBreakWordStyle(style.lineBreak?.wordBreak)
+
val ellipsize = if (ellipsis) {
TextUtils.TruncateAt.END
} else {
@@ -138,7 +156,10 @@
alignment = alignment,
justificationMode = justificationMode,
ellipsize = ellipsize,
- maxLines = maxLines
+ maxLines = maxLines,
+ breakStrategy = breakStrategy,
+ lineBreakStyle = lineBreakStyle,
+ lineBreakWordStyle = lineBreakWordStyle
)
// Ellipsize if there's not enough vertical space to fit all lines
@@ -154,7 +175,10 @@
// This will allow to have an ellipsis on that single line. If we measured with
// 0 maxLines, it would measure all lines with no ellipsis even though the first
// line might be partially visible
- maxLines = calculatedMaxLines.coerceAtLeast(1)
+ maxLines = calculatedMaxLines.coerceAtLeast(1),
+ breakStrategy = breakStrategy,
+ lineBreakStyle = lineBreakStyle,
+ lineBreakWordStyle = lineBreakWordStyle
)
} else {
firstLayout
@@ -484,7 +508,10 @@
alignment: Int,
justificationMode: Int,
ellipsize: TextUtils.TruncateAt?,
- maxLines: Int
+ maxLines: Int,
+ breakStrategy: Int,
+ lineBreakStyle: Int,
+ lineBreakWordStyle: Int
) =
TextLayout(
charSequence = charSequence,
@@ -498,7 +525,10 @@
justificationMode = justificationMode,
layoutIntrinsics = paragraphIntrinsics.layoutIntrinsics,
includePadding = paragraphIntrinsics.style.isIncludeFontPaddingEnabled(),
- fallbackLineSpacing = true
+ fallbackLineSpacing = true,
+ breakStrategy = breakStrategy,
+ lineBreakStyle = lineBreakStyle,
+ lineBreakWordStyle = lineBreakWordStyle
)
}
@@ -515,6 +545,32 @@
else -> DEFAULT_ALIGNMENT
}
+@OptIn(ExperimentalTextApi::class, InternalPlatformTextApi::class)
+private fun toLayoutBreakStrategy(breakStrategy: LineBreak.Strategy?): Int = when (breakStrategy) {
+ LineBreak.Strategy.Simple -> BREAK_STRATEGY_SIMPLE
+ LineBreak.Strategy.HighQuality -> BREAK_STRATEGY_HIGH_QUALITY
+ LineBreak.Strategy.Balanced -> BREAK_STRATEGY_BALANCED
+ else -> DEFAULT_BREAK_STRATEGY
+}
+
+@OptIn(ExperimentalTextApi::class, InternalPlatformTextApi::class)
+private fun toLayoutLineBreakStyle(lineBreakStrictness: LineBreak.Strictness?): Int =
+ when (lineBreakStrictness) {
+ LineBreak.Strictness.Default -> LINE_BREAK_STYLE_NONE
+ LineBreak.Strictness.Loose -> LINE_BREAK_STYLE_LOOSE
+ LineBreak.Strictness.Normal -> LINE_BREAK_STYLE_NORMAL
+ LineBreak.Strictness.Strict -> LINE_BREAK_STYLE_STRICT
+ else -> DEFAULT_LINE_BREAK_STYLE
+ }
+
+@OptIn(ExperimentalTextApi::class, InternalPlatformTextApi::class)
+private fun toLayoutLineBreakWordStyle(lineBreakWordStyle: LineBreak.WordBreak?): Int =
+ when (lineBreakWordStyle) {
+ LineBreak.WordBreak.Default -> LINE_BREAK_WORD_STYLE_NONE
+ LineBreak.WordBreak.Phrase -> LINE_BREAK_WORD_STYLE_PHRASE
+ else -> DEFAULT_LINE_BREAK_WORD_STYLE
+ }
+
@OptIn(InternalPlatformTextApi::class)
private fun TextLayout.numberOfLinesThatFitMaxHeight(maxHeight: Int): Int {
for (lineIndex in 0 until lineCount) {
diff --git a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/style/LineBreak.android.kt b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/style/LineBreak.android.kt
new file mode 100644
index 0000000..b98a775
--- /dev/null
+++ b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/style/LineBreak.android.kt
@@ -0,0 +1,315 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.ui.text.style
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.text.ExperimentalTextApi
+
+// TODO(b/246340708): Remove @sample LineBreakSample from the actual class
+/**
+ * When soft wrap is enabled and the width of the text exceeds the width of its container,
+ * line breaks are inserted in the text to split it over multiple lines.
+ *
+ * There are a number of parameters that affect how the line breaks are inserted.
+ * For example, the breaking algorithm can be changed to one with improved readability
+ * at the cost of speed.
+ * Another example is the strictness, which in some languages determines which symbols can appear
+ * at the start of a line.
+ *
+ * This represents a configuration for line breaking on Android, describing [Strategy], [Strictness],
+ * and [WordBreak].
+ *
+ * @sample androidx.compose.ui.text.samples.LineBreakSample
+ * @sample androidx.compose.ui.text.samples.AndroidLineBreakSample
+ *
+ * @param strategy defines the algorithm that inserts line breaks
+ * @param strictness defines the line breaking rules
+ * @param wordBreak defines how words are broken
+ */
+@ExperimentalTextApi
+@Immutable
+actual class LineBreak(
+ val strategy: Strategy,
+ val strictness: Strictness,
+ val wordBreak: WordBreak
+) {
+ actual companion object {
+ /**
+ * The greedy, fast line breaking algorithm. Ideal for text that updates often,
+ * such as a text editor, as the text will reflow minimally.
+ *
+ * <pre>
+ * +---------+
+ * | This is |
+ * | an |
+ * | example |
+ * | text. |
+ * | 今日は自 |
+ * | 由が丘で |
+ * | 焼き鳥を |
+ * | 食べま |
+ * | す。 |
+ * +---------+
+ * </pre>
+ */
+ actual val Simple: LineBreak = LineBreak(
+ strategy = Strategy.Simple,
+ strictness = Strictness.Normal,
+ wordBreak = WordBreak.Default
+ )
+
+ /**
+ * Balanced line lengths, hyphenation, and phrase-based breaking.
+ * Suitable for short text such as titles or narrow newspaper columns.
+ *
+ * <pre>
+ * +---------+
+ * | This |
+ * | is an |
+ * | example |
+ * | text. |
+ * | 今日は |
+ * | 自由が丘 |
+ * | で焼き鳥 |
+ * | を食べ |
+ * | ます。 |
+ * +---------+
+ * </pre>
+ */
+ actual val Heading: LineBreak = LineBreak(
+ strategy = Strategy.Balanced,
+ strictness = Strictness.Loose,
+ wordBreak = WordBreak.Phrase
+ )
+
+ /**
+ * Slower, higher quality line breaking for improved readability.
+ * Suitable for larger amounts of text.
+ *
+ * <pre>
+ * +---------+
+ * | This |
+ * | is an |
+ * | example |
+ * | text. |
+ * | 今日は自 |
+ * | 由が丘で |
+ * | 焼き鳥を |
+ * | 食べま |
+ * | す。 |
+ * +---------+
+ * </pre>
+ */
+ actual val Paragraph: LineBreak = LineBreak(
+ strategy = Strategy.HighQuality,
+ strictness = Strictness.Strict,
+ wordBreak = WordBreak.Default
+ )
+ }
+
+ fun copy(
+ strategy: Strategy = this.strategy,
+ strictness: Strictness = this.strictness,
+ wordBreak: WordBreak = this.wordBreak
+ ): LineBreak = LineBreak(
+ strategy = strategy,
+ strictness = strictness,
+ wordBreak = wordBreak
+ )
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (other !is LineBreak) return false
+
+ if (strategy != other.strategy) return false
+ if (strictness != other.strictness) return false
+ if (wordBreak != other.wordBreak) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = strategy.hashCode()
+ result = 31 * result + strictness.hashCode()
+ result = 31 * result + wordBreak.hashCode()
+ return result
+ }
+
+ override fun toString(): String =
+ "LineBreak(strategy=$strategy, strictness=$strictness, wordBreak=$wordBreak)"
+
+ /**
+ * The strategy used for line breaking.
+ */
+ @JvmInline
+ value class Strategy private constructor(private val value: Int) {
+ companion object {
+ /**
+ * Basic, fast break strategy. Hyphenation, if enabled, is done only for words
+ * that don't fit on an entire line by themselves.
+ *
+ * <pre>
+ * +---------+
+ * | This is |
+ * | an |
+ * | example |
+ * | text. |
+ * +---------+
+ * </pre>
+ */
+ val Simple: Strategy = Strategy(1)
+
+ /**
+ * Does whole paragraph optimization for more readable text,
+ * including hyphenation if enabled.
+ *
+ * <pre>
+ * +---------+
+ * | This |
+ * | is an |
+ * | example |
+ * | text. |
+ * +---------+
+ * </pre>
+ */
+ val HighQuality: Strategy = Strategy(2)
+
+ /**
+ * Attempts to balance the line lengths of the text, also applying automatic
+ * hyphenation if enabled. Suitable for small screens.
+ *
+ * <pre>
+ * +-----------------------+
+ * | This is an |
+ * | example text. |
+ * +-----------------------+
+ * </pre>
+ */
+ val Balanced: Strategy = Strategy(3)
+ }
+
+ override fun toString(): String = when (this) {
+ Simple -> "Strategy.Simple"
+ HighQuality -> "Strategy.HighQuality"
+ Balanced -> "Strategy.Balanced"
+ else -> "Invalid"
+ }
+ }
+
+ /**
+ * Describes the strictness of line breaking, determining before which characters
+ * line breaks can be inserted. It is useful when working with CJK scripts.
+ */
+ @JvmInline
+ value class Strictness private constructor(private val value: Int) {
+ companion object {
+ /**
+ * Default breaking rules for the locale, which may correspond to [Normal] or [Strict].
+ */
+ val Default: Strictness = Strictness(1)
+
+ /**
+ * The least restrictive rules, suitable for short lines.
+ *
+ * For example, in Japanese it allows breaking before iteration marks, such as 々, 〻.
+ */
+ val Loose: Strictness = Strictness(2)
+
+ /**
+ * The most common rules for line breaking.
+ *
+ * For example, in Japanese it allows breaking before characters like
+ * small hiragana (ぁ), small katakana (ァ), halfwidth variants (ｧ).
+ */
+ val Normal: Strictness = Strictness(3)
+
+ /**
+ * The most stringent rules for line breaking.
+ *
+ * For example, in Japanese it does not allow breaking before characters like
+ * small hiragana (ぁ), small katakana (ァ), halfwidth variants (ｧ).
+ */
+ val Strict: Strictness = Strictness(4)
+ }
+
+ override fun toString(): String = when (this) {
+ Default -> "Strictness.None"
+ Loose -> "Strictness.Loose"
+ Normal -> "Strictness.Normal"
+ Strict -> "Strictness.Strict"
+ else -> "Invalid"
+ }
+ }
+
+ /**
+ * Describes how line breaks should be inserted within words.
+ */
+ @JvmInline
+ value class WordBreak private constructor(private val value: Int) {
+ companion object {
+ /**
+ * Default word breaking rules for the locale.
+ * In latin scripts this means inserting line breaks between words,
+ * while in languages that don't use whitespace (e.g. Japanese) the line can break
+ * between characters.
+ *
+ * <pre>
+ * +---------+
+ * | This is |
+ * | an |
+ * | example |
+ * | text. |
+ * | 今日は自 |
+ * | 由が丘で |
+ * | 焼き鳥を |
+ * | 食べま |
+ * | す。 |
+ * +---------+
+ * </pre>
+ */
+ val Default: WordBreak = WordBreak(1)
+
+ /**
+ * Line breaking is based on phrases.
+ * In languages that don't use whitespace (e.g. Japanese), line breaks are not inserted
+ * between characters that are part of the same phrase unit.
+ * This is ideal for short text such as titles and UI labels.
+ *
+ * <pre>
+ * +---------+
+ * | This |
+ * | is an |
+ * | example |
+ * | text. |
+ * | 今日は |
+ * | 自由が丘 |
+ * | で焼き鳥 |
+ * | を食べ |
+ * | ます。 |
+ * +---------+
+ * </pre>
+ */
+ val Phrase: WordBreak = WordBreak(2)
+ }
+
+ override fun toString(): String = when (this) {
+ Default -> "WordBreak.None"
+ Phrase -> "WordBreak.Phrase"
+ else -> "Invalid"
+ }
+ }
+}
\ No newline at end of file
diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphStyle.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphStyle.kt
index 4cba34a..9736a79 100644
--- a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphStyle.kt
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphStyle.kt
@@ -18,6 +18,7 @@
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.Stable
+import androidx.compose.ui.text.style.LineBreak
import androidx.compose.ui.text.style.LineHeightStyle
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextDirection
@@ -49,6 +50,7 @@
* line, whether to apply additional space as a result of line height to top of first line top and
* bottom of last line. The configuration is applied only when a [lineHeight] is defined.
* When null, [LineHeightStyle.Default] is used.
+ * @param lineBreak The line breaking configuration for the text.
*
* @see Paragraph
* @see AnnotatedString
@@ -56,13 +58,15 @@
* @see TextStyle
*/
@Immutable
-class ParagraphStyle constructor(
+class ParagraphStyle @ExperimentalTextApi constructor(
val textAlign: TextAlign? = null,
val textDirection: TextDirection? = null,
val lineHeight: TextUnit = TextUnit.Unspecified,
val textIndent: TextIndent? = null,
val platformStyle: PlatformParagraphStyle? = null,
- val lineHeightStyle: LineHeightStyle? = null
+ val lineHeightStyle: LineHeightStyle? = null,
+ @Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
+ @get:ExperimentalTextApi val lineBreak: LineBreak? = null
) {
/**
@@ -100,6 +104,51 @@
lineHeightStyle = null
)
+ /**
+ * Paragraph styling configuration for a paragraph. The difference between [SpanStyle] and
+ * `ParagraphStyle` is that, `ParagraphStyle` can be applied to a whole [Paragraph] while
+ * [SpanStyle] can be applied at the character level.
+ * Once a portion of the text is marked with a `ParagraphStyle`, that portion will be separated from
+ * the remaining as if a line feed character was added.
+ *
+ * @sample androidx.compose.ui.text.samples.ParagraphStyleSample
+ * @sample androidx.compose.ui.text.samples.ParagraphStyleAnnotatedStringsSample
+ *
+ * @param textAlign The alignment of the text within the lines of the paragraph.
+ * @param textDirection The algorithm to be used to resolve the final text direction:
+ * Left To Right or Right To Left.
+ * @param lineHeight Line height for the [Paragraph] in [TextUnit] unit, e.g. SP or EM.
+ * @param textIndent The indentation of the paragraph.
+ * @param platformStyle Platform specific [ParagraphStyle] parameters.
+ * @param lineHeightStyle the configuration for line height such as vertical alignment of the
+ * line, whether to apply additional space as a result of line height to top of first line top and
+ * bottom of last line. The configuration is applied only when a [lineHeight] is defined.
+ * When null, [LineHeightStyle.Default] is used.
+ *
+ * @see Paragraph
+ * @see AnnotatedString
+ * @see SpanStyle
+ * @see TextStyle
+ */
+ // TODO(b/245939557): Deprecate this when LineBreak is stable
+ @OptIn(ExperimentalTextApi::class)
+ constructor(
+ textAlign: TextAlign? = null,
+ textDirection: TextDirection? = null,
+ lineHeight: TextUnit = TextUnit.Unspecified,
+ textIndent: TextIndent? = null,
+ platformStyle: PlatformParagraphStyle? = null,
+ lineHeightStyle: LineHeightStyle? = null
+ ) : this(
+ textAlign = textAlign,
+ textDirection = textDirection,
+ lineHeight = lineHeight,
+ textIndent = textIndent,
+ platformStyle = platformStyle,
+ lineHeightStyle = lineHeightStyle,
+ lineBreak = null
+ )
+
init {
if (lineHeight != TextUnit.Unspecified) {
// Since we are checking if it's negative, no need to convert Sp into Px at this point.
@@ -115,6 +164,7 @@
*
* If the given paragraph style is null, returns this paragraph style.
*/
+ @OptIn(ExperimentalTextApi::class)
@Stable
fun merge(other: ParagraphStyle? = null): ParagraphStyle {
if (other == null) return this
@@ -129,7 +179,8 @@
textAlign = other.textAlign ?: this.textAlign,
textDirection = other.textDirection ?: this.textDirection,
platformStyle = mergePlatformStyle(other.platformStyle),
- lineHeightStyle = other.lineHeightStyle ?: this.lineHeightStyle
+ lineHeightStyle = other.lineHeightStyle ?: this.lineHeightStyle,
+ lineBreak = other.lineBreak ?: this.lineBreak
)
}
@@ -145,6 +196,7 @@
@Stable
operator fun plus(other: ParagraphStyle): ParagraphStyle = this.merge(other)
+ @OptIn(ExperimentalTextApi::class)
fun copy(
textAlign: TextAlign? = this.textAlign,
textDirection: TextDirection? = this.textDirection,
@@ -157,10 +209,13 @@
lineHeight = lineHeight,
textIndent = textIndent,
platformStyle = this.platformStyle,
- lineHeightStyle = this.lineHeightStyle
+ lineHeightStyle = this.lineHeightStyle,
+ lineBreak = this.lineBreak
)
}
+ // TODO(b/245939557): Deprecate this when LineBreak is stable
+ @OptIn(ExperimentalTextApi::class)
fun copy(
textAlign: TextAlign? = this.textAlign,
textDirection: TextDirection? = this.textDirection,
@@ -175,10 +230,33 @@
lineHeight = lineHeight,
textIndent = textIndent,
platformStyle = platformStyle,
- lineHeightStyle = lineHeightStyle
+ lineHeightStyle = lineHeightStyle,
+ lineBreak = this.lineBreak
)
}
+ @ExperimentalTextApi
+ fun copy(
+ textAlign: TextAlign? = this.textAlign,
+ textDirection: TextDirection? = this.textDirection,
+ lineHeight: TextUnit = this.lineHeight,
+ textIndent: TextIndent? = this.textIndent,
+ platformStyle: PlatformParagraphStyle? = this.platformStyle,
+ lineHeightStyle: LineHeightStyle? = this.lineHeightStyle,
+ lineBreak: LineBreak? = this.lineBreak
+ ): ParagraphStyle {
+ return ParagraphStyle(
+ textAlign = textAlign,
+ textDirection = textDirection,
+ lineHeight = lineHeight,
+ textIndent = textIndent,
+ platformStyle = platformStyle,
+ lineHeightStyle = lineHeightStyle,
+ lineBreak = lineBreak
+ )
+ }
+
+ @OptIn(ExperimentalTextApi::class)
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other !is ParagraphStyle) return false
@@ -189,10 +267,12 @@
if (textIndent != other.textIndent) return false
if (platformStyle != other.platformStyle) return false
if (lineHeightStyle != other.lineHeightStyle) return false
+ if (lineBreak != other.lineBreak) return false
return true
}
+ @OptIn(ExperimentalTextApi::class)
override fun hashCode(): Int {
var result = textAlign?.hashCode() ?: 0
result = 31 * result + (textDirection?.hashCode() ?: 0)
@@ -200,9 +280,11 @@
result = 31 * result + (textIndent?.hashCode() ?: 0)
result = 31 * result + (platformStyle?.hashCode() ?: 0)
result = 31 * result + (lineHeightStyle?.hashCode() ?: 0)
+ result = 31 * result + (lineBreak?.hashCode() ?: 0)
return result
}
+ @OptIn(ExperimentalTextApi::class)
override fun toString(): String {
return "ParagraphStyle(" +
"textAlign=$textAlign, " +
@@ -210,7 +292,8 @@
"lineHeight=$lineHeight, " +
"textIndent=$textIndent, " +
"platformStyle=$platformStyle, " +
- "lineHeightStyle=$lineHeightStyle" +
+ "lineHeightStyle=$lineHeightStyle, " +
+ "lineBreak=$lineBreak" +
")"
}
}
@@ -228,6 +311,7 @@
* between [start] and [stop]. The interpolation can be extrapolated beyond 0.0 and
* 1.0, so negative values and values greater than 1.0 are valid.
*/
+@OptIn(ExperimentalTextApi::class)
@Stable
fun lerp(start: ParagraphStyle, stop: ParagraphStyle, fraction: Float): ParagraphStyle {
return ParagraphStyle(
@@ -248,7 +332,8 @@
start.lineHeightStyle,
stop.lineHeightStyle,
fraction
- )
+ ),
+ lineBreak = lerpDiscrete(start.lineBreak, stop.lineBreak, fraction)
)
}
@@ -263,6 +348,7 @@
return lerp(startNonNull, stopNonNull, fraction)
}
+@OptIn(ExperimentalTextApi::class)
internal fun resolveParagraphStyleDefaults(
style: ParagraphStyle,
direction: LayoutDirection
@@ -272,5 +358,6 @@
lineHeight = if (style.lineHeight.isUnspecified) DefaultLineHeight else style.lineHeight,
textIndent = style.textIndent ?: TextIndent.None,
platformStyle = style.platformStyle,
- lineHeightStyle = style.lineHeightStyle
+ lineHeightStyle = style.lineHeightStyle,
+ lineBreak = style.lineBreak ?: LineBreak.Simple
)
diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/TextStyle.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/TextStyle.kt
index 2f759cc..7d677e1 100644
--- a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/TextStyle.kt
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/TextStyle.kt
@@ -27,6 +27,7 @@
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.intl.LocaleList
import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.LineBreak
import androidx.compose.ui.text.style.LineHeightStyle
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextDecoration
@@ -96,6 +97,7 @@
* @param lineHeight Line height for the [Paragraph] in [TextUnit] unit, e.g. SP or EM.
* @param textIndent The indentation of the paragraph.
*/
+ @OptIn(ExperimentalTextApi::class)
constructor(
color: Color = Color.Unspecified,
fontSize: TextUnit = TextUnit.Unspecified,
@@ -139,7 +141,8 @@
lineHeight = lineHeight,
textIndent = textIndent,
platformStyle = null,
- lineHeightStyle = null
+ lineHeightStyle = null,
+ lineBreak = null
),
platformStyle = null
)
@@ -179,6 +182,8 @@
* and bottom of last line. The configuration is applied only when a [lineHeight] is defined.
* When null, [LineHeightStyle.Default] is used.
*/
+ // TODO(b/245939557): Deprecate this when LineBreak is stable
+ @OptIn(ExperimentalTextApi::class)
constructor(
color: Color = Color.Unspecified,
fontSize: TextUnit = TextUnit.Unspecified,
@@ -224,7 +229,97 @@
lineHeight = lineHeight,
textIndent = textIndent,
platformStyle = platformStyle?.paragraphStyle,
- lineHeightStyle = lineHeightStyle
+ lineHeightStyle = lineHeightStyle,
+ lineBreak = null
+ ),
+ platformStyle = platformStyle
+ )
+
+ /**
+ * Styling configuration for a `Text`.
+ *
+ * @sample androidx.compose.ui.text.samples.TextStyleSample
+ *
+ * @param color The text color.
+ * @param fontSize The size of glyphs to use when painting the text. This
+ * may be [TextUnit.Unspecified] for inheriting from another [TextStyle].
+ * @param fontWeight The typeface thickness to use when painting the text (e.g., bold).
+ * @param fontStyle The typeface variant to use when drawing the letters (e.g., italic).
+ * @param fontSynthesis Whether to synthesize font weight and/or style when the requested weight
+ * or style cannot be found in the provided font family.
+ * @param fontFamily The font family to be used when rendering the text.
+ * @param fontFeatureSettings The advanced typography settings provided by font. The format is
+ * the same as the CSS font-feature-settings attribute:
+ * https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
+ * @param letterSpacing The amount of space to add between each letter.
+ * @param baselineShift The amount by which the text is shifted up from the current baseline.
+ * @param textGeometricTransform The geometric transformation applied the text.
+ * @param localeList The locale list used to select region-specific glyphs.
+ * @param background The background color for the text.
+ * @param textDecoration The decorations to paint on the text (e.g., an underline).
+ * @param shadow The shadow effect applied on the text.
+ * @param textAlign The alignment of the text within the lines of the paragraph.
+ * @param textDirection The algorithm to be used to resolve the final text and paragraph
+ * direction: Left To Right or Right To Left. If no value is provided the system will use the
+ * [LayoutDirection] as the primary signal.
+ * @param lineHeight Line height for the [Paragraph] in [TextUnit] unit, e.g. SP or EM.
+ * @param textIndent The indentation of the paragraph.
+ * @param platformStyle Platform specific [TextStyle] parameters.
+ * @param lineHeightStyle the configuration for line height such as vertical alignment of the
+ * line, whether to apply additional space as a result of line height to top of first line top
+ * and bottom of last line. The configuration is applied only when a [lineHeight] is defined.
+ * When null, [LineHeightStyle.Default] is used.
+ * @param lineBreak The line breaking configuration for the text.
+ */
+ @ExperimentalTextApi
+ constructor(
+ color: Color = Color.Unspecified,
+ fontSize: TextUnit = TextUnit.Unspecified,
+ fontWeight: FontWeight? = null,
+ fontStyle: FontStyle? = null,
+ fontSynthesis: FontSynthesis? = null,
+ fontFamily: FontFamily? = null,
+ fontFeatureSettings: String? = null,
+ letterSpacing: TextUnit = TextUnit.Unspecified,
+ baselineShift: BaselineShift? = null,
+ textGeometricTransform: TextGeometricTransform? = null,
+ localeList: LocaleList? = null,
+ background: Color = Color.Unspecified,
+ textDecoration: TextDecoration? = null,
+ shadow: Shadow? = null,
+ textAlign: TextAlign? = null,
+ textDirection: TextDirection? = null,
+ lineHeight: TextUnit = TextUnit.Unspecified,
+ textIndent: TextIndent? = null,
+ platformStyle: PlatformTextStyle? = null,
+ lineHeightStyle: LineHeightStyle? = null,
+ lineBreak: LineBreak? = null
+ ) : this(
+ SpanStyle(
+ color = color,
+ fontSize = fontSize,
+ fontWeight = fontWeight,
+ fontStyle = fontStyle,
+ fontSynthesis = fontSynthesis,
+ fontFamily = fontFamily,
+ fontFeatureSettings = fontFeatureSettings,
+ letterSpacing = letterSpacing,
+ baselineShift = baselineShift,
+ textGeometricTransform = textGeometricTransform,
+ localeList = localeList,
+ background = background,
+ textDecoration = textDecoration,
+ shadow = shadow,
+ platformStyle = platformStyle?.spanStyle
+ ),
+ ParagraphStyle(
+ textAlign = textAlign,
+ textDirection = textDirection,
+ lineHeight = lineHeight,
+ textIndent = textIndent,
+ platformStyle = platformStyle?.paragraphStyle,
+ lineHeightStyle = lineHeightStyle,
+ lineBreak = lineBreak
),
platformStyle = platformStyle
)
@@ -266,6 +361,7 @@
* @param lineHeightStyle the configuration for line height such as vertical alignment of the
* line, whether to apply additional space as a result of line height to top of first line top
* and bottom of last line. The configuration is applied only when a [lineHeight] is defined.
+ * @param lineBreak The line breaking configuration for the text.
*/
@ExperimentalTextApi
constructor(
@@ -289,7 +385,8 @@
lineHeight: TextUnit = TextUnit.Unspecified,
textIndent: TextIndent? = null,
platformStyle: PlatformTextStyle? = null,
- lineHeightStyle: LineHeightStyle? = null
+ lineHeightStyle: LineHeightStyle? = null,
+ lineBreak: LineBreak? = null
) : this(
SpanStyle(
brush = brush,
@@ -315,7 +412,8 @@
lineHeight = lineHeight,
textIndent = textIndent,
platformStyle = platformStyle?.paragraphStyle,
- lineHeightStyle = lineHeightStyle
+ lineHeightStyle = lineHeightStyle,
+ lineBreak = lineBreak
),
platformStyle = platformStyle
)
@@ -388,6 +486,7 @@
@Stable
operator fun plus(other: SpanStyle): TextStyle = this.merge(other)
+ @OptIn(ExperimentalTextApi::class)
fun copy(
color: Color = this.spanStyle.color,
fontSize: TextUnit = this.spanStyle.fontSize,
@@ -436,12 +535,15 @@
lineHeight = lineHeight,
textIndent = textIndent,
platformStyle = this.paragraphStyle.platformStyle,
- lineHeightStyle = this.lineHeightStyle
+ lineHeightStyle = this.lineHeightStyle,
+ lineBreak = this.lineBreak
),
platformStyle = this.platformStyle
)
}
+ // TODO(b/245939557): Deprecate this when LineBreak is stable
+ @OptIn(ExperimentalTextApi::class)
fun copy(
color: Color = this.spanStyle.color,
fontSize: TextUnit = this.spanStyle.fontSize,
@@ -492,7 +594,67 @@
lineHeight = lineHeight,
textIndent = textIndent,
platformStyle = platformStyle?.paragraphStyle,
- lineHeightStyle = lineHeightStyle
+ lineHeightStyle = lineHeightStyle,
+ lineBreak = this.lineBreak
+ ),
+ platformStyle = platformStyle
+ )
+ }
+
+ @ExperimentalTextApi
+ fun copy(
+ color: Color = this.spanStyle.color,
+ fontSize: TextUnit = this.spanStyle.fontSize,
+ fontWeight: FontWeight? = this.spanStyle.fontWeight,
+ fontStyle: FontStyle? = this.spanStyle.fontStyle,
+ fontSynthesis: FontSynthesis? = this.spanStyle.fontSynthesis,
+ fontFamily: FontFamily? = this.spanStyle.fontFamily,
+ fontFeatureSettings: String? = this.spanStyle.fontFeatureSettings,
+ letterSpacing: TextUnit = this.spanStyle.letterSpacing,
+ baselineShift: BaselineShift? = this.spanStyle.baselineShift,
+ textGeometricTransform: TextGeometricTransform? = this.spanStyle.textGeometricTransform,
+ localeList: LocaleList? = this.spanStyle.localeList,
+ background: Color = this.spanStyle.background,
+ textDecoration: TextDecoration? = this.spanStyle.textDecoration,
+ shadow: Shadow? = this.spanStyle.shadow,
+ textAlign: TextAlign? = this.paragraphStyle.textAlign,
+ textDirection: TextDirection? = this.paragraphStyle.textDirection,
+ lineHeight: TextUnit = this.paragraphStyle.lineHeight,
+ textIndent: TextIndent? = this.paragraphStyle.textIndent,
+ platformStyle: PlatformTextStyle? = this.platformStyle,
+ lineHeightStyle: LineHeightStyle? = this.paragraphStyle.lineHeightStyle,
+ lineBreak: LineBreak? = this.paragraphStyle.lineBreak
+ ): TextStyle {
+ return TextStyle(
+ spanStyle = SpanStyle(
+ textForegroundStyle = if (color == this.spanStyle.color) {
+ spanStyle.textForegroundStyle
+ } else {
+ TextForegroundStyle.from(color)
+ },
+ fontSize = fontSize,
+ fontWeight = fontWeight,
+ fontStyle = fontStyle,
+ fontSynthesis = fontSynthesis,
+ fontFamily = fontFamily,
+ fontFeatureSettings = fontFeatureSettings,
+ letterSpacing = letterSpacing,
+ baselineShift = baselineShift,
+ textGeometricTransform = textGeometricTransform,
+ localeList = localeList,
+ background = background,
+ textDecoration = textDecoration,
+ shadow = shadow,
+ platformStyle = platformStyle?.spanStyle
+ ),
+ paragraphStyle = ParagraphStyle(
+ textAlign = textAlign,
+ textDirection = textDirection,
+ lineHeight = lineHeight,
+ textIndent = textIndent,
+ platformStyle = platformStyle?.paragraphStyle,
+ lineHeightStyle = lineHeightStyle,
+ lineBreak = lineBreak
),
platformStyle = platformStyle
)
@@ -520,7 +682,8 @@
lineHeight: TextUnit = this.paragraphStyle.lineHeight,
textIndent: TextIndent? = this.paragraphStyle.textIndent,
platformStyle: PlatformTextStyle? = this.platformStyle,
- lineHeightStyle: LineHeightStyle? = this.paragraphStyle.lineHeightStyle
+ lineHeightStyle: LineHeightStyle? = this.paragraphStyle.lineHeightStyle,
+ lineBreak: LineBreak? = this.paragraphStyle.lineBreak
): TextStyle {
return TextStyle(
spanStyle = SpanStyle(
@@ -547,7 +710,8 @@
lineHeight = lineHeight,
textIndent = textIndent,
platformStyle = platformStyle?.paragraphStyle,
- lineHeightStyle = lineHeightStyle
+ lineHeightStyle = lineHeightStyle,
+ lineBreak = lineBreak
),
platformStyle = platformStyle
)
@@ -677,6 +841,14 @@
*/
val lineHeightStyle: LineHeightStyle? get() = this.paragraphStyle.lineHeightStyle
+ /**
+ * The line breaking configuration of the paragraph.
+ */
+ @ExperimentalTextApi
+ @Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
+ @get:ExperimentalTextApi
+ val lineBreak: LineBreak? get() = this.paragraphStyle.lineBreak
+
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other !is TextStyle) return false
@@ -742,8 +914,9 @@
"textDirection=$textDirection, " +
"lineHeight=$lineHeight, " +
"textIndent=$textIndent, " +
- "platformStyle=$platformStyle" +
- "lineHeightStyle=$lineHeightStyle" +
+ "platformStyle=$platformStyle, " +
+ "lineHeightStyle=$lineHeightStyle, " +
+ "lineBreak=$lineBreak" +
")"
}
diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/LineBreak.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/LineBreak.kt
new file mode 100644
index 0000000..337f6af9
--- /dev/null
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/LineBreak.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.ui.text.style
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.text.ExperimentalTextApi
+
+/**
+ * When soft wrap is enabled and the width of the text exceeds the width of its container,
+ * line breaks are inserted in the text to split it over multiple lines.
+ *
+ * There are a number of parameters that affect how the line breaks are inserted.
+ * For example, the breaking algorithm can be changed to one with improved readability
+ * at the cost of speed.
+ * Another example is the strictness, which in some languages determines which symbols can appear
+ * at the start of a line.
+ *
+ * `LineBreak` represents a configuration for line breaking, offering several presets
+ * for different use cases: [Simple], [Heading], [Paragraph].
+ *
+ * @sample androidx.compose.ui.text.samples.LineBreakSample
+ *
+ * For further customization, each platform has its own parameters. An example on Android:
+ *
+ * @sample androidx.compose.ui.text.samples.AndroidLineBreakSample
+ */
+@ExperimentalTextApi
+@Immutable
+expect class LineBreak {
+ companion object {
+ /**
+ * Basic, fast line breaking. Ideal for text input fields, as it will cause minimal
+ * text reflow when editing.
+ */
+ val Simple: LineBreak
+
+ /**
+ * Looser breaking rules, suitable for short text such as titles or narrow newspaper
+ * columns. For longer lines of text, use [Paragraph] for improved readability.
+ */
+ val Heading: LineBreak
+
+ /**
+ * Slower, higher quality line breaking for improved readability.
+ * Suitable for larger amounts of text.
+ */
+ val Paragraph: LineBreak
+ }
+}
\ No newline at end of file
diff --git a/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/style/LineBreak.skiko.kt b/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/style/LineBreak.skiko.kt
new file mode 100644
index 0000000..21b4e2c
--- /dev/null
+++ b/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/style/LineBreak.skiko.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.ui.text.style
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.text.ExperimentalTextApi
+
+@Immutable
+@ExperimentalTextApi
+actual class LineBreak private constructor() {
+ actual companion object {
+ actual val Simple: LineBreak = LineBreak()
+
+ actual val Heading: LineBreak = LineBreak()
+
+ actual val Paragraph: LineBreak = LineBreak()
+ }
+}
\ No newline at end of file
diff --git a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/ParagraphStyleTest.kt b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/ParagraphStyleTest.kt
index 23888e3..7778d33 100644
--- a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/ParagraphStyleTest.kt
+++ b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/ParagraphStyleTest.kt
@@ -16,6 +16,7 @@
package androidx.compose.ui.text
+import androidx.compose.ui.text.style.LineBreak
import androidx.compose.ui.text.style.LineHeightStyle
import androidx.compose.ui.text.style.LineHeightStyle.Trim
import androidx.compose.ui.text.style.LineHeightStyle.Alignment
@@ -163,6 +164,50 @@
@OptIn(ExperimentalTextApi::class)
@Test
+ fun `merge null with non-null lineBreak uses other's lineBreak`() {
+ val style = ParagraphStyle(lineBreak = null)
+ val otherStyle = ParagraphStyle(lineBreak = LineBreak.Heading)
+
+ val mergedStyle = style.merge(otherStyle)
+
+ assertThat(mergedStyle.lineBreak).isEqualTo(otherStyle.lineBreak)
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `merge non-null with null lineBreak returns original's lineBreak`() {
+ val style = ParagraphStyle(lineBreak = LineBreak.Paragraph)
+ val otherStyle = ParagraphStyle(lineBreak = null)
+
+ val mergedStyle = style.merge(otherStyle)
+
+ assertThat(mergedStyle.lineBreak).isEqualTo(style.lineBreak)
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `merge null with null lineBreak returns null`() {
+ val style = ParagraphStyle(lineBreak = null)
+ val otherStyle = ParagraphStyle(lineBreak = null)
+
+ val mergedStyle = style.merge(otherStyle)
+
+ assertThat(mergedStyle.lineBreak).isEqualTo(null)
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `merge non-null with non-null lineBreak returns other's lineBreak`() {
+ val style = ParagraphStyle(lineBreak = LineBreak.Paragraph)
+ val otherStyle = ParagraphStyle(lineBreak = LineBreak.Heading)
+
+ val mergedStyle = style.merge(otherStyle)
+
+ assertThat(mergedStyle.lineBreak).isEqualTo(otherStyle.lineBreak)
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
fun `merge null platformStyles`() {
val style1 = ParagraphStyle(platformStyle = null)
val style2 = ParagraphStyle(platformStyle = null)
@@ -377,6 +422,50 @@
@OptIn(ExperimentalTextApi::class)
@Test
+ fun `lerp with non-null start, null end, closer to start has non-null lineBreak`() {
+ val style = ParagraphStyle(lineBreak = LineBreak.Heading)
+ val otherStyle = ParagraphStyle(lineHeightStyle = null)
+
+ val lerpedStyle = lerp(start = style, stop = otherStyle, fraction = 0.4f)
+
+ assertThat(lerpedStyle.lineBreak).isSameInstanceAs(style.lineBreak)
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `lerp with non-null start, null end, closer to end has null lineBreak`() {
+ val style = ParagraphStyle(lineBreak = LineBreak.Heading)
+ val otherStyle = ParagraphStyle(lineHeightStyle = null)
+
+ val lerpedStyle = lerp(start = style, stop = otherStyle, fraction = 0.6f)
+
+ assertThat(lerpedStyle.lineBreak).isNull()
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `lerp with null start, non-null end, closer to start has null lineBreak`() {
+ val style = ParagraphStyle(lineHeightStyle = null)
+ val otherStyle = ParagraphStyle(lineBreak = LineBreak.Heading)
+
+ val lerpedStyle = lerp(start = style, stop = otherStyle, fraction = 0.4f)
+
+ assertThat(lerpedStyle.lineBreak).isNull()
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `lerp with null start, non-null end, closer to end has non-null lineBreak`() {
+ val style = ParagraphStyle(lineBreak = null)
+ val otherStyle = ParagraphStyle(lineBreak = LineBreak.Heading)
+
+ val lerpedStyle = lerp(start = style, stop = otherStyle, fraction = 0.6f)
+
+ assertThat(lerpedStyle.lineBreak).isSameInstanceAs(otherStyle.lineBreak)
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
fun `equals return false for different line height behavior`() {
val style = ParagraphStyle(lineHeightStyle = null)
val otherStyle = ParagraphStyle(lineHeightStyle = LineHeightStyle.Default)
@@ -514,4 +603,40 @@
assertThat(style.lineHeightStyle).isNull()
}
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `copy with lineBreak returns new lineBreak`() {
+ val style = ParagraphStyle(lineBreak = LineBreak.Paragraph)
+ val newStyle = style.copy(lineBreak = LineBreak.Heading)
+
+ assertThat(newStyle.lineBreak).isEqualTo(LineBreak.Heading)
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `copy without lineBreak uses existing lineBreak`() {
+ val style = ParagraphStyle(lineBreak = LineBreak.Paragraph)
+ val newStyle = style.copy()
+
+ assertThat(newStyle.lineBreak).isEqualTo(style.lineBreak)
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `hashCode is same for same lineBreak`() {
+ val style = ParagraphStyle(lineBreak = LineBreak.Paragraph)
+ val otherStyle = ParagraphStyle(lineBreak = LineBreak.Paragraph)
+
+ assertThat(style.hashCode()).isEqualTo(otherStyle.hashCode())
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `hashCode is different for different lineBreak`() {
+ val style = ParagraphStyle(lineBreak = LineBreak.Paragraph)
+ val otherStyle = ParagraphStyle(lineBreak = LineBreak.Heading)
+
+ assertThat(style.hashCode()).isNotEqualTo(otherStyle.hashCode())
+ }
}
diff --git a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleLayoutAttributesTest.kt b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleLayoutAttributesTest.kt
index d7b1aae..3b12bd3 100644
--- a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleLayoutAttributesTest.kt
+++ b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleLayoutAttributesTest.kt
@@ -25,6 +25,7 @@
import androidx.compose.ui.text.font.FontSynthesis
import androidx.compose.ui.text.intl.LocaleList
import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.LineBreak
import androidx.compose.ui.text.style.LineHeightStyle
import androidx.compose.ui.text.style.LineHeightStyle.Trim
import androidx.compose.ui.text.style.LineHeightStyle.Alignment
@@ -328,6 +329,21 @@
).isFalse()
}
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun returns_false_for_lineBreak_change() {
+ val style = TextStyle(
+ lineBreak = LineBreak.Heading
+ )
+ assertThat(
+ style.hasSameLayoutAffectingAttributes(
+ TextStyle(
+ lineBreak = LineBreak.Paragraph
+ )
+ )
+ ).isFalse()
+ }
+
@Test
fun should_be_updated_when_a_new_attribute_is_added_to_TextStyle() {
// TextLayoutHelper TextStyle.hasSameLayoutAffectingAttributes is very easy to forget
@@ -360,7 +376,8 @@
// ui-text/../androidx/compose/ui/text/TextSpanParagraphStyleTest.kt
getProperty("paragraphStyle"),
getProperty("spanStyle"),
- getProperty("lineHeightStyle")
+ getProperty("lineHeightStyle"),
+ getProperty("lineBreak")
)
val textStyleProperties = TextStyle::class.memberProperties.map { Property(it) }
diff --git a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleResolveDefaultsTest.kt b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleResolveDefaultsTest.kt
index 0e5d80f..a773e49 100644
--- a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleResolveDefaultsTest.kt
+++ b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleResolveDefaultsTest.kt
@@ -25,6 +25,7 @@
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.intl.LocaleList
import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.LineBreak
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.text.style.TextDirection
@@ -72,6 +73,7 @@
assertThat(it.lineHeight).isEqualTo(DefaultLineHeight)
assertThat(it.textIndent).isEqualTo(TextIndent.None)
assertThat(it.platformStyle).isNull()
+ assertThat(it.lineBreak).isEqualTo(LineBreak.Simple)
}
}
@@ -271,6 +273,17 @@
).isEqualTo(TextIndent(12.sp, 13.sp))
}
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun test_use_provided_values_lineBreak() {
+ assertThat(
+ resolveDefaults(
+ TextStyle(lineBreak = LineBreak.Heading),
+ direction = LayoutDirection.Ltr
+ ).lineBreak
+ ).isEqualTo(LineBreak.Heading)
+ }
+
@Test
fun test_use_provided_values_textDirection_with_LTR_layoutDirection() {
assertThat(
diff --git a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleTest.kt b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleTest.kt
index bd0599d..6b5a98f 100644
--- a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleTest.kt
+++ b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleTest.kt
@@ -29,6 +29,7 @@
import androidx.compose.ui.text.font.lerp
import androidx.compose.ui.text.intl.LocaleList
import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.LineBreak
import androidx.compose.ui.text.style.LineHeightStyle
import androidx.compose.ui.text.style.LineHeightStyle.Trim
import androidx.compose.ui.text.style.LineHeightStyle.Alignment
@@ -66,6 +67,7 @@
assertThat(style.textDecoration).isNull()
assertThat(style.fontFamily).isNull()
assertThat(style.platformStyle).isNull()
+ assertThat(style.lineBreak).isNull()
}
@OptIn(ExperimentalTextApi::class)
@@ -150,6 +152,26 @@
}
}
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `copy with lineBreak returns new lineBreak`() {
+ val style = TextStyle(lineBreak = LineBreak.Paragraph)
+
+ val newStyle = style.copy(lineBreak = LineBreak.Heading)
+
+ assertThat(newStyle.lineBreak).isEqualTo(LineBreak.Heading)
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `copy without lineBreak uses existing lineBreak`() {
+ val style = TextStyle(lineBreak = LineBreak.Paragraph)
+
+ val newStyle = style.copy()
+
+ assertThat(newStyle.lineBreak).isEqualTo(style.lineBreak)
+ }
+
@Test
fun `constructor with customized color`() {
val color = Color.Red
@@ -251,6 +273,14 @@
assertThat(style.fontFamily).isEqualTo(fontFamily)
}
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `constructor with customized lineBreak`() {
+ val style = TextStyle(lineBreak = LineBreak.Heading)
+
+ assertThat(style.lineBreak).isEqualTo(LineBreak.Heading)
+ }
+
@Test
fun `merge with empty other should return this`() {
val style = TextStyle()
@@ -669,6 +699,50 @@
assertThat(mergedStyle.alpha).isEqualTo(0.3f)
}
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `merge null and non-null lineBreak uses other's lineBreak`() {
+ val style = TextStyle(lineBreak = null)
+ val otherStyle = TextStyle(lineBreak = LineBreak.Heading)
+
+ val mergedStyle = style.merge(otherStyle)
+
+ assertThat(mergedStyle.lineBreak).isEqualTo(otherStyle.lineBreak)
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `merge non-null and null lineBreak uses original`() {
+ val style = TextStyle(lineBreak = LineBreak.Paragraph)
+ val otherStyle = TextStyle(lineBreak = null)
+
+ val mergedStyle = style.merge(otherStyle)
+
+ assertThat(mergedStyle.lineBreak).isEqualTo(style.lineBreak)
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `merge with both null lineBreak uses null`() {
+ val style = TextStyle(lineBreak = null)
+ val otherStyle = TextStyle(lineBreak = null)
+
+ val mergedStyle = style.merge(otherStyle)
+
+ assertThat(mergedStyle.lineBreak).isEqualTo(null)
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `merge with both non-null lineBreak uses other's lineBreak`() {
+ val style = TextStyle(lineBreak = LineBreak.Paragraph)
+ val otherStyle = TextStyle(lineBreak = LineBreak.Heading)
+
+ val mergedStyle = style.merge(otherStyle)
+
+ assertThat(mergedStyle.lineBreak).isEqualTo(otherStyle.lineBreak)
+ }
+
@Test
fun `plus operator merges other TextStyle`() {
val style = TextStyle(
@@ -1210,6 +1284,50 @@
assertThat(newStyle.color).isEqualTo(Color.Unspecified)
}
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `lerp with non-null start, null end, closer to start has non-null lineBreak`() {
+ val style = TextStyle(lineBreak = LineBreak.Heading)
+ val otherStyle = TextStyle(lineHeightStyle = null)
+
+ val lerpedStyle = lerp(start = style, stop = otherStyle, fraction = 0.4f)
+
+ assertThat(lerpedStyle.lineBreak).isSameInstanceAs(style.lineBreak)
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `lerp with non-null start, null end, closer to end has null lineBreak`() {
+ val style = TextStyle(lineBreak = LineBreak.Heading)
+ val otherStyle = TextStyle(lineHeightStyle = null)
+
+ val lerpedStyle = lerp(start = style, stop = otherStyle, fraction = 0.6f)
+
+ assertThat(lerpedStyle.lineBreak).isNull()
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `lerp with null start, non-null end, closer to start has null lineBreak`() {
+ val style = TextStyle(lineHeightStyle = null)
+ val otherStyle = TextStyle(lineBreak = LineBreak.Heading)
+
+ val lerpedStyle = lerp(start = style, stop = otherStyle, fraction = 0.4f)
+
+ assertThat(lerpedStyle.lineBreak).isNull()
+ }
+
+ @OptIn(ExperimentalTextApi::class)
+ @Test
+ fun `lerp with null start, non-null end, closer to end has non-null lineBreak`() {
+ val style = TextStyle(lineBreak = null)
+ val otherStyle = TextStyle(lineBreak = LineBreak.Heading)
+
+ val lerpedStyle = lerp(start = style, stop = otherStyle, fraction = 0.6f)
+
+ assertThat(lerpedStyle.lineBreak).isSameInstanceAs(otherStyle.lineBreak)
+ }
+
@Test
fun `toSpanStyle return attributes with correct values`() {
val color = Color.Red
@@ -1330,13 +1448,19 @@
alignment = Alignment.Center,
trim = Trim.None
)
+ val lineBreak = LineBreak(
+ strategy = LineBreak.Strategy.Balanced,
+ strictness = LineBreak.Strictness.Strict,
+ wordBreak = LineBreak.WordBreak.Phrase
+ )
val style = TextStyle(
textAlign = textAlign,
textDirection = textDirection,
lineHeight = lineHeight,
textIndent = textIndent,
- lineHeightStyle = lineHeightStyle
+ lineHeightStyle = lineHeightStyle,
+ lineBreak = lineBreak
)
assertThat(style.toParagraphStyle()).isEqualTo(
@@ -1345,7 +1469,8 @@
textDirection = textDirection,
lineHeight = lineHeight,
textIndent = textIndent,
- lineHeightStyle = lineHeightStyle
+ lineHeightStyle = lineHeightStyle,
+ lineBreak = lineBreak
)
)
}
diff --git a/text/text/src/main/java/androidx/compose/ui/text/android/LayoutCompat.kt b/text/text/src/main/java/androidx/compose/ui/text/android/LayoutCompat.kt
index 92d10dc..8086ac4 100644
--- a/text/text/src/main/java/androidx/compose/ui/text/android/LayoutCompat.kt
+++ b/text/text/src/main/java/androidx/compose/ui/text/android/LayoutCompat.kt
@@ -16,6 +16,7 @@
package androidx.compose.ui.text.android
+import android.graphics.text.LineBreakConfig
import android.graphics.text.LineBreaker
import android.text.Layout
import android.text.Layout.Alignment
@@ -79,6 +80,30 @@
)
internal annotation class BreakStrategy
+ const val LINE_BREAK_STYLE_NONE = LineBreakConfig.LINE_BREAK_STYLE_NONE
+ const val LINE_BREAK_STYLE_LOOSE = LineBreakConfig.LINE_BREAK_STYLE_LOOSE
+ const val LINE_BREAK_STYLE_NORMAL = LineBreakConfig.LINE_BREAK_STYLE_NORMAL
+ const val LINE_BREAK_STYLE_STRICT = LineBreakConfig.LINE_BREAK_STYLE_STRICT
+
+ @Retention(AnnotationRetention.SOURCE)
+ @IntDef(
+ LINE_BREAK_STYLE_NONE,
+ LINE_BREAK_STYLE_LOOSE,
+ LINE_BREAK_STYLE_NORMAL,
+ LINE_BREAK_STYLE_STRICT
+ )
+ internal annotation class LineBreakStyle
+
+ const val LINE_BREAK_WORD_STYLE_NONE = LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE
+ const val LINE_BREAK_WORD_STYLE_PHRASE = LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE
+
+ @Retention(AnnotationRetention.SOURCE)
+ @IntDef(
+ LINE_BREAK_WORD_STYLE_NONE,
+ LINE_BREAK_WORD_STYLE_PHRASE
+ )
+ internal annotation class LineBreakWordStyle
+
const val TEXT_DIRECTION_LTR = 0
const val TEXT_DIRECTION_RTL = 1
const val TEXT_DIRECTION_FIRST_STRONG_LTR = 2
@@ -111,6 +136,10 @@
internal const val DEFAULT_BREAK_STRATEGY = BREAK_STRATEGY_SIMPLE
+ internal const val DEFAULT_LINE_BREAK_STYLE = LINE_BREAK_STYLE_NONE
+
+ internal const val DEFAULT_LINE_BREAK_WORD_STYLE = LINE_BREAK_WORD_STYLE_NONE
+
internal const val DEFAULT_HYPHENATION_FREQUENCY = HYPHENATION_FREQUENCY_NONE
const val DEFAULT_JUSTIFICATION_MODE = JUSTIFICATION_MODE_NONE
diff --git a/text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt b/text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt
index 53d17d4..821635c 100644
--- a/text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt
+++ b/text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt
@@ -15,6 +15,7 @@
*/
package androidx.compose.ui.text.android
+import android.graphics.text.LineBreakConfig
import android.os.Build
import android.text.Layout.Alignment
import android.text.StaticLayout
@@ -30,6 +31,8 @@
import androidx.compose.ui.text.android.LayoutCompat.BreakStrategy
import androidx.compose.ui.text.android.LayoutCompat.HyphenationFrequency
import androidx.compose.ui.text.android.LayoutCompat.JustificationMode
+import androidx.compose.ui.text.android.LayoutCompat.LineBreakStyle
+import androidx.compose.ui.text.android.LayoutCompat.LineBreakWordStyle
import androidx.core.os.BuildCompat
import java.lang.reflect.Constructor
import java.lang.reflect.InvocationTargetException
@@ -70,6 +73,10 @@
useFallbackLineSpacing: Boolean = LayoutCompat.DEFAULT_FALLBACK_LINE_SPACING,
@BreakStrategy
breakStrategy: Int = LayoutCompat.DEFAULT_BREAK_STRATEGY,
+ @LineBreakStyle
+ lineBreakStyle: Int = LayoutCompat.DEFAULT_LINE_BREAK_STYLE,
+ @LineBreakWordStyle
+ lineBreakWordStyle: Int = LayoutCompat.DEFAULT_LINE_BREAK_WORD_STYLE,
@HyphenationFrequency
hyphenationFrequency: Int = LayoutCompat.DEFAULT_HYPHENATION_FREQUENCY,
leftIndents: IntArray? = null,
@@ -93,6 +100,8 @@
includePadding = includePadding,
useFallbackLineSpacing = useFallbackLineSpacing,
breakStrategy = breakStrategy,
+ lineBreakStyle = lineBreakStyle,
+ lineBreakWordStyle = lineBreakWordStyle,
hyphenationFrequency = hyphenationFrequency,
leftIndents = leftIndents,
rightIndents = rightIndents
@@ -133,6 +142,8 @@
val includePadding: Boolean,
val useFallbackLineSpacing: Boolean,
val breakStrategy: Int,
+ val lineBreakStyle: Int,
+ val lineBreakWordStyle: Int,
val hyphenationFrequency: Int,
val leftIndents: IntArray?,
val rightIndents: IntArray?
@@ -181,6 +192,13 @@
params.useFallbackLineSpacing
)
}
+ if (Build.VERSION.SDK_INT >= 33) {
+ StaticLayoutFactory33.setLineBreakConfig(
+ this,
+ params.lineBreakStyle,
+ params.lineBreakWordStyle
+ )
+ }
}.build()
}
@@ -224,6 +242,17 @@
fun isFallbackLineSpacingEnabled(layout: StaticLayout): Boolean {
return layout.isFallbackLineSpacingEnabled
}
+
+ @JvmStatic
+ @DoNotInline
+ fun setLineBreakConfig(builder: Builder, lineBreakStyle: Int, lineBreakWordStyle: Int) {
+ val lineBreakConfig =
+ LineBreakConfig.Builder()
+ .setLineBreakStyle(lineBreakStyle)
+ .setLineBreakWordStyle(lineBreakWordStyle)
+ .build()
+ builder.setLineBreakConfig(lineBreakConfig)
+ }
}
private class StaticLayoutFactoryDefault : StaticLayoutFactoryImpl {
diff --git a/text/text/src/main/java/androidx/compose/ui/text/android/TextLayout.kt b/text/text/src/main/java/androidx/compose/ui/text/android/TextLayout.kt
index 1a98308..eb3382b 100644
--- a/text/text/src/main/java/androidx/compose/ui/text/android/TextLayout.kt
+++ b/text/text/src/main/java/androidx/compose/ui/text/android/TextLayout.kt
@@ -37,6 +37,8 @@
import androidx.compose.ui.text.android.LayoutCompat.ALIGN_OPPOSITE
import androidx.compose.ui.text.android.LayoutCompat.ALIGN_RIGHT
import androidx.compose.ui.text.android.LayoutCompat.BreakStrategy
+import androidx.compose.ui.text.android.LayoutCompat.LineBreakStyle
+import androidx.compose.ui.text.android.LayoutCompat.LineBreakWordStyle
import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_ALIGNMENT
import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_BREAK_STRATEGY
import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_HYPHENATION_FREQUENCY
@@ -44,6 +46,8 @@
import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_JUSTIFICATION_MODE
import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_LINESPACING_EXTRA
import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_LINESPACING_MULTIPLIER
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_LINE_BREAK_STYLE
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_LINE_BREAK_WORD_STYLE
import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_TEXT_DIRECTION
import androidx.compose.ui.text.android.LayoutCompat.HyphenationFrequency
import androidx.compose.ui.text.android.LayoutCompat.JustificationMode
@@ -115,6 +119,8 @@
val fallbackLineSpacing: Boolean = true,
maxLines: Int = Int.MAX_VALUE,
@BreakStrategy breakStrategy: Int = DEFAULT_BREAK_STRATEGY,
+ @LineBreakStyle lineBreakStyle: Int = DEFAULT_LINE_BREAK_STYLE,
+ @LineBreakWordStyle lineBreakWordStyle: Int = DEFAULT_LINE_BREAK_WORD_STYLE,
@HyphenationFrequency hyphenationFrequency: Int = DEFAULT_HYPHENATION_FREQUENCY,
@JustificationMode justificationMode: Int = DEFAULT_JUSTIFICATION_MODE,
leftIndents: IntArray? = null,
@@ -260,6 +266,8 @@
includePadding = includePadding,
useFallbackLineSpacing = fallbackLineSpacing,
breakStrategy = breakStrategy,
+ lineBreakStyle = lineBreakStyle,
+ lineBreakWordStyle = lineBreakWordStyle,
hyphenationFrequency = hyphenationFrequency,
leftIndents = leftIndents,
rightIndents = rightIndents
