From 90bbe035e9efdff72241c8a0d87000fdba482a6b Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Sun, 20 Mar 2016 16:15:17 +0100
Subject: Fixes FS#143 - Displaying of emoticons too large

---
 src/main/res/values/attrs.xml  | 3 +++
 src/main/res/values/themes.xml | 4 ++++
 2 files changed, 7 insertions(+)

(limited to 'src/main/res/values')

diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 0d6d19b1..2cad436c 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -5,6 +5,9 @@
     <attr name="TextSizeBody" format="dimension" />
     <attr name="TextSizeHeadline" format="dimension" />
 
+    <attr name="EmojiconSizeBody" format="dimension" />
+    <attr name="EmojiconSizeInput" format="dimension" />
+
     <attr name="icon_add_group" format="reference"/>
     <attr name="icon_add_person" format="reference"/>
     <attr name="icon_cancel" format="reference"/>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 0f8b95bb..67e0a5ee 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -9,6 +9,9 @@
         <item name="TextSizeBody">14sp</item>
         <item name="TextSizeHeadline">20sp</item>
 
+        <item name="EmojiconSizeBody">19sp</item>
+        <item name="EmojiconSizeInput">24sp</item>
+
         <item name="attr/icon_add_group">@drawable/ic_action_add_group</item>
         <item name="attr/icon_add_person">@drawable/ic_action_add_person</item>
         <item name="attr/icon_cancel">@drawable/ic_action_cancel</item>
@@ -36,6 +39,7 @@
         <item name="TextSizeInfo">14sp</item>
         <item name="TextSizeBody">16sp</item>
         <item name="TextSizeHeadline">22sp</item>
+        <item name="EmojiconSizeBody">22sp</item>
     </style>
 
     <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
-- 
cgit v1.2.3