aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-09-09 22:11:30 +0200
committerChristian Schneppe <christian@pix-art.de>2016-09-09 22:11:30 +0200
commitc88df3c1da4afef3fdeb4301a096a5aee65b06f2 (patch)
treee9870d20f4d7a52888868d107b19da731888f5c4 /src
parent4afe339ec32b8d180d913bcf07adf880b4899965 (diff)
add new emoji library
Diffstat (limited to 'src')
-rw-r--r--src/main/res/layout/ab_title.xml4
-rw-r--r--src/main/res/layout/activity_contact_details.xml2
-rw-r--r--src/main/res/layout/activity_muc_details.xml2
-rw-r--r--src/main/res/layout/activity_set_presence.xml2
-rw-r--r--src/main/res/layout/contact.xml2
-rw-r--r--src/main/res/layout/conversation_list_row.xml4
-rw-r--r--src/main/res/layout/create_conference_dialog.xml2
-rw-r--r--src/main/res/layout/message_received.xml4
-rw-r--r--src/main/res/layout/message_sent.xml4
-rw-r--r--src/main/res/layout/presence_template.xml4
-rw-r--r--src/main/res/layout/show_location_infowindow.xml2
11 files changed, 18 insertions, 14 deletions
diff --git a/src/main/res/layout/ab_title.xml b/src/main/res/layout/ab_title.xml
index d241a40e9..b6f917073 100644
--- a/src/main/res/layout/ab_title.xml
+++ b/src/main/res/layout/ab_title.xml
@@ -3,7 +3,7 @@
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
- <io.github.rockerhieu.emojicon.EmojiconTextView xmlns:android="http://schemas.android.com/apk/res/android"
+ <github.ankushsachdeva.emojicon.EmojiconTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title"
android:layout_width="match_parent"
@@ -15,7 +15,7 @@
android:clickable="true"
android:onClick="onClick"
android:paddingTop="1dp" />
- <io.github.rockerhieu.emojicon.EmojiconTextView xmlns:android="http://schemas.android.com/apk/res/android"
+ <github.ankushsachdeva.emojicon.EmojiconTextView xmlns:android="http://schemas.android.com/apk/res/android"
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 e2976809f..6681b913a 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -76,7 +76,7 @@
android:textSize="?attr/TextSizeBody"
android:layout_gravity="center_horizontal" />
- <io.github.rockerhieu.emojicon.EmojiconTextView
+ <github.ankushsachdeva.emojicon.EmojiconTextView
android:layout_marginTop="8dp"
android:id="@+id/status_message"
android:layout_width="wrap_content"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 98587f950..2cc2576b5 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -139,7 +139,7 @@
android:orientation="vertical"
android:paddingLeft="8dp">
- <io.github.rockerhieu.emojicon.EmojiconTextView
+ <github.ankushsachdeva.emojicon.EmojiconTextView
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 d173d163d..d7ada8539 100644
--- a/src/main/res/layout/activity_set_presence.xml
+++ b/src/main/res/layout/activity_set_presence.xml
@@ -20,7 +20,7 @@
android:background="@drawable/infocard_border"
android:padding="@dimen/infocard_padding"
android:orientation="vertical">
- <io.github.rockerhieu.emojicon.EmojiconEditText
+ <github.ankushsachdeva.emojicon.EmojiconEditText
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 7e96d54e0..445f16567 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" >
- <io.github.rockerhieu.emojicon.EmojiconTextView
+ <github.ankushsachdeva.emojicon.EmojiconTextView
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 d134b43cf..42a55d09f 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">
- <io.github.rockerhieu.emojicon.EmojiconTextView
+ <github.ankushsachdeva.emojicon.EmojiconTextView
android:id="@+id/conversation_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -67,7 +67,7 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/notification_status"
android:orientation="vertical">
- <io.github.rockerhieu.emojicon.EmojiconTextView
+ <github.ankushsachdeva.emojicon.EmojiconTextView
android:id="@+id/conversation_lastmsg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/src/main/res/layout/create_conference_dialog.xml b/src/main/res/layout/create_conference_dialog.xml
index 1a3ae34cc..d7eef989a 100644
--- a/src/main/res/layout/create_conference_dialog.xml
+++ b/src/main/res/layout/create_conference_dialog.xml
@@ -31,7 +31,7 @@
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody" />
- <io.github.rockerhieu.emojicon.EmojiconEditText
+ <github.ankushsachdeva.emojicon.EmojiconEditText
android:id="@+id/subject"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index d7076fffc..2f47dabb4 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:emojicon="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -54,8 +55,9 @@
android:maxHeight="400dp"
android:maxWidth="400dp" />
- <io.github.rockerhieu.emojicon.EmojiconTextView
+ <github.ankushsachdeva.emojicon.EmojiconTextView
android:id="@+id/message_body"
+ emojicon:emojiconSize="28sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 732388c26..6db84df96 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:emojicon="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
@@ -55,8 +56,9 @@
android:maxHeight="400dp"
android:maxWidth="400dp" />
- <io.github.rockerhieu.emojicon.EmojiconTextView
+ <github.ankushsachdeva.emojicon.EmojiconTextView
android:id="@+id/message_body"
+ emojicon:emojiconSize="28sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
diff --git a/src/main/res/layout/presence_template.xml b/src/main/res/layout/presence_template.xml
index f8dd20927..ea1d05bd8 100644
--- a/src/main/res/layout/presence_template.xml
+++ b/src/main/res/layout/presence_template.xml
@@ -17,13 +17,13 @@
android:layout_toLeftOf="@+id/delete_button"
android:layout_toStartOf="@+id/delete_button"
android:layout_marginRight="8dp">
- <io.github.rockerhieu.emojicon.EmojiconTextView
+ <github.ankushsachdeva.emojicon.EmojiconTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/presence_status_message"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"/>
- <io.github.rockerhieu.emojicon.EmojiconTextView
+ <github.ankushsachdeva.emojicon.EmojiconTextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/src/main/res/layout/show_location_infowindow.xml b/src/main/res/layout/show_location_infowindow.xml
index a81d0d6f9..0793ba7d5 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">
- <io.github.rockerhieu.emojicon.EmojiconTextView
+ <github.ankushsachdeva.emojicon.EmojiconTextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"