diff options
Diffstat (limited to '')
4 files changed, 14 insertions, 6 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/EditMessage.java b/src/main/java/de/pixart/messenger/ui/EditMessage.java index 62d6a6aee..479fd3445 100644 --- a/src/main/java/de/pixart/messenger/ui/EditMessage.java +++ b/src/main/java/de/pixart/messenger/ui/EditMessage.java @@ -15,11 +15,11 @@ import android.util.AttributeSet; import android.view.KeyEvent; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputConnection; +import android.widget.EditText; import de.pixart.messenger.Config; -import github.ankushsachdeva.emojicon.EmojiconEditText; -public class EditMessage extends EmojiconEditText { +public class EditMessage extends EditText { private OnCommitContentListener mCommitContentListener = null; private String[] mimeTypes = null; diff --git a/src/main/java/de/pixart/messenger/ui/StartUI.java b/src/main/java/de/pixart/messenger/ui/StartUI.java index 18a5d0f0d..7cc71f919 100644 --- a/src/main/java/de/pixart/messenger/ui/StartUI.java +++ b/src/main/java/de/pixart/messenger/ui/StartUI.java @@ -13,6 +13,9 @@ import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatActivity; import android.util.Log; +import com.vanniktech.emoji.EmojiManager; +import com.vanniktech.emoji.ios.IosEmojiProvider; + import java.util.List; import de.pixart.messenger.Config; @@ -33,6 +36,7 @@ public class StartUI extends AppCompatActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_start_ui); + EmojiManager.install(new IosEmojiProvider()); // This line needs to be executed before any usage of EmojiTextView or EmojiEditText. requestNeededPermissions(); } diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java index d7467b7a4..b46ec8296 100644 --- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java +++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java @@ -52,6 +52,9 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.Toast; +import com.vanniktech.emoji.EmojiManager; +import com.vanniktech.emoji.ios.IosEmojiProvider; + import net.java.otr4j.session.SessionID; import java.io.FileNotFoundException; @@ -394,6 +397,7 @@ public abstract class XmppActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + EmojiManager.install(new IosEmojiProvider()); // This line needs to be executed before any usage of EmojiTextView or EmojiEditText. metrics = getResources().getDisplayMetrics(); ExceptionHelper.init(getApplicationContext()); mPrimaryTextColor = getResources().getColor(R.color.black87); diff --git a/src/main/java/de/pixart/messenger/ui/widget/CopyTextView.java b/src/main/java/de/pixart/messenger/ui/widget/CopyTextView.java index 42a8ac29f..59223adcd 100644 --- a/src/main/java/de/pixart/messenger/ui/widget/CopyTextView.java +++ b/src/main/java/de/pixart/messenger/ui/widget/CopyTextView.java @@ -7,9 +7,9 @@ import android.content.Context; import android.os.Build; import android.util.AttributeSet; -import github.ankushsachdeva.emojicon.EmojiconTextView; +import com.vanniktech.emoji.EmojiTextView; -public class CopyTextView extends EmojiconTextView { +public class CopyTextView extends EmojiTextView { public CopyTextView(Context context) { super(context); @@ -20,13 +20,13 @@ public class CopyTextView extends EmojiconTextView { } public CopyTextView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); + super(context, attrs); //, defStyleAttr); } @SuppressWarnings("unused") @TargetApi(Build.VERSION_CODES.LOLLIPOP) public CopyTextView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr); //, defStyleRes); + super(context, attrs); //, defStyleAttr); //, defStyleRes); } public interface CopyHandler { |