aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2015-08-15 23:21:31 +0200
committerlookshe <github@lookshe.org>2015-08-15 23:24:46 +0200
commit9e785f265858b5e475bbb720ae8cb89b12675594 (patch)
treec63c74cf305a4edef0a5a279b2229c281854f7f9 /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
parent79c585144d0967a2e5d4b1cfb6c486332d0b0cfb (diff)
first attempt for trying to change emojicon to https://github.com/rockerhieu/emojicontrz/emojicon-new
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationFragment.java18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index dc472360..d0dc89a2 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -65,9 +65,10 @@ import eu.siacs.conversations.utils.GeoHelper;
import eu.siacs.conversations.utils.UIHelper;
import eu.siacs.conversations.xmpp.chatstate.ChatState;
import eu.siacs.conversations.xmpp.jid.Jid;
-import github.ankushsachdeva.emojicon.EmojiconGridView;
-import github.ankushsachdeva.emojicon.EmojiconsPopup;
-import github.ankushsachdeva.emojicon.emoji.Emojicon;
+
+import com.rockerhieu.emojicon.EmojiconGridFragment;
+import com.rockerhieu.emojicon.EmojiconsPopup;
+import com.rockerhieu.emojicon.emoji.Emojicon;
public class ConversationFragment extends Fragment implements EditMessage.KeyboardListener {
@@ -289,15 +290,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
//Will automatically set size according to the soft keyboard size
mEmojPopup.setSizeForSoftKeyboard();
- //Set on emojicon click listener
- mEmojPopup.setOnEmojiconClickedListener(new EmojiconGridView.OnEmojiconClickedListener() {
-
- @Override
- public void onEmojiconClicked(Emojicon emojicon) {
- mEditMessage.append(emojicon.getEmoji());
- }
- });
-
//Set on backspace click listener
mEmojPopup.setOnEmojiconBackspaceClickedListener(new EmojiconsPopup.OnEmojiconBackspaceClickedListener() {
@@ -334,7 +326,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
});
//On emoji clicked, add it to edittext
- mEmojPopup.setOnEmojiconClickedListener(new EmojiconGridView.OnEmojiconClickedListener() {
+ mEmojPopup.setOnEmojiconClickedListener(new EmojiconGridFragment.OnEmojiconClickedListener() {
@Override
public void onEmojiconClicked(Emojicon emojicon) {