Rremove JvmOverloads and add textStyle for toText

AndroidLiba · AndroidLiba · commit 8c29ed40a51b · 2019-04-26T13:59:34.000+03:00
diff --git a/omegatypes/src/main/java/com/omega_r/libs/omegatypes/Text.kt b/omegatypes/src/main/java/com/omega_r/libs/omegatypes/Text.kt
@@ -223,7 +223,6 @@ open class Text(protected val defaultTextStyle: TextStyle? ) : Serializable {
 
 }
 
-@JvmOverloads // todo: remove, temporary
 fun TextView.setText(text: Text?, textStyle: TextStyle? = null) {
     if (text == null) {
         this.text = null
@@ -270,4 +269,6 @@ operator fun Text.plus(string: String) : Text {
     return TextBuilder.BuilderText(this) + string
 }
 
-fun String.toText() = Text.from(this)
+fun String.toText(textStyle: TextStyle? = null) = Text.from(this, textStyle)
+
+operator fun Text.plus(textStyle: TextStyle) = Text.from(this, textStyle = textStyle)

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,6 @@ open class Text(protected val defaultTextStyle: TextStyle? ) : Serializable {`
`223`	`223`
`224`	`224`	`}`
`225`	`225`
`226`		`-@JvmOverloads // todo: remove, temporary`
`227`	`226`	`fun TextView.setText(text: Text?, textStyle: TextStyle? = null) {`
`228`	`227`	`if (text == null) {`
`229`	`228`	`this.text = null`
`@@ -270,4 +269,6 @@ operator fun Text.plus(string: String) : Text {`
`270`	`269`	`return TextBuilder.BuilderText(this) + string`
`271`	`270`	`}`
`272`	`271`
`273`		`-fun String.toText() = Text.from(this)`
	`272`	`+fun String.toText(textStyle: TextStyle? = null) = Text.from(this, textStyle)`
	`273`	`+`
	`274`	`+operator fun Text.plus(textStyle: TextStyle) = Text.from(this, textStyle = textStyle)`