From f3a8825cb9e485fd833d8b0bcf7b9dd0c8c9a942 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 18 Sep 2023 16:31:17 -0400 Subject: [PATCH] Revert "Add proper tinting to delivery status icon." This reverts commit c4ac63ea7a89e44f478b0321901eaf43e2745502. --- .../v2/items/V2ConversationItemTextOnlyViewHolder.kt | 2 -- .../conversation/v2/items/V2ConversationItemTheme.kt | 8 -------- 2 files changed, 10 deletions(-) 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 d195a37382..5503d885ae 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 @@ -669,8 +669,6 @@ 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 032df94def..5935a87355 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 @@ -39,10 +39,6 @@ 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, @@ -58,10 +54,6 @@ 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,