Mastodon/Tusky-App-Android
1
0
Fork 0
mirror of https://github.com/tuskyapp/Tusky synced 2025-02-10 13:00:50 +01:00
Code Issues Releases Wiki Activity

Don't repeat inline tags in the trailing hashtag bar (#4811)

Browse Source
This commit is contained in:
Levi Bard 2024-12-15 20:58:19 +01:00 committed by GitHub
parent 02da325e37
commit 8937d0abf0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt
View File

@ -86,13 +86,14 @@ fun setClickableText(
trailingHashtagView == null || tags.isNullOrEmpty() -> Pair(spannableContent.length, emptyList()) trailingHashtagView == null || tags.isNullOrEmpty() -> Pair(spannableContent.length, emptyList())
else -> getTrailingHashtags(spannableContent) else -> getTrailingHashtags(spannableContent)
} }
var inlineHashtagSpanCount = 0 val inlineHashtags = mutableListOf<CharSequence>()
view.text = spannableContent.apply { view.text = spannableContent.apply {
styleQuoteSpans(view) styleQuoteSpans(view)
getSpans(0, endOfContent, URLSpan::class.java).forEach { span -> getSpans(0, endOfContent, URLSpan::class.java).forEach { span ->
if (get(getSpanStart(span)) == '#') { val start = getSpanStart(span)
inlineHashtagSpanCount += 1 if (get(start) == '#') {
inlineHashtags.add(subSequence(start + 1, getSpanEnd(span)))
} }
setClickableText(span, this, mentions, tags, listener) setClickableText(span, this, mentions, tags, listener)
} }
@ -100,12 +101,18 @@ fun setClickableText(
view.movementMethod = NoTrailingSpaceLinkMovementMethod view.movementMethod = NoTrailingSpaceLinkMovementMethod
val showHashtagBar = (trailingHashtags.isNotEmpty() || inlineHashtagSpanCount != tags?.size) val showHashtagBar = (trailingHashtags.isNotEmpty() || inlineHashtags.size != tags?.size)
// I don't _love_ setting the visibility here, but the alternative is to duplicate the logic in other places // I don't _love_ setting the visibility here, but the alternative is to duplicate the logic in other places
trailingHashtagView?.visible(showHashtagBar) trailingHashtagView?.visible(showHashtagBar)
if (showHashtagBar) { if (showHashtagBar) {
trailingHashtagView?.apply { text = buildTrailingHashtagText(tags, trailingHashtags, listener) } trailingHashtagView?.apply {
text = buildTrailingHashtagText(
tags?.filterNot { tag -> inlineHashtags.any { it.contentEquals(tag.name, ignoreCase = true) } },
trailingHashtags,
listener,
)
}
} }
} }