the-btfash-foundation/Markwon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Dimitry Ivanov 2018-12-23 16:50:48 +03:00
parent 83547d38c3
commit 2aef492e7d
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/ru/noties/markwon/MainActivity.java
View File

@ -6,6 +6,7 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.text.Spanned;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
@ -71,7 +72,7 @@ public class MainActivity extends Activity {
public void apply(final String text) { public void apply(final String text) {
markdownRenderer.render(MainActivity.this, themes.isLight(), uri(), text, new MarkdownRenderer.MarkdownReadyListener() { markdownRenderer.render(MainActivity.this, themes.isLight(), uri(), text, new MarkdownRenderer.MarkdownReadyListener() {
@Override @Override
public void onMarkdownReady(@NonNull Markwon markwon, CharSequence markdown) { public void onMarkdownReady(@NonNull Markwon markwon, Spanned markdown) {
markwon.setParsedMarkdown(textView, markdown); markwon.setParsedMarkdown(textView, markdown);

5
app/src/main/java/ru/noties/markwon/MarkdownRenderer.java
View File

@ -6,6 +6,7 @@ import android.os.Handler;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.text.Spanned;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future; import java.util.concurrent.Future;
@ -34,7 +35,7 @@ import ru.noties.prism4j.Prism4j;
public class MarkdownRenderer { public class MarkdownRenderer {
interface MarkdownReadyListener { interface MarkdownReadyListener {
void onMarkdownReady(@NonNull Markwon markwon, CharSequence markdown); void onMarkdownReady(@NonNull Markwon markwon, Spanned markdown);
} }
@Inject @Inject
@ -105,7 +106,7 @@ public class MarkdownRenderer {
final long start = SystemClock.uptimeMillis(); final long start = SystemClock.uptimeMillis();
final CharSequence text = markwon.toMarkdown(markdown); final Spanned text = markwon.toMarkdown(markdown);
final long end = SystemClock.uptimeMillis(); final long end = SystemClock.uptimeMillis();

3
markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TablePlugin.java
View File

@ -2,6 +2,7 @@ package ru.noties.markwon.ext.tables;
import android.content.Context; import android.content.Context;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.text.Spanned;
import android.widget.TextView; import android.widget.TextView;
import org.commonmark.ext.gfm.tables.TableBody; import org.commonmark.ext.gfm.tables.TableBody;
@ -49,7 +50,7 @@ public class TablePlugin extends AbstractMarkwonPlugin {
} }
@Override @Override
public void beforeSetText(@NonNull TextView textView, @NonNull CharSequence markdown) { public void beforeSetText(@NonNull TextView textView, @NonNull Spanned markdown) {
TableRowsScheduler.unschedule(textView); TableRowsScheduler.unschedule(textView);
} }

3
markwon/src/main/java/ru/noties/markwon/core/MarkwonTheme.java
View File

@ -56,6 +56,7 @@ public class MarkwonTheme {
* @return {@link Builder instance} * @return {@link Builder instance}
* @see #builderWithDefaults(Context) * @see #builderWithDefaults(Context)
* @see #builder(MarkwonTheme) * @see #builder(MarkwonTheme)
* @see #emptyBuilder()
* @since 1.0.0 * @since 1.0.0
* @deprecated 3.0.0 * @deprecated 3.0.0
*/ */
@ -75,7 +76,7 @@ public class MarkwonTheme {
* @since 3.0.0 * @since 3.0.0
*/ */
@NonNull @NonNull
public static Builder builderNoDefaults() { public static Builder emptyBuilder() {
return new Builder(); return new Builder();
} }