From ed851b76ba85321b9a8a038208967166d167d2b1 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 27 Jul 2023 13:28:05 +0200
Subject: [PATCH] Fixed oval background behind avatar in some phones while in
 landscape

---
 .../main/res/layout-land/voip_conference_active_speaker.xml   | 4 ++--
 app/src/main/res/layout/voip_call_incoming_fragment.xml       | 3 ++-
 app/src/main/res/layout/voip_call_outgoing_fragment.xml       | 3 ++-
 app/src/main/res/layout/voip_conference_active_speaker.xml    | 4 ++--
 ...conference_participant_remote_active_speaker_miniature.xml | 3 ++-
 .../layout/voip_conference_participant_remote_audio_only.xml  | 3 ++-
 .../res/layout/voip_conference_participant_remote_grid.xml    | 3 ++-
 app/src/main/res/layout/voip_single_call_fragment.xml         | 3 ++-
 8 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout-land/voip_conference_active_speaker.xml b/app/src/main/res/layout-land/voip_conference_active_speaker.xml
index d3cdea714..8106f0a2b 100644
--- a/app/src/main/res/layout-land/voip_conference_active_speaker.xml
+++ b/app/src/main/res/layout-land/voip_conference_active_speaker.xml
@@ -181,13 +181,13 @@
             android:contentDescription="@null"
             coilVoipContact="@{conferenceViewModel.speakingParticipant}"
             android:background="@drawable/generated_avatar_bg"
-            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/active_speaker_background"
             app:layout_constraintEnd_toEndOf="@id/active_speaker_background"
             app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
             app:layout_constraintStart_toStartOf="@id/active_speaker_background"
             app:layout_constraintTop_toTopOf="@id/active_speaker_background"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size" />
+            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size"
+            app:layout_constraintDimensionRatio="1:1" />
 
         <ImageView
             android:id="@+id/speaking_participant_paused"
diff --git a/app/src/main/res/layout/voip_call_incoming_fragment.xml b/app/src/main/res/layout/voip_call_incoming_fragment.xml
index d8093d47c..a9ae0f199 100644
--- a/app/src/main/res/layout/voip_call_incoming_fragment.xml
+++ b/app/src/main/res/layout/voip_call_incoming_fragment.xml
@@ -83,7 +83,8 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/incoming_call_timer"
             app:layout_constraintVertical_chainStyle="packed"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size" />
+            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size"
+            app:layout_constraintDimensionRatio="1:1" />
 
         <TextView
             android:id="@+id/caller_name"
diff --git a/app/src/main/res/layout/voip_call_outgoing_fragment.xml b/app/src/main/res/layout/voip_call_outgoing_fragment.xml
index 6d6f4c59f..69fd78dbb 100644
--- a/app/src/main/res/layout/voip_call_outgoing_fragment.xml
+++ b/app/src/main/res/layout/voip_call_outgoing_fragment.xml
@@ -67,7 +67,8 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/outgoing_call_timer"
             app:layout_constraintVertical_chainStyle="packed"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size" />
+            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size"
+            app:layout_constraintDimensionRatio="1:1" />
 
         <ImageView
             android:id="@+id/conference_avatar"
diff --git a/app/src/main/res/layout/voip_conference_active_speaker.xml b/app/src/main/res/layout/voip_conference_active_speaker.xml
index 714a95d16..7289ea422 100644
--- a/app/src/main/res/layout/voip_conference_active_speaker.xml
+++ b/app/src/main/res/layout/voip_conference_active_speaker.xml
@@ -141,13 +141,13 @@
             android:contentDescription="@null"
             coilVoipContact="@{conferenceViewModel.speakingParticipant}"
             android:background="@drawable/generated_avatar_bg"
-            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/active_speaker_background"
             app:layout_constraintEnd_toEndOf="@id/active_speaker_background"
             app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
             app:layout_constraintStart_toStartOf="@id/active_speaker_background"
             app:layout_constraintTop_toTopOf="@id/active_speaker_background"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size" />
+            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size"
+            app:layout_constraintDimensionRatio="1:1" />
 
         <ImageView
             android:id="@+id/speaking_participant_paused"
diff --git a/app/src/main/res/layout/voip_conference_participant_remote_active_speaker_miniature.xml b/app/src/main/res/layout/voip_conference_participant_remote_active_speaker_miniature.xml
index e2ceadd86..84f73f08d 100644
--- a/app/src/main/res/layout/voip_conference_participant_remote_active_speaker_miniature.xml
+++ b/app/src/main/res/layout/voip_conference_participant_remote_active_speaker_miniature.xml
@@ -31,7 +31,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintDimensionRatio="1:1" />
 
         <org.linphone.activities.voip.views.RoundCornersTextureView
             android:id="@+id/participant_video_surface"
diff --git a/app/src/main/res/layout/voip_conference_participant_remote_audio_only.xml b/app/src/main/res/layout/voip_conference_participant_remote_audio_only.xml
index e55a303af..4a3b99802 100644
--- a/app/src/main/res/layout/voip_conference_participant_remote_audio_only.xml
+++ b/app/src/main/res/layout/voip_conference_participant_remote_audio_only.xml
@@ -55,7 +55,8 @@
             app:layout_constraintEnd_toStartOf="@id/paused_avatar"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintDimensionRatio="1:1" />
 
         <ImageView
             android:id="@+id/paused_avatar"
diff --git a/app/src/main/res/layout/voip_conference_participant_remote_grid.xml b/app/src/main/res/layout/voip_conference_participant_remote_grid.xml
index a5e353bce..4b75e5f32 100644
--- a/app/src/main/res/layout/voip_conference_participant_remote_grid.xml
+++ b/app/src/main/res/layout/voip_conference_participant_remote_grid.xml
@@ -40,7 +40,8 @@
             app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size" />
+            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size"
+            app:layout_constraintDimensionRatio="1:1" />
 
         <org.linphone.activities.voip.views.RoundCornersTextureView
             android:id="@+id/participant_video_surface"
diff --git a/app/src/main/res/layout/voip_single_call_fragment.xml b/app/src/main/res/layout/voip_single_call_fragment.xml
index 7b088e11e..643b374d2 100644
--- a/app/src/main/res/layout/voip_single_call_fragment.xml
+++ b/app/src/main/res/layout/voip_single_call_fragment.xml
@@ -150,7 +150,8 @@
                 app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
                 app:layout_constraintStart_toStartOf="@id/background"
                 app:layout_constraintTop_toTopOf="@id/background"
-                app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size" />
+                app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size"
+                app:layout_constraintDimensionRatio="1:1"/>
 
             <TextView
                 android:id="@+id/display_name"