filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
David Langley 2023-06-09 13:22:05 +01:00 committed by GitHub
parent 0f18cdb7d2 38330a7b67
commit 7d084f18a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/8270.bugfix Normal file
View File

@ -0,0 +1 @@
Update rich text editor library to support pasting of images.

2
dependencies.gradle
View File

@ -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",

2
vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
View File

@ -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