From 633aee829af4d7ce8aed576d5d3de27954b3a894 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 5 Sep 2025 11:04:16 +0200
Subject: [PATCH] Updated numpad digits from cirlces to squircles to make them
 bigger

---
 .../in_call_numpad_button_background.xml      |  9 +++
 .../shape_squircle_numpad_background.xml      |  5 ++
 ...ape_squircle_numpad_pressed_background.xml |  5 ++
 .../layout-land/call_numpad_bottom_sheet.xml  | 50 ++++++++--------
 .../res/layout/call_numpad_bottom_sheet.xml   | 53 +++++++++--------
 app/src/main/res/layout/call_numpad_digit.xml |  2 +-
 .../layout/call_numpad_digit_with_letters.xml |  2 +-
 .../layout/call_numpad_digit_with_plus.xml    |  2 +-
 .../call_numpad_digit_with_voicemail.xml      |  2 +-
 .../layout/start_call_numpad_bottom_sheet.xml | 59 ++++++++++---------
 app/src/main/res/values/dimen.xml             |  1 +
 app/src/main/res/values/styles.xml            |  4 ++
 12 files changed, 112 insertions(+), 82 deletions(-)
 create mode 100644 app/src/main/res/drawable/in_call_numpad_button_background.xml
 create mode 100644 app/src/main/res/drawable/shape_squircle_numpad_background.xml
 create mode 100644 app/src/main/res/drawable/shape_squircle_numpad_pressed_background.xml

diff --git a/app/src/main/res/drawable/in_call_numpad_button_background.xml b/app/src/main/res/drawable/in_call_numpad_button_background.xml
new file mode 100644
index 000000000..57ac431b8
--- /dev/null
+++ b/app/src/main/res/drawable/in_call_numpad_button_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+        android:drawable="@drawable/shape_squircle_numpad_pressed_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_squircle_numpad_pressed_background" />
+    <item
+        android:drawable="@drawable/shape_squircle_numpad_background" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_squircle_numpad_background.xml b/app/src/main/res/drawable/shape_squircle_numpad_background.xml
new file mode 100644
index 000000000..e0b7f9980
--- /dev/null
+++ b/app/src/main/res/drawable/shape_squircle_numpad_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="71dp" />
+    <solid android:color="@color/gray_500"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_squircle_numpad_pressed_background.xml b/app/src/main/res/drawable/shape_squircle_numpad_pressed_background.xml
new file mode 100644
index 000000000..c03011715
--- /dev/null
+++ b/app/src/main/res/drawable/shape_squircle_numpad_pressed_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="71dp" />
+    <solid android:color="@color/gray_main2_400"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/call_numpad_bottom_sheet.xml b/app/src/main/res/layout-land/call_numpad_bottom_sheet.xml
index bb8a340db..c7fc113f7 100644
--- a/app/src/main/res/layout-land/call_numpad_bottom_sheet.xml
+++ b/app/src/main/res/layout-land/call_numpad_bottom_sheet.xml
@@ -77,20 +77,20 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_marginTop="14dp"
+            android:layout_marginBottom="10dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/backspace"
             app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginBottom="20dp"
             app:flow_horizontalStyle="spread"
             app:flow_wrapMode="aligned"
             app:flow_verticalGap="10dp"
+            app:flow_horizontalGap="10dp"
             app:flow_maxElementsWrap="6"
             app:constraint_referenced_ids="digit_1, digit_2, digit_3, digit_4, digit_5, digit_6, digit_7, digit_8, digit_9, digit_star, digit_0, digit_sharp" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_1"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`1`}"
             bind:model="@{model}"
@@ -98,120 +98,120 @@
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_2"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`2`}"
             bind:letters="@{`abc`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_3"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`3`}"
             bind:letters="@{`def`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_4"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`4`}"
             bind:letters="@{`ghi`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_5"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`5`}"
             bind:letters="@{`jkl`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_6"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`6`}"
             bind:letters="@{`mno`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_7"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`7`}"
             bind:letters="@{`pqrs`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_8"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`8`}"
             bind:letters="@{`tuv`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_9"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`9`}"
             bind:letters="@{`wxyz`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_star"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`*`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_0"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`0`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_sharp"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`#`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
diff --git a/app/src/main/res/layout/call_numpad_bottom_sheet.xml b/app/src/main/res/layout/call_numpad_bottom_sheet.xml
index ee2481b3f..bd94dbcc6 100644
--- a/app/src/main/res/layout/call_numpad_bottom_sheet.xml
+++ b/app/src/main/res/layout/call_numpad_bottom_sheet.xml
@@ -77,141 +77,144 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_marginTop="14dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/backspace"
             app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginBottom="20dp"
             app:flow_horizontalStyle="spread"
             app:flow_wrapMode="aligned"
             app:flow_verticalGap="10dp"
+            app:flow_horizontalGap="10dp"
             app:flow_maxElementsWrap="3"
             app:constraint_referenced_ids="digit_1, digit_2, digit_3, digit_4, digit_5, digit_6, digit_7, digit_8, digit_9, digit_star, digit_0, digit_sharp" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_1"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`1`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_2"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`2`}"
             bind:letters="@{`abc`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_3"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`3`}"
             bind:letters="@{`def`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_4"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`4`}"
             bind:letters="@{`ghi`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_5"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`5`}"
             bind:letters="@{`jkl`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_6"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`6`}"
             bind:letters="@{`mno`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_7"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`7`}"
             bind:letters="@{`pqrs`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_8"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`8`}"
             bind:letters="@{`tuv`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_9"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`9`}"
             bind:letters="@{`wxyz`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_star"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`*`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_0"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`0`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_sharp"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`#`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/numpad_handle"
             app:layout_constraintStart_toStartOf="parent" />
 
