From 7c473b3d37cef429e3f46882a4f42b86ee2bf237 Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Mon, 17 Dec 2018 16:19:31 +0300 Subject: [PATCH] Change markwon render return type to Spanned --- markwon/src/main/java/ru/noties/markwon/Markwon.java | 5 +++-- markwon/src/main/java/ru/noties/markwon/MarkwonImpl.java | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/markwon/src/main/java/ru/noties/markwon/Markwon.java b/markwon/src/main/java/ru/noties/markwon/Markwon.java index b9fe2dad..6214fc16 100644 --- a/markwon/src/main/java/ru/noties/markwon/Markwon.java +++ b/markwon/src/main/java/ru/noties/markwon/Markwon.java @@ -2,6 +2,7 @@ package ru.noties.markwon; import android.content.Context; import android.support.annotation.NonNull; +import android.text.Spanned; import android.widget.TextView; import org.commonmark.node.Node; @@ -17,11 +18,11 @@ public abstract class Markwon { public abstract Node parse(@NonNull String input); @NonNull - public abstract CharSequence render(@NonNull Node node); + public abstract Spanned render(@NonNull Node node); // parse + render @NonNull - public abstract CharSequence toMarkdown(@NonNull String input); + public abstract Spanned toMarkdown(@NonNull String input); public abstract void setMarkdown(@NonNull TextView textView, @NonNull String markdown); diff --git a/markwon/src/main/java/ru/noties/markwon/MarkwonImpl.java b/markwon/src/main/java/ru/noties/markwon/MarkwonImpl.java index fe6747c7..2114f050 100644 --- a/markwon/src/main/java/ru/noties/markwon/MarkwonImpl.java +++ b/markwon/src/main/java/ru/noties/markwon/MarkwonImpl.java @@ -1,6 +1,7 @@ package ru.noties.markwon; import android.support.annotation.NonNull; +import android.text.Spanned; import android.widget.TextView; import org.commonmark.node.Node; @@ -39,7 +40,7 @@ class MarkwonImpl extends Markwon { @NonNull @Override - public CharSequence render(@NonNull Node node) { + public Spanned render(@NonNull Node node) { for (MarkwonPlugin plugin : plugins) { plugin.beforeRender(node); @@ -51,12 +52,12 @@ class MarkwonImpl extends Markwon { plugin.afterRender(node, visitor); } - return visitor.builder().text(); + return visitor.builder().spannableStringBuilder(); } @NonNull @Override - public CharSequence toMarkdown(@NonNull String input) { + public Spanned toMarkdown(@NonNull String input) { return render(parse(input)); }