Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-21 18:26:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use matching color for read conversation sender names.

Browse Source
This commit is contained in:
Alan Evans
2021-02-03 15:56:55 -04:00
committed by Greyson Parrelli
parent af7e736de9
commit 3e2349c4ff
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
View File

@@ -493,7 +493,7 @@ public final class ConversationListItem extends ConstraintLayout
if (thread.getRecipient().isGroup()) {
RecipientId groupMessageSender = thread.getGroupMessageSender();
if (!groupMessageSender.isUnknown()) {
return describeGroupMessage(context, body, groupMessageSender);
return describeGroupMessage(context, body, groupMessageSender, thread.isRead());
}
}
return LiveDataUtil.just(new SpannableString(body));
@@ -503,21 +503,24 @@ public final class ConversationListItem extends ConstraintLayout
private static LiveData<SpannableString> describeGroupMessage(@NonNull Context context,
@NonNull String body,
@NonNull RecipientId groupMessageSender)
@NonNull RecipientId groupMessageSender,
boolean read)
{
return whileLoadingShow(body, recipientToStringAsync(groupMessageSender,
r -> createGroupMessageUpdateString(context, body, r)));
r -> createGroupMessageUpdateString(context, body, r, read)));
}
private static SpannableString createGroupMessageUpdateString(@NonNull Context context,
@NonNull String body,
@NonNull Recipient recipient)
@NonNull Recipient recipient,
boolean read)
{
String sender = (recipient.isSelf() ? context.getString(R.string.MessageRecord_you)
: recipient.getShortDisplayName(context)) + ": ";
SpannableString spannable = new SpannableString(sender + body);
spannable.setSpan(new TextAppearanceSpan(context, R.style.Signal_Text_Preview_Medium),
spannable.setSpan(new TextAppearanceSpan(context, read ? R.style.Signal_Text_Preview_Medium_Secondary
: R.style.Signal_Text_Preview_Medium_Primary),
0,
sender.length(),
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);