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

V1.0.4 (#31)

Browse Source 
* Fix for #28 (table is removed when at the end)

* Added support for IndentedCodeBlock (#30)
This commit is contained in:
Dimitry 2018-03-18 11:59:30 +03:00 committed by GitHub
parent 79fceb6f69
commit 9dd05434d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -12,9 +12,9 @@
## Installation
```groovy
compile 'ru.noties:markwon:1.0.3'
compile 'ru.noties:markwon-image-loader:1.0.3' // optional
compile 'ru.noties:markwon-view:1.0.3' // optional
compile 'ru.noties:markwon:1.0.4'
compile 'ru.noties:markwon-image-loader:1.0.4' // optional
compile 'ru.noties:markwon-view:1.0.4' // optional
```
## Supported markdown features:

2
gradle.properties
View File

@ -6,7 +6,7 @@ org.gradle.configureondemand=true
android.enableBuildCache=true
android.buildCacheDir=build/pre-dex-cache
VERSION_NAME=1.0.3
VERSION_NAME=1.0.4
GROUP=ru.noties
POM_DESCRIPTION=Markwon

2
library/src/main/java/ru/noties/markwon/Markwon.java
View File

@ -66,7 +66,7 @@ public abstract class Markwon {
}
/**
* Helper method to apply parsed markdown. Please note, that if images or tables are used
* Helper method to apply parsed markdown.
*
* @param view {@link TextView} to set markdown into
* @param text parsed markdown

27
library/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java
View File

@ -1,6 +1,7 @@
package ru.noties.markwon.renderer;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.StrikethroughSpan;
@ -22,6 +23,7 @@ import org.commonmark.node.Heading;
import org.commonmark.node.HtmlBlock;
import org.commonmark.node.HtmlInline;
import org.commonmark.node.Image;
import org.commonmark.node.IndentedCodeBlock;
import org.commonmark.node.Link;
import org.commonmark.node.ListBlock;
import org.commonmark.node.ListItem;
@ -142,7 +144,24 @@ public class SpannableMarkdownVisitor extends AbstractVisitor {
@Override
public void visit(FencedCodeBlock fencedCodeBlock) {
// @since 1.0.4
visitCodeBlock(fencedCodeBlock.getInfo(), fencedCodeBlock.getLiteral());
}
/**
* @since 1.0.4
*/
@Override
public void visit(IndentedCodeBlock indentedCodeBlock) {
visitCodeBlock(null, indentedCodeBlock.getLiteral());
}
/**
* @param info tag of a code block
* @param code content of a code block
* @since 1.0.4
*/
private void visitCodeBlock(@Nullable String info, @NonNull String code) {
newLine();
final int length = builder.length();
@ -151,7 +170,7 @@ public class SpannableMarkdownVisitor extends AbstractVisitor {
builder.append('\u00a0').append('\n');
builder.append(
configuration.syntaxHighlight()
.highlight(fencedCodeBlock.getInfo(), fencedCodeBlock.getLiteral())
.highlight(info, code)
);
builder.append('\u00a0').append('\n');
@ -331,7 +350,11 @@ public class SpannableMarkdownVisitor extends AbstractVisitor {
visitChildren(node);
if (pendingTableRow != null) {
builder.append(' ');
// @since 1.0.4 Replace table char with non-breakable space
// we need this because if table is at the end of the text, then it will be
// trimmed from the final result
builder.append('\u00a0');
final TableRowSpan span = new TableRowSpan(
configuration.theme(),