From a5b39a8f172780ea7f4fd4d9df8b2b10711066c4 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Tue, 25 Jul 2023 16:53:07 -0400
Subject: [PATCH] Fix conversation banner animation bugs.

When in doubt, put it in a FrameLayout.
---
 .../res/layout/v2_conversation_fragment.xml   | 60 +++++++++++--------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/app/src/main/res/layout/v2_conversation_fragment.xml b/app/src/main/res/layout/v2_conversation_fragment.xml
index 3efa24b590..566c5abd87 100644
--- a/app/src/main/res/layout/v2_conversation_fragment.xml
+++ b/app/src/main/res/layout/v2_conversation_fragment.xml
@@ -138,43 +138,51 @@
 
     </org.thoughtcrime.securesms.util.views.DarkOverflowToolbar>
 
-    <org.thoughtcrime.securesms.conversation.v2.ConversationBannerView
-        android:id="@+id/conversation_banner"
+    <FrameLayout
+        android:id="@+id/conversation_banner_frame"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:clipChildren="true"
         app:layout_constraintEnd_toEndOf="@id/parent_end_guideline"
         app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
         app:layout_constraintTop_toBottomOf="@+id/toolbar">
 
-        <ViewStub
-            android:id="@+id/voice_note_player_stub"
+        <org.thoughtcrime.securesms.conversation.v2.ConversationBannerView
+            android:id="@+id/conversation_banner"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/voice_note_player"
-            android:layout="@layout/voice_note_player_stub" />
+            android:layout_height="wrap_content">
 
-        <ViewStub
-            android:id="@+id/unverified_banner_stub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/unverified_banner"
-            android:layout="@layout/conversation_activity_unverified_banner_stub" />
+            <ViewStub
+                android:id="@+id/voice_note_player_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/voice_note_player"
+                android:layout="@layout/voice_note_player_stub" />
 
-        <ViewStub
-            android:id="@+id/reminder_stub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/reminder"
-            android:layout="@layout/conversation_activity_reminderview_stub" />
+            <ViewStub
+                android:id="@+id/unverified_banner_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/unverified_banner"
+                android:layout="@layout/conversation_activity_unverified_banner_stub" />
 
-        <ViewStub
-            android:id="@+id/review_banner_stub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/review_banner"
-            android:layout="@layout/review_banner_view" />
+            <ViewStub
+                android:id="@+id/reminder_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/reminder"
+                android:layout="@layout/conversation_activity_reminderview_stub" />
 
-    </org.thoughtcrime.securesms.conversation.v2.ConversationBannerView>
+            <ViewStub
+                android:id="@+id/review_banner_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/review_banner"
+                android:layout="@layout/review_banner_view" />
+
+        </org.thoughtcrime.securesms.conversation.v2.ConversationBannerView>
+
+    </FrameLayout>
 
     <org.thoughtcrime.securesms.components.ConversationScrollToView
         android:id="@+id/scroll_to_mention"