From cce811e0a5272df71bf4e5d6000ca9226cb9b6ae Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Sat, 16 Dec 2023 15:26:22 +0100 Subject: [PATCH] fix icon alignment in help text of empty timelines (#4179) @Lakoja do you remember why you added that version check? Removing it fixes the bug. Before / after closes #4175 --- app/src/main/java/com/keylesspalace/tusky/util/SpanUtils.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/util/SpanUtils.kt b/app/src/main/java/com/keylesspalace/tusky/util/SpanUtils.kt index 4b1235148..66cda17a5 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/SpanUtils.kt +++ b/app/src/main/java/com/keylesspalace/tusky/util/SpanUtils.kt @@ -1,7 +1,6 @@ package com.keylesspalace.tusky.util import android.content.Context -import android.os.Build import android.text.Spannable import android.text.SpannableStringBuilder import android.text.Spanned @@ -98,8 +97,6 @@ fun highlightSpans(text: Spannable, colour: Int) { * Replaces text of the form [iconics name] with their spanned counterparts (ImageSpan). */ fun addDrawables(text: CharSequence, color: Int, size: Int, context: Context): Spannable { - val alignment = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) DynamicDrawableSpan.ALIGN_CENTER else DynamicDrawableSpan.ALIGN_BASELINE - val builder = SpannableStringBuilder(text) val pattern = Pattern.compile("\\[iconics ([0-9a-z_]+)\\]") @@ -112,7 +109,7 @@ fun addDrawables(text: CharSequence, color: Int, size: Int, context: Context): S drawable.setBounds(0, 0, size, size) drawable.setTint(color) - builder.setSpan(ImageSpan(drawable, alignment), matcher.start(), matcher.end(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) + builder.setSpan(ImageSpan(drawable, DynamicDrawableSpan.ALIGN_BASELINE), matcher.start(), matcher.end(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) } return builder