From ed56d12b72d0c272e92f900e9cf4eb456f47f881 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 3 Jun 2021 12:58:21 +0200
Subject: [PATCH] Dialpad: fix some UI

---
 .../features/call/dialpad/DialPadFragment.kt  |  4 ++--
 .../main/res/values-land/styles_dial_pad.xml  | 22 +++++++++++++++++++
 .../src/main/res/values/styles_dial_pad.xml   | 12 +++++++++-
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 vector/src/main/res/values-land/styles_dial_pad.xml

diff --git a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
index 11c3af9394..9c5b1f5d46 100644
--- a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
@@ -26,9 +26,9 @@ import androidx.core.widget.ImageViewCompat
 import androidx.fragment.app.Fragment
 import com.android.dialer.dialpadview.DialpadView
 import com.android.dialer.dialpadview.DigitsEditText
-import com.android.dialer.dialpadview.R
 import com.google.i18n.phonenumbers.AsYouTypeFormatter
 import com.google.i18n.phonenumbers.PhoneNumberUtil
+import im.vector.app.R
 import im.vector.app.features.themes.ThemeUtils
 
 class DialPadFragment : Fragment() {
@@ -57,7 +57,7 @@ class DialPadFragment : Fragment() {
         dialpadView.findViewById<View>(R.id.dialpad_key_voicemail).isVisible = false
         digits = dialpadView.digits as? DigitsEditText
         digits?.isCursorVisible = cursorVisible
-        digits?.setTextColor(ThemeUtils.getColor(requireContext(), im.vector.app.R.attr.riotx_text_primary))
+        digits?.setTextColor(ThemeUtils.getColor(requireContext(), R.attr.riotx_text_primary))
         dialpadView.findViewById<View>(R.id.zero).setOnClickListener { append('0') }
         if (enablePlus) {
             dialpadView.findViewById<View>(R.id.zero).setOnLongClickListener {
diff --git a/vector/src/main/res/values-land/styles_dial_pad.xml b/vector/src/main/res/values-land/styles_dial_pad.xml
new file mode 100644
index 0000000000..81841b3f11
--- /dev/null
+++ b/vector/src/main/res/values-land/styles_dial_pad.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="DialpadKeyNumberStyle">
+        <item name="android:textColor">?attr/riotx_text_primary</item>
+        <item name="android:textSize">@dimen/dialpad_key_numbers_default_size</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">@dimen/dialpad_key_number_default_margin_bottom</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+    <style name="DialpadKeyLettersStyle">
+        <item name="android:textColor">?attr/riotx_text_secondary</item>
+        <item name="android:textSize">@dimen/dialpad_key_letters_size</item>
+        <item name="android:fontFamily">sans-serif-regular</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center_horizontal</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_dial_pad.xml b/vector/src/main/res/values/styles_dial_pad.xml
index 614923caad..81841b3f11 100644
--- a/vector/src/main/res/values/styles_dial_pad.xml
+++ b/vector/src/main/res/values/styles_dial_pad.xml
@@ -3,10 +3,20 @@
     <style name="DialpadKeyNumberStyle">
         <item name="android:textColor">?attr/riotx_text_primary</item>
         <item name="android:textSize">@dimen/dialpad_key_numbers_default_size</item>
-        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:fontFamily">sans-serif</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginBottom">@dimen/dialpad_key_number_default_margin_bottom</item>
         <item name="android:gravity">center</item>
     </style>
+
+    <style name="DialpadKeyLettersStyle">
+        <item name="android:textColor">?attr/riotx_text_secondary</item>
+        <item name="android:textSize">@dimen/dialpad_key_letters_size</item>
+        <item name="android:fontFamily">sans-serif-regular</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center_horizontal</item>
+    </style>
+
 </resources>
\ No newline at end of file