diff options
| author | lookshe <github@lookshe.org> | 2016-03-20 16:15:17 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-20 16:15:17 +0100 |
| commit | 90bbe035e9efdff72241c8a0d87000fdba482a6b (patch) | |
| tree | 506ca0cd571fbedeee206280e0f1d2d9a9ba0d7b /src/main/res/layout | |
| parent | 89082f1c68fb60cf6e7c1d8533696976377fcfde (diff) | |
Fixes FS#143 - Displaying of emoticons too large
Diffstat (limited to 'src/main/res/layout')
| -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 |
4 files changed, 5 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 c3a86616..c5a6595c 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 /> </de.thedevstack.conversationsplus.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" |