From df8721c5fd4a62e0d08c4eacd6cb25cd3dc5d57e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 24 Mar 2022 15:29:55 +0100
Subject: [PATCH] Fixed margin between views in mosaic conference layout that
 was removed with latest rework

---
 .../activities/voip/views/GridBoxLayout.kt    |  3 ++-
 ...oip_conference_participant_remote_grid.xml | 23 ++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/voip/views/GridBoxLayout.kt b/app/src/main/java/org/linphone/activities/voip/views/GridBoxLayout.kt
index b474739fd..b05a227bf 100644
--- a/app/src/main/java/org/linphone/activities/voip/views/GridBoxLayout.kt
+++ b/app/src/main/java/org/linphone/activities/voip/views/GridBoxLayout.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
+ * Copyright (c) 2010-2022 Belledonne Communications SARL.
  *
  * This file is part of linphone-android
  * (see https://www.linphone.org).
@@ -18,6 +18,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 package org.linphone.activities.voip.views
+
 import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
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 af93dafa2..02ae56875 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
@@ -14,12 +14,17 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@{!data.isInConference ? @drawable/shape_remote_paused_background : data.videoEnabled ? @drawable/shape_remote_video_background : @drawable/shape_remote_background, default=@drawable/shape_remote_background}"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintDimensionRatio="1:1">
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_margin="5dp"
+            android:background="@{!data.isInConference ? @drawable/shape_remote_paused_background : data.videoEnabled ? @drawable/shape_remote_video_background : @drawable/shape_remote_background, default=@drawable/shape_remote_background}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <include
             layout="@layout/voip_contact_avatar"
@@ -39,6 +44,7 @@
             participantTextureView="@{data}"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_margin="5dp"
             android:visibility="@{data.videoEnabled &amp;&amp; data.isInConference ? View.VISIBLE : View.GONE}"
             app:alignTopRight="false"
             app:displayMode="hybrid"
@@ -62,6 +68,7 @@
         <ImageView
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_margin="5dp"
             android:adjustViewBounds="true"
             android:contentDescription="@null"
             android:src="@drawable/shape_conference_active_speaker_border"
@@ -95,7 +102,7 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="5dp"
+            android:layout_margin="10dp"
             android:contentDescription="@string/content_description_switch_camera"
             android:onClick="@{() -> data.switchCamera()}"
             android:padding="5dp"
@@ -107,7 +114,7 @@
         <ImageView
             android:layout_width="@dimen/voip_conference_participant_mic_muted_icon_size"
             android:layout_height="@dimen/voip_conference_participant_mic_muted_icon_size"
-            android:layout_margin="5dp"
+            android:layout_margin="10dp"
             android:background="@drawable/shape_button_disabled_background"
             android:contentDescription="@string/content_description_conference_participant_mic_muted"
             android:padding="5dp"