From e16cb01b31b774546e8fbf58a46dbe5e6d2affeb Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 10 Mar 2022 15:19:53 +0100
Subject: [PATCH] Conference layouts improvements

---
 .../res/layout-land/voip_conference_grid.xml  |  3 +-
 .../layout/voip_conference_active_speaker.xml |  3 +-
 .../res/layout/voip_conference_audio_only.xml |  3 +-
 .../layout/voip_conference_call_fragment.xml  | 65 +++++++++----------
 .../main/res/layout/voip_conference_grid.xml  |  3 +-
 ...cipant_remote_active_speaker_miniature.xml |  1 +
 ...oip_conference_participant_remote_grid.xml |  3 +-
 app/src/main/res/values/strings.xml           |  1 +
 8 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/app/src/main/res/layout-land/voip_conference_grid.xml b/app/src/main/res/layout-land/voip_conference_grid.xml
index 55b660ed7..15c4f3721 100644
--- a/app/src/main/res/layout-land/voip_conference_grid.xml
+++ b/app/src/main/res/layout-land/voip_conference_grid.xml
@@ -18,7 +18,8 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/voip_remote_margin_full_screen : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}">
 
         <LinearLayout
             android:layout_width="match_parent"
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 1f03781f3..ade129ef1 100644
--- a/app/src/main/res/layout/voip_conference_active_speaker.xml
+++ b/app/src/main/res/layout/voip_conference_active_speaker.xml
@@ -18,7 +18,8 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/voip_remote_margin_full_screen : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}">
 
         <LinearLayout
             android:id="@+id/header"
diff --git a/app/src/main/res/layout/voip_conference_audio_only.xml b/app/src/main/res/layout/voip_conference_audio_only.xml
index e286b7837..f20cd1d00 100644
--- a/app/src/main/res/layout/voip_conference_audio_only.xml
+++ b/app/src/main/res/layout/voip_conference_audio_only.xml
@@ -19,7 +19,8 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/voip_remote_margin_full_screen : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}">
 
         <LinearLayout
             android:id="@+id/header"
diff --git a/app/src/main/res/layout/voip_conference_call_fragment.xml b/app/src/main/res/layout/voip_conference_call_fragment.xml
index 1e77dba5f..bb9154dbd 100644
--- a/app/src/main/res/layout/voip_conference_call_fragment.xml
+++ b/app/src/main/res/layout/voip_conference_call_fragment.xml
@@ -31,45 +31,42 @@
             android:layout_height="match_parent"
             android:background="@{controlsViewModel.fullScreenMode ? @color/black_color : @color/transparent_color}">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <ViewStub
+                android:id="@+id/stubbed_conference_active_speaker_layout"
+                android:inflatedId="@+id/conference_active_speaker_layout"
+                android:layout="@layout/voip_conference_active_speaker"
+                android:visibility="@{conferenceViewModel.conferenceActiveSpeakerDisplayMode ? View.VISIBLE : View.GONE, default=gone}"
+                app:inflatedVisibility="@{conferenceViewModel.conferenceActiveSpeakerDisplayMode ? View.VISIBLE : View.GONE}"
                 android:layout_width="match_parent"
+                app:conferenceViewModel="@{conferenceViewModel}"
+                app:controlsViewModel="@{controlsViewModel}"
                 android:layout_height="0dp"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/primary_buttons"
-                android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/voip_remote_margin_full_screen : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}">
+                app:layout_constraintBottom_toTopOf="@id/primary_buttons" />
 
-                <ViewStub
-                    android:id="@+id/stubbed_conference_active_speaker_layout"
-                    android:inflatedId="@+id/conference_active_speaker_layout"
-                    android:layout="@layout/voip_conference_active_speaker"
-                    android:visibility="@{conferenceViewModel.conferenceActiveSpeakerDisplayMode ? View.VISIBLE : View.GONE, default=gone}"
-                    app:inflatedVisibility="@{conferenceViewModel.conferenceActiveSpeakerDisplayMode ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:conferenceViewModel="@{conferenceViewModel}"
-                    app:controlsViewModel="@{controlsViewModel}"/>
+            <ViewStub
+                android:id="@+id/stubbed_conference_grid_layout"
+                android:layout="@layout/voip_conference_grid"
+                android:visibility="@{conferenceViewModel.conferenceMosaicDisplayMode ? View.VISIBLE : View.GONE, default=gone}"
+                app:inflatedVisibility="@{conferenceViewModel.conferenceMosaicDisplayMode ? View.VISIBLE : View.GONE}"
+                android:layout_width="match_parent"
+                app:conferenceViewModel="@{conferenceViewModel}"
+                app:controlsViewModel="@{controlsViewModel}"
+                android:layout_height="0dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/primary_buttons" />
 
