From 5d147d9665ba13e6278f2e859b423de26864e795 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 23 Oct 2022 10:04:48 +0200
Subject: [PATCH] Move bottom space bar bellow DM/group tab navigation

Change-Id: I2dbb2e22ab8166f9e1025dd831da1c7ea25e3bf1
---
 .../main/res/layout/fragment_home_detail.xml  | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index 97af157fc5..72f87b3f21 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -150,7 +150,7 @@
         android:id="@+id/roomListContainerStateView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/spaceBarRecyclerView"
+        app:layout_constraintBottom_toTopOf="@+id/bottomNavigationView"
         app:layout_constraintTop_toBottomOf="@+id/homeKeysBackupBanner">
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/roomListContainerPager"
@@ -158,6 +158,18 @@
             android:layout_height="match_parent" />
     </im.vector.app.core.platform.StateView>
 
+    <!-- Elevation: match space bar -->
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/bottomNavigationView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:elevation="4dp"
+        app:elevation="4dp"
+        app:layout_constraintBottom_toTopOf="@id/spaceBarRecyclerView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:menu="@menu/home_bottom_navigation" />
+
     <!-- Own view for spacebar bg in case of wrap_content of spaceBarRecyclerView is smaller than screen estate -->
     <View
         android:id="@+id/spaceBarBackground"
@@ -165,6 +177,7 @@
         android:layout_height="0dp"
         android:background="@drawable/bg_bottom_navigation"
         android:elevation="4dp"
+        app:elevation="4dp"
         app:layout_constraintBottom_toBottomOf="@id/spaceBarRecyclerView"
         app:layout_constraintTop_toTopOf="@id/spaceBarRecyclerView"
         app:layout_constraintStart_toStartOf="parent"
@@ -177,17 +190,9 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:elevation="80dp"
+        app:elevation="80dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/bottomNavigationView" />
-
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/bottomNavigationView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:menu="@menu/home_bottom_navigation" />
+        app:layout_constraintBottom_toBottomOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>