diff --git a/app/src/main/java/org/linphone/activities/voip/data/ConferenceParticipantDeviceData.kt b/app/src/main/java/org/linphone/activities/voip/data/ConferenceParticipantDeviceData.kt index 762f58b48..a6a1e8f54 100644 --- a/app/src/main/java/org/linphone/activities/voip/data/ConferenceParticipantDeviceData.kt +++ b/app/src/main/java/org/linphone/activities/voip/data/ConferenceParticipantDeviceData.kt @@ -39,6 +39,8 @@ class ConferenceParticipantDeviceData( val activeSpeaker = MutableLiveData() + val micMuted = MutableLiveData() + val isInConference = MutableLiveData() private var textureView: TextureView? = null @@ -95,6 +97,7 @@ class ConferenceParticipantDeviceData( activeSpeaker.value = false videoEnabled.value = participantDevice.getStreamAvailability(StreamType.Video) + micMuted.value = false // TODO isInConference.value = participantDevice.isInConference val videoCapability = participantDevice.getStreamCapability(StreamType.Video) 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 38fef36ba..5e01189cd 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 @@ -45,6 +45,7 @@ class ConferenceViewModel : ViewModel() { val conferenceParticipantDevices = MutableLiveData>() val conferenceMosaicDisplayMode = MutableLiveData() val conferenceActiveSpeakerDisplayMode = MutableLiveData() + val conferenceAudioOnlyDisplayMode = MutableLiveData() val isRecording = MutableLiveData() val isRemotelyRecorded = MutableLiveData() @@ -182,6 +183,7 @@ class ConferenceViewModel : ViewModel() { conferenceParticipantDevices.value = arrayListOf() conferenceMosaicDisplayMode.value = false conferenceActiveSpeakerDisplayMode.value = false + conferenceAudioOnlyDisplayMode.value = false subject.value = AppUtils.getString(R.string.conference_default_title) diff --git a/app/src/main/res/drawable-xhdpi/voip_conference_audio_only.png b/app/src/main/res/drawable-xhdpi/voip_conference_audio_only.png new file mode 100644 index 000000000..fd57a3f27 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/voip_conference_audio_only.png differ diff --git a/app/src/main/res/drawable/icon_conference_layout_audio_only.xml b/app/src/main/res/drawable/icon_conference_layout_audio_only.xml new file mode 100644 index 000000000..954eaf27e --- /dev/null +++ b/app/src/main/res/drawable/icon_conference_layout_audio_only.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/drawable/icon_mic_muted.xml b/app/src/main/res/drawable/icon_mic_muted.xml new file mode 100644 index 000000000..1ab7fc636 --- /dev/null +++ b/app/src/main/res/drawable/icon_mic_muted.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/layout/voip_conference_active_speaker.xml b/app/src/main/res/layout/voip_conference_active_speaker.xml index ee0d898b8..1f03781f3 100644 --- a/app/src/main/res/layout/voip_conference_active_speaker.xml +++ b/app/src/main/res/layout/voip_conference_active_speaker.xml @@ -104,6 +104,7 @@ + + + + diff --git a/app/src/main/res/layout/voip_conference_participant_remote_active_speaker_miniature.xml b/app/src/main/res/layout/voip_conference_participant_remote_active_speaker_miniature.xml index d053de2e4..6db2f0685 100644 --- a/app/src/main/res/layout/voip_conference_participant_remote_active_speaker_miniature.xml +++ b/app/src/main/res/layout/voip_conference_participant_remote_active_speaker_miniature.xml @@ -69,7 +69,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="5dp" - android:padding="10dp" + android:padding="5dp" android:src="@drawable/icon_call_camera_switch" android:contentDescription="@string/content_description_switch_camera" app:layout_constraintTop_toTopOf="@id/participant_video_surface" @@ -110,6 +110,18 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@id/participant_name"/>--> + + \ No newline at end of file diff --git a/app/src/main/res/layout/voip_conference_participant_remote_grid.xml b/app/src/main/res/layout/voip_conference_participant_remote_grid.xml index 924ffaf1f..4d19167e2 100644 --- a/app/src/main/res/layout/voip_conference_participant_remote_grid.xml +++ b/app/src/main/res/layout/voip_conference_participant_remote_grid.xml @@ -101,12 +101,24 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="5dp" - android:padding="10dp" + android:padding="5dp" android:src="@drawable/icon_call_camera_switch" android:contentDescription="@string/content_description_switch_camera" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent"/> + + diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index 0098f2806..564b5510d 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -56,4 +56,5 @@ 10dp 60dp 50dp + 30dp \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fca3b40ea..5b3530a5e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -265,6 +265,7 @@ %d participants Mosaic mode Active speaker mode + Audio only mode Start Cancel Video is currently disabled @@ -805,4 +806,5 @@ Show numpad Hide numpad Go to conversations list + Participant has it\'s microphone muted