From ed05b648d174fd571a52fb5d7ddf0e8b0949f313 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 18 Apr 2024 17:04:57 +0200
Subject: [PATCH] Updated active speaker portrait layout + added landscape
 layout

---
 ...all_conference_active_speaker_fragment.xml | 168 ++++++++++++++++++
 ...all_conference_active_speaker_fragment.xml |   8 +-
 2 files changed, 172 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/layout-land/call_conference_active_speaker_fragment.xml

diff --git a/app/src/main/res/layout-land/call_conference_active_speaker_fragment.xml b/app/src/main/res/layout-land/call_conference_active_speaker_fragment.xml
new file mode 100644
index 000000000..67092ecc3
--- /dev/null
+++ b/app/src/main/res/layout-land/call_conference_active_speaker_fragment.xml
@@ -0,0 +1,168 @@
+<?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:bind="http://schemas.android.com/tools">
+
+    <data>
+        <import type="android.view.View" />
+        <import type="org.linphone.ui.call.conference.viewmodel.ConferenceViewModel" />
+        <variable
+            name="viewModel"
+            type="org.linphone.ui.call.viewmodel.CurrentCallViewModel" />
+        <variable
+            name="conferenceViewModel"
+            type="org.linphone.ui.call.conference.viewmodel.ConferenceViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraint_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/gray_900">
+
+        <include
+            android:id="@+id/avatar"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            layout="@layout/contact_avatar_huge"
+            android:layout_marginTop="5dp"
+            bind:model="@{conferenceViewModel.activeSpeaker.avatarModel}"
+            android:visibility="@{conferenceViewModel.activeSpeaker.isSendingVideo || conferenceViewModel.activeSpeaker.isJoining || !conferenceViewModel.activeSpeaker.isInConference ? View.GONE : View.VISIBLE}"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintWidth_max="@dimen/avatar_in_call_size"
+            app:layout_constraintHeight_max="@dimen/avatar_in_call_size"
+            app:layout_constraintVertical_chainStyle="packed"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/active_speaker_miniatures_vertical_layout"
+            app:layout_constraintBottom_toBottomOf="@id/active_speaker_name" />
+
+        <org.linphone.ui.call.view.RoundCornersTextureView
+            android:id="@+id/active_speaker_surface"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginEnd="8dp"
+            android:onClick="@{() -> viewModel.toggleFullScreen()}"
+            android:visibility="@{conferenceViewModel.activeSpeaker.isSendingVideo &amp;&amp; conferenceViewModel.activeSpeaker.isInConference ? View.VISIBLE : View.GONE, default=gone}"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/active_speaker_miniatures_vertical_layout"/>
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/joining"
+            android:layout_width="@dimen/big_icon_size"
+            android:layout_height="@dimen/big_icon_size"
+            android:indeterminate="true"
+            android:visibility="@{conferenceViewModel.activeSpeaker.isJoining ? View.VISIBLE : View.GONE, default=gone}"
+            app:indicatorColor="@color/white"
+            app:layout_constraintVertical_chainStyle="packed"
+            app:layout_constraintEnd_toStartOf="@id/active_speaker_miniatures_vertical_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/joining_label" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style"
+            android:id="@+id/joining_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/conference_participant_joining_text"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:visibility="@{conferenceViewModel.activeSpeaker.isJoining ? View.VISIBLE : View.GONE, default=gone}"
+            app:layout_constraintTop_toBottomOf="@id/joining"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/active_speaker_miniatures_vertical_layout"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <ImageView
+            android:id="@+id/paused"
+            android:layout_width="@dimen/big_icon_size"
+            android:layout_height="@dimen/big_icon_size"
+            android:contentDescription="@null"
+            android:src="@drawable/pause"
+            android:visibility="@{!conferenceViewModel.activeSpeaker.isInConference &amp;&amp; !conferenceViewModel.activeSpeaker.isJoining ? View.VISIBLE : View.GONE, default=gone}"
+            app:tint="@color/white"
+            app:layout_constraintVertical_chainStyle="packed"
+            app:layout_constraintEnd_toStartOf="@id/active_speaker_miniatures_vertical_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/paused_label" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style"
+            android:id="@+id/paused_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/conference_participant_paused_text"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:visibility="@{!conferenceViewModel.activeSpeaker.isInConference &amp;&amp; !conferenceViewModel.activeSpeaker.isJoining ? View.VISIBLE : View.GONE, default=gone}"
+            app:layout_constraintTop_toBottomOf="@id/paused"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/active_speaker_miniatures_vertical_layout"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style_500"
+            android:id="@+id/active_speaker_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginBottom="10dp"
+            android:text="@{conferenceViewModel.activeSpeaker.name, default=`John Doe`}"
+            android:textColor="@color/white"
+            android:textSize="20sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style_500"
+            android:id="@+id/active_speaker_screen_sharing"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:text="@string/conference_active_speaker_is_screen_sharing"
+            android:textColor="@color/white"
+            android:textSize="20sp"
+            android:visibility="@{conferenceViewModel.isScreenSharing ? View.VISIBLE : View.GONE}"
+            app:layout_constraintBottom_toBottomOf="@id/active_speaker_name"
+            app:layout_constraintTop_toTopOf="@id/active_speaker_name"
+            app:layout_constraintStart_toEndOf="@id/active_speaker_name" />
+
+        <ImageView
+            android:id="@+id/muted"
+            android:layout_width="@dimen/icon_size"
+            android:layout_height="@dimen/icon_size"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="18dp"
+            android:padding="2dp"
+            android:src="@drawable/microphone_slash"
+            android:background="@drawable/shape_circle_white_call_background"
+            android:visibility="@{conferenceViewModel.activeSpeaker.isMuted ? View.VISIBLE : View.GONE}"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/active_speaker_miniatures_vertical_layout" />
+
+        <ScrollView
+            android:id="@+id/active_speaker_miniatures_vertical_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:onClick="@{() -> viewModel.toggleFullScreen()}"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:orientation="vertical"
+                entries="@{conferenceViewModel.participantDevices}"
+                layout="@{@layout/call_conference_active_speaker_cell}"/>
+
+        </ScrollView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/call_conference_active_speaker_fragment.xml b/app/src/main/res/layout/call_conference_active_speaker_fragment.xml
index 126a5bc60..5e7b60c2c 100644
--- a/app/src/main/res/layout/call_conference_active_speaker_fragment.xml
+++ b/app/src/main/res/layout/call_conference_active_speaker_fragment.xml
@@ -35,7 +35,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            app:layout_constraintBottom_toBottomOf="@id/active_speaker_name" />
 
         <org.linphone.ui.call.view.RoundCornersTextureView
             android:id="@+id/active_speaker_surface"
@@ -44,7 +44,7 @@
             android:onClick="@{() -> viewModel.toggleFullScreen()}"
             android:visibility="@{conferenceViewModel.activeSpeaker.isSendingVideo &amp;&amp; conferenceViewModel.activeSpeaker.isInConference ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/active_speaker_miniatures_horizontal_layout"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"/>
 
@@ -113,7 +113,7 @@
             android:text="@{conferenceViewModel.activeSpeaker.name, default=`John Doe`}"
             android:textColor="@color/white"
             android:textSize="20sp"
-            app:layout_constraintBottom_toTopOf="@id/active_speaker_miniatures_layout"
+            app:layout_constraintBottom_toTopOf="@id/active_speaker_miniatures_horizontal_layout"
             app:layout_constraintStart_toStartOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -144,7 +144,7 @@
             app:layout_constraintEnd_toEndOf="parent" />
 
         <HorizontalScrollView
-            android:id="@+id/active_speaker_miniatures_layout"
+            android:id="@+id/active_speaker_miniatures_horizontal_layout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:onClick="@{() -> viewModel.toggleFullScreen()}"