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

Fixed margin between views in mosaic conference layout that was removed with latest rework

Browse source
This commit is contained in:
Sylvain Berfini 2022-03-24 15:29:55 +01:00
parent 487cae1625
commit df8721c5fd
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/linphone/activities/voip/views/GridBoxLayout.kt
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2010-2020 Belledonne Communications SARL. * Copyright (c) 2010-2022 Belledonne Communications SARL.
* *
* This file is part of linphone-android * This file is part of linphone-android
* (see https://www.linphone.org). * (see https://www.linphone.org).
@ -18,6 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.linphone.activities.voip.views package org.linphone.activities.voip.views
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.util.AttributeSet import android.util.AttributeSet

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

@ -14,12 +14,17 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@{!data.isInConference ? @drawable/shape_remote_paused_background : data.videoEnabled ? @drawable/shape_remote_video_background : @drawable/shape_remote_background, default=@drawable/shape_remote_background}" app:layout_constraintDimensionRatio="1:1">
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1" <View
app:layout_constraintEnd_toEndOf="parent" android:layout_width="0dp"
app:layout_constraintStart_toStartOf="parent" android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"> android:layout_margin="5dp"
android:background="@{!data.isInConference ? @drawable/shape_remote_paused_background : data.videoEnabled ? @drawable/shape_remote_video_background : @drawable/shape_remote_background, default=@drawable/shape_remote_background}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<include <include
layout="@layout/voip_contact_avatar" layout="@layout/voip_contact_avatar"
@ -39,6 +44,7 @@
participantTextureView="@{data}" participantTextureView="@{data}"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_margin="5dp"
android:visibility="@{data.videoEnabled &amp;&amp; data.isInConference ? View.VISIBLE : View.GONE}" android:visibility="@{data.videoEnabled &amp;&amp; data.isInConference ? View.VISIBLE : View.GONE}"
app:alignTopRight="false" app:alignTopRight="false"
app:displayMode="hybrid" app:displayMode="hybrid"
@ -62,6 +68,7 @@
<ImageView <ImageView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_margin="5dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:contentDescription="@null" android:contentDescription="@null"
android:src="@drawable/shape_conference_active_speaker_border" android:src="@drawable/shape_conference_active_speaker_border"
@ -95,7 +102,7 @@
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_margin="10dp"
android:contentDescription="@string/content_description_switch_camera" android:contentDescription="@string/content_description_switch_camera"
android:onClick="@{() -> data.switchCamera()}" android:onClick="@{() -> data.switchCamera()}"
android:padding="5dp" android:padding="5dp"
@ -107,7 +114,7 @@
<ImageView <ImageView
android:layout_width="@dimen/voip_conference_participant_mic_muted_icon_size" android:layout_width="@dimen/voip_conference_participant_mic_muted_icon_size"
android:layout_height="@dimen/voip_conference_participant_mic_muted_icon_size" android:layout_height="@dimen/voip_conference_participant_mic_muted_icon_size"
android:layout_margin="5dp" android:layout_margin="10dp"
android:background="@drawable/shape_button_disabled_background" android:background="@drawable/shape_button_disabled_background"
android:contentDescription="@string/content_description_conference_participant_mic_muted" android:contentDescription="@string/content_description_conference_participant_mic_muted"
android:padding="5dp" android:padding="5dp"