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

Removed html from core artifact

Browse Source
This commit is contained in:
Dimitry Ivanov 2018-11-26 17:21:24 +03:00
parent d48b33e9a5
commit dc9a4dbf56
54 changed files with 129 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ import ru.noties.markwon.ext.strikethrough.StrikethroughPlugin;
import ru.noties.markwon.ext.tables.TablePlugin;
import ru.noties.markwon.ext.tasklist.TaskListPlugin;
import ru.noties.markwon.gif.GifAwarePlugin;
import ru.noties.markwon.html.impl.HtmlPlugin;
import ru.noties.markwon.html.HtmlPlugin;
import ru.noties.markwon.image.ImagesPlugin;
import ru.noties.markwon.image.gif.GifPlugin;
import ru.noties.markwon.image.svg.SvgPlugin;

2
markwon-html/src/main/AndroidManifest.xml
View File

@ -1 +1 @@
<manifest package="ru.noties.markwon.html.impl" />
<manifest package="ru.noties.markwon.html" />

2
markwon-html/src/main/java/ru/noties/markwon/html/impl/AppendableUtils.java → markwon-html/src/main/java/ru/noties/markwon/html/AppendableUtils.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl;
package ru.noties.markwon.html;
import android.support.annotation.NonNull;

2
markwon-html/src/main/java/ru/noties/markwon/html/impl/CssInlineStyleParser.java → markwon-html/src/main/java/ru/noties/markwon/html/CssInlineStyleParser.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl;
package ru.noties.markwon.html;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;

2
markwon-html/src/main/java/ru/noties/markwon/html/impl/CssProperty.java → markwon-html/src/main/java/ru/noties/markwon/html/CssProperty.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl;
package ru.noties.markwon.html;
import android.support.annotation.NonNull;

4
markwon-html/src/main/java/ru/noties/markwon/html/impl/HtmlEmptyTagReplacement.java → markwon-html/src/main/java/ru/noties/markwon/html/HtmlEmptyTagReplacement.java
View File

