From 935d134bbd76ef3c6ae4886d2c41465d003b8e5e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 15 Feb 2024 14:20:29 +0100
Subject: [PATCH] Show paused icon instead of call quality indicator while
 paused or paused by remote

---
 .../call_conference_actions_bottom_sheet.xml   |  4 ++--
 .../layout/call_active_conference_fragment.xml | 18 +++++++++++++++---
 .../main/res/layout/call_active_fragment.xml   | 16 ++++++++++++++--
 .../call_conference_actions_bottom_sheet.xml   |  4 ++--
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml b/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml
index db6dedf28..0dffd0c8f 100644
--- a/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml
+++ b/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml
@@ -137,7 +137,7 @@
             android:layout_height="@dimen/call_button_size"
             android:layout_marginTop="@dimen/call_extra_button_top_margin"
             android:padding="@dimen/call_button_icon_padding"
-            android:src="@drawable/pause"
+            android:src="@{viewModel.isPaused ? @drawable/play : @drawable/pause, default=@drawable/pause}"
             android:background="@drawable/in_call_button_background_green"
             app:tint="@color/in_call_button_tint_color"
             app:layout_constraintDimensionRatio="1:1"
@@ -224,7 +224,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:paddingBottom="15dp"
-            android:text="@string/call_action_pause_call"
+            android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}"
             app:layout_constraintTop_toBottomOf="@id/pause_call"
             app:layout_constraintStart_toEndOf="@id/chat_label"
             app:layout_constraintEnd_toStartOf="@id/record_call_label" />
diff --git a/app/src/main/res/layout/call_active_conference_fragment.xml b/app/src/main/res/layout/call_active_conference_fragment.xml
index 0edb0c084..389f5c8cc 100644
--- a/app/src/main/res/layout/call_active_conference_fragment.xml
+++ b/app/src/main/res/layout/call_active_conference_fragment.xml
@@ -127,11 +127,23 @@
                 android:layout_marginStart="5dp"
                 android:layout_marginEnd="5dp"
                 android:src="@drawable/camera_rotate"
-                android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; viewModel.isVideoEnabled &amp;&amp; viewModel.showSwitchCamera ? View.VISIBLE : View.GONE}"
+                android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; viewModel.isVideoEnabled &amp;&amp; viewModel.showSwitchCamera &amp;&amp; conferenceViewModel.participantDevices.size() > 1 ? View.VISIBLE : View.GONE}"
                 app:tint="@color/white"
                 app:layout_constraintTop_toTopOf="@id/conference_subject"
                 app:layout_constraintBottom_toBottomOf="@id/conference_subject"
-                app:layout_constraintEnd_toStartOf="@+id/stats" />
+                app:layout_constraintEnd_toStartOf="@+id/paused" />
+
+            <ImageView
+                android:id="@+id/paused"
+                android:layout_width="@dimen/call_top_bar_info_height"
+                android:layout_height="@dimen/call_top_bar_info_height"
+                android:padding="10dp"
+                android:src="@drawable/pause"
+                android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; (viewModel.isPaused || viewModel.isPausedByRemote) ? View.VISIBLE : View.GONE, default=gone}"
+                app:tint="@color/main1_500"
+                app:layout_constraintTop_toTopOf="@id/back"
+                app:layout_constraintBottom_toBottomOf="@id/back"
+                app:layout_constraintEnd_toStartOf="@id/stats" />
 
             <ImageView
                 android:id="@+id/stats"
@@ -140,7 +152,7 @@
                 android:layout_height="@dimen/call_top_bar_info_height"
                 android:padding="10dp"
                 android:src="@{viewModel.qualityIcon, default=@drawable/cell_signal_full}"
-                android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode ? View.VISIBLE : View.GONE}"
+                android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; !(viewModel.isPaused || viewModel.isPausedByRemote) ? View.VISIBLE : View.GONE}"
                 android:tint="@{viewModel.qualityValue >= 2 ? @color/white : viewModel.qualityValue >= 1 ? @color/orange_warning_600 : @color/red_danger_500, default=@color/white}"
                 app:layout_constraintTop_toTopOf="@id/conference_subject"
                 app:layout_constraintBottom_toBottomOf="@id/conference_subject"
diff --git a/app/src/main/res/layout/call_active_fragment.xml b/app/src/main/res/layout/call_active_fragment.xml
index 8cdec3e5d..331e9b363 100644
--- a/app/src/main/res/layout/call_active_fragment.xml
+++ b/app/src/main/res/layout/call_active_fragment.xml
@@ -204,7 +204,19 @@
                 app:tint="@color/white"
                 app:layout_constraintTop_toTopOf="@id/back"
                 app:layout_constraintBottom_toBottomOf="@id/back"
-                app:layout_constraintEnd_toStartOf="@+id/stats" />
+                app:layout_constraintEnd_toStartOf="@+id/paused" />
+
+            <ImageView
+                android:id="@+id/paused"
+                android:layout_width="@dimen/call_top_bar_info_height"
+                android:layout_height="@dimen/call_top_bar_info_height"
+                android:padding="10dp"
+                android:src="@drawable/pause"
+                android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; (viewModel.isPaused || viewModel.isPausedByRemote) ? View.VISIBLE : View.GONE, default=gone}"
+                app:tint="@color/main1_500"
+                app:layout_constraintTop_toTopOf="@id/back"
+                app:layout_constraintBottom_toBottomOf="@id/back"
+                app:layout_constraintEnd_toStartOf="@id/stats" />
 
             <ImageView
                 android:id="@+id/stats"
@@ -213,7 +225,7 @@
                 android:layout_height="@dimen/call_top_bar_info_height"
                 android:padding="10dp"
                 android:src="@{viewModel.qualityIcon, default=@drawable/cell_signal_full}"
-                android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode ? View.VISIBLE : View.GONE}"
+                android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; !(viewModel.isPaused || viewModel.isPausedByRemote) ? View.VISIBLE : View.GONE}"
                 android:tint="@{viewModel.qualityValue >= 2 ? @color/white : viewModel.qualityValue >= 1 ? @color/orange_warning_600 : @color/red_danger_500, default=@color/white}"
                 app:layout_constraintTop_toTopOf="@id/back"
                 app:layout_constraintBottom_toBottomOf="@id/back"
diff --git a/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml b/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml
index ca268643d..2bea62806 100644
--- a/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml
+++ b/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml
@@ -136,7 +136,7 @@
             android:layout_height="@dimen/call_button_size"
             android:layout_marginTop="@dimen/call_extra_button_top_margin"
             android:padding="@dimen/call_button_icon_padding"
-            android:src="@drawable/pause"
+            android:src="@{viewModel.isPaused ? @drawable/play : @drawable/pause, default=@drawable/pause}"
             android:background="@drawable/in_call_button_background_green"
             app:tint="@color/in_call_button_tint_color"
             app:layout_constraintDimensionRatio="1:1"
@@ -219,7 +219,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:paddingBottom="15dp"
-            android:text="@string/call_action_pause_call"
+            android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}"
             app:layout_constraintTop_toBottomOf="@id/pause_call"
             app:layout_constraintStart_toStartOf="@id/participants_label"
             app:layout_constraintEnd_toEndOf="@id/participants_label" />