diff options
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 2 | ||||
| -rw-r--r-- | src/main/res/layout/fragment_conversation.xml | 3 | ||||
| -rw-r--r-- | src/main/res/layout/message_received.xml | 2 | ||||
| -rw-r--r-- | src/main/res/layout/message_sent.xml | 2 | ||||
| -rw-r--r-- | src/main/res/values-v21/themes.xml | 3 | ||||
| -rw-r--r-- | src/main/res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 4 |
7 files changed, 15 insertions, 4 deletions
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 9f040676..74e84593 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -88,7 +88,7 @@ android:text="This is a placeholder text to show the last messages" android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" - app:emojiconSize="20sp" /> + app:emojiconSize="?attr/EmojiconSizeBody" /> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/conversation_lastimage" diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index d14091fd..dd102177 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -55,7 +55,8 @@ android:paddingLeft="8dp" android:paddingRight="8dp" android:paddingTop="12dp" - android:textColor="@color/primaryText" > + android:textColor="@color/primaryText" + app:emojiconSize="?attr/EmojiconSizeInput" > <requestFocus /> </eu.siacs.conversations.ui.EditMessage> diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index fa690872..d331b3ef 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -56,7 +56,7 @@ android:autoLink="web|phone|email" android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" - app:emojiconSize="28sp" /> + app:emojiconSize="?attr/EmojiconSizeBody" /> <Button android:id="@+id/download_button" diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index 723a29e2..0edbab51 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -57,7 +57,7 @@ android:autoLink="web|phone|email" android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" - app:emojiconSize="28sp"/> + app:emojiconSize="?attr/EmojiconSizeBody"/> <Button android:id="@+id/download_button" diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml index 91d43e77..1902832d 100644 --- a/src/main/res/values-v21/themes.xml +++ b/src/main/res/values-v21/themes.xml @@ -13,6 +13,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_group_add_white_24dp</item> <item name="attr/icon_add_person">@drawable/ic_person_add_white_24dp</item> <item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item> 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"> |