From 97574157ed95bc9da586b43f9d8e95d281bbcd1d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 23 Feb 2022 14:02:03 +0100
Subject: [PATCH] Added audio only conference layout

---
 .../ConferenceWaitingRoomViewModel.kt         |   4 +
 .../ConferencesSettingsViewModel.kt           |   3 +
 .../ActiveCallOrConferenceFragment.kt         |  15 ++
 .../fragments/ConferenceLayoutFragment.kt     |  14 ++
 .../voip/viewmodels/ConferenceViewModel.kt    |   5 +-
 .../java/org/linphone/core/CoreContext.kt     |   3 +
 ...oip_active_call_or_conference_fragment.xml |  10 ++
 .../res/layout/voip_conference_audio_only.xml | 140 ++++++++++++++++++
 8 files changed, 192 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/layout/voip_conference_audio_only.xml

diff --git a/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceWaitingRoomViewModel.kt b/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceWaitingRoomViewModel.kt
index 14268c6af..8625c6168 100644
--- a/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceWaitingRoomViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceWaitingRoomViewModel.kt
@@ -133,6 +133,10 @@ class ConferenceWaitingRoomViewModel : ViewModel() {
     }
 
     fun start() {
+        // Hide menus
+        audioRoutesSelected.value = false
+        layoutMenuSelected.value = false
+
         joinInProgress.value = true
         joinConferenceEvent.value = Event(callParams)
     }
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ConferencesSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ConferencesSettingsViewModel.kt
index 52d1c005c..07c593fb0 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ConferencesSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ConferencesSettingsViewModel.kt
@@ -48,6 +48,9 @@ class ConferencesSettingsViewModel : GenericSettingsViewModel() {
         labels.add(prefs.getString(R.string.conference_display_mode_mosaic))
         layoutValues.add(ConferenceLayout.Grid.toInt())
 
+        labels.add(prefs.getString(R.string.conference_display_mode_audio_only))
+        layoutValues.add(ConferenceLayout.Legacy.toInt()) // TODO: FIXME: Use AudioOnly
+
         layoutLabels.value = labels
         layoutIndex.value = layoutValues.indexOf(core.defaultConferenceLayout.toInt())
     }
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/ActiveCallOrConferenceFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/ActiveCallOrConferenceFragment.kt
index c61f22a40..4b5003241 100644
--- a/app/src/main/java/org/linphone/activities/voip/fragments/ActiveCallOrConferenceFragment.kt
+++ b/app/src/main/java/org/linphone/activities/voip/fragments/ActiveCallOrConferenceFragment.kt
@@ -115,6 +115,14 @@ class ActiveCallOrConferenceFragment : GenericFragment<VoipActiveCallOrConferenc
             }
         }
 
+        conferenceViewModel.conferenceAudioOnlyDisplayMode.observe(
+            viewLifecycleOwner
+        ) {
+            if (it) {
+                startTimer(R.id.audio_only_conference_timer)
+            }
+        }
+
         conferenceViewModel.conferenceParticipantDevices.observe(
             viewLifecycleOwner
         ) {
@@ -239,6 +247,13 @@ class ActiveCallOrConferenceFragment : GenericFragment<VoipActiveCallOrConferenc
             startTimer(R.id.grid_conference_timer)
         }
 
+        binding.stubbedConferenceAudioOnlyLayout.setOnInflateListener { _, inflated ->
+            Log.i("[Call] Audio only conference layout inflated")
+            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
+            binding?.lifecycleOwner = viewLifecycleOwner
+            startTimer(R.id.audio_only_conference_timer)
+        }
+
         binding.stubbedAudioRoutes.setOnInflateListener { _, inflated ->
             val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
             binding?.lifecycleOwner = viewLifecycleOwner
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceLayoutFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceLayoutFragment.kt
index ae01dcb17..8c70d994a 100644
--- a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceLayoutFragment.kt
+++ b/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceLayoutFragment.kt
@@ -74,6 +74,20 @@ class ConferenceLayoutFragment : GenericFragment<VoipConferenceLayoutFragmentBin
             }
         }
 