@ -1,10 +1,8 @@
package ru.noties.markwon.html.impl;
package ru.noties.markwon.html;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import ru.noties.markwon.html.HtmlTag;
/**
* This class will be used to append some text to output in order to
* apply a Span for this tag. Please note that this class will be used for

17
markwon-html/src/main/java/ru/noties/markwon/html/impl/HtmlPlugin.java → markwon-html/src/main/java/ru/noties/markwon/html/HtmlPlugin.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl;
package ru.noties.markwon.html;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -8,10 +8,7 @@ import org.commonmark.node.HtmlBlock;
import org.commonmark.node.HtmlInline;
import ru.noties.markwon.AbstractMarkwonPlugin;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.MarkwonVisitor;
import ru.noties.markwon.html.MarkwonHtmlParser;
import ru.noties.markwon.html.MarkwonHtmlRenderer;
public class HtmlPlugin extends AbstractMarkwonPlugin {
@ -43,13 +40,6 @@ public class HtmlPlugin extends AbstractMarkwonPlugin {
this.parser = parser;
}
@Override
public void configureConfiguration(@NonNull MarkwonConfiguration.Builder builder) {
builder
.htmlParser(parser)
.htmlRenderer(renderer);
}
@Override
public void configureVisitor(@NonNull MarkwonVisitor.Builder builder) {
builder
@ -59,8 +49,7 @@ public class HtmlPlugin extends AbstractMarkwonPlugin {
visitor.visitChildren(document);
final MarkwonConfiguration configuration = visitor.configuration();
configuration.htmlRenderer().render(configuration, visitor.builder(), configuration.htmlParser());
renderer.render(visitor.configuration(), visitor.builder(), parser);
}
})
.on(HtmlBlock.class, new MarkwonVisitor.NodeVisitor<HtmlBlock>() {
@ -79,7 +68,7 @@ public class HtmlPlugin extends AbstractMarkwonPlugin {
private void visitHtml(@NonNull MarkwonVisitor visitor, @Nullable String html) {
if (html != null) {
visitor.configuration().htmlParser().processFragment(visitor.builder(), html);
parser.processFragment(visitor.builder(), html);
}
}
}

0
markwon/src/main/java/ru/noties/markwon/html/HtmlTag.java → markwon-html/src/main/java/ru/noties/markwon/html/HtmlTag.java
View File

4
markwon-html/src/main/java/ru/noties/markwon/html/impl/HtmlTagImpl.java → markwon-html/src/main/java/ru/noties/markwon/html/HtmlTagImpl.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl;
package ru.noties.markwon.html;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -7,8 +7,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import ru.noties.markwon.html.HtmlTag;
abstract class HtmlTagImpl implements HtmlTag {
final String name;

0
markwon/src/main/java/ru/noties/markwon/html/MarkwonHtmlParser.java → markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlParser.java
View File

18
markwon-html/src/main/java/ru/noties/markwon/html/impl/MarkwonHtmlParserImpl.java → markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserImpl.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl;
package ru.noties.markwon.html;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -14,18 +14,16 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
import ru.noties.markwon.html.HtmlTag;
import ru.noties.markwon.html.HtmlTag.Block;
import ru.noties.markwon.html.HtmlTag.Inline;
import ru.noties.markwon.html.MarkwonHtmlParser;
import ru.noties.markwon.html.impl.jsoup.nodes.Attribute;
import ru.noties.markwon.html.impl.jsoup.nodes.Attributes;
import ru.noties.markwon.html.impl.jsoup.parser.CharacterReader;
import ru.noties.markwon.html.impl.jsoup.parser.ParseErrorList;
import ru.noties.markwon.html.impl.jsoup.parser.Token;
import ru.noties.markwon.html.impl.jsoup.parser.Tokeniser;
import ru.noties.markwon.html.jsoup.nodes.Attribute;
import ru.noties.markwon.html.jsoup.nodes.Attributes;
import ru.noties.markwon.html.jsoup.parser.CharacterReader;
import ru.noties.markwon.html.jsoup.parser.ParseErrorList;
import ru.noties.markwon.html.jsoup.parser.Token;
import ru.noties.markwon.html.jsoup.parser.Tokeniser;
import static ru.noties.markwon.html.impl.AppendableUtils.appendQuietly;
import static ru.noties.markwon.html.AppendableUtils.appendQuietly;
/**
* @since 2.0.0

0
markwon/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserNoOp.java → markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserNoOp.java
View File

0
markwon/src/main/java/ru/noties/markwon/html/MarkwonHtmlRenderer.java → markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlRenderer.java
View File

32
markwon-html/src/main/java/ru/noties/markwon/html/impl/MarkwonHtmlRendererImpl.java → markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererImpl.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl;
package ru.noties.markwon.html;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -11,21 +11,17 @@ import java.util.Map;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.SpannableBuilder;
import ru.noties.markwon.html.HtmlTag;
import ru.noties.markwon.html.MarkwonHtmlParser;
import ru.noties.markwon.html.MarkwonHtmlRenderer;
import ru.noties.markwon.html.TagHandler;
import ru.noties.markwon.html.impl.tag.BlockquoteHandler;
import ru.noties.markwon.html.impl.tag.EmphasisHandler;
import ru.noties.markwon.html.impl.tag.HeadingHandler;
import ru.noties.markwon.html.impl.tag.ImageHandler;
import ru.noties.markwon.html.impl.tag.LinkHandler;
import ru.noties.markwon.html.impl.tag.ListHandler;
import ru.noties.markwon.html.impl.tag.StrikeHandler;
import ru.noties.markwon.html.impl.tag.StrongEmphasisHandler;
import ru.noties.markwon.html.impl.tag.SubScriptHandler;
import ru.noties.markwon.html.impl.tag.SuperScriptHandler;
import ru.noties.markwon.html.impl.tag.UnderlineHandler;
import ru.noties.markwon.html.tag.BlockquoteHandler;
import ru.noties.markwon.html.tag.EmphasisHandler;
import ru.noties.markwon.html.tag.HeadingHandler;
import ru.noties.markwon.html.tag.ImageHandler;
import ru.noties.markwon.html.tag.LinkHandler;
import ru.noties.markwon.html.tag.ListHandler;
import ru.noties.markwon.html.tag.StrikeHandler;
import ru.noties.markwon.html.tag.StrongEmphasisHandler;
import ru.noties.markwon.html.tag.SubScriptHandler;
import ru.noties.markwon.html.tag.SuperScriptHandler;
import ru.noties.markwon.html.tag.UnderlineHandler;
public class MarkwonHtmlRendererImpl extends MarkwonHtmlRenderer {
@ -130,7 +126,7 @@ public class MarkwonHtmlRendererImpl extends MarkwonHtmlRenderer {
handler = tagHandler(inline.name());
if (handler != null) {
handler.handle(configuration, builder, inline);
handler.handle(configuration, MarkwonHtmlRendererImpl.this, builder, inline);
}
}
}
@ -150,7 +146,7 @@ public class MarkwonHtmlRendererImpl extends MarkwonHtmlRenderer {
handler = tagHandler(block.name());
if (handler != null) {
handler.handle(configuration, builder, block);
handler.handle(configuration, MarkwonHtmlRendererImpl.this, builder, block);
} else {
// see if any of children can be handled
apply(block.children());

0
markwon/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererNoOp.java → markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererNoOp.java
View File

8
markwon/src/main/java/ru/noties/markwon/html/TagHandler.java → markwon-html/src/main/java/ru/noties/markwon/html/TagHandler.java
View File

@ -9,12 +9,14 @@ public abstract class TagHandler {
public abstract void handle(
@NonNull MarkwonConfiguration configuration,
@NonNull MarkwonHtmlRenderer renderer,
@NonNull SpannableBuilder builder,
@NonNull HtmlTag tag
);
protected static void visitChildren(
@NonNull MarkwonConfiguration configuration,
@NonNull MarkwonHtmlRenderer renderer,
@NonNull SpannableBuilder builder,
@NonNull HtmlTag.Block block) {
@ -26,11 +28,11 @@ public abstract class TagHandler {
continue;
}
handler = configuration.htmlRenderer().tagHandler(child.name());
handler = renderer.tagHandler(child.name());
if (handler != null) {
handler.handle(configuration, builder, child);
handler.handle(configuration, renderer, builder, child);
} else {
visitChildren(configuration, builder, child);
visitChildren(configuration, renderer, builder, child);
}
}
}

4
markwon-html/src/main/java/ru/noties/markwon/html/impl/TrimmingAppender.java → markwon-html/src/main/java/ru/noties/markwon/html/TrimmingAppender.java
View File

@ -1,8 +1,8 @@
package ru.noties.markwon.html.impl;
package ru.noties.markwon.html;
import android.support.annotation.NonNull;
import static ru.noties.markwon.html.impl.AppendableUtils.appendQuietly;
import static ru.noties.markwon.html.AppendableUtils.appendQuietly;
abstract class TrimmingAppender {

2
markwon-html/src/main/java/ru/noties/markwon/html/impl/jsoup/UncheckedIOException.java → markwon-html/src/main/java/ru/noties/markwon/html/jsoup/UncheckedIOException.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.jsoup;
package ru.noties.markwon.html.jsoup;
import java.io.IOException;

2
markwon-html/src/main/java/ru/noties/markwon/html/impl/jsoup/helper/Normalizer.java → markwon-html/src/main/java/ru/noties/markwon/html/jsoup/helper/Normalizer.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.jsoup.helper;
package ru.noties.markwon.html.jsoup.helper;
import java.util.Locale;

2
markwon-html/src/main/java/ru/noties/markwon/html/impl/jsoup/helper/Validate.java → markwon-html/src/main/java/ru/noties/markwon/html/jsoup/helper/Validate.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.jsoup.helper;
package ru.noties.markwon.html.jsoup.helper;
/**
* Simple validation methods. Designed for jsoup internal use

4
markwon-html/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/Attribute.java → markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/Attribute.java
View File

@ -1,8 +1,8 @@
package ru.noties.markwon.html.impl.jsoup.nodes;
package ru.noties.markwon.html.jsoup.nodes;
import java.util.Map;
import ru.noties.markwon.html.impl.jsoup.helper.Validate;
import ru.noties.markwon.html.jsoup.helper.Validate;
/**
A single key + value attribute. (Only used for presentation.)

9
markwon-html/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/Attributes.java → markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/Attributes.java
View File

@ -1,14 +1,11 @@
package ru.noties.markwon.html.impl.jsoup.nodes;
package ru.noties.markwon.html.jsoup.nodes;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import ru.noties.markwon.html.impl.jsoup.helper.Validate;
import ru.noties.markwon.html.jsoup.helper.Validate;
import static ru.noties.markwon.html.impl.jsoup.helper.Normalizer.lowerCase;
import static ru.noties.markwon.html.jsoup.helper.Normalizer.lowerCase;
/**
* The attributes of an Element.

2
markwon-html/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/CommonMarkEntities.java → markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/CommonMarkEntities.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.jsoup.nodes;
package ru.noties.markwon.html.jsoup.nodes;
import android.support.annotation.NonNull;

2
markwon-html/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/DocumentType.java → markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/DocumentType.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.jsoup.nodes;
package ru.noties.markwon.html.jsoup.nodes;
/**
* A {@code <!DOCTYPE>} node.

8
markwon-html/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/CharacterReader.java → markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/CharacterReader.java
View File

@ -1,6 +1,4 @@
package ru.noties.markwon.html.impl.jsoup.parser;
import android.support.annotation.NonNull;
package ru.noties.markwon.html.jsoup.parser;
import java.io.IOException;
import java.io.Reader;
@ -8,8 +6,8 @@ import java.io.StringReader;
import java.util.Arrays;
import java.util.Locale;
import ru.noties.markwon.html.impl.jsoup.UncheckedIOException;
import ru.noties.markwon.html.impl.jsoup.helper.Validate;
import ru.noties.markwon.html.jsoup.UncheckedIOException;
import ru.noties.markwon.html.jsoup.helper.Validate;
/**
* CharacterReader consumes tokens off a string. Used internally by jsoup. API subject to changes.

2
markwon-html/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/ParseError.java → markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/ParseError.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.jsoup.parser;
package ru.noties.markwon.html.jsoup.parser;
/**
* A Parse Error records an error in the input HTML that occurs in either the tokenisation or the tree building phase.

2
markwon-html/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/ParseErrorList.java → markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/ParseErrorList.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.jsoup.parser;
package ru.noties.markwon.html.jsoup.parser;
import java.util.ArrayList;

8
markwon-html/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/Token.java → markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/Token.java
View File

@ -1,11 +1,11 @@
package ru.noties.markwon.html.impl.jsoup.parser;
package ru.noties.markwon.html.jsoup.parser;
import android.support.annotation.NonNull;
import ru.noties.markwon.html.impl.jsoup.helper.Validate;
import ru.noties.markwon.html.impl.jsoup.nodes.Attributes;
import ru.noties.markwon.html.jsoup.helper.Validate;
import ru.noties.markwon.html.jsoup.nodes.Attributes;
import static ru.noties.markwon.html.impl.jsoup.helper.Normalizer.lowerCase;
import static ru.noties.markwon.html.jsoup.helper.Normalizer.lowerCase;
/**
* Parse tokens for the Tokeniser.

6
markwon-html/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/Tokeniser.java → markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/Tokeniser.java
View File

@ -1,9 +1,9 @@
package ru.noties.markwon.html.impl.jsoup.parser;
package ru.noties.markwon.html.jsoup.parser;
import java.util.Arrays;
import ru.noties.markwon.html.impl.jsoup.helper.Validate;
import ru.noties.markwon.html.impl.jsoup.nodes.CommonMarkEntities;
import ru.noties.markwon.html.jsoup.helper.Validate;
import ru.noties.markwon.html.jsoup.nodes.CommonMarkEntities;
/**
* Readers the input stream into tokens.

4
markwon-html/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/TokeniserState.java → markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/TokeniserState.java
View File

@ -1,6 +1,6 @@
package ru.noties.markwon.html.impl.jsoup.parser;
package ru.noties.markwon.html.jsoup.parser;
import ru.noties.markwon.html.impl.jsoup.nodes.DocumentType;
import ru.noties.markwon.html.jsoup.nodes.DocumentType;
/**
* States and transition activations for the Tokeniser.

4
markwon-html/src/main/java/ru/noties/markwon/html/impl/span/SubScriptSpan.java → markwon-html/src/main/java/ru/noties/markwon/html/span/SubScriptSpan.java
View File

@ -1,10 +1,10 @@
package ru.noties.markwon.html.impl.span;
package ru.noties.markwon.html.span;
import android.support.annotation.NonNull;
import android.text.TextPaint;
import android.text.style.MetricAffectingSpan;
import ru.noties.markwon.html.impl.MarkwonHtmlRendererImpl;
import ru.noties.markwon.html.MarkwonHtmlRendererImpl;
public class SubScriptSpan extends MetricAffectingSpan {

4
markwon-html/src/main/java/ru/noties/markwon/html/impl/span/SuperScriptSpan.java → markwon-html/src/main/java/ru/noties/markwon/html/span/SuperScriptSpan.java
View File

@ -1,10 +1,10 @@
package ru.noties.markwon.html.impl.span;
package ru.noties.markwon.html.span;
import android.support.annotation.NonNull;
import android.text.TextPaint;
import android.text.style.MetricAffectingSpan;
import ru.noties.markwon.html.impl.MarkwonHtmlRendererImpl;
import ru.noties.markwon.html.MarkwonHtmlRendererImpl;
public class SuperScriptSpan extends MetricAffectingSpan {

6
markwon-html/src/main/java/ru/noties/markwon/html/impl/tag/BlockquoteHandler.java → markwon-html/src/main/java/ru/noties/markwon/html/tag/BlockquoteHandler.java
View File

@ -1,10 +1,11 @@
package ru.noties.markwon.html.impl.tag;
package ru.noties.markwon.html.tag;
import android.support.annotation.NonNull;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.SpannableBuilder;
import ru.noties.markwon.html.HtmlTag;
import ru.noties.markwon.html.MarkwonHtmlRenderer;
import ru.noties.markwon.html.TagHandler;
public class BlockquoteHandler extends TagHandler {
@ -12,11 +13,12 @@ public class BlockquoteHandler extends TagHandler {
@Override
public void handle(
@NonNull MarkwonConfiguration configuration,
@NonNull MarkwonHtmlRenderer renderer,
@NonNull SpannableBuilder builder,
@NonNull HtmlTag tag) {
if (tag.isBlock()) {
visitChildren(configuration, builder, tag.getAsBlock());
visitChildren(configuration, renderer, builder, tag.getAsBlock());
}
SpannableBuilder.setSpans(

2
markwon-html/src/main/java/ru/noties/markwon/html/impl/tag/EmphasisHandler.java → markwon-html/src/main/java/ru/noties/markwon/html/tag/EmphasisHandler.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.tag;
package ru.noties.markwon.html.tag;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;

2
markwon-html/src/main/java/ru/noties/markwon/html/impl/tag/HeadingHandler.java → markwon-html/src/main/java/ru/noties/markwon/html/tag/HeadingHandler.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.tag;
package ru.noties.markwon.html.tag;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;

4
markwon-html/src/main/java/ru/noties/markwon/html/impl/tag/ImageHandler.java → markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageHandler.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.tag;
package ru.noties.markwon.html.tag;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -8,7 +8,7 @@ import java.util.Map;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.html.HtmlTag;
import ru.noties.markwon.html.impl.CssInlineStyleParser;
import ru.noties.markwon.html.CssInlineStyleParser;
import ru.noties.markwon.image.ImageSize;
public class ImageHandler extends SimpleTagHandler {

6
markwon-html/src/main/java/ru/noties/markwon/html/impl/tag/ImageSizeParserImpl.java → markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageSizeParserImpl.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.tag;
package ru.noties.markwon.html.tag;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -7,8 +7,8 @@ import android.text.TextUtils;
import java.util.Map;
import ru.noties.markwon.html.impl.CssInlineStyleParser;
import ru.noties.markwon.html.impl.CssProperty;
import ru.noties.markwon.html.CssInlineStyleParser;
import ru.noties.markwon.html.CssProperty;
import ru.noties.markwon.image.ImageSize;
class ImageSizeParserImpl implements ImageHandler.ImageSizeParser {

2
markwon-html/src/main/java/ru/noties/markwon/html/impl/tag/LinkHandler.java → markwon-html/src/main/java/ru/noties/markwon/html/tag/LinkHandler.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.tag;
package ru.noties.markwon.html.tag;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;

6
markwon-html/src/main/java/ru/noties/markwon/html/impl/tag/ListHandler.java → markwon-html/src/main/java/ru/noties/markwon/html/tag/ListHandler.java
View File

@ -1,10 +1,11 @@
package ru.noties.markwon.html.impl.tag;
package ru.noties.markwon.html.tag;
import android.support.annotation.NonNull;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.SpannableBuilder;
import ru.noties.markwon.html.HtmlTag;
import ru.noties.markwon.html.MarkwonHtmlRenderer;
import ru.noties.markwon.html.TagHandler;
public class ListHandler extends TagHandler {
@ -12,6 +13,7 @@ public class ListHandler extends TagHandler {
@Override
public void handle(
@NonNull MarkwonConfiguration configuration,
@NonNull MarkwonHtmlRenderer renderer,
@NonNull SpannableBuilder builder,
@NonNull HtmlTag tag) {
@ -34,7 +36,7 @@ public class ListHandler extends TagHandler {
for (HtmlTag.Block child : block.children()) {
visitChildren(configuration, builder, child);
visitChildren(configuration, renderer, builder, child);
if ("li".equals(child.name())) {
// insert list item here

5
markwon-html/src/main/java/ru/noties/markwon/html/impl/tag/SimpleTagHandler.java → markwon-html/src/main/java/ru/noties/markwon/html/tag/SimpleTagHandler.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.tag;
package ru.noties.markwon.html.tag;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.SpannableBuilder;
import ru.noties.markwon.html.HtmlTag;
import ru.noties.markwon.html.MarkwonHtmlRenderer;
import ru.noties.markwon.html.TagHandler;
public abstract class SimpleTagHandler extends TagHandler {
@ -14,7 +15,7 @@ public abstract class SimpleTagHandler extends TagHandler {
public abstract Object getSpans(@NonNull MarkwonConfiguration configuration, @NonNull HtmlTag tag);
@Override
public void handle(@NonNull MarkwonConfiguration configuration, @NonNull SpannableBuilder builder, @NonNull HtmlTag tag) {
public void handle(@NonNull MarkwonConfiguration configuration, @NonNull MarkwonHtmlRenderer renderer, @NonNull SpannableBuilder builder, @NonNull HtmlTag tag) {
final Object spans = getSpans(configuration, tag);
if (spans != null) {
SpannableBuilder.setSpans(builder, spans, tag.start(), tag.end());

6
markwon-html/src/main/java/ru/noties/markwon/html/impl/tag/StrikeHandler.java → markwon-html/src/main/java/ru/noties/markwon/html/tag/StrikeHandler.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.tag;
package ru.noties.markwon.html.tag;
import android.support.annotation.NonNull;
import android.text.style.StrikethroughSpan;
@ -6,6 +6,7 @@ import android.text.style.StrikethroughSpan;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.SpannableBuilder;
import ru.noties.markwon.html.HtmlTag;
import ru.noties.markwon.html.MarkwonHtmlRenderer;
import ru.noties.markwon.html.TagHandler;
public class StrikeHandler extends TagHandler {
@ -13,11 +14,12 @@ public class StrikeHandler extends TagHandler {
@Override
public void handle(
@NonNull MarkwonConfiguration configuration,
@NonNull MarkwonHtmlRenderer renderer,
@NonNull SpannableBuilder builder,
@NonNull HtmlTag tag) {
if (tag.isBlock()) {
visitChildren(configuration, builder, tag.getAsBlock());
visitChildren(configuration, renderer, builder, tag.getAsBlock());
}
SpannableBuilder.setSpans(

2
markwon-html/src/main/java/ru/noties/markwon/html/impl/tag/StrongEmphasisHandler.java → markwon-html/src/main/java/ru/noties/markwon/html/tag/StrongEmphasisHandler.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.tag;
package ru.noties.markwon.html.tag;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;

4
markwon-html/src/main/java/ru/noties/markwon/html/impl/tag/SubScriptHandler.java → markwon-html/src/main/java/ru/noties/markwon/html/tag/SubScriptHandler.java
View File

@ -1,11 +1,11 @@
package ru.noties.markwon.html.impl.tag;
package ru.noties.markwon.html.tag;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.html.HtmlTag;
import ru.noties.markwon.html.impl.span.SubScriptSpan;
import ru.noties.markwon.html.span.SubScriptSpan;
public class SubScriptHandler extends SimpleTagHandler {
@Nullable

4
markwon-html/src/main/java/ru/noties/markwon/html/impl/tag/SuperScriptHandler.java → markwon-html/src/main/java/ru/noties/markwon/html/tag/SuperScriptHandler.java
View File

@ -1,11 +1,11 @@
package ru.noties.markwon.html.impl.tag;
package ru.noties.markwon.html.tag;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.html.HtmlTag;
import ru.noties.markwon.html.impl.span.SuperScriptSpan;
import ru.noties.markwon.html.span.SuperScriptSpan;
public class SuperScriptHandler extends SimpleTagHandler {
@Nullable

6
markwon-html/src/main/java/ru/noties/markwon/html/impl/tag/UnderlineHandler.java → markwon-html/src/main/java/ru/noties/markwon/html/tag/UnderlineHandler.java
View File

@ -1,4 +1,4 @@
package ru.noties.markwon.html.impl.tag;
package ru.noties.markwon.html.tag;
import android.support.annotation.NonNull;
import android.text.style.UnderlineSpan;
@ -6,6 +6,7 @@ import android.text.style.UnderlineSpan;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.SpannableBuilder;
import ru.noties.markwon.html.HtmlTag;
import ru.noties.markwon.html.MarkwonHtmlRenderer;
import ru.noties.markwon.html.TagHandler;
public class UnderlineHandler extends TagHandler {
@ -13,6 +14,7 @@ public class UnderlineHandler extends TagHandler {
@Override
public void handle(
@NonNull MarkwonConfiguration configuration,
@NonNull MarkwonHtmlRenderer renderer,
@NonNull SpannableBuilder builder,
@NonNull HtmlTag tag) {
@ -20,7 +22,7 @@ public class UnderlineHandler extends TagHandler {
// thus doesn't allow children, we must visit them first
if (tag.isBlock()) {
visitChildren(configuration, builder, tag.getAsBlock());
visitChildren(configuration, renderer, builder, tag.getAsBlock());
}
SpannableBuilder.setSpans(

2
markwon-html/src/test/java/ru/noties/markwon/html/impl/CssInlineStyleParserTest.java
View File

@ -14,6 +14,8 @@ import java.util.Map;
import ix.Ix;
import ix.IxFunction;
import ru.noties.markwon.html.CssInlineStyleParser;
import ru.noties.markwon.html.CssProperty;
import ru.noties.markwon.test.TestUtils;
import static org.junit.Assert.assertEquals;

3
markwon-html/src/test/java/ru/noties/markwon/html/impl/HtmlEmptyTagReplacementTest.java
View File

@ -5,8 +5,9 @@ import org.junit.Test;
import java.util.Collections;
import ru.noties.markwon.html.HtmlEmptyTagReplacement;
import ru.noties.markwon.html.api.HtmlTag;
import ru.noties.markwon.html.impl.HtmlTagImpl.InlineImpl;
import ru.noties.markwon.html.HtmlTagImpl.InlineImpl;
import static org.junit.Assert.assertEquals;

2
markwon-html/src/test/java/ru/noties/markwon/html/impl/MarkwonHtmlParserImplTest.java
View File

@ -15,6 +15,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import ru.noties.markwon.html.HtmlEmptyTagReplacement;
import ru.noties.markwon.html.MarkwonHtmlParserImpl;
import ru.noties.markwon.html.api.HtmlTag;
import ru.noties.markwon.html.api.MarkwonHtmlParser;

2
markwon-html/src/test/java/ru/noties/markwon/html/impl/TrimmingAppenderTest.java
View File

@ -6,6 +6,8 @@ import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import ru.noties.markwon.html.TrimmingAppender;
import static org.junit.Assert.assertEquals;
@RunWith(RobolectricTestRunner.class)

2
markwon-html/src/test/java/ru/noties/markwon/html/impl/jsoup/nodes/CommonMarkEntitiesTest.java
View File

@ -5,6 +5,8 @@ import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import ru.noties.markwon.html.jsoup.nodes.CommonMarkEntities;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

1
markwon-html/src/test/java/ru/noties/markwon/html/impl/tag/ImageSizeParserImplTest.java
View File

@ -13,6 +13,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import ru.noties.markwon.html.tag.ImageSizeParserImpl;
import ru.noties.markwon.image.ImageSize;
import ru.noties.markwon.renderer.html2.CssInlineStyleParser;

58
markwon/src/main/java/ru/noties/markwon/MarkwonConfiguration.java
View File

@ -3,10 +3,7 @@ package ru.noties.markwon;
import android.content.Context;
import android.support.annotation.NonNull;
import ru.noties.markwon.html.MarkwonHtmlParser;
import ru.noties.markwon.html.MarkwonHtmlRenderer;
import ru.noties.markwon.image.AsyncDrawableLoader;
import ru.noties.markwon.image.AsyncDrawableLoaderNoOp;
import ru.noties.markwon.image.ImageSizeResolver;
import ru.noties.markwon.image.ImageSizeResolverDef;
import ru.noties.markwon.spans.LinkSpan;
@ -20,8 +17,9 @@ public class MarkwonConfiguration {
// creates default configuration
@NonNull
@Deprecated
public static MarkwonConfiguration create(@NonNull Context context) {
return new Builder(context).build(MarkwonTheme.create(context), new AsyncDrawableLoaderNoOp());
return new Builder(context).build(MarkwonTheme.create(context), AsyncDrawableLoader.noOp());
}
@NonNull
@ -37,8 +35,6 @@ public class MarkwonConfiguration {
private final UrlProcessor urlProcessor;
private final ImageSizeResolver imageSizeResolver;
private final SpannableFactory factory; // @since 1.1.0
private final MarkwonHtmlParser htmlParser; // @since 2.0.0
private final MarkwonHtmlRenderer htmlRenderer; // @since 2.0.0
private MarkwonConfiguration(@NonNull Builder builder) {
this.theme = builder.theme;
@ -48,8 +44,6 @@ public class MarkwonConfiguration {
this.urlProcessor = builder.urlProcessor;
this.imageSizeResolver = builder.imageSizeResolver;
this.factory = builder.factory;
this.htmlParser = builder.htmlParser;
this.htmlRenderer = builder.htmlRenderer;
}
/**
@ -95,22 +89,6 @@ public class MarkwonConfiguration {
return factory;
}
/**
* @since 2.0.0
*/
@NonNull
public MarkwonHtmlParser htmlParser() {
return htmlParser;
}
/**
* @since 2.0.0
*/
@NonNull
public MarkwonHtmlRenderer htmlRenderer() {
return htmlRenderer;
}
@SuppressWarnings("unused")
public static class Builder {
@ -123,8 +101,6 @@ public class MarkwonConfiguration {
private UrlProcessor urlProcessor;
private ImageSizeResolver imageSizeResolver;
private SpannableFactory factory; // @since 1.1.0
private MarkwonHtmlParser htmlParser; // @since 2.0.0
private MarkwonHtmlRenderer htmlRenderer; // @since 2.0.0
Builder(@NonNull Context context) {
this.context = context;
@ -139,8 +115,6 @@ public class MarkwonConfiguration {
this.urlProcessor = configuration.urlProcessor;
this.imageSizeResolver = configuration.imageSizeResolver;
this.factory = configuration.factory;
this.htmlParser = configuration.htmlParser;
this.htmlRenderer = configuration.htmlRenderer;
}
@NonNull
@ -179,24 +153,6 @@ public class MarkwonConfiguration {
return this;
}
/**
* @since 2.0.0
*/
@NonNull
public Builder htmlParser(@NonNull MarkwonHtmlParser htmlParser) {
this.htmlParser = htmlParser;
return this;
}
/**
* @since 2.0.0
*/
@NonNull
public Builder htmlRenderer(@NonNull MarkwonHtmlRenderer htmlRenderer) {
this.htmlRenderer = htmlRenderer;
return this;
}
@NonNull
public MarkwonConfiguration build(@NonNull MarkwonTheme theme, @NonNull AsyncDrawableLoader asyncDrawableLoader) {
@ -224,16 +180,6 @@ public class MarkwonConfiguration {
factory = SpannableFactoryDef.create();
}
// @since 2.0.0
if (htmlParser == null) {
htmlParser = MarkwonHtmlParser.noOp();
}
// @since 2.0.0
if (htmlRenderer == null) {
htmlRenderer = MarkwonHtmlRenderer.noOp();
}
return new MarkwonConfiguration(this);
}
}

16
markwon/src/main/java/ru/noties/markwon/image/AsyncDrawableLoader.java
View File

@ -12,6 +12,22 @@ import java.util.concurrent.Executors;
public abstract class AsyncDrawableLoader {
/**
* @since 3.0.0
*/
@NonNull
public static Builder builder() {
return new Builder();
}
/**
* @since 3.0.0
*/
@NonNull
public static AsyncDrawableLoader noOp() {
return new AsyncDrawableLoaderNoOp();
}
public abstract void load(@NonNull String destination, @NonNull AsyncDrawable drawable);

2
markwon/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderNoOp.java
View File

@ -2,7 +2,7 @@ package ru.noties.markwon.image;
import android.support.annotation.NonNull;
public class AsyncDrawableLoaderNoOp extends AsyncDrawableLoader {
class AsyncDrawableLoaderNoOp extends AsyncDrawableLoader {
@Override
public void load(@NonNull String destination, @NonNull AsyncDrawable drawable) {