Fix colour and display of subject

Stephen Paul Weber created 2 years ago

Change summary

src/main/java/eu/siacs/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(-)

Detailed changes

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() {

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

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