mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 03:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated numpad digits from cirlces to squircles to make them bigger

Browse source
This commit is contained in:
Sylvain Berfini 2025-09-05 11:04:16 +02:00
parent 38ffac31b4
commit 633aee829a
12 changed files with 112 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/res/drawable/in_call_numpad_button_background.xml Normal file
View file

@ -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>

5
app/src/main/res/drawable/shape_squircle_numpad_background.xml Normal file
View file

@ -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>

5
app/src/main/res/drawable/shape_squircle_numpad_pressed_background.xml Normal file
View file

@ -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>

50
app/src/main/res/layout-land/call_numpad_bottom_sheet.xml
View file

@ -77,20 +77,20 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
android:layout_marginBottom="10dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/backspace" app:layout_constraintTop_toBottomOf="@id/backspace"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="20dp"
app:flow_horizontalStyle="spread" app:flow_horizontalStyle="spread"
app:flow_wrapMode="aligned" app:flow_wrapMode="aligned"
app:flow_verticalGap="10dp" app:flow_verticalGap="10dp"
app:flow_horizontalGap="10dp"
app:flow_maxElementsWrap="6" 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" /> 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 <include
style="@style/numpad_button_style"
android:id="@+id/digit_1" 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" layout="@layout/call_numpad_digit"
bind:digit="@{`1`}" bind:digit="@{`1`}"
bind:model="@{model}" bind:model="@{model}"
@ -98,120 +98,120 @@
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_2" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`2`}" bind:digit="@{`2`}"
bind:letters="@{`abc`}" bind:letters="@{`abc`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_3" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`3`}" bind:digit="@{`3`}"
bind:letters="@{`def`}" bind:letters="@{`def`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_4" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`4`}" bind:digit="@{`4`}"
bind:letters="@{`ghi`}" bind:letters="@{`ghi`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_5" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`5`}" bind:digit="@{`5`}"
bind:letters="@{`jkl`}" bind:letters="@{`jkl`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_6" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`6`}" bind:digit="@{`6`}"
bind:letters="@{`mno`}" bind:letters="@{`mno`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_7" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`7`}" bind:digit="@{`7`}"
bind:letters="@{`pqrs`}" bind:letters="@{`pqrs`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_8" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`8`}" bind:digit="@{`8`}"
bind:letters="@{`tuv`}" bind:letters="@{`tuv`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_9" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`9`}" bind:digit="@{`9`}"
bind:letters="@{`wxyz`}" bind:letters="@{`wxyz`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_star" 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" layout="@layout/call_numpad_digit"
bind:digit="@{`*`}" bind:digit="@{`*`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_0" 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" layout="@layout/call_numpad_digit"
bind:digit="@{`0`}" bind:digit="@{`0`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_sharp" 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" layout="@layout/call_numpad_digit"
bind:digit="@{`#`}" bind:digit="@{`#`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />

53
app/src/main/res/layout/call_numpad_bottom_sheet.xml
View file

@ -77,141 +77,144 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
android:layout_marginBottom="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/backspace" app:layout_constraintTop_toBottomOf="@id/backspace"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="20dp"
app:flow_horizontalStyle="spread" app:flow_horizontalStyle="spread"
app:flow_wrapMode="aligned" app:flow_wrapMode="aligned"
app:flow_verticalGap="10dp" app:flow_verticalGap="10dp"
app:flow_horizontalGap="10dp"
app:flow_maxElementsWrap="3" 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" /> 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 <include
style="@style/numpad_button_style"
android:id="@+id/digit_1" 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" layout="@layout/call_numpad_digit"
bind:digit="@{`1`}" bind:digit="@{`1`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_2" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`2`}" bind:digit="@{`2`}"
bind:letters="@{`abc`}" bind:letters="@{`abc`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_3" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`3`}" bind:digit="@{`3`}"
bind:letters="@{`def`}" bind:letters="@{`def`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_4" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`4`}" bind:digit="@{`4`}"
bind:letters="@{`ghi`}" bind:letters="@{`ghi`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_5" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`5`}" bind:digit="@{`5`}"
bind:letters="@{`jkl`}" bind:letters="@{`jkl`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_6" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`6`}" bind:digit="@{`6`}"
bind:letters="@{`mno`}" bind:letters="@{`mno`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_7" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`7`}" bind:digit="@{`7`}"
bind:letters="@{`pqrs`}" bind:letters="@{`pqrs`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_8" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`8`}" bind:digit="@{`8`}"
bind:letters="@{`tuv`}" bind:letters="@{`tuv`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_9" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`9`}" bind:digit="@{`9`}"
bind:letters="@{`wxyz`}" bind:letters="@{`wxyz`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_star" 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" layout="@layout/call_numpad_digit"
bind:digit="@{`*`}" bind:digit="@{`*`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_0" 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" layout="@layout/call_numpad_digit"
bind:digit="@{`0`}" bind:digit="@{`0`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_sharp" 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" layout="@layout/call_numpad_digit"
bind:digit="@{`#`}" bind:digit="@{`#`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintTop_toBottomOf="@id/numpad_handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />

