From fadc6032fb6198c715a8ff7ac03dccec9f3f87b2 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 26 Oct 2023 11:40:56 +0200
Subject: [PATCH] Updated shape of FAB + updated chat icon in bottom nav bar

---
 .../main/res/layout-land/bottom_nav_bar.xml   |  2 +-
 .../main/res/layout-land/chat_fragment.xml    | 32 -------------------
 .../res/layout-land/chat_list_fragment.xml    |  1 +
 .../res/layout-land/contacts_fragment.xml     | 32 -------------------
 .../layout-land/contacts_list_fragment.xml    |  1 +
 .../main/res/layout-land/history_fragment.xml | 32 -------------------
 .../res/layout-land/history_list_fragment.xml |  1 +
 .../res/layout-land/meetings_fragment.xml     | 32 -------------------
 .../layout-land/meetings_list_fragment.xml    |  1 +
 app/src/main/res/layout/bottom_nav_bar.xml    |  2 +-
 .../main/res/layout/chat_list_fragment.xml    |  1 +
 .../res/layout/contacts_list_fragment.xml     |  1 +
 .../main/res/layout/history_list_fragment.xml |  1 +
 .../res/layout/meetings_list_fragment.xml     |  1 +
 app/src/main/res/values-land/dimen.xml        |  2 +-
 app/src/main/res/values/styles.xml            |  4 +--
 16 files changed, 13 insertions(+), 133 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/chat_fragment.xml
 delete mode 100644 app/src/main/res/layout-land/contacts_fragment.xml
 delete mode 100644 app/src/main/res/layout-land/history_fragment.xml
 delete mode 100644 app/src/main/res/layout-land/meetings_fragment.xml

diff --git a/app/src/main/res/layout-land/bottom_nav_bar.xml b/app/src/main/res/layout-land/bottom_nav_bar.xml
index 677071b94..8189d9b6a 100644
--- a/app/src/main/res/layout-land/bottom_nav_bar.xml
+++ b/app/src/main/res/layout-land/bottom_nav_bar.xml
@@ -81,7 +81,7 @@
             android:visibility="@{viewModel.hideConversations ? View.GONE : View.VISIBLE}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:drawableTop="@drawable/chat_text"
+            android:drawableTop="@drawable/chat_teardrop_text"
             android:drawablePadding="10dp"
             android:drawableTint="@{viewModel.conversationsSelected ? @color/orange_main_500 : @color/gray_main2_600, default=@color/gray_main2_600}"
             android:onClick="@{onConversationsClicked}"
diff --git a/app/src/main/res/layout-land/chat_fragment.xml b/app/src/main/res/layout-land/chat_fragment.xml
deleted file mode 100644
index d7f70c2bb..000000000
--- a/app/src/main/res/layout-land/chat_fragment.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-    </data>
-
-    <androidx.slidingpanelayout.widget.SlidingPaneLayout
-        android:id="@+id/sliding_pane_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/conversations_list"
-            android:name="org.linphone.ui.main.chat.fragment.ConversationsListFragment"
-            android:layout_width="@dimen/sliding_pane_left_fragment_width"
-            android:layout_height="match_parent"
-            app:layout="@layout/chat_list_fragment"/>
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/chat_nav_container"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            app:defaultNavHost="false"
-            app:navGraph="@navigation/chat_nav_graph"/>
-
-    </androidx.slidingpanelayout.widget.SlidingPaneLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/chat_list_fragment.xml b/app/src/main/res/layout-land/chat_list_fragment.xml
index 3aca8752e..b5a91cc83 100644
--- a/app/src/main/res/layout-land/chat_list_fragment.xml
+++ b/app/src/main/res/layout-land/chat_list_fragment.xml
@@ -108,6 +108,7 @@
                 android:src="@drawable/plus_circle"
                 app:tint="@color/gray_main2_700"
                 app:backgroundTint="@color/white"
+                app:shapeAppearanceOverlay="@style/rounded"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent" />
 
