From d16f41d39b65b58cba5e445b57652bbefc5dc97c Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 30 Apr 2024 20:59:11 -0500
Subject: [PATCH] Fix colour and display of subject

---
 .../conversations/ui/adapter/MessageAdapter.java      | 11 +----------
 src/main/res/layout/item_message_received.xml         |  3 ++-
 src/main/res/layout/item_message_sent.xml             |  3 ++-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index ce9fdf7c01fa9cf3b0969357cbc5f6bfe879b464..5248f162dd46564fac3f8eaf872212bc66e61f0b 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -301,6 +301,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         } else {
             setTextColor(viewHolder.time, bubbleColor);
         }
+        setTextColor(viewHolder.subject, bubbleColor);
         if (message.getEncryption() == Message.ENCRYPTION_NONE) {
             viewHolder.indicator.setVisibility(View.GONE);
         } else {
@@ -1403,16 +1404,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             }
         }
 
-        /* TODO
-        if (darkBackground) {
-            if (viewHolder.subject != null) viewHolder.subject.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_OnDark_Bold);
-            if (viewHolder.encryption != null) viewHolder.encryption.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_OnDark_Bold);
-        } else {
-            if (viewHolder.subject != null) viewHolder.subject.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Bold);
-            if (viewHolder.encryption != null) viewHolder.encryption.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Bold);
-        }
-        */
-
         displayStatus(viewHolder, message, type, bubbleColor);
 
         viewHolder.messageBody.setAccessibilityDelegate(new View.AccessibilityDelegate() {
diff --git a/src/main/res/layout/item_message_received.xml b/src/main/res/layout/item_message_received.xml
index 941ef3148fbb1c175fe50018def7f074e1e9cc27..3bc2cbc86a3a523167b7bff104d0eee82136bcc6 100644
--- a/src/main/res/layout/item_message_received.xml
+++ b/src/main/res/layout/item_message_received.xml
@@ -62,7 +62,8 @@
                         android:accessibilityTraversalAfter="@id/message_photo"
                         android:accessibilityTraversalBefore="@id/message_time"
                         android:gravity="center_vertical"
-                        android:textAppearance="?textAppearanceBodySmall"
+                        android:textAppearance="?textAppearanceLabelSmall"
+                        android:textColor="?colorOnTertiaryContainer"
                         android:visibility="gone" />
 
                     <TextView
diff --git a/src/main/res/layout/item_message_sent.xml b/src/main/res/layout/item_message_sent.xml
index 27b64ef41c30b73d9cef1845e2f939150ec1cb8e..14ed9a35d415a632442cf50476cd26d657d0363a 100644
--- a/src/main/res/layout/item_message_sent.xml
+++ b/src/main/res/layout/item_message_sent.xml
@@ -70,7 +70,8 @@
                         android:accessibilityTraversalAfter="@id/message_photo"
                         android:accessibilityTraversalBefore="@id/message_time"
                         android:gravity="center_vertical"
-                        android:textAppearance="?textAppearanceBodySmall"
+                        android:textAppearance="?textAppearanceLabelSmall"
+                        android:textColor="?colorOnSecondaryContainer"
                         android:visibility="gone" />
 
                     <TextView