mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Started conference waiting room

Browse source
This commit is contained in:
Sylvain Berfini 2023-10-25 11:57:12 +02:00
parent 98488e5798
commit a129cc5f95
32 changed files with 652 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/core/CoreContext.kt
View file

@ -279,7 +279,7 @@ class CoreContext @UiThread constructor(val context: Context) : HandlerThread("C
params.mediaEncryption = MediaEncryption.ZRTP
}
/*if (LinphoneUtils.checkIfNetworkHasLowBandwidth(context)) {
Log.w("[Context] Enabling low bandwidth mode!")
Log.w("$TAG Enabling low bandwidth mode!")
params.isLowBandwidthEnabled = true
}*/

4
app/src/main/java/org/linphone/core/CorePreferences.kt
View file

@ -146,10 +146,6 @@ class CorePreferences @UiThread constructor(private val context: Context) {
val ringtonesPath: String
get() = context.filesDir.absolutePath + "/share/sounds/linphone/rings/"
@get:AnyThread
val defaultRingtonePath: String
get() = ringtonesPath + "notes_of_the_optimistic.mkv"
@UiThread
fun copyAssetsFromPackage() {
copy("linphonerc_default", configPath)

3
app/src/main/java/org/linphone/ui/assistant/fragment/QrCodeScannerFragment.kt
View file

@ -104,6 +104,9 @@ class QrCodeScannerFragment : Fragment() {
super.onResume()
if (isCameraPermissionGranted()) {
Log.i(
"$TAG Record video permission is granted, starting video preview with back cam if possible"
)
viewModel.setBackCamera()
enableQrCodeVideoScanner()
}

4
app/src/main/java/org/linphone/ui/call/fragment/CallsListFragment.kt
View file

@ -64,9 +64,7 @@ class CallsListFragment : GenericCallFragment() {
adapter = CallsListAdapter(viewLifecycleOwner)
binding.callsList.setHasFixedSize(true)
binding.callsList.adapter = adapter
val layoutManager = LinearLayoutManager(requireContext())
binding.callsList.layoutManager = layoutManager
binding.callsList.layoutManager = LinearLayoutManager(requireContext())
adapter.callLongClickedEvent.observe(viewLifecycleOwner) {
it.consume { model ->

1
app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
View file

@ -541,6 +541,7 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
@UiThread
fun switchCamera() {
coreContext.postOnCoreThread {
Log.i("$TAG Switching camera")
coreContext.switchCamera()
}
}

4
app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
View file

@ -162,9 +162,7 @@ class ConversationFragment : GenericFragment() {
adapter = ConversationEventAdapter(viewLifecycleOwner)
binding.eventsList.setHasFixedSize(true)
binding.eventsList.adapter = adapter
val layoutManager = LinearLayoutManager(requireContext())
binding.eventsList.layoutManager = layoutManager
binding.eventsList.layoutManager = LinearLayoutManager(requireContext())
bottomSheetAdapter = ChatMessageBottomSheetAdapter(viewLifecycleOwner)
binding.messageBottomSheet.bottomSheetList.setHasFixedSize(true)

3
app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt
View file

@ -63,8 +63,7 @@ class ConversationInfoFragment : GenericFragment() {
}
override fun goBack(): Boolean {
findNavController().popBackStack()
return true
return findNavController().popBackStack()
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

3
app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsFragment.kt
View file

@ -112,7 +112,8 @@ class ConversationsFragment : GenericFragment() {
sharedViewModel.showStartConversationEvent.observe(viewLifecycleOwner) {
it.consume {
Log.i("$TAG Navigating to start conversation fragment")
findNavController().navigate(R.id.action_global_startConversationFragment)
val action = ConversationsFragmentDirections.actionConversationsFragmentToStartConversationFragment()
findNavController().navigate(action)
}
}

4
app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt
View file

@ -70,9 +70,7 @@ class ConversationsListFragment : AbstractTopBarFragment() {
adapter = ConversationsListAdapter(viewLifecycleOwner)
binding.conversationsList.setHasFixedSize(true)
binding.conversationsList.adapter = adapter
val layoutManager = LinearLayoutManager(requireContext())
binding.conversationsList.layoutManager = layoutManager
binding.conversationsList.layoutManager = LinearLayoutManager(requireContext())
adapter.conversationLongClickedEvent.observe(viewLifecycleOwner) {
it.consume { model ->

4
app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsFragment.kt
View file

@ -114,8 +114,8 @@ class ContactsFragment : GenericFragment() {
) {
it.consume {
Log.i("$TAG Opening contact editor for creating new contact")
val navController = findNavController()
navController.navigate(R.id.action_global_newContactFragment)
val action = ContactsFragmentDirections.actionContactsFragmentToNewContactFragment()
findNavController().navigate(action)
}
}

4
app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt
View file

@ -81,9 +81,7 @@ class ContactsListFragment : AbstractTopBarFragment() {
binding.contactsList.setHasFixedSize(true)
binding.contactsList.adapter = adapter
configureAdapter(adapter)
val layoutManager = LinearLayoutManager(requireContext())
binding.contactsList.layoutManager = layoutManager
binding.contactsList.layoutManager = LinearLayoutManager(requireContext())
favouritesAdapter = ContactsListAdapter(viewLifecycleOwner, favourites = true)
binding.favouritesContactsList.setHasFixedSize(true)

3
app/src/main/java/org/linphone/ui/main/fragment/AddParticipantsFragment.kt
View file

@ -54,8 +54,7 @@ class AddParticipantsFragment : GenericAddressPickerFragment() {
}
override fun goBack(): Boolean {
findNavController().popBackStack()
return true
return findNavController().popBackStack()
}
override fun onSingleAddressSelected(address: Address, friend: Friend) {

4
app/src/main/java/org/linphone/ui/main/history/fragment/HistoryContactFragment.kt
View file

@ -93,9 +93,7 @@ class HistoryContactFragment : GenericFragment() {
adapter = ContactHistoryListAdapter(viewLifecycleOwner)
binding.callHistory.setHasFixedSize(true)
binding.callHistory.adapter = adapter
val layoutManager = LinearLayoutManager(requireContext())
binding.callHistory.layoutManager = layoutManager
binding.callHistory.layoutManager = LinearLayoutManager(requireContext())
binding.setBackClickListener {
goBack()

3
app/src/main/java/org/linphone/ui/main/history/fragment/HistoryFragment.kt
View file

@ -99,7 +99,8 @@ class HistoryFragment : GenericFragment() {
sharedViewModel.showStartCallEvent.observe(viewLifecycleOwner) {
it.consume {
Log.i("$TAG Navigating to start call fragment")
findNavController().navigate(R.id.action_global_startCallFragment)
val action = HistoryFragmentDirections.actionHistoryFragmentToStartCallFragment()
findNavController().navigate(action)
}
}

4
app/src/main/java/org/linphone/ui/main/history/fragment/HistoryListFragment.kt
View file

@ -80,9 +80,7 @@ class HistoryListFragment : AbstractTopBarFragment() {
adapter = HistoryListAdapter(viewLifecycleOwner)
binding.historyList.setHasFixedSize(true)
binding.historyList.adapter = adapter
val layoutManager = LinearLayoutManager(requireContext())
binding.historyList.layoutManager = layoutManager
binding.historyList.layoutManager = LinearLayoutManager(requireContext())
adapter.callLogLongClickedEvent.observe(viewLifecycleOwner) {
it.consume { model ->

13
app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingFragment.kt
View file

@ -79,9 +79,7 @@ class MeetingFragment : GenericFragment() {
binding.lifecycleOwner = viewLifecycleOwner
viewModel = requireActivity().run {
ViewModelProvider(this)[MeetingViewModel::class.java]
}
viewModel = ViewModelProvider(this)[MeetingViewModel::class.java]
binding.viewModel = viewModel
val uri = args.conferenceUri
@ -95,6 +93,7 @@ class MeetingFragment : GenericFragment() {
}
binding.setShareClickListener {
Log.i("$TAG Sharing conference info as Google Calendar event")
shareMeetingInfoAsCalendarEvent()
}
@ -102,6 +101,12 @@ class MeetingFragment : GenericFragment() {
showPopupMenu()
}
binding.setJoinClickListener {
val conferenceUri = args.conferenceUri
Log.i("$TAG Requesting to go to waiting room for conference URI [$conferenceUri]")
sharedViewModel.goToMeetingWaitingRoomEvent.value = Event(conferenceUri)
}
sharedViewModel.isSlidingPaneSlideable.observe(viewLifecycleOwner) { slideable ->
viewModel.showBackButton.value = slideable
}
@ -181,7 +186,7 @@ class MeetingFragment : GenericFragment() {
try {
startActivity(intent)
} catch (exception: ActivityNotFoundException) {
Log.e("${MeetingFragment.TAG} No activity found to handle intent: $exception")
Log.e("$TAG No activity found to handle intent: $exception")
}
}
}

158
app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingWaitingRoomFragment.kt Normal file
View file

@ -0,0 +1,158 @@
/*
* Copyright (c) 2010-2023 Belledonne Communications SARL.
*
* This file is part of linphone-android
* (see https://www.linphone.org).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.linphone.ui.main.meetings.fragment
import android.Manifest
import android.content.pm.PackageManager
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.activity.result.contract.ActivityResultContracts
import androidx.annotation.UiThread
import androidx.core.content.ContextCompat
import androidx.core.view.doOnPreDraw
import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.core.tools.Log
import org.linphone.databinding.MeetingWaitingRoomFragmentBinding
import org.linphone.ui.main.fragment.GenericFragment
import org.linphone.ui.main.meetings.viewmodel.MeetingWaitingRoomViewModel
@UiThread
class MeetingWaitingRoomFragment : GenericFragment() {
companion object {
private const val TAG = "[Meeting Waiting Room Fragment]"
}
private lateinit var binding: MeetingWaitingRoomFragmentBinding
private lateinit var viewModel: MeetingWaitingRoomViewModel
private val args: MeetingWaitingRoomFragmentArgs by navArgs()
private val requestPermissionLauncher = registerForActivityResult(
ActivityResultContracts.RequestPermission()
) { isGranted ->
if (isGranted) {
Log.i("$TAG Camera permission has been granted")
enableVideoPreview()
} else {
Log.e("$TAG Camera permission has been denied, leaving this fragment")
goBack()
}
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
binding = MeetingWaitingRoomFragmentBinding.inflate(layoutInflater)
return binding.root
}
override fun goBack(): Boolean {
return findNavController().popBackStack()
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
binding.lifecycleOwner = viewLifecycleOwner
viewModel = ViewModelProvider(this)[MeetingWaitingRoomViewModel::class.java]
binding.viewModel = viewModel
val uri = args.conferenceUri
Log.i(
"$TAG Looking up for conference with SIP URI [$uri]"
)
viewModel.findConferenceInfo(uri)
binding.setBackClickListener {
goBack()
}
viewModel.conferenceInfoFoundEvent.observe(viewLifecycleOwner) {
it.consume { found ->
if (found) {
(view.parent as? ViewGroup)?.doOnPreDraw {
startPostponedEnterTransition()
}
} else {
Log.e("$TAG Failed to find meeting with URI [$uri], going back")
(view.parent as? ViewGroup)?.doOnPreDraw {
goBack()
}
}
}
}
if (!isCameraPermissionGranted()) {
viewModel.isVideoAvailable.value = false
Log.w("$TAG Camera permission wasn't granted yet, asking for it now")
requestPermissionLauncher.launch(Manifest.permission.CAMERA)
}
}
override fun onResume() {
super.onResume()
if (isCameraPermissionGranted()) {
Log.i(
"$TAG Record video permission is granted, starting video preview with front cam if possible"
)
viewModel.setFrontCamera()
enableVideoPreview()
}
}
override fun onPause() {
coreContext.postOnCoreThread { core ->
core.nativePreviewWindowId = null
core.isVideoPreviewEnabled = false
}
super.onPause()
}
private fun isCameraPermissionGranted(): Boolean {
val granted = ContextCompat.checkSelfPermission(
requireContext(),
Manifest.permission.CAMERA
) == PackageManager.PERMISSION_GRANTED
Log.i("$TAG Camera permission is ${if (granted) "granted" else "denied"}")
return granted
}
private fun enableVideoPreview() {
coreContext.postOnCoreThread { core ->
if (core.isVideoEnabled) {
viewModel.isVideoAvailable.postValue(true)
core.nativePreviewWindowId = binding.videoPreview
core.isVideoPreviewEnabled = true
}
}
}
}

13
app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsFragment.kt
View file

@ -99,7 +99,18 @@ class MeetingsFragment : GenericFragment() {
sharedViewModel.showScheduleMeetingEvent.observe(viewLifecycleOwner) {
it.consume {
Log.i("$TAG Navigating to schedule meeting fragment")
findNavController().navigate(R.id.action_global_scheduleMeetingFragment)
val action = MeetingsFragmentDirections.actionMeetingsFragmentToScheduleMeetingFragment()
findNavController().navigate(action)
}
}
sharedViewModel.goToMeetingWaitingRoomEvent.observe(viewLifecycleOwner) {
it.consume { uri ->
Log.i("$TAG Navigating to meeting waiting room fragment with URI [$uri]")
val action = MeetingsFragmentDirections.actionMeetingsFragmentToMeetingWaitingRoomFragment(
uri
)
findNavController().navigate(action)
}
}

4
app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsListFragment.kt
View file

@ -75,9 +75,7 @@ class MeetingsListFragment : AbstractTopBarFragment() {
val headerItemDecoration = RecyclerViewHeaderDecoration(requireContext(), adapter, true)
binding.meetingsList.addItemDecoration(headerItemDecoration)
val layoutManager = LinearLayoutManager(requireContext())
binding.meetingsList.layoutManager = layoutManager
binding.meetingsList.layoutManager = LinearLayoutManager(requireContext())
binding.setNewMeetingClicked {
sharedViewModel.showScheduleMeetingEvent.value = Event(true)

10
app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt
View file

@ -91,23 +91,21 @@ class MeetingViewModel @UiThread constructor() : ViewModel() {
if (address != null) {
val found = core.findConferenceInformationFromUri(address)
if (found != null) {
Log.i("$TAG Conference info with SIP URI [$uri] was found")
conferenceInfo = found
configureConferenceInfo()
conferenceInfoFoundEvent.postValue(Event(true))
} else {
Log.e("$TAG Conference info with SIP URI [$uri] couldn't be found!")
conferenceInfoFoundEvent.postValue(Event(false))
}
} else {
Log.e("$TAG Failed to parse SIP URI [$uri] as Address!")
conferenceInfoFoundEvent.postValue(Event(false))
}
}
}
@UiThread
fun join() {
// TODO
}
@UiThread
fun delete() {
coreContext.postOnCoreThread { core ->
@ -181,7 +179,7 @@ class MeetingViewModel @UiThread constructor() : ViewModel() {
val participant = info.address
val isOrganizer = organizer?.weakEqual(participant) ?: false
Log.i(
"$TAG Conference [${subject.value}] ${if (isOrganizer) "organizer" else "participant"} [${participant.asStringUriOnly()}] is a [${info.role}]"
"$TAG Conference [${conferenceInfo.subject}] ${if (isOrganizer) "organizer" else "participant"} [${participant.asStringUriOnly()}] is a [${info.role}]"
)
if (isOrganizer) {
organizerFound = true

189
app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt Normal file
View file

@ -0,0 +1,189 @@
/*
* Copyright (c) 2010-2023 Belledonne Communications SARL.
*
* This file is part of linphone-android
* (see https://www.linphone.org).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.linphone.ui.main.meetings.viewmodel
import androidx.annotation.UiThread
import androidx.annotation.WorkerThread
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.core.ConferenceInfo
import org.linphone.core.Factory
import org.linphone.core.tools.Log
import org.linphone.ui.main.contacts.model.ContactAvatarModel
import org.linphone.utils.Event
import org.linphone.utils.LinphoneUtils
import org.linphone.utils.TimestampUtils
class MeetingWaitingRoomViewModel @UiThread constructor() : ViewModel() {
companion object {
private const val TAG = "[Meeting Waiting Room ViewModel]"
}
val subject = MutableLiveData<String>()
val dateTime = MutableLiveData<String>()
val selfAvatar = MutableLiveData<ContactAvatarModel>()
val isMicrophoneMuted = MutableLiveData<Boolean>()
val isVideoAvailable = MutableLiveData<Boolean>()
val isVideoEnabled = MutableLiveData<Boolean>()
val isSwitchCameraAvailable = MutableLiveData<Boolean>()
val conferenceInfoFoundEvent = MutableLiveData<Event<Boolean>>()
private lateinit var conferenceInfo: ConferenceInfo
@UiThread
override fun onCleared() {
super.onCleared()
}
@UiThread
fun findConferenceInfo(uri: String) {
coreContext.postOnCoreThread { core ->
val address = Factory.instance().createAddress(uri)
if (address != null) {
val found = core.findConferenceInformationFromUri(address)
if (found != null) {
Log.i("$TAG Conference info with SIP URI [$uri] was found")
conferenceInfo = found
configureConferenceInfo()
configureWaitingRoom()
conferenceInfoFoundEvent.postValue(Event(true))
} else {
Log.e("$TAG Conference info with SIP URI [$uri] couldn't be found!")
conferenceInfoFoundEvent.postValue(Event(false))
}
} else {
Log.e("$TAG Failed to parse SIP URI [$uri] as Address!")
conferenceInfoFoundEvent.postValue(Event(false))
}
}
}
@UiThread
fun setFrontCamera() {
coreContext.postOnCoreThread { core ->
for (camera in core.videoDevicesList) {
if (camera.contains("Front")) {
Log.i("$TAG Found front facing camera [$camera], using it")
coreContext.core.videoDevice = camera
return@postOnCoreThread
}
}
val first = core.videoDevicesList.firstOrNull()
if (first != null) {
Log.w("$TAG No front facing camera found, using first one available [$first]")
coreContext.core.videoDevice = first
}
}
}
@UiThread
fun join() {
coreContext.postOnCoreThread { core ->
if (::conferenceInfo.isInitialized) {
val conferenceUri = conferenceInfo.uri
if (conferenceUri == null) {
Log.e("$TAG Conference Info doesn't have a conference SIP URI to call!")
return@postOnCoreThread
}
val params = core.createCallParams(null)
params ?: return@postOnCoreThread
params.isVideoEnabled = isVideoEnabled.value == true
params.isMicEnabled = isMicrophoneMuted.value == false
params.account = core.defaultAccount
coreContext.startCall(conferenceUri, params)
}
}
}
@UiThread
fun switchCamera() {
coreContext.postOnCoreThread {
Log.i("$TAG Switching camera")
coreContext.switchCamera()
}
}
@UiThread
fun toggleVideo() {
isVideoEnabled.value = isVideoEnabled.value == false
}
@UiThread
fun toggleMuteMicrophone() {
isMicrophoneMuted.value = isMicrophoneMuted.value == false
}
@UiThread
fun toggleSpeaker() {
// TODO
}
@WorkerThread
private fun configureConferenceInfo() {
if (::conferenceInfo.isInitialized) {
subject.postValue(conferenceInfo.subject)
val timestamp = conferenceInfo.dateTime
val duration = conferenceInfo.duration
val date = TimestampUtils.toString(
timestamp,
onlyDate = true,
shortDate = false,
hideYear = false
)
val startTime = TimestampUtils.timeToString(timestamp)
val end = timestamp + (duration * 60)
val endTime = TimestampUtils.timeToString(end)
dateTime.postValue("$date | $startTime - $endTime")
val localAddress = coreContext.core.defaultAccount?.params?.identityAddress
val fakeFriend = coreContext.core.createFriend()
fakeFriend.address = localAddress
fakeFriend.name = LinphoneUtils.getDisplayName(localAddress)
val avatarModel = ContactAvatarModel(fakeFriend)
selfAvatar.postValue(avatarModel)
}
}
@WorkerThread
private fun configureWaitingRoom() {
val core = coreContext.core
isVideoEnabled.postValue(
core.isVideoEnabled && core.videoActivationPolicy.automaticallyInitiate
)
isSwitchCameraAvailable.postValue(coreContext.showSwitchCameraButton())
isMicrophoneMuted.postValue(!core.isMicEnabled)
// TODO: audio routes
}
}

3
app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt
View file

@ -48,8 +48,7 @@ class AccountSettingsFragment : GenericFragment() {
}
override fun goBack(): Boolean {
findNavController().popBackStack()
return true
return findNavController().popBackStack()
}
override fun onCreateView(

4
app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt
View file

@ -123,6 +123,10 @@ class SharedMainViewModel @UiThread constructor() : ViewModel() {
MutableLiveData<Event<Boolean>>()
}
val goToMeetingWaitingRoomEvent: MutableLiveData<Event<String>> by lazy {
MutableLiveData<Event<String>>()
}
/* Other */
val listOfSelectedSipUrisEvent: MutableLiveData<Event<ArrayList<String>>> by lazy {

0
app/src/main/res/drawable/shape_squircle_gray_2_background.xml → app/src/main/res/drawable/shape_squircle_gray_100_background.xml
View file

5
app/src/main/res/drawable/shape_squircle_gray_600_background.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="15dp" />
<solid android:color="@color/gray_600"/>
</shape>

2
app/src/main/res/layout/account_profile_device_list_cell.xml
View file

@ -15,7 +15,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:paddingBottom="27dp"
android:background="@drawable/shape_squircle_gray_2_background">
android:background="@drawable/shape_squircle_gray_100_background">
<androidx.appcompat.widget.AppCompatTextView
style="@style/header_style"

4
app/src/main/res/layout/assistant_secure_mode_fragment.xml
View file

@ -114,7 +114,7 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="10dp"
android:background="@drawable/shape_squircle_gray_2_background"
android:background="@drawable/shape_squircle_gray_100_background"
android:paddingTop="20dp"
android:paddingBottom="20dp"
android:paddingStart="16dp"
@ -233,7 +233,7 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="10dp"
android:background="@drawable/shape_squircle_gray_2_background"
android:background="@drawable/shape_squircle_gray_100_background"
android:paddingTop="20dp"
android:paddingBottom="20dp"
android:paddingStart="16dp"

2
app/src/main/res/layout/call_main_actions.xml
View file

@ -54,7 +54,7 @@
android:layout_marginEnd="16dp"
android:padding="@dimen/call_button_icon_padding"
android:enabled="@{!viewModel.isPaused &amp;&amp; !viewModel.isPausedByRemote}"
android:src="@{viewModel.isVideoEnabled() ? @drawable/video_camera : @drawable/video_camera_slash, default=@drawable/video_camera}"
android:src="@{viewModel.isVideoEnabled ? @drawable/video_camera : @drawable/video_camera_slash, default=@drawable/video_camera}"
android:background="@drawable/in_call_button_background"
app:tint="@color/in_call_button_tint_color"
app:layout_constraintHorizontal_bias="1"

29
app/src/main/res/layout/meeting_fragment.xml
View file

@ -13,6 +13,9 @@
<variable
name="shareClickListener"
type="View.OnClickListener" />
<variable
name="joinClickListener"
type="View.OnClickListener" />
<variable
name="viewModel"
type="org.linphone.ui.main.meetings.viewmodel.MeetingViewModel" />
@ -198,7 +201,6 @@
android:layout_height="1dp"
android:layout_marginTop="16dp"
android:background="@color/gray_main2_200"
android:visibility="@{viewModel.description.length() > 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/timezone" />
@ -230,10 +232,18 @@
android:layout_height="1dp"
android:layout_marginTop="16dp"
android:background="@color/gray_main2_200"
android:visibility="@{viewModel.description.length() > 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/description" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/speakers_bottom_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="speakers, speakers_icon" />
<ImageView
android:id="@+id/speakers_icon"
android:layout_width="@dimen/icon_size"
@ -250,11 +260,11 @@
android:id="@+id/speakers"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:visibility="@{viewModel.isBroadcast ? View.VISIBLE : View.GONE}"
android:orientation="vertical"
entries="@{viewModel.speakers}"
layout="@{@layout/meeting_participant_list_cell}"
app:layout_constraintTop_toBottomOf="@id/separator_3"
@ -270,7 +280,7 @@
android:visibility="@{viewModel.isBroadcast ? View.VISIBLE : View.GONE}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/speakers" />
app:layout_constraintTop_toBottomOf="@id/speakers_bottom_barrier" />
<ImageView
android:id="@+id/participants_icon"
@ -287,16 +297,23 @@
android:id="@+id/participants"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:orientation="vertical"
entries="@{viewModel.participants}"
layout="@{@layout/meeting_participant_list_cell}"
app:layout_constraintTop_toBottomOf="@id/separator_4"
app:layout_constraintStart_toEndOf="@id/participants_icon"
app:layout_constraintEnd_toEndOf="parent" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/participants_bottom_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="participants, participants_icon" />
<View
android:id="@+id/separator_5"
android:layout_width="0dp"
@ -305,12 +322,12 @@
android:background="@color/gray_main2_200"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/participants" />
app:layout_constraintTop_toBottomOf="@id/participants_bottom_barrier" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/primary_button_label_style"
android:id="@+id/join"
android:onClick="@{() -> viewModel.join()}"
android:onClick="@{joinClickListener}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"

179
app/src/main/res/layout/meeting_waiting_room_fragment.xml Normal file
View file

@ -0,0 +1,179 @@
<?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">
<data>
<import type="android.view.View" />
<variable
name="backClickListener"
type="View.OnClickListener" />
<variable
name="viewModel"
type="org.linphone.ui.main.meetings.viewmodel.MeetingWaitingRoomViewModel" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_900">
<ImageView
android:id="@+id/back"
android:onClick="@{backClickListener}"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:adjustViewBounds="true"
android:padding="15dp"
android:src="@drawable/caret_left"
app:tint="@color/orange_main_500"
app:layout_constraintBottom_toBottomOf="@id/subtitle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/main_page_title_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:text="@{viewModel.subject, default=`Meeting with John Doe`}"
android:textColor="@color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toTopOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_300"
android:id="@+id/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:text="@{viewModel.dateTime, default=`Wed. 25 Oct. 14:00 - 15:00`}"
android:textSize="12sp"
android:textColor="@color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toBottomOf="@id/title"/>
<View
android:id="@+id/no_video_background"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/shape_squircle_gray_600_background"
app:layout_constraintTop_toTopOf="@id/video_preview"
app:layout_constraintStart_toStartOf="@id/video_preview"
app:layout_constraintEnd_toEndOf="@id/video_preview"
app:layout_constraintBottom_toBottomOf="@id/video_preview" />
<com.google.android.material.imageview.ShapeableImageView
style="@style/avatar_imageview"
android:id="@+id/avatar"
android:layout_width="@dimen/avatar_in_call_size"
android:layout_height="@dimen/avatar_in_call_size"
coilCallAvatar="@{viewModel.selfAvatar}"
app:layout_constraintEnd_toEndOf="@id/no_video_background"
app:layout_constraintStart_toStartOf="@id/no_video_background"
app:layout_constraintTop_toTopOf="@id/no_video_background"
app:layout_constraintBottom_toBottomOf="@id/no_video_background"/>
<org.linphone.ui.call.view.RoundCornersTextureView
android:id="@+id/video_preview"
android:layout_width="0dp"
android:layout_height="0dp"
android:visibility="@{viewModel.isVideoAvailable &amp;&amp; viewModel.isVideoEnabled ? View.VISIBLE : View.INVISIBLE}"
app:alignTopRight="false"
app:displayMode="occupy_all_space"
app:layout_constraintWidth_percent="0.65"
app:layout_constraintHeight_percent="0.65"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/back"
app:layout_constraintBottom_toTopOf="@id/toggle_mute_mic"/>
<ImageView
android:id="@+id/switch_camera"
android:onClick="@{() -> viewModel.switchCamera()}"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:visibility="@{viewModel.isVideoAvailable &amp;&amp; viewModel.isVideoEnabled &amp;&amp; viewModel.isSwitchCameraAvailable ? View.VISIBLE : View.GONE}"
android:src="@drawable/camera_rotate"
app:tint="@color/white"
app:layout_constraintTop_toTopOf="@id/video_preview"
app:layout_constraintEnd_toEndOf="@id/video_preview" />
<ImageView
android:id="@+id/toggle_video"
android:onClick="@{() -> viewModel.toggleVideo()}"
android:layout_width="@dimen/call_button_size"
android:layout_height="@dimen/call_button_size"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:padding="@dimen/call_button_icon_padding"
android:enabled="@{viewModel.isVideoAvailable}"
android:src="@{viewModel.isVideoEnabled ? @drawable/video_camera : @drawable/video_camera_slash, default=@drawable/video_camera}"
android:background="@drawable/in_call_button_background"
app:tint="@color/in_call_button_tint_color"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintTop_toTopOf="@id/toggle_mute_mic"
app:layout_constraintBottom_toBottomOf="@id/toggle_mute_mic"
app:layout_constraintStart_toStartOf="@id/video_preview"
app:layout_constraintEnd_toStartOf="@id/toggle_mute_mic" />
<ImageView
android:id="@+id/toggle_mute_mic"
android:onClick="@{() -> viewModel.toggleMuteMicrophone()}"
android:layout_width="@dimen/call_button_size"
android:layout_height="@dimen/call_button_size"
android:layout_marginEnd="16dp"
android:layout_marginTop="20dp"
android:padding="@dimen/call_button_icon_padding"
android:src="@{viewModel.isMicrophoneMuted ? @drawable/microphone_slash : @drawable/microphone, default=@drawable/microphone}"
android:background="@drawable/in_call_button_background"
app:tint="@color/in_call_button_tint_color"
app:layout_constraintTop_toBottomOf="@id/video_preview"
app:layout_constraintBottom_toTopOf="@id/join"
app:layout_constraintStart_toEndOf="@id/toggle_video"
app:layout_constraintEnd_toStartOf="@id/change_audio_output" />
<ImageView
android:id="@+id/change_audio_output"
android:onClick="@{() -> viewModel.toggleSpeaker()}"
android:layout_width="@dimen/call_button_size"
android:layout_height="@dimen/call_button_size"
android:layout_marginEnd="16dp"
android:padding="@dimen/call_button_icon_padding"
android:src="@drawable/speaker_slash"
android:background="@drawable/in_call_button_background"
app:tint="@color/in_call_button_tint_color"
app:layout_constraintTop_toTopOf="@id/toggle_mute_mic"
app:layout_constraintBottom_toBottomOf="@id/toggle_mute_mic"
app:layout_constraintStart_toEndOf="@id/toggle_mute_mic"
app:layout_constraintEnd_toEndOf="@id/video_preview" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/primary_button_label_style"
android:id="@+id/join"
android:onClick="@{() -> viewModel.join()}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="@dimen/screen_bottom_margin"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/meeting_waiting_room_join"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintVertical_bias="1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

69
app/src/main/res/navigation/main_nav_graph.xml
View file

@ -29,6 +29,12 @@
app:launchSingleTop="true"
app:popUpTo="@id/contactsFragment"
app:popUpToInclusive="true" />
<action
android:id="@+id/action_contactsFragment_to_newContactFragment"
app:destination="@id/newContactFragment"
app:enterAnim="@anim/slide_in"
app:popExitAnim="@anim/slide_out"
app:launchSingleTop="true" />
</fragment>
<fragment
@ -54,6 +60,12 @@
app:launchSingleTop="true"
app:popUpTo="@id/historyFragment"
app:popUpToInclusive="true" />
<action
android:id="@+id/action_historyFragment_to_startCallFragment"
app:destination="@id/startCallFragment"
app:enterAnim="@anim/slide_in"
app:popExitAnim="@anim/slide_out"
app:launchSingleTop="true" />
</fragment>
<fragment
@ -151,26 +163,12 @@
android:label="StartCallFragment"
tools:layout="@layout/start_call_fragment" />
<action
android:id="@+id/action_global_startCallFragment"
app:destination="@id/startCallFragment"
app:enterAnim="@anim/slide_in"
app:popExitAnim="@anim/slide_out"
app:launchSingleTop="true"/>
<fragment
android:id="@+id/newContactFragment"
android:name="org.linphone.ui.main.contacts.fragment.NewContactFragment"
android:label="NewContactFragment"
tools:layout="@layout/contact_new_or_edit_fragment"/>
<action
android:id="@+id/action_global_newContactFragment"
app:destination="@id/newContactFragment"
app:enterAnim="@anim/slide_in"
app:popExitAnim="@anim/slide_out"
app:launchSingleTop="true" />
<fragment
android:id="@+id/accountProfileModeFragment"
android:name="org.linphone.ui.main.settings.fragment.AccountProfileModeFragment"
@ -216,6 +214,12 @@
app:launchSingleTop="true"
app:popUpTo="@id/conversationsFragment"
app:popUpToInclusive="true" />
<action
android:id="@+id/action_conversationsFragment_to_startConversationFragment"
app:destination="@id/startConversationFragment"
app:enterAnim="@anim/slide_in"
app:popExitAnim="@anim/slide_out"
app:launchSingleTop="true" />
</fragment>
<fragment
@ -224,13 +228,6 @@
android:label="StartConversationFragment"
tools:layout="@layout/start_chat_fragment"/>
<action
android:id="@+id/action_global_startConversationFragment"
app:destination="@id/startConversationFragment"
app:enterAnim="@anim/slide_in"
app:launchSingleTop="true"
app:popExitAnim="@anim/slide_out" />
<fragment
android:id="@+id/meetingsFragment"
android:name="org.linphone.ui.main.meetings.fragment.MeetingsFragment"
@ -254,6 +251,20 @@
app:launchSingleTop="true"
app:popUpTo="@id/meetingsFragment"
app:popUpToInclusive="true" />
<action
android:id="@+id/action_meetingsFragment_to_scheduleMeetingFragment"
app:destination="@id/scheduleMeetingFragment"
app:enterAnim="@anim/slide_in"
app:popExitAnim="@anim/slide_out"
app:launchSingleTop="true" />
<action
android:id="@+id/action_meetingsFragment_to_meetingWaitingRoomFragment"
app:destination="@id/meetingWaitingRoomFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right"
app:launchSingleTop="true" />
</fragment>
<fragment
@ -270,12 +281,6 @@
app:popExitAnim="@anim/slide_out_right" />
</fragment>
<action
android:id="@+id/action_global_scheduleMeetingFragment"
app:destination="@id/scheduleMeetingFragment"
app:enterAnim="@anim/slide_in"
app:launchSingleTop="true"
app:popExitAnim="@anim/slide_out"/>
<fragment
android:id="@+id/addParticipantsFragment"
android:name="org.linphone.ui.main.fragment.AddParticipantsFragment"
@ -286,4 +291,14 @@
app:destination="@id/conversationsFragment"
app:launchSingleTop="true"/>
<fragment
android:id="@+id/meetingWaitingRoomFragment"
android:name="org.linphone.ui.main.meetings.fragment.MeetingWaitingRoomFragment"
android:label="MeetingWaitingRoomFragment"
tools:layout="@layout/meeting_waiting_room_fragment">
<argument
android:name="conferenceUri"
app:argType="string" />
</fragment>
</navigation>

2
app/src/main/res/values/strings.xml
View file

@ -394,6 +394,8 @@
<string name="meeting_info_delete">Delete meeting</string>
<string name="meeting_info_deleted_toast">Meeting has been deleted</string>
<string name="meeting_waiting_room_join">Join</string>
<string name="operation_in_progress_overlay">Operation in progress, please wait</string>
<string name="call_action_blind_transfer">Transfer</string>