diff options
author | Christian Schneppe <christian@pix-art.de> | 2017-11-24 21:41:15 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2017-11-24 21:41:15 +0100 |
commit | b741b8bf12118bd13d43c62ea5c1598bd078348e (patch) | |
tree | 0ef0abe20af33c121e4c6540b438964aa35f6685 /src/main/res | |
parent | fca8eacabec77f4c3604a71763915c32e09d286d (diff) |
use com.android.support:support-emoji
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/layout/ab_title.xml | 4 | ||||
-rw-r--r-- | src/main/res/layout/activity_contact_details.xml | 6 | ||||
-rw-r--r-- | src/main/res/layout/activity_muc_details.xml | 4 | ||||
-rw-r--r-- | src/main/res/layout/activity_set_presence.xml | 2 | ||||
-rw-r--r-- | src/main/res/layout/contact.xml | 2 | ||||
-rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 4 | ||||
-rw-r--r-- | src/main/res/layout/fragment_conversation.xml | 4 | ||||
-rw-r--r-- | src/main/res/layout/message_content.xml | 3 | ||||
-rw-r--r-- | src/main/res/layout/presence_template.xml | 4 | ||||
-rw-r--r-- | src/main/res/layout/quickedit.xml | 4 | ||||
-rw-r--r-- | src/main/res/layout/show_location_infowindow.xml | 2 | ||||
-rw-r--r-- | src/main/res/values/defaults.xml | 1 |
12 files changed, 19 insertions, 21 deletions
diff --git a/src/main/res/layout/ab_title.xml b/src/main/res/layout/ab_title.xml index 3dbef8938..a20e9f8bc 100644 --- a/src/main/res/layout/ab_title.xml +++ b/src/main/res/layout/ab_title.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:gravity="start|center_vertical"> - <com.vanniktech.emoji.EmojiTextView + <android.support.text.emoji.widget.EmojiTextView android:id="@android:id/text1" style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title" android:layout_width="match_parent" @@ -19,7 +19,7 @@ android:onClick="onClick" android:paddingTop="1dp" /> - <com.vanniktech.emoji.EmojiTextView + <android.support.text.emoji.widget.EmojiTextView android:id="@android:id/text2" style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle" android:layout_width="match_parent" diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 4f842aec1..031110bea 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -20,7 +20,7 @@ android:background="@drawable/infocard_border" android:padding="@dimen/infocard_padding"> - <com.vanniktech.emoji.EmojiTextView + <android.support.text.emoji.widget.EmojiTextView android:id="@+id/contact_display_name" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -92,7 +92,7 @@ android:layout_marginBottom="4dp" android:layout_marginTop="4dp" /> - <com.vanniktech.emoji.EmojiTextView + <android.support.text.emoji.widget.EmojiTextView android:id="@+id/status_message" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -104,7 +104,7 @@ android:textStyle="italic" android:layout_marginBottom="4dp" /> - <com.vanniktech.emoji.EmojiTextView + <android.support.text.emoji.widget.EmojiTextView android:id="@+id/resource" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index e38247472..e0aabd8c0 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -22,7 +22,7 @@ android:orientation="vertical" android:padding="@dimen/infocard_padding"> - <com.vanniktech.emoji.EmojiTextView + <android.support.text.emoji.widget.EmojiTextView android:id="@+id/conference_name" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -156,7 +156,7 @@ android:orientation="vertical" android:paddingLeft="8dp"> - <com.vanniktech.emoji.EmojiTextView + <android.support.text.emoji.widget.EmojiTextView android:id="@+id/muc_your_nick" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/src/main/res/layout/activity_set_presence.xml b/src/main/res/layout/activity_set_presence.xml index 76039683e..705bba333 100644 --- a/src/main/res/layout/activity_set_presence.xml +++ b/src/main/res/layout/activity_set_presence.xml @@ -21,7 +21,7 @@ android:padding="@dimen/infocard_padding" android:orientation="vertical"> - <EditText + <android.support.text.emoji.widget.EmojiEditText android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textMultiLine" diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml index 3637d52bd..2865f3edf 100644 --- a/src/main/res/layout/contact.xml +++ b/src/main/res/layout/contact.xml @@ -24,7 +24,7 @@ android:orientation="vertical" android:paddingLeft="8dp"> - <com.vanniktech.emoji.EmojiTextView + <android.support.text.emoji.widget.EmojiTextView android:id="@+id/contact_display_name" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 480d84eba..e30e940a4 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -41,7 +41,7 @@ android:layout_toRightOf="@+id/conversation_image" android:paddingLeft="8dp"> - <com.vanniktech.emoji.EmojiTextView + <TextView android:id="@+id/conversation_name" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -89,7 +89,7 @@ android:layout_height="?attr/IconSize" android:layout_marginRight="?attr/TextSeparation"/>/> - <com.vanniktech.emoji.EmojiTextView + <TextView android:id="@+id/conversation_lastmsg" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index 5de574fb7..b40567750 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -34,7 +34,7 @@ android:paddingLeft="2dp" android:paddingBottom="2dp"> - <de.pixart.messenger.ui.EditMessage + <de.pixart.messenger.ui.widget.EditMessage android:id="@+id/textinput" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -54,7 +54,7 @@ android:textColor="@color/black87" android:singleLine="false"> - </de.pixart.messenger.ui.EditMessage> + </de.pixart.messenger.ui.widget.EditMessage> <ImageButton android:id="@+id/textSendButton" diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml index d2bcb0405..9bfa661e8 100644 --- a/src/main/res/layout/message_content.xml +++ b/src/main/res/layout/message_content.xml @@ -26,8 +26,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> android:textColor="@color/dark" android:textColorHighlight="@color/grey800" android:textColorLink="@color/dark" - android:textSize="?attr/TextSizeBody" - app:emojiSize="28sp" /> + android:textSize="?attr/TextSizeBody" /> <Button android:id="@+id/download_button" diff --git a/src/main/res/layout/presence_template.xml b/src/main/res/layout/presence_template.xml index 6972dfe58..22ce44147 100644 --- a/src/main/res/layout/presence_template.xml +++ b/src/main/res/layout/presence_template.xml @@ -19,14 +19,14 @@ android:layout_toStartOf="@+id/delete_button" android:layout_marginRight="8dp"> - <com.vanniktech.emoji.EmojiTextView + <android.support.text.emoji.widget.EmojiTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/presence_status_message" android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" /> - <com.vanniktech.emoji.EmojiTextView + <android.support.text.emoji.widget.EmojiTextView android:id="@+id/status" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/src/main/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml index a526cee26..93e81024c 100644 --- a/src/main/res/layout/quickedit.xml +++ b/src/main/res/layout/quickedit.xml @@ -5,7 +5,7 @@ android:orientation="vertical" android:padding="16dp"> - <EditText + <android.support.text.emoji.widget.EmojiEditText android:id="@+id/editor" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -13,6 +13,6 @@ android:inputType="textPersonName" android:textColor="@color/black87"> <requestFocus /> - </EditText> + </android.support.text.emoji.widget.EmojiEditText> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/show_location_infowindow.xml b/src/main/res/layout/show_location_infowindow.xml index fab14f87e..d7c208610 100644 --- a/src/main/res/layout/show_location_infowindow.xml +++ b/src/main/res/layout/show_location_infowindow.xml @@ -9,7 +9,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <com.vanniktech.emoji.EmojiTextView + <android.support.text.emoji.widget.EmojiTextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index 3bb1b2284..0f62c59c2 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -52,7 +52,6 @@ \n\nhttps://github.com/vanniktech/Emoji\n(Apache License, Version 2.0) \n\nhttps://github.com/ypresto/android-transcoder\n(Apache License, Version 2.0) \n\nhttp://www.eclipse.org/jetty/\n(Apache License, Version 2.0 and Eclipse Public License 1.0) - \n\nhttps://github.com/vdurmont/emoji-java\n(The MIT License) </string> <string name="default_resource" translatable="false">Phone</string> <bool name="portrait_only">true</bool> |