Use matching color for read conversation sender names.

signalapp · Feb 3, 2021 · 3e2349c · 3e2349c
1 parent af7e736
commit 3e2349c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
@@ -493,7 +493,7 @@ public void onRecipientChanged(@NonNull Recipient recipient) {
         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 void onRecipientChanged(@NonNull Recipient recipient) {
 
   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);

diff --git a/app/src/main/res/values/text_styles.xml b/app/src/main/res/values/text_styles.xml
@@ -26,6 +26,14 @@
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
+    <style name="Signal.Text.Preview.Medium.Primary">
+        <item name="android:textColor">@color/signal_text_primary</item>
+    </style>
+
+    <style name="Signal.Text.Preview.Medium.Secondary">
+        <item name="android:textColor">@color/signal_text_secondary</item>
+    </style>
+
     <style name="Signal.Text.Caption" parent="Base.TextAppearance.AppCompat.Caption">
         <item name="android:textSize">12sp</item>
         <item name="android:lineSpacingExtra">2sp</item>