From 7c0afedc05e28661f3154ca4776724c157c0856d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 27 Mar 2025 11:32:11 +0100
Subject: [PATCH] Show floating action button to open numpad in outgoing early
 media call, prevent display name & SIP address being displayed twice if early
 media is audio only

---
 .../ui/call/fragment/OutgoingCallFragment.kt  |  12 +
 .../in_call_button_background_tint_color.xml  |   6 +
 .../layout-land/call_outgoing_fragment.xml    | 248 +++++++++--------
 .../res/layout/call_incoming_fragment.xml     |   4 +-
 .../res/layout/call_outgoing_fragment.xml     | 254 ++++++++++--------
 5 files changed, 301 insertions(+), 223 deletions(-)
 create mode 100644 app/src/main/res/color/in_call_button_background_tint_color.xml

diff --git a/app/src/main/java/org/linphone/ui/call/fragment/OutgoingCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/OutgoingCallFragment.kt
index e4b0bdbd3..ffbb9714a 100644
--- a/app/src/main/java/org/linphone/ui/call/fragment/OutgoingCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/OutgoingCallFragment.kt
@@ -26,6 +26,7 @@ import android.view.ViewGroup
 import androidx.annotation.UiThread
 import androidx.core.view.doOnLayout
 import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.core.tools.Log
 import org.linphone.databinding.CallOutgoingFragmentBinding