diff --git a/app/src/main/res/layout-land/contacts_fragment.xml b/app/src/main/res/layout-land/contacts_fragment.xml
deleted file mode 100644
index 9dda56568..000000000
--- a/app/src/main/res/layout-land/contacts_fragment.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-    </data>
-
-    <androidx.slidingpanelayout.widget.SlidingPaneLayout
-        android:id="@+id/sliding_pane_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/contacts_list"
-            android:name="org.linphone.ui.main.contacts.fragment.ContactsListFragment"
-            android:layout_width="@dimen/sliding_pane_left_fragment_width"
-            android:layout_height="match_parent"
-            app:layout="@layout/contacts_list_fragment"/>
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/contacts_nav_container"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            app:defaultNavHost="false"
-            app:navGraph="@navigation/contacts_nav_graph"/>
-
-    </androidx.slidingpanelayout.widget.SlidingPaneLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/contacts_list_fragment.xml b/app/src/main/res/layout-land/contacts_list_fragment.xml
index 403b1fbae..521cf143e 100644
--- a/app/src/main/res/layout-land/contacts_list_fragment.xml
+++ b/app/src/main/res/layout-land/contacts_list_fragment.xml
@@ -162,6 +162,7 @@
                 android:src="@drawable/user_plus"
                 app:tint="@color/gray_main2_700"
                 app:backgroundTint="@color/white"
+                app:shapeAppearanceOverlay="@style/rounded"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent" />
 
diff --git a/app/src/main/res/layout-land/history_fragment.xml b/app/src/main/res/layout-land/history_fragment.xml
deleted file mode 100644
index 1f429aee0..000000000
--- a/app/src/main/res/layout-land/history_fragment.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-    </data>
-
-    <androidx.slidingpanelayout.widget.SlidingPaneLayout
-        android:id="@+id/sliding_pane_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/history"
-            android:name="org.linphone.ui.main.history.fragment.HistoryListFragment"
-            android:layout_width="@dimen/sliding_pane_left_fragment_width"
-            android:layout_height="match_parent"
-            app:layout="@layout/history_list_fragment"/>
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/history_nav_container"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            app:defaultNavHost="false"
-            app:navGraph="@navigation/history_nav_graph"/>
-
-    </androidx.slidingpanelayout.widget.SlidingPaneLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/history_list_fragment.xml b/app/src/main/res/layout-land/history_list_fragment.xml
index 6a1e15fa3..6c073e8c6 100644
--- a/app/src/main/res/layout-land/history_list_fragment.xml
+++ b/app/src/main/res/layout-land/history_list_fragment.xml
@@ -126,6 +126,7 @@
                 android:src="@drawable/phone_plus"
                 app:tint="@color/gray_main2_700"
                 app:backgroundTint="@color/white"
+                app:shapeAppearanceOverlay="@style/rounded"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent" />
 
diff --git a/app/src/main/res/layout-land/meetings_fragment.xml b/app/src/main/res/layout-land/meetings_fragment.xml
deleted file mode 100644
index 178545578..000000000
--- a/app/src/main/res/layout-land/meetings_fragment.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-    </data>
-
-    <androidx.slidingpanelayout.widget.SlidingPaneLayout
-        android:id="@+id/sliding_pane_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/meetings_list"
-            android:name="org.linphone.ui.main.meetings.fragment.MeetingsListFragment"
-            android:layout_width="@dimen/sliding_pane_left_fragment_width"
-            android:layout_height="match_parent"
-            app:layout="@layout/meetings_list_fragment"/>
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/meetings_nav_container"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            app:defaultNavHost="false"
-            app:navGraph="@navigation/meetings_nav_graph"/>
-
-    </androidx.slidingpanelayout.widget.SlidingPaneLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/meetings_list_fragment.xml b/app/src/main/res/layout-land/meetings_list_fragment.xml
index eefe9f355..b83af18a8 100644
--- a/app/src/main/res/layout-land/meetings_list_fragment.xml
+++ b/app/src/main/res/layout-land/meetings_list_fragment.xml
@@ -123,6 +123,7 @@
                 android:src="@drawable/plus_circle"
                 app:tint="@color/gray_main2_700"
                 app:backgroundTint="@color/white"
+                app:shapeAppearanceOverlay="@style/rounded"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent" />
 
