From d6712b7c93d11f50f001c663ab017706b0afec8c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 27 Jan 2023 17:01:52 +0100
Subject: [PATCH] Fix layout issue with `Messages failed to send` banner.

---
 .../src/main/res/layout/fragment_timeline.xml | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_timeline.xml b/vector/src/main/res/layout/fragment_timeline.xml
index 6e83dbe8fd..a022ad2744 100644
--- a/vector/src/main/res/layout/fragment_timeline.xml
+++ b/vector/src/main/res/layout/fragment_timeline.xml
@@ -17,7 +17,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="48dp"
-            android:visibility="gone" />
+            android:visibility="gone"
+            tools:visibility="visible" />
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/roomToolbar"
@@ -38,9 +39,9 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/rootConstraintLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/rootConstraintLayout">
+        android:layout_height="match_parent">
 
         <im.vector.app.features.sync.widget.SyncStateView
             android:id="@+id/syncStateView"
@@ -75,7 +76,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:overScrollMode="always"
-            app:layout_constraintBottom_toTopOf="@id/notificationAreaView"
+            app:layout_constraintBottom_toTopOf="@id/failedMessagesWarningStub"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView"
@@ -95,7 +96,19 @@
             app:closeIcon="@drawable/ic_close_24dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView" />
+            app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView"
+            tools:visibility="visible" />
+
+        <ViewStub
+            android:id="@+id/failedMessagesWarningStub"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inflatedId="@+id/failedMessagesWarningStub"
+            android:layout="@layout/view_stub_failed_message_warning_layout"
+            app:layout_constraintBottom_toTopOf="@id/notificationAreaView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:layout_height="300dp" />
 
         <im.vector.app.core.ui.views.NotificationAreaView
             android:id="@+id/notificationAreaView"
@@ -107,17 +120,6 @@
             app:layout_constraintStart_toStartOf="parent"
             tools:visibility="visible" />
 
-        <ViewStub
-            android:id="@+id/failedMessagesWarningStub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/failedMessagesWarningStub"
-            android:layout="@layout/view_stub_failed_message_warning_layout"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:layout_height="300dp" />
-
         <ViewStub
             android:id="@+id/inviteViewStub"
             android:layout_width="0dp"
@@ -208,8 +210,8 @@
         android:id="@+id/composerContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:translationZ="10dp"
         android:background="@android:color/transparent"
+        android:translationZ="10dp"
         app:layout_behavior="im.vector.app.core.utils.ExpandingBottomSheetBehavior" />
 
     <FrameLayout
@@ -217,7 +219,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:visibility="visible"
-        android:translationZ="10dp" />
+        android:translationZ="10dp"
+        android:visibility="visible" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>