diff options
author | Christian Schneppe <christian@pix-art.de> | 2016-09-14 22:24:57 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2016-09-14 22:24:57 +0200 |
commit | 98017f0ef8e89f50f440fd2c5f9ea4e73c8f9cc9 (patch) | |
tree | d766bdc70769dc3ce134a41616a4da44ee364b4d /src | |
parent | 008f747b956d85055d3b6a2b213eeec90b67729c (diff) |
show Emojis in EditText
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/EditMessage.java | 4 | ||||
-rw-r--r-- | src/main/res/layout/fragment_conversation.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/EditMessage.java b/src/main/java/de/pixart/messenger/ui/EditMessage.java index ee08cd47e..5415767e9 100644 --- a/src/main/java/de/pixart/messenger/ui/EditMessage.java +++ b/src/main/java/de/pixart/messenger/ui/EditMessage.java @@ -4,11 +4,11 @@ import android.content.Context; import android.os.Handler; import android.util.AttributeSet; import android.view.KeyEvent; -import android.widget.EditText; import de.pixart.messenger.Config; +import github.ankushsachdeva.emojicon.EmojiconEditText; -public class EditMessage extends EditText { +public class EditMessage extends EmojiconEditText { public EditMessage(Context context, AttributeSet attrs) { super(context, attrs); diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index c0debe3a8..9ad5392ab 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:emojicon="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/grey200" @@ -35,6 +36,7 @@ android:paddingBottom="2dp"> <de.pixart.messenger.ui.EditMessage + emojicon:emojiconSize="28sp" android:id="@+id/textinput" android:layout_width="wrap_content" android:layout_height="wrap_content" |