From 85b7ee85f3733401bea655abd1cd92941e166930 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 20 Sep 2023 10:27:14 -0400 Subject: [PATCH] Display date in forced footer for CIV2. --- .../v2/items/V2ConversationItemTextOnlyViewHolder.kt | 2 +- .../main/res/layout/v2_conversation_item_text_only_incoming.xml | 2 +- 2 files changed, 2 insertions(+), 2 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 d971af4ea2..c103c72151 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 @@ -600,7 +600,7 @@ open class V2ConversationItemTextOnlyViewHolder>( } private fun presentDate() { - if (!shape.isEndingShape && !conversationMessage.messageRecord.isEditMessage) { + if (!shape.isEndingShape && !isForcedFooter()) { binding.footerDate.visible = false return } diff --git a/app/src/main/res/layout/v2_conversation_item_text_only_incoming.xml b/app/src/main/res/layout/v2_conversation_item_text_only_incoming.xml index cd3b78a87a..431e8e9d79 100644 --- a/app/src/main/res/layout/v2_conversation_item_text_only_incoming.xml +++ b/app/src/main/res/layout/v2_conversation_item_text_only_incoming.xml @@ -156,7 +156,7 @@ android:layout_width="@dimen/message_bubble_horizontal_padding" android:layout_height="@dimen/message_bubble_horizontal_padding" app:layout_constraintTop_toTopOf="@id/conversation_item_footer_date" - app:layout_constraintBottom_toBottomOf="@id/conversation_item_body_wrapper" + app:layout_constraintBottom_toBottomOf="@id/conversation_item_body_wrapper" app:layout_constraintEnd_toEndOf="@id/conversation_item_body_wrapper" />