From f9ae9985a4f8505835abe1a75ccef1ed6eb933c9 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 15 Feb 2024 14:10:18 +0100 Subject: [PATCH] Created landscape versions of meeting waiting room & conference menu --- .../fragment/ActiveConferenceCallFragment.kt | 7 + .../call_conference_actions_bottom_sheet.xml | 245 ++++++++++++++++++ .../meeting_waiting_room_fragment.xml | 196 ++++++++++++++ .../call_active_conference_fragment.xml | 4 +- .../call_conference_actions_bottom_sheet.xml | 5 +- .../layout/meeting_waiting_room_fragment.xml | 7 +- 6 files changed, 456 insertions(+), 8 deletions(-) create mode 100644 app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml create mode 100644 app/src/main/res/layout-land/meeting_waiting_room_fragment.xml diff --git a/app/src/main/java/org/linphone/ui/call/fragment/ActiveConferenceCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/ActiveConferenceCallFragment.kt index bb6b4cbf2..d034af915 100644 --- a/app/src/main/java/org/linphone/ui/call/fragment/ActiveConferenceCallFragment.kt +++ b/app/src/main/java/org/linphone/ui/call/fragment/ActiveConferenceCallFragment.kt @@ -190,6 +190,13 @@ class ActiveConferenceCallFragment : GenericCallFragment() { } } + override fun onPause() { + super.onPause() + + bottomSheetDialog?.dismiss() + bottomSheetDialog = null + } + private fun showCallStatistics() { // TODO } 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 new file mode 100644 index 000000000..db6dedf28 --- /dev/null +++ b/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml b/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml new file mode 100644 index 000000000..5e9b06b2e --- /dev/null +++ b/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 88d882fdb..0edb0c084 100644 --- a/app/src/main/res/layout/call_active_conference_fragment.xml +++ b/app/src/main/res/layout/call_active_conference_fragment.xml @@ -191,8 +191,9 @@ android:textSize="22sp" android:gravity="center" android:visibility="@{conferenceViewModel.participantDevices.size() > 1 ? View.GONE : View.VISIBLE}" + app:layout_constraintVertical_chainStyle="packed" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintBottom_toTopOf="@id/share_conference_link" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" /> @@ -216,6 +217,7 @@ android:drawablePadding="8dp" app:drawableTint="@color/gray_main2_400" app:layout_constraintTop_toBottomOf="@id/waiting_for_others" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> 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 2e0e0ef04..ca268643d 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 @@ -129,6 +129,7 @@