2
app/src/main/res/layout/call_numpad_digit.xml
View file

@ -15,7 +15,7 @@
android:onClick="@{() -> model.onDigitClicked(digit)}" android:onClick="@{() -> model.onDigitClicked(digit)}"
android:layout_width="@dimen/call_dtmf_button_size" android:layout_width="@dimen/call_dtmf_button_size"
android:layout_height="@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 <androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style" style="@style/default_text_style"

2
app/src/main/res/layout/call_numpad_digit_with_letters.xml
View file

@ -20,7 +20,7 @@
android:onLongClick="@{() -> model.onDigitLongClicked(digit)}" android:onLongClick="@{() -> model.onDigitLongClicked(digit)}"
android:layout_width="@dimen/call_dtmf_button_size" android:layout_width="@dimen/call_dtmf_button_size"
android:layout_height="@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 <androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style" style="@style/default_text_style"

2
app/src/main/res/layout/call_numpad_digit_with_plus.xml
View file

@ -18,7 +18,7 @@
android:onLongClick="@{() -> model.onDigitLongClicked(digit)}" android:onLongClick="@{() -> model.onDigitLongClicked(digit)}"
android:layout_width="@dimen/call_dtmf_button_size" android:layout_width="@dimen/call_dtmf_button_size"
android:layout_height="@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 <androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style" style="@style/default_text_style"

2
app/src/main/res/layout/call_numpad_digit_with_voicemail.xml
View file

@ -20,7 +20,7 @@
android:onLongClick="@{() -> model.onVoicemailLongClicked()}" android:onLongClick="@{() -> model.onVoicemailLongClicked()}"
android:layout_width="@dimen/call_dtmf_button_size" android:layout_width="@dimen/call_dtmf_button_size"
android:layout_height="@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 <androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style" style="@style/default_text_style"

59
app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
View file

