Skip to content

Commit

Permalink
Use newer TextStyle constructor
Browse files Browse the repository at this point in the history
  • Loading branch information
wingio committed Jul 19, 2024
1 parent 46db53c commit fa69350
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
dependencies {
classpath(libs.plugin.maven)
classpath(libs.plugin.multiplatform.compose)
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public fun ClickableText(
fontFamily: FontFamily? = null,
letterSpacing: TextUnit = TextUnit.Unspecified,
textDecoration: TextDecoration? = null,
textAlign: TextAlign? = null,
textAlign: TextAlign = TextAlign.Unspecified,
lineHeight: TextUnit = TextUnit.Unspecified,
style: TextStyle = LocalTextStyle.current,
overflow: TextOverflow = TextOverflow.Clip,
Expand All @@ -75,6 +75,7 @@ public fun ClickableText(
LocalContentColor.current
}
}
TextStyle()
val textStyle = style.merge(
TextStyle(
color = textColor,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public fun ClickableText(
fontFamily: FontFamily? = null,
letterSpacing: TextUnit = TextUnit.Unspecified,
textDecoration: TextDecoration? = null,
textAlign: TextAlign? = null,
textAlign: TextAlign = TextAlign.Unspecified,
lineHeight: TextUnit = TextUnit.Unspecified,
style: TextStyle = TextStyle(),
overflow: TextOverflow = TextOverflow.Clip,
Expand Down

0 comments on commit fa69350

Please sign in to comment.