File tree 2 files changed +10
-5
lines changed
compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text
text/text/src/main/java/androidx/compose/ui/text/android
2 files changed +10
-5
lines changed Original file line number Diff line number Diff line change @@ -50,8 +50,8 @@ import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_BREAK_STRATEGY
50
50
import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_JUSTIFICATION_MODE
51
51
import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_LINESPACING_MULTIPLIER
52
52
import androidx.compose.ui.text.android.LayoutCompat.HYPHENATION_FREQUENCY_NONE
53
- import androidx.compose.ui.text.android.LayoutCompat.HYPHENATION_FREQUENCY_NORMAL
54
- import androidx.compose.ui.text.android.LayoutCompat.HYPHENATION_FREQUENCY_NORMAL_FAST
53
+ import androidx.compose.ui.text.android.LayoutCompat.HYPHENATION_FREQUENCY_FULL
54
+ import androidx.compose.ui.text.android.LayoutCompat.HYPHENATION_FREQUENCY_FULL_FAST
55
55
import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_LINE_BREAK_STYLE
56
56
import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_LINE_BREAK_WORD_STYLE
57
57
import androidx.compose.ui.text.android.LayoutCompat.JUSTIFICATION_MODE_INTER_WORD
@@ -562,9 +562,9 @@ private fun toLayoutAlign(align: TextAlign?): Int = when (align) {
562
562
@OptIn(InternalPlatformTextApi ::class )
563
563
private fun toLayoutHyphenationFrequency (hyphens : Hyphens ? ): Int = when (hyphens) {
564
564
Hyphens .Auto -> if (Build .VERSION .SDK_INT <= 32 ) {
565
- HYPHENATION_FREQUENCY_NORMAL
565
+ HYPHENATION_FREQUENCY_FULL
566
566
} else {
567
- HYPHENATION_FREQUENCY_NORMAL_FAST
567
+ HYPHENATION_FREQUENCY_FULL_FAST
568
568
}
569
569
Hyphens .None -> HYPHENATION_FREQUENCY_NONE
570
570
else -> DEFAULT_HYPHENATION_FREQUENCY
Original file line number Diff line number Diff line change @@ -59,12 +59,17 @@ internal object LayoutCompat {
59
59
const val HYPHENATION_FREQUENCY_NONE = Layout .HYPHENATION_FREQUENCY_NONE
60
60
const val HYPHENATION_FREQUENCY_NORMAL = Layout .HYPHENATION_FREQUENCY_NORMAL
61
61
const val HYPHENATION_FREQUENCY_NORMAL_FAST = Layout .HYPHENATION_FREQUENCY_NORMAL_FAST
62
+ const val HYPHENATION_FREQUENCY_FULL = Layout .HYPHENATION_FREQUENCY_FULL
63
+ const val HYPHENATION_FREQUENCY_FULL_FAST = Layout .HYPHENATION_FREQUENCY_FULL_FAST
62
64
63
65
@Retention(AnnotationRetention .SOURCE )
64
66
@IntDef(
67
+ HYPHENATION_FREQUENCY_NONE ,
65
68
HYPHENATION_FREQUENCY_NORMAL ,
66
69
HYPHENATION_FREQUENCY_NORMAL_FAST ,
67
- HYPHENATION_FREQUENCY_NONE
70
+ HYPHENATION_FREQUENCY_FULL ,
71
+ HYPHENATION_FREQUENCY_FULL_FAST
72
+
68
73
)
69
74
internal annotation class HyphenationFrequency
70
75
You can’t perform that action at this time.
0 commit comments