-                <ViewStub
-                    android:id="@+id/stubbed_conference_grid_layout"
-                    android:layout="@layout/voip_conference_grid"
-                    android:visibility="@{conferenceViewModel.conferenceMosaicDisplayMode ? View.VISIBLE : View.GONE, default=gone}"
-                    app:inflatedVisibility="@{conferenceViewModel.conferenceMosaicDisplayMode ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:conferenceViewModel="@{conferenceViewModel}"
-                    app:controlsViewModel="@{controlsViewModel}"/>
-
-                <ViewStub
-                    android:id="@+id/stubbed_conference_audio_only_layout"
-                    android:layout="@layout/voip_conference_audio_only"
-                    android:visibility="@{conferenceViewModel.conferenceAudioOnlyDisplayMode ? View.VISIBLE : View.GONE, default=gone}"
-                    app:inflatedVisibility="@{conferenceViewModel.conferenceAudioOnlyDisplayMode ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:conferenceViewModel="@{conferenceViewModel}"
-                    app:controlsViewModel="@{controlsViewModel}"/>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
+            <ViewStub
+                android:id="@+id/stubbed_conference_audio_only_layout"
+                android:layout="@layout/voip_conference_audio_only"
+                android:visibility="@{conferenceViewModel.conferenceAudioOnlyDisplayMode ? View.VISIBLE : View.GONE, default=gone}"
+                app:inflatedVisibility="@{conferenceViewModel.conferenceAudioOnlyDisplayMode ? View.VISIBLE : View.GONE}"
+                android:layout_width="match_parent"
+                app:conferenceViewModel="@{conferenceViewModel}"
+                app:controlsViewModel="@{controlsViewModel}"
+                android:layout_height="0dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/primary_buttons" />
 
             <ViewStub
                 android:id="@+id/stubbed_audio_routes"
diff --git a/app/src/main/res/layout/voip_conference_grid.xml b/app/src/main/res/layout/voip_conference_grid.xml
index f267ac657..202306715 100644
--- a/app/src/main/res/layout/voip_conference_grid.xml
+++ b/app/src/main/res/layout/voip_conference_grid.xml
@@ -18,7 +18,8 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/voip_remote_margin_full_screen : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}">
 
         <LinearLayout
             android:layout_width="match_parent"
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 58850a67f..680f3a031 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
@@ -58,6 +58,7 @@
             android:layout_height="@dimen/voip_conference_active_speaker_miniature_avatar_size"
             android:src="@drawable/icon_pause"
             android:background="@drawable/shape_button_background"
+            android:contentDescription="@string/content_description_participant_is_paused"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
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 91909b3f7..0f9a60019 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
@@ -57,10 +57,11 @@
                 android:layout_height="wrap_content"
                 android:src="@drawable/icon_pause"
                 android:background="@drawable/shape_button_background"
+                android:contentDescription="@string/content_description_participant_is_paused"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
+                app:layout_constraintEnd_toEndOf="parent"/>
 
             <ImageView
                 android:visibility="@{data.activeSpeaker ? View.VISIBLE : View.GONE, default=gone}"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a145ae7f1..87ab6d52c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -844,4 +844,5 @@
     <string name="content_description_go_to_chat_rooms_list">Go to conversations list</string>
     <string name="content_description_conference_participant_mic_muted">Participant has it\'s microphone muted</string>
     <string name="content_description_toggle_layout_menu">Show or hide conference layout menu</string>
+    <string name="content_description_participant_is_paused">Participant has momentarily left the conference</string>
 </resources>