4 files changed, 53 insertions, 0 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index f6c2e5fed..6cb9893ea 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -7,6 +7,7 @@
     <attr name="TextSizeSubhead" format="dimension" />
     <attr name="TextSizeBody1" format="dimension" />
     <attr name="TextSizeBody2" format="dimension" />
+    <attr name="TextSizeDisplay2" format="dimension"/>
     <attr name="TextSizeInput" format="dimension" />
     <attr name="TextSeparation" format="dimension" />
     <attr name="TextSizeBody" format="dimension" />
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3b176f4f3..585e87a4b 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -779,4 +779,5 @@
     <string name="large">Large</string>
     <string name="create_shortcut">Create Shortcut</string>
     <string name="not_encrypted_for_this_device">Message was not encrypted for this device.</string>
+    <string name="no_microphone_permission">Conversations needs access to the microphone</string>
 </resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index e3038c62e..e67e4db1e 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -1,5 +1,11 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
+    <style name="TextAppearance.Conversations.Display2.Monospace" parent="TextAppearance.AppCompat.Display2">
+        <item name="android:textSize">?TextSizeDisplay2</item>
+        <item name="android:fontFamily" tools:targetApi="jelly_bean">monospace</item>
+        <item name="android:typeface">monospace</item>
+    </style>
+
     <style name="TextAppearance.Conversations.Title" parent="TextAppearance.AppCompat.Title">
         <item name="android:textSize">?TextSizeTitle</item>
     </style>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 0eb408e09..2860b5c59 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -247,6 +247,7 @@
         <item name="TextSizeCaption">12sp</item>
         <item name="TextSizeBody1">14sp</item>
         <item name="TextSizeBody2">14sp</item>
+        <item name="TextSizeDisplay2">45sp</item>
         <item name="TextSizeSubhead">16sp</item>
         <item name="TextSizeTitle">20sp</item>
         <item name="TextSizeInput">16sp</item>
@@ -270,6 +271,7 @@
         <item name="TextSizeCaption">12sp</item>
         <item name="TextSizeBody1">14sp</item>
         <item name="TextSizeBody2">14sp</item>
+        <item name="TextSizeDisplay2">45sp</item>
         <item name="TextSizeSubhead">16sp</item>
         <item name="TextSizeTitle">20sp</item>
         <item name="TextSizeInput">16sp</item>
@@ -286,6 +288,49 @@
         <item name="android:background">@color/grey900</item>
     </style>
 
+
+    <style name="ConversationsTheme.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primary_dark</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="color_background_primary">@color/grey50</item>
+        <item name="divider">@color/black12</item>
+        <item name="TextSizeBody2">14sp</item>
+        <item name="TextSizeDisplay2">45sp</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+
+    <style name="ConversationsTheme.Dark.Dialog" parent="@style/Theme.AppCompat.Dialog">
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primary_dark</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="color_background_primary">@color/grey800</item>
+        <item name="divider">@color/white12</item>
+        <item name="TextSizeBody2">14sp</item>
+        <item name="TextSizeDisplay2">45sp</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+
+    <style name="ConversationsTheme.Dialog.Medium" parent="ConversationsTheme.Dialog">
+        <item name="TextSizeBody2">16sp</item>
+        <item name="TextSizeDisplay2">51sp</item>
+    </style>
+
+    <style name="ConversationsTheme.Dark.Dialog.Medium" parent="ConversationsTheme.Dark.Dialog">
+        <item name="TextSizeBody2">16sp</item>
+        <item name="TextSizeDisplay2">51sp</item>
+    </style>
+
+    <style name="ConversationsTheme.Dialog.Large" parent="ConversationsTheme.Dialog">
+        <item name="TextSizeBody2">18sp</item>
+        <item name="TextSizeDisplay2">56sp</item>
+    </style>
+
+    <style name="ConversationsTheme.Dark.Dialog.Large" parent="ConversationsTheme.Dark.Dialog">
+        <item name="TextSizeBody2">18sp</item>
+        <item name="TextSizeTitle">56sp</item>
+    </style>
+
     <style name="ConversationsTheme.FullScreen" parent="@style/Theme.AppCompat.Light">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>