From 74bd6f0ca2eabdbd339c3060101b39309dd5dd3e Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 26 Oct 2021 13:38:55 -0500
Subject: [PATCH] Switch onClicks to use DataBinding

---
 .../conversations/ui/widget/DialpadView.java  |  27 +-
 src/main/res/layout/dialpad.xml               | 733 +++++++++---------
 2 files changed, 385 insertions(+), 375 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/widget/DialpadView.java b/src/main/java/eu/siacs/conversations/ui/widget/DialpadView.java
index fa4d46ec5781fc499cad2da56e9eb77908c858d9..ccf91cad4bfc76b7a533a2ded7a29041b84f29bc 100644
--- a/src/main/java/eu/siacs/conversations/ui/widget/DialpadView.java
+++ b/src/main/java/eu/siacs/conversations/ui/widget/DialpadView.java
@@ -19,9 +19,12 @@ package eu.siacs.conversations.ui.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.LayoutInflater;
 import android.view.View;
 
 import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.databinding.DataBindingUtil;
+import eu.siacs.conversations.databinding.DialpadBinding;
 import eu.siacs.conversations.R;
 
 public class DialpadView extends ConstraintLayout implements View.OnClickListener {
@@ -48,23 +51,13 @@ public class DialpadView extends ConstraintLayout implements View.OnClickListene
     }
 
     private void init() {
-        inflate(getContext(), R.layout.dialpad, this);
-        initViews();
-    }
-
-    private void initViews() {
-        findViewById(R.id.dialpad_1_holder).setOnClickListener(this);
-        findViewById(R.id.dialpad_2_holder).setOnClickListener(this);
-        findViewById(R.id.dialpad_3_holder).setOnClickListener(this);
-        findViewById(R.id.dialpad_4_holder).setOnClickListener(this);
-        findViewById(R.id.dialpad_5_holder).setOnClickListener(this);
-        findViewById(R.id.dialpad_6_holder).setOnClickListener(this);
-        findViewById(R.id.dialpad_7_holder).setOnClickListener(this);
-        findViewById(R.id.dialpad_8_holder).setOnClickListener(this);
-        findViewById(R.id.dialpad_9_holder).setOnClickListener(this);
-        findViewById(R.id.dialpad_0_holder).setOnClickListener(this);
-        findViewById(R.id.dialpad_asterisk_holder).setOnClickListener(this);
-        findViewById(R.id.dialpad_pound_holder).setOnClickListener(this);
+        DialpadBinding binding = DataBindingUtil.inflate(
+            LayoutInflater.from(getContext()),
+            R.layout.dialpad,
+            this,
+            true
+        );
+        binding.setDialpadView(this);
     }
 
     @Override
diff --git a/src/main/res/layout/dialpad.xml b/src/main/res/layout/dialpad.xml
index 2a2208c945ed3b3febe4b4ae03e8dd743d990c12..4a18363fe67aa16381b38bfbac7b56856bf4c356 100644
--- a/src/main/res/layout/dialpad.xml
+++ b/src/main/res/layout/dialpad.xml
@@ -1,368 +1,385 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/dialpad_holder"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
-    android:focusableInTouchMode="true"
-    android:paddingTop="@dimen/medium_margin"
-    tools:ignore="HardcodedText">
-
-    <RelativeLayout
-        android:id="@+id/dialpad_1_holder"
-        android:tag="1"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginStart="@dimen/activity_margin"
-        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_toTopOf="@+id/dialpad_2_holder"
-        android:focusable="true" >
-
-        <TextView
-            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:tag="2"
-        android:layout_width="0dp"
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <data>
+        <variable name="dialpadView" type="eu.siacs.conversations.ui.widget.DialpadView"/>
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/dialpad_holder"
+        android:layout_width="match_parent"
         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">
