From c61a909c718cd865ae9efb7e64525201dfbc3281 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Dec 2020 14:07:14 +0100 Subject: [PATCH] Use AppCompatEditText instead of EmojiEditText This avoids different emojis from the editText compared to other messages and the system keyboard. When using the inbuilt emoji picker, we get slightly different emojis to the rest of the system and messages either way, so we might as well start in the editText, to keep at least that one equal to the rest. Change-Id: If4cf1dec0513ed725a3bb098cc05a5cd267860b0 --- .../features/home/room/detail/composer/ComposerEditText.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt index 2257e5ee81..353ab783db 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt @@ -24,16 +24,16 @@ import android.text.Editable import android.util.AttributeSet import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputConnection +import androidx.appcompat.widget.AppCompatEditText import androidx.core.view.inputmethod.EditorInfoCompat import androidx.core.view.inputmethod.InputConnectionCompat -import com.vanniktech.emoji.EmojiEditText import im.vector.app.core.extensions.ooi import im.vector.app.core.platform.SimpleTextWatcher import im.vector.app.features.html.PillImageSpan import timber.log.Timber class ComposerEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = android.R.attr.editTextStyle) - : EmojiEditText(context, attrs, defStyleAttr) { + : AppCompatEditText(context, attrs, defStyleAttr) { interface Callback { fun onRichContentSelected(contentUri: Uri): Boolean