From dfff3bff7262c1bb940c51d11674f45fe60236e8 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 22 May 2021 19:50:55 +0200
Subject: [PATCH] rewriting the dialpad, add some holder layouts

---
 .../dialer/activities/DialpadActivity.kt      |  40 +-
 app/src/main/res/layout/dialpad.xml           | 508 ++++++++++--------
 app/src/main/res/values/styles.xml            |   5 -
 3 files changed, 312 insertions(+), 241 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt
index 0fb4ac44..c1b36595 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt
@@ -47,29 +47,29 @@ class DialpadActivity : SimpleActivity() {
         privateCursor = getMyContactsCursor(false, true)?.loadInBackground()
 
         dialpad_0_holder.setOnClickListener { dialpadPressed('0', it) }
-        dialpad_1.setOnClickListener { dialpadPressed('1', it) }
-        dialpad_2.setOnClickListener { dialpadPressed('2', it) }
-        dialpad_3.setOnClickListener { dialpadPressed('3', it) }
-        dialpad_4.setOnClickListener { dialpadPressed('4', it) }
-        dialpad_5.setOnClickListener { dialpadPressed('5', it) }
-        dialpad_6.setOnClickListener { dialpadPressed('6', it) }
-        dialpad_7.setOnClickListener { dialpadPressed('7', it) }
-        dialpad_8.setOnClickListener { dialpadPressed('8', it) }
-        dialpad_9.setOnClickListener { dialpadPressed('9', it) }
+        dialpad_1_holder.setOnClickListener { dialpadPressed('1', it) }
+        dialpad_2_holder.setOnClickListener { dialpadPressed('2', it) }
+        dialpad_3_holder.setOnClickListener { dialpadPressed('3', it) }
+        dialpad_4_holder.setOnClickListener { dialpadPressed('4', it) }
+        dialpad_5_holder.setOnClickListener { dialpadPressed('5', it) }
+        dialpad_6_holder.setOnClickListener { dialpadPressed('6', it) }
+        dialpad_7_holder.setOnClickListener { dialpadPressed('7', it) }
+        dialpad_8_holder.setOnClickListener { dialpadPressed('8', it) }
+        dialpad_9_holder.setOnClickListener { dialpadPressed('9', it) }
 
-        dialpad_1.setOnLongClickListener { speedDial(1); true }
-        dialpad_2.setOnLongClickListener { speedDial(2); true }
-        dialpad_3.setOnLongClickListener { speedDial(3); true }
-        dialpad_4.setOnLongClickListener { speedDial(4); true }
-        dialpad_5.setOnLongClickListener { speedDial(5); true }
-        dialpad_6.setOnLongClickListener { speedDial(6); true }
-        dialpad_7.setOnLongClickListener { speedDial(7); true }
-        dialpad_8.setOnLongClickListener { speedDial(8); true }
-        dialpad_9.setOnLongClickListener { speedDial(9); true }
+        dialpad_1_holder.setOnLongClickListener { speedDial(1); true }
+        dialpad_2_holder.setOnLongClickListener { speedDial(2); true }
+        dialpad_3_holder.setOnLongClickListener { speedDial(3); true }
+        dialpad_4_holder.setOnLongClickListener { speedDial(4); true }
+        dialpad_5_holder.setOnLongClickListener { speedDial(5); true }
+        dialpad_6_holder.setOnLongClickListener { speedDial(6); true }
+        dialpad_7_holder.setOnLongClickListener { speedDial(7); true }
+        dialpad_8_holder.setOnLongClickListener { speedDial(8); true }
+        dialpad_9_holder.setOnLongClickListener { speedDial(9); true }
 
         dialpad_0_holder.setOnLongClickListener { dialpadPressed('+', null); true }
-        dialpad_asterisk.setOnClickListener { dialpadPressed('*', it) }
-        dialpad_hashtag.setOnClickListener { dialpadPressed('#', it) }
+        dialpad_asterisk_holder.setOnClickListener { dialpadPressed('*', it) }
+        dialpad_hashtag_holder.setOnClickListener { dialpadPressed('#', it) }
         dialpad_clear_char.setOnClickListener { clearChar(it) }
         dialpad_clear_char.setOnLongClickListener { clearInput(); true }
         dialpad_call_button.setOnClickListener { initCall() }
diff --git a/app/src/main/res/layout/dialpad.xml b/app/src/main/res/layout/dialpad.xml
index 28561ddf..656d9d8c 100644
--- a/app/src/main/res/layout/dialpad.xml
+++ b/app/src/main/res/layout/dialpad.xml
@@ -7,227 +7,295 @@
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
     android:focusableInTouchMode="true"
+    android:paddingTop="@dimen/medium_margin"
+    android:paddingBottom="@dimen/activity_margin"
     tools:ignore="HardcodedText">
 
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_1"
-        style="@style/DialpadNumberStyle"
+    <RelativeLayout
+        android:id="@+id/dialpad_1_holder"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginStart="@dimen/activity_margin"
-        android:text="1"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_4"
-        app:layout_constraintEnd_toStartOf="@+id/dialpad_2"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_2"
-        style="@style/DialpadNumberStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="2"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_5"
-        app:layout_constraintEnd_toStartOf="@+id/dialpad_3"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/dialpad_1" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_2_letters"
-        style="@style/DialpadLetterStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="ABC"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_5"
-        app:layout_constraintEnd_toStartOf="@+id/dialpad_3"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/dialpad_1" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_3"
-        style="@style/DialpadNumberStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/activity_margin"
-        android:text="3"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_6"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/dialpad_2" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_3_letters"
-        style="@style/DialpadLetterStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/activity_margin"
-        android:text="DEF"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_6"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/dialpad_2" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_4"
-        style="@style/DialpadNumberStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/activity_margin"
-        android:text="4"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_7"
-        app:layout_constraintEnd_toStartOf="@+id/dialpad_5"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_4_letters"
-        style="@style/DialpadLetterStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/activity_margin"
-        android:text="GHI"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_7"
-        app:layout_constraintEnd_toStartOf="@+id/dialpad_5"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_5"
-        style="@style/DialpadNumberStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="5"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_8"
-        app:layout_constraintEnd_toStartOf="@+id/dialpad_6"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/dialpad_4" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_5_letters"
-        style="@style/DialpadLetterStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="JKL"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_8"
-        app:layout_constraintEnd_toStartOf="@+id/dialpad_6"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/dialpad_4" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_6"
-        style="@style/DialpadNumberStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/activity_margin"
-        android:text="6"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_9"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/dialpad_5" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_6_letters"
-        style="@style/DialpadLetterStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/activity_margin"
-        android:text="MNO"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_9"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/dialpad_5" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_7"
-        style="@style/DialpadNumberStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/activity_margin"
-        android:text="7"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_asterisk"
-        app:layout_constraintEnd_toStartOf="@+id/dialpad_8"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_7_letters"
-        style="@style/DialpadLetterStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/activity_margin"
-        android:text="PQRS"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_asterisk"
-        app:layout_constraintEnd_toStartOf="@+id/dialpad_8"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_8"
-        style="@style/DialpadNumberStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="8"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_0_holder"
-        app:layout_constraintEnd_toStartOf="@+id/dialpad_9"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/dialpad_7" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_8_letters"
-        style="@style/DialpadLetterStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="TUV"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_0_holder"
-        app:layout_constraintEnd_toStartOf="@+id/dialpad_9"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/dialpad_7" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_9"
-        style="@style/DialpadNumberStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/activity_margin"
-        android:text="9"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_hashtag"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/dialpad_8" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_9_letters"
-        style="@style/DialpadLetterStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/activity_margin"
-        android:text="WXYZ"
-        app:layout_constraintBottom_toTopOf="@+id/dialpad_hashtag"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/dialpad_8" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_asterisk"
-        style="@style/DialpadNumberStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/activity_margin"
-        android:text="*"
-        app:layout_constraintEnd_toStartOf="@+id/dialpad_0_holder"
-        app:layout_constraintHorizontal_bias="0.5"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        app:layout_constraintBottom_toBottomOf="@+id/dialpad_2_holder"
+        app:layout_constraintEnd_toStartOf="@+id/dialpad_2_holder"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/dialpad_7" />
+        app:layout_constraintTop_toTopOf="@+id/dialpad_2_holder">
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_1"
+            style="@style/DialpadNumberStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:text="1" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/dialpad_2_holder"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/medium_margin"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        app:layout_constraintBottom_toTopOf="@+id/dialpad_5_holder"
+        app:layout_constraintEnd_toStartOf="@+id/dialpad_3_holder"
+        app:layout_constraintStart_toEndOf="@+id/dialpad_1_holder">
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_2"
+            style="@style/DialpadNumberStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:text="2" />
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_2_letters"
+            style="@style/DialpadLetterStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/dialpad_2"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/medium_margin"
+            android:text="ABC" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/dialpad_3_holder"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/activity_margin"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        app:layout_constraintBottom_toBottomOf="@+id/dialpad_2_holder"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/dialpad_2_holder">
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_3"
+            style="@style/DialpadNumberStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:text="3" />
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_3_letters"
+            style="@style/DialpadLetterStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/dialpad_3"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/medium_margin"
+            android:text="DEF" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/dialpad_4_holder"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/activity_margin"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        app:layout_constraintBottom_toBottomOf="@+id/dialpad_5_holder"
+        app:layout_constraintEnd_toStartOf="@+id/dialpad_5_holder"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/dialpad_5_holder">
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_4"
+            style="@style/DialpadNumberStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:text="4" />
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_4_letters"
+            style="@style/DialpadLetterStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/dialpad_4"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/medium_margin"
+            android:text="GHI" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/dialpad_5_holder"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/medium_margin"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        app:layout_constraintBottom_toTopOf="@+id/dialpad_8_holder"
+        app:layout_constraintEnd_toStartOf="@+id/dialpad_6_holder"
+        app:layout_constraintStart_toEndOf="@+id/dialpad_4_holder">
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_5"
+            style="@style/DialpadNumberStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:text="5" />
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_5_letters"
+            style="@style/DialpadLetterStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/dialpad_5"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/medium_margin"
+            android:text="JKL" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/dialpad_6_holder"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/activity_margin"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        app:layout_constraintBottom_toBottomOf="@+id/dialpad_5_holder"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/dialpad_5_holder">
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_6"
+            style="@style/DialpadNumberStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:text="6" />
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_6_letters"
+            style="@style/DialpadLetterStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/dialpad_6"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/medium_margin"
+            android:gravity="center_horizontal"
+            android:text="MNO" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/dialpad_7_holder"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/activity_margin"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        app:layout_constraintBottom_toBottomOf="@+id/dialpad_8_holder"
+        app:layout_constraintEnd_toStartOf="@+id/dialpad_8_holder"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_7"
+            style="@style/DialpadNumberStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:text="7" />
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_7_letters"
+            style="@style/DialpadLetterStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/dialpad_7"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/medium_margin"
+            android:text="PQRS" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/dialpad_8_holder"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/medium_margin"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        app:layout_constraintBottom_toTopOf="@+id/dialpad_0_holder"
+        app:layout_constraintEnd_toStartOf="@+id/dialpad_9_holder"
+        app:layout_constraintStart_toEndOf="@+id/dialpad_7_holder">
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_8"
+            style="@style/DialpadNumberStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:text="8" />
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_8_letters"
+            style="@style/DialpadLetterStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/dialpad_8"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/medium_margin"
+            android:text="TUV" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/dialpad_9_holder"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/activity_margin"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        app:layout_constraintBottom_toBottomOf="@+id/dialpad_8_holder"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/dialpad_8_holder">
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_9"
+            style="@style/DialpadNumberStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:text="9" />
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_9_letters"
+            style="@style/DialpadLetterStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/dialpad_9"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/medium_margin"
+            android:gravity="center_horizontal"
+            android:text="WXYZ" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/dialpad_asterisk_holder"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="@dimen/activity_margin"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        app:layout_constraintBottom_toBottomOf="@+id/dialpad_0_holder"
+        app:layout_constraintEnd_toStartOf="@+id/dialpad_0_holder"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/dialpad_0_holder">
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_asterisk"
+            style="@style/DialpadNumberStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:text="*" />
+    </RelativeLayout>
 
     <RelativeLayout
         android:id="@+id/dialpad_0_holder"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackgroundBorderless"
-        app:layout_constraintEnd_toStartOf="@+id/dialpad_hashtag"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/dialpad_asterisk"
-        app:layout_constraintTop_toTopOf="@+id/dialpad_asterisk">
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/dialpad_hashtag_holder"
+        app:layout_constraintStart_toEndOf="@+id/dialpad_asterisk_holder">
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/dialpad_0"
@@ -253,16 +321,24 @@
 
     </RelativeLayout>
 
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/dialpad_hashtag"
-        style="@style/DialpadNumberStyle"
+    <RelativeLayout
+        android:id="@+id/dialpad_hashtag_holder"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/activity_margin"
-        android:text="#"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        app:layout_constraintBottom_toBottomOf="@+id/dialpad_0_holder"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/dialpad_0_holder"
-        app:layout_constraintTop_toTopOf="@+id/dialpad_0_holder" />
+        app:layout_constraintTop_toTopOf="@+id/dialpad_0_holder">
 
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/dialpad_hashtag"
+            style="@style/DialpadNumberStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginEnd="@dimen/activity_margin"
+            android:text="#" />
+    </RelativeLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 34758cad..3fb7b669 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,15 +3,10 @@
     <style name="AppTheme" parent="AppTheme.Base" />
 
     <style name="DialpadNumberStyle">
-        <item name="android:gravity">center</item>
-        <item name="android:paddingBottom">@dimen/normal_margin</item>
-        <item name="android:paddingTop">@dimen/normal_margin</item>
         <item name="android:textSize">@dimen/dialpad_text_size</item>
-        <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
     </style>
 
     <style name="DialpadLetterStyle">
-        <item name="android:gravity">center_horizontal</item>
         <item name="android:textSize">@dimen/smaller_text_size</item>
         <item name="android:alpha">0.8</item>
     </style>