Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Conference layouts improvements

Browse source
This commit is contained in:
Sylvain Berfini 2022-03-10 15:19:53 +01:00
parent 0dd411330c
commit e16cb01b31
8 changed files with 43 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/res/layout-land/voip_conference_grid.xml
View file

@ -18,7 +18,8 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="@{inflatedVisibility}"> android:visibility="@{inflatedVisibility}"
android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/voip_remote_margin_full_screen : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

3
app/src/main/res/layout/voip_conference_active_speaker.xml
View file

@ -18,7 +18,8 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="@{inflatedVisibility}"> android:visibility="@{inflatedVisibility}"
android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/voip_remote_margin_full_screen : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}">
<LinearLayout <LinearLayout
android:id="@+id/header" android:id="@+id/header"

3
app/src/main/res/layout/voip_conference_audio_only.xml
View file

@ -19,7 +19,8 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="@{inflatedVisibility}"> android:visibility="@{inflatedVisibility}"
android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/voip_remote_margin_full_screen : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}">
<LinearLayout <LinearLayout
android:id="@+id/header" android:id="@+id/header"

27
app/src/main/res/layout/voip_conference_call_fragment.xml
View file

@ -31,13 +31,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@{controlsViewModel.fullScreenMode ? @color/black_color : @color/transparent_color}"> android:background="@{controlsViewModel.fullScreenMode ? @color/black_color : @color/transparent_color}">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/primary_buttons"
android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/voip_remote_margin_full_screen : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}">
<ViewStub <ViewStub
android:id="@+id/stubbed_conference_active_speaker_layout" android:id="@+id/stubbed_conference_active_speaker_layout"
android:inflatedId="@+id/conference_active_speaker_layout" android:inflatedId="@+id/conference_active_speaker_layout"
@ -45,9 +38,11 @@
android:visibility="@{conferenceViewModel.conferenceActiveSpeakerDisplayMode ? View.VISIBLE : View.GONE, default=gone}" android:visibility="@{conferenceViewModel.conferenceActiveSpeakerDisplayMode ? View.VISIBLE : View.GONE, default=gone}"
app:inflatedVisibility="@{conferenceViewModel.conferenceActiveSpeakerDisplayMode ? View.VISIBLE : View.GONE}" app:inflatedVisibility="@{conferenceViewModel.conferenceActiveSpeakerDisplayMode ? View.VISIBLE : View.GONE}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"
app:conferenceViewModel="@{conferenceViewModel}" app:conferenceViewModel="@{conferenceViewModel}"
app:controlsViewModel="@{controlsViewModel}"/> app:controlsViewModel="@{controlsViewModel}"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/primary_buttons" />
<ViewStub <ViewStub
android:id="@+id/stubbed_conference_grid_layout" android:id="@+id/stubbed_conference_grid_layout"
@ -55,9 +50,11 @@
android:visibility="@{conferenceViewModel.conferenceMosaicDisplayMode ? View.VISIBLE : View.GONE, default=gone}" android:visibility="@{conferenceViewModel.conferenceMosaicDisplayMode ? View.VISIBLE : View.GONE, default=gone}"
app:inflatedVisibility="@{conferenceViewModel.conferenceMosaicDisplayMode ? View.VISIBLE : View.GONE}" app:inflatedVisibility="@{conferenceViewModel.conferenceMosaicDisplayMode ? View.VISIBLE : View.GONE}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"
app:conferenceViewModel="@{conferenceViewModel}" app:conferenceViewModel="@{conferenceViewModel}"
app:controlsViewModel="@{controlsViewModel}"/> app:controlsViewModel="@{controlsViewModel}"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/primary_buttons" />
<ViewStub <ViewStub
android:id="@+id/stubbed_conference_audio_only_layout" android:id="@+id/stubbed_conference_audio_only_layout"
@ -65,11 +62,11 @@
android:visibility="@{conferenceViewModel.conferenceAudioOnlyDisplayMode ? View.VISIBLE : View.GONE, default=gone}" android:visibility="@{conferenceViewModel.conferenceAudioOnlyDisplayMode ? View.VISIBLE : View.GONE, default=gone}"
app:inflatedVisibility="@{conferenceViewModel.conferenceAudioOnlyDisplayMode ? View.VISIBLE : View.GONE}" app:inflatedVisibility="@{conferenceViewModel.conferenceAudioOnlyDisplayMode ? View.VISIBLE : View.GONE}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"
app:conferenceViewModel="@{conferenceViewModel}" app:conferenceViewModel="@{conferenceViewModel}"
app:controlsViewModel="@{controlsViewModel}"/> app:controlsViewModel="@{controlsViewModel}"
android:layout_height="0dp"
</androidx.constraintlayout.widget.ConstraintLayout> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/primary_buttons" />
<ViewStub <ViewStub
android:id="@+id/stubbed_audio_routes" android:id="@+id/stubbed_audio_routes"

3
app/src/main/res/layout/voip_conference_grid.xml
View file

@ -18,7 +18,8 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="@{inflatedVisibility}"> android:visibility="@{inflatedVisibility}"
android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/voip_remote_margin_full_screen : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

1
app/src/main/res/layout/voip_conference_participant_remote_active_speaker_miniature.xml
View file

@ -58,6 +58,7 @@
android:layout_height="@dimen/voip_conference_active_speaker_miniature_avatar_size" android:layout_height="@dimen/voip_conference_active_speaker_miniature_avatar_size"
android:src="@drawable/icon_pause" android:src="@drawable/icon_pause"
android:background="@drawable/shape_button_background" android:background="@drawable/shape_button_background"
android:contentDescription="@string/content_description_participant_is_paused"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

1
app/src/main/res/layout/voip_conference_participant_remote_grid.xml
View file

@ -57,6 +57,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/icon_pause" android:src="@drawable/icon_pause"
android:background="@drawable/shape_button_background" android:background="@drawable/shape_button_background"
android:contentDescription="@string/content_description_participant_is_paused"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

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

@ -844,4 +844,5 @@
<string name="content_description_go_to_chat_rooms_list">Go to conversations list</string> <string name="content_description_go_to_chat_rooms_list">Go to conversations list</string>
<string name="content_description_conference_participant_mic_muted">Participant has it\'s microphone muted</string> <string name="content_description_conference_participant_mic_muted">Participant has it\'s microphone muted</string>
<string name="content_description_toggle_layout_menu">Show or hide conference layout menu</string> <string name="content_description_toggle_layout_menu">Show or hide conference layout menu</string>
<string name="content_description_participant_is_paused">Participant has momentarily left the conference</string>
</resources> </resources>