From 5cce0fdce4868a46dcfb29930ee22e6843b62710 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 5 Mar 2019 13:42:20 +0100
Subject: [PATCH] Fixed crash due to dialog layout

---
 app/src/main/res/layout/dialog.xml |  9 +++------
 app/src/main/res/values/styles.xml | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/dialog.xml b/app/src/main/res/layout/dialog.xml
index dd325f58e..881830b26 100644
--- a/app/src/main/res/layout/dialog.xml
+++ b/app/src/main/res/layout/dialog.xml
@@ -138,24 +138,22 @@
 
         <Button
             android:id="@+id/dialog_cancel_button"
-            style="@style/font8"
+            style="@style/dialog_cancel_button_font"
             android:layout_width="137dp"
             android:layout_height="40dp"
             android:layout_margin="10dp"
             android:background="@drawable/resizable_assistant_button"
-            android:textColor="@drawable/assistant_button_text_color"
             android:ellipsize="end"
             android:padding="10dp"
             android:text="@string/cancel" />
 
         <Button
             android:id="@+id/dialog_delete_button"
-            style="@style/font15"
+            style="@style/dialog_action_button_font"
             android:layout_width="137dp"
             android:layout_height="40dp"
             android:layout_margin="10dp"
             android:background="@drawable/resizable_assistant_button"
-            android:textColor="@drawable/assistant_button_text_color"
             android:backgroundTint="@color/colorI"
             android:ellipsize="end"
             android:padding="10dp"
@@ -163,12 +161,11 @@
 
         <Button
             android:id="@+id/dialog_ok_button"
-            style="@style/font15"
+            style="@style/dialog_action_button_font"
             android:layout_width="137dp"
             android:layout_height="40dp"
             android:layout_margin="10dp"
             android:background="@drawable/resizable_assistant_button"
-            android:textColor="@drawable/assistant_button_text_color"
             android:backgroundTint="@color/colorL"
             android:ellipsize="end"
             android:padding="10dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c353f1482..2cc36fa55 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -330,10 +330,22 @@
     </style>
 
     <style name="dialog_message_font" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">?attr/subtitleTextColor</item>
+        <item name="android:textColor">@color/colorH</item>
         <item name="android:textSize">21sp</item>
     </style>
 
+    <style name="dialog_cancel_button_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">@color/colorC</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="dialog_action_button_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">@color/colorH</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
     <style name="dialog_zrtp_colored_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">@color/colorL</item>
         <item name="android:textSize">20sp</item>