Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-28 04:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix footer background sizing.

Browse Source
This commit is contained in:
Alex Hart
2023-09-18 09:50:56 -04:00
parent 18de51a531
commit c953003c2f
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,7 @@ fun V2ConversationItemTextOnlyIncomingBinding.bridge(): V2ConversationItemTextOn
conversationItemFooterExpiry = conversationItemExpirationTimer, conversationItemFooterExpiry = conversationItemExpirationTimer,
conversationItemFooterBackground = conversationItemFooterBackground, conversationItemFooterBackground = conversationItemFooterBackground,
conversationItemAlert = null, conversationItemAlert = null,
conversationItemFooterSpace = null, conversationItemFooterSpace = footerEndPad,
isIncoming = true isIncoming = true
) )
} }

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

@@ -463,8 +463,8 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
val timer = binding.conversationItemFooterExpiry val timer = binding.conversationItemFooterExpiry
val record = conversationMessage.messageRecord val record = conversationMessage.messageRecord
if (record.expiresIn > 0 && !record.isPending) { if (record.expiresIn > 0 && !record.isPending) {
binding.conversationItemFooterExpiry.visible = true timer.visible = true
binding.conversationItemFooterExpiry.setPercentComplete(0f) timer.setPercentComplete(0f)
if (record.expireStarted > 0) { if (record.expireStarted > 0) {
timer.setExpirationTime(record.expireStarted, record.expiresIn) timer.setExpirationTime(record.expireStarted, record.expiresIn)

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

@@ -13,7 +13,6 @@ 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.

14
app/src/main/res/layout/v2_conversation_item_text_only_incoming.xml
View File

@@ -139,18 +139,26 @@
android:textColor="@color/signal_text_secondary" android:textColor="@color/signal_text_secondary"
app:layout_constraintBottom_toBottomOf="@id/conversation_item_body_wrapper" app:layout_constraintBottom_toBottomOf="@id/conversation_item_body_wrapper"
app:layout_constraintEnd_toStartOf="@id/conversation_item_expiration_timer" app:layout_constraintEnd_toStartOf="@id/conversation_item_expiration_timer"
app:layout_goneMarginEnd="@dimen/message_bubble_horizontal_padding" app:layout_goneMarginEnd="0dp"
tools:text="13:14pm" /> tools:text="13:14pm" />
<org.thoughtcrime.securesms.components.ExpirationTimerView <org.thoughtcrime.securesms.components.ExpirationTimerView
android:id="@+id/conversation_item_expiration_timer" android:id="@+id/conversation_item_expiration_timer"
android:layout_width="12dp" android:layout_width="12dp"
android:layout_height="12dp" android:layout_height="12dp"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/message_bubble_bottom_padding" android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
app:layout_constraintBottom_toBottomOf="@id/conversation_item_footer_date" app:layout_constraintBottom_toBottomOf="@id/conversation_item_footer_date"
app:layout_constraintEnd_toEndOf="@id/conversation_item_body_wrapper" app:layout_constraintEnd_toStartOf="@id/footer_end_pad"
app:layout_constraintTop_toTopOf="@id/conversation_item_footer_date" /> app:layout_constraintTop_toTopOf="@id/conversation_item_footer_date" />
<Space
android:id="@+id/footer_end_pad"
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_constraintEnd_toEndOf="@id/conversation_item_body_wrapper" />
<!-- End Footer --> <!-- End Footer -->
<!-- Replies Icon --> <!-- Replies Icon -->