Skip to content

Commit d5d5c90

Browse files
Bump io.element.android:wysiwyg from 1.2.2 to 2.2.1 (#8464)
* Bump io.element.android:wysiwyg from 1.2.2 to 2.2.1 Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 1.2.2 to 2.2.1. - [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md) - [Commits](matrix-org/matrix-rich-text-editor@1.2.2...2.2.1) --- updated-dependencies: - dependency-name: io.element.android:wysiwyg dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Fix compilation --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jonnyandrew <jonnya@element.io>
1 parent e4e4c29 commit d5d5c90

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ ext.libs = [
101101
],
102102
element : [
103103
'opusencoder' : "io.element.android:opusencoder:1.1.0",
104-
'wysiwyg' : "io.element.android:wysiwyg:1.2.2"
104+
'wysiwyg' : "io.element.android:wysiwyg:2.2.1"
105105
],
106106
squareup : [
107107
'moshi' : "com.squareup.moshi:moshi:$moshi",

vector/src/androidTest/java/im/vector/app/core/utils/TestSpan.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import android.text.Spanned
2323
import android.text.style.StrikethroughSpan
2424
import androidx.core.text.getSpans
2525
import im.vector.app.features.html.HtmlCodeSpan
26-
import io.element.android.wysiwyg.spans.InlineCodeSpan
26+
import io.element.android.wysiwyg.view.spans.InlineCodeSpan
2727
import io.mockk.justRun
2828
import io.mockk.mockk
2929
import io.mockk.slot

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ import im.vector.app.databinding.ComposerRichTextLayoutBinding
5050
import im.vector.app.databinding.ViewRichTextMenuButtonBinding
5151
import im.vector.app.features.home.room.detail.composer.images.UriContentListener
5252
import io.element.android.wysiwyg.EditorEditText
53-
import io.element.android.wysiwyg.inputhandlers.models.InlineFormat
54-
import io.element.android.wysiwyg.inputhandlers.models.LinkAction
5553
import io.element.android.wysiwyg.utils.RustErrorCollector
54+
import io.element.android.wysiwyg.view.models.InlineFormat
55+
import io.element.android.wysiwyg.view.models.LinkAction
5656
import uniffi.wysiwyg_composer.ActionState
5757
import uniffi.wysiwyg_composer.ComposerAction
5858

@@ -269,7 +269,7 @@ internal class RichTextComposerLayout @JvmOverloads constructor(
269269
views.richTextComposerEditText.getLinkAction()?.let {
270270
when (it) {
271271
LinkAction.InsertLink -> callback?.onSetLink(isTextSupported = true, initialLink = null)
272-
is LinkAction.SetLink -> callback?.onSetLink(isTextSupported = false, initialLink = it.currentLink)
272+
is LinkAction.SetLink -> callback?.onSetLink(isTextSupported = false, initialLink = it.currentUrl)
273273
}
274274
}
275275
}

vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import im.vector.app.core.di.ActiveSessionHolder
4343
import im.vector.app.core.resources.ColorProvider
4444
import im.vector.app.core.utils.DimensionConverter
4545
import im.vector.app.features.settings.VectorPreferences
46-
import io.element.android.wysiwyg.spans.InlineCodeSpan
46+
import io.element.android.wysiwyg.view.spans.InlineCodeSpan
4747
import io.noties.markwon.AbstractMarkwonPlugin
4848
import io.noties.markwon.Markwon
4949
import io.noties.markwon.MarkwonPlugin

vector/src/main/java/im/vector/app/features/html/HtmlCodeHandlers.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package im.vector.app.features.html
1818

1919
import im.vector.app.core.utils.DimensionConverter
2020
import im.vector.app.features.settings.VectorPreferences
21-
import io.element.android.wysiwyg.spans.CodeBlockSpan
22-
import io.element.android.wysiwyg.spans.InlineCodeSpan
21+
import io.element.android.wysiwyg.view.spans.CodeBlockSpan
22+
import io.element.android.wysiwyg.view.spans.InlineCodeSpan
2323
import io.noties.markwon.MarkwonVisitor
2424
import io.noties.markwon.SpannableBuilder
2525
import io.noties.markwon.core.MarkwonTheme

0 commit comments

Comments
 (0)