Skip to content

Commit 2d23747

Browse files
Haoyu ZhangGerrit Code Review
Haoyu Zhang
authored and
Gerrit Code Review
committed
Merge "Convert TextAlign, FontSynthesis and TextDirection to inline class" into androidx-main
2 parents f03f258 + 15d22fc commit 2d23747

File tree

15 files changed

+665
-242
lines changed

15 files changed

+665
-242
lines changed

‎compose/ui/ui-text/api/1.0.0-beta09.txt

Lines changed: 67 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ package androidx.compose.ui.text {
206206
method public androidx.compose.ui.text.ParagraphStyle copy-QrGfzA0(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);
207207
method public operator boolean equals(Object? other);
208208
method public long getLineHeight-XSAIIZE();
209-
method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
210-
method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
209+
method public androidx.compose.ui.text.style.TextAlign? getTextAlign-buA522U();
210+
method public androidx.compose.ui.text.style.TextDirection? getTextDirection-mmuk1to();
211211
method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
212212
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle merge(optional androidx.compose.ui.text.ParagraphStyle? other);
213213
method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
@@ -271,7 +271,7 @@ package androidx.compose.ui.text {
271271
method public String? getFontFeatureSettings();
272272
method public long getFontSize-XSAIIZE();
273273
method public androidx.compose.ui.text.font.FontStyle? getFontStyle-4Lr2A7w();
274-
method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
274+
method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis-ZQGJjVo();
275275
method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
276276
method public long getLetterSpacing-XSAIIZE();
277277
method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
@@ -429,15 +429,15 @@ package androidx.compose.ui.text {
429429
method public String? getFontFeatureSettings();
430430
method public long getFontSize-XSAIIZE();
431431
method public androidx.compose.ui.text.font.FontStyle? getFontStyle-4Lr2A7w();
432-
method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
432+
method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis-ZQGJjVo();
433433
method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
434434
method public long getLetterSpacing-XSAIIZE();
435435
method public long getLineHeight-XSAIIZE();
436436
method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
437437
method public androidx.compose.ui.graphics.Shadow? getShadow();
438-
method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
438+
method public androidx.compose.ui.text.style.TextAlign? getTextAlign-buA522U();
439439
method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
440-
method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
440+
method public androidx.compose.ui.text.style.TextDirection? getTextDirection-mmuk1to();
441441
method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
442442
method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
443443
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(optional androidx.compose.ui.text.TextStyle? other);
@@ -613,11 +613,24 @@ package androidx.compose.ui.text.font {
613613
property public final int Normal;
614614
}
615615

616-
public enum FontSynthesis {
617-
enum_constant public static final androidx.compose.ui.text.font.FontSynthesis All;
618-
enum_constant public static final androidx.compose.ui.text.font.FontSynthesis None;
619-
enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Style;
620-
enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Weight;
616+
public final inline class FontSynthesis {
617+
ctor public FontSynthesis();
618+
method public static inline boolean equals-impl(int p, Object? p1);
619+
method public static boolean equals-impl0(int p1, int p2);
620+
method public static inline int hashCode-impl(int p);
621+
method public static String toString-impl(int $this);
622+
field public static final androidx.compose.ui.text.font.FontSynthesis.Companion Companion;
623+
}
624+
625+
public static final class FontSynthesis.Companion {
626+
method public int getAll-GVVA2EU();
627+
method public int getNone-GVVA2EU();
628+
method public int getStyle-GVVA2EU();
629+
method public int getWeight-GVVA2EU();
630+
property public final int All;
631+
property public final int None;
632+
property public final int Style;
633+
property public final int Weight;
621634
}
622635

623636
@androidx.compose.runtime.Immutable public final class FontWeight implements java.lang.Comparable<androidx.compose.ui.text.font.FontWeight> {
@@ -1120,13 +1133,29 @@ package androidx.compose.ui.text.style {
11201133
enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Rtl;
11211134
}
11221135

1123-
public enum TextAlign {
1124-
enum_constant public static final androidx.compose.ui.text.style.TextAlign Center;
1125-
enum_constant public static final androidx.compose.ui.text.style.TextAlign End;
1126-
enum_constant public static final androidx.compose.ui.text.style.TextAlign Justify;
1127-
enum_constant public static final androidx.compose.ui.text.style.TextAlign Left;
1128-
enum_constant public static final androidx.compose.ui.text.style.TextAlign Right;
1129-
enum_constant public static final androidx.compose.ui.text.style.TextAlign Start;
1136+
public final inline class TextAlign {
1137+
ctor public TextAlign();
1138+
method public static inline boolean equals-impl(int p, Object? p1);
1139+
method public static boolean equals-impl0(int p1, int p2);
1140+
method public static inline int hashCode-impl(int p);
1141+
method public static String toString-impl(int $this);
1142+
field public static final androidx.compose.ui.text.style.TextAlign.Companion Companion;
1143+
}
1144+
1145+
public static final class TextAlign.Companion {
1146+
method public int getCenter-e0LSkKk();
1147+
method public int getEnd-e0LSkKk();
1148+
method public int getJustify-e0LSkKk();
1149+
method public int getLeft-e0LSkKk();
1150+
method public int getRight-e0LSkKk();
1151+
method public int getStart-e0LSkKk();
1152+
method public java.util.List<androidx.compose.ui.text.style.TextAlign> values();
1153+
property public final int Center;
1154+
property public final int End;
1155+
property public final int Justify;
1156+
property public final int Left;
1157+
property public final int Right;
1158+
property public final int Start;
11301159
}
11311160

11321161
@androidx.compose.runtime.Immutable public final class TextDecoration {
@@ -1148,12 +1177,26 @@ package androidx.compose.ui.text.style {
11481177
property public final androidx.compose.ui.text.style.TextDecoration Underline;
11491178
}
11501179

1151-
public enum TextDirection {
1152-
enum_constant public static final androidx.compose.ui.text.style.TextDirection Content;
1153-
enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrLtr;
1154-
enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrRtl;
1155-
enum_constant public static final androidx.compose.ui.text.style.TextDirection Ltr;
1156-
enum_constant public static final androidx.compose.ui.text.style.TextDirection Rtl;
1180+
public final inline class TextDirection {
1181+
ctor public TextDirection();
1182+
method public static inline boolean equals-impl(int p, Object? p1);
1183+
method public static boolean equals-impl0(int p1, int p2);
1184+
method public static inline int hashCode-impl(int p);
1185+
method public static String toString-impl(int $this);
1186+
field public static final androidx.compose.ui.text.style.TextDirection.Companion Companion;
1187+
}
1188+
1189+
public static final class TextDirection.Companion {
1190+
method public int getContent-s_7X-co();
1191+
method public int getContentOrLtr-s_7X-co();
1192+
method public int getContentOrRtl-s_7X-co();
1193+
method public int getLtr-s_7X-co();
1194+
method public int getRtl-s_7X-co();
1195+
property public final int Content;
1196+
property public final int ContentOrLtr;
1197+
property public final int ContentOrRtl;
1198+
property public final int Ltr;
1199+
property public final int Rtl;
11571200
}
11581201

11591202
@androidx.compose.runtime.Immutable public final class TextGeometricTransform {

‎compose/ui/ui-text/api/current.ignore

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@ AddedAbstractMethod: androidx.compose.ui.text.font.Font#getStyle-_-LCdwA():
55

66
ChangedSuperclass: androidx.compose.ui.text.font.FontStyle:
77
Class androidx.compose.ui.text.font.FontStyle superclass changed from java.lang.Enum to java.lang.Object
8+
ChangedSuperclass: androidx.compose.ui.text.font.FontSynthesis:
9+
Class androidx.compose.ui.text.font.FontSynthesis superclass changed from java.lang.Enum to java.lang.Object
810
ChangedSuperclass: androidx.compose.ui.text.input.KeyboardCapitalization:
911
Class androidx.compose.ui.text.input.KeyboardCapitalization superclass changed from java.lang.Enum to java.lang.Object
12+
ChangedSuperclass: androidx.compose.ui.text.style.TextAlign:
13+
Class androidx.compose.ui.text.style.TextAlign superclass changed from java.lang.Enum to java.lang.Object
14+
ChangedSuperclass: androidx.compose.ui.text.style.TextDirection:
15+
Class androidx.compose.ui.text.style.TextDirection superclass changed from java.lang.Enum to java.lang.Object
1016
ChangedSuperclass: androidx.compose.ui.text.style.TextOverflow:
1117
Class androidx.compose.ui.text.style.TextOverflow superclass changed from java.lang.Enum to java.lang.Object
1218

@@ -25,6 +31,14 @@ RemovedField: androidx.compose.ui.text.font.FontStyle#Italic:
2531
Removed enum constant androidx.compose.ui.text.font.FontStyle.Italic
2632
RemovedField: androidx.compose.ui.text.font.FontStyle#Normal:
2733
Removed enum constant androidx.compose.ui.text.font.FontStyle.Normal
34+
RemovedField: androidx.compose.ui.text.font.FontSynthesis#All:
35+
Removed enum constant androidx.compose.ui.text.font.FontSynthesis.All
36+
RemovedField: androidx.compose.ui.text.font.FontSynthesis#None:
37+
Removed enum constant androidx.compose.ui.text.font.FontSynthesis.None
38+
RemovedField: androidx.compose.ui.text.font.FontSynthesis#Style:
39+
Removed enum constant androidx.compose.ui.text.font.FontSynthesis.Style
40+
RemovedField: androidx.compose.ui.text.font.FontSynthesis#Weight:
41+
Removed enum constant androidx.compose.ui.text.font.FontSynthesis.Weight
2842
RemovedField: androidx.compose.ui.text.input.KeyboardCapitalization#Characters:
2943
Removed enum constant androidx.compose.ui.text.input.KeyboardCapitalization.Characters
3044
RemovedField: androidx.compose.ui.text.input.KeyboardCapitalization#None:
@@ -33,6 +47,28 @@ RemovedField: androidx.compose.ui.text.input.KeyboardCapitalization#Sentences:
3347
Removed enum constant androidx.compose.ui.text.input.KeyboardCapitalization.Sentences
3448
RemovedField: androidx.compose.ui.text.input.KeyboardCapitalization#Words:
3549
Removed enum constant androidx.compose.ui.text.input.KeyboardCapitalization.Words
50+
RemovedField: androidx.compose.ui.text.style.TextAlign#Center:
51+
Removed enum constant androidx.compose.ui.text.style.TextAlign.Center
52+
RemovedField: androidx.compose.ui.text.style.TextAlign#End:
53+
Removed enum constant androidx.compose.ui.text.style.TextAlign.End
54+
RemovedField: androidx.compose.ui.text.style.TextAlign#Justify:
55+
Removed enum constant androidx.compose.ui.text.style.TextAlign.Justify
56+
RemovedField: androidx.compose.ui.text.style.TextAlign#Left:
57+
Removed enum constant androidx.compose.ui.text.style.TextAlign.Left
58+
RemovedField: androidx.compose.ui.text.style.TextAlign#Right:
59+
Removed enum constant androidx.compose.ui.text.style.TextAlign.Right
60+
RemovedField: androidx.compose.ui.text.style.TextAlign#Start:
61+
Removed enum constant androidx.compose.ui.text.style.TextAlign.Start
62+
RemovedField: androidx.compose.ui.text.style.TextDirection#Content:
63+
Removed enum constant androidx.compose.ui.text.style.TextDirection.Content
64+
RemovedField: androidx.compose.ui.text.style.TextDirection#ContentOrLtr:
65+
Removed enum constant androidx.compose.ui.text.style.TextDirection.ContentOrLtr
66+
RemovedField: androidx.compose.ui.text.style.TextDirection#ContentOrRtl:
67+
Removed enum constant androidx.compose.ui.text.style.TextDirection.ContentOrRtl
68+
RemovedField: androidx.compose.ui.text.style.TextDirection#Ltr:
69+
Removed enum constant androidx.compose.ui.text.style.TextDirection.Ltr
70+
RemovedField: androidx.compose.ui.text.style.TextDirection#Rtl:
71+
Removed enum constant androidx.compose.ui.text.style.TextDirection.Rtl
3672
RemovedField: androidx.compose.ui.text.style.TextOverflow#Clip:
3773
Removed enum constant androidx.compose.ui.text.style.TextOverflow.Clip
3874
RemovedField: androidx.compose.ui.text.style.TextOverflow#Ellipsis:
@@ -41,18 +77,30 @@ RemovedField: androidx.compose.ui.text.style.TextOverflow#Visible:
4177
Removed enum constant androidx.compose.ui.text.style.TextOverflow.Visible
4278

4379

80+
RemovedMethod: androidx.compose.ui.text.ParagraphStyle#getTextAlign():
81+
Removed method androidx.compose.ui.text.ParagraphStyle.getTextAlign()
82+
RemovedMethod: androidx.compose.ui.text.ParagraphStyle#getTextDirection():
83+
Removed method androidx.compose.ui.text.ParagraphStyle.getTextDirection()
4484
RemovedMethod: androidx.compose.ui.text.PlaceholderVerticalAlign#constructor-impl(int):
4585
Removed method androidx.compose.ui.text.PlaceholderVerticalAlign.constructor-impl(int)
4686
RemovedMethod: androidx.compose.ui.text.PlaceholderVerticalAlign#getValue():
4787
Removed method androidx.compose.ui.text.PlaceholderVerticalAlign.getValue()
4888
RemovedMethod: androidx.compose.ui.text.SpanStyle#getFontStyle():
4989
Removed method androidx.compose.ui.text.SpanStyle.getFontStyle()
90+
RemovedMethod: androidx.compose.ui.text.SpanStyle#getFontSynthesis():
91+
Removed method androidx.compose.ui.text.SpanStyle.getFontSynthesis()
5092
RemovedMethod: androidx.compose.ui.text.TextLayoutInput#copy-ih31NyA(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.TextStyle, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>>, int, boolean, androidx.compose.ui.text.style.TextOverflow, androidx.compose.ui.unit.Density, androidx.compose.ui.unit.LayoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader, long):
5193
Removed method androidx.compose.ui.text.TextLayoutInput.copy-ih31NyA(androidx.compose.ui.text.AnnotatedString,androidx.compose.ui.text.TextStyle,java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>>,int,boolean,androidx.compose.ui.text.style.TextOverflow,androidx.compose.ui.unit.Density,androidx.compose.ui.unit.LayoutDirection,androidx.compose.ui.text.font.Font.ResourceLoader,long)
5294
RemovedMethod: androidx.compose.ui.text.TextLayoutInput#getOverflow():
5395
Removed method androidx.compose.ui.text.TextLayoutInput.getOverflow()
5496
RemovedMethod: androidx.compose.ui.text.TextStyle#getFontStyle():
5597
Removed method androidx.compose.ui.text.TextStyle.getFontStyle()
98+
RemovedMethod: androidx.compose.ui.text.TextStyle#getFontSynthesis():
99+
Removed method androidx.compose.ui.text.TextStyle.getFontSynthesis()
100+
RemovedMethod: androidx.compose.ui.text.TextStyle#getTextAlign():
101+
Removed method androidx.compose.ui.text.TextStyle.getTextAlign()
102+
RemovedMethod: androidx.compose.ui.text.TextStyle#getTextDirection():
103+
Removed method androidx.compose.ui.text.TextStyle.getTextDirection()
56104
RemovedMethod: androidx.compose.ui.text.font.Font#getStyle():
57105
Removed method androidx.compose.ui.text.font.Font.getStyle()
58106
RemovedMethod: androidx.compose.ui.text.font.FontKt#Font(int, androidx.compose.ui.text.font.FontWeight, androidx.compose.ui.text.font.FontStyle):

0 commit comments

Comments
 (0)