-
-        <TextView
-            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" />
-
-        <TextView
-            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:gravity="center_horizontal"
-            android:text="ABC" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/dialpad_3_holder"
-        android:tag="3"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        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"
-        app:layout_constraintTop_toTopOf="@+id/dialpad_2_holder">
-
-        <TextView
-            android:id="@+id/dialpad_3"
-            style="@style/DialpadNumberStyle"
-            android:layout_width="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:focusableInTouchMode="true"
+        android:paddingTop="@dimen/medium_margin"
+        tools:ignore="HardcodedText">
+
+
+        <RelativeLayout
+            android:onClick="@{dialpadView::onClick}"
+            android:id="@+id/dialpad_1_holder"
+            android:tag="1"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="@dimen/activity_margin"
+            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_toTopOf="@+id/dialpad_2_holder"
+            android:focusable="true" >
+
+            <TextView
+                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:onClick="@{dialpadView::onClick}"
+            android:id="@+id/dialpad_2_holder"
+            android:tag="2"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:text="3" />
-
-        <TextView
-            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:gravity="center_horizontal"
-            android:text="DEF" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/dialpad_4_holder"
-        android:tag="4"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        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">
-
-        <TextView
-            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" />
-
-        <TextView
-            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:gravity="center_horizontal"
-            android:text="GHI" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/dialpad_5_holder"
-        android:tag="5"
-        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">
-
-        <TextView
-            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" />
-
-        <TextView
-            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:gravity="center_horizontal"
-            android:text="JKL" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/dialpad_6_holder"
-        android:tag="6"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        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"
-        app:layout_constraintTop_toTopOf="@+id/dialpad_5_holder">
-
-        <TextView
-            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" />
-
-        <TextView
-            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:tag="7"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        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"
-        app:layout_constraintTop_toTopOf="@+id/dialpad_8_holder">
-
-        <TextView
-            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" />
-
-        <TextView
-            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:gravity="center_horizontal"
-            android:text="PQRS" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/dialpad_8_holder"
-        android:tag="8"
-        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">
-
-        <TextView
-            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" />
-
-        <TextView
-            android:id="@+id/dialpad_8_letters"
-            style="@style/DialpadLetterStyle"
-            android:layout_width="wrap_content"
+            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">
+
+            <TextView
+                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" />
+
+            <TextView
+                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:gravity="center_horizontal"
+                android:text="ABC" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:onClick="@{dialpadView::onClick}"
+            android:id="@+id/dialpad_3_holder"
+            android:tag="3"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            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"
+            app:layout_constraintTop_toTopOf="@+id/dialpad_2_holder">
+
+            <TextView
+                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" />
+
+            <TextView
+                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:gravity="center_horizontal"
+                android:text="DEF" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:onClick="@{dialpadView::onClick}"
+            android:id="@+id/dialpad_4_holder"
+            android:tag="4"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            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">
+
+            <TextView
+                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" />
+
+            <TextView
+                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:gravity="center_horizontal"
+                android:text="GHI" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:onClick="@{dialpadView::onClick}"
+            android:id="@+id/dialpad_5_holder"
+            android:tag="5"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/dialpad_8"
-            android:layout_centerHorizontal="true"
             android:layout_marginBottom="@dimen/medium_margin"
-            android:gravity="center_horizontal"
-            android:text="TUV" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/dialpad_9_holder"
-        android:tag="9"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        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"
-        app:layout_constraintTop_toTopOf="@+id/dialpad_8_holder">
-
-        <TextView
-            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" />
-
-        <TextView
-            android:id="@+id/dialpad_9_letters"
-            style="@style/DialpadLetterStyle"
-            android:layout_width="wrap_content"
+            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">
+
+            <TextView
+                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" />
+
+            <TextView
+                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:gravity="center_horizontal"
+                android:text="JKL" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:onClick="@{dialpadView::onClick}"
+            android:id="@+id/dialpad_6_holder"
+            android:tag="6"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            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"
+            app:layout_constraintTop_toTopOf="@+id/dialpad_5_holder">
+
+            <TextView
+                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" />
+
+            <TextView
+                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:onClick="@{dialpadView::onClick}"
+            android:id="@+id/dialpad_7_holder"
+            android:tag="7"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            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"
+            app:layout_constraintTop_toTopOf="@+id/dialpad_8_holder">
+
+            <TextView
+                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" />
+
+            <TextView
+                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:gravity="center_horizontal"
+                android:text="PQRS" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:onClick="@{dialpadView::onClick}"
+            android:id="@+id/dialpad_8_holder"
+            android:tag="8"
+            android:layout_width="0dp"
             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:tag="*"
