From e0f6121dc9363faf665291a03880b00fa6a07275 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 24 Aug 2023 16:50:19 +0200
Subject: [PATCH] Improvements for video calls

---
 .../java/org/linphone/utils/DataBindingUtils.kt    |  9 +++++++++
 app/src/main/res/layout/contact_fragment.xml       |  5 ++---
 .../main/res/layout/voip_active_call_fragment.xml  | 14 ++++++++------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index ae1a459c9..34495dcf4 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -32,6 +32,7 @@ import androidx.annotation.ColorInt
 import androidx.annotation.UiThread
 import androidx.appcompat.widget.AppCompatEditText
 import androidx.appcompat.widget.AppCompatTextView
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
@@ -260,3 +261,11 @@ fun AppCompatEditText.editTextSetting(lambda: () -> Unit) {
         override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
     })
 }
+
+@BindingAdapter("android:layout_marginBottom")
+fun setConstraintLayoutBottomMargin(view: View, margins: Float) {
+    val params = view.layoutParams as ConstraintLayout.LayoutParams
+    val m = margins.toInt()
+    params.setMargins(params.leftMargin, params.topMargin, params.rightMargin, m)
+    view.layoutParams = params
+}
diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml
index b84f997a5..329d2912d 100644
--- a/app/src/main/res/layout/contact_fragment.xml
+++ b/app/src/main/res/layout/contact_fragment.xml
@@ -59,7 +59,7 @@
             android:onClick="@{() -> viewModel.editContact()}"
             android:id="@+id/edit"
             android:layout_width="wrap_content"
-            android:layout_height="35dp"
+            android:layout_height="0dp"
             android:layout_marginEnd="10dp"
             android:padding="5dp"
             android:src="@drawable/pencil_simple"
@@ -71,11 +71,10 @@
             android:id="@+id/scrollView"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="5dp"
             android:background="@color/gray_7"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/edit"
+            app:layout_constraintTop_toBottomOf="@id/invisible_title"
             app:layout_constraintBottom_toBottomOf="parent">
 
             <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/voip_active_call_fragment.xml b/app/src/main/res/layout/voip_active_call_fragment.xml
index b0bf66c01..3b4f4d9d7 100644
--- a/app/src/main/res/layout/voip_active_call_fragment.xml
+++ b/app/src/main/res/layout/voip_active_call_fragment.xml
@@ -33,13 +33,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:layout_marginTop="7dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
             android:visibility="@{viewModel.fullScreenMode ? View.GONE : View.VISIBLE}"
             android:text="@{viewModel.isOutgoing ? `Outgoing call` : `Incoming call`, default=`Outgoing call`}"
             android:textColor="@color/white"
             android:textSize="16sp"
             app:layout_constraintStart_toEndOf="@id/call_direction_icon"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/background"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_800"
@@ -87,7 +89,6 @@
             android:src="@drawable/shape_round_in_call_gray_background"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="17dp"
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"
             android:layout_marginBottom="@dimen/in_call_main_actions_menu_height"
@@ -152,11 +153,12 @@
             android:id="@+id/remote_video_surface"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginBottom="@{viewModel.fullScreenMode ? @dimen/zero : @dimen/in_call_main_actions_menu_height, default=@dimen/in_call_main_actions_menu_height}"
             android:onClick="@{() -> viewModel.toggleFullScreen()}"
             android:visibility="@{viewModel.isVideoEnabled ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="@id/background"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toStartOf="@id/background"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/background" />
 
         <org.linphone.ui.voip.view.RoundCornersTextureView