From 4ef2aba4e2f59c07b2b5ed9f142fc7c601c63329 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 5 Jul 2023 09:26:23 -0300 Subject: [PATCH] Ensure text-only entries are cached. --- .../test/ConversationElementGenerator.kt | 4 ++-- .../conversation/ConversationFragment.java | 4 ++-- .../v2_conversation_item_text_only_incoming.xml | 1 + .../v2_conversation_item_text_only_outgoing.xml | 13 +++++++------ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/ConversationElementGenerator.kt b/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/ConversationElementGenerator.kt index 0e7a73d159..45a1222dac 100644 --- a/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/ConversationElementGenerator.kt +++ b/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/ConversationElementGenerator.kt @@ -67,7 +67,7 @@ class ConversationElementGenerator { val messageId = key.requireMessageId() val now = getNow() - val testMessageWordLength = random.nextInt(40) + 1 + val testMessageWordLength = random.nextInt(3) + 1 val testMessage = (0 until testMessageWordLength).map { wordBank.random() }.joinToString(" ") @@ -86,7 +86,7 @@ class ConversationElementGenerator { 1, testMessage, SlideDeck(), - if (isIncoming) getIncomingType() else getSentFailedOutgoingType(), + if (isIncoming) getIncomingType() else getSentOutgoingType(), emptySet(), emptySet(), 0, diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java index 83b6990993..ee1fbee821 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -273,8 +273,8 @@ public class ConversationFragment extends LoggingFragment implements Multiselect FrameLayout parent = new FrameLayout(context); parent.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT)); - CachedInflater.from(context).cacheUntilLimit(R.layout.conversation_item_received_text_only, parent, 25); - CachedInflater.from(context).cacheUntilLimit(R.layout.conversation_item_sent_text_only, parent, 25); + CachedInflater.from(context).cacheUntilLimit(R.layout.v2_conversation_item_text_only_incoming, parent, 25); + CachedInflater.from(context).cacheUntilLimit(R.layout.v2_conversation_item_text_only_outgoing, parent, 25); CachedInflater.from(context).cacheUntilLimit(R.layout.conversation_item_received_multimedia, parent, 10); CachedInflater.from(context).cacheUntilLimit(R.layout.conversation_item_sent_multimedia, parent, 10); CachedInflater.from(context).cacheUntilLimit(R.layout.conversation_item_update, parent, 5); 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 5c96ab02e5..a51ea6df96 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 @@ -155,6 +155,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="-4dp" + android:layout_marginEnd="5dp" android:orientation="horizontal" app:layout_constraintEnd_toEndOf="@id/conversation_item_body_wrapper" app:layout_constraintTop_toBottomOf="@id/conversation_item_body_wrapper" diff --git a/app/src/main/res/layout/v2_conversation_item_text_only_outgoing.xml b/app/src/main/res/layout/v2_conversation_item_text_only_outgoing.xml index 8504696df5..91a99df434 100644 --- a/app/src/main/res/layout/v2_conversation_item_text_only_outgoing.xml +++ b/app/src/main/res/layout/v2_conversation_item_text_only_outgoing.xml @@ -120,8 +120,8 @@ android:id="@+id/conversation_item_expiration_timer" android:layout_width="12dp" android:layout_height="12dp" - android:layout_marginBottom="@dimen/message_bubble_bottom_padding" android:layout_marginEnd="4dp" + android:layout_marginBottom="@dimen/message_bubble_bottom_padding" app:layout_constraintBottom_toBottomOf="@id/conversation_item_body_wrapper" app:layout_constraintEnd_toStartOf="@id/conversation_item_delivery_status" /> @@ -136,10 +136,10 @@ + android:layout_height="@dimen/message_bubble_horizontal_padding" + app:layout_constraintBottom_toBottomOf="@id/conversation_item_body_wrapper" + app:layout_constraintEnd_toEndOf="@id/conversation_item_body_wrapper" /> @@ -150,9 +150,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="-4dp" + android:layout_marginStart="5dp" android:orientation="horizontal" - app:layout_constraintEnd_toEndOf="@id/conversation_item_body_wrapper" + app:layout_constraintStart_toStartOf="@id/conversation_item_body_wrapper" app:layout_constraintTop_toBottomOf="@id/conversation_item_body_wrapper" - app:rcv_outgoing="false" /> + app:rcv_outgoing="true" /> \ No newline at end of file