mirror of
https://github.com/element-hq/element-android
synced 2024-09-06 00:47:22 +00:00
Merge pull request #8517 from vector-im/dla/feature/rte_paste_images
Update rich text editor library to support pasting of images
This commit is contained in:
commit
7d084f18a0
1
changelog.d/8270.bugfix
Normal file
1
changelog.d/8270.bugfix
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Update rich text editor library to support pasting of images.
|
|
@ -101,7 +101,7 @@ ext.libs = [
|
||||||
],
|
],
|
||||||
element : [
|
element : [
|
||||||
'opusencoder' : "io.element.android:opusencoder:1.1.0",
|
'opusencoder' : "io.element.android:opusencoder:1.1.0",
|
||||||
'wysiwyg' : "io.element.android:wysiwyg:2.2.1"
|
'wysiwyg' : "io.element.android:wysiwyg:2.2.2"
|
||||||
],
|
],
|
||||||
squareup : [
|
squareup : [
|
||||||
'moshi' : "com.squareup.moshi:moshi:$moshi",
|
'moshi' : "com.squareup.moshi:moshi:$moshi",
|
||||||
|
|
|
@ -88,7 +88,7 @@ internal class RichTextComposerLayout @JvmOverloads constructor(
|
||||||
override val text: Editable?
|
override val text: Editable?
|
||||||
get() = editText.text
|
get() = editText.text
|
||||||
override val formattedText: String?
|
override val formattedText: String?
|
||||||
get() = (editText as? EditorEditText)?.getHtmlOutput()
|
get() = (editText as? EditorEditText)?.getContentAsMessageHtml()
|
||||||
override val editText: EditText
|
override val editText: EditText
|
||||||
get() = if (isTextFormattingEnabled) {
|
get() = if (isTextFormattingEnabled) {
|
||||||
views.richTextComposerEditText
|
views.richTextComposerEditText
|
||||||
|
|
Loading…
Reference in a new issue