From 1d328f98e3dfe83e4dc2eaa127385f2833beebc3 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 18 Jul 2024 14:59:58 +0200
Subject: [PATCH] Fixed margin in conversation header if no back button

---
 app/src/main/res/layout/chat_conversation_fragment.xml | 2 +-
 app/src/main/res/values/dimen.xml                      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index b53b88a1e..4e8137d6c 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -87,7 +87,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginStart="5dp"
+                    android:layout_marginStart="@{viewModel.isInCallConversation || viewModel.showBackButton ? @dimen/chat_conversation_header_avatar_start_margin_if_back_button : @dimen/chat_conversation_header_avatar_start_margin_if_no_back_button, default=@dimen/chat_conversation_header_avatar_start_margin_if_back_button}"
                     layout="@layout/contact_avatar"
                     bind:model="@{viewModel.avatarModel}"
                     app:layout_constraintStart_toEndOf="@id/back"
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 54b3d91a0..d567378c6 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -87,6 +87,8 @@
     <dimen name="chat_bubble_max_width">291dp</dimen>
     <dimen name="chat_bubble_images_rounded_corner_radius">5dp</dimen>
     <dimen name="chat_bubble_start_margin_when_avatar_displayed">10dp</dimen>
+    <dimen name="chat_conversation_header_avatar_start_margin_if_back_button">5dp</dimen>
+    <dimen name="chat_conversation_header_avatar_start_margin_if_no_back_button">15dp</dimen>
 
     <dimen name="chat_room_emoji_picker_height">300dp</dimen>
     <dimen name="chat_room_participants_list_max_height">300dp</dimen>