diff --git a/app/src/main/res/layout/bottom_nav_bar.xml b/app/src/main/res/layout/bottom_nav_bar.xml
index 236dd7c68..c915ef2bc 100644
--- a/app/src/main/res/layout/bottom_nav_bar.xml
+++ b/app/src/main/res/layout/bottom_nav_bar.xml
@@ -94,7 +94,7 @@
             android:layout_marginStart="18dp"
             android:paddingTop="16dp"
             android:paddingBottom="16dp"
-            android:drawableTop="@drawable/chat_text"
+            android:drawableTop="@drawable/chat_teardrop_text"
             android:drawablePadding="10dp"
             android:drawableTint="@{viewModel.conversationsSelected ? @color/orange_main_500 : @color/gray_main2_600, default=@color/gray_main2_600}"
             android:text="@string/bottom_navigation_conversations_label"
diff --git a/app/src/main/res/layout/chat_list_fragment.xml b/app/src/main/res/layout/chat_list_fragment.xml
index b88f77813..376ca8cab 100644
--- a/app/src/main/res/layout/chat_list_fragment.xml
+++ b/app/src/main/res/layout/chat_list_fragment.xml
@@ -108,6 +108,7 @@
                 android:src="@drawable/plus_circle"
                 app:tint="@color/gray_main2_700"
                 app:backgroundTint="@color/white"
+                app:shapeAppearanceOverlay="@style/rounded"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
 
diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml
index 276f9b827..c7d832cf9 100644
--- a/app/src/main/res/layout/contacts_list_fragment.xml
+++ b/app/src/main/res/layout/contacts_list_fragment.xml
@@ -164,6 +164,7 @@
                 android:src="@drawable/user_plus"
                 app:tint="@color/gray_main2_700"
                 app:backgroundTint="@color/white"
+                app:shapeAppearanceOverlay="@style/rounded"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
 
diff --git a/app/src/main/res/layout/history_list_fragment.xml b/app/src/main/res/layout/history_list_fragment.xml
index e21584282..a15237c7c 100644
--- a/app/src/main/res/layout/history_list_fragment.xml
+++ b/app/src/main/res/layout/history_list_fragment.xml
@@ -126,6 +126,7 @@
                 android:src="@drawable/phone_plus"
                 app:tint="@color/gray_main2_700"
                 app:backgroundTint="@color/white"
+                app:shapeAppearanceOverlay="@style/rounded"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
 
diff --git a/app/src/main/res/layout/meetings_list_fragment.xml b/app/src/main/res/layout/meetings_list_fragment.xml
index 5b63cf251..4887c9eb9 100644
--- a/app/src/main/res/layout/meetings_list_fragment.xml
+++ b/app/src/main/res/layout/meetings_list_fragment.xml
@@ -123,6 +123,7 @@
                 android:src="@drawable/plus_circle"
                 app:tint="@color/gray_main2_700"
                 app:backgroundTint="@color/white"
+                app:shapeAppearanceOverlay="@style/rounded"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
 
diff --git a/app/src/main/res/values-land/dimen.xml b/app/src/main/res/values-land/dimen.xml
index ec242d9ee..9e3c4b071 100644
--- a/app/src/main/res/values-land/dimen.xml
+++ b/app/src/main/res/values-land/dimen.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="sliding_pane_left_fragment_width">450dp</dimen>
-    <dimen name="sliding_pane_right_fragment_width">450dp</dimen>
+    <dimen name="sliding_pane_right_fragment_width">0dp</dimen>
 
     <dimen name="call_main_actions_menu_height">110dp</dimen>
     <dimen name="call_extra_actions_menu_height">125dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c40202942..28cab06d9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -149,7 +149,7 @@
         <item name="android:textColor">@color/gray_main2_600</item>
         <item name="android:textSize">14sp</item>
     </style>
-    <style name="ShapeAppearance.CircularBorder" parent="">
+    <style name="rounded">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">50%</item>
     </style>
@@ -158,7 +158,7 @@
         <item name="android:background">@drawable/shape_circle_light_blue_background</item>
         <item name="android:adjustViewBounds">true</item>
         <item name="android:scaleType">centerCrop</item>
-        <item name="shapeAppearanceOverlay">@style/ShapeAppearance.CircularBorder</item>
+        <item name="shapeAppearanceOverlay">@style/rounded</item>
         <item name="strokeColor">@color/transparent_color</item>
         <item name="strokeWidth">0dp</item>
     </style>