Package name and maven group-id change io.noties.markwon

This commit is contained in:
Dimitry Ivanov 2019-06-05 00:20:36 +03:00
parent 79b99abb24
commit 13536302cc
279 changed files with 913 additions and 927 deletions

View File

@ -28,11 +28,11 @@ features listed in [commonmark-spec] are supported
## Installation
![stable](https://img.shields.io/maven-central/v/ru.noties.markwon/core.svg?label=stable)
![snapshot](https://img.shields.io/nexus/s/https/oss.sonatype.org/ru.noties.markwon/core.svg?label=snapshot)
![stable](https://img.shields.io/maven-central/v/io.noties.markwon/core.svg?label=stable)
![snapshot](https://img.shields.io/nexus/s/https/oss.sonatype.org/io.noties.markwon/core.svg?label=snapshot)
```groovy
implementation "ru.noties.markwon:core:${markwonVersion}"
implementation "io.noties.markwon:core:${markwonVersion}"
```
Full list of available artifacts is present in the [install section](https://noties.github.io/Markwon/docs/v3/install.html)
@ -217,7 +217,6 @@ public static Parser createParser() {
android:layout_margin="16dip"
android:lineSpacingExtra="2dip"
android:textSize="16sp"
tools:context="ru.noties.markwon.MainActivity"
tools:text="yo\nman" />
</ScrollView>
@ -296,7 +295,7 @@ Underscores (`_`)
## License
```
Copyright 2017 Dimitry Ivanov (mail@dimitryivanov.ru)
Copyright 2019 Dimitry Ivanov (legal@noties.io)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

View File

@ -6,7 +6,7 @@ android {
buildToolsVersion config['build-tools']
defaultConfig {
applicationId "ru.noties.markwon"
applicationId "io.noties.markwon"
minSdkVersion config['min-sdk']
targetSdkVersion config['target-sdk']
versionCode 1

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.debug;
package io.noties.markwon.debug;
import android.content.Context;
import android.content.res.TypedArray;
@ -8,8 +8,8 @@ import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import ru.noties.markwon.R;
import ru.noties.markwon.ext.tasklist.TaskListDrawable;
import io.noties.markwon.app.R;
import io.noties.markwon.ext.tasklist.TaskListDrawable;
public class DebugCheckboxDrawableView extends View {

View File

@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<ru.noties.markwon.debug.DebugCheckboxDrawableView
<io.noties.markwon.debug.DebugCheckboxDrawableView
android:layout_width="128dip"
android:layout_height="128dip"
android:layout_gravity="center"

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="ru.noties.markwon">
package="io.noties.markwon.app">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_ALL_DOWNLOADS" />

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon.app;
import javax.inject.Scope;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon.app;
import android.app.Application;
import android.content.Context;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon.app;
import android.support.annotation.NonNull;
import android.text.TextUtils;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon.app;
import javax.inject.Singleton;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon.app;
import android.content.Context;
import android.content.res.Resources;
@ -12,10 +12,10 @@ import javax.inject.Singleton;
import dagger.Module;
import dagger.Provides;
import io.noties.markwon.syntax.Prism4jThemeDarkula;
import io.noties.markwon.syntax.Prism4jThemeDefault;
import okhttp3.Cache;
import okhttp3.OkHttpClient;
import ru.noties.markwon.syntax.Prism4jThemeDarkula;
import ru.noties.markwon.syntax.Prism4jThemeDefault;
import ru.noties.prism4j.Prism4j;
import ru.noties.prism4j.annotations.PrismBundle;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon.app;
import android.app.Activity;
import android.content.Intent;
@ -12,6 +12,7 @@ import android.widget.TextView;
import javax.inject.Inject;
import io.noties.markwon.Markwon;
import ru.noties.debug.Debug;
public class MainActivity extends Activity {

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon.app;
import dagger.Subcomponent;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon.app;
import android.content.ContentResolver;
import android.content.Context;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon.app;
import android.content.Context;
import android.net.Uri;
@ -13,24 +13,27 @@ import java.util.concurrent.Future;
import javax.inject.Inject;
import io.noties.markwon.AbstractMarkwonPlugin;
import io.noties.markwon.Markwon;
import io.noties.markwon.MarkwonConfiguration;
import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
import io.noties.markwon.ext.tables.TablePlugin;
import io.noties.markwon.ext.tasklist.TaskListPlugin;
import io.noties.markwon.app.gif.GifAwarePlugin;
import io.noties.markwon.html.HtmlPlugin;
import io.noties.markwon.image.ImagesPlugin;
import io.noties.markwon.image.data.DataUriSchemeHandler;
import io.noties.markwon.image.file.FileSchemeHandler;
import io.noties.markwon.image.gif.GifMediaDecoder;
import io.noties.markwon.image.network.OkHttpNetworkSchemeHandler;
import io.noties.markwon.image.svg.SvgMediaDecoder;
import io.noties.markwon.syntax.Prism4jTheme;
import io.noties.markwon.syntax.Prism4jThemeDarkula;
import io.noties.markwon.syntax.Prism4jThemeDefault;
import io.noties.markwon.syntax.SyntaxHighlightPlugin;
import io.noties.markwon.urlprocessor.UrlProcessor;
import io.noties.markwon.urlprocessor.UrlProcessorRelativeToAbsolute;
import ru.noties.debug.Debug;
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.HtmlPlugin;
import ru.noties.markwon.image.ImagesPlugin;
import ru.noties.markwon.image.data.DataUriSchemeHandler;
import ru.noties.markwon.image.file.FileSchemeHandler;
import ru.noties.markwon.image.gif.GifMediaDecoder;
import ru.noties.markwon.image.network.OkHttpNetworkSchemeHandler;
import ru.noties.markwon.image.svg.SvgMediaDecoder;
import ru.noties.markwon.syntax.Prism4jTheme;
import ru.noties.markwon.syntax.Prism4jThemeDarkula;
import ru.noties.markwon.syntax.Prism4jThemeDefault;
import ru.noties.markwon.syntax.SyntaxHighlightPlugin;
import ru.noties.markwon.urlprocessor.UrlProcessor;
import ru.noties.markwon.urlprocessor.UrlProcessorRelativeToAbsolute;
import ru.noties.prism4j.Prism4j;
@ActivityScope

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon.app;
import android.content.Context;
import android.content.SharedPreferences;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon.app;
import android.net.Uri;
import android.support.annotation.NonNull;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon.app;
import android.net.Uri;
import android.support.annotation.NonNull;

View File

@ -1,11 +1,11 @@
package ru.noties.markwon;
package io.noties.markwon.app;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import ru.noties.markwon.urlprocessor.UrlProcessor;
import ru.noties.markwon.urlprocessor.UrlProcessorRelativeToAbsolute;
import io.noties.markwon.urlprocessor.UrlProcessor;
import io.noties.markwon.urlprocessor.UrlProcessorRelativeToAbsolute;
class UrlProcessorInitialReadme implements UrlProcessor {

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon.app;
import android.support.annotation.IntDef;
import android.support.annotation.NonNull;

View File

@ -1,15 +1,15 @@
package ru.noties.markwon.gif;
package io.noties.markwon.app.gif;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import io.noties.markwon.image.AsyncDrawable;
import io.noties.markwon.image.AsyncDrawableLoader;
import io.noties.markwon.image.ImageSize;
import io.noties.markwon.image.ImageSizeResolver;
import pl.droidsonroids.gif.GifDrawable;
import ru.noties.markwon.image.AsyncDrawableLoader;
import ru.noties.markwon.image.ImageSize;
import ru.noties.markwon.image.ImageSizeResolver;
import ru.noties.markwon.image.AsyncDrawable;
public class GifAwareAsyncDrawable extends AsyncDrawable {

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.gif;
package io.noties.markwon.app.gif;
import android.content.Context;
import android.support.annotation.NonNull;
@ -6,14 +6,14 @@ import android.widget.TextView;
import org.commonmark.node.Image;
import ru.noties.markwon.AbstractMarkwonPlugin;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.MarkwonSpansFactory;
import ru.noties.markwon.R;
import ru.noties.markwon.RenderProps;
import ru.noties.markwon.SpanFactory;
import ru.noties.markwon.image.AsyncDrawableSpan;
import ru.noties.markwon.image.ImageProps;
import io.noties.markwon.AbstractMarkwonPlugin;
import io.noties.markwon.MarkwonConfiguration;
import io.noties.markwon.MarkwonSpansFactory;
import io.noties.markwon.RenderProps;
import io.noties.markwon.SpanFactory;
import io.noties.markwon.app.R;
import io.noties.markwon.image.AsyncDrawableSpan;
import io.noties.markwon.image.ImageProps;
public class GifAwarePlugin extends AbstractMarkwonPlugin {

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.gif;
package io.noties.markwon.app.gif;
import android.graphics.Canvas;
import android.graphics.ColorFilter;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.gif;
package io.noties.markwon.app.gif;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -8,8 +8,8 @@ import android.text.style.ClickableSpan;
import android.view.View;
import android.widget.TextView;
import io.noties.markwon.image.AsyncDrawableSpan;
import pl.droidsonroids.gif.GifDrawable;
import ru.noties.markwon.image.AsyncDrawableSpan;
public abstract class GifProcessor {

View File

@ -20,7 +20,6 @@
android:layout_height="wrap_content"
android:lineSpacingExtra="2dip"
android:textSize="16sp"
tools:context="ru.noties.markwon.MainActivity"
tools:text="yo\nman" />
</ScrollView>

View File

@ -8,7 +8,7 @@ android.buildCacheDir=build/pre-dex-cache
VERSION_NAME=4.0.0-SNAPSHOT
GROUP=ru.noties.markwon
GROUP=io.noties.markwon
POM_DESCRIPTION=Markwon markdown for Android
POM_URL=https://github.com/noties/Markwon
POM_SCM_URL=https://github.com/noties/Markwon

View File

@ -1 +1 @@
<manifest package="ru.noties.markwon.renderer" />
<manifest package="io.noties.markwon" />

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon;
import android.support.annotation.NonNull;
import android.text.Spanned;
@ -7,8 +7,7 @@ import android.widget.TextView;
import org.commonmark.node.Node;
import org.commonmark.parser.Parser;
import ru.noties.markwon.core.MarkwonTheme;
import ru.noties.markwon.html.MarkwonHtmlRenderer;
import io.noties.markwon.core.MarkwonTheme;
/**
* Class that extends {@link MarkwonPlugin} with all methods implemented (empty body)

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon;
import android.content.ActivityNotFoundException;
import android.content.Context;
@ -9,7 +9,7 @@ import android.support.annotation.NonNull;
import android.util.Log;
import android.view.View;
import ru.noties.markwon.core.spans.LinkSpan;
import io.noties.markwon.core.spans.LinkSpan;
public class LinkResolverDef implements LinkSpan.Resolver {
@Override

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon;
import android.content.Context;
import android.support.annotation.NonNull;
@ -8,7 +8,7 @@ import android.widget.TextView;
import org.commonmark.node.Node;
import ru.noties.markwon.core.CorePlugin;
import io.noties.markwon.core.CorePlugin;
/**
* Class to parse and render markdown. Since version 3.0.0 instance specific (previously consisted

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon;
import android.content.Context;
import android.support.annotation.NonNull;
@ -15,7 +15,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import ru.noties.markwon.core.MarkwonTheme;
import io.noties.markwon.core.MarkwonTheme;
/**
* @since 3.0.0

View File

@ -1,18 +1,18 @@
package ru.noties.markwon;
package io.noties.markwon;
import android.support.annotation.NonNull;
import ru.noties.markwon.core.MarkwonTheme;
import ru.noties.markwon.core.spans.LinkSpan;
import ru.noties.markwon.html.MarkwonHtmlParser;
import ru.noties.markwon.html.MarkwonHtmlRenderer;
import ru.noties.markwon.image.AsyncDrawableLoader;
import ru.noties.markwon.image.ImageSizeResolver;
import ru.noties.markwon.image.ImageSizeResolverDef;
import ru.noties.markwon.syntax.SyntaxHighlight;
import ru.noties.markwon.syntax.SyntaxHighlightNoOp;
import ru.noties.markwon.urlprocessor.UrlProcessor;
import ru.noties.markwon.urlprocessor.UrlProcessorNoOp;
import io.noties.markwon.core.MarkwonTheme;
import io.noties.markwon.core.spans.LinkSpan;
import io.noties.markwon.html.MarkwonHtmlParser;
import io.noties.markwon.html.MarkwonHtmlRenderer;
import io.noties.markwon.image.AsyncDrawableLoader;
import io.noties.markwon.image.ImageSizeResolver;
import io.noties.markwon.image.ImageSizeResolverDef;
import io.noties.markwon.syntax.SyntaxHighlight;
import io.noties.markwon.syntax.SyntaxHighlightNoOp;
import io.noties.markwon.urlprocessor.UrlProcessor;
import io.noties.markwon.urlprocessor.UrlProcessorNoOp;
/**
* since 3.0.0 renamed `SpannableConfiguration` -&gt; `MarkwonConfiguration`

View File

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

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon;
import android.content.Context;
import android.support.annotation.IdRes;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon;
import android.support.annotation.NonNull;
import android.text.Spanned;
@ -7,16 +7,18 @@ import android.widget.TextView;
import org.commonmark.node.Node;
import org.commonmark.parser.Parser;
import ru.noties.markwon.core.MarkwonTheme;
import ru.noties.markwon.html.MarkwonHtmlRenderer;
import io.noties.markwon.core.CorePlugin;
import io.noties.markwon.core.MarkwonTheme;
import io.noties.markwon.image.AsyncDrawableSpan;
import io.noties.markwon.movement.MovementMethodPlugin;
/**
* Class represents a plugin (extension) to Markwon to configure how parsing and rendering
* of markdown is carried on.
*
* @see AbstractMarkwonPlugin
* @see ru.noties.markwon.core.CorePlugin
* @see ru.noties.markwon.movement.MovementMethodPlugin
* @see CorePlugin
* @see MovementMethodPlugin
* @since 3.0.0
*/
public interface MarkwonPlugin {
@ -89,7 +91,7 @@ public interface MarkwonPlugin {
void configureSpansFactory(@NonNull MarkwonSpansFactory.Builder builder);
// /**
// * Configure {@link MarkwonHtmlRenderer} to add or remove HTML {@link ru.noties.markwon.html.TagHandler}s
// * Configure {@link MarkwonHtmlRenderer} to add or remove HTML {@link TagHandler}s
// *
// * @see MarkwonHtmlRenderer
// * @see MarkwonHtmlRenderer.Builder
@ -129,8 +131,8 @@ public interface MarkwonPlugin {
* This method will be called <strong>before</strong> calling <code>TextView#setText</code>.
* <p>
* It can be useful to prepare a TextView for markdown. For example {@code ru.noties.markwon.image.ImagesPlugin}
* uses this method to unregister previously registered {@link ru.noties.markwon.image.AsyncDrawableSpan}
* (if there are such spans in this TextView at this point). Or {@link ru.noties.markwon.core.CorePlugin}
* uses this method to unregister previously registered {@link AsyncDrawableSpan}
* (if there are such spans in this TextView at this point). Or {@link CorePlugin}
* which measures ordered list numbers
*
* @param textView TextView to which <code>markdown</code> will be applied
@ -142,7 +144,7 @@ public interface MarkwonPlugin {
* This method will be called <strong>after</strong> markdown was applied.
* <p>
* It can be useful to trigger certain action on spans/textView. For example {@code ru.noties.markwon.image.ImagesPlugin}
* uses this method to register {@link ru.noties.markwon.image.AsyncDrawableSpan} and start
* uses this method to register {@link AsyncDrawableSpan} and start
* asynchronously loading images.
* <p>
* Unlike {@link #beforeSetText(TextView, Spanned)} this method does not receive parsed markdown

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.core;
package io.noties.markwon.core;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -30,23 +30,24 @@ import org.commonmark.node.ThematicBreak;
import java.util.ArrayList;
import java.util.List;
import ru.noties.markwon.AbstractMarkwonPlugin;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.MarkwonSpansFactory;
import ru.noties.markwon.MarkwonVisitor;
import ru.noties.markwon.RenderProps;
import ru.noties.markwon.SpanFactory;
import ru.noties.markwon.core.factory.BlockQuoteSpanFactory;
import ru.noties.markwon.core.factory.CodeBlockSpanFactory;
import ru.noties.markwon.core.factory.CodeSpanFactory;
import ru.noties.markwon.core.factory.EmphasisSpanFactory;
import ru.noties.markwon.core.factory.HeadingSpanFactory;
import ru.noties.markwon.core.factory.LinkSpanFactory;
import ru.noties.markwon.core.factory.ListItemSpanFactory;
import ru.noties.markwon.core.factory.StrongEmphasisSpanFactory;
import ru.noties.markwon.core.factory.ThematicBreakSpanFactory;
import ru.noties.markwon.core.spans.OrderedListItemSpan;
import ru.noties.markwon.image.ImageProps;
import io.noties.markwon.SpannableBuilder;
import io.noties.markwon.core.spans.OrderedListItemSpan;
import io.noties.markwon.image.ImageProps;
import io.noties.markwon.AbstractMarkwonPlugin;
import io.noties.markwon.MarkwonConfiguration;
import io.noties.markwon.MarkwonSpansFactory;
import io.noties.markwon.MarkwonVisitor;
import io.noties.markwon.RenderProps;
import io.noties.markwon.SpanFactory;
import io.noties.markwon.core.factory.BlockQuoteSpanFactory;
import io.noties.markwon.core.factory.CodeBlockSpanFactory;
import io.noties.markwon.core.factory.CodeSpanFactory;
import io.noties.markwon.core.factory.EmphasisSpanFactory;
import io.noties.markwon.core.factory.HeadingSpanFactory;
import io.noties.markwon.core.factory.LinkSpanFactory;
import io.noties.markwon.core.factory.ListItemSpanFactory;
import io.noties.markwon.core.factory.StrongEmphasisSpanFactory;
import io.noties.markwon.core.factory.ThematicBreakSpanFactory;
/**
* @see CoreProps
@ -61,7 +62,7 @@ public class CorePlugin extends AbstractMarkwonPlugin {
public interface OnTextAddedListener {
/**
* Will be called when new text is added to resulting {@link ru.noties.markwon.SpannableBuilder}.
* Will be called when new text is added to resulting {@link SpannableBuilder}.
* Please note that only text represented by {@link Text} node will trigger this callback
* (text inside code and code-blocks won\'t trigger it).
* <p>

View File

@ -1,6 +1,6 @@
package ru.noties.markwon.core;
package io.noties.markwon.core;
import ru.noties.markwon.Prop;
import io.noties.markwon.Prop;
/**
* @since 3.0.0

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.core;
package io.noties.markwon.core;
import android.content.Context;
import android.graphics.Paint;
@ -13,8 +13,9 @@ import android.text.TextPaint;
import java.util.Arrays;
import java.util.Locale;
import ru.noties.markwon.utils.ColorUtils;
import ru.noties.markwon.utils.Dip;
import io.noties.markwon.MarkwonPlugin;
import io.noties.markwon.utils.ColorUtils;
import io.noties.markwon.utils.Dip;
/**
* Class to hold <i>theming</i> information for rending of markdown.
@ -23,14 +24,14 @@ import ru.noties.markwon.utils.Dip;
* information holds data for core features only. But based on this other components can still use it
* to display markdown consistently.
* <p>
* Since version 3.0.0 this class should not be instantiated manually. Instead a {@link ru.noties.markwon.MarkwonPlugin}
* should be used: {@link ru.noties.markwon.MarkwonPlugin#configureTheme(Builder)}
* Since version 3.0.0 this class should not be instantiated manually. Instead a {@link MarkwonPlugin}
* should be used: {@link MarkwonPlugin#configureTheme(Builder)}
* <p>
* Since version 3.0.0 properties related to <em>strike-through</em>, <em>tables</em> and <em>HTML</em>
* are moved to specific plugins in independent artifacts
*
* @see CorePlugin
* @see ru.noties.markwon.MarkwonPlugin#configureTheme(Builder)
* @see MarkwonPlugin#configureTheme(Builder)
*/
@SuppressWarnings("WeakerAccess")
public class MarkwonTheme {
@ -52,7 +53,7 @@ public class MarkwonTheme {
* Create an <strong>empty</strong> instance of {@link Builder} with no default values applied
* <p>
* Since version 3.0.0 manual construction of {@link MarkwonTheme} is not required, instead a
* {@link ru.noties.markwon.MarkwonPlugin#configureTheme(Builder)} should be used in order
* {@link MarkwonPlugin#configureTheme(Builder)} should be used in order
* to change certain theme properties
*
* @since 3.0.0

View File

@ -1,13 +1,13 @@
package ru.noties.markwon.core;
package io.noties.markwon.core;
import android.support.annotation.NonNull;
import org.commonmark.node.Node;
import ru.noties.markwon.MarkwonVisitor;
import io.noties.markwon.MarkwonVisitor;
/**
* A {@link ru.noties.markwon.MarkwonVisitor.NodeVisitor} that ensures that a markdown
* A {@link MarkwonVisitor.NodeVisitor} that ensures that a markdown
* block starts with a new line, all children are visited and if further content available
* ensures a new line after self. Does not render any spans
*

View File

@ -1,12 +1,12 @@
package ru.noties.markwon.core.factory;
package io.noties.markwon.core.factory;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.RenderProps;
import ru.noties.markwon.SpanFactory;
import ru.noties.markwon.core.spans.BlockQuoteSpan;
import io.noties.markwon.core.spans.BlockQuoteSpan;
import io.noties.markwon.MarkwonConfiguration;
import io.noties.markwon.RenderProps;
import io.noties.markwon.SpanFactory;
public class BlockQuoteSpanFactory implements SpanFactory {
@Nullable

View File

@ -1,12 +1,12 @@
package ru.noties.markwon.core.factory;
package io.noties.markwon.core.factory;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.RenderProps;
import ru.noties.markwon.SpanFactory;
import ru.noties.markwon.core.spans.CodeBlockSpan;
import io.noties.markwon.core.spans.CodeBlockSpan;
import io.noties.markwon.MarkwonConfiguration;
import io.noties.markwon.RenderProps;
import io.noties.markwon.SpanFactory;
public class CodeBlockSpanFactory implements SpanFactory {
@Nullable

View File

@ -1,12 +1,12 @@
package ru.noties.markwon.core.factory;
package io.noties.markwon.core.factory;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.RenderProps;
import ru.noties.markwon.SpanFactory;
import ru.noties.markwon.core.spans.CodeSpan;
import io.noties.markwon.core.spans.CodeSpan;
import io.noties.markwon.MarkwonConfiguration;
import io.noties.markwon.RenderProps;
import io.noties.markwon.SpanFactory;
public class CodeSpanFactory implements SpanFactory {
@Nullable

View File

@ -1,12 +1,12 @@
package ru.noties.markwon.core.factory;
package io.noties.markwon.core.factory;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.RenderProps;
import ru.noties.markwon.SpanFactory;
import ru.noties.markwon.core.spans.EmphasisSpan;
import io.noties.markwon.core.spans.EmphasisSpan;
import io.noties.markwon.MarkwonConfiguration;
import io.noties.markwon.RenderProps;
import io.noties.markwon.SpanFactory;
public class EmphasisSpanFactory implements SpanFactory {
@Nullable

View File

@ -1,13 +1,13 @@
package ru.noties.markwon.core.factory;
package io.noties.markwon.core.factory;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.RenderProps;
import ru.noties.markwon.SpanFactory;
import ru.noties.markwon.core.CoreProps;
import ru.noties.markwon.core.spans.HeadingSpan;
import io.noties.markwon.core.CoreProps;
import io.noties.markwon.core.spans.HeadingSpan;
import io.noties.markwon.MarkwonConfiguration;
import io.noties.markwon.RenderProps;
import io.noties.markwon.SpanFactory;
public class HeadingSpanFactory implements SpanFactory {
@Nullable

View File

@ -1,13 +1,13 @@
package ru.noties.markwon.core.factory;
package io.noties.markwon.core.factory;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.RenderProps;
import ru.noties.markwon.SpanFactory;
import ru.noties.markwon.core.CoreProps;
import ru.noties.markwon.core.spans.LinkSpan;
import io.noties.markwon.core.CoreProps;
import io.noties.markwon.core.spans.LinkSpan;
import io.noties.markwon.MarkwonConfiguration;
import io.noties.markwon.RenderProps;
import io.noties.markwon.SpanFactory;
public class LinkSpanFactory implements SpanFactory {
@Nullable

View File

@ -1,14 +1,14 @@
package ru.noties.markwon.core.factory;
package io.noties.markwon.core.factory;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.RenderProps;
import ru.noties.markwon.SpanFactory;
import ru.noties.markwon.core.CoreProps;
import ru.noties.markwon.core.spans.BulletListItemSpan;
import ru.noties.markwon.core.spans.OrderedListItemSpan;
import io.noties.markwon.core.CoreProps;
import io.noties.markwon.core.spans.BulletListItemSpan;
import io.noties.markwon.core.spans.OrderedListItemSpan;
import io.noties.markwon.MarkwonConfiguration;
import io.noties.markwon.RenderProps;
import io.noties.markwon.SpanFactory;
public class ListItemSpanFactory implements SpanFactory {

View File

@ -1,12 +1,12 @@
package ru.noties.markwon.core.factory;
package io.noties.markwon.core.factory;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.RenderProps;
import ru.noties.markwon.SpanFactory;
import ru.noties.markwon.core.spans.StrongEmphasisSpan;
import io.noties.markwon.core.spans.StrongEmphasisSpan;
import io.noties.markwon.MarkwonConfiguration;
import io.noties.markwon.RenderProps;
import io.noties.markwon.SpanFactory;
public class StrongEmphasisSpanFactory implements SpanFactory {
@Nullable

View File

@ -1,12 +1,12 @@
package ru.noties.markwon.core.factory;
package io.noties.markwon.core.factory;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.RenderProps;
import ru.noties.markwon.SpanFactory;
import ru.noties.markwon.core.spans.ThematicBreakSpan;
import io.noties.markwon.core.spans.ThematicBreakSpan;
import io.noties.markwon.MarkwonConfiguration;
import io.noties.markwon.RenderProps;
import io.noties.markwon.SpanFactory;
public class ThematicBreakSpanFactory implements SpanFactory {
@Nullable

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.core.spans;
package io.noties.markwon.core.spans;
import android.graphics.Canvas;
import android.graphics.Paint;
@ -7,7 +7,7 @@ import android.support.annotation.NonNull;
import android.text.Layout;
import android.text.style.LeadingMarginSpan;
import ru.noties.markwon.core.MarkwonTheme;
import io.noties.markwon.core.MarkwonTheme;
public class BlockQuoteSpan implements LeadingMarginSpan {

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.core.spans;
package io.noties.markwon.core.spans;
import android.graphics.Canvas;
import android.graphics.Paint;
@ -9,8 +9,8 @@ import android.support.annotation.NonNull;
import android.text.Layout;
import android.text.style.LeadingMarginSpan;
import ru.noties.markwon.core.MarkwonTheme;
import ru.noties.markwon.utils.LeadingMarginUtils;
import io.noties.markwon.core.MarkwonTheme;
import io.noties.markwon.utils.LeadingMarginUtils;
public class BulletListItemSpan implements LeadingMarginSpan {

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.core.spans;
package io.noties.markwon.core.spans;
import android.graphics.Canvas;
import android.graphics.Paint;
@ -9,7 +9,7 @@ import android.text.TextPaint;
import android.text.style.LeadingMarginSpan;
import android.text.style.MetricAffectingSpan;
import ru.noties.markwon.core.MarkwonTheme;
import io.noties.markwon.core.MarkwonTheme;
/**
* @since 3.0.0 split inline and block spans

View File

@ -1,10 +1,10 @@
package ru.noties.markwon.core.spans;
package io.noties.markwon.core.spans;
import android.support.annotation.NonNull;
import android.text.TextPaint;
import android.text.style.MetricAffectingSpan;
import ru.noties.markwon.core.MarkwonTheme;
import io.noties.markwon.core.MarkwonTheme;
/**
* @since 3.0.0 split inline and block spans

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.core.spans;
package io.noties.markwon.core.spans;
import android.graphics.Typeface;
import android.support.annotation.NonNull;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.core.spans;
package io.noties.markwon.core.spans;
import android.text.TextPaint;
import android.text.style.MetricAffectingSpan;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.core.spans;
package io.noties.markwon.core.spans;
import android.graphics.Canvas;
import android.graphics.Paint;
@ -10,8 +10,8 @@ import android.text.TextPaint;
import android.text.style.LeadingMarginSpan;
import android.text.style.MetricAffectingSpan;
import ru.noties.markwon.core.MarkwonTheme;
import ru.noties.markwon.utils.LeadingMarginUtils;
import io.noties.markwon.core.MarkwonTheme;
import io.noties.markwon.utils.LeadingMarginUtils;
public class HeadingSpan extends MetricAffectingSpan implements LeadingMarginSpan {

View File

@ -1,11 +1,11 @@
package ru.noties.markwon.core.spans;
package io.noties.markwon.core.spans;
import android.support.annotation.NonNull;
import android.text.TextPaint;
import android.text.style.URLSpan;
import android.view.View;
import ru.noties.markwon.core.MarkwonTheme;
import io.noties.markwon.core.MarkwonTheme;
public class LinkSpan extends URLSpan {

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.core.spans;
package io.noties.markwon.core.spans;
import android.graphics.Paint;
import android.graphics.Rect;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.core.spans;
package io.noties.markwon.core.spans;
import android.graphics.Canvas;
import android.graphics.Paint;
@ -9,8 +9,8 @@ import android.text.TextPaint;
import android.text.style.LeadingMarginSpan;
import android.widget.TextView;
import ru.noties.markwon.core.MarkwonTheme;
import ru.noties.markwon.utils.LeadingMarginUtils;
import io.noties.markwon.core.MarkwonTheme;
import io.noties.markwon.utils.LeadingMarginUtils;
public class OrderedListItemSpan implements LeadingMarginSpan {

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.core.spans;
package io.noties.markwon.core.spans;
import android.text.TextPaint;
import android.text.style.MetricAffectingSpan;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.core.spans;
package io.noties.markwon.core.spans;
import android.graphics.Canvas;
import android.graphics.Paint;
@ -7,7 +7,7 @@ import android.support.annotation.NonNull;
import android.text.Layout;
import android.text.style.LeadingMarginSpan;
import ru.noties.markwon.core.MarkwonTheme;
import io.noties.markwon.core.MarkwonTheme;
public class ThematicBreakSpan implements LeadingMarginSpan {

View File

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

View File

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

View File

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

View File

@ -1,9 +1,9 @@
package ru.noties.markwon.html;
package io.noties.markwon.html;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import ru.noties.markwon.MarkwonVisitor;
import io.noties.markwon.MarkwonVisitor;
/**
* @since 2.0.0

View File

@ -1,9 +1,9 @@
package ru.noties.markwon.html;
package io.noties.markwon.html;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import ru.noties.markwon.MarkwonVisitor;
import io.noties.markwon.MarkwonVisitor;
class MarkwonHtmlRendererNoOp extends MarkwonHtmlRenderer {

View File

@ -1,10 +1,10 @@
package ru.noties.markwon.html;
package io.noties.markwon.html;
import android.support.annotation.NonNull;
import java.util.Collection;
import ru.noties.markwon.MarkwonVisitor;
import io.noties.markwon.MarkwonVisitor;
public abstract class TagHandler {

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.image;
package io.noties.markwon.image;
import android.graphics.Canvas;
import android.graphics.ColorFilter;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.image;
package io.noties.markwon.image;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.image;
package io.noties.markwon.image;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.image;
package io.noties.markwon.image;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
@ -10,7 +10,7 @@ import android.text.Spanned;
import android.view.View;
import android.widget.TextView;
import ru.noties.markwon.renderer.R;
import io.noties.markwon.R;
public abstract class AsyncDrawableScheduler {

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.image;
package io.noties.markwon.image;
import android.graphics.Canvas;
import android.graphics.Paint;
@ -12,7 +12,7 @@ import android.text.style.ReplacementSpan;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import ru.noties.markwon.core.MarkwonTheme;
import io.noties.markwon.core.MarkwonTheme;
@SuppressWarnings("WeakerAccess")
public class AsyncDrawableSpan extends ReplacementSpan {

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.image;
package io.noties.markwon.image;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;

View File

@ -1,6 +1,6 @@
package ru.noties.markwon.image;
package io.noties.markwon.image;
import ru.noties.markwon.Prop;
import io.noties.markwon.Prop;
/**
* @since 3.0.0

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.image;
package io.noties.markwon.image;
import android.support.annotation.Nullable;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.image;
package io.noties.markwon.image;
import android.graphics.Rect;
import android.support.annotation.NonNull;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.image;
package io.noties.markwon.image;
import android.graphics.Rect;
import android.support.annotation.NonNull;

View File

@ -1,11 +1,11 @@
package ru.noties.markwon.image;
package io.noties.markwon.image;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import ru.noties.markwon.MarkwonConfiguration;
import ru.noties.markwon.RenderProps;
import ru.noties.markwon.SpanFactory;
import io.noties.markwon.MarkwonConfiguration;
import io.noties.markwon.RenderProps;
import io.noties.markwon.SpanFactory;
public class ImageSpanFactory implements SpanFactory {
@Nullable

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.movement;
package io.noties.markwon.movement;
import android.support.annotation.NonNull;
import android.text.Spanned;
@ -6,7 +6,7 @@ import android.text.method.LinkMovementMethod;
import android.text.method.MovementMethod;
import android.widget.TextView;
import ru.noties.markwon.AbstractMarkwonPlugin;
import io.noties.markwon.AbstractMarkwonPlugin;
/**
* @since 3.0.0

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.urlprocessor;
package io.noties.markwon.urlprocessor;
import android.net.Uri;
import android.support.annotation.NonNull;

View File

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

View File

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

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.utils;
package io.noties.markwon.utils;
public abstract class ColorUtils {

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.utils;
package io.noties.markwon.utils;
import android.content.Context;
import android.support.annotation.NonNull;

View File

@ -1,10 +1,10 @@
package ru.noties.markwon.utils;
package io.noties.markwon.utils;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
/**
* @deprecated Please use {@link ru.noties.markwon.image.DrawableUtils}
* @deprecated Please use {@link io.noties.markwon.image.DrawableUtils}
*/
@Deprecated
public abstract class DrawableUtils {

View File

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

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.utils;
package io.noties.markwon.utils;
import android.text.Spanned;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon.utils;
package io.noties.markwon.utils;
import android.support.annotation.NonNull;
import android.text.Spannable;

View File

@ -1,4 +1,4 @@
package ru.noties.markwon;
package io.noties.markwon;
import org.junit.Test;
import org.junit.runner.RunWith;

Some files were not shown because too many files have changed in this diff Show More