Mastodon
/
Yuito-app-android
mirror of https://github.com/accelforce/Yuito
1
0
Fork 0
Code Issues Releases Wiki Activity

fix apng emojis not rendered when animation is turned off (#2312)

This commit is contained in:
Konrad Pozniak 2022-02-05 08:56:24 +01:00 committed by GitHub
parent 17207312d6
commit 329bc51f90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/keylesspalace/tusky/util/CustomEmojiHelper.kt
View File

@ -33,7 +33,7 @@ import java.util.regex.Pattern
/** /**
* replaces emoji shortcodes in a text with EmojiSpans * replaces emoji shortcodes in a text with EmojiSpans
* @param text the text containing custom emojis * @receiver the text containing custom emojis
* @param emojis a list of the custom emojis (nullable for backward compatibility with old mastodon instances) * @param emojis a list of the custom emojis (nullable for backward compatibility with old mastodon instances)
* @param view a reference to the a view the emojis will be shown in (should be the TextView, but parents of the TextView are also acceptable) * @param view a reference to the a view the emojis will be shown in (should be the TextView, but parents of the TextView are also acceptable)
* @return the text with the shortcodes replaced by EmojiSpans * @return the text with the shortcodes replaced by EmojiSpans
@ -44,7 +44,7 @@ fun CharSequence.emojify(emojis: List<Emoji>?, view: View, animate: Boolean): Ch
val builder = SpannableStringBuilder.valueOf(this) val builder = SpannableStringBuilder.valueOf(this)
emojis.forEach { (shortcode, url) -> emojis.forEach { (shortcode, url, staticUrl) ->
val matcher = Pattern.compile(":$shortcode:", Pattern.LITERAL) val matcher = Pattern.compile(":$shortcode:", Pattern.LITERAL)
.matcher(this) .matcher(this)
@ -54,7 +54,7 @@ fun CharSequence.emojify(emojis: List<Emoji>?, view: View, animate: Boolean): Ch
builder.setSpan(span, matcher.start(), matcher.end(), 0) builder.setSpan(span, matcher.start(), matcher.end(), 0)
Glide.with(view) Glide.with(view)
.asDrawable() .asDrawable()
.load(url) .load(if (animate) { url } else { staticUrl })
.into(span.getTarget(animate)) .into(span.getTarget(animate))
} }
} }