From 18de51a531dea94e9319b2b6eeb40226d1b8568f Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 18 Sep 2023 09:19:02 -0400 Subject: [PATCH] Add proper tinting to delivery status icon. --- .../v2/items/V2ConversationItemTextOnlyViewHolder.kt | 2 ++ .../conversation/v2/items/V2ConversationItemTheme.kt | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt index e3a27bdb4b..ccff05cca1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt @@ -644,6 +644,8 @@ open class V2ConversationItemTextOnlyViewHolder>( return } + deliveryStatus.setTint(themeDelegate.getFooterIconColor(conversationMessage)) + val onlyShowSendingStatus = when { record.isOutgoing && !record.isRemoteDelete -> false record.isRemoteDelete -> true diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme.kt index 5935a87355..9dba495148 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme.kt @@ -13,6 +13,7 @@ import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.conversation.ConversationMessage import org.thoughtcrime.securesms.conversation.v2.items.V2ConversationItemUtils.isThumbnailAtBottomOfBubble import org.thoughtcrime.securesms.util.hasNoBubble +import org.thoughtcrime.securesms.util.isBorderless /** * Color information for conversation items. @@ -39,6 +40,10 @@ class V2ConversationItemTheme( return ContextCompat.getColor(context, R.color.signal_colorOnCustom) } + if (conversationMessage.messageRecord.hasNoBubble(context) && !conversationContext.hasWallpaper()) { + return conversationContext.getColorizer().getIncomingFooterTextColor(context, false) + } + return getColor( conversationMessage, conversationContext.getColorizer()::getOutgoingFooterIconColor, @@ -54,6 +59,10 @@ class V2ConversationItemTheme( return ContextCompat.getColor(context, R.color.signal_colorOnCustom) } + if (conversationMessage.messageRecord.hasNoBubble(context) && !conversationContext.hasWallpaper()) { + return conversationContext.getColorizer().getIncomingFooterIconColor(context, false) + } + return getColor( conversationMessage, conversationContext.getColorizer()::getOutgoingFooterTextColor,