From febc6a85d370d9adea6d649b7aac2933e7f48de3 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 22 Jan 2025 10:12:34 +0100
Subject: [PATCH] Trying to prevent hidden bottom nav bar (very rare)

---
 app/src/main/res/layout/bottom_nav_bar.xml         | 2 +-
 app/src/main/res/layout/chat_list_fragment.xml     | 2 +-
 app/src/main/res/layout/contacts_list_fragment.xml | 2 +-
 app/src/main/res/layout/history_list_fragment.xml  | 2 +-
 app/src/main/res/layout/meetings_list_fragment.xml | 2 +-
 app/src/main/res/values/dimen.xml                  | 1 +
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/bottom_nav_bar.xml b/app/src/main/res/layout/bottom_nav_bar.xml
index 0de55daeb..cb2bbe0c6 100644
--- a/app/src/main/res/layout/bottom_nav_bar.xml
+++ b/app/src/main/res/layout/bottom_nav_bar.xml
@@ -14,7 +14,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/bottom_nav_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/portrait_nav_bar_height"
         android:elevation="16dp"
         android:background="?attr/color_background_contrast_in_dark_mode">
 
diff --git a/app/src/main/res/layout/chat_list_fragment.xml b/app/src/main/res/layout/chat_list_fragment.xml
index 36a07c6e3..ca9901314 100644
--- a/app/src/main/res/layout/chat_list_fragment.xml
+++ b/app/src/main/res/layout/chat_list_fragment.xml
@@ -104,7 +104,7 @@
                 <include
                     android:id="@+id/bottom_nav_bar"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/portrait_nav_bar_height"
                     layout="@layout/bottom_nav_bar"
                     bind:viewModel="@{viewModel}"
                     app:layout_constraintBottom_toBottomOf="parent" />
diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml
index 25792d42d..b5e307440 100644
--- a/app/src/main/res/layout/contacts_list_fragment.xml
+++ b/app/src/main/res/layout/contacts_list_fragment.xml
@@ -152,7 +152,7 @@
                 <include
                     android:id="@+id/bottom_nav_bar"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/portrait_nav_bar_height"
                     layout="@layout/bottom_nav_bar"
                     bind:viewModel="@{viewModel}"
                     app:layout_constraintBottom_toBottomOf="parent" />
diff --git a/app/src/main/res/layout/history_list_fragment.xml b/app/src/main/res/layout/history_list_fragment.xml
index 0baddd46b..17f21ccaf 100644
--- a/app/src/main/res/layout/history_list_fragment.xml
+++ b/app/src/main/res/layout/history_list_fragment.xml
@@ -114,7 +114,7 @@
                 <include
                     android:id="@+id/bottom_nav_bar"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/portrait_nav_bar_height"
                     layout="@layout/bottom_nav_bar"
                     bind:viewModel="@{viewModel}"
                     app:layout_constraintBottom_toBottomOf="parent" />
diff --git a/app/src/main/res/layout/meetings_list_fragment.xml b/app/src/main/res/layout/meetings_list_fragment.xml
index c789d793a..ad654234f 100644
--- a/app/src/main/res/layout/meetings_list_fragment.xml
+++ b/app/src/main/res/layout/meetings_list_fragment.xml
@@ -79,7 +79,7 @@
                 <include
                     android:id="@+id/bottom_nav_bar"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/portrait_nav_bar_height"
                     layout="@layout/bottom_nav_bar"
                     bind:viewModel="@{viewModel}"
                     app:layout_constraintBottom_toBottomOf="parent" />
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index e59668806..12b62c7c6 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -5,6 +5,7 @@
 
     <dimen name="screen_bottom_margin">10dp</dimen>
 
+    <dimen name="portrait_nav_bar_height">85dp</dimen>
     <dimen name="landscape_nav_bar_width">75dp</dimen>
     <dimen name="sliding_pane_left_fragment_width">350dp</dimen>
     <dimen name="sliding_pane_right_fragment_width">300dp</dimen>