mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2025-02-16 20:10:04 +03:00
Merge pull request #4758 from vector-im/feature/adm/emoji-inconsistencies
Wrong emojis in composer
This commit is contained in:
commit
abcdfc6f73
2 changed files with 7 additions and 3 deletions
1
changelog.d/4756.bugfix
Normal file
1
changelog.d/4756.bugfix
Normal file
|
@ -0,0 +1 @@
|
|||
Fixes newer emojis rendering strangely when inserting from the system keyboard
|
|
@ -24,18 +24,21 @@ 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.OnReceiveContentListener
|
||||
import androidx.core.view.ViewCompat
|
||||
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) {
|
||||
class ComposerEditText @JvmOverloads constructor(
|
||||
context: Context,
|
||||
attrs: AttributeSet? = null,
|
||||
defStyleAttr: Int = android.R.attr.editTextStyle
|
||||
) : AppCompatEditText(context, attrs, defStyleAttr) {
|
||||
|
||||
interface Callback {
|
||||
fun onRichContentSelected(contentUri: Uri): Boolean
|
||||
|
|
Loading…
Add table
Reference in a new issue