From 0520765bdcde31b1843aafe63dfda66d80c07598 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 10 Nov 2022 14:25:56 +0100
Subject: [PATCH] Fixed active speaking participant paused UI when only 2 in
 conf

---
 .../voip_conference_active_speaker.xml        | 22 ++++++++++++++++---
 .../layout/voip_conference_active_speaker.xml | 21 ++++++++++++++++--
 2 files changed, 38 insertions(+), 5 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 8c47312d6..cb9a376a3 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
@@ -170,7 +170,7 @@
             app:layout_constraintEnd_toStartOf="@id/miniatures"
             app:layout_constraintBottom_toBottomOf="@id/hinge_bottom"
             android:layout_marginTop="@{controlsViewModel.fullScreenMode ? @dimen/margin_0dp : @dimen/voip_active_speaker_top_margin, default=@dimen/voip_active_speaker_top_margin}"
-            android:background="@drawable/shape_remote_background"
+            android:background="@{!conferenceViewModel.speakingParticipant.isInConference ? @drawable/shape_remote_paused_background : @drawable/shape_remote_background, default=@drawable/shape_remote_background}"
             android:onClick="@{() -> controlsViewModel.toggleFullScreen()}"/>
 
         <ImageView
@@ -188,6 +188,22 @@
             app:layout_constraintTop_toTopOf="@id/active_speaker_background"
             app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size" />
 
+        <ImageView
+            android:id="@+id/speaking_participant_paused"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="@drawable/shape_button_background"
+            android:contentDescription="@string/content_description_participant_is_paused"
+            android:src="@drawable/icon_pause"
+            android:visibility="@{conferenceViewModel.speakingParticipant.isInConference ? View.GONE : View.VISIBLE, default=gone}"
+            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" />
+
         <ProgressBar
             android:id="@+id/speaking_participant_joining"
             android:layout_width="@dimen/voip_conference_participant_joining_icon_size_active_speaker"
@@ -202,7 +218,7 @@
             android:id="@+id/conference_active_speaker_remote_video"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:visibility="@{!conferenceViewModel.isConferenceLocallyPaused &amp;&amp; conferenceViewModel.speakingParticipant.videoEnabled ? View.VISIBLE : View.GONE}"
+            android:visibility="@{!conferenceViewModel.isConferenceLocallyPaused &amp;&amp; conferenceViewModel.speakingParticipant.videoEnabled &amp;&amp; conferenceViewModel.speakingParticipant.isInConference ? View.VISIBLE : View.GONE}"
             app:layout_constraintBottom_toBottomOf="@id/active_speaker_background"
             app:layout_constraintEnd_toEndOf="@id/active_speaker_background"
             app:layout_constraintStart_toStartOf="@id/active_speaker_background"
@@ -330,7 +346,7 @@
             android:background="@drawable/shape_button_background"
             android:contentDescription="@string/content_description_participant_is_paused"
             android:src="@drawable/icon_pause"
-            android:visibility="@{conferenceViewModel.conferenceCreationPending || conferenceViewModel.meParticipant.isInConference || conferenceViewModel.meParticipant.isJoining ? View.GONE : View.VISIBLE, default=gone}"
+            android:visibility="@{conferenceViewModel.conferenceCreationPending || !conferenceViewModel.isConferenceLocallyPaused || conferenceViewModel.meParticipant.isJoining ? View.GONE : View.VISIBLE, default=gone}"
             app:layout_constraintBottom_toBottomOf="@id/local_participant_background"
             app:layout_constraintEnd_toEndOf="@id/local_participant_background"
             app:layout_constraintStart_toStartOf="@id/local_participant_background"
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 584ec0697..287054f6e 100644
--- a/app/src/main/res/layout/voip_conference_active_speaker.xml
+++ b/app/src/main/res/layout/voip_conference_active_speaker.xml
@@ -129,7 +129,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toTopOf="@id/miniatures"
             android:layout_marginTop="@{controlsViewModel.fullScreenMode ? @dimen/margin_0dp : @dimen/voip_active_speaker_top_margin, default=@dimen/voip_active_speaker_top_margin}"
-            android:background="@drawable/shape_remote_background"
+            android:background="@{!conferenceViewModel.speakingParticipant.isInConference ? @drawable/shape_remote_paused_background : @drawable/shape_remote_background, default=@drawable/shape_remote_background}"
             android:onClick="@{() -> controlsViewModel.toggleFullScreen()}"/>
 
         <ImageView
@@ -148,6 +148,23 @@
             app:layout_constraintTop_toTopOf="@id/active_speaker_background"
             app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size" />
 
+        <ImageView
+            android:id="@+id/speaking_participant_paused"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_margin="10dp"
+            android:background="@drawable/shape_button_background"
+            android:contentDescription="@string/content_description_participant_is_paused"
+            android:src="@drawable/icon_pause"
+            android:visibility="@{conferenceViewModel.speakingParticipant.isInConference ? View.GONE : View.VISIBLE, default=gone}"
+            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" />
+
         <ProgressBar
             android:id="@+id/speaking_participant_joining"
             android:layout_width="@dimen/voip_conference_participant_joining_icon_size_active_speaker"
@@ -162,7 +179,7 @@
             android:id="@+id/conference_active_speaker_remote_video"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:visibility="@{!conferenceViewModel.isConferenceLocallyPaused &amp;&amp; conferenceViewModel.speakingParticipant.videoEnabled ? View.VISIBLE : View.GONE}"
+            android:visibility="@{!conferenceViewModel.isConferenceLocallyPaused &amp;&amp; conferenceViewModel.speakingParticipant.videoEnabled &amp;&amp; conferenceViewModel.speakingParticipant.isInConference ? View.VISIBLE : View.GONE}"
             app:layout_constraintBottom_toBottomOf="@id/active_speaker_background"
             app:layout_constraintEnd_toEndOf="@id/active_speaker_background"
             app:layout_constraintStart_toStartOf="@id/active_speaker_background"