+        conferenceViewModel.conferenceAudioOnlyDisplayMode.observe(
+            viewLifecycleOwner
+        ) {
+            if (it) {
+                Log.i("[Conference] Trying to change conference layout to AudioOnly")
+                val conference = conferenceViewModel.conference.value
+                if (conference != null) {
+                    conference.layout = ConferenceLayout.Legacy // TODO: FIXME: Use AudioOnly
+                } else {
+                    Log.e("[Conference] Conference is null in ConferenceViewModel")
+                }
+            }
+        }
+
         conferenceViewModel.conferenceParticipantDevices.observe(
             viewLifecycleOwner
         ) {
diff --git a/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt b/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt
index 5e01189cd..10a15c777 100644
--- a/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt
@@ -64,7 +64,7 @@ class ConferenceViewModel : ViewModel() {
             updateParticipantsList(conference)
 
             val count = conferenceParticipants.value.orEmpty().size
-            if (count > maxParticipantsForMosaicLayout) {
+            if (count > maxParticipantsForMosaicLayout && conferenceMosaicDisplayMode.value == true) {
                 Log.w("[Conference] More than $maxParticipantsForMosaicLayout participants ($count), forcing active speaker layout")
                 conferenceMosaicDisplayMode.value = false
                 conferenceActiveSpeakerDisplayMode.value = true
@@ -292,8 +292,9 @@ class ConferenceViewModel : ViewModel() {
 
     private fun updateConferenceLayout(conference: Conference) {
         val layout = conference.layout
-        conferenceMosaicDisplayMode.value = layout == ConferenceLayout.Grid || layout == ConferenceLayout.Legacy
+        conferenceMosaicDisplayMode.value = layout == ConferenceLayout.Grid
         conferenceActiveSpeakerDisplayMode.value = layout == ConferenceLayout.ActiveSpeaker
+        conferenceAudioOnlyDisplayMode.value = layout == ConferenceLayout.Legacy // TODO: FIXME: Use AudioOnly layout
         Log.i("[Conference] Conference current layout is: $layout")
     }
 
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 99b216b69..c3744cdf1 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -354,6 +354,9 @@ class CoreContext(val context: Context, coreConfig: Config) {
             core.isVibrationOnIncomingCallEnabled = true
             core.config.setBool("app", "incoming_call_vibration", false)
         }
+        if (core.defaultConferenceLayout == ConferenceLayout.Legacy) {
+            core.defaultConferenceLayout = ConferenceLayout.ActiveSpeaker
+        }
 
         initUserCertificates()
 
diff --git a/app/src/main/res/layout/voip_active_call_or_conference_fragment.xml b/app/src/main/res/layout/voip_active_call_or_conference_fragment.xml
index 4e5f52de4..96aa3b285 100644
--- a/app/src/main/res/layout/voip_active_call_or_conference_fragment.xml
+++ b/app/src/main/res/layout/voip_active_call_or_conference_fragment.xml
@@ -59,6 +59,16 @@
                     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 &amp;&amp; conferenceViewModel.conferenceExists &amp;&amp; !callsViewModel.currentCallData.isActiveAndNotInConference ? View.VISIBLE : View.GONE, default=gone}"
+                    app:inflatedVisibility="@{conferenceViewModel.conferenceAudioOnlyDisplayMode &amp;&amp; conferenceViewModel.conferenceExists &amp;&amp; !callsViewModel.currentCallData.isActiveAndNotInConference ? View.VISIBLE : View.GONE}"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:conferenceViewModel="@{conferenceViewModel}"
+                    app:controlsViewModel="@{controlsViewModel}"/>
+
                 <include
                     android:id="@+id/remote_layout"
                     layout="@layout/voip_call"
diff --git a/app/src/main/res/layout/voip_conference_audio_only.xml b/app/src/main/res/layout/voip_conference_audio_only.xml
new file mode 100644
index 000000000..e286b7837
--- /dev/null
+++ b/app/src/main/res/layout/voip_conference_audio_only.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <import type="android.view.View" />
+        <variable
+            name="conferenceViewModel"
+            type="org.linphone.activities.voip.viewmodels.ConferenceViewModel" />
+        <variable
+            name="controlsViewModel"
+            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
+        <variable
+            name="inflatedVisibility"
+            type="Integer" />
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="@{inflatedVisibility}">
+
+        <LinearLayout
+            android:id="@+id/header"
+            android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/voip_call_header_height"
+            android:layout_marginBottom="10dp"
+            android:layout_alignParentTop="true"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/call_header_title"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:text="@{conferenceViewModel.subject, default=@string/conference_default_title}"/>
+
+                <Chronometer
+                    android:id="@+id/audio_only_conference_timer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/call_header_subtitle" />
+
+            </LinearLayout>
+
+            <ImageView
+                android:onClick="@{() -> conferenceViewModel.toggleRecording()}"
+                android:selected="@{conferenceViewModel.isRecording}"
+                android:layout_height="40dp"
+                android:layout_width="40dp"
+                android:background="@drawable/button_call_recording_background"
+                android:src="@drawable/icon_call_record"
+                android:contentDescription="@string/content_description_toggle_recording"
+                android:padding="7dp"
+                android:layout_marginEnd="10dp"/>
+
+            <ImageView
+                android:onClick="@{() -> conferenceViewModel.pauseConference()}"
+                android:selected="@{conferenceViewModel.isConferenceLocallyPaused}"
+                android:enabled="@{!conferenceViewModel.conferenceCreationPending}"
+                android:layout_height="40dp"
+                android:layout_width="40dp"
+                android:background="@drawable/button_toggle_background"
+                android:src="@drawable/icon_pause"
+                android:contentDescription="@string/content_description_pause_call"
+                android:padding="5dp"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/remote_recording"
+            android:visibility="@{conferenceViewModel.isRemotelyRecorded ? View.VISIBLE : View.GONE, default=gone}"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/header"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:layout_marginBottom="10dp"
+            android:background="@drawable/shape_remote_recording_background">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/voip_remote_recording"
+                android:contentDescription="@null"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                style="@style/call_remote_recording_font"
+                android:layout_marginStart="10dp"
+                android:text="@string/call_remote_recording"/>
+
+        </LinearLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:background="@drawable/shape_remote_background"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/remote_recording"
+            android:layout_above="@id/miniatures">
+
+            <include
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_margin="10dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintHeight_max="200dp"
+                app:data="@{conferenceViewModel.speakingParticipant}"
+                layout="@layout/voip_contact_avatar"/>
+
+            <TextView
+                android:text="@{conferenceViewModel.speakingParticipant.contact.fullName ?? conferenceViewModel.speakingParticipant.displayName}"
+                style="@style/call_remote_name_font"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:layout_marginStart="10dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </RelativeLayout>
+
+</layout>
\ No newline at end of file