From 09bbe650e3c71cbab5b46cf0fc7df74c4cb5a43e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 31 Jul 2023 16:42:57 +0200
Subject: [PATCH] Improved bottom bar layouts

---
 app/src/main/res/drawable/meetings.xml        | 21 +++++++++-----
 .../res/layout/bottom_nav_bar_contacts.xml    | 28 +++++++++++--------
 .../layout/bottom_nav_bar_conversations.xml   | 28 +++++++++++--------
 3 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/app/src/main/res/drawable/meetings.xml b/app/src/main/res/drawable/meetings.xml
index bac6848af..fbfe18ea9 100644
--- a/app/src/main/res/drawable/meetings.xml
+++ b/app/src/main/res/drawable/meetings.xml
@@ -2,12 +2,19 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:name="vector"
     android:width="24dp"
-    android:height="12dp"
+    android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="12">
-    <path
-        android:name="path"
-        android:pathData="M 4 7 C 5.1 7 6 6.1 6 5 C 6 3.9 5.1 3 4 3 C 2.9 3 2 3.9 2 5 C 2 6.1 2.9 7 4 7 Z M 5.13 8.1 C 4.76 8.04 4.39 8 4 8 C 3.01 8 2.07 8.21 1.22 8.58 C 0.48 8.9 0 9.62 0 10.43 L 0 12 L 4.5 12 L 4.5 10.39 C 4.5 9.56 4.73 8.78 5.13 8.1 Z M 20 7 C 21.1 7 22 6.1 22 5 C 22 3.9 21.1 3 20 3 C 18.9 3 18 3.9 18 5 C 18 6.1 18.9 7 20 7 Z M 24 10.43 C 24 9.62 23.52 8.9 22.78 8.58 C 21.93 8.21 20.99 8 20 8 C 19.61 8 19.24 8.04 18.87 8.1 C 19.27 8.78 19.5 9.56 19.5 10.39 L 19.5 12 L 24 12 L 24 10.43 Z M 16.24 7.65 C 15.07 7.13 13.63 6.75 12 6.75 C 10.37 6.75 8.93 7.14 7.76 7.65 C 6.68 8.13 6 9.21 6 10.39 L 6 12 L 18 12 L 18 10.39 C 18 9.21 17.32 8.13 16.24 7.65 Z M 8.07 10 C 8.16 9.77 8.2 9.61 8.98 9.31 C 9.95 8.93 10.97 8.75 12 8.75 C 13.03 8.75 14.05 8.93 15.02 9.31 C 15.79 9.61 15.83 9.77 15.93 10 L 8.07 10 Z M 12 2 C 12.55 2 13 2.45 13 3 C 13 3.55 12.55 4 12 4 C 11.45 4 11 3.55 11 3 C 11 2.45 11.45 2 12 2 Z M 12 0 C 10.34 0 9 1.34 9 3 C 9 4.66 10.34 6 12 6 C 13.66 6 15 4.66 15 3 C 15 1.34 13.66 0 12 0 Z"
-        android:fillColor="#4e6074"
-        android:strokeWidth="1"/>
+    android:viewportHeight="24">
+    <group android:name="wrapper">
+        <clip-path
+            android:name="clip0_116_4583"
+            android:pathData="M 0 0 L 24 0 L 24 24 L 0 24 Z"/>
+        <group android:name="group">
+            <path
+                android:name="path"
+                android:pathData="M 12 12.75 C 13.63 12.75 15.07 13.14 16.24 13.65 C 17.32 14.13 18 15.21 18 16.38 L 18 18 L 6 18 L 6 16.39 C 6 15.21 6.68 14.13 7.76 13.66 C 8.93 13.14 10.37 12.75 12 12.75 Z M 4 13 C 5.1 13 6 12.1 6 11 C 6 9.9 5.1 9 4 9 C 2.9 9 2 9.9 2 11 C 2 12.1 2.9 13 4 13 Z M 5.13 14.1 C 4.76 14.04 4.39 14 4 14 C 3.01 14 2.07 14.21 1.22 14.58 C 0.48 14.9 0 15.62 0 16.43 L 0 18 L 4.5 18 L 4.5 16.39 C 4.5 15.56 4.73 14.78 5.13 14.1 Z M 20 13 C 21.1 13 22 12.1 22 11 C 22 9.9 21.1 9 20 9 C 18.9 9 18 9.9 18 11 C 18 12.1 18.9 13 20 13 Z M 24 16.43 C 24 15.62 23.52 14.9 22.78 14.58 C 21.93 14.21 20.99 14 20 14 C 19.61 14 19.24 14.04 18.87 14.1 C 19.27 14.78 19.5 15.56 19.5 16.39 L 19.5 18 L 24 18 L 24 16.43 Z M 12 6 C 13.66 6 15 7.34 15 9 C 15 10.66 13.66 12 12 12 C 10.34 12 9 10.66 9 9 C 9 7.34 10.34 6 12 6 Z"
+                android:fillColor="#ffffff"
+                android:strokeWidth="1"/>
+        </group>
+    </group>
 </vector>
