diff --git a/app/src/main/res/layout/voip_buttons_incoming.xml b/app/src/main/res/layout/voip_buttons_incoming.xml index efffbe663..b1765e4e3 100644 --- a/app/src/main/res/layout/voip_buttons_incoming.xml +++ b/app/src/main/res/layout/voip_buttons_incoming.xml @@ -3,7 +3,9 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> + + @@ -27,7 +29,7 @@ app:layout_constraintDimensionRatio="W,1.26:1" app:layout_constraintEnd_toStartOf="@id/answer" app:layout_constraintHorizontal_chainStyle="packed" - app:layout_constraintStart_toStartOf="parent"/> + app:layout_constraintStart_toStartOf="parent" /> + + @@ -24,7 +26,7 @@ android:src="@drawable/icon_call_hangup" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="W,1.26:1" - app:layout_constraintStart_toStartOf="parent"/> + app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintStart_toStartOf="@id/hangup" /> + app:layout_constraintStart_toEndOf="@id/microphone" /> + app:layout_constraintEnd_toEndOf="parent" /> diff --git a/app/src/main/res/layout/voip_call_incoming_fragment.xml b/app/src/main/res/layout/voip_call_incoming_fragment.xml index 794bd7ab0..588536a4a 100644 --- a/app/src/main/res/layout/voip_call_incoming_fragment.xml +++ b/app/src/main/res/layout/voip_call_incoming_fragment.xml @@ -3,10 +3,13 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> + + + diff --git a/app/src/main/res/layout/voip_call_outgoing_fragment.xml b/app/src/main/res/layout/voip_call_outgoing_fragment.xml index a119a0060..a8c5ba11f 100644 --- a/app/src/main/res/layout/voip_call_outgoing_fragment.xml +++ b/app/src/main/res/layout/voip_call_outgoing_fragment.xml @@ -3,10 +3,13 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> + + + @@ -103,7 +106,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintWidth_max="350dp" /> + app:layout_constraintWidth_max="@dimen/voip_buttons_max_width" /> + + @@ -14,91 +16,81 @@ android:layout_height="@dimen/voip_active_speaker_miniature_size" android:layout_marginStart="5dp" android:layout_marginEnd="5dp" - app:layout_flexShrink="0" - app:layout_alignSelf="flex_end"> + 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_alignSelf="flex_end" + app:layout_flexShrink="0"> - - - - - + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> + android:visibility="@{data.videoEnabled && data.isSwitchCameraAvailable() && data.isInConference ? View.VISIBLE : View.GONE, default=gone}" + app:layout_constraintEnd_toEndOf="@id/participant_video_surface" + app:layout_constraintTop_toTopOf="@id/participant_video_surface" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" />