Ling0925
/
TiebaLite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 贴子正文无法触发点击事件

This commit is contained in:
HuanCheng65 2024-01-30 00:18:39 +08:00
parent d86f0d9c41
commit a758639eb1
No known key found for this signature in database
GPG Key ID: 5EC9DD60A32C7360
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/huanchengfly/tieba/post/ui/common/PbContentRender.kt
View File

@ -302,9 +302,9 @@ fun PbContentText(
awaitEachGesture { awaitEachGesture {
val change = awaitFirstDown() val change = awaitFirstDown()
val annotation = val annotation =
layoutResult.value?.getOffsetForPosition(change.position)?.let { layoutResult.value?.getOffsetForPosition(change.position)?.let { offset ->
text.getStringAnnotations(start = it, end = it) text.getStringAnnotations(start = offset, end = offset)
.firstOrNull() .firstOrNull { it.tag == "url" || it.tag == "user" }
} }
if (annotation != null) { if (annotation != null) {
if (change.pressed != change.previousPressed) change.consume() if (change.pressed != change.previousPressed) change.consume()

5
app/src/main/java/com/huanchengfly/tieba/post/utils/EmoticonUtil.kt
View File

@ -146,6 +146,7 @@ object EmoticonUtil {
} }
} }
@OptIn(ExperimentalTextApi::class)
val AnnotatedString.emoticonString: AnnotatedString val AnnotatedString.emoticonString: AnnotatedString
get() { get() {
if (hasStringAnnotations("Emoticon", 0, length)) { if (hasStringAnnotations("Emoticon", 0, length)) {
@ -154,7 +155,9 @@ object EmoticonUtil {
val regexPattern = Pattern.compile(getRegex(EMOTICON_ALL_TYPE)) val regexPattern = Pattern.compile(getRegex(EMOTICON_ALL_TYPE))
val matcher = regexPattern.matcher(this.text) val matcher = regexPattern.matcher(this.text)
return buildAnnotatedString { return buildAnnotatedString {
append(this@emoticonString) withAnnotation("Emoticon", "true") {
append(this@emoticonString)
}
while (matcher.find()) { while (matcher.find()) {
val start = matcher.start() val start = matcher.start()
val end = matcher.end() val end = matcher.end()