@@ -60,6 +61,7 @@ class OutgoingCallFragment : GenericCallFragment() {
 
         binding.lifecycleOwner = viewLifecycleOwner
         binding.viewModel = callViewModel
+        binding.numpadModel = callViewModel.numpadModel
 
         callViewModel.isOutgoingEarlyMedia.observe(viewLifecycleOwner) { earlyMedia ->
             if (earlyMedia) {
@@ -69,6 +71,16 @@ class OutgoingCallFragment : GenericCallFragment() {
                 }
             }
         }
+
+        val numpadBottomSheetBehavior = BottomSheetBehavior.from(binding.callNumpad.root)
+        numpadBottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
+        numpadBottomSheetBehavior.skipCollapsed = true
+
+        callViewModel.showNumpadBottomSheetEvent.observe(viewLifecycleOwner) {
+            it.consume {
+                numpadBottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
+            }
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/res/color/in_call_button_background_tint_color.xml b/app/src/main/res/color/in_call_button_background_tint_color.xml
new file mode 100644
index 000000000..67e4952cb
--- /dev/null
+++ b/app/src/main/res/color/in_call_button_background_tint_color.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/gray_700" />
+    <item android:state_pressed="true" android:color="@color/gray_main2_400" />
+    <item android:color="@color/gray_500"/>
+</selector>
diff --git a/app/src/main/res/layout-land/call_outgoing_fragment.xml b/app/src/main/res/layout-land/call_outgoing_fragment.xml
index 2f9c0292f..539be70ce 100644
--- a/app/src/main/res/layout-land/call_outgoing_fragment.xml
+++ b/app/src/main/res/layout-land/call_outgoing_fragment.xml
@@ -8,133 +8,163 @@
         <variable
             name="viewModel"
             type="org.linphone.ui.call.viewmodel.CurrentCallViewModel" />
+        <variable
+            name="numpadModel"
+            type="org.linphone.ui.main.history.model.NumpadModel" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/gray_900">
+        android:layout_height="match_parent">
 
-        <ImageView
-            android:id="@+id/call_direction_icon"
-            android:layout_width="12dp"
-            android:layout_height="12dp"
-            android:layout_marginStart="10dp"
-            android:adjustViewBounds="true"
-            android:src="@drawable/outgoing_call"
-            android:contentDescription="@null"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/call_direction_label"
-            app:layout_constraintBottom_toBottomOf="@id/call_direction_label"/>
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/gray_900">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/call_header_style"
-            android:id="@+id/call_direction_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:text="@string/call_outgoing"
-            app:layout_constraintStart_toEndOf="@id/call_direction_icon"
-            app:layout_constraintTop_toTopOf="parent"/>
-
-        <include
-            android:id="@+id/avatar"
-            android:layout_width="@dimen/avatar_in_call_size"
-            android:layout_height="@dimen/avatar_in_call_size"
-            layout="@layout/contact_avatar_huge"
-            bind:model="@{viewModel.contact}"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintEnd_toStartOf="@id/name_address"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/call_direction_label"
-            app:layout_constraintBottom_toTopOf="@id/bottom_bar" />
-
-        <LinearLayout
-            android:id="@+id/name_address"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
-            android:orientation="vertical"
-            android:gravity="center"
-            app:layout_constraintStart_toEndOf="@id/avatar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/call_direction_label"
-            app:layout_constraintBottom_toTopOf="@id/bottom_bar">
+            <ImageView
+                android:id="@+id/call_direction_icon"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:layout_marginStart="10dp"
+                android:adjustViewBounds="true"
+                android:src="@drawable/outgoing_call"
+                android:contentDescription="@null"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@id/call_direction_label"
+                app:layout_constraintBottom_toBottomOf="@id/call_direction_label"/>
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style_300"
-                android:id="@+id/name"
+                style="@style/call_header_style"
+                android:id="@+id/call_direction_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:text="@{viewModel.displayedName, default=`John Doe`}"
-                android:textColor="@color/bc_white"
-                android:textSize="22sp" />
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:text="@string/call_outgoing"
+                app:layout_constraintStart_toEndOf="@id/call_direction_icon"
+                app:layout_constraintTop_toTopOf="parent"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style"
-                android:id="@+id/address"
+            <include
+                android:id="@+id/avatar"
+                android:layout_width="@dimen/avatar_in_call_size"
+                android:layout_height="@dimen/avatar_in_call_size"
+                layout="@layout/contact_avatar_huge"
+                bind:model="@{viewModel.contact}"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintEnd_toStartOf="@id/name_address"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/call_direction_label"
+                app:layout_constraintBottom_toTopOf="@id/bottom_bar" />
+
+            <LinearLayout
+                android:id="@+id/name_address"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}"
-                android:textColor="@color/bc_white"
-                android:textSize="14sp" />
+                android:layout_marginStart="30dp"
+                android:orientation="vertical"
+                android:gravity="center"
+                app:layout_constraintStart_toEndOf="@id/avatar"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/call_direction_label"
+                app:layout_constraintBottom_toTopOf="@id/bottom_bar">
 
-        </LinearLayout>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style_300"
+                    android:id="@+id/name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:text="@{viewModel.displayedName, default=`John Doe`}"
+                    android:textColor="@color/bc_white"
+                    android:textSize="22sp" />
 
-        <ImageView
-            android:onClick="@{() -> viewModel.switchCamera()}"
-            android:id="@+id/switch_camera"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/top_bar_height"
-            android:padding="10dp"
-            android:layout_marginStart="5dp"
-            android:layout_marginEnd="5dp"
-            android:src="@drawable/camera_rotate"
-            android:contentDescription="@string/content_description_change_camera"
-            android:visibility="gone"
-            app:tint="@color/bc_white"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style"
+                    android:id="@+id/address"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}"
+                    android:textColor="@color/bc_white"
+                    android:textSize="14sp" />
 
-        <com.google.android.material.progressindicator.CircularProgressIndicator
-            android:id="@+id/in_progress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:indeterminate="true"
-            app:indicatorColor="@color/bc_white"
-            app:indicatorSize="28dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/avatar"
-            app:layout_constraintTop_toTopOf="@id/name_address"
-            app:layout_constraintBottom_toBottomOf="@id/name_address" />
+            </LinearLayout>
 