@ -49,148 +49,151 @@
android:id="@+id/flow" android:id="@+id/flow"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginBottom="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/handle" app:layout_constraintTop_toBottomOf="@id/handle"
app:layout_constraintBottom_toTopOf="@id/call_barrier" app:layout_constraintBottom_toTopOf="@id/call_barrier"
android:layout_marginBottom="20dp"
app:flow_horizontalStyle="spread" app:flow_horizontalStyle="spread"
app:flow_wrapMode="aligned" app:flow_wrapMode="aligned"
app:flow_verticalGap="10dp" app:flow_verticalGap="10dp"
app:flow_horizontalGap="10dp"
app:flow_maxElementsWrap="3" 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" /> 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 <include
style="@style/numpad_button_style"
android:id="@+id/digit_1" 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" layout="@layout/call_numpad_digit_with_voicemail"
bind:digit="@{`1`}" bind:digit="@{`1`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/handle" app:layout_constraintTop_toBottomOf="@id/handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_2" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`2`}" bind:digit="@{`2`}"
bind:letters="@{`abc`}" bind:letters="@{`abc`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/handle" app:layout_constraintTop_toBottomOf="@id/handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_3" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`3`}" bind:digit="@{`3`}"
bind:letters="@{`def`}" bind:letters="@{`def`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/handle" app:layout_constraintTop_toBottomOf="@id/handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_4" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`4`}" bind:digit="@{`4`}"
bind:letters="@{`ghi`}" bind:letters="@{`ghi`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/handle" app:layout_constraintTop_toBottomOf="@id/handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_5" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`5`}" bind:digit="@{`5`}"
bind:letters="@{`jkl`}" bind:letters="@{`jkl`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/handle" app:layout_constraintTop_toBottomOf="@id/handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_6" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`6`}" bind:digit="@{`6`}"
bind:letters="@{`mno`}" bind:letters="@{`mno`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/handle" app:layout_constraintTop_toBottomOf="@id/handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_7" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`7`}" bind:digit="@{`7`}"
bind:letters="@{`pqrs`}" bind:letters="@{`pqrs`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/handle" app:layout_constraintTop_toBottomOf="@id/handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_8" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`8`}" bind:digit="@{`8`}"
bind:letters="@{`tuv`}" bind:letters="@{`tuv`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/handle" app:layout_constraintTop_toBottomOf="@id/handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_9" 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" layout="@layout/call_numpad_digit_with_letters"
bind:digit="@{`9`}" bind:digit="@{`9`}"
bind:letters="@{`wxyz`}" bind:letters="@{`wxyz`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/handle" app:layout_constraintTop_toBottomOf="@id/handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_star" 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" layout="@layout/call_numpad_digit"
bind:digit="@{`*`}" bind:digit="@{`*`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/handle" app:layout_constraintTop_toBottomOf="@id/handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_0" 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" layout="@layout/call_numpad_digit_with_plus"
bind:digit="@{`0`}" bind:digit="@{`0`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/handle" app:layout_constraintTop_toBottomOf="@id/handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<include <include
style="@style/numpad_button_style"
android:id="@+id/digit_sharp" 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" layout="@layout/call_numpad_digit"
bind:digit="@{`#`}" bind:digit="@{`#`}"
bind:model="@{model}" bind:model="@{model}"
app:layout_constraintWidth_max="@dimen/call_dtmf_button_max_width"
app:layout_constraintTop_toBottomOf="@id/handle" app:layout_constraintTop_toBottomOf="@id/handle"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<ImageView <ImageView
android:id="@+id/call" android:id="@+id/call"
android:onClick="@{() -> model.onCallClicked()}" android:onClick="@{() -> model.onCallClicked()}"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="@dimen/call_button_size" android:layout_height="@dimen/call_button_size"
android:paddingStart="30dp" android:paddingStart="30dp"
android:paddingTop="15dp" android:paddingTop="15dp"
@ -202,8 +205,8 @@
android:background="@drawable/squircle_green_button_background" android:background="@drawable/squircle_green_button_background"
android:visibility="@{showCallTransferIcon ? View.GONE : View.VISIBLE}" android:visibility="@{showCallTransferIcon ? View.GONE : View.VISIBLE}"
app:tint="@color/bc_white" app:tint="@color/bc_white"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="@id/digit_0"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="@id/digit_0"
app:layout_constraintTop_toBottomOf="@id/digit_0" app:layout_constraintTop_toBottomOf="@id/digit_0"
app:layout_constraintBottom_toBottomOf="parent"/> app:layout_constraintBottom_toBottomOf="parent"/>

1
app/src/main/res/values/dimen.xml
View file

@ -68,6 +68,7 @@
<dimen name="sliding_accept_decline_call_margin">10dp</dimen> <dimen name="sliding_accept_decline_call_margin">10dp</dimen>
<dimen name="call_button_icon_padding">15dp</dimen> <dimen name="call_button_icon_padding">15dp</dimen>
<dimen name="call_dtmf_button_size">65dp</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_extra_button_top_margin">30dp</dimen>
<dimen name="call_video_preview_max_size">200dp</dimen> <dimen name="call_video_preview_max_size">200dp</dimen>

4
app/src/main/res/values/styles.xml
View file

@ -235,4 +235,8 @@
<item name="android:autoSizeMinTextSize">8sp</item> <item name="android:autoSizeMinTextSize">8sp</item>
<item name="android:autoSizeStepGranularity">1sp</item> <item name="android:autoSizeStepGranularity">1sp</item>
</style> </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> </resources>