Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 13:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always show expiration timer if there is one.

Browse Source
This commit is contained in:
Alex Hart
2023-09-20 10:07:49 -04:00
parent 2e45e131b1
commit 326b728d4b
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -459,17 +459,11 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
}
private fun presentFooterExpiry() {
if (shape == V2ConversationItemShape.MessageShape.MIDDLE || shape == V2ConversationItemShape.MessageShape.START) {
binding.footerExpiry.stopAnimation()
binding.footerExpiry.visible = false
return
}
binding.footerExpiry.setColorFilter(themeDelegate.getFooterTextColor(conversationMessage), PorterDuff.Mode.SRC_IN)
val timer = binding.footerExpiry
val record = conversationMessage.messageRecord
if (record.expiresIn > 0 && !record.isPending) {
timer.setColorFilter(themeDelegate.getFooterTextColor(conversationMessage), PorterDuff.Mode.SRC_IN)
timer.visible = true
timer.setPercentComplete(0f)
@@ -484,6 +478,7 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
conversationContext.onStartExpirationTimeout(record)
}
} else {
timer.stopAnimation()
timer.visible = false
}
}
@@ -588,7 +583,7 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
return
}
if (!(conversationMessage.messageRecord.isEditMessage || shape.isEndingShape)) {
if (!(isForcedFooter() || shape.isEndingShape)) {
binding.footerBackground.visible = false
return
}
@@ -699,6 +694,10 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
return false
}
private fun isForcedFooter(): Boolean {
return conversationMessage.messageRecord.isEditMessage || conversationMessage.messageRecord.expiresIn > 0L
}
private inner class ReactionMeasureListener : V2ConversationItemLayout.OnMeasureListener {
override fun onPreMeasure() = Unit