From 409882725374701a42644032fee0a8a9b8b57bed Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 25 Mar 2024 10:05:15 +0100
Subject: [PATCH] Fixed square image in contact editor

---
 app/src/main/java/org/linphone/utils/DataBindingUtils.kt | 4 +++-
 app/src/main/res/layout/contact_new_or_edit_fragment.xml | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index cf5d90b41..6b7239e86 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -318,7 +318,9 @@ fun ImageView.startAnimatedDrawable(start: Boolean = true) {
 @BindingAdapter("coil")
 fun ImageView.loadCircleFileWithCoil(file: String?) {
     if (file != null) {
-        load(file)
+        load(file) {
+            transformations(CircleCropTransformation())
+        }
     }
 }
 
diff --git a/app/src/main/res/layout/contact_new_or_edit_fragment.xml b/app/src/main/res/layout/contact_new_or_edit_fragment.xml
index 6f1f0d0d2..e84393d8e 100644
--- a/app/src/main/res/layout/contact_new_or_edit_fragment.xml
+++ b/app/src/main/res/layout/contact_new_or_edit_fragment.xml
@@ -92,8 +92,8 @@
                     app:layout_constraintBottom_toBottomOf="@id/avatar" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    android:onClick="@{pickImageClickListener}"
                     style="@style/default_text_style"
+                    android:onClick="@{pickImageClickListener}"
                     android:id="@+id/add_picture_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -108,8 +108,8 @@
                     app:layout_constraintEnd_toEndOf="parent"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    android:onClick="@{pickImageClickListener}"
                     style="@style/default_text_style"
+                    android:onClick="@{pickImageClickListener}"
                     android:id="@+id/edit_picture_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -125,8 +125,8 @@
                     app:layout_constraintEnd_toStartOf="@id/remove_picture_label"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    android:onClick="@{deleteImageClickListener}"
                     style="@style/default_text_style"
+                    android:onClick="@{deleteImageClickListener}"
                     android:id="@+id/remove_picture_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"