diff --git a/app/src/main/res/layout/bottom_nav_bar_contacts.xml b/app/src/main/res/layout/bottom_nav_bar_contacts.xml
index 0e9d69bc8..75ac3326f 100644
--- a/app/src/main/res/layout/bottom_nav_bar_contacts.xml
+++ b/app/src/main/res/layout/bottom_nav_bar_contacts.xml
@@ -18,14 +18,15 @@
 
         <TextView
             android:id="@+id/contacts"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
             android:drawableTop="@drawable/contacts"
             android:drawablePadding="10dp"
             android:text="Contacts"
             android:textSize="11sp"
+            android:gravity="center"
             android:textColor="@color/gray_9"
             android:drawableTint="@color/primary_color"
             android:textStyle="bold"
@@ -36,15 +37,16 @@
 
         <TextView
             android:id="@+id/calls"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="18dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
             android:drawableTop="@drawable/calls"
             android:drawablePadding="10dp"
             android:text="Calls"
             android:textSize="11sp"
+            android:gravity="center"
             android:textColor="@color/gray_9"
             android:drawableTint="@color/gray_9"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -55,15 +57,16 @@
         <TextView
             android:onClick="@{onConversationsClicked}"
             android:id="@+id/conversations"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="18dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
             android:drawableTop="@drawable/conversations"
             android:drawablePadding="10dp"
             android:text="Conversations"
             android:textSize="11sp"
+            android:gravity="center"
             android:textColor="@color/gray_9"
             android:drawableTint="@color/gray_9"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -73,15 +76,16 @@
 
         <TextView
             android:id="@+id/meetings"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="18dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
             android:drawableTop="@drawable/meetings"
             android:drawablePadding="10dp"
             android:text="Meetings"
             android:textSize="11sp"
+            android:gravity="center"
             android:textColor="@color/gray_9"
             android:drawableTint="@color/gray_9"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/bottom_nav_bar_conversations.xml b/app/src/main/res/layout/bottom_nav_bar_conversations.xml
index 08bfc3524..9e002df3e 100644
--- a/app/src/main/res/layout/bottom_nav_bar_conversations.xml
+++ b/app/src/main/res/layout/bottom_nav_bar_conversations.xml
@@ -18,14 +18,15 @@
         <TextView
             android:onClick="@{onContactsClicked}"
             android:id="@+id/contacts"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
             android:drawableTop="@drawable/contacts"
             android:drawablePadding="10dp"
             android:text="Contacts"
             android:textSize="11sp"
+            android:gravity="center"
             android:textColor="@color/gray_9"
             android:drawableTint="@color/gray_9"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -35,15 +36,16 @@
 
         <TextView
             android:id="@+id/calls"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="18dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
             android:drawableTop="@drawable/calls"
             android:drawablePadding="10dp"
             android:text="Calls"
             android:textSize="11sp"
+            android:gravity="center"
             android:textColor="@color/gray_9"
             android:drawableTint="@color/gray_9"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -53,15 +55,16 @@
 
         <TextView
             android:id="@+id/conversations"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="18dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
             android:drawableTop="@drawable/conversations"
             android:drawablePadding="10dp"
             android:text="Conversations"
             android:textSize="11sp"
+            android:gravity="center"
             android:textColor="@color/gray_9"
             android:drawableTint="@color/primary_color"
             android:textStyle="bold"
@@ -72,15 +75,16 @@
 
         <TextView
             android:id="@+id/meetings"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="18dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
             android:drawableTop="@drawable/meetings"
             android:drawablePadding="10dp"
             android:text="Meetings"
             android:textSize="11sp"
+            android:gravity="center"
             android:textColor="@color/gray_9"
             android:drawableTint="@color/gray_9"
             app:layout_constraintBottom_toBottomOf="parent"