mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-22 21:58:53 +01:00
Use SpannableString insteaed of SpannableStringBuilder when binding messages
This commit is contained in:
@@ -23,7 +23,7 @@ import android.content.Context
|
|||||||
import android.graphics.Typeface
|
import android.graphics.Typeface
|
||||||
import android.telephony.PhoneNumberUtils
|
import android.telephony.PhoneNumberUtils
|
||||||
import android.text.Spannable
|
import android.text.Spannable
|
||||||
import android.text.SpannableStringBuilder
|
import android.text.SpannableString
|
||||||
import android.text.style.StyleSpan
|
import android.text.style.StyleSpan
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
@@ -231,9 +231,7 @@ class MessagesAdapter @Inject constructor(
|
|||||||
view.body.text = when (message.isSms()) {
|
view.body.text = when (message.isSms()) {
|
||||||
true -> message.body
|
true -> message.body
|
||||||
false -> {
|
false -> {
|
||||||
val subject = SpannableStringBuilder(message.getCleansedSubject())
|
val subject = message.getCleansedSubject()
|
||||||
subject.setSpan(StyleSpan(Typeface.BOLD), 0, subject.length, Spannable.SPAN_INCLUSIVE_EXCLUSIVE)
|
|
||||||
|
|
||||||
val body = message.parts
|
val body = message.parts
|
||||||
.filter { part -> !part.isVCard() }
|
.filter { part -> !part.isVCard() }
|
||||||
.mapNotNull { part -> part.text }
|
.mapNotNull { part -> part.text }
|
||||||
@@ -241,8 +239,11 @@ class MessagesAdapter @Inject constructor(
|
|||||||
.joinToString("\n")
|
.joinToString("\n")
|
||||||
|
|
||||||
when {
|
when {
|
||||||
subject.isNotBlank() && body.isNotBlank() -> subject.append("\n$body")
|
subject.isNotBlank() -> {
|
||||||
subject.isNotBlank() -> subject
|
val spannable = SpannableString(if (body.isNotBlank()) "$subject\n$body" else subject)
|
||||||
|
spannable.setSpan(StyleSpan(Typeface.BOLD), 0, subject.length, Spannable.SPAN_INCLUSIVE_EXCLUSIVE)
|
||||||
|
spannable
|
||||||
|
}
|
||||||
else -> body
|
else -> body
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user