Skip to content

add onClicked parameter to HtmlText #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iankerr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add onClicked parameter to HtmlText #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions app/src/main/java/com/ireward/showcase/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.text.Html
import android.text.method.LinkMovementMethod
import android.view.Gravity
import android.view.ViewGroup
import android.widget.LinearLayout
import android.widget.TextView
import android.widget.Toast
import androidx.activity.compose.setContent
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.foundation.Image
Expand Down Expand Up @@ -164,23 +164,25 @@ private fun AndroidLegacyTextView(html: String) {
) {
AndroidView(
modifier = Modifier
.fillMaxWidth()
.align(Alignment.Center)
.padding(10.dp),
factory = { ctx ->
TextView(ctx).apply {
layoutParams = LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT
)

gravity = Gravity.CENTER
setLinkTextColor(ContextCompat.getColorStateList(context, R.color.blue))
text = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
Html.fromHtml(html, Html.FROM_HTML_MODE_COMPACT)
} else {
Html.fromHtml(html)
}
movementMethod = LinkMovementMethod.getInstance()
setOnClickListener {
Toast.makeText(
context,
context.getText(R.string.textview_link_clicked_message),
Toast.LENGTH_LONG
).show()
}
}
})
Image(
Expand Down Expand Up @@ -220,6 +222,13 @@ private fun HtmlTextItem(context: Context, html: String) {
}
)
},
onClicked = {
Toast.makeText(
context,
context.getText(R.string.html_text_clicked_message),
Toast.LENGTH_LONG
).show()
},
URLSpanStyle = SpanStyle(
color = colorResource(id = R.color.blue),
textDecoration = TextDecoration.Underline
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<resources>
<string name="app_name">HTMLText</string>
<string name="textview_link_clicked_message">TextView without link clicked</string>
<string name="html_text_clicked_message">HtmlText without link clicked</string>
</resources>
2 changes: 2 additions & 0 deletions htmlcompose/src/main/java/com/ireward/htmlcompose/HtmlText.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ fun HtmlText(
maxLines: Int = Int.MAX_VALUE,
onTextLayout: (TextLayoutResult) -> Unit = {},
linkClicked: ((String) -> Unit)? = null,
onClicked: (() -> Unit)? = null,
fontSize: TextUnit = 14.sp,
flags: Int = HtmlCompat.FROM_HTML_MODE_COMPACT,
URLSpanStyle: SpanStyle = SpanStyle(
Expand All @@ -52,6 +53,7 @@ fun HtmlText(
.getStringAnnotations(URL_TAG, it, it)
.firstOrNull()
?.let { stringAnnotation -> linkClicked(stringAnnotation.item) }
?: onClicked?.invoke()
}
)
} else {
Expand Down