Skip to content

Commit

Permalink
Move to non-deprecated TextStyle constructor.
Browse files Browse the repository at this point in the history
  • Loading branch information
ychescale9 committed Jan 26, 2024
1 parent fe166ef commit 9f77410
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public fun Text(
modifier: Modifier = Modifier,
color: Color = Color.Unspecified,
textDecoration: TextDecoration? = null,
textAlign: TextAlign? = null,
textAlign: TextAlign = TextAlign.Unspecified,
overflow: TextOverflow = TextOverflow.Clip,
softWrap: Boolean = true,
maxLines: Int = Int.MAX_VALUE,
Expand All @@ -36,7 +36,7 @@ public fun Text(
val mergedStyle = style.merge(
TextStyle(
color = textColor,
textAlign = textAlign ?: style.textAlign,
textAlign = textAlign,
textDecoration = textDecoration,
)
)
Expand All @@ -59,7 +59,7 @@ public fun Text(
modifier: Modifier = Modifier,
color: Color = Color.Unspecified,
textDecoration: TextDecoration? = null,
textAlign: TextAlign? = null,
textAlign: TextAlign = TextAlign.Unspecified,
overflow: TextOverflow = TextOverflow.Clip,
softWrap: Boolean = true,
maxLines: Int = Int.MAX_VALUE,
Expand All @@ -75,7 +75,7 @@ public fun Text(
val mergedStyle = style.merge(
TextStyle(
color = textColor,
textAlign = textAlign ?: style.textAlign,
textAlign = textAlign,
textDecoration = textDecoration,
)
)
Expand Down

0 comments on commit 9f77410

Please sign in to comment.