-        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">
-
-        <TextView
-            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:tag="0"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/activity_margin"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/dialpad_pound_holder"
-        app:layout_constraintStart_toEndOf="@+id/dialpad_asterisk_holder">
-
-        <TextView
-            android:id="@+id/dialpad_0"
-            style="@style/DialpadNumberStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:text="0" />
-
-        <TextView
-            android:id="@+id/dialpad_plus"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/dialpad_0"
-            android:layout_alignBottom="@+id/dialpad_0"
-            android:layout_centerHorizontal="true"
-            android:layout_toEndOf="@+id/dialpad_0"
-            android:gravity="center"
-            android:paddingStart="@dimen/small_margin"
-            android:paddingTop="@dimen/small_margin"
-            android:text="+"
-            android:textSize="@dimen/actionbar_text_size" />
-
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/dialpad_pound_holder"
-        android:tag="#"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginEnd="@dimen/activity_margin"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        app:layout_constraintBottom_toBottomOf="@+id/dialpad_0_holder"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/dialpad_0_holder"
-        app:layout_constraintTop_toTopOf="@+id/dialpad_0_holder">
-
-        <TextView
-            android:id="@+id/dialpad_pound"
-            style="@style/DialpadNumberStyle"
-            android:layout_width="wrap_content"
+            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">
+
+            <TextView
+                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" />
+
+            <TextView
+                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:gravity="center_horizontal"
+                android:text="TUV" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:onClick="@{dialpadView::onClick}"
+            android:id="@+id/dialpad_9_holder"
+            android:tag="9"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            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"
+            app:layout_constraintTop_toTopOf="@+id/dialpad_8_holder">
+
+            <TextView
+                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" />
+
+            <TextView
+                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:onClick="@{dialpadView::onClick}"
+            android:id="@+id/dialpad_asterisk_holder"
+            android:tag="*"
+            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">
+
+            <TextView
+                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:onClick="@{dialpadView::onClick}"
+            android:id="@+id/dialpad_0_holder"
+            android:tag="0"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/activity_margin"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/dialpad_pound_holder"
+            app:layout_constraintStart_toEndOf="@+id/dialpad_asterisk_holder">
+
+            <TextView
+                android:id="@+id/dialpad_0"
+                style="@style/DialpadNumberStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:text="0" />
+
+            <TextView
+                android:id="@+id/dialpad_plus"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@+id/dialpad_0"
+                android:layout_alignBottom="@+id/dialpad_0"
+                android:layout_centerHorizontal="true"
+                android:layout_toEndOf="@+id/dialpad_0"
+                android:gravity="center"
+                android:paddingStart="@dimen/small_margin"
+                android:paddingTop="@dimen/small_margin"
+                android:text="+"
+                android:textSize="@dimen/actionbar_text_size" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:onClick="@{dialpadView::onClick}"
+            android:id="@+id/dialpad_pound_holder"
+            android:tag="#"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
             android:layout_marginEnd="@dimen/activity_margin"
-            android:text="#" />
-    </RelativeLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+            android:background="?attr/selectableItemBackgroundBorderless"
+            app:layout_constraintBottom_toBottomOf="@+id/dialpad_0_holder"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/dialpad_0_holder"
+            app:layout_constraintTop_toTopOf="@+id/dialpad_0_holder">
+
+            <TextView
+                android:id="@+id/dialpad_pound"
+                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>
+</layout>