diff --git a/app/src/main/res/layout/call_numpad_digit.xml b/app/src/main/res/layout/call_numpad_digit.xml
index d02a27f22..1fae2a8c9 100644
--- a/app/src/main/res/layout/call_numpad_digit.xml
+++ b/app/src/main/res/layout/call_numpad_digit.xml
@@ -15,7 +15,7 @@
         android:onClick="@{() -> model.onDigitClicked(digit)}"
         android:layout_width="@dimen/call_dtmf_button_size"
         android:layout_height="@dimen/call_dtmf_button_size"
-        android:background="@drawable/in_call_button_background_red">
+        android:background="@drawable/in_call_numpad_button_background">
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
diff --git a/app/src/main/res/layout/call_numpad_digit_with_letters.xml b/app/src/main/res/layout/call_numpad_digit_with_letters.xml
index 8bba443ee..e56ecd448 100644
--- a/app/src/main/res/layout/call_numpad_digit_with_letters.xml
+++ b/app/src/main/res/layout/call_numpad_digit_with_letters.xml
@@ -20,7 +20,7 @@
         android:onLongClick="@{() -> model.onDigitLongClicked(digit)}"
         android:layout_width="@dimen/call_dtmf_button_size"
         android:layout_height="@dimen/call_dtmf_button_size"
-        android:background="@drawable/in_call_button_background_red">
+        android:background="@drawable/in_call_numpad_button_background">
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
diff --git a/app/src/main/res/layout/call_numpad_digit_with_plus.xml b/app/src/main/res/layout/call_numpad_digit_with_plus.xml
index dcc8a25c5..ea9ff20a8 100644
--- a/app/src/main/res/layout/call_numpad_digit_with_plus.xml
+++ b/app/src/main/res/layout/call_numpad_digit_with_plus.xml
@@ -18,7 +18,7 @@
         android:onLongClick="@{() -> model.onDigitLongClicked(digit)}"
         android:layout_width="@dimen/call_dtmf_button_size"
         android:layout_height="@dimen/call_dtmf_button_size"
-        android:background="@drawable/in_call_button_background_red">
+        android:background="@drawable/in_call_numpad_button_background">
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
diff --git a/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml b/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml
index 71108c24d..8b1933102 100644
--- a/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml
+++ b/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml
@@ -20,7 +20,7 @@
         android:onLongClick="@{() -> model.onVoicemailLongClicked()}"
         android:layout_width="@dimen/call_dtmf_button_size"
         android:layout_height="@dimen/call_dtmf_button_size"
-        android:background="@drawable/in_call_button_background_red">
+        android:background="@drawable/in_call_numpad_button_background">
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
diff --git a/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml b/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
index cbfb75447..0775cab15 100644
--- a/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
+++ b/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
@@ -49,148 +49,151 @@
             android:id="@+id/flow"
             android:layout_width="match_parent"
             android:layout_height="0dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/handle"
             app:layout_constraintBottom_toTopOf="@id/call_barrier"
-            android:layout_marginBottom="20dp"
             app:flow_horizontalStyle="spread"
             app:flow_wrapMode="aligned"
             app:flow_verticalGap="10dp"
+            app:flow_horizontalGap="10dp"
             app:flow_maxElementsWrap="3"
             app:constraint_referenced_ids="digit_1, digit_2, digit_3, digit_4, digit_5, digit_6, digit_7, digit_8, digit_9, digit_star, digit_0, digit_sharp" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_1"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_voicemail"
             bind:digit="@{`1`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_2"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`2`}"
             bind:letters="@{`abc`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_3"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`3`}"
             bind:letters="@{`def`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_4"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`4`}"
             bind:letters="@{`ghi`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_5"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`5`}"
             bind:letters="@{`jkl`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_6"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`6`}"
             bind:letters="@{`mno`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_7"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`7`}"
             bind:letters="@{`pqrs`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_8"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`8`}"
             bind:letters="@{`tuv`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_9"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`9`}"
             bind:letters="@{`wxyz`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_star"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`*`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_0"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_plus"
             bind:digit="@{`0`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <include
+            style="@style/numpad_button_style"
             android:id="@+id/digit_sharp"
-            android:layout_width="@dimen/call_dtmf_button_size"
-            android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`#`}"
             bind:model="@{model}"
+            app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
             app:layout_constraintTop_toBottomOf="@id/handle"
             app:layout_constraintStart_toStartOf="parent" />
 
         <ImageView
             android:id="@+id/call"
             android:onClick="@{() -> model.onCallClicked()}"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_button_size"
             android:paddingStart="30dp"
             android:paddingTop="15dp"
@@ -202,8 +205,8 @@
             android:background="@drawable/squircle_green_button_background"
             android:visibility="@{showCallTransferIcon ? View.GONE : View.VISIBLE}"
             app:tint="@color/bc_white"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/digit_0"
+            app:layout_constraintEnd_toEndOf="@id/digit_0"
             app:layout_constraintTop_toBottomOf="@id/digit_0"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index e2b65dbb3..8830b12bb 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -68,6 +68,7 @@
     <dimen name="sliding_accept_decline_call_margin">10dp</dimen>
     <dimen name="call_button_icon_padding">15dp</dimen>
     <dimen name="call_dtmf_button_size">65dp</dimen>
+    <dimen name="call_dtmf_button_max_width">120dp</dimen>
     <dimen name="call_extra_button_top_margin">30dp</dimen>
 
     <dimen name="call_video_preview_max_size">200dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a161245be..7f262f272 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -235,4 +235,8 @@
         <item name="android:autoSizeMinTextSize">8sp</item>
         <item name="android:autoSizeStepGranularity">1sp</item>
     </style>
+    <style name="numpad_button_style">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">@dimen/call_dtmf_button_size</item>
+    </style>
 </resources>