restyling the dialpad

app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt

@@ -20,6 +20,7 @@ import android.view.WindowManager
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.view.animation.OvershootInterpolator
 import android.widget.ImageView
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.children
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.LOWER_ALPHA
@@ -88,7 +89,7 @@ class CallActivity : SimpleActivity() {
     override fun onResume() {
         super.onResume()
         updateState()
-        updateNavigationBarColor(getBottomNavigationBackgroundColor())
+        updateNavigationBarColor(getProperBackgroundColor())
     }
 
     override fun onDestroy() {
@@ -187,6 +188,25 @@ class CallActivity : SimpleActivity() {
         dialpad_8_holder.setOnClickListener { dialpadPressed('8') }
         dialpad_9_holder.setOnClickListener { dialpadPressed('9') }
 
+        arrayOf(
+            dialpad_0_holder,
+            dialpad_1_holder,
+            dialpad_2_holder,
+            dialpad_3_holder,
+            dialpad_4_holder,
+            dialpad_5_holder,
+            dialpad_6_holder,
+            dialpad_7_holder,
+            dialpad_8_holder,
+            dialpad_9_holder,
+            dialpad_plus_holder,
+            dialpad_asterisk_holder,
+            dialpad_hashtag_holder
+        ).forEach {
+            it.background = ResourcesCompat.getDrawable(resources, R.drawable.dialpad_button_background, theme)
+            it.background?.alpha = 50
+        }
+
         dialpad_0_holder.setOnLongClickListener { dialpadPressed('+'); true }
         dialpad_asterisk_holder.setOnClickListener { dialpadPressed('*') }
         dialpad_hashtag_holder.setOnClickListener { dialpadPressed('#') }

app/src/main/kotlin/com/simplemobiletools/dialer/activities/ConferenceActivity.kt

@@ -10,10 +10,12 @@ import kotlinx.android.synthetic.main.activity_conference.*
 class ConferenceActivity : SimpleActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        isMaterialActivity = true
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_conference)
-
+        updateMaterialActivityViews(conference_coordinator, conference_frame, true)
-        conference_calls_list.adapter = ConferenceCallsAdapter(this, conference_calls_list, ArrayList(CallManager.getConferenceCalls())) {}
+        setupMaterialScrollListener(conference_list, conference_toolbar)
+        conference_list.adapter = ConferenceCallsAdapter(this, conference_list, ArrayList(CallManager.getConferenceCalls())) {}
     }
 
     override fun onResume() {

app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt

@@ -17,6 +17,7 @@ import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewConfiguration
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isVisible
 import com.reddit.indicatorfastscroll.FastScrollItemIndicator
 import com.simplemobiletools.commons.extensions.*
@@ -50,6 +51,10 @@ class DialpadActivity : SimpleActivity() {
         setContentView(R.layout.activity_dialpad)
         hasRussianLocale = Locale.getDefault().language == "ru"
 
+        updateMaterialActivityViews(dialpad_coordinator, dialpad_holder, true)
+        setupMaterialScrollListener(dialpad_list, dialpad_toolbar)
+        updateNavigationBarColor(getProperBackgroundColor())
+
         if (checkAppSideloading()) {
             return
         }
@@ -68,6 +73,24 @@ class DialpadActivity : SimpleActivity() {
             dialpad_0_holder.visibility = View.INVISIBLE
         }
 
+        arrayOf(
+            dialpad_0_holder,
+            dialpad_1_holder,
+            dialpad_2_holder,
+            dialpad_3_holder,
+            dialpad_4_holder,
+            dialpad_5_holder,
+            dialpad_6_holder,
+            dialpad_7_holder,
+            dialpad_8_holder,
+            dialpad_9_holder,
+            dialpad_plus_holder,
+            dialpad_asterisk_holder,
+            dialpad_hashtag_holder
+        ).forEach {
+            it.background = ResourcesCompat.getDrawable(resources, R.drawable.dialpad_button_background, theme)
+            it.background?.alpha = 50
+        }
 
         setupOptionsMenu()
         speedDialValues = config.getSpeedDialValues()
@@ -105,7 +128,7 @@ class DialpadActivity : SimpleActivity() {
         setupCharClick(dialpad_8_holder, '8')
         setupCharClick(dialpad_9_holder, '9')
         setupCharClick(dialpad_0_holder, '0')
-        setupCharClick(dialpad_plus_holder, '+', longClickable =  false)
+        setupCharClick(dialpad_plus_holder, '+', longClickable = false)
         setupCharClick(dialpad_asterisk_holder, '*', longClickable = false)
         setupCharClick(dialpad_hashtag_holder, '#', longClickable = false)
 
@@ -148,7 +171,7 @@ class DialpadActivity : SimpleActivity() {
         super.onResume()
         updateTextColors(dialpad_holder)
         dialpad_clear_char.applyColorFilter(getProperTextColor())
-        updateNavigationBarColor(getBottomNavigationBackgroundColor())
+        updateNavigationBarColor(getProperBackgroundColor())
         setupToolbar(dialpad_toolbar, NavigationIcon.Arrow)
     }
 

app/src/main/res/drawable/dialpad_button_background.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorPrimaryDark">
+    <item android:id="@+id/button_circular_background_holder">
+        <layer-list>
+            <item android:id="@+id/button_circular_background_shape">
+                <shape android:shape="rectangle">
+                    <corners android:radius="@dimen/material_dialog_corner_radius" />
+                    <solid android:color="?attr/colorPrimary" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+</ripple>

app/src/main/res/layout/activity_conference.xml

@@ -6,29 +6,22 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.AppBarLayout
+    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/conference_app_bar_layout"
+        android:id="@+id/conference_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="?attr/actionBarSize"
-
+        android:background="@color/color_primary"
-        <com.google.android.material.appbar.MaterialToolbar
+        app:title="@string/conference"
-            android:id="@+id/conference_toolbar"
+        app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="@color/color_primary"
-            app:title="@string/conference"
-            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
-
-    </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
         android:id="@+id/conference_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        android:layout_marginTop="?attr/actionBarSize">
 
         <com.simplemobiletools.commons.views.MyRecyclerView
-            android:id="@+id/conference_calls_list"
+            android:id="@+id/conference_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipToPadding="false"

app/src/main/res/layout/activity_dialpad.xml

@@ -5,29 +5,22 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.AppBarLayout
+    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/dialpad_app_bar_layout"
+        android:id="@+id/dialpad_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="?attr/actionBarSize"
-
+        android:background="@color/color_primary"
-        <com.google.android.material.appbar.MaterialToolbar
+        app:menu="@menu/menu_dialpad"
-            android:id="@+id/dialpad_toolbar"
+        app:title="@string/dialpad"
-            android:layout_width="match_parent"
+        app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
-            android:layout_height="?attr/actionBarSize"
-            android:background="@color/color_primary"
-            app:menu="@menu/menu_dialpad"
-            app:title="@string/dialpad"
-            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
-
-    </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/dialpad_holder"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignParentBottom="true"
-        android:focusableInTouchMode="true"
+        android:layout_marginTop="?attr/actionBarSize"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        android:focusableInTouchMode="true">
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/dialpad_placeholder"
@@ -122,7 +115,7 @@
             android:layout_width="@dimen/dialpad_button_size"
             android:layout_height="@dimen/dialpad_button_size"
             android:layout_marginBottom="@dimen/activity_margin"
-            android:background="@drawable/circle_background"
+            android:background="@drawable/circle_button_background_ripple"
             android:contentDescription="@string/call_number"
             android:elevation="@dimen/medium_margin"
             android:padding="@dimen/normal_margin"
@@ -136,7 +129,7 @@
             android:layout_width="@dimen/dialpad_button_size_small"
             android:layout_height="@dimen/dialpad_button_size_small"
             android:layout_marginBottom="@dimen/activity_margin"
-            android:background="@drawable/circle_background"
+            android:background="@drawable/circle_button_background_ripple"
             android:contentDescription="@string/call_number"
             android:elevation="@dimen/medium_margin"
             android:padding="@dimen/normal_margin"

app/src/main/res/layout/dialpad.xml

@@ -8,15 +8,16 @@
     android:layout_alignParentBottom="true"
     android:focusableInTouchMode="true"
     android:layoutDirection="ltr"
+    android:paddingStart="@dimen/medium_margin"
     android:paddingTop="@dimen/medium_margin"
+    android:paddingEnd="@dimen/medium_margin"
     tools:ignore="HardcodedText">
 
     <RelativeLayout
         android:id="@+id/dialpad_1_holder"
+        style="@style/DialpadButtonStyle"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginStart="@dimen/activity_margin"
-        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/one"
         app:layout_constraintBottom_toBottomOf="@+id/dialpad_2_holder"
         app:layout_constraintEnd_toStartOf="@+id/dialpad_2_holder"
@@ -29,16 +30,16 @@
             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"
+        style="@style/DialpadButtonStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/medium_margin"
-        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/two"
         app:layout_constraintBottom_toTopOf="@+id/dialpad_5_holder"
         app:layout_constraintEnd_toStartOf="@+id/dialpad_3_holder"
@@ -49,7 +50,6 @@
             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
@@ -58,18 +58,15 @@
             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"
+        style="@style/DialpadButtonStyle"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginEnd="@dimen/activity_margin"
-        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/three"
         app:layout_constraintBottom_toBottomOf="@+id/dialpad_2_holder"
         app:layout_constraintEnd_toEndOf="parent"
@@ -81,7 +78,6 @@
             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
@@ -90,18 +86,15 @@
             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"
+        style="@style/DialpadButtonStyle"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginStart="@dimen/activity_margin"
-        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/four"
         app:layout_constraintBottom_toBottomOf="@+id/dialpad_5_holder"
         app:layout_constraintEnd_toStartOf="@+id/dialpad_5_holder"
@@ -113,7 +106,6 @@
             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
@@ -122,18 +114,16 @@
             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"
+        style="@style/DialpadButtonStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/medium_margin"
-        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/five"
         app:layout_constraintBottom_toTopOf="@+id/dialpad_8_holder"
         app:layout_constraintEnd_toStartOf="@+id/dialpad_6_holder"
@@ -144,7 +134,6 @@
             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
@@ -153,18 +142,15 @@
             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"
+        style="@style/DialpadButtonStyle"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginEnd="@dimen/activity_margin"
-        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/six"
         app:layout_constraintBottom_toBottomOf="@+id/dialpad_5_holder"
         app:layout_constraintEnd_toEndOf="parent"
@@ -176,7 +162,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
@@ -185,18 +170,15 @@
             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"
+        style="@style/DialpadButtonStyle"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginStart="@dimen/activity_margin"
-        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/seven"
         app:layout_constraintBottom_toBottomOf="@+id/dialpad_8_holder"
         app:layout_constraintEnd_toStartOf="@+id/dialpad_8_holder"
@@ -208,7 +190,6 @@
             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
@@ -217,18 +198,16 @@
             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"
+        style="@style/DialpadButtonStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/medium_margin"
-        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/eight"
         app:layout_constraintBottom_toTopOf="@+id/dialpad_0_holder"
         app:layout_constraintEnd_toStartOf="@+id/dialpad_9_holder"
@@ -239,7 +218,6 @@
             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
@@ -248,18 +226,15 @@
             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:id="@+id/dialpad_9_holder"
+        style="@style/DialpadButtonStyle"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginEnd="@dimen/activity_margin"
-        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/nine"
         app:layout_constraintBottom_toBottomOf="@+id/dialpad_8_holder"
         app:layout_constraintEnd_toEndOf="parent"
@@ -271,7 +246,6 @@
             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
@@ -280,18 +254,15 @@
             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"
+        style="@style/DialpadButtonStyle"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginStart="@dimen/activity_margin"
-        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/asterisk"
         app:layout_constraintBottom_toBottomOf="@+id/dialpad_0_holder"
         app:layout_constraintEnd_toStartOf="@+id/dialpad_0_holder"
@@ -303,17 +274,16 @@
             style="@style/DialpadNumberStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
+            android:layout_centerInParent="true"
-            android:layout_centerHorizontal="true"
             android:text="*" />
     </RelativeLayout>
 
     <RelativeLayout
         android:id="@+id/dialpad_0_holder"
+        style="@style/DialpadButtonStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/activity_margin"
+        android:layout_marginBottom="@dimen/medium_margin"
-        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/zero"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/dialpad_hashtag_holder"
@@ -324,31 +294,24 @@
             style="@style/DialpadNumberStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
             android:text="0" />
 
         <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/dialpad_plus"
+            android:id="@+id/dialpad_plus_letters"
+            style="@style/DialpadLetterStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/dialpad_0"
+            android:layout_below="@+id/dialpad_0"
-            android:layout_alignBottom="@+id/dialpad_0"
+            android:layout_marginBottom="@dimen/medium_margin"
-            android:layout_centerHorizontal="true"
+            android:text="ABC" />
-            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_plus_holder"
+        style="@style/DialpadButtonStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/zero"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -359,7 +322,6 @@
             android:id="@+id/dialpad_plus_alt"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
             android:gravity="center"
             android:paddingStart="@dimen/small_margin"
             android:paddingTop="@dimen/small_margin"
@@ -370,10 +332,9 @@
 
     <RelativeLayout
         android:id="@+id/dialpad_hashtag_holder"
+        style="@style/DialpadButtonStyle"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginEnd="@dimen/activity_margin"
-        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/hashtag"
         app:layout_constraintBottom_toBottomOf="@+id/dialpad_0_holder"
         app:layout_constraintEnd_toEndOf="parent"
@@ -385,8 +346,8 @@
             style="@style/DialpadNumberStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
+            android:layout_centerInParent="true"
-            android:layout_marginEnd="@dimen/activity_margin"
             android:text="#" />
+
     </RelativeLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/styles.xml

@@ -2,14 +2,23 @@
 
     <style name="AppTheme" parent="AppTheme.Base" />
 
+    <style name="DialpadButtonStyle">
+        <item name="android:background">@drawable/dialpad_button_background</item>
+        <item name="android:layout_marginStart">@dimen/small_margin</item>
+        <item name="android:layout_marginEnd">@dimen/small_margin</item>
+        <item name="android:paddingTop">@dimen/one_dp</item>
+    </style>
+
     <style name="DialpadNumberStyle">
         <item name="android:includeFontPadding">false</item>
         <item name="android:textSize">@dimen/dialpad_text_size</item>
+        <item name="android:layout_centerHorizontal">true</item>
     </style>
 
     <style name="DialpadLetterStyle">
         <item name="android:textSize">@dimen/smaller_text_size</item>
         <item name="android:alpha">0.8</item>
+        <item name="android:layout_centerHorizontal">true</item>
     </style>
 
 </resources>