empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix conversation banner animation bugs.

Browse source 
When in doubt, put it in a FrameLayout.
This commit is contained in:
Cody Henthorne 2023-07-25 16:53:07 -04:00
parent 26866a7b2c
commit a5b39a8f17
1 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
app/src/main/res/layout/v2_conversation_fragment.xml
View file

@ -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"