Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-21 19:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add proper tinting to delivery status icon.

Browse Source
This commit is contained in:
Alex Hart
2023-09-18 09:19:02 -04:00
parent ab6d3b5e8d
commit 18de51a531
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt
View File

@@ -644,6 +644,8 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
return return
} }
deliveryStatus.setTint(themeDelegate.getFooterIconColor(conversationMessage))
val onlyShowSendingStatus = when { val onlyShowSendingStatus = when {
record.isOutgoing && !record.isRemoteDelete -> false record.isOutgoing && !record.isRemoteDelete -> false
record.isRemoteDelete -> true record.isRemoteDelete -> true

9
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme.kt
View File

@@ -13,6 +13,7 @@ import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.conversation.ConversationMessage import org.thoughtcrime.securesms.conversation.ConversationMessage
import org.thoughtcrime.securesms.conversation.v2.items.V2ConversationItemUtils.isThumbnailAtBottomOfBubble import org.thoughtcrime.securesms.conversation.v2.items.V2ConversationItemUtils.isThumbnailAtBottomOfBubble
import org.thoughtcrime.securesms.util.hasNoBubble import org.thoughtcrime.securesms.util.hasNoBubble
import org.thoughtcrime.securesms.util.isBorderless
/** /**
* Color information for conversation items. * Color information for conversation items.
@@ -39,6 +40,10 @@ class V2ConversationItemTheme(
return ContextCompat.getColor(context, R.color.signal_colorOnCustom) return ContextCompat.getColor(context, R.color.signal_colorOnCustom)
} }
if (conversationMessage.messageRecord.hasNoBubble(context) && !conversationContext.hasWallpaper()) {
return conversationContext.getColorizer().getIncomingFooterTextColor(context, false)
}
return getColor( return getColor(
conversationMessage, conversationMessage,
conversationContext.getColorizer()::getOutgoingFooterIconColor, conversationContext.getColorizer()::getOutgoingFooterIconColor,
@@ -54,6 +59,10 @@ class V2ConversationItemTheme(
return ContextCompat.getColor(context, R.color.signal_colorOnCustom) return ContextCompat.getColor(context, R.color.signal_colorOnCustom)
} }
if (conversationMessage.messageRecord.hasNoBubble(context) && !conversationContext.hasWallpaper()) {
return conversationContext.getColorizer().getIncomingFooterIconColor(context, false)
}
return getColor( return getColor(
conversationMessage, conversationMessage,
conversationContext.getColorizer()::getOutgoingFooterTextColor, conversationContext.getColorizer()::getOutgoingFooterTextColor,