-        <org.linphone.ui.call.view.RoundCornersTextureView
-            android:id="@+id/local_preview_video_surface"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="10dp"
-            app:alignTopRight="true"
-            app:displayMode="black_bars"
-            roundCornersRadius="@dimen/call_round_corners_texture_view_radius"
-            app:layout_constraintBottom_toTopOf="@id/bottom_bar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_max="@dimen/call_video_preview_max_size"
-            app:layout_constraintWidth_max="@dimen/call_video_preview_max_size" />
+            <ImageView
+                android:onClick="@{() -> viewModel.switchCamera()}"
+                android:id="@+id/switch_camera"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/top_bar_height"
+                android:padding="10dp"
+                android:layout_marginStart="5dp"
+                android:layout_marginEnd="5dp"
+                android:src="@drawable/camera_rotate"
+                android:contentDescription="@string/content_description_change_camera"
+                android:visibility="gone"
+                app:tint="@color/bc_white"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <com.google.android.material.progressindicator.CircularProgressIndicator
+                android:id="@+id/in_progress"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:indeterminate="true"
+                app:indicatorColor="@color/bc_white"
+                app:indicatorSize="28dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/avatar"
+                app:layout_constraintTop_toTopOf="@id/name_address"
+                app:layout_constraintBottom_toBottomOf="@id/name_address" />
+
+            <org.linphone.ui.call.view.RoundCornersTextureView
+                android:id="@+id/local_preview_video_surface"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="10dp"
+                app:alignTopRight="true"
+                app:displayMode="black_bars"
+                roundCornersRadius="@dimen/call_round_corners_texture_view_radius"
+                app:layout_constraintBottom_toTopOf="@id/bottom_bar"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHeight_max="@dimen/call_video_preview_max_size"
+                app:layout_constraintWidth_max="@dimen/call_video_preview_max_size" />
+
+            <include
+                bind:viewModel="@{viewModel}"
+                android:id="@+id/bottom_bar"
+                layout="@layout/call_outgoing_actions"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/call_main_actions_menu_height"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/new_contact"
+                android:onClick="@{() -> viewModel.showNumpad()}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|bottom"
+                android:layout_margin="16dp"
+                android:src="@drawable/numpad"
+                android:contentDescription="@string/content_description_show_numpad"
+                android:visibility="@{viewModel.isOutgoingEarlyMedia ? View.VISIBLE : View.GONE, default=gone}"
+                app:tint="@color/in_call_button_tint_color"
+                app:backgroundTint="@color/in_call_button_background_tint_color"
+                app:shapeAppearanceOverlay="@style/rounded"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/bottom_bar" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <include
-            bind:viewModel="@{viewModel}"
-            android:id="@+id/bottom_bar"
-            layout="@layout/call_outgoing_actions"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/call_main_actions_menu_height"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            android:id="@+id/call_numpad"
+            layout="@layout/call_numpad_bottom_sheet"
+            bind:model="@{numpadModel}"/>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/call_incoming_fragment.xml b/app/src/main/res/layout/call_incoming_fragment.xml
index c8b55177f..cd3d4c0fd 100644
--- a/app/src/main/res/layout/call_incoming_fragment.xml
+++ b/app/src/main/res/layout/call_incoming_fragment.xml
@@ -110,7 +110,7 @@
             android:text="@{viewModel.displayedName, default=`John Doe`}"
             android:textColor="@color/bc_white"
             android:textSize="22sp"
-            android:visibility="@{viewModel.isIncomingEarlyMedia ? View.VISIBLE : View.GONE, default=gone}"
+            android:visibility="@{viewModel.isIncomingEarlyMedia &amp;&amp; viewModel.isVideoEnabled ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintBottom_toTopOf="@id/early_media_address"
             app:layout_constraintStart_toStartOf="parent" />
 
@@ -124,7 +124,7 @@
             android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}"
             android:textColor="@color/bc_white"
             android:textSize="14sp"
-            android:visibility="@{viewModel.isIncomingEarlyMedia ? View.VISIBLE : View.GONE, default=gone}"
+            android:visibility="@{viewModel.isIncomingEarlyMedia &amp;&amp; viewModel.isVideoEnabled ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintBottom_toTopOf="@id/bottom_bar"
             app:layout_constraintStart_toStartOf="parent" />
 
diff --git a/app/src/main/res/layout/call_outgoing_fragment.xml b/app/src/main/res/layout/call_outgoing_fragment.xml
index fe69ccf88..73fcddeaa 100644
--- a/app/src/main/res/layout/call_outgoing_fragment.xml
+++ b/app/src/main/res/layout/call_outgoing_fragment.xml
@@ -8,127 +8,157 @@
         <variable
             name="viewModel"
             type="org.linphone.ui.call.viewmodel.CurrentCallViewModel" />
+        <variable
+            name="numpadModel"
+            type="org.linphone.ui.main.history.model.NumpadModel" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/gray_900">
+        android:layout_height="match_parent">
 
-        <ImageView
-            android:id="@+id/call_direction_icon"
-            android:layout_width="12dp"
-            android:layout_height="12dp"
-            android:layout_marginStart="10dp"
-            android:adjustViewBounds="true"
-            android:src="@drawable/outgoing_call"
-            android:contentDescription="@null"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/call_direction_label"
-            app:layout_constraintBottom_toBottomOf="@id/call_direction_label"/>
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/gray_900">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/call_header_style"
-            android:id="@+id/call_direction_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="10dp"
-            android:text="@string/call_outgoing"
-            app:layout_constraintStart_toEndOf="@id/call_direction_icon"
-            app:layout_constraintTop_toTopOf="parent"/>
+            <ImageView
+                android:id="@+id/call_direction_icon"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:layout_marginStart="10dp"
+                android:adjustViewBounds="true"
+                android:src="@drawable/outgoing_call"
+                android:contentDescription="@null"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@id/call_direction_label"
+                app:layout_constraintBottom_toBottomOf="@id/call_direction_label"/>
 
-        <ImageView
-            android:onClick="@{() -> viewModel.switchCamera()}"
-            android:id="@+id/switch_camera"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/top_bar_height"
-            android:padding="10dp"
-            android:layout_marginStart="5dp"
-            android:layout_marginEnd="5dp"
-            android:src="@drawable/camera_rotate"
-            android:contentDescription="@string/content_description_change_camera"
-            android:visibility="gone"
-            app:tint="@color/bc_white"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/call_header_style"
+                android:id="@+id/call_direction_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:text="@string/call_outgoing"
+                app:layout_constraintStart_toEndOf="@id/call_direction_icon"
+                app:layout_constraintTop_toTopOf="parent"/>
 
-        <com.google.android.material.progressindicator.CircularProgressIndicator
-            android:id="@+id/in_progress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:indeterminate="true"
-            app:indicatorColor="@color/bc_white"
-            app:indicatorSize="28dp"
-            app:layout_constraintStart_toStartOf="@id/avatar"
-            app:layout_constraintEnd_toEndOf="@id/avatar"
-            app:layout_constraintTop_toBottomOf="@id/call_direction_label"
-            app:layout_constraintBottom_toTopOf="@id/avatar" />
+            <ImageView
+                android:onClick="@{() -> viewModel.switchCamera()}"
+                android:id="@+id/switch_camera"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/top_bar_height"
+                android:padding="10dp"
+                android:layout_marginStart="5dp"
+                android:layout_marginEnd="5dp"
+                android:src="@drawable/camera_rotate"
+                android:contentDescription="@string/content_description_change_camera"
+                android:visibility="gone"
+                app:tint="@color/bc_white"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <com.google.android.material.progressindicator.CircularProgressIndicator
+                android:id="@+id/in_progress"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:indeterminate="true"
+                app:indicatorColor="@color/bc_white"
+                app:indicatorSize="28dp"
+                app:layout_constraintStart_toStartOf="@id/avatar"
+                app:layout_constraintEnd_toEndOf="@id/avatar"
+                app:layout_constraintTop_toBottomOf="@id/call_direction_label"
+                app:layout_constraintBottom_toTopOf="@id/avatar" />
+
+            <include
+                android:id="@+id/avatar"
+                android:layout_width="@dimen/avatar_in_call_size"
+                android:layout_height="@dimen/avatar_in_call_size"
+                layout="@layout/contact_avatar_huge"
+                bind:model="@{viewModel.contact}"
+                app:layout_constraintVertical_chainStyle="packed"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/call_direction_label"
+                app:layout_constraintBottom_toTopOf="@id/name" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_300"
+                android:id="@+id/name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:text="@{viewModel.displayedName, default=`John Doe`}"
+                android:textColor="@color/bc_white"
+                android:textSize="22sp"
+                app:layout_constraintTop_toBottomOf="@id/avatar"
+                app:layout_constraintBottom_toTopOf="@id/address"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style"
+                android:id="@+id/address"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}"
+                android:textColor="@color/bc_white"
+                android:textSize="14sp"
+                app:layout_constraintTop_toBottomOf="@id/name"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <org.linphone.ui.call.view.RoundCornersTextureView
+                android:id="@+id/local_preview_video_surface"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="10dp"
+                app:alignTopRight="true"
+                app:displayMode="black_bars"
+                roundCornersRadius="@dimen/call_round_corners_texture_view_radius"
+                app:layout_constraintBottom_toTopOf="@id/bottom_bar"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHeight_max="@dimen/call_video_preview_max_size"
+                app:layout_constraintWidth_max="@dimen/call_video_preview_max_size" />
+
+            <include
+                bind:viewModel="@{viewModel}"
+                android:id="@+id/bottom_bar"
+                layout="@layout/call_outgoing_actions"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/call_main_actions_menu_height"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/new_contact"
+                android:onClick="@{() -> viewModel.showNumpad()}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|bottom"
+                android:layout_margin="16dp"
+                android:src="@drawable/numpad"
+                android:contentDescription="@string/content_description_show_numpad"
+                android:visibility="@{viewModel.isOutgoingEarlyMedia ? View.VISIBLE : View.GONE, default=gone}"
+                app:tint="@color/in_call_button_tint_color"
+                app:backgroundTint="@color/in_call_button_background_tint_color"
+                app:shapeAppearanceOverlay="@style/rounded"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/bottom_bar" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <include
-            android:id="@+id/avatar"
-            android:layout_width="@dimen/avatar_in_call_size"
-            android:layout_height="@dimen/avatar_in_call_size"
-            layout="@layout/contact_avatar_huge"
-            bind:model="@{viewModel.contact}"
-            app:layout_constraintVertical_chainStyle="packed"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/call_direction_label"
-            app:layout_constraintBottom_toTopOf="@id/name" />
+            android:id="@+id/call_numpad"
+            layout="@layout/call_numpad_bottom_sheet"
+            bind:model="@{numpadModel}"/>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_300"
-            android:id="@+id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:text="@{viewModel.displayedName, default=`John Doe`}"
-            android:textColor="@color/bc_white"
-            android:textSize="22sp"
-            app:layout_constraintTop_toBottomOf="@id/avatar"
-            app:layout_constraintBottom_toTopOf="@id/address"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
-            android:id="@+id/address"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}"
-            android:textColor="@color/bc_white"
-            android:textSize="14sp"
-            app:layout_constraintTop_toBottomOf="@id/name"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <org.linphone.ui.call.view.RoundCornersTextureView
-            android:id="@+id/local_preview_video_surface"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="10dp"
-            app:alignTopRight="true"
-            app:displayMode="black_bars"
-            roundCornersRadius="@dimen/call_round_corners_texture_view_radius"
-            app:layout_constraintBottom_toTopOf="@id/bottom_bar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_max="@dimen/call_video_preview_max_size"
-            app:layout_constraintWidth_max="@dimen/call_video_preview_max_size" />
-
-        <include
-            bind:viewModel="@{viewModel}"
-            android:id="@+id/bottom_bar"
-            layout="@layout/call_outgoing_actions"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/call_main_actions_menu_height"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
\ No newline at end of file