diff --git a/README.md b/README.md index dd379ae3..34db2572 100644 --- a/README.md +++ b/README.md @@ -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" /> @@ -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. diff --git a/app/build.gradle b/app/build.gradle index ffa43c25..c17e0fa6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 diff --git a/app/src/debug/java/ru/noties/markwon/debug/DebugCheckboxDrawableView.java b/app/src/debug/java/io/noties/markwon/debug/DebugCheckboxDrawableView.java similarity index 94% rename from app/src/debug/java/ru/noties/markwon/debug/DebugCheckboxDrawableView.java rename to app/src/debug/java/io/noties/markwon/debug/DebugCheckboxDrawableView.java index 4c9027cc..759ab4dc 100644 --- a/app/src/debug/java/ru/noties/markwon/debug/DebugCheckboxDrawableView.java +++ b/app/src/debug/java/io/noties/markwon/debug/DebugCheckboxDrawableView.java @@ -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 { diff --git a/app/src/debug/res/layout/debug_checkbox.xml b/app/src/debug/res/layout/debug_checkbox.xml index bf56ec39..3e5d19eb 100644 --- a/app/src/debug/res/layout/debug_checkbox.xml +++ b/app/src/debug/res/layout/debug_checkbox.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + package="io.noties.markwon.app"> diff --git a/app/src/main/java/ru/noties/markwon/ActivityScope.java b/app/src/main/java/io/noties/markwon/app/ActivityScope.java similarity index 67% rename from app/src/main/java/ru/noties/markwon/ActivityScope.java rename to app/src/main/java/io/noties/markwon/app/ActivityScope.java index de2920a7..38f20d61 100644 --- a/app/src/main/java/ru/noties/markwon/ActivityScope.java +++ b/app/src/main/java/io/noties/markwon/app/ActivityScope.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon.app; import javax.inject.Scope; diff --git a/app/src/main/java/ru/noties/markwon/App.java b/app/src/main/java/io/noties/markwon/app/App.java similarity index 95% rename from app/src/main/java/ru/noties/markwon/App.java rename to app/src/main/java/io/noties/markwon/app/App.java index 5c9b3157..ce64314a 100644 --- a/app/src/main/java/ru/noties/markwon/App.java +++ b/app/src/main/java/io/noties/markwon/app/App.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon.app; import android.app.Application; import android.content.Context; diff --git a/app/src/main/java/ru/noties/markwon/AppBarItem.java b/app/src/main/java/io/noties/markwon/app/AppBarItem.java similarity index 97% rename from app/src/main/java/ru/noties/markwon/AppBarItem.java rename to app/src/main/java/io/noties/markwon/app/AppBarItem.java index bf83e658..ce6094c3 100644 --- a/app/src/main/java/ru/noties/markwon/AppBarItem.java +++ b/app/src/main/java/io/noties/markwon/app/AppBarItem.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon.app; import android.support.annotation.NonNull; import android.text.TextUtils; diff --git a/app/src/main/java/ru/noties/markwon/AppComponent.java b/app/src/main/java/io/noties/markwon/app/AppComponent.java similarity index 86% rename from app/src/main/java/ru/noties/markwon/AppComponent.java rename to app/src/main/java/io/noties/markwon/app/AppComponent.java index 1ff78c29..6f657b1c 100644 --- a/app/src/main/java/ru/noties/markwon/AppComponent.java +++ b/app/src/main/java/io/noties/markwon/app/AppComponent.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon.app; import javax.inject.Singleton; diff --git a/app/src/main/java/ru/noties/markwon/AppModule.java b/app/src/main/java/io/noties/markwon/app/AppModule.java similarity index 93% rename from app/src/main/java/ru/noties/markwon/AppModule.java rename to app/src/main/java/io/noties/markwon/app/AppModule.java index 32d3e931..4e4acc5a 100644 --- a/app/src/main/java/ru/noties/markwon/AppModule.java +++ b/app/src/main/java/io/noties/markwon/app/AppModule.java @@ -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; diff --git a/app/src/main/java/ru/noties/markwon/MainActivity.java b/app/src/main/java/io/noties/markwon/app/MainActivity.java similarity index 98% rename from app/src/main/java/ru/noties/markwon/MainActivity.java rename to app/src/main/java/io/noties/markwon/app/MainActivity.java index fd3965b6..85594e59 100644 --- a/app/src/main/java/ru/noties/markwon/MainActivity.java +++ b/app/src/main/java/io/noties/markwon/app/MainActivity.java @@ -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 { diff --git a/app/src/main/java/ru/noties/markwon/MainActivitySubcomponent.java b/app/src/main/java/io/noties/markwon/app/MainActivitySubcomponent.java similarity index 81% rename from app/src/main/java/ru/noties/markwon/MainActivitySubcomponent.java rename to app/src/main/java/io/noties/markwon/app/MainActivitySubcomponent.java index 077fcd31..24d67488 100644 --- a/app/src/main/java/ru/noties/markwon/MainActivitySubcomponent.java +++ b/app/src/main/java/io/noties/markwon/app/MainActivitySubcomponent.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon.app; import dagger.Subcomponent; diff --git a/app/src/main/java/ru/noties/markwon/MarkdownLoader.java b/app/src/main/java/io/noties/markwon/app/MarkdownLoader.java similarity index 99% rename from app/src/main/java/ru/noties/markwon/MarkdownLoader.java rename to app/src/main/java/io/noties/markwon/app/MarkdownLoader.java index 02bb902d..b08d8d25 100644 --- a/app/src/main/java/ru/noties/markwon/MarkdownLoader.java +++ b/app/src/main/java/io/noties/markwon/app/MarkdownLoader.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon.app; import android.content.ContentResolver; import android.content.Context; diff --git a/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java b/app/src/main/java/io/noties/markwon/app/MarkdownRenderer.java similarity index 81% rename from app/src/main/java/ru/noties/markwon/MarkdownRenderer.java rename to app/src/main/java/io/noties/markwon/app/MarkdownRenderer.java index a55d82dc..a924cedd 100644 --- a/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java +++ b/app/src/main/java/io/noties/markwon/app/MarkdownRenderer.java @@ -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 diff --git a/app/src/main/java/ru/noties/markwon/Themes.java b/app/src/main/java/io/noties/markwon/app/Themes.java similarity index 97% rename from app/src/main/java/ru/noties/markwon/Themes.java rename to app/src/main/java/io/noties/markwon/app/Themes.java index 85ab846c..f2dc5571 100644 --- a/app/src/main/java/ru/noties/markwon/Themes.java +++ b/app/src/main/java/io/noties/markwon/app/Themes.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon.app; import android.content.Context; import android.content.SharedPreferences; diff --git a/app/src/main/java/ru/noties/markwon/UriProcessor.java b/app/src/main/java/io/noties/markwon/app/UriProcessor.java similarity index 84% rename from app/src/main/java/ru/noties/markwon/UriProcessor.java rename to app/src/main/java/io/noties/markwon/app/UriProcessor.java index a4fb5b85..4fcc48dd 100644 --- a/app/src/main/java/ru/noties/markwon/UriProcessor.java +++ b/app/src/main/java/io/noties/markwon/app/UriProcessor.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon.app; import android.net.Uri; import android.support.annotation.NonNull; diff --git a/app/src/main/java/ru/noties/markwon/UriProcessorImpl.java b/app/src/main/java/io/noties/markwon/app/UriProcessorImpl.java similarity index 97% rename from app/src/main/java/ru/noties/markwon/UriProcessorImpl.java rename to app/src/main/java/io/noties/markwon/app/UriProcessorImpl.java index 03d29353..843a2403 100644 --- a/app/src/main/java/ru/noties/markwon/UriProcessorImpl.java +++ b/app/src/main/java/io/noties/markwon/app/UriProcessorImpl.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon.app; import android.net.Uri; import android.support.annotation.NonNull; diff --git a/app/src/main/java/ru/noties/markwon/UrlProcessorInitialReadme.java b/app/src/main/java/io/noties/markwon/app/UrlProcessorInitialReadme.java similarity index 83% rename from app/src/main/java/ru/noties/markwon/UrlProcessorInitialReadme.java rename to app/src/main/java/io/noties/markwon/app/UrlProcessorInitialReadme.java index d9690574..535a4810 100644 --- a/app/src/main/java/ru/noties/markwon/UrlProcessorInitialReadme.java +++ b/app/src/main/java/io/noties/markwon/app/UrlProcessorInitialReadme.java @@ -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 { diff --git a/app/src/main/java/ru/noties/markwon/Views.java b/app/src/main/java/io/noties/markwon/app/Views.java similarity index 95% rename from app/src/main/java/ru/noties/markwon/Views.java rename to app/src/main/java/io/noties/markwon/app/Views.java index 3c172e4b..db438375 100644 --- a/app/src/main/java/ru/noties/markwon/Views.java +++ b/app/src/main/java/io/noties/markwon/app/Views.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon.app; import android.support.annotation.IntDef; import android.support.annotation.NonNull; diff --git a/app/src/main/java/ru/noties/markwon/gif/GifAwareAsyncDrawable.java b/app/src/main/java/io/noties/markwon/app/gif/GifAwareAsyncDrawable.java similarity index 88% rename from app/src/main/java/ru/noties/markwon/gif/GifAwareAsyncDrawable.java rename to app/src/main/java/io/noties/markwon/app/gif/GifAwareAsyncDrawable.java index b5ba34ce..553bcd90 100644 --- a/app/src/main/java/ru/noties/markwon/gif/GifAwareAsyncDrawable.java +++ b/app/src/main/java/io/noties/markwon/app/gif/GifAwareAsyncDrawable.java @@ -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 { diff --git a/app/src/main/java/ru/noties/markwon/gif/GifAwarePlugin.java b/app/src/main/java/io/noties/markwon/app/gif/GifAwarePlugin.java similarity index 82% rename from app/src/main/java/ru/noties/markwon/gif/GifAwarePlugin.java rename to app/src/main/java/io/noties/markwon/app/gif/GifAwarePlugin.java index 95509525..ad5ab813 100644 --- a/app/src/main/java/ru/noties/markwon/gif/GifAwarePlugin.java +++ b/app/src/main/java/io/noties/markwon/app/gif/GifAwarePlugin.java @@ -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 { diff --git a/app/src/main/java/ru/noties/markwon/gif/GifPlaceholder.java b/app/src/main/java/io/noties/markwon/app/gif/GifPlaceholder.java similarity index 98% rename from app/src/main/java/ru/noties/markwon/gif/GifPlaceholder.java rename to app/src/main/java/io/noties/markwon/app/gif/GifPlaceholder.java index 7d6dcbe1..326d1b22 100644 --- a/app/src/main/java/ru/noties/markwon/gif/GifPlaceholder.java +++ b/app/src/main/java/io/noties/markwon/app/gif/GifPlaceholder.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.gif; +package io.noties.markwon.app.gif; import android.graphics.Canvas; import android.graphics.ColorFilter; diff --git a/app/src/main/java/ru/noties/markwon/gif/GifProcessor.java b/app/src/main/java/io/noties/markwon/app/gif/GifProcessor.java similarity index 98% rename from app/src/main/java/ru/noties/markwon/gif/GifProcessor.java rename to app/src/main/java/io/noties/markwon/app/gif/GifProcessor.java index 8cdb1da5..266c5a03 100644 --- a/app/src/main/java/ru/noties/markwon/gif/GifProcessor.java +++ b/app/src/main/java/io/noties/markwon/app/gif/GifProcessor.java @@ -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 { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0bd1c6ac..da49a67b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -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" /> diff --git a/gradle.properties b/gradle.properties index e3eb78c6..59be8bf9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/markwon-core/src/main/AndroidManifest.xml b/markwon-core/src/main/AndroidManifest.xml index c3f0b404..52c9768c 100644 --- a/markwon-core/src/main/AndroidManifest.xml +++ b/markwon-core/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/markwon-core/src/main/java/ru/noties/markwon/AbstractMarkwonPlugin.java b/markwon-core/src/main/java/io/noties/markwon/AbstractMarkwonPlugin.java similarity index 92% rename from markwon-core/src/main/java/ru/noties/markwon/AbstractMarkwonPlugin.java rename to markwon-core/src/main/java/io/noties/markwon/AbstractMarkwonPlugin.java index 4fb39da0..d7d9f744 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/AbstractMarkwonPlugin.java +++ b/markwon-core/src/main/java/io/noties/markwon/AbstractMarkwonPlugin.java @@ -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) diff --git a/markwon-core/src/main/java/ru/noties/markwon/LinkResolverDef.java b/markwon-core/src/main/java/io/noties/markwon/LinkResolverDef.java similarity index 92% rename from markwon-core/src/main/java/ru/noties/markwon/LinkResolverDef.java rename to markwon-core/src/main/java/io/noties/markwon/LinkResolverDef.java index 4f893761..da08c9fc 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/LinkResolverDef.java +++ b/markwon-core/src/main/java/io/noties/markwon/LinkResolverDef.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/Markwon.java b/markwon-core/src/main/java/io/noties/markwon/Markwon.java similarity index 98% rename from markwon-core/src/main/java/ru/noties/markwon/Markwon.java rename to markwon-core/src/main/java/io/noties/markwon/Markwon.java index 17f4af24..6f7af7bf 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/Markwon.java +++ b/markwon-core/src/main/java/io/noties/markwon/Markwon.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonBuilderImpl.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonBuilderImpl.java similarity index 98% rename from markwon-core/src/main/java/ru/noties/markwon/MarkwonBuilderImpl.java rename to markwon-core/src/main/java/io/noties/markwon/MarkwonBuilderImpl.java index 863cfe30..7166aedc 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonBuilderImpl.java +++ b/markwon-core/src/main/java/io/noties/markwon/MarkwonBuilderImpl.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonConfiguration.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonConfiguration.java similarity index 90% rename from markwon-core/src/main/java/ru/noties/markwon/MarkwonConfiguration.java rename to markwon-core/src/main/java/io/noties/markwon/MarkwonConfiguration.java index 66159da4..9b4ffb95 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonConfiguration.java +++ b/markwon-core/src/main/java/io/noties/markwon/MarkwonConfiguration.java @@ -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` -> `MarkwonConfiguration` diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonImpl.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonImpl.java similarity index 99% rename from markwon-core/src/main/java/ru/noties/markwon/MarkwonImpl.java rename to markwon-core/src/main/java/io/noties/markwon/MarkwonImpl.java index e90b7898..d76925ae 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonImpl.java +++ b/markwon-core/src/main/java/io/noties/markwon/MarkwonImpl.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonNodeRenderer.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonNodeRenderer.java similarity index 99% rename from markwon-core/src/main/java/ru/noties/markwon/MarkwonNodeRenderer.java rename to markwon-core/src/main/java/io/noties/markwon/MarkwonNodeRenderer.java index 94de3c20..7038a620 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonNodeRenderer.java +++ b/markwon-core/src/main/java/io/noties/markwon/MarkwonNodeRenderer.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.content.Context; import android.support.annotation.IdRes; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonPlugin.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonPlugin.java similarity index 91% rename from markwon-core/src/main/java/ru/noties/markwon/MarkwonPlugin.java rename to markwon-core/src/main/java/io/noties/markwon/MarkwonPlugin.java index fb7f1022..f84ab62a 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonPlugin.java +++ b/markwon-core/src/main/java/io/noties/markwon/MarkwonPlugin.java @@ -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 before calling TextView#setText. *

* 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 markdown will be applied @@ -142,7 +144,7 @@ public interface MarkwonPlugin { * This method will be called after markdown was applied. *

* 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. *

* Unlike {@link #beforeSetText(TextView, Spanned)} this method does not receive parsed markdown diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonReducer.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonReducer.java similarity index 98% rename from markwon-core/src/main/java/ru/noties/markwon/MarkwonReducer.java rename to markwon-core/src/main/java/io/noties/markwon/MarkwonReducer.java index a139e3f1..82a61963 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonReducer.java +++ b/markwon-core/src/main/java/io/noties/markwon/MarkwonReducer.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.support.annotation.NonNull; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactory.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonSpansFactory.java similarity index 98% rename from markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactory.java rename to markwon-core/src/main/java/io/noties/markwon/MarkwonSpansFactory.java index 2ef3f47f..2dd6b156 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactory.java +++ b/markwon-core/src/main/java/io/noties/markwon/MarkwonSpansFactory.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactoryImpl.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonSpansFactoryImpl.java similarity index 99% rename from markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactoryImpl.java rename to markwon-core/src/main/java/io/noties/markwon/MarkwonSpansFactoryImpl.java index 85a4ab33..66c3823d 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactoryImpl.java +++ b/markwon-core/src/main/java/io/noties/markwon/MarkwonSpansFactoryImpl.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitor.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonVisitor.java similarity index 99% rename from markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitor.java rename to markwon-core/src/main/java/io/noties/markwon/MarkwonVisitor.java index e7a83db0..b2dd95c2 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitor.java +++ b/markwon-core/src/main/java/io/noties/markwon/MarkwonVisitor.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitorImpl.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonVisitorImpl.java similarity index 99% rename from markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitorImpl.java rename to markwon-core/src/main/java/io/noties/markwon/MarkwonVisitorImpl.java index d4f0bce6..f443bcd4 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitorImpl.java +++ b/markwon-core/src/main/java/io/noties/markwon/MarkwonVisitorImpl.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/Prop.java b/markwon-core/src/main/java/io/noties/markwon/Prop.java similarity index 98% rename from markwon-core/src/main/java/ru/noties/markwon/Prop.java rename to markwon-core/src/main/java/io/noties/markwon/Prop.java index 91b4515b..552a4340 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/Prop.java +++ b/markwon-core/src/main/java/io/noties/markwon/Prop.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/RenderProps.java b/markwon-core/src/main/java/io/noties/markwon/RenderProps.java similarity index 93% rename from markwon-core/src/main/java/ru/noties/markwon/RenderProps.java rename to markwon-core/src/main/java/io/noties/markwon/RenderProps.java index e28edbaf..61442969 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/RenderProps.java +++ b/markwon-core/src/main/java/io/noties/markwon/RenderProps.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/RenderPropsImpl.java b/markwon-core/src/main/java/io/noties/markwon/RenderPropsImpl.java similarity index 97% rename from markwon-core/src/main/java/ru/noties/markwon/RenderPropsImpl.java rename to markwon-core/src/main/java/io/noties/markwon/RenderPropsImpl.java index 24557975..9b0fc241 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/RenderPropsImpl.java +++ b/markwon-core/src/main/java/io/noties/markwon/RenderPropsImpl.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/SpanFactory.java b/markwon-core/src/main/java/io/noties/markwon/SpanFactory.java similarity index 91% rename from markwon-core/src/main/java/ru/noties/markwon/SpanFactory.java rename to markwon-core/src/main/java/io/noties/markwon/SpanFactory.java index 76e251e7..6a90a533 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/SpanFactory.java +++ b/markwon-core/src/main/java/io/noties/markwon/SpanFactory.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/SpannableBuilder.java b/markwon-core/src/main/java/io/noties/markwon/SpannableBuilder.java similarity index 99% rename from markwon-core/src/main/java/ru/noties/markwon/SpannableBuilder.java rename to markwon-core/src/main/java/io/noties/markwon/SpannableBuilder.java index 3c10f779..a9f3a48d 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/SpannableBuilder.java +++ b/markwon-core/src/main/java/io/noties/markwon/SpannableBuilder.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/CorePlugin.java b/markwon-core/src/main/java/io/noties/markwon/core/CorePlugin.java similarity index 94% rename from markwon-core/src/main/java/ru/noties/markwon/core/CorePlugin.java rename to markwon-core/src/main/java/io/noties/markwon/core/CorePlugin.java index 506da2b9..2604ecdc 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/CorePlugin.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/CorePlugin.java @@ -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). *

diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/CoreProps.java b/markwon-core/src/main/java/io/noties/markwon/core/CoreProps.java similarity index 92% rename from markwon-core/src/main/java/ru/noties/markwon/core/CoreProps.java rename to markwon-core/src/main/java/io/noties/markwon/core/CoreProps.java index 4a722b0f..1da57e24 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/CoreProps.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/CoreProps.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/MarkwonTheme.java b/markwon-core/src/main/java/io/noties/markwon/core/MarkwonTheme.java similarity index 98% rename from markwon-core/src/main/java/ru/noties/markwon/core/MarkwonTheme.java rename to markwon-core/src/main/java/io/noties/markwon/core/MarkwonTheme.java index f01df083..8a9dcee6 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/MarkwonTheme.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/MarkwonTheme.java @@ -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 theming 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. *

- * 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)} *

* Since version 3.0.0 properties related to strike-through, tables and HTML * 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 empty instance of {@link Builder} with no default values applied *

* 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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/SimpleBlockNodeVisitor.java b/markwon-core/src/main/java/io/noties/markwon/core/SimpleBlockNodeVisitor.java similarity index 84% rename from markwon-core/src/main/java/ru/noties/markwon/core/SimpleBlockNodeVisitor.java rename to markwon-core/src/main/java/io/noties/markwon/core/SimpleBlockNodeVisitor.java index 31f04081..03ffaeff 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/SimpleBlockNodeVisitor.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/SimpleBlockNodeVisitor.java @@ -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 * diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/BlockQuoteSpanFactory.java b/markwon-core/src/main/java/io/noties/markwon/core/factory/BlockQuoteSpanFactory.java similarity index 61% rename from markwon-core/src/main/java/ru/noties/markwon/core/factory/BlockQuoteSpanFactory.java rename to markwon-core/src/main/java/io/noties/markwon/core/factory/BlockQuoteSpanFactory.java index cbe86db6..30fa2853 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/BlockQuoteSpanFactory.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/factory/BlockQuoteSpanFactory.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeBlockSpanFactory.java b/markwon-core/src/main/java/io/noties/markwon/core/factory/CodeBlockSpanFactory.java similarity index 61% rename from markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeBlockSpanFactory.java rename to markwon-core/src/main/java/io/noties/markwon/core/factory/CodeBlockSpanFactory.java index 2bf9383e..352a0e1f 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeBlockSpanFactory.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/factory/CodeBlockSpanFactory.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeSpanFactory.java b/markwon-core/src/main/java/io/noties/markwon/core/factory/CodeSpanFactory.java similarity index 61% rename from markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeSpanFactory.java rename to markwon-core/src/main/java/io/noties/markwon/core/factory/CodeSpanFactory.java index 944556fb..9c4f0aef 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeSpanFactory.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/factory/CodeSpanFactory.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/EmphasisSpanFactory.java b/markwon-core/src/main/java/io/noties/markwon/core/factory/EmphasisSpanFactory.java similarity index 60% rename from markwon-core/src/main/java/ru/noties/markwon/core/factory/EmphasisSpanFactory.java rename to markwon-core/src/main/java/io/noties/markwon/core/factory/EmphasisSpanFactory.java index d9d8331d..3942b8b1 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/EmphasisSpanFactory.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/factory/EmphasisSpanFactory.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/HeadingSpanFactory.java b/markwon-core/src/main/java/io/noties/markwon/core/factory/HeadingSpanFactory.java similarity index 62% rename from markwon-core/src/main/java/ru/noties/markwon/core/factory/HeadingSpanFactory.java rename to markwon-core/src/main/java/io/noties/markwon/core/factory/HeadingSpanFactory.java index bd675edd..f96ab110 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/HeadingSpanFactory.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/factory/HeadingSpanFactory.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/LinkSpanFactory.java b/markwon-core/src/main/java/io/noties/markwon/core/factory/LinkSpanFactory.java similarity index 65% rename from markwon-core/src/main/java/ru/noties/markwon/core/factory/LinkSpanFactory.java rename to markwon-core/src/main/java/io/noties/markwon/core/factory/LinkSpanFactory.java index ee97ba34..345e4e15 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/LinkSpanFactory.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/factory/LinkSpanFactory.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/ListItemSpanFactory.java b/markwon-core/src/main/java/io/noties/markwon/core/factory/ListItemSpanFactory.java similarity index 77% rename from markwon-core/src/main/java/ru/noties/markwon/core/factory/ListItemSpanFactory.java rename to markwon-core/src/main/java/io/noties/markwon/core/factory/ListItemSpanFactory.java index 06d73d2e..fd55e9a4 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/ListItemSpanFactory.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/factory/ListItemSpanFactory.java @@ -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 { diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/StrongEmphasisSpanFactory.java b/markwon-core/src/main/java/io/noties/markwon/core/factory/StrongEmphasisSpanFactory.java similarity index 60% rename from markwon-core/src/main/java/ru/noties/markwon/core/factory/StrongEmphasisSpanFactory.java rename to markwon-core/src/main/java/io/noties/markwon/core/factory/StrongEmphasisSpanFactory.java index c81d6121..029d3d25 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/StrongEmphasisSpanFactory.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/factory/StrongEmphasisSpanFactory.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/ThematicBreakSpanFactory.java b/markwon-core/src/main/java/io/noties/markwon/core/factory/ThematicBreakSpanFactory.java similarity index 61% rename from markwon-core/src/main/java/ru/noties/markwon/core/factory/ThematicBreakSpanFactory.java rename to markwon-core/src/main/java/io/noties/markwon/core/factory/ThematicBreakSpanFactory.java index ecd20f32..6f5659fc 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/ThematicBreakSpanFactory.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/factory/ThematicBreakSpanFactory.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/BlockQuoteSpan.java b/markwon-core/src/main/java/io/noties/markwon/core/spans/BlockQuoteSpan.java similarity index 94% rename from markwon-core/src/main/java/ru/noties/markwon/core/spans/BlockQuoteSpan.java rename to markwon-core/src/main/java/io/noties/markwon/core/spans/BlockQuoteSpan.java index ea4e353c..0a7c7615 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/BlockQuoteSpan.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/spans/BlockQuoteSpan.java @@ -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 { diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/BulletListItemSpan.java b/markwon-core/src/main/java/io/noties/markwon/core/spans/BulletListItemSpan.java similarity index 96% rename from markwon-core/src/main/java/ru/noties/markwon/core/spans/BulletListItemSpan.java rename to markwon-core/src/main/java/io/noties/markwon/core/spans/BulletListItemSpan.java index 86a6c81b..59681b5a 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/BulletListItemSpan.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/spans/BulletListItemSpan.java @@ -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 { diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeBlockSpan.java b/markwon-core/src/main/java/io/noties/markwon/core/spans/CodeBlockSpan.java similarity index 95% rename from markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeBlockSpan.java rename to markwon-core/src/main/java/io/noties/markwon/core/spans/CodeBlockSpan.java index 00109766..24626f12 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeBlockSpan.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/spans/CodeBlockSpan.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeSpan.java b/markwon-core/src/main/java/io/noties/markwon/core/spans/CodeSpan.java similarity index 89% rename from markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeSpan.java rename to markwon-core/src/main/java/io/noties/markwon/core/spans/CodeSpan.java index 856d5807..8e2b1051 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeSpan.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/spans/CodeSpan.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/CustomTypefaceSpan.java b/markwon-core/src/main/java/io/noties/markwon/core/spans/CustomTypefaceSpan.java similarity index 96% rename from markwon-core/src/main/java/ru/noties/markwon/core/spans/CustomTypefaceSpan.java rename to markwon-core/src/main/java/io/noties/markwon/core/spans/CustomTypefaceSpan.java index 99ae2111..083c35f7 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/CustomTypefaceSpan.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/spans/CustomTypefaceSpan.java @@ -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; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/EmphasisSpan.java b/markwon-core/src/main/java/io/noties/markwon/core/spans/EmphasisSpan.java similarity index 90% rename from markwon-core/src/main/java/ru/noties/markwon/core/spans/EmphasisSpan.java rename to markwon-core/src/main/java/io/noties/markwon/core/spans/EmphasisSpan.java index cb7f9ac6..f0275228 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/EmphasisSpan.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/spans/EmphasisSpan.java @@ -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; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/HeadingSpan.java b/markwon-core/src/main/java/io/noties/markwon/core/spans/HeadingSpan.java similarity index 94% rename from markwon-core/src/main/java/ru/noties/markwon/core/spans/HeadingSpan.java rename to markwon-core/src/main/java/io/noties/markwon/core/spans/HeadingSpan.java index a942cc64..9d4e8e72 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/HeadingSpan.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/spans/HeadingSpan.java @@ -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 { diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/LinkSpan.java b/markwon-core/src/main/java/io/noties/markwon/core/spans/LinkSpan.java similarity index 90% rename from markwon-core/src/main/java/ru/noties/markwon/core/spans/LinkSpan.java rename to markwon-core/src/main/java/io/noties/markwon/core/spans/LinkSpan.java index e8f7d8f7..32108b0c 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/LinkSpan.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/spans/LinkSpan.java @@ -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 { diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/ObjectsPool.java b/markwon-core/src/main/java/io/noties/markwon/core/spans/ObjectsPool.java similarity index 95% rename from markwon-core/src/main/java/ru/noties/markwon/core/spans/ObjectsPool.java rename to markwon-core/src/main/java/io/noties/markwon/core/spans/ObjectsPool.java index de6f0671..aa1b0818 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/ObjectsPool.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/spans/ObjectsPool.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.core.spans; +package io.noties.markwon.core.spans; import android.graphics.Paint; import android.graphics.Rect; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/OrderedListItemSpan.java b/markwon-core/src/main/java/io/noties/markwon/core/spans/OrderedListItemSpan.java similarity index 96% rename from markwon-core/src/main/java/ru/noties/markwon/core/spans/OrderedListItemSpan.java rename to markwon-core/src/main/java/io/noties/markwon/core/spans/OrderedListItemSpan.java index 6be46fd5..0109c14c 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/OrderedListItemSpan.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/spans/OrderedListItemSpan.java @@ -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 { diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/StrongEmphasisSpan.java b/markwon-core/src/main/java/io/noties/markwon/core/spans/StrongEmphasisSpan.java similarity index 90% rename from markwon-core/src/main/java/ru/noties/markwon/core/spans/StrongEmphasisSpan.java rename to markwon-core/src/main/java/io/noties/markwon/core/spans/StrongEmphasisSpan.java index d74ee63e..6b837fea 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/StrongEmphasisSpan.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/spans/StrongEmphasisSpan.java @@ -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; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/ThematicBreakSpan.java b/markwon-core/src/main/java/io/noties/markwon/core/spans/ThematicBreakSpan.java similarity index 94% rename from markwon-core/src/main/java/ru/noties/markwon/core/spans/ThematicBreakSpan.java rename to markwon-core/src/main/java/io/noties/markwon/core/spans/ThematicBreakSpan.java index 0e06537b..aa3f4259 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/ThematicBreakSpan.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/spans/ThematicBreakSpan.java @@ -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 { diff --git a/markwon-core/src/main/java/ru/noties/markwon/html/HtmlTag.java b/markwon-core/src/main/java/io/noties/markwon/html/HtmlTag.java similarity index 98% rename from markwon-core/src/main/java/ru/noties/markwon/html/HtmlTag.java rename to markwon-core/src/main/java/io/noties/markwon/html/HtmlTag.java index fbe417e9..a44ccd82 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/html/HtmlTag.java +++ b/markwon-core/src/main/java/io/noties/markwon/html/HtmlTag.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParser.java b/markwon-core/src/main/java/io/noties/markwon/html/MarkwonHtmlParser.java similarity index 98% rename from markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParser.java rename to markwon-core/src/main/java/io/noties/markwon/html/MarkwonHtmlParser.java index 01bea86a..ec3b32c8 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParser.java +++ b/markwon-core/src/main/java/io/noties/markwon/html/MarkwonHtmlParser.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import android.support.annotation.NonNull; diff --git a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserNoOp.java b/markwon-core/src/main/java/io/noties/markwon/html/MarkwonHtmlParserNoOp.java similarity index 95% rename from markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserNoOp.java rename to markwon-core/src/main/java/io/noties/markwon/html/MarkwonHtmlParserNoOp.java index ecf6e423..9057630b 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserNoOp.java +++ b/markwon-core/src/main/java/io/noties/markwon/html/MarkwonHtmlParserNoOp.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import android.support.annotation.NonNull; diff --git a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRenderer.java b/markwon-core/src/main/java/io/noties/markwon/html/MarkwonHtmlRenderer.java similarity index 87% rename from markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRenderer.java rename to markwon-core/src/main/java/io/noties/markwon/html/MarkwonHtmlRenderer.java index 88bf8709..26970f2a 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRenderer.java +++ b/markwon-core/src/main/java/io/noties/markwon/html/MarkwonHtmlRenderer.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererNoOp.java b/markwon-core/src/main/java/io/noties/markwon/html/MarkwonHtmlRendererNoOp.java similarity index 84% rename from markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererNoOp.java rename to markwon-core/src/main/java/io/noties/markwon/html/MarkwonHtmlRendererNoOp.java index 1a6ac51f..f8194ca3 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererNoOp.java +++ b/markwon-core/src/main/java/io/noties/markwon/html/MarkwonHtmlRendererNoOp.java @@ -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 { diff --git a/markwon-core/src/main/java/ru/noties/markwon/html/TagHandler.java b/markwon-core/src/main/java/io/noties/markwon/html/TagHandler.java similarity index 93% rename from markwon-core/src/main/java/ru/noties/markwon/html/TagHandler.java rename to markwon-core/src/main/java/io/noties/markwon/html/TagHandler.java index 28c2c068..60332b61 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/html/TagHandler.java +++ b/markwon-core/src/main/java/io/noties/markwon/html/TagHandler.java @@ -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 { diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawable.java b/markwon-core/src/main/java/io/noties/markwon/image/AsyncDrawable.java similarity index 99% rename from markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawable.java rename to markwon-core/src/main/java/io/noties/markwon/image/AsyncDrawable.java index 10e4d45d..422f4923 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawable.java +++ b/markwon-core/src/main/java/io/noties/markwon/image/AsyncDrawable.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.graphics.Canvas; import android.graphics.ColorFilter; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoader.java b/markwon-core/src/main/java/io/noties/markwon/image/AsyncDrawableLoader.java similarity index 95% rename from markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoader.java rename to markwon-core/src/main/java/io/noties/markwon/image/AsyncDrawableLoader.java index 314e537f..3a3a7d31 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoader.java +++ b/markwon-core/src/main/java/io/noties/markwon/image/AsyncDrawableLoader.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderNoOp.java b/markwon-core/src/main/java/io/noties/markwon/image/AsyncDrawableLoaderNoOp.java similarity index 93% rename from markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderNoOp.java rename to markwon-core/src/main/java/io/noties/markwon/image/AsyncDrawableLoaderNoOp.java index e3a6331a..c7d06d7b 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderNoOp.java +++ b/markwon-core/src/main/java/io/noties/markwon/image/AsyncDrawableLoaderNoOp.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableScheduler.java b/markwon-core/src/main/java/io/noties/markwon/image/AsyncDrawableScheduler.java similarity index 98% rename from markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableScheduler.java rename to markwon-core/src/main/java/io/noties/markwon/image/AsyncDrawableScheduler.java index 83a4b150..251f9937 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableScheduler.java +++ b/markwon-core/src/main/java/io/noties/markwon/image/AsyncDrawableScheduler.java @@ -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 { diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableSpan.java b/markwon-core/src/main/java/io/noties/markwon/image/AsyncDrawableSpan.java similarity index 98% rename from markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableSpan.java rename to markwon-core/src/main/java/io/noties/markwon/image/AsyncDrawableSpan.java index a268ef19..d7b7aaf7 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableSpan.java +++ b/markwon-core/src/main/java/io/noties/markwon/image/AsyncDrawableSpan.java @@ -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 { diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/DrawableUtils.java b/markwon-core/src/main/java/io/noties/markwon/image/DrawableUtils.java similarity index 96% rename from markwon-core/src/main/java/ru/noties/markwon/image/DrawableUtils.java rename to markwon-core/src/main/java/io/noties/markwon/image/DrawableUtils.java index a5134d52..2cecf8c0 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/DrawableUtils.java +++ b/markwon-core/src/main/java/io/noties/markwon/image/DrawableUtils.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.graphics.Rect; import android.graphics.drawable.Drawable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/ImageProps.java b/markwon-core/src/main/java/io/noties/markwon/image/ImageProps.java similarity index 85% rename from markwon-core/src/main/java/ru/noties/markwon/image/ImageProps.java rename to markwon-core/src/main/java/io/noties/markwon/image/ImageProps.java index 7bb9bfd1..2c1343c3 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/ImageProps.java +++ b/markwon-core/src/main/java/io/noties/markwon/image/ImageProps.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSize.java b/markwon-core/src/main/java/io/noties/markwon/image/ImageSize.java similarity index 96% rename from markwon-core/src/main/java/ru/noties/markwon/image/ImageSize.java rename to markwon-core/src/main/java/io/noties/markwon/image/ImageSize.java index ec44ed76..f06ec6d3 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSize.java +++ b/markwon-core/src/main/java/io/noties/markwon/image/ImageSize.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolver.java b/markwon-core/src/main/java/io/noties/markwon/image/ImageSizeResolver.java similarity index 95% rename from markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolver.java rename to markwon-core/src/main/java/io/noties/markwon/image/ImageSizeResolver.java index 57284a41..85b5f44b 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolver.java +++ b/markwon-core/src/main/java/io/noties/markwon/image/ImageSizeResolver.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.graphics.Rect; import android.support.annotation.NonNull; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolverDef.java b/markwon-core/src/main/java/io/noties/markwon/image/ImageSizeResolverDef.java similarity index 98% rename from markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolverDef.java rename to markwon-core/src/main/java/io/noties/markwon/image/ImageSizeResolverDef.java index bdf7ae48..9788b7fe 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolverDef.java +++ b/markwon-core/src/main/java/io/noties/markwon/image/ImageSizeResolverDef.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.graphics.Rect; import android.support.annotation.NonNull; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSpanFactory.java b/markwon-core/src/main/java/io/noties/markwon/image/ImageSpanFactory.java similarity index 83% rename from markwon-core/src/main/java/ru/noties/markwon/image/ImageSpanFactory.java rename to markwon-core/src/main/java/io/noties/markwon/image/ImageSpanFactory.java index 5af5b0ec..df2dce06 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSpanFactory.java +++ b/markwon-core/src/main/java/io/noties/markwon/image/ImageSpanFactory.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/movement/MovementMethodPlugin.java b/markwon-core/src/main/java/io/noties/markwon/movement/MovementMethodPlugin.java similarity index 93% rename from markwon-core/src/main/java/ru/noties/markwon/movement/MovementMethodPlugin.java rename to markwon-core/src/main/java/io/noties/markwon/movement/MovementMethodPlugin.java index 59dd04ab..fd672783 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/movement/MovementMethodPlugin.java +++ b/markwon-core/src/main/java/io/noties/markwon/movement/MovementMethodPlugin.java @@ -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 diff --git a/markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlight.java b/markwon-core/src/main/java/io/noties/markwon/syntax/SyntaxHighlight.java similarity index 87% rename from markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlight.java rename to markwon-core/src/main/java/io/noties/markwon/syntax/SyntaxHighlight.java index cf6921ee..925fd1df 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlight.java +++ b/markwon-core/src/main/java/io/noties/markwon/syntax/SyntaxHighlight.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.syntax; +package io.noties.markwon.syntax; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlightNoOp.java b/markwon-core/src/main/java/io/noties/markwon/syntax/SyntaxHighlightNoOp.java similarity index 89% rename from markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlightNoOp.java rename to markwon-core/src/main/java/io/noties/markwon/syntax/SyntaxHighlightNoOp.java index 48a80ee2..e3931244 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlightNoOp.java +++ b/markwon-core/src/main/java/io/noties/markwon/syntax/SyntaxHighlightNoOp.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.syntax; +package io.noties.markwon.syntax; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessor.java b/markwon-core/src/main/java/io/noties/markwon/urlprocessor/UrlProcessor.java similarity index 77% rename from markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessor.java rename to markwon-core/src/main/java/io/noties/markwon/urlprocessor/UrlProcessor.java index 9ea7919e..03f1995d 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessor.java +++ b/markwon-core/src/main/java/io/noties/markwon/urlprocessor/UrlProcessor.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.urlprocessor; +package io.noties.markwon.urlprocessor; import android.support.annotation.NonNull; diff --git a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorAndroidAssets.java b/markwon-core/src/main/java/io/noties/markwon/urlprocessor/UrlProcessorAndroidAssets.java similarity index 97% rename from markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorAndroidAssets.java rename to markwon-core/src/main/java/io/noties/markwon/urlprocessor/UrlProcessorAndroidAssets.java index 439d7f12..714f9553 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorAndroidAssets.java +++ b/markwon-core/src/main/java/io/noties/markwon/urlprocessor/UrlProcessorAndroidAssets.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.urlprocessor; +package io.noties.markwon.urlprocessor; import android.net.Uri; import android.support.annotation.NonNull; diff --git a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorNoOp.java b/markwon-core/src/main/java/io/noties/markwon/urlprocessor/UrlProcessorNoOp.java similarity index 84% rename from markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorNoOp.java rename to markwon-core/src/main/java/io/noties/markwon/urlprocessor/UrlProcessorNoOp.java index 9d8560d6..ba795b5e 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorNoOp.java +++ b/markwon-core/src/main/java/io/noties/markwon/urlprocessor/UrlProcessorNoOp.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.urlprocessor; +package io.noties.markwon.urlprocessor; import android.support.annotation.NonNull; diff --git a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsolute.java b/markwon-core/src/main/java/io/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsolute.java similarity index 96% rename from markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsolute.java rename to markwon-core/src/main/java/io/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsolute.java index d99aaf4f..e67ab48c 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsolute.java +++ b/markwon-core/src/main/java/io/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsolute.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.urlprocessor; +package io.noties.markwon.urlprocessor; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/utils/ColorUtils.java b/markwon-core/src/main/java/io/noties/markwon/utils/ColorUtils.java similarity index 85% rename from markwon-core/src/main/java/ru/noties/markwon/utils/ColorUtils.java rename to markwon-core/src/main/java/io/noties/markwon/utils/ColorUtils.java index d6305132..d2a8bc6e 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/utils/ColorUtils.java +++ b/markwon-core/src/main/java/io/noties/markwon/utils/ColorUtils.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.utils; +package io.noties.markwon.utils; public abstract class ColorUtils { diff --git a/markwon-core/src/main/java/ru/noties/markwon/utils/Dip.java b/markwon-core/src/main/java/io/noties/markwon/utils/Dip.java similarity index 94% rename from markwon-core/src/main/java/ru/noties/markwon/utils/Dip.java rename to markwon-core/src/main/java/io/noties/markwon/utils/Dip.java index 51d098e0..6b8fdba2 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/utils/Dip.java +++ b/markwon-core/src/main/java/io/noties/markwon/utils/Dip.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.utils; +package io.noties.markwon.utils; import android.content.Context; import android.support.annotation.NonNull; diff --git a/markwon-core/src/main/java/ru/noties/markwon/utils/DrawableUtils.java b/markwon-core/src/main/java/io/noties/markwon/utils/DrawableUtils.java similarity index 78% rename from markwon-core/src/main/java/ru/noties/markwon/utils/DrawableUtils.java rename to markwon-core/src/main/java/io/noties/markwon/utils/DrawableUtils.java index 0f719339..5201a828 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/utils/DrawableUtils.java +++ b/markwon-core/src/main/java/io/noties/markwon/utils/DrawableUtils.java @@ -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 { diff --git a/markwon-core/src/main/java/ru/noties/markwon/utils/DumpNodes.java b/markwon-core/src/main/java/io/noties/markwon/utils/DumpNodes.java similarity index 99% rename from markwon-core/src/main/java/ru/noties/markwon/utils/DumpNodes.java rename to markwon-core/src/main/java/io/noties/markwon/utils/DumpNodes.java index 3b45d238..0693da72 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/utils/DumpNodes.java +++ b/markwon-core/src/main/java/io/noties/markwon/utils/DumpNodes.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.utils; +package io.noties.markwon.utils; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-core/src/main/java/ru/noties/markwon/utils/LeadingMarginUtils.java b/markwon-core/src/main/java/io/noties/markwon/utils/LeadingMarginUtils.java similarity index 94% rename from markwon-core/src/main/java/ru/noties/markwon/utils/LeadingMarginUtils.java rename to markwon-core/src/main/java/io/noties/markwon/utils/LeadingMarginUtils.java index bc18a140..072d2ccf 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/utils/LeadingMarginUtils.java +++ b/markwon-core/src/main/java/io/noties/markwon/utils/LeadingMarginUtils.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.utils; +package io.noties.markwon.utils; import android.text.Spanned; diff --git a/markwon-core/src/main/java/ru/noties/markwon/utils/NoCopySpannableFactory.java b/markwon-core/src/main/java/io/noties/markwon/utils/NoCopySpannableFactory.java similarity index 95% rename from markwon-core/src/main/java/ru/noties/markwon/utils/NoCopySpannableFactory.java rename to markwon-core/src/main/java/io/noties/markwon/utils/NoCopySpannableFactory.java index f5eedc2a..7609630e 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/utils/NoCopySpannableFactory.java +++ b/markwon-core/src/main/java/io/noties/markwon/utils/NoCopySpannableFactory.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.utils; +package io.noties.markwon.utils; import android.support.annotation.NonNull; import android.text.Spannable; diff --git a/markwon-core/src/test/java/ru/noties/markwon/AbstractMarkwonPluginTest.java b/markwon-core/src/test/java/io/noties/markwon/AbstractMarkwonPluginTest.java similarity index 95% rename from markwon-core/src/test/java/ru/noties/markwon/AbstractMarkwonPluginTest.java rename to markwon-core/src/test/java/io/noties/markwon/AbstractMarkwonPluginTest.java index 025af005..3587fdca 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/AbstractMarkwonPluginTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/AbstractMarkwonPluginTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/markwon-core/src/test/java/ru/noties/markwon/AbstractMarkwonVisitorImpl.java b/markwon-core/src/test/java/io/noties/markwon/AbstractMarkwonVisitorImpl.java similarity index 95% rename from markwon-core/src/test/java/ru/noties/markwon/AbstractMarkwonVisitorImpl.java rename to markwon-core/src/test/java/io/noties/markwon/AbstractMarkwonVisitorImpl.java index ea099248..04298a06 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/AbstractMarkwonVisitorImpl.java +++ b/markwon-core/src/test/java/io/noties/markwon/AbstractMarkwonVisitorImpl.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.support.annotation.NonNull; diff --git a/markwon-core/src/test/java/ru/noties/markwon/MarkwonBuilderImplTest.java b/markwon-core/src/test/java/io/noties/markwon/MarkwonBuilderImplTest.java similarity index 96% rename from markwon-core/src/test/java/ru/noties/markwon/MarkwonBuilderImplTest.java rename to markwon-core/src/test/java/io/noties/markwon/MarkwonBuilderImplTest.java index fc4c73fc..56b1ee60 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/MarkwonBuilderImplTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/MarkwonBuilderImplTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.text.Spanned; import android.widget.TextView; @@ -11,8 +11,8 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import ru.noties.markwon.core.MarkwonTheme; -import ru.noties.markwon.html.MarkwonHtmlRenderer; +import io.noties.markwon.core.MarkwonTheme; +import io.noties.markwon.html.MarkwonHtmlRenderer; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; diff --git a/markwon-core/src/test/java/ru/noties/markwon/MarkwonImplTest.java b/markwon-core/src/test/java/io/noties/markwon/MarkwonImplTest.java similarity index 99% rename from markwon-core/src/test/java/ru/noties/markwon/MarkwonImplTest.java rename to markwon-core/src/test/java/io/noties/markwon/MarkwonImplTest.java index d80cb765..60f022ef 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/MarkwonImplTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/MarkwonImplTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.text.Spanned; import android.widget.TextView; diff --git a/markwon-core/src/test/java/ru/noties/markwon/MarkwonSpansFactoryImplTest.java b/markwon-core/src/test/java/io/noties/markwon/MarkwonSpansFactoryImplTest.java similarity index 99% rename from markwon-core/src/test/java/ru/noties/markwon/MarkwonSpansFactoryImplTest.java rename to markwon-core/src/test/java/io/noties/markwon/MarkwonSpansFactoryImplTest.java index b66cfd0c..ad43e6e6 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/MarkwonSpansFactoryImplTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/MarkwonSpansFactoryImplTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import org.commonmark.node.Block; import org.commonmark.node.Emphasis; diff --git a/markwon-core/src/test/java/ru/noties/markwon/MarkwonSpansFactoryTest.java b/markwon-core/src/test/java/io/noties/markwon/MarkwonSpansFactoryTest.java similarity index 98% rename from markwon-core/src/test/java/ru/noties/markwon/MarkwonSpansFactoryTest.java rename to markwon-core/src/test/java/io/noties/markwon/MarkwonSpansFactoryTest.java index a2cb36ff..cdb631e7 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/MarkwonSpansFactoryTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/MarkwonSpansFactoryTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import org.commonmark.node.BlockQuote; import org.commonmark.node.Image; diff --git a/markwon-core/src/test/java/ru/noties/markwon/MarkwonVisitorImplTest.java b/markwon-core/src/test/java/io/noties/markwon/MarkwonVisitorImplTest.java similarity index 99% rename from markwon-core/src/test/java/ru/noties/markwon/MarkwonVisitorImplTest.java rename to markwon-core/src/test/java/io/noties/markwon/MarkwonVisitorImplTest.java index 1a444d70..45387afb 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/MarkwonVisitorImplTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/MarkwonVisitorImplTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import org.commonmark.node.BlockQuote; import org.commonmark.node.Node; diff --git a/markwon-core/src/test/java/ru/noties/markwon/PropTest.java b/markwon-core/src/test/java/io/noties/markwon/PropTest.java similarity index 98% rename from markwon-core/src/test/java/ru/noties/markwon/PropTest.java rename to markwon-core/src/test/java/io/noties/markwon/PropTest.java index 85a81fe1..3b90b7fb 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/PropTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/PropTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import org.junit.Before; import org.junit.Test; diff --git a/markwon-core/src/test/java/ru/noties/markwon/RenderPropsImplTest.java b/markwon-core/src/test/java/io/noties/markwon/RenderPropsImplTest.java similarity index 99% rename from markwon-core/src/test/java/ru/noties/markwon/RenderPropsImplTest.java rename to markwon-core/src/test/java/io/noties/markwon/RenderPropsImplTest.java index 36a6315b..3f185bcf 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/RenderPropsImplTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/RenderPropsImplTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import org.junit.Before; import org.junit.Test; diff --git a/markwon-core/src/test/java/ru/noties/markwon/SpannableBuilderTest.java b/markwon-core/src/test/java/io/noties/markwon/SpannableBuilderTest.java similarity index 98% rename from markwon-core/src/test/java/ru/noties/markwon/SpannableBuilderTest.java rename to markwon-core/src/test/java/io/noties/markwon/SpannableBuilderTest.java index 3535e19b..3e68fe38 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/SpannableBuilderTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/SpannableBuilderTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon; +package io.noties.markwon; import android.support.annotation.NonNull; import android.text.SpannableStringBuilder; @@ -19,8 +19,8 @@ import ix.IxFunction; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static ru.noties.markwon.SpannableBuilder.isPositionValid; -import static ru.noties.markwon.SpannableBuilder.setSpans; +import static io.noties.markwon.SpannableBuilder.isPositionValid; +import static io.noties.markwon.SpannableBuilder.setSpans; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/CorePluginBridge.java b/markwon-core/src/test/java/io/noties/markwon/core/CorePluginBridge.java similarity index 86% rename from markwon-core/src/test/java/ru/noties/markwon/core/CorePluginBridge.java rename to markwon-core/src/test/java/io/noties/markwon/core/CorePluginBridge.java index 6517873b..01520e54 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/CorePluginBridge.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/CorePluginBridge.java @@ -1,11 +1,11 @@ -package ru.noties.markwon.core; +package io.noties.markwon.core; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import org.commonmark.node.Node; -import ru.noties.markwon.MarkwonVisitor; +import io.noties.markwon.MarkwonVisitor; public abstract class CorePluginBridge { diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/CorePluginTest.java b/markwon-core/src/test/java/io/noties/markwon/core/CorePluginTest.java similarity index 97% rename from markwon-core/src/test/java/ru/noties/markwon/core/CorePluginTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/CorePluginTest.java index 3a300cfb..3d9834dc 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/CorePluginTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/CorePluginTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.core; +package io.noties.markwon.core; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -39,12 +39,12 @@ import java.util.Set; import ix.Ix; import ix.IxFunction; import ix.IxPredicate; -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.SpannableBuilder; +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.SpannableBuilder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/CoreTest.java b/markwon-core/src/test/java/io/noties/markwon/core/CoreTest.java similarity index 78% rename from markwon-core/src/test/java/ru/noties/markwon/core/CoreTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/CoreTest.java index de7c0dd0..1d5b4830 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/CoreTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/CoreTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.core; +package io.noties.markwon.core; import android.support.annotation.NonNull; import android.text.Spanned; @@ -11,18 +11,18 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.Markwon; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonSpansFactory; -import ru.noties.markwon.RenderProps; -import ru.noties.markwon.SpanFactory; -import ru.noties.markwon.test.TestSpan; -import ru.noties.markwon.test.TestSpanMatcher; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.Markwon; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonSpansFactory; +import io.noties.markwon.RenderProps; +import io.noties.markwon.SpanFactory; +import io.noties.markwon.test.TestSpan; +import io.noties.markwon.test.TestSpanMatcher; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/.editorconfig b/markwon-core/src/test/java/io/noties/markwon/core/suite/.editorconfig similarity index 100% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/.editorconfig rename to markwon-core/src/test/java/io/noties/markwon/core/suite/.editorconfig diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/BaseSuiteTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/BaseSuiteTest.java similarity index 90% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/BaseSuiteTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/BaseSuiteTest.java index d434ed99..7ecab39d 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/BaseSuiteTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/BaseSuiteTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -24,19 +24,19 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.Markwon; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonSpansFactory; -import ru.noties.markwon.RenderProps; -import ru.noties.markwon.SpanFactory; -import ru.noties.markwon.core.CorePlugin; -import ru.noties.markwon.core.CoreProps; -import ru.noties.markwon.test.TestSpan; -import ru.noties.markwon.test.TestSpanMatcher; +import io.noties.markwon.core.CorePlugin; +import io.noties.markwon.core.CoreProps; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.Markwon; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonSpansFactory; +import io.noties.markwon.RenderProps; +import io.noties.markwon.SpanFactory; +import io.noties.markwon.test.TestSpan; +import io.noties.markwon.test.TestSpanMatcher; -import static ru.noties.markwon.test.TestSpan.args; -import static ru.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.args; +import static io.noties.markwon.test.TestSpan.span; abstract class BaseSuiteTest { diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/BlockquoteTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/BlockquoteTest.java similarity index 76% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/BlockquoteTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/BlockquoteTest.java index 21d2c852..11d4aa1f 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/BlockquoteTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/BlockquoteTest.java @@ -1,15 +1,15 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpan.Document; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/BoldItalicTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/BoldItalicTest.java similarity index 66% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/BoldItalicTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/BoldItalicTest.java index 1315136b..ceece2f5 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/BoldItalicTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/BoldItalicTest.java @@ -1,15 +1,15 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan; +import io.noties.markwon.test.TestSpan; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/CodeTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/CodeTest.java similarity index 80% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/CodeTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/CodeTest.java index 52a8f614..3fc22a3d 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/CodeTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/CodeTest.java @@ -1,16 +1,16 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpan.Document; -import static ru.noties.markwon.test.TestSpan.args; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.args; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/DeeplyNestedTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/DeeplyNestedTest.java similarity index 71% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/DeeplyNestedTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/DeeplyNestedTest.java index e0dcda38..86c948ba 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/DeeplyNestedTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/DeeplyNestedTest.java @@ -1,16 +1,16 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpan.Document; -import static ru.noties.markwon.test.TestSpan.args; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.args; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/EmphasisTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/EmphasisTest.java similarity index 64% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/EmphasisTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/EmphasisTest.java index 057acc18..697075ac 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/EmphasisTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/EmphasisTest.java @@ -1,15 +1,15 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpan.Document; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/FirstTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/FirstTest.java similarity index 71% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/FirstTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/FirstTest.java index f67a5062..32c8f17e 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/FirstTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/FirstTest.java @@ -1,16 +1,16 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpan.Document; -import static ru.noties.markwon.test.TestSpan.args; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.args; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/HeadingTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/HeadingTest.java similarity index 71% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/HeadingTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/HeadingTest.java index 10fa5f9b..4aef1e52 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/HeadingTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/HeadingTest.java @@ -1,16 +1,16 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpan.Document; -import static ru.noties.markwon.test.TestSpan.args; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.args; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/LinkTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/LinkTest.java similarity index 59% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/LinkTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/LinkTest.java index ff70f82c..a3e6f2af 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/LinkTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/LinkTest.java @@ -1,16 +1,16 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpan.Document; -import static ru.noties.markwon.test.TestSpan.args; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.args; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/NoParagraphsTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/NoParagraphsTest.java similarity index 75% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/NoParagraphsTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/NoParagraphsTest.java index 32ea306b..634b6d16 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/NoParagraphsTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/NoParagraphsTest.java @@ -1,14 +1,14 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpan.Document; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/OrderedListTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/OrderedListTest.java similarity index 86% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/OrderedListTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/OrderedListTest.java index 9efb46b8..afd98aeb 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/OrderedListTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/OrderedListTest.java @@ -1,16 +1,16 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpan.Document; -import static ru.noties.markwon.test.TestSpan.args; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.args; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/ParagraphTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/ParagraphTest.java similarity index 73% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/ParagraphTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/ParagraphTest.java index 877a8818..c866ebe9 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/ParagraphTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/ParagraphTest.java @@ -1,15 +1,15 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpan.Document; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/SecondTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/SecondTest.java similarity index 78% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/SecondTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/SecondTest.java index 340df08d..fef1f3f4 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/SecondTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/SecondTest.java @@ -1,16 +1,16 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpan.Document; -import static ru.noties.markwon.test.TestSpan.args; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.args; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/SoftBreakTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/SoftBreakTest.java similarity index 72% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/SoftBreakTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/SoftBreakTest.java index b94ab45a..ed282908 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/SoftBreakTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/SoftBreakTest.java @@ -1,14 +1,14 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpan.Document; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/StrongEmphasisTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/StrongEmphasisTest.java similarity index 65% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/StrongEmphasisTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/StrongEmphasisTest.java index d08377a1..97ccfa2e 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/StrongEmphasisTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/StrongEmphasisTest.java @@ -1,15 +1,15 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpan.Document; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/ThematicBreakTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/ThematicBreakTest.java similarity index 66% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/ThematicBreakTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/ThematicBreakTest.java index 1e0159bc..53d8f234 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/ThematicBreakTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/ThematicBreakTest.java @@ -1,15 +1,15 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpan.Document; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/UnOrderedListTest.java b/markwon-core/src/test/java/io/noties/markwon/core/suite/UnOrderedListTest.java similarity index 83% rename from markwon-core/src/test/java/ru/noties/markwon/core/suite/UnOrderedListTest.java rename to markwon-core/src/test/java/io/noties/markwon/core/suite/UnOrderedListTest.java index 9b1dfb85..41503788 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/UnOrderedListTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/core/suite/UnOrderedListTest.java @@ -1,16 +1,16 @@ -package ru.noties.markwon.core.suite; +package io.noties.markwon.core.suite; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpan.Document; -import static ru.noties.markwon.test.TestSpan.args; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.args; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/image/AsyncDrawableTest.java b/markwon-core/src/test/java/io/noties/markwon/image/AsyncDrawableTest.java similarity index 98% rename from markwon-core/src/test/java/ru/noties/markwon/image/AsyncDrawableTest.java rename to markwon-core/src/test/java/io/noties/markwon/image/AsyncDrawableTest.java index 7dad4514..d725c00f 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/image/AsyncDrawableTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/image/AsyncDrawableTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.graphics.Canvas; import android.graphics.ColorFilter; diff --git a/markwon-core/src/test/java/ru/noties/markwon/image/ImageSizeResolverDefTest.java b/markwon-core/src/test/java/io/noties/markwon/image/ImageSizeResolverDefTest.java similarity index 80% rename from markwon-core/src/test/java/ru/noties/markwon/image/ImageSizeResolverDefTest.java rename to markwon-core/src/test/java/io/noties/markwon/image/ImageSizeResolverDefTest.java index f8649603..33280b03 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/image/ImageSizeResolverDefTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/image/ImageSizeResolverDefTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.graphics.Rect; @@ -8,13 +8,9 @@ import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.image.ImageSize; -import ru.noties.markwon.image.ImageSize.Dimension; -import ru.noties.markwon.image.ImageSizeResolverDef; - import static org.junit.Assert.assertEquals; -import static ru.noties.markwon.image.ImageSizeResolverDef.UNIT_EM; -import static ru.noties.markwon.image.ImageSizeResolverDef.UNIT_PERCENT; +import static io.noties.markwon.image.ImageSizeResolverDef.UNIT_EM; +import static io.noties.markwon.image.ImageSizeResolverDef.UNIT_PERCENT; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) @@ -55,7 +51,7 @@ public class ImageSizeResolverDefTest { assertEquals( rect, def.resolveImageSize( - new ImageSize(null, new Dimension(100.F, UNIT_PERCENT)), + new ImageSize(null, new ImageSize.Dimension(100.F, UNIT_PERCENT)), rect, -1, Float.NaN @@ -69,7 +65,7 @@ public class ImageSizeResolverDefTest { assertEquals( new Rect(0, 0, 50, 100), def.resolveImageSize( - new ImageSize(new Dimension(50.F, UNIT_PERCENT), null), + new ImageSize(new ImageSize.Dimension(50.F, UNIT_PERCENT), null), rect, 100, Float.NaN @@ -83,7 +79,7 @@ public class ImageSizeResolverDefTest { assertEquals( new Rect(0, 0, 7, 9), def.resolveImageSize( - new ImageSize(new Dimension(7, "width"), new Dimension(9, "height")), + new ImageSize(new ImageSize.Dimension(7, "width"), new ImageSize.Dimension(9, "height")), rect, 90, Float.NaN @@ -97,7 +93,7 @@ public class ImageSizeResolverDefTest { assertEquals( new Rect(0, 0, 20, 40), def.resolveImageSize( - new ImageSize(new Dimension(2.f, UNIT_EM), new Dimension(4.F, UNIT_EM)), + new ImageSize(new ImageSize.Dimension(2.f, UNIT_EM), new ImageSize.Dimension(4.F, UNIT_EM)), rect, 999, 10.F @@ -111,7 +107,7 @@ public class ImageSizeResolverDefTest { assertEquals( new Rect(0, 0, 10, 20), def.resolveImageSize( - new ImageSize(new Dimension(1.F, UNIT_EM), null), + new ImageSize(new ImageSize.Dimension(1.F, UNIT_EM), null), rect, 42, 10.F @@ -125,7 +121,7 @@ public class ImageSizeResolverDefTest { assertEquals( new Rect(0, 0, 100, 50), def.resolveImageSize( - new ImageSize(null, new Dimension(50, "px")), + new ImageSize(null, new ImageSize.Dimension(50, "px")), rect, 200, Float.NaN @@ -139,7 +135,7 @@ public class ImageSizeResolverDefTest { assertEquals( new Rect(0, 0, 10, 30), def.resolveImageSize( - new ImageSize(null, new Dimension(3.F, UNIT_EM)), + new ImageSize(null, new ImageSize.Dimension(3.F, UNIT_EM)), rect, 40, 10.F diff --git a/markwon-core/src/test/java/ru/noties/markwon/image/ImageTest.java b/markwon-core/src/test/java/io/noties/markwon/image/ImageTest.java similarity index 70% rename from markwon-core/src/test/java/ru/noties/markwon/image/ImageTest.java rename to markwon-core/src/test/java/io/noties/markwon/image/ImageTest.java index def53907..71d13624 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/image/ImageTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/image/ImageTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.content.Context; import android.support.annotation.NonNull; @@ -10,20 +10,20 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.Markwon; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonSpansFactory; -import ru.noties.markwon.RenderProps; -import ru.noties.markwon.SpanFactory; -import ru.noties.markwon.core.CorePlugin; -import ru.noties.markwon.test.TestSpan.Document; -import ru.noties.markwon.test.TestSpanMatcher; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.Markwon; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonSpansFactory; +import io.noties.markwon.RenderProps; +import io.noties.markwon.SpanFactory; +import io.noties.markwon.core.CorePlugin; +import io.noties.markwon.test.TestSpan.Document; +import io.noties.markwon.test.TestSpanMatcher; -import static ru.noties.markwon.test.TestSpan.args; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.args; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/syntax/SyntaxHighlightTest.java b/markwon-core/src/test/java/io/noties/markwon/syntax/SyntaxHighlightTest.java similarity index 90% rename from markwon-core/src/test/java/ru/noties/markwon/syntax/SyntaxHighlightTest.java rename to markwon-core/src/test/java/io/noties/markwon/syntax/SyntaxHighlightTest.java index 68fa8a12..3024fcc0 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/syntax/SyntaxHighlightTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/syntax/SyntaxHighlightTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.syntax; +package io.noties.markwon.syntax; import android.os.Build; import android.support.annotation.NonNull; @@ -17,16 +17,16 @@ import java.util.Arrays; import java.util.Collections; import java.util.Map; -import ru.noties.markwon.AbstractMarkwonVisitorImpl; -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.SpannableBuilder; -import ru.noties.markwon.core.CorePluginBridge; -import ru.noties.markwon.core.MarkwonTheme; -import ru.noties.markwon.html.MarkwonHtmlRenderer; +import io.noties.markwon.AbstractMarkwonVisitorImpl; +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.SpannableBuilder; +import io.noties.markwon.core.CorePluginBridge; +import io.noties.markwon.core.MarkwonTheme; +import io.noties.markwon.html.MarkwonHtmlRenderer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/markwon-core/src/test/java/ru/noties/markwon/urlprocessor/UrlProcessorAndroidAssetsTest.java b/markwon-core/src/test/java/io/noties/markwon/urlprocessor/UrlProcessorAndroidAssetsTest.java similarity index 87% rename from markwon-core/src/test/java/ru/noties/markwon/urlprocessor/UrlProcessorAndroidAssetsTest.java rename to markwon-core/src/test/java/io/noties/markwon/urlprocessor/UrlProcessorAndroidAssetsTest.java index 7a5cbf1a..4129bfb8 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/urlprocessor/UrlProcessorAndroidAssetsTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/urlprocessor/UrlProcessorAndroidAssetsTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.urlprocessor; +package io.noties.markwon.urlprocessor; import org.junit.Before; import org.junit.Test; @@ -6,10 +6,8 @@ import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.urlprocessor.UrlProcessorAndroidAssets; - import static org.junit.Assert.assertEquals; -import static ru.noties.markwon.urlprocessor.UrlProcessorAndroidAssets.BASE; +import static io.noties.markwon.urlprocessor.UrlProcessorAndroidAssets.BASE; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-core/src/test/java/ru/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsoluteTest.java b/markwon-core/src/test/java/io/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsoluteTest.java similarity index 95% rename from markwon-core/src/test/java/ru/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsoluteTest.java rename to markwon-core/src/test/java/io/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsoluteTest.java index a8bf2d01..afa55b33 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsoluteTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsoluteTest.java @@ -1,12 +1,10 @@ -package ru.noties.markwon.urlprocessor; +package io.noties.markwon.urlprocessor; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import ru.noties.markwon.urlprocessor.UrlProcessorRelativeToAbsolute; - import static org.junit.Assert.*; @RunWith(RobolectricTestRunner.class) diff --git a/markwon-ext-latex/src/main/AndroidManifest.xml b/markwon-ext-latex/src/main/AndroidManifest.xml index fee2db10..b38d59c6 100644 --- a/markwon-ext-latex/src/main/AndroidManifest.xml +++ b/markwon-ext-latex/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/markwon-ext-latex/src/main/java/ru/noties/markwon/ext/latex/JLatexMathBlock.java b/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathBlock.java similarity index 87% rename from markwon-ext-latex/src/main/java/ru/noties/markwon/ext/latex/JLatexMathBlock.java rename to markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathBlock.java index d49d108a..4066caba 100644 --- a/markwon-ext-latex/src/main/java/ru/noties/markwon/ext/latex/JLatexMathBlock.java +++ b/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathBlock.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.latex; +package io.noties.markwon.ext.latex; import org.commonmark.node.CustomBlock; diff --git a/markwon-ext-latex/src/main/java/ru/noties/markwon/ext/latex/JLatexMathBlockParser.java b/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathBlockParser.java similarity index 98% rename from markwon-ext-latex/src/main/java/ru/noties/markwon/ext/latex/JLatexMathBlockParser.java rename to markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathBlockParser.java index 7aac76f2..8f54f245 100644 --- a/markwon-ext-latex/src/main/java/ru/noties/markwon/ext/latex/JLatexMathBlockParser.java +++ b/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathBlockParser.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.latex; +package io.noties.markwon.ext.latex; import org.commonmark.node.Block; import org.commonmark.parser.block.AbstractBlockParser; diff --git a/markwon-ext-latex/src/main/java/ru/noties/markwon/ext/latex/JLatexMathPlugin.java b/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathPlugin.java similarity index 95% rename from markwon-ext-latex/src/main/java/ru/noties/markwon/ext/latex/JLatexMathPlugin.java rename to markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathPlugin.java index decdb6d1..f3d16403 100644 --- a/markwon-ext-latex/src/main/java/ru/noties/markwon/ext/latex/JLatexMathPlugin.java +++ b/markwon-ext-latex/src/main/java/io/noties/markwon/ext/latex/JLatexMathPlugin.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.latex; +package io.noties.markwon.ext.latex; import android.graphics.drawable.Drawable; import android.os.Handler; @@ -18,15 +18,15 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import io.noties.markwon.image.AsyncDrawable; +import io.noties.markwon.image.AsyncDrawableScheduler; +import io.noties.markwon.image.AsyncDrawableSpan; import ru.noties.jlatexmath.JLatexMathDrawable; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonVisitor; -import ru.noties.markwon.image.AsyncDrawable; -import ru.noties.markwon.image.AsyncDrawableLoader; -import ru.noties.markwon.image.AsyncDrawableScheduler; -import ru.noties.markwon.image.AsyncDrawableSpan; -import ru.noties.markwon.image.ImageSize; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonVisitor; +import io.noties.markwon.image.AsyncDrawableLoader; +import io.noties.markwon.image.ImageSize; /** * @since 3.0.0 diff --git a/markwon-ext-strikethrough/README.md b/markwon-ext-strikethrough/README.md index acd8b513..1f99b846 100644 --- a/markwon-ext-strikethrough/README.md +++ b/markwon-ext-strikethrough/README.md @@ -1,6 +1,6 @@ # Strikethrough -[![ext-strikethrough](https://img.shields.io/maven-central/v/ru.noties.markwon/ext-strikethrough.svg?label=ext-strikethrough)](http://search.maven.org/#search|ga|1|g%3A%22ru.noties.markwon%22%20AND%20a%3A%22ext-strikethrough%22) +[![ext-strikethrough](https://img.shields.io/maven-central/v/io.noties.markwon/ext-strikethrough.svg?label=ext-strikethrough)](http://search.maven.org/#search|ga|1|g%3A%22io.noties.markwon%22%20AND%20a%3A%22ext-strikethrough%22) This module adds `strikethrough` functionality to `Markwon` via `StrikethroughPlugin`: diff --git a/markwon-ext-strikethrough/src/main/AndroidManifest.xml b/markwon-ext-strikethrough/src/main/AndroidManifest.xml index 6c243e1b..09c636bd 100644 --- a/markwon-ext-strikethrough/src/main/AndroidManifest.xml +++ b/markwon-ext-strikethrough/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/markwon-ext-strikethrough/src/main/java/ru/noties/markwon/ext/strikethrough/StrikethroughPlugin.java b/markwon-ext-strikethrough/src/main/java/io/noties/markwon/ext/strikethrough/StrikethroughPlugin.java similarity index 85% rename from markwon-ext-strikethrough/src/main/java/ru/noties/markwon/ext/strikethrough/StrikethroughPlugin.java rename to markwon-ext-strikethrough/src/main/java/io/noties/markwon/ext/strikethrough/StrikethroughPlugin.java index f73ccc71..08d7aa06 100644 --- a/markwon-ext-strikethrough/src/main/java/ru/noties/markwon/ext/strikethrough/StrikethroughPlugin.java +++ b/markwon-ext-strikethrough/src/main/java/io/noties/markwon/ext/strikethrough/StrikethroughPlugin.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.strikethrough; +package io.noties.markwon.ext.strikethrough; import android.support.annotation.NonNull; import android.text.style.StrikethroughSpan; @@ -9,12 +9,12 @@ import org.commonmark.parser.Parser; import java.util.Collections; -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 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; /** * Plugin to add strikethrough markdown feature. This plugin will extend commonmark-java.Parser diff --git a/markwon-ext-strikethrough/src/test/java/ru/noties/markwon/ext/strikethrough/StrikethroughPluginTest.java b/markwon-ext-strikethrough/src/test/java/io/noties/markwon/ext/strikethrough/StrikethroughPluginTest.java similarity index 87% rename from markwon-ext-strikethrough/src/test/java/ru/noties/markwon/ext/strikethrough/StrikethroughPluginTest.java rename to markwon-ext-strikethrough/src/test/java/io/noties/markwon/ext/strikethrough/StrikethroughPluginTest.java index 18cab664..db77c79d 100644 --- a/markwon-ext-strikethrough/src/test/java/ru/noties/markwon/ext/strikethrough/StrikethroughPluginTest.java +++ b/markwon-ext-strikethrough/src/test/java/io/noties/markwon/ext/strikethrough/StrikethroughPluginTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.strikethrough; +package io.noties.markwon.ext.strikethrough; import android.support.annotation.NonNull; import android.text.style.StrikethroughSpan; @@ -17,16 +17,16 @@ import org.robolectric.annotation.Config; import java.util.List; import ix.Ix; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.Markwon; -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.CorePlugin; -import ru.noties.markwon.test.TestSpan; -import ru.noties.markwon.test.TestSpanMatcher; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.Markwon; +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.CorePlugin; +import io.noties.markwon.test.TestSpan; +import io.noties.markwon.test.TestSpanMatcher; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -35,9 +35,9 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.document; +import static io.noties.markwon.test.TestSpan.span; +import static io.noties.markwon.test.TestSpan.text; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-ext-tables/README.md b/markwon-ext-tables/README.md index 6f94bd2d..5bb0effd 100644 --- a/markwon-ext-tables/README.md +++ b/markwon-ext-tables/README.md @@ -1,6 +1,6 @@ # Tables -[![ext-tables](https://img.shields.io/maven-central/v/ru.noties.markwon/ext-tables.svg?label=ext-tables)](http://search.maven.org/#search|ga|1|g%3A%22ru.noties.markwon%22%20AND%20a%3A%22ext-tables%22) +[![ext-tables](https://img.shields.io/maven-central/v/io.noties.markwon/ext-tables.svg?label=ext-tables)](http://search.maven.org/#search|ga|1|g%3A%22io.noties.markwon%22%20AND%20a%3A%22ext-tables%22) This extension adds support for GFM tables. diff --git a/markwon-ext-tables/src/main/AndroidManifest.xml b/markwon-ext-tables/src/main/AndroidManifest.xml index f65b9d67..d83c2374 100644 --- a/markwon-ext-tables/src/main/AndroidManifest.xml +++ b/markwon-ext-tables/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/Table.java b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/Table.java similarity index 98% rename from markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/Table.java rename to markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/Table.java index 12fee872..774c52e2 100644 --- a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/Table.java +++ b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/Table.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.tables; +package io.noties.markwon.ext.tables; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -14,7 +14,7 @@ import org.commonmark.node.CustomNode; import java.util.ArrayList; import java.util.List; -import ru.noties.markwon.Markwon; +import io.noties.markwon.Markwon; /** * A class to parse TableBlock and return a data-structure that is not dependent diff --git a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TablePlugin.java b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TablePlugin.java similarity index 97% rename from markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TablePlugin.java rename to markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TablePlugin.java index f05a84fc..7846029c 100644 --- a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TablePlugin.java +++ b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TablePlugin.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.tables; +package io.noties.markwon.ext.tables; import android.content.Context; import android.support.annotation.NonNull; @@ -17,9 +17,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.MarkwonVisitor; -import ru.noties.markwon.SpannableBuilder; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.MarkwonVisitor; +import io.noties.markwon.SpannableBuilder; /** * @since 3.0.0 diff --git a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableRowSpan.java b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableRowSpan.java similarity index 99% rename from markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableRowSpan.java rename to markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableRowSpan.java index 3f9bbace..a4bd08a7 100644 --- a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableRowSpan.java +++ b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableRowSpan.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.tables; +package io.noties.markwon.ext.tables; import android.annotation.SuppressLint; import android.graphics.Canvas; diff --git a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableRowsScheduler.java b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableRowsScheduler.java similarity index 98% rename from markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableRowsScheduler.java rename to markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableRowsScheduler.java index b3b4c773..5fbb6b4b 100644 --- a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableRowsScheduler.java +++ b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableRowsScheduler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.tables; +package io.noties.markwon.ext.tables; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableTheme.java b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableTheme.java similarity index 97% rename from markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableTheme.java rename to markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableTheme.java index e9b1bd47..eeab17d9 100644 --- a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableTheme.java +++ b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableTheme.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.tables; +package io.noties.markwon.ext.tables; import android.content.Context; import android.graphics.Paint; @@ -6,8 +6,8 @@ import android.support.annotation.ColorInt; import android.support.annotation.NonNull; import android.support.annotation.Px; -import ru.noties.markwon.utils.ColorUtils; -import ru.noties.markwon.utils.Dip; +import io.noties.markwon.utils.ColorUtils; +import io.noties.markwon.utils.Dip; public class TableTheme { diff --git a/markwon-ext-tasklist/src/main/AndroidManifest.xml b/markwon-ext-tasklist/src/main/AndroidManifest.xml index 14f5d738..2d436d25 100644 --- a/markwon-ext-tasklist/src/main/AndroidManifest.xml +++ b/markwon-ext-tasklist/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListBlock.java b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListBlock.java similarity index 74% rename from markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListBlock.java rename to markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListBlock.java index 4e3cc8b4..157104f4 100644 --- a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListBlock.java +++ b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListBlock.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.tasklist; +package io.noties.markwon.ext.tasklist; import org.commonmark.node.CustomBlock; diff --git a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListBlockParser.java b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListBlockParser.java similarity index 99% rename from markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListBlockParser.java rename to markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListBlockParser.java index 417d92a7..b36ce73a 100644 --- a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListBlockParser.java +++ b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListBlockParser.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.tasklist; +package io.noties.markwon.ext.tasklist; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListDrawable.java b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListDrawable.java similarity index 99% rename from markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListDrawable.java rename to markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListDrawable.java index 4a02c6c4..b43ea1ec 100644 --- a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListDrawable.java +++ b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListDrawable.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.tasklist; +package io.noties.markwon.ext.tasklist; import android.graphics.Canvas; import android.graphics.ColorFilter; diff --git a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListItem.java b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListItem.java similarity index 92% rename from markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListItem.java rename to markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListItem.java index 65b969db..0ba504b8 100644 --- a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListItem.java +++ b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListItem.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.tasklist; +package io.noties.markwon.ext.tasklist; import org.commonmark.node.CustomNode; diff --git a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListPlugin.java b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListPlugin.java similarity index 93% rename from markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListPlugin.java rename to markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListPlugin.java index ec664280..5c37ea8c 100644 --- a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListPlugin.java +++ b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListPlugin.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.tasklist; +package io.noties.markwon.ext.tasklist; import android.content.Context; import android.content.res.TypedArray; @@ -11,11 +11,11 @@ import android.util.TypedValue; import org.commonmark.node.Node; import org.commonmark.parser.Parser; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.MarkwonSpansFactory; -import ru.noties.markwon.MarkwonVisitor; -import ru.noties.markwon.RenderProps; -import ru.noties.markwon.core.SimpleBlockNodeVisitor; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.MarkwonSpansFactory; +import io.noties.markwon.MarkwonVisitor; +import io.noties.markwon.RenderProps; +import io.noties.markwon.core.SimpleBlockNodeVisitor; /** * @since 3.0.0 diff --git a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListProps.java b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListProps.java similarity index 78% rename from markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListProps.java rename to markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListProps.java index 7a0b6ca7..9e02990b 100644 --- a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListProps.java +++ b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListProps.java @@ -1,6 +1,6 @@ -package ru.noties.markwon.ext.tasklist; +package io.noties.markwon.ext.tasklist; -import ru.noties.markwon.Prop; +import io.noties.markwon.Prop; /** * @since 3.0.0 diff --git a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListSpan.java b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListSpan.java similarity index 95% rename from markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListSpan.java rename to markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListSpan.java index b851f382..02d8a2a3 100644 --- a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListSpan.java +++ b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListSpan.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.tasklist; +package io.noties.markwon.ext.tasklist; import android.graphics.Canvas; import android.graphics.Paint; @@ -7,8 +7,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; /** * @since 1.0.1 diff --git a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListSpanFactory.java b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListSpanFactory.java similarity index 80% rename from markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListSpanFactory.java rename to markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListSpanFactory.java index bd68ede3..80864340 100644 --- a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListSpanFactory.java +++ b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListSpanFactory.java @@ -1,12 +1,12 @@ -package ru.noties.markwon.ext.tasklist; +package io.noties.markwon.ext.tasklist; import android.graphics.drawable.Drawable; 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 TaskListSpanFactory implements SpanFactory { diff --git a/markwon-ext-tasklist/src/test/java/ru/noties/markwon/ext/tasklist/TaskListTest.java b/markwon-ext-tasklist/src/test/java/io/noties/markwon/ext/tasklist/TaskListTest.java similarity index 56% rename from markwon-ext-tasklist/src/test/java/ru/noties/markwon/ext/tasklist/TaskListTest.java rename to markwon-ext-tasklist/src/test/java/io/noties/markwon/ext/tasklist/TaskListTest.java index 6097312a..c28a8555 100644 --- a/markwon-ext-tasklist/src/test/java/ru/noties/markwon/ext/tasklist/TaskListTest.java +++ b/markwon-ext-tasklist/src/test/java/io/noties/markwon/ext/tasklist/TaskListTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.ext.tasklist; +package io.noties.markwon.ext.tasklist; import android.support.annotation.NonNull; @@ -12,19 +12,16 @@ import org.robolectric.annotation.Config; import java.io.IOException; import java.nio.charset.StandardCharsets; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.Markwon; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonSpansFactory; -import ru.noties.markwon.RenderProps; -import ru.noties.markwon.SpanFactory; -import ru.noties.markwon.test.TestSpan; -import ru.noties.markwon.test.TestSpanMatcher; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.Markwon; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonSpansFactory; +import io.noties.markwon.RenderProps; +import io.noties.markwon.SpanFactory; +import io.noties.markwon.test.TestSpan; +import io.noties.markwon.test.TestSpanMatcher; -import static ru.noties.markwon.test.TestSpan.args; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.span; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) @@ -36,28 +33,28 @@ public class TaskListTest { @Test public void test() { - final TestSpan.Document document = document( - span(SPAN, args(IS_DONE, false), text("First")), + final TestSpan.Document document = TestSpan.document( + TestSpan.span(SPAN, TestSpan.args(IS_DONE, false), TestSpan.text("First")), newLine(), - span(SPAN, args(IS_DONE, true), text("Second")), + TestSpan.span(SPAN, TestSpan.args(IS_DONE, true), TestSpan.text("Second")), newLine(), - span(SPAN, args(IS_DONE, true), text("Third")), + TestSpan.span(SPAN, TestSpan.args(IS_DONE, true), TestSpan.text("Third")), newLine(), - span(SPAN, args(IS_DONE, false), text("First star")), + TestSpan.span(SPAN, TestSpan.args(IS_DONE, false), TestSpan.text("First star")), newLine(), - span(SPAN, args(IS_DONE, true), text("Second star")), + TestSpan.span(SPAN, TestSpan.args(IS_DONE, true), TestSpan.text("Second star")), newLine(), - span(SPAN, args(IS_DONE, true), text("Third star")), + TestSpan.span(SPAN, TestSpan.args(IS_DONE, true), TestSpan.text("Third star")), newLine(), - span(SPAN, args(IS_DONE, false), text("First plus")), + TestSpan.span(SPAN, TestSpan.args(IS_DONE, false), TestSpan.text("First plus")), newLine(), - span(SPAN, args(IS_DONE, true), text("Second plus")), + TestSpan.span(SPAN, TestSpan.args(IS_DONE, true), TestSpan.text("Second plus")), newLine(), - span(SPAN, args(IS_DONE, true), text("Third plus")), + TestSpan.span(SPAN, TestSpan.args(IS_DONE, true), TestSpan.text("Third plus")), newLine(), - span(SPAN, args(IS_DONE, true), text("Number with dot")), + TestSpan.span(SPAN, TestSpan.args(IS_DONE, true), TestSpan.text("Number with dot")), newLine(), - span(SPAN, args(IS_DONE, false), text("Number")) + TestSpan.span(SPAN, TestSpan.args(IS_DONE, false), TestSpan.text("Number")) ); TestSpanMatcher.matches( @@ -76,7 +73,7 @@ public class TaskListTest { builder.setFactory(TaskListItem.class, new SpanFactory() { @Override public Object getSpans(@NonNull MarkwonConfiguration configuration, @NonNull RenderProps props) { - return span(SPAN, args(IS_DONE, TaskListProps.DONE.require(props))); + return TestSpan.span(SPAN, TestSpan.args(IS_DONE, TaskListProps.DONE.require(props))); } }); } @@ -96,6 +93,6 @@ public class TaskListTest { @NonNull private static TestSpan.Text newLine() { - return text("\n"); + return TestSpan.text("\n"); } } diff --git a/markwon-html/src/main/AndroidManifest.xml b/markwon-html/src/main/AndroidManifest.xml index 6d886e0e..9eff536f 100644 --- a/markwon-html/src/main/AndroidManifest.xml +++ b/markwon-html/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/AppendableUtils.java b/markwon-html/src/main/java/io/noties/markwon/html/AppendableUtils.java similarity index 96% rename from markwon-html/src/main/java/ru/noties/markwon/html/AppendableUtils.java rename to markwon-html/src/main/java/io/noties/markwon/html/AppendableUtils.java index 5e890174..29f25b83 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/AppendableUtils.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/AppendableUtils.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import android.support.annotation.NonNull; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/CssInlineStyleParser.java b/markwon-html/src/main/java/io/noties/markwon/html/CssInlineStyleParser.java similarity index 99% rename from markwon-html/src/main/java/ru/noties/markwon/html/CssInlineStyleParser.java rename to markwon-html/src/main/java/io/noties/markwon/html/CssInlineStyleParser.java index c9d7c1fc..c06f396d 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/CssInlineStyleParser.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/CssInlineStyleParser.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/CssProperty.java b/markwon-html/src/main/java/io/noties/markwon/html/CssProperty.java similarity index 96% rename from markwon-html/src/main/java/ru/noties/markwon/html/CssProperty.java rename to markwon-html/src/main/java/io/noties/markwon/html/CssProperty.java index 70bc6d88..6805296e 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/CssProperty.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/CssProperty.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import android.support.annotation.NonNull; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/HtmlEmptyTagReplacement.java b/markwon-html/src/main/java/io/noties/markwon/html/HtmlEmptyTagReplacement.java similarity index 98% rename from markwon-html/src/main/java/ru/noties/markwon/html/HtmlEmptyTagReplacement.java rename to markwon-html/src/main/java/io/noties/markwon/html/HtmlEmptyTagReplacement.java index c191b59d..416346e6 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/HtmlEmptyTagReplacement.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/HtmlEmptyTagReplacement.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/HtmlPlugin.java b/markwon-html/src/main/java/io/noties/markwon/html/HtmlPlugin.java similarity index 86% rename from markwon-html/src/main/java/ru/noties/markwon/html/HtmlPlugin.java rename to markwon-html/src/main/java/io/noties/markwon/html/HtmlPlugin.java index 8e437ac5..526fb323 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/HtmlPlugin.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/HtmlPlugin.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -7,20 +7,20 @@ import org.commonmark.node.HtmlBlock; import org.commonmark.node.HtmlInline; import org.commonmark.node.Node; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonVisitor; -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; +import io.noties.markwon.html.tag.ImageHandler; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonVisitor; +import io.noties.markwon.html.tag.BlockquoteHandler; +import io.noties.markwon.html.tag.EmphasisHandler; +import io.noties.markwon.html.tag.HeadingHandler; +import io.noties.markwon.html.tag.LinkHandler; +import io.noties.markwon.html.tag.ListHandler; +import io.noties.markwon.html.tag.StrikeHandler; +import io.noties.markwon.html.tag.StrongEmphasisHandler; +import io.noties.markwon.html.tag.SubScriptHandler; +import io.noties.markwon.html.tag.SuperScriptHandler; +import io.noties.markwon.html.tag.UnderlineHandler; /** * @since 3.0.0 diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/HtmlTagImpl.java b/markwon-html/src/main/java/io/noties/markwon/html/HtmlTagImpl.java similarity index 99% rename from markwon-html/src/main/java/ru/noties/markwon/html/HtmlTagImpl.java rename to markwon-html/src/main/java/io/noties/markwon/html/HtmlTagImpl.java index 7c07360a..3dfb2c00 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/HtmlTagImpl.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/HtmlTagImpl.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserImpl.java b/markwon-html/src/main/java/io/noties/markwon/html/MarkwonHtmlParserImpl.java similarity index 93% rename from markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserImpl.java rename to markwon-html/src/main/java/io/noties/markwon/html/MarkwonHtmlParserImpl.java index e0f4a9e3..ba0ce566 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserImpl.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/MarkwonHtmlParserImpl.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -14,16 +14,14 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import ru.noties.markwon.html.HtmlTag.Block; -import ru.noties.markwon.html.HtmlTag.Inline; -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 io.noties.markwon.html.jsoup.nodes.Attribute; +import io.noties.markwon.html.jsoup.nodes.Attributes; +import io.noties.markwon.html.jsoup.parser.CharacterReader; +import io.noties.markwon.html.jsoup.parser.ParseErrorList; +import io.noties.markwon.html.jsoup.parser.Token; +import io.noties.markwon.html.jsoup.parser.Tokeniser; -import static ru.noties.markwon.html.AppendableUtils.appendQuietly; +import static io.noties.markwon.html.AppendableUtils.appendQuietly; /** * @since 2.0.0 @@ -186,7 +184,7 @@ public class MarkwonHtmlParserImpl extends MarkwonHtmlParser { } @Override - public void flushInlineTags(int documentLength, @NonNull FlushAction action) { + public void flushInlineTags(int documentLength, @NonNull FlushAction action) { if (inlineTags.size() > 0) { if (documentLength > HtmlTag.NO_END) { @@ -195,15 +193,15 @@ public class MarkwonHtmlParserImpl extends MarkwonHtmlParser { } } - action.apply(Collections.unmodifiableList((List) inlineTags)); + action.apply(Collections.unmodifiableList((List) inlineTags)); inlineTags.clear(); } else { - action.apply(Collections.emptyList()); + action.apply(Collections.emptyList()); } } @Override - public void flushBlockTags(int documentLength, @NonNull FlushAction action) { + public void flushBlockTags(int documentLength, @NonNull FlushAction action) { HtmlTagImpl.BlockImpl block = currentBlock; while (block.parent != null) { @@ -214,11 +212,11 @@ public class MarkwonHtmlParserImpl extends MarkwonHtmlParser { block.closeAt(documentLength); } - final List children = block.children(); + final List children = block.children(); if (children.size() > 0) { action.apply(children); } else { - action.apply(Collections.emptyList()); + action.apply(Collections.emptyList()); } currentBlock = HtmlTagImpl.BlockImpl.root(); @@ -247,7 +245,7 @@ public class MarkwonHtmlParserImpl extends MarkwonHtmlParser { final String replacement = emptyTagReplacement.replace(inline); if (replacement != null && replacement.length() > 0) { - appendQuietly(output, replacement); + AppendableUtils.appendQuietly(output, replacement); } // the thing is: we will keep this inline tag in the list, @@ -292,7 +290,7 @@ public class MarkwonHtmlParserImpl extends MarkwonHtmlParser { // it must be closed here not matter what we are as here we _assume_ // that it's a block tag currentBlock.closeAt(output.length()); - appendQuietly(output, '\n'); + AppendableUtils.appendQuietly(output, '\n'); currentBlock = currentBlock.parent; } else if (TAG_LIST_ITEM.equals(name) && TAG_LIST_ITEM.equals(currentBlock.name)) { @@ -317,7 +315,7 @@ public class MarkwonHtmlParserImpl extends MarkwonHtmlParser { final String replacement = emptyTagReplacement.replace(block); if (replacement != null && replacement.length() > 0) { - appendQuietly(output, replacement); + AppendableUtils.appendQuietly(output, replacement); } block.closeAt(output.length()); } @@ -357,7 +355,7 @@ public class MarkwonHtmlParserImpl extends MarkwonHtmlParser { } if (TAG_PARAGRAPH.equals(name)) { - appendQuietly(output, '\n'); + AppendableUtils.appendQuietly(output, '\n'); } this.currentBlock = block.parent; @@ -441,7 +439,7 @@ public class MarkwonHtmlParserImpl extends MarkwonHtmlParser { final int length = output.length(); if (length > 0 && '\n' != output.charAt(length - 1)) { - appendQuietly(output, '\n'); + AppendableUtils.appendQuietly(output, '\n'); } } @@ -477,7 +475,7 @@ public class MarkwonHtmlParserImpl extends MarkwonHtmlParser { @NonNull HtmlTagImpl tag) { final String replacement = emptyTagReplacement.replace(tag); if (replacement != null) { - appendQuietly(output, replacement); + AppendableUtils.appendQuietly(output, replacement); } } } diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererImpl.java b/markwon-html/src/main/java/io/noties/markwon/html/MarkwonHtmlRendererImpl.java similarity index 98% rename from markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererImpl.java rename to markwon-html/src/main/java/io/noties/markwon/html/MarkwonHtmlRendererImpl.java index dbde9035..fe3e1d97 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererImpl.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/MarkwonHtmlRendererImpl.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -8,7 +8,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import ru.noties.markwon.MarkwonVisitor; +import io.noties.markwon.MarkwonVisitor; class MarkwonHtmlRendererImpl extends MarkwonHtmlRenderer { diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/TagHandlerNoOp.java b/markwon-html/src/main/java/io/noties/markwon/html/TagHandlerNoOp.java similarity index 92% rename from markwon-html/src/main/java/ru/noties/markwon/html/TagHandlerNoOp.java rename to markwon-html/src/main/java/io/noties/markwon/html/TagHandlerNoOp.java index c96d6867..944a10f9 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/TagHandlerNoOp.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/TagHandlerNoOp.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import android.support.annotation.NonNull; @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import ru.noties.markwon.MarkwonVisitor; +import io.noties.markwon.MarkwonVisitor; /** * @since 4.0.0-SNAPSHOT diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/TrimmingAppender.java b/markwon-html/src/main/java/io/noties/markwon/html/TrimmingAppender.java similarity index 95% rename from markwon-html/src/main/java/ru/noties/markwon/html/TrimmingAppender.java rename to markwon-html/src/main/java/io/noties/markwon/html/TrimmingAppender.java index 4f884b00..0115a531 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/TrimmingAppender.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/TrimmingAppender.java @@ -1,8 +1,8 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import android.support.annotation.NonNull; -import static ru.noties.markwon.html.AppendableUtils.appendQuietly; +import static io.noties.markwon.html.AppendableUtils.appendQuietly; abstract class TrimmingAppender { diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/UncheckedIOException.java b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/UncheckedIOException.java similarity index 87% rename from markwon-html/src/main/java/ru/noties/markwon/html/jsoup/UncheckedIOException.java rename to markwon-html/src/main/java/io/noties/markwon/html/jsoup/UncheckedIOException.java index 9548bdf4..3a8f568b 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/UncheckedIOException.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/UncheckedIOException.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.jsoup; +package io.noties.markwon.html.jsoup; import java.io.IOException; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/helper/Normalizer.java b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/helper/Normalizer.java similarity index 90% rename from markwon-html/src/main/java/ru/noties/markwon/html/jsoup/helper/Normalizer.java rename to markwon-html/src/main/java/io/noties/markwon/html/jsoup/helper/Normalizer.java index a0df7dd4..4bc3181a 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/helper/Normalizer.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/helper/Normalizer.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.jsoup.helper; +package io.noties.markwon.html.jsoup.helper; import java.util.Locale; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/helper/Validate.java b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/helper/Validate.java similarity index 98% rename from markwon-html/src/main/java/ru/noties/markwon/html/jsoup/helper/Validate.java rename to markwon-html/src/main/java/io/noties/markwon/html/jsoup/helper/Validate.java index 0d00249b..171be48a 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/helper/Validate.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/helper/Validate.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.jsoup.helper; +package io.noties.markwon.html.jsoup.helper; /** * Simple validation methods. Designed for jsoup internal use diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/Attribute.java b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/nodes/Attribute.java similarity index 98% rename from markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/Attribute.java rename to markwon-html/src/main/java/io/noties/markwon/html/jsoup/nodes/Attribute.java index 934dc364..2ea27051 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/Attribute.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/nodes/Attribute.java @@ -1,8 +1,8 @@ -package ru.noties.markwon.html.jsoup.nodes; +package io.noties.markwon.html.jsoup.nodes; import java.util.Map; -import ru.noties.markwon.html.jsoup.helper.Validate; +import io.noties.markwon.html.jsoup.helper.Validate; /** A single key + value attribute. (Only used for presentation.) diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/Attributes.java b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/nodes/Attributes.java similarity index 98% rename from markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/Attributes.java rename to markwon-html/src/main/java/io/noties/markwon/html/jsoup/nodes/Attributes.java index ced993b0..1656a3c5 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/Attributes.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/nodes/Attributes.java @@ -1,11 +1,11 @@ -package ru.noties.markwon.html.jsoup.nodes; +package io.noties.markwon.html.jsoup.nodes; import java.util.Arrays; import java.util.Iterator; -import ru.noties.markwon.html.jsoup.helper.Validate; +import io.noties.markwon.html.jsoup.helper.Validate; -import static ru.noties.markwon.html.jsoup.helper.Normalizer.lowerCase; +import static io.noties.markwon.html.jsoup.helper.Normalizer.lowerCase; /** * The attributes of an Element. diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/CommonMarkEntities.java b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/nodes/CommonMarkEntities.java similarity index 97% rename from markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/CommonMarkEntities.java rename to markwon-html/src/main/java/io/noties/markwon/html/jsoup/nodes/CommonMarkEntities.java index ec362312..1bf8dca5 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/CommonMarkEntities.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/nodes/CommonMarkEntities.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.jsoup.nodes; +package io.noties.markwon.html.jsoup.nodes; import android.support.annotation.NonNull; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/DocumentType.java b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/nodes/DocumentType.java similarity index 98% rename from markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/DocumentType.java rename to markwon-html/src/main/java/io/noties/markwon/html/jsoup/nodes/DocumentType.java index dc11e537..28e82f70 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/DocumentType.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/nodes/DocumentType.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.jsoup.nodes; +package io.noties.markwon.html.jsoup.nodes; /** * A {@code } node. diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/CharacterReader.java b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/CharacterReader.java similarity index 98% rename from markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/CharacterReader.java rename to markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/CharacterReader.java index 1839cc2b..c9dc770f 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/CharacterReader.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/CharacterReader.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.jsoup.parser; +package io.noties.markwon.html.jsoup.parser; import java.io.IOException; import java.io.Reader; @@ -6,8 +6,8 @@ import java.io.StringReader; import java.util.Arrays; import java.util.Locale; -import ru.noties.markwon.html.jsoup.UncheckedIOException; -import ru.noties.markwon.html.jsoup.helper.Validate; +import io.noties.markwon.html.jsoup.UncheckedIOException; +import io.noties.markwon.html.jsoup.helper.Validate; /** * CharacterReader consumes tokens off a string. Used internally by jsoup. API subject to changes. diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/ParseError.java b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/ParseError.java similarity index 95% rename from markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/ParseError.java rename to markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/ParseError.java index 533f9aee..bc97fcb3 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/ParseError.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/ParseError.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.jsoup.parser; +package io.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. diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/ParseErrorList.java b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/ParseErrorList.java similarity index 94% rename from markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/ParseErrorList.java rename to markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/ParseErrorList.java index a3e42a08..919c7b35 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/ParseErrorList.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/ParseErrorList.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.jsoup.parser; +package io.noties.markwon.html.jsoup.parser; import java.util.ArrayList; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/Token.java b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/Token.java similarity index 98% rename from markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/Token.java rename to markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/Token.java index 887cc61c..428186b5 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/Token.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/Token.java @@ -1,11 +1,11 @@ -package ru.noties.markwon.html.jsoup.parser; +package io.noties.markwon.html.jsoup.parser; import android.support.annotation.NonNull; -import ru.noties.markwon.html.jsoup.helper.Validate; -import ru.noties.markwon.html.jsoup.nodes.Attributes; +import io.noties.markwon.html.jsoup.helper.Validate; +import io.noties.markwon.html.jsoup.nodes.Attributes; -import static ru.noties.markwon.html.jsoup.helper.Normalizer.lowerCase; +import static io.noties.markwon.html.jsoup.helper.Normalizer.lowerCase; /** * Parse tokens for the Tokeniser. diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/Tokeniser.java b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/Tokeniser.java similarity index 98% rename from markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/Tokeniser.java rename to markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/Tokeniser.java index 3b871776..786ab75a 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/Tokeniser.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/Tokeniser.java @@ -1,9 +1,9 @@ -package ru.noties.markwon.html.jsoup.parser; +package io.noties.markwon.html.jsoup.parser; import java.util.Arrays; -import ru.noties.markwon.html.jsoup.helper.Validate; -import ru.noties.markwon.html.jsoup.nodes.CommonMarkEntities; +import io.noties.markwon.html.jsoup.helper.Validate; +import io.noties.markwon.html.jsoup.nodes.CommonMarkEntities; /** * Readers the input stream into tokens. diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/TokeniserState.java b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/TokeniserState.java similarity index 99% rename from markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/TokeniserState.java rename to markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/TokeniserState.java index 01a98958..f4b7bdb4 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/TokeniserState.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/jsoup/parser/TokeniserState.java @@ -1,6 +1,6 @@ -package ru.noties.markwon.html.jsoup.parser; +package io.noties.markwon.html.jsoup.parser; -import ru.noties.markwon.html.jsoup.nodes.DocumentType; +import io.noties.markwon.html.jsoup.nodes.DocumentType; /** * States and transition activations for the Tokeniser. diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/span/SubScriptSpan.java b/markwon-html/src/main/java/io/noties/markwon/html/span/SubScriptSpan.java similarity index 87% rename from markwon-html/src/main/java/ru/noties/markwon/html/span/SubScriptSpan.java rename to markwon-html/src/main/java/io/noties/markwon/html/span/SubScriptSpan.java index 5ab51160..8fa840ad 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/span/SubScriptSpan.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/span/SubScriptSpan.java @@ -1,10 +1,10 @@ -package ru.noties.markwon.html.span; +package io.noties.markwon.html.span; import android.support.annotation.NonNull; import android.text.TextPaint; import android.text.style.MetricAffectingSpan; -import ru.noties.markwon.html.HtmlPlugin; +import io.noties.markwon.html.HtmlPlugin; public class SubScriptSpan extends MetricAffectingSpan { diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/span/SuperScriptSpan.java b/markwon-html/src/main/java/io/noties/markwon/html/span/SuperScriptSpan.java similarity index 87% rename from markwon-html/src/main/java/ru/noties/markwon/html/span/SuperScriptSpan.java rename to markwon-html/src/main/java/io/noties/markwon/html/span/SuperScriptSpan.java index 7375309a..6c4d5247 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/span/SuperScriptSpan.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/span/SuperScriptSpan.java @@ -1,10 +1,10 @@ -package ru.noties.markwon.html.span; +package io.noties.markwon.html.span; import android.support.annotation.NonNull; import android.text.TextPaint; import android.text.style.MetricAffectingSpan; -import ru.noties.markwon.html.HtmlPlugin; +import io.noties.markwon.html.HtmlPlugin; public class SuperScriptSpan extends MetricAffectingSpan { diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/BlockquoteHandler.java b/markwon-html/src/main/java/io/noties/markwon/html/tag/BlockquoteHandler.java similarity index 75% rename from markwon-html/src/main/java/ru/noties/markwon/html/tag/BlockquoteHandler.java rename to markwon-html/src/main/java/io/noties/markwon/html/tag/BlockquoteHandler.java index 31ed4916..ee8373c7 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/BlockquoteHandler.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/tag/BlockquoteHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.tag; +package io.noties.markwon.html.tag; import android.support.annotation.NonNull; @@ -7,13 +7,13 @@ import org.commonmark.node.BlockQuote; import java.util.Collection; import java.util.Collections; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonVisitor; -import ru.noties.markwon.SpanFactory; -import ru.noties.markwon.SpannableBuilder; -import ru.noties.markwon.html.HtmlTag; -import ru.noties.markwon.html.MarkwonHtmlRenderer; -import ru.noties.markwon.html.TagHandler; +import io.noties.markwon.html.HtmlTag; +import io.noties.markwon.html.MarkwonHtmlRenderer; +import io.noties.markwon.html.TagHandler; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonVisitor; +import io.noties.markwon.SpanFactory; +import io.noties.markwon.SpannableBuilder; public class BlockquoteHandler extends TagHandler { diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/EmphasisHandler.java b/markwon-html/src/main/java/io/noties/markwon/html/tag/EmphasisHandler.java similarity index 80% rename from markwon-html/src/main/java/ru/noties/markwon/html/tag/EmphasisHandler.java rename to markwon-html/src/main/java/io/noties/markwon/html/tag/EmphasisHandler.java index a5e62c40..ff7c4e5e 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/EmphasisHandler.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/tag/EmphasisHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.tag; +package io.noties.markwon.html.tag; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -8,10 +8,10 @@ import org.commonmark.node.Emphasis; import java.util.Arrays; import java.util.Collection; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.RenderProps; -import ru.noties.markwon.SpanFactory; -import ru.noties.markwon.html.HtmlTag; +import io.noties.markwon.html.HtmlTag; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.RenderProps; +import io.noties.markwon.SpanFactory; public class EmphasisHandler extends SimpleTagHandler { @Nullable diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/HeadingHandler.java b/markwon-html/src/main/java/io/noties/markwon/html/tag/HeadingHandler.java similarity index 82% rename from markwon-html/src/main/java/ru/noties/markwon/html/tag/HeadingHandler.java rename to markwon-html/src/main/java/io/noties/markwon/html/tag/HeadingHandler.java index 8c778f94..155a46fa 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/HeadingHandler.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/tag/HeadingHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.tag; +package io.noties.markwon.html.tag; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -8,11 +8,11 @@ import org.commonmark.node.Heading; import java.util.Arrays; import java.util.Collection; -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.html.HtmlTag; +import io.noties.markwon.core.CoreProps; +import io.noties.markwon.html.HtmlTag; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.RenderProps; +import io.noties.markwon.SpanFactory; public class HeadingHandler extends SimpleTagHandler { diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageHandler.java b/markwon-html/src/main/java/io/noties/markwon/html/tag/ImageHandler.java similarity index 86% rename from markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageHandler.java rename to markwon-html/src/main/java/io/noties/markwon/html/tag/ImageHandler.java index 04cbe46e..e93c42cb 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageHandler.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/tag/ImageHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.tag; +package io.noties.markwon.html.tag; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -10,13 +10,13 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.RenderProps; -import ru.noties.markwon.SpanFactory; -import ru.noties.markwon.html.CssInlineStyleParser; -import ru.noties.markwon.html.HtmlTag; -import ru.noties.markwon.image.ImageProps; -import ru.noties.markwon.image.ImageSize; +import io.noties.markwon.image.ImageSize; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.RenderProps; +import io.noties.markwon.SpanFactory; +import io.noties.markwon.html.CssInlineStyleParser; +import io.noties.markwon.html.HtmlTag; +import io.noties.markwon.image.ImageProps; public class ImageHandler extends SimpleTagHandler { diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageSizeParserImpl.java b/markwon-html/src/main/java/io/noties/markwon/html/tag/ImageSizeParserImpl.java similarity index 94% rename from markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageSizeParserImpl.java rename to markwon-html/src/main/java/io/noties/markwon/html/tag/ImageSizeParserImpl.java index 236f53be..69eb0412 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageSizeParserImpl.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/tag/ImageSizeParserImpl.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.tag; +package io.noties.markwon.html.tag; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -7,9 +7,9 @@ import android.text.TextUtils; import java.util.Map; -import ru.noties.markwon.html.CssInlineStyleParser; -import ru.noties.markwon.html.CssProperty; -import ru.noties.markwon.image.ImageSize; +import io.noties.markwon.html.CssInlineStyleParser; +import io.noties.markwon.html.CssProperty; +import io.noties.markwon.image.ImageSize; class ImageSizeParserImpl implements ImageHandler.ImageSizeParser { diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/LinkHandler.java b/markwon-html/src/main/java/io/noties/markwon/html/tag/LinkHandler.java similarity index 81% rename from markwon-html/src/main/java/ru/noties/markwon/html/tag/LinkHandler.java rename to markwon-html/src/main/java/io/noties/markwon/html/tag/LinkHandler.java index a1687dd8..a3cd6084 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/LinkHandler.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/tag/LinkHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.tag; +package io.noties.markwon.html.tag; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -9,11 +9,11 @@ import org.commonmark.node.Link; import java.util.Collection; import java.util.Collections; -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.html.HtmlTag; +import io.noties.markwon.core.CoreProps; +import io.noties.markwon.html.HtmlTag; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.RenderProps; +import io.noties.markwon.SpanFactory; public class LinkHandler extends SimpleTagHandler { @Nullable diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/ListHandler.java b/markwon-html/src/main/java/io/noties/markwon/html/tag/ListHandler.java similarity index 84% rename from markwon-html/src/main/java/ru/noties/markwon/html/tag/ListHandler.java rename to markwon-html/src/main/java/io/noties/markwon/html/tag/ListHandler.java index a8f8df9d..d214aaca 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/ListHandler.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/tag/ListHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.tag; +package io.noties.markwon.html.tag; import android.support.annotation.NonNull; @@ -7,15 +7,15 @@ import org.commonmark.node.ListItem; import java.util.Arrays; import java.util.Collection; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonVisitor; -import ru.noties.markwon.RenderProps; -import ru.noties.markwon.SpanFactory; -import ru.noties.markwon.SpannableBuilder; -import ru.noties.markwon.core.CoreProps; -import ru.noties.markwon.html.HtmlTag; -import ru.noties.markwon.html.MarkwonHtmlRenderer; -import ru.noties.markwon.html.TagHandler; +import io.noties.markwon.core.CoreProps; +import io.noties.markwon.html.HtmlTag; +import io.noties.markwon.html.MarkwonHtmlRenderer; +import io.noties.markwon.html.TagHandler; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonVisitor; +import io.noties.markwon.RenderProps; +import io.noties.markwon.SpanFactory; +import io.noties.markwon.SpannableBuilder; public class ListHandler extends TagHandler { diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/SimpleTagHandler.java b/markwon-html/src/main/java/io/noties/markwon/html/tag/SimpleTagHandler.java similarity index 70% rename from markwon-html/src/main/java/ru/noties/markwon/html/tag/SimpleTagHandler.java rename to markwon-html/src/main/java/io/noties/markwon/html/tag/SimpleTagHandler.java index 94341b2f..bf0f141c 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/SimpleTagHandler.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/tag/SimpleTagHandler.java @@ -1,17 +1,17 @@ -package ru.noties.markwon.html.tag; +package io.noties.markwon.html.tag; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import java.util.Collection; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonVisitor; -import ru.noties.markwon.RenderProps; -import ru.noties.markwon.SpannableBuilder; -import ru.noties.markwon.html.HtmlTag; -import ru.noties.markwon.html.MarkwonHtmlRenderer; -import ru.noties.markwon.html.TagHandler; +import io.noties.markwon.html.HtmlTag; +import io.noties.markwon.html.MarkwonHtmlRenderer; +import io.noties.markwon.html.TagHandler; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonVisitor; +import io.noties.markwon.RenderProps; +import io.noties.markwon.SpannableBuilder; public abstract class SimpleTagHandler extends TagHandler { diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/StrikeHandler.java b/markwon-html/src/main/java/io/noties/markwon/html/tag/StrikeHandler.java similarity index 84% rename from markwon-html/src/main/java/ru/noties/markwon/html/tag/StrikeHandler.java rename to markwon-html/src/main/java/io/noties/markwon/html/tag/StrikeHandler.java index 02dedc8a..2715a8f5 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/StrikeHandler.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/tag/StrikeHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.tag; +package io.noties.markwon.html.tag; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -7,13 +7,13 @@ import android.text.style.StrikethroughSpan; import java.util.Arrays; import java.util.Collection; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonVisitor; -import ru.noties.markwon.SpanFactory; -import ru.noties.markwon.SpannableBuilder; -import ru.noties.markwon.html.HtmlTag; -import ru.noties.markwon.html.MarkwonHtmlRenderer; -import ru.noties.markwon.html.TagHandler; +import io.noties.markwon.html.HtmlTag; +import io.noties.markwon.html.MarkwonHtmlRenderer; +import io.noties.markwon.html.TagHandler; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonVisitor; +import io.noties.markwon.SpanFactory; +import io.noties.markwon.SpannableBuilder; public class StrikeHandler extends TagHandler { diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/StrongEmphasisHandler.java b/markwon-html/src/main/java/io/noties/markwon/html/tag/StrongEmphasisHandler.java similarity index 80% rename from markwon-html/src/main/java/ru/noties/markwon/html/tag/StrongEmphasisHandler.java rename to markwon-html/src/main/java/io/noties/markwon/html/tag/StrongEmphasisHandler.java index 486e43c4..2a28ec7c 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/StrongEmphasisHandler.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/tag/StrongEmphasisHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.tag; +package io.noties.markwon.html.tag; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -8,10 +8,10 @@ import org.commonmark.node.StrongEmphasis; import java.util.Arrays; import java.util.Collection; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.RenderProps; -import ru.noties.markwon.SpanFactory; -import ru.noties.markwon.html.HtmlTag; +import io.noties.markwon.html.HtmlTag; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.RenderProps; +import io.noties.markwon.SpanFactory; public class StrongEmphasisHandler extends SimpleTagHandler { @Nullable diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/SubScriptHandler.java b/markwon-html/src/main/java/io/noties/markwon/html/tag/SubScriptHandler.java similarity index 71% rename from markwon-html/src/main/java/ru/noties/markwon/html/tag/SubScriptHandler.java rename to markwon-html/src/main/java/io/noties/markwon/html/tag/SubScriptHandler.java index 5c99d963..cfcf77c5 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/SubScriptHandler.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/tag/SubScriptHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.tag; +package io.noties.markwon.html.tag; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -6,10 +6,10 @@ import android.support.annotation.Nullable; import java.util.Collection; import java.util.Collections; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.RenderProps; -import ru.noties.markwon.html.HtmlTag; -import ru.noties.markwon.html.span.SubScriptSpan; +import io.noties.markwon.html.HtmlTag; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.RenderProps; +import io.noties.markwon.html.span.SubScriptSpan; public class SubScriptHandler extends SimpleTagHandler { @Nullable diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/SuperScriptHandler.java b/markwon-html/src/main/java/io/noties/markwon/html/tag/SuperScriptHandler.java similarity index 71% rename from markwon-html/src/main/java/ru/noties/markwon/html/tag/SuperScriptHandler.java rename to markwon-html/src/main/java/io/noties/markwon/html/tag/SuperScriptHandler.java index 163a1735..199350aa 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/SuperScriptHandler.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/tag/SuperScriptHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.tag; +package io.noties.markwon.html.tag; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -6,10 +6,10 @@ import android.support.annotation.Nullable; import java.util.Collection; import java.util.Collections; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.RenderProps; -import ru.noties.markwon.html.HtmlTag; -import ru.noties.markwon.html.span.SuperScriptSpan; +import io.noties.markwon.html.HtmlTag; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.RenderProps; +import io.noties.markwon.html.span.SuperScriptSpan; public class SuperScriptHandler extends SimpleTagHandler { @Nullable diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/UnderlineHandler.java b/markwon-html/src/main/java/io/noties/markwon/html/tag/UnderlineHandler.java similarity index 78% rename from markwon-html/src/main/java/ru/noties/markwon/html/tag/UnderlineHandler.java rename to markwon-html/src/main/java/io/noties/markwon/html/tag/UnderlineHandler.java index bc2be951..300cc69c 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/UnderlineHandler.java +++ b/markwon-html/src/main/java/io/noties/markwon/html/tag/UnderlineHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.tag; +package io.noties.markwon.html.tag; import android.support.annotation.NonNull; import android.text.style.UnderlineSpan; @@ -6,11 +6,11 @@ import android.text.style.UnderlineSpan; import java.util.Arrays; import java.util.Collection; -import ru.noties.markwon.MarkwonVisitor; -import ru.noties.markwon.SpannableBuilder; -import ru.noties.markwon.html.HtmlTag; -import ru.noties.markwon.html.MarkwonHtmlRenderer; -import ru.noties.markwon.html.TagHandler; +import io.noties.markwon.html.HtmlTag; +import io.noties.markwon.html.MarkwonHtmlRenderer; +import io.noties.markwon.html.TagHandler; +import io.noties.markwon.MarkwonVisitor; +import io.noties.markwon.SpannableBuilder; public class UnderlineHandler extends TagHandler { diff --git a/markwon-html/src/test/java/ru/noties/markwon/html/CssInlineStyleParserTest.java b/markwon-html/src/test/java/io/noties/markwon/html/CssInlineStyleParserTest.java similarity index 99% rename from markwon-html/src/test/java/ru/noties/markwon/html/CssInlineStyleParserTest.java rename to markwon-html/src/test/java/io/noties/markwon/html/CssInlineStyleParserTest.java index cc105137..88a45f14 100644 --- a/markwon-html/src/test/java/ru/noties/markwon/html/CssInlineStyleParserTest.java +++ b/markwon-html/src/test/java/io/noties/markwon/html/CssInlineStyleParserTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import android.support.annotation.NonNull; diff --git a/markwon-html/src/test/java/ru/noties/markwon/html/HtmlEmptyTagReplacementTest.java b/markwon-html/src/test/java/io/noties/markwon/html/HtmlEmptyTagReplacementTest.java similarity index 92% rename from markwon-html/src/test/java/ru/noties/markwon/html/HtmlEmptyTagReplacementTest.java rename to markwon-html/src/test/java/io/noties/markwon/html/HtmlEmptyTagReplacementTest.java index c54fab18..148564a2 100644 --- a/markwon-html/src/test/java/ru/noties/markwon/html/HtmlEmptyTagReplacementTest.java +++ b/markwon-html/src/test/java/io/noties/markwon/html/HtmlEmptyTagReplacementTest.java @@ -1,11 +1,11 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import org.junit.Before; import org.junit.Test; import java.util.Collections; -import ru.noties.markwon.html.HtmlTagImpl.InlineImpl; +import io.noties.markwon.html.HtmlTagImpl.InlineImpl; import static org.junit.Assert.assertEquals; diff --git a/markwon-html/src/test/java/ru/noties/markwon/html/MarkwonHtmlParserImplTest.java b/markwon-html/src/test/java/io/noties/markwon/html/MarkwonHtmlParserImplTest.java similarity index 99% rename from markwon-html/src/test/java/ru/noties/markwon/html/MarkwonHtmlParserImplTest.java rename to markwon-html/src/test/java/io/noties/markwon/html/MarkwonHtmlParserImplTest.java index c614d36c..a2e0e7bd 100644 --- a/markwon-html/src/test/java/ru/noties/markwon/html/MarkwonHtmlParserImplTest.java +++ b/markwon-html/src/test/java/io/noties/markwon/html/MarkwonHtmlParserImplTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-html/src/test/java/ru/noties/markwon/html/TrimmingAppenderTest.java b/markwon-html/src/test/java/io/noties/markwon/html/TrimmingAppenderTest.java similarity index 93% rename from markwon-html/src/test/java/ru/noties/markwon/html/TrimmingAppenderTest.java rename to markwon-html/src/test/java/io/noties/markwon/html/TrimmingAppenderTest.java index ef82795e..828f867b 100644 --- a/markwon-html/src/test/java/ru/noties/markwon/html/TrimmingAppenderTest.java +++ b/markwon-html/src/test/java/io/noties/markwon/html/TrimmingAppenderTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html; +package io.noties.markwon.html; import org.junit.Before; import org.junit.Test; @@ -6,8 +6,6 @@ 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) diff --git a/markwon-html/src/test/java/ru/noties/markwon/html/jsoup/nodes/CommonMarkEntitiesTest.java b/markwon-html/src/test/java/io/noties/markwon/html/jsoup/nodes/CommonMarkEntitiesTest.java similarity index 92% rename from markwon-html/src/test/java/ru/noties/markwon/html/jsoup/nodes/CommonMarkEntitiesTest.java rename to markwon-html/src/test/java/io/noties/markwon/html/jsoup/nodes/CommonMarkEntitiesTest.java index 3472d8d5..0cfbac5b 100644 --- a/markwon-html/src/test/java/ru/noties/markwon/html/jsoup/nodes/CommonMarkEntitiesTest.java +++ b/markwon-html/src/test/java/io/noties/markwon/html/jsoup/nodes/CommonMarkEntitiesTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.jsoup.nodes; +package io.noties.markwon.html.jsoup.nodes; import org.junit.Assert; import org.junit.Test; diff --git a/markwon-html/src/test/java/ru/noties/markwon/html/tag/ImageSizeParserImplTest.java b/markwon-html/src/test/java/io/noties/markwon/html/tag/ImageSizeParserImplTest.java similarity index 97% rename from markwon-html/src/test/java/ru/noties/markwon/html/tag/ImageSizeParserImplTest.java rename to markwon-html/src/test/java/io/noties/markwon/html/tag/ImageSizeParserImplTest.java index ffa9fdc6..daa5491e 100644 --- a/markwon-html/src/test/java/ru/noties/markwon/html/tag/ImageSizeParserImplTest.java +++ b/markwon-html/src/test/java/io/noties/markwon/html/tag/ImageSizeParserImplTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.html.tag; +package io.noties.markwon.html.tag; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -14,8 +14,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import ru.noties.markwon.html.CssInlineStyleParser; -import ru.noties.markwon.image.ImageSize; +import io.noties.markwon.image.ImageSize; +import io.noties.markwon.html.CssInlineStyleParser; @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) diff --git a/markwon-image-glide/src/main/AndroidManifest.xml b/markwon-image-glide/src/main/AndroidManifest.xml index 806be809..2447b688 100644 --- a/markwon-image-glide/src/main/AndroidManifest.xml +++ b/markwon-image-glide/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/markwon-image-glide/src/main/java/ru/noties/markwon/image/glide/GlideImagesPlugin.java b/markwon-image-glide/src/main/java/io/noties/markwon/image/glide/GlideImagesPlugin.java similarity index 93% rename from markwon-image-glide/src/main/java/ru/noties/markwon/image/glide/GlideImagesPlugin.java rename to markwon-image-glide/src/main/java/io/noties/markwon/image/glide/GlideImagesPlugin.java index 2afa28f7..21d2bc55 100644 --- a/markwon-image-glide/src/main/java/ru/noties/markwon/image/glide/GlideImagesPlugin.java +++ b/markwon-image-glide/src/main/java/io/noties/markwon/image/glide/GlideImagesPlugin.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image.glide; +package io.noties.markwon.image.glide; import android.content.Context; import android.graphics.drawable.Drawable; @@ -19,14 +19,14 @@ import org.commonmark.node.Image; import java.util.HashMap; import java.util.Map; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonSpansFactory; -import ru.noties.markwon.image.AsyncDrawable; -import ru.noties.markwon.image.AsyncDrawableLoader; -import ru.noties.markwon.image.AsyncDrawableScheduler; -import ru.noties.markwon.image.DrawableUtils; -import ru.noties.markwon.image.ImageSpanFactory; +import io.noties.markwon.image.AsyncDrawable; +import io.noties.markwon.image.AsyncDrawableScheduler; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonSpansFactory; +import io.noties.markwon.image.AsyncDrawableLoader; +import io.noties.markwon.image.DrawableUtils; +import io.noties.markwon.image.ImageSpanFactory; /** * @since 4.0.0-SNAPSHOT diff --git a/markwon-image-picasso/src/main/AndroidManifest.xml b/markwon-image-picasso/src/main/AndroidManifest.xml index a32bdc6e..993a051e 100644 --- a/markwon-image-picasso/src/main/AndroidManifest.xml +++ b/markwon-image-picasso/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/markwon-image-picasso/src/main/java/ru/noties/markwon/image/picasso/PicassoImagesPlugin.java b/markwon-image-picasso/src/main/java/io/noties/markwon/image/picasso/PicassoImagesPlugin.java similarity index 92% rename from markwon-image-picasso/src/main/java/ru/noties/markwon/image/picasso/PicassoImagesPlugin.java rename to markwon-image-picasso/src/main/java/io/noties/markwon/image/picasso/PicassoImagesPlugin.java index 7bb37c1d..5d3fc7b5 100644 --- a/markwon-image-picasso/src/main/java/ru/noties/markwon/image/picasso/PicassoImagesPlugin.java +++ b/markwon-image-picasso/src/main/java/io/noties/markwon/image/picasso/PicassoImagesPlugin.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image.picasso; +package io.noties.markwon.image.picasso; import android.content.Context; import android.content.res.Resources; @@ -19,14 +19,14 @@ import org.commonmark.node.Image; import java.util.HashMap; import java.util.Map; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonSpansFactory; -import ru.noties.markwon.image.AsyncDrawable; -import ru.noties.markwon.image.AsyncDrawableLoader; -import ru.noties.markwon.image.AsyncDrawableScheduler; -import ru.noties.markwon.image.DrawableUtils; -import ru.noties.markwon.image.ImageSpanFactory; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonSpansFactory; +import io.noties.markwon.image.AsyncDrawable; +import io.noties.markwon.image.AsyncDrawableLoader; +import io.noties.markwon.image.AsyncDrawableScheduler; +import io.noties.markwon.image.DrawableUtils; +import io.noties.markwon.image.ImageSpanFactory; /** * @since 4.0.0-SNAPSHOT diff --git a/markwon-image/src/main/AndroidManifest.xml b/markwon-image/src/main/AndroidManifest.xml index e8b1253d..c7a58c74 100644 --- a/markwon-image/src/main/AndroidManifest.xml +++ b/markwon-image/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderBuilder.java b/markwon-image/src/main/java/io/noties/markwon/image/AsyncDrawableLoaderBuilder.java similarity index 95% rename from markwon-image/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderBuilder.java rename to markwon-image/src/main/java/io/noties/markwon/image/AsyncDrawableLoaderBuilder.java index 59de548f..7f8c0dcb 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderBuilder.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/AsyncDrawableLoaderBuilder.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -8,8 +8,8 @@ import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import ru.noties.markwon.image.data.DataUriSchemeHandler; -import ru.noties.markwon.image.network.NetworkSchemeHandler; +import io.noties.markwon.image.data.DataUriSchemeHandler; +import io.noties.markwon.image.network.NetworkSchemeHandler; class AsyncDrawableLoaderBuilder { diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderImpl.java b/markwon-image/src/main/java/io/noties/markwon/image/AsyncDrawableLoaderImpl.java similarity index 98% rename from markwon-image/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderImpl.java rename to markwon-image/src/main/java/io/noties/markwon/image/AsyncDrawableLoaderImpl.java index 01b12282..c03529d7 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderImpl.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/AsyncDrawableLoaderImpl.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.graphics.drawable.Drawable; import android.net.Uri; @@ -10,9 +10,7 @@ import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.util.Log; -import java.lang.ref.WeakReference; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/DefaultImageMediaDecoder.java b/markwon-image/src/main/java/io/noties/markwon/image/DefaultImageMediaDecoder.java similarity index 98% rename from markwon-image/src/main/java/ru/noties/markwon/image/DefaultImageMediaDecoder.java rename to markwon-image/src/main/java/io/noties/markwon/image/DefaultImageMediaDecoder.java index 8322f745..3aec554a 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/DefaultImageMediaDecoder.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/DefaultImageMediaDecoder.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.content.res.Resources; import android.graphics.Bitmap; diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/ImageItem.java b/markwon-image/src/main/java/io/noties/markwon/image/ImageItem.java similarity index 99% rename from markwon-image/src/main/java/ru/noties/markwon/image/ImageItem.java rename to markwon-image/src/main/java/io/noties/markwon/image/ImageItem.java index df07e768..8e62e010 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/ImageItem.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/ImageItem.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/ImagesPlugin.java b/markwon-image/src/main/java/io/noties/markwon/image/ImagesPlugin.java similarity index 84% rename from markwon-image/src/main/java/ru/noties/markwon/image/ImagesPlugin.java rename to markwon-image/src/main/java/io/noties/markwon/image/ImagesPlugin.java index ebb4cea0..4d7ad275 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/ImagesPlugin.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/ImagesPlugin.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; @@ -10,9 +10,16 @@ import org.commonmark.node.Image; import java.util.concurrent.ExecutorService; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonSpansFactory; +import io.noties.markwon.MarkwonPlugin; +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.NetworkSchemeHandler; +import io.noties.markwon.image.network.OkHttpNetworkSchemeHandler; +import io.noties.markwon.image.svg.SvgMediaDecoder; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonSpansFactory; @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"}) public class ImagesPlugin extends AbstractMarkwonPlugin { @@ -47,7 +54,7 @@ public class ImagesPlugin extends AbstractMarkwonPlugin { /** * Factory method to create an empty {@link ImagesPlugin} instance with no {@link SchemeHandler}s * nor {@link MediaDecoder}s registered. Can be used to further configure via instance methods or - * via {@link ru.noties.markwon.MarkwonPlugin#configure(Registry)} + * via {@link MarkwonPlugin#configure(Registry)} * * @see #create(ImagesConfigure) */ @@ -78,10 +85,10 @@ public class ImagesPlugin extends AbstractMarkwonPlugin { /** * @see SchemeHandler - * @see ru.noties.markwon.image.data.DataUriSchemeHandler - * @see ru.noties.markwon.image.file.FileSchemeHandler - * @see ru.noties.markwon.image.network.NetworkSchemeHandler - * @see ru.noties.markwon.image.network.OkHttpNetworkSchemeHandler + * @see DataUriSchemeHandler + * @see FileSchemeHandler + * @see NetworkSchemeHandler + * @see OkHttpNetworkSchemeHandler * @since 4.0.0-SNAPSHOT */ @NonNull @@ -92,8 +99,8 @@ public class ImagesPlugin extends AbstractMarkwonPlugin { /** * @see DefaultImageMediaDecoder - * @see ru.noties.markwon.image.svg.SvgMediaDecoder - * @see ru.noties.markwon.image.gif.GifMediaDecoder + * @see SvgMediaDecoder + * @see GifMediaDecoder * @since 4.0.0-SNAPSHOT */ @NonNull diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/MediaDecoder.java b/markwon-image/src/main/java/io/noties/markwon/image/MediaDecoder.java similarity index 95% rename from markwon-image/src/main/java/ru/noties/markwon/image/MediaDecoder.java rename to markwon-image/src/main/java/io/noties/markwon/image/MediaDecoder.java index 4470c50e..6f05bb20 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/MediaDecoder.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/MediaDecoder.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/SchemeHandler.java b/markwon-image/src/main/java/io/noties/markwon/image/SchemeHandler.java similarity index 95% rename from markwon-image/src/main/java/ru/noties/markwon/image/SchemeHandler.java rename to markwon-image/src/main/java/io/noties/markwon/image/SchemeHandler.java index 32402136..d16ffc0e 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/SchemeHandler.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/SchemeHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.net.Uri; import android.support.annotation.NonNull; diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/data/DataUri.java b/markwon-image/src/main/java/io/noties/markwon/image/data/DataUri.java similarity index 97% rename from markwon-image/src/main/java/ru/noties/markwon/image/data/DataUri.java rename to markwon-image/src/main/java/io/noties/markwon/image/data/DataUri.java index 6e812c92..0d14bad9 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/data/DataUri.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/data/DataUri.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image.data; +package io.noties.markwon.image.data; import android.support.annotation.Nullable; diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/data/DataUriDecoder.java b/markwon-image/src/main/java/io/noties/markwon/image/data/DataUriDecoder.java similarity index 96% rename from markwon-image/src/main/java/ru/noties/markwon/image/data/DataUriDecoder.java rename to markwon-image/src/main/java/io/noties/markwon/image/data/DataUriDecoder.java index 929ff47d..e802cad2 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/data/DataUriDecoder.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/data/DataUriDecoder.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image.data; +package io.noties.markwon.image.data; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/data/DataUriParser.java b/markwon-image/src/main/java/io/noties/markwon/image/data/DataUriParser.java similarity index 98% rename from markwon-image/src/main/java/ru/noties/markwon/image/data/DataUriParser.java rename to markwon-image/src/main/java/io/noties/markwon/image/data/DataUriParser.java index 0768ee4a..ad3311b2 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/data/DataUriParser.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/data/DataUriParser.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image.data; +package io.noties.markwon.image.data; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/data/DataUriSchemeHandler.java b/markwon-image/src/main/java/io/noties/markwon/image/data/DataUriSchemeHandler.java similarity index 93% rename from markwon-image/src/main/java/ru/noties/markwon/image/data/DataUriSchemeHandler.java rename to markwon-image/src/main/java/io/noties/markwon/image/data/DataUriSchemeHandler.java index b5c8dcc4..6ba1cb33 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/data/DataUriSchemeHandler.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/data/DataUriSchemeHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image.data; +package io.noties.markwon.image.data; import android.net.Uri; import android.support.annotation.NonNull; @@ -7,8 +7,8 @@ import java.io.ByteArrayInputStream; import java.util.Collection; import java.util.Collections; -import ru.noties.markwon.image.ImageItem; -import ru.noties.markwon.image.SchemeHandler; +import io.noties.markwon.image.ImageItem; +import io.noties.markwon.image.SchemeHandler; /** * @since 2.0.0 diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/file/FileSchemeHandler.java b/markwon-image/src/main/java/io/noties/markwon/image/file/FileSchemeHandler.java similarity index 93% rename from markwon-image/src/main/java/ru/noties/markwon/image/file/FileSchemeHandler.java rename to markwon-image/src/main/java/io/noties/markwon/image/file/FileSchemeHandler.java index f09906a1..257fcfe8 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/file/FileSchemeHandler.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/file/FileSchemeHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image.file; +package io.noties.markwon.image.file; import android.content.Context; import android.content.res.AssetManager; @@ -18,8 +18,9 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import ru.noties.markwon.image.ImageItem; -import ru.noties.markwon.image.SchemeHandler; +import io.noties.markwon.urlprocessor.UrlProcessorAndroidAssets; +import io.noties.markwon.image.ImageItem; +import io.noties.markwon.image.SchemeHandler; /** * @since 3.0.0 @@ -29,7 +30,7 @@ public class FileSchemeHandler extends SchemeHandler { public static final String SCHEME = "file"; /** - * @see ru.noties.markwon.urlprocessor.UrlProcessorAndroidAssets + * @see UrlProcessorAndroidAssets */ @NonNull public static FileSchemeHandler createWithAssets(@NonNull AssetManager assetManager) { @@ -38,7 +39,7 @@ public class FileSchemeHandler extends SchemeHandler { /** * @see #createWithAssets(AssetManager) - * @see ru.noties.markwon.urlprocessor.UrlProcessorAndroidAssets + * @see UrlProcessorAndroidAssets * @since 4.0.0-SNAPSHOT */ @NonNull diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/gif/GifMediaDecoder.java b/markwon-image/src/main/java/io/noties/markwon/image/gif/GifMediaDecoder.java similarity index 95% rename from markwon-image/src/main/java/ru/noties/markwon/image/gif/GifMediaDecoder.java rename to markwon-image/src/main/java/io/noties/markwon/image/gif/GifMediaDecoder.java index 200be994..d8757df4 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/gif/GifMediaDecoder.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/gif/GifMediaDecoder.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image.gif; +package io.noties.markwon.image.gif; import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; @@ -10,9 +10,9 @@ import java.io.InputStream; import java.util.Collection; import java.util.Collections; +import io.noties.markwon.image.MediaDecoder; import pl.droidsonroids.gif.GifDrawable; -import ru.noties.markwon.image.DrawableUtils; -import ru.noties.markwon.image.MediaDecoder; +import io.noties.markwon.image.DrawableUtils; /** * @since 1.1.0 diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/network/NetworkSchemeHandler.java b/markwon-image/src/main/java/io/noties/markwon/image/network/NetworkSchemeHandler.java similarity index 94% rename from markwon-image/src/main/java/ru/noties/markwon/image/network/NetworkSchemeHandler.java rename to markwon-image/src/main/java/io/noties/markwon/image/network/NetworkSchemeHandler.java index 920fa4c1..03c015e3 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/network/NetworkSchemeHandler.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/network/NetworkSchemeHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image.network; +package io.noties.markwon.image.network; import android.net.Uri; import android.support.annotation.NonNull; @@ -12,8 +12,8 @@ import java.net.URL; import java.util.Arrays; import java.util.Collection; -import ru.noties.markwon.image.ImageItem; -import ru.noties.markwon.image.SchemeHandler; +import io.noties.markwon.image.ImageItem; +import io.noties.markwon.image.SchemeHandler; /** * A simple network scheme handler that is not dependent on any external libraries. diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/network/OkHttpNetworkSchemeHandler.java b/markwon-image/src/main/java/io/noties/markwon/image/network/OkHttpNetworkSchemeHandler.java similarity index 95% rename from markwon-image/src/main/java/ru/noties/markwon/image/network/OkHttpNetworkSchemeHandler.java rename to markwon-image/src/main/java/io/noties/markwon/image/network/OkHttpNetworkSchemeHandler.java index b470841d..5203d23a 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/network/OkHttpNetworkSchemeHandler.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/network/OkHttpNetworkSchemeHandler.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image.network; +package io.noties.markwon.image.network; import android.net.Uri; import android.support.annotation.NonNull; @@ -7,13 +7,13 @@ import java.io.InputStream; import java.util.Arrays; import java.util.Collection; +import io.noties.markwon.image.ImageItem; +import io.noties.markwon.image.SchemeHandler; import okhttp3.Call; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; import okhttp3.ResponseBody; -import ru.noties.markwon.image.ImageItem; -import ru.noties.markwon.image.SchemeHandler; /** * @since 4.0.0-SNAPSHOT diff --git a/markwon-image/src/main/java/ru/noties/markwon/image/svg/SvgMediaDecoder.java b/markwon-image/src/main/java/io/noties/markwon/image/svg/SvgMediaDecoder.java similarity index 95% rename from markwon-image/src/main/java/ru/noties/markwon/image/svg/SvgMediaDecoder.java rename to markwon-image/src/main/java/io/noties/markwon/image/svg/SvgMediaDecoder.java index 78d381a8..229899c2 100644 --- a/markwon-image/src/main/java/ru/noties/markwon/image/svg/SvgMediaDecoder.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/svg/SvgMediaDecoder.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image.svg; +package io.noties.markwon.image.svg; import android.content.res.Resources; import android.graphics.Bitmap; @@ -15,8 +15,8 @@ import java.io.InputStream; import java.util.Collection; import java.util.Collections; -import ru.noties.markwon.image.DrawableUtils; -import ru.noties.markwon.image.MediaDecoder; +import io.noties.markwon.image.MediaDecoder; +import io.noties.markwon.image.DrawableUtils; /** * @since 1.1.0 diff --git a/markwon-image/src/test/java/ru/noties/markwon/image/AsyncDrawableLoaderBuilderTest.java b/markwon-image/src/test/java/io/noties/markwon/image/AsyncDrawableLoaderBuilderTest.java similarity index 97% rename from markwon-image/src/test/java/ru/noties/markwon/image/AsyncDrawableLoaderBuilderTest.java rename to markwon-image/src/test/java/io/noties/markwon/image/AsyncDrawableLoaderBuilderTest.java index b2400a37..e08328d2 100644 --- a/markwon-image/src/test/java/ru/noties/markwon/image/AsyncDrawableLoaderBuilderTest.java +++ b/markwon-image/src/test/java/io/noties/markwon/image/AsyncDrawableLoaderBuilderTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import org.junit.Before; import org.junit.Test; @@ -10,8 +10,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.concurrent.ExecutorService; -import ru.noties.markwon.image.data.DataUriSchemeHandler; -import ru.noties.markwon.image.network.NetworkSchemeHandler; +import io.noties.markwon.image.network.NetworkSchemeHandler; +import io.noties.markwon.image.data.DataUriSchemeHandler; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/markwon-image/src/test/java/ru/noties/markwon/image/AsyncDrawableLoaderImplTest.java b/markwon-image/src/test/java/io/noties/markwon/image/AsyncDrawableLoaderImplTest.java similarity index 98% rename from markwon-image/src/test/java/ru/noties/markwon/image/AsyncDrawableLoaderImplTest.java rename to markwon-image/src/test/java/io/noties/markwon/image/AsyncDrawableLoaderImplTest.java index 80e2bf53..2737fcc6 100644 --- a/markwon-image/src/test/java/ru/noties/markwon/image/AsyncDrawableLoaderImplTest.java +++ b/markwon-image/src/test/java/io/noties/markwon/image/AsyncDrawableLoaderImplTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.os.Handler; import android.support.annotation.NonNull; diff --git a/markwon-image/src/test/java/ru/noties/markwon/image/ImagesPluginTest.java b/markwon-image/src/test/java/io/noties/markwon/image/ImagesPluginTest.java similarity index 92% rename from markwon-image/src/test/java/ru/noties/markwon/image/ImagesPluginTest.java rename to markwon-image/src/test/java/io/noties/markwon/image/ImagesPluginTest.java index e141d456..20e7feb5 100644 --- a/markwon-image/src/test/java/ru/noties/markwon/image/ImagesPluginTest.java +++ b/markwon-image/src/test/java/io/noties/markwon/image/ImagesPluginTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image; +package io.noties.markwon.image; import android.support.annotation.NonNull; import android.text.Spanned; @@ -9,15 +9,17 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.mockito.ArgumentMatchers; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.util.concurrent.ExecutorService; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonSpansFactory; -import ru.noties.markwon.SpanFactory; -import ru.noties.markwon.image.data.DataUriSchemeHandler; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonSpansFactory; +import io.noties.markwon.SpanFactory; +import ru.noties.markwon.image.R; +import io.noties.markwon.image.data.DataUriSchemeHandler; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -159,7 +161,7 @@ public class ImagesPluginTest { plugin.beforeSetText(textView, mock(Spanned.class)); verify(textView, times(1)) - .getTag(eq(R.id.markwon_drawables_scheduler_last_text_hashcode)); + .getTag(ArgumentMatchers.eq(R.id.markwon_drawables_scheduler_last_text_hashcode)); } @Test diff --git a/markwon-image/src/test/java/ru/noties/markwon/image/data/DataUriParserTest.java b/markwon-image/src/test/java/io/noties/markwon/image/data/DataUriParserTest.java similarity index 98% rename from markwon-image/src/test/java/ru/noties/markwon/image/data/DataUriParserTest.java rename to markwon-image/src/test/java/io/noties/markwon/image/data/DataUriParserTest.java index b361a0d3..d8bda4b3 100644 --- a/markwon-image/src/test/java/ru/noties/markwon/image/data/DataUriParserTest.java +++ b/markwon-image/src/test/java/io/noties/markwon/image/data/DataUriParserTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image.data; +package io.noties.markwon.image.data; import org.junit.Before; import org.junit.Test; diff --git a/markwon-image/src/test/java/ru/noties/markwon/image/data/DataUriSchemeHandlerTest.java b/markwon-image/src/test/java/io/noties/markwon/image/data/DataUriSchemeHandlerTest.java similarity index 97% rename from markwon-image/src/test/java/ru/noties/markwon/image/data/DataUriSchemeHandlerTest.java rename to markwon-image/src/test/java/io/noties/markwon/image/data/DataUriSchemeHandlerTest.java index 6cb64cd2..58d9ffd2 100644 --- a/markwon-image/src/test/java/ru/noties/markwon/image/data/DataUriSchemeHandlerTest.java +++ b/markwon-image/src/test/java/io/noties/markwon/image/data/DataUriSchemeHandlerTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.image.data; +package io.noties.markwon.image.data; import android.net.Uri; import android.support.annotation.NonNull; @@ -14,7 +14,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Scanner; -import ru.noties.markwon.image.ImageItem; +import io.noties.markwon.image.ImageItem; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/markwon-linkify/src/main/AndroidManifest.xml b/markwon-linkify/src/main/AndroidManifest.xml index 3a9ba865..28afaae4 100644 --- a/markwon-linkify/src/main/AndroidManifest.xml +++ b/markwon-linkify/src/main/AndroidManifest.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/markwon-linkify/src/main/java/ru/noties/markwon/linkify/LinkifyPlugin.java b/markwon-linkify/src/main/java/io/noties/markwon/linkify/LinkifyPlugin.java similarity index 92% rename from markwon-linkify/src/main/java/ru/noties/markwon/linkify/LinkifyPlugin.java rename to markwon-linkify/src/main/java/io/noties/markwon/linkify/LinkifyPlugin.java index b24f3b49..05098dcf 100644 --- a/markwon-linkify/src/main/java/ru/noties/markwon/linkify/LinkifyPlugin.java +++ b/markwon-linkify/src/main/java/io/noties/markwon/linkify/LinkifyPlugin.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.linkify; +package io.noties.markwon.linkify; import android.support.annotation.IntDef; import android.support.annotation.NonNull; @@ -8,10 +8,10 @@ import android.text.util.Linkify; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.MarkwonVisitor; -import ru.noties.markwon.SpannableBuilder; -import ru.noties.markwon.core.CorePlugin; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.MarkwonVisitor; +import io.noties.markwon.SpannableBuilder; +import io.noties.markwon.core.CorePlugin; public class LinkifyPlugin extends AbstractMarkwonPlugin { diff --git a/markwon-recycler-table/src/main/AndroidManifest.xml b/markwon-recycler-table/src/main/AndroidManifest.xml index b215e1f6..da5aced9 100644 --- a/markwon-recycler-table/src/main/AndroidManifest.xml +++ b/markwon-recycler-table/src/main/AndroidManifest.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableBorderDrawable.java b/markwon-recycler-table/src/main/java/io/noties/markwon/recycler/table/TableBorderDrawable.java similarity index 96% rename from markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableBorderDrawable.java rename to markwon-recycler-table/src/main/java/io/noties/markwon/recycler/table/TableBorderDrawable.java index 06a89f24..e78dbd84 100644 --- a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableBorderDrawable.java +++ b/markwon-recycler-table/src/main/java/io/noties/markwon/recycler/table/TableBorderDrawable.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.recycler.table; +package io.noties.markwon.recycler.table; import android.graphics.Canvas; import android.graphics.ColorFilter; diff --git a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntry.java b/markwon-recycler-table/src/main/java/io/noties/markwon/recycler/table/TableEntry.java similarity index 98% rename from markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntry.java rename to markwon-recycler-table/src/main/java/io/noties/markwon/recycler/table/TableEntry.java index 5ff8b25e..01190f29 100644 --- a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntry.java +++ b/markwon-recycler-table/src/main/java/io/noties/markwon/recycler/table/TableEntry.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.recycler.table; +package io.noties.markwon.recycler.table; import android.annotation.SuppressLint; import android.content.Context; @@ -24,10 +24,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import ru.noties.markwon.Markwon; -import ru.noties.markwon.ext.tables.Table; -import ru.noties.markwon.recycler.MarkwonAdapter; -import ru.noties.markwon.utils.NoCopySpannableFactory; +import io.noties.markwon.recycler.MarkwonAdapter; +import io.noties.markwon.utils.NoCopySpannableFactory; +import io.noties.markwon.Markwon; +import io.noties.markwon.ext.tables.Table; /** * @since 3.0.0 diff --git a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntryPlugin.java b/markwon-recycler-table/src/main/java/io/noties/markwon/recycler/table/TableEntryPlugin.java similarity index 86% rename from markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntryPlugin.java rename to markwon-recycler-table/src/main/java/io/noties/markwon/recycler/table/TableEntryPlugin.java index a92400ee..0a339c3a 100644 --- a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntryPlugin.java +++ b/markwon-recycler-table/src/main/java/io/noties/markwon/recycler/table/TableEntryPlugin.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.recycler.table; +package io.noties.markwon.recycler.table; import android.content.Context; import android.support.annotation.NonNull; @@ -8,12 +8,12 @@ import org.commonmark.parser.Parser; import java.util.Collections; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.ext.tables.TablePlugin; -import ru.noties.markwon.ext.tables.TableTheme; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.ext.tables.TablePlugin; +import io.noties.markwon.ext.tables.TableTheme; /** - * This plugin must be used instead of {@link ru.noties.markwon.ext.tables.TablePlugin} when a markdown + * This plugin must be used instead of {@link TablePlugin} when a markdown * table is intended to be used in a RecyclerView via {@link TableEntry}. This is required * because TablePlugin additionally processes markdown tables to be displayed in limited * context of a TextView. If TablePlugin will be used, {@link TableEntry} will display table, diff --git a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntryTheme.java b/markwon-recycler-table/src/main/java/io/noties/markwon/recycler/table/TableEntryTheme.java similarity index 92% rename from markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntryTheme.java rename to markwon-recycler-table/src/main/java/io/noties/markwon/recycler/table/TableEntryTheme.java index e9b9b7ca..9164bd12 100644 --- a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntryTheme.java +++ b/markwon-recycler-table/src/main/java/io/noties/markwon/recycler/table/TableEntryTheme.java @@ -1,12 +1,12 @@ -package ru.noties.markwon.recycler.table; +package io.noties.markwon.recycler.table; import android.graphics.Paint; import android.support.annotation.ColorInt; import android.support.annotation.NonNull; import android.support.annotation.Px; -import ru.noties.markwon.ext.tables.TableTheme; -import ru.noties.markwon.utils.ColorUtils; +import io.noties.markwon.utils.ColorUtils; +import io.noties.markwon.ext.tables.TableTheme; /** * Mimics TableTheme to allow uniform table customization diff --git a/markwon-recycler-table/src/test/java/ru/noties/markwon/recycler/table/TableEntryTest.java b/markwon-recycler-table/src/test/java/io/noties/markwon/recycler/table/TableEntryTest.java similarity index 97% rename from markwon-recycler-table/src/test/java/ru/noties/markwon/recycler/table/TableEntryTest.java rename to markwon-recycler-table/src/test/java/io/noties/markwon/recycler/table/TableEntryTest.java index ae55f18e..e7c89bd5 100644 --- a/markwon-recycler-table/src/test/java/ru/noties/markwon/recycler/table/TableEntryTest.java +++ b/markwon-recycler-table/src/test/java/io/noties/markwon/recycler/table/TableEntryTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.recycler.table; +package io.noties.markwon.recycler.table; import android.content.res.Resources; import android.util.Pair; @@ -14,7 +14,7 @@ import org.robolectric.annotation.Config; import java.util.Arrays; import java.util.List; -import ru.noties.markwon.ext.tables.Table; +import io.noties.markwon.ext.tables.Table; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/markwon-recycler/src/main/AndroidManifest.xml b/markwon-recycler/src/main/AndroidManifest.xml index 4af698d1..8373a44c 100644 --- a/markwon-recycler/src/main/AndroidManifest.xml +++ b/markwon-recycler/src/main/AndroidManifest.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/markwon-recycler/src/main/java/ru/noties/markwon/recycler/MarkwonAdapter.java b/markwon-recycler/src/main/java/io/noties/markwon/recycler/MarkwonAdapter.java similarity index 98% rename from markwon-recycler/src/main/java/ru/noties/markwon/recycler/MarkwonAdapter.java rename to markwon-recycler/src/main/java/io/noties/markwon/recycler/MarkwonAdapter.java index 64241d55..99894ddd 100644 --- a/markwon-recycler/src/main/java/ru/noties/markwon/recycler/MarkwonAdapter.java +++ b/markwon-recycler/src/main/java/io/noties/markwon/recycler/MarkwonAdapter.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.recycler; +package io.noties.markwon.recycler; import android.support.annotation.IdRes; import android.support.annotation.LayoutRes; @@ -13,8 +13,8 @@ import org.commonmark.node.Node; import java.util.List; -import ru.noties.markwon.Markwon; -import ru.noties.markwon.MarkwonReducer; +import io.noties.markwon.Markwon; +import io.noties.markwon.MarkwonReducer; /** * Adapter to display markdown in a RecyclerView. It is done by extracting root blocks from a diff --git a/markwon-recycler/src/main/java/ru/noties/markwon/recycler/MarkwonAdapterImpl.java b/markwon-recycler/src/main/java/io/noties/markwon/recycler/MarkwonAdapterImpl.java similarity index 97% rename from markwon-recycler/src/main/java/ru/noties/markwon/recycler/MarkwonAdapterImpl.java rename to markwon-recycler/src/main/java/io/noties/markwon/recycler/MarkwonAdapterImpl.java index 30b093f5..ea7c34d2 100644 --- a/markwon-recycler/src/main/java/ru/noties/markwon/recycler/MarkwonAdapterImpl.java +++ b/markwon-recycler/src/main/java/io/noties/markwon/recycler/MarkwonAdapterImpl.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.recycler; +package io.noties.markwon.recycler; import android.support.annotation.NonNull; import android.util.SparseArray; @@ -10,8 +10,8 @@ import org.commonmark.node.Node; import java.util.Collections; import java.util.List; -import ru.noties.markwon.Markwon; -import ru.noties.markwon.MarkwonReducer; +import io.noties.markwon.Markwon; +import io.noties.markwon.MarkwonReducer; class MarkwonAdapterImpl extends MarkwonAdapter { diff --git a/markwon-recycler/src/main/java/ru/noties/markwon/recycler/SimpleEntry.java b/markwon-recycler/src/main/java/io/noties/markwon/recycler/SimpleEntry.java similarity index 95% rename from markwon-recycler/src/main/java/ru/noties/markwon/recycler/SimpleEntry.java rename to markwon-recycler/src/main/java/io/noties/markwon/recycler/SimpleEntry.java index 93ef0d30..a876597a 100644 --- a/markwon-recycler/src/main/java/ru/noties/markwon/recycler/SimpleEntry.java +++ b/markwon-recycler/src/main/java/io/noties/markwon/recycler/SimpleEntry.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.recycler; +package io.noties.markwon.recycler; import android.support.annotation.IdRes; import android.support.annotation.LayoutRes; @@ -14,8 +14,8 @@ import org.commonmark.node.Node; import java.util.HashMap; import java.util.Map; -import ru.noties.markwon.Markwon; -import ru.noties.markwon.utils.NoCopySpannableFactory; +import io.noties.markwon.Markwon; +import io.noties.markwon.utils.NoCopySpannableFactory; /** * @since 3.0.0 diff --git a/markwon-syntax-highlight/src/main/AndroidManifest.xml b/markwon-syntax-highlight/src/main/AndroidManifest.xml index e758e4c1..318afcd8 100644 --- a/markwon-syntax-highlight/src/main/AndroidManifest.xml +++ b/markwon-syntax-highlight/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxHighlight.java b/markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jSyntaxHighlight.java similarity index 98% rename from markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxHighlight.java rename to markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jSyntaxHighlight.java index bb016796..a36a0170 100644 --- a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxHighlight.java +++ b/markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jSyntaxHighlight.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.syntax; +package io.noties.markwon.syntax; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxVisitor.java b/markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jSyntaxVisitor.java similarity index 96% rename from markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxVisitor.java rename to markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jSyntaxVisitor.java index cd7f2f04..9fd14435 100644 --- a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxVisitor.java +++ b/markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jSyntaxVisitor.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.syntax; +package io.noties.markwon.syntax; import android.support.annotation.NonNull; import android.text.SpannableStringBuilder; diff --git a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jTheme.java b/markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jTheme.java similarity index 93% rename from markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jTheme.java rename to markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jTheme.java index 3932bafc..6f15c6ed 100644 --- a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jTheme.java +++ b/markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jTheme.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.syntax; +package io.noties.markwon.syntax; import android.support.annotation.ColorInt; import android.support.annotation.NonNull; diff --git a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeBase.java b/markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jThemeBase.java similarity index 99% rename from markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeBase.java rename to markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jThemeBase.java index 5cf784df..16110cf0 100644 --- a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeBase.java +++ b/markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jThemeBase.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.syntax; +package io.noties.markwon.syntax; import android.support.annotation.ColorInt; import android.support.annotation.FloatRange; diff --git a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDarkula.java b/markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jThemeDarkula.java similarity index 94% rename from markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDarkula.java rename to markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jThemeDarkula.java index 4d4016bf..df586fd0 100644 --- a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDarkula.java +++ b/markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jThemeDarkula.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.syntax; +package io.noties.markwon.syntax; import android.support.annotation.ColorInt; import android.support.annotation.NonNull; @@ -6,8 +6,8 @@ import android.support.annotation.Nullable; import android.text.SpannableStringBuilder; import android.text.Spanned; -import ru.noties.markwon.core.spans.EmphasisSpan; -import ru.noties.markwon.core.spans.StrongEmphasisSpan; +import io.noties.markwon.core.spans.StrongEmphasisSpan; +import io.noties.markwon.core.spans.EmphasisSpan; public class Prism4jThemeDarkula extends Prism4jThemeBase { diff --git a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDefault.java b/markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jThemeDefault.java similarity index 95% rename from markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDefault.java rename to markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jThemeDefault.java index b729ed76..b44e46e7 100644 --- a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDefault.java +++ b/markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/Prism4jThemeDefault.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.syntax; +package io.noties.markwon.syntax; import android.support.annotation.ColorInt; import android.support.annotation.NonNull; @@ -7,8 +7,8 @@ import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.style.BackgroundColorSpan; -import ru.noties.markwon.core.spans.EmphasisSpan; -import ru.noties.markwon.core.spans.StrongEmphasisSpan; +import io.noties.markwon.core.spans.EmphasisSpan; +import io.noties.markwon.core.spans.StrongEmphasisSpan; public class Prism4jThemeDefault extends Prism4jThemeBase { diff --git a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/SyntaxHighlightPlugin.java b/markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/SyntaxHighlightPlugin.java similarity index 89% rename from markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/SyntaxHighlightPlugin.java rename to markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/SyntaxHighlightPlugin.java index b07f5c6e..9bcefc38 100644 --- a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/SyntaxHighlightPlugin.java +++ b/markwon-syntax-highlight/src/main/java/io/noties/markwon/syntax/SyntaxHighlightPlugin.java @@ -1,11 +1,11 @@ -package ru.noties.markwon.syntax; +package io.noties.markwon.syntax; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.core.MarkwonTheme; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.core.MarkwonTheme; import ru.noties.prism4j.Prism4j; public class SyntaxHighlightPlugin extends AbstractMarkwonPlugin { diff --git a/markwon-test-span/src/main/AndroidManifest.xml b/markwon-test-span/src/main/AndroidManifest.xml index c2e8a267..966a6859 100644 --- a/markwon-test-span/src/main/AndroidManifest.xml +++ b/markwon-test-span/src/main/AndroidManifest.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpan.java b/markwon-test-span/src/main/java/io/noties/markwon/test/TestSpan.java similarity index 99% rename from markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpan.java rename to markwon-test-span/src/main/java/io/noties/markwon/test/TestSpan.java index f979d633..fe41dd2a 100644 --- a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpan.java +++ b/markwon-test-span/src/main/java/io/noties/markwon/test/TestSpan.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.test; +package io.noties.markwon.test; import android.support.annotation.NonNull; diff --git a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanDocument.java b/markwon-test-span/src/main/java/io/noties/markwon/test/TestSpanDocument.java similarity index 97% rename from markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanDocument.java rename to markwon-test-span/src/main/java/io/noties/markwon/test/TestSpanDocument.java index ef876311..91b479db 100644 --- a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanDocument.java +++ b/markwon-test-span/src/main/java/io/noties/markwon/test/TestSpanDocument.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.test; +package io.noties.markwon.test; import android.support.annotation.NonNull; diff --git a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanEnumerator.java b/markwon-test-span/src/main/java/io/noties/markwon/test/TestSpanEnumerator.java similarity index 96% rename from markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanEnumerator.java rename to markwon-test-span/src/main/java/io/noties/markwon/test/TestSpanEnumerator.java index 1c2172db..7e75f149 100644 --- a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanEnumerator.java +++ b/markwon-test-span/src/main/java/io/noties/markwon/test/TestSpanEnumerator.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.test; +package io.noties.markwon.test; import android.support.annotation.NonNull; diff --git a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanMatcher.java b/markwon-test-span/src/main/java/io/noties/markwon/test/TestSpanMatcher.java similarity index 99% rename from markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanMatcher.java rename to markwon-test-span/src/main/java/io/noties/markwon/test/TestSpanMatcher.java index 03bc2ace..a3cf1b57 100644 --- a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanMatcher.java +++ b/markwon-test-span/src/main/java/io/noties/markwon/test/TestSpanMatcher.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.test; +package io.noties.markwon.test; import android.support.annotation.NonNull; import android.text.Spanned; diff --git a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanSpan.java b/markwon-test-span/src/main/java/io/noties/markwon/test/TestSpanSpan.java similarity index 97% rename from markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanSpan.java rename to markwon-test-span/src/main/java/io/noties/markwon/test/TestSpanSpan.java index d9669cb2..f51a32ba 100644 --- a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanSpan.java +++ b/markwon-test-span/src/main/java/io/noties/markwon/test/TestSpanSpan.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.test; +package io.noties.markwon.test; import android.support.annotation.NonNull; diff --git a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanText.java b/markwon-test-span/src/main/java/io/noties/markwon/test/TestSpanText.java similarity index 96% rename from markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanText.java rename to markwon-test-span/src/main/java/io/noties/markwon/test/TestSpanText.java index 8a34a410..995d3541 100644 --- a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanText.java +++ b/markwon-test-span/src/main/java/io/noties/markwon/test/TestSpanText.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.test; +package io.noties.markwon.test; import android.support.annotation.NonNull; diff --git a/markwon-test-span/src/test/java/ru/noties/markwon/test/TestSpanTest.java b/markwon-test-span/src/test/java/io/noties/markwon/test/TestSpanTest.java similarity index 70% rename from markwon-test-span/src/test/java/ru/noties/markwon/test/TestSpanTest.java rename to markwon-test-span/src/test/java/io/noties/markwon/test/TestSpanTest.java index 5e178409..d1c90adf 100644 --- a/markwon-test-span/src/test/java/ru/noties/markwon/test/TestSpanTest.java +++ b/markwon-test-span/src/test/java/io/noties/markwon/test/TestSpanTest.java @@ -1,25 +1,20 @@ -package ru.noties.markwon.test; +package io.noties.markwon.test; import org.junit.Test; import java.util.Map; -import ru.noties.markwon.test.TestSpan.Document; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static ru.noties.markwon.test.TestSpan.args; -import static ru.noties.markwon.test.TestSpan.document; -import static ru.noties.markwon.test.TestSpan.span; -import static ru.noties.markwon.test.TestSpan.text; +import static io.noties.markwon.test.TestSpan.span; public class TestSpanTest { @Test public void args_not_event_throws() { try { - args("key"); + TestSpan.args("key"); fail(); } catch (IllegalStateException e) { assertTrue(e.getMessage(), e.getMessage().contains("Supplied key-values array must contain ")); @@ -29,7 +24,7 @@ public class TestSpanTest { @Test public void args_key_not_string_throws() { try { - args("key", 1, 2, 3); + TestSpan.args("key", 1, 2, 3); fail(); } catch (ClassCastException e) { assertTrue(true); @@ -39,7 +34,7 @@ public class TestSpanTest { @Test public void args_correct() { - final Map args = args("key1", true, "key2", 4); + final Map args = TestSpan.args("key1", true, "key2", 4); assertEquals(2, args.size()); assertEquals(true, args.get("key1")); @@ -48,21 +43,21 @@ public class TestSpanTest { @Test public void empty_document() { - final Document document = document(); + final TestSpan.Document document = TestSpan.document(); assertEquals(0, document.children().size()); assertEquals("", document.wholeText()); } @Test public void document_single_text_child() { - final Document document = document(text("Text")); + final TestSpan.Document document = TestSpan.document(TestSpan.text("Text")); assertEquals(1, document.children().size()); assertEquals("Text", document.wholeText()); } @Test public void document_single_span_child() { - final Document document = document(span("span", text("TextInSpan"))); + final TestSpan.Document document = TestSpan.document(TestSpan.span("span", TestSpan.text("TextInSpan"))); assertEquals(1, document.children().size()); assertTrue(document.children().get(0) instanceof TestSpan.Span); assertEquals("TextInSpan", document.wholeText()); diff --git a/sample/build.gradle b/sample/build.gradle index 4bde062b..df6695e4 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -6,7 +6,7 @@ android { buildToolsVersion config['build-tools'] defaultConfig { - applicationId "ru.noties.markwon.sample" + applicationId "io.noties.markwon.sample" minSdkVersion config['min-sdk'] targetSdkVersion config['target-sdk'] versionCode 1 diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 376348ca..a26c6d72 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="io.noties.markwon.sample"> @@ -11,19 +11,19 @@ android:theme="@style/AppTheme" tools:ignore="AllowBackup,GoogleAppIndexingWarning,MissingApplicationIcon"> - + - - - - - - + + + + + + diff --git a/sample/src/main/java/ru/noties/markwon/sample/MainActivity.java b/sample/src/main/java/io/noties/markwon/sample/MainActivity.java similarity index 89% rename from sample/src/main/java/ru/noties/markwon/sample/MainActivity.java rename to sample/src/main/java/io/noties/markwon/sample/MainActivity.java index 16205066..9348f6bf 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/MainActivity.java +++ b/sample/src/main/java/io/noties/markwon/sample/MainActivity.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.sample; +package io.noties.markwon.sample; import android.app.Activity; import android.content.Context; @@ -12,16 +12,16 @@ import android.view.View; import java.util.Arrays; +import io.noties.markwon.Markwon; +import io.noties.markwon.sample.basicplugins.BasicPluginsActivity; +import io.noties.markwon.sample.core.CoreActivity; +import io.noties.markwon.sample.customextension.CustomExtensionActivity; +import io.noties.markwon.sample.latex.LatexActivity; +import io.noties.markwon.sample.recycler.RecyclerActivity; import ru.noties.adapt.Adapt; import ru.noties.adapt.OnClickViewProcessor; import ru.noties.debug.AndroidLogDebugOutput; import ru.noties.debug.Debug; -import ru.noties.markwon.Markwon; -import ru.noties.markwon.sample.basicplugins.BasicPluginsActivity; -import ru.noties.markwon.sample.core.CoreActivity; -import ru.noties.markwon.sample.customextension.CustomExtensionActivity; -import ru.noties.markwon.sample.latex.LatexActivity; -import ru.noties.markwon.sample.recycler.RecyclerActivity; public class MainActivity extends Activity { diff --git a/sample/src/main/java/ru/noties/markwon/sample/SampleItem.java b/sample/src/main/java/io/noties/markwon/sample/SampleItem.java similarity index 94% rename from sample/src/main/java/ru/noties/markwon/sample/SampleItem.java rename to sample/src/main/java/io/noties/markwon/sample/SampleItem.java index e21444ba..0c7f8b86 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/SampleItem.java +++ b/sample/src/main/java/io/noties/markwon/sample/SampleItem.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.sample; +package io.noties.markwon.sample; import android.support.annotation.StringRes; diff --git a/sample/src/main/java/ru/noties/markwon/sample/SampleItemDecoration.java b/sample/src/main/java/io/noties/markwon/sample/SampleItemDecoration.java similarity index 98% rename from sample/src/main/java/ru/noties/markwon/sample/SampleItemDecoration.java rename to sample/src/main/java/io/noties/markwon/sample/SampleItemDecoration.java index 580b2763..16a04286 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/SampleItemDecoration.java +++ b/sample/src/main/java/io/noties/markwon/sample/SampleItemDecoration.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.sample; +package io.noties.markwon.sample; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/sample/src/main/java/ru/noties/markwon/sample/SampleItemView.java b/sample/src/main/java/io/noties/markwon/sample/SampleItemView.java similarity index 94% rename from sample/src/main/java/ru/noties/markwon/sample/SampleItemView.java rename to sample/src/main/java/io/noties/markwon/sample/SampleItemView.java index dc4432aa..fa2a202e 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/SampleItemView.java +++ b/sample/src/main/java/io/noties/markwon/sample/SampleItemView.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.sample; +package io.noties.markwon.sample; import android.support.annotation.NonNull; import android.text.Spannable; @@ -10,10 +10,10 @@ import android.widget.TextView; import java.util.EnumMap; +import io.noties.markwon.Markwon; +import io.noties.markwon.utils.NoCopySpannableFactory; import ru.noties.adapt.Holder; import ru.noties.adapt.ItemView; -import ru.noties.markwon.Markwon; -import ru.noties.markwon.utils.NoCopySpannableFactory; class SampleItemView extends ItemView { diff --git a/sample/src/main/java/ru/noties/markwon/sample/basicplugins/BasicPluginsActivity.java b/sample/src/main/java/io/noties/markwon/sample/basicplugins/BasicPluginsActivity.java similarity index 92% rename from sample/src/main/java/ru/noties/markwon/sample/basicplugins/BasicPluginsActivity.java rename to sample/src/main/java/io/noties/markwon/sample/basicplugins/BasicPluginsActivity.java index 4d34db84..8e6c2500 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/basicplugins/BasicPluginsActivity.java +++ b/sample/src/main/java/io/noties/markwon/sample/basicplugins/BasicPluginsActivity.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.sample.basicplugins; +package io.noties.markwon.sample.basicplugins; import android.app.Activity; import android.graphics.Color; @@ -18,22 +18,22 @@ import org.commonmark.node.Paragraph; import java.util.Collection; import java.util.Collections; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.Markwon; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonPlugin; -import ru.noties.markwon.MarkwonSpansFactory; -import ru.noties.markwon.MarkwonVisitor; -import ru.noties.markwon.RenderProps; -import ru.noties.markwon.core.MarkwonTheme; -import ru.noties.markwon.html.HtmlPlugin; -import ru.noties.markwon.html.HtmlTag; -import ru.noties.markwon.html.tag.SimpleTagHandler; -import ru.noties.markwon.image.ImageItem; -import ru.noties.markwon.image.ImagesPlugin; -import ru.noties.markwon.image.SchemeHandler; -import ru.noties.markwon.image.network.NetworkSchemeHandler; -import ru.noties.markwon.movement.MovementMethodPlugin; +import io.noties.markwon.core.MarkwonTheme; +import io.noties.markwon.html.HtmlTag; +import io.noties.markwon.image.ImageItem; +import io.noties.markwon.image.ImagesPlugin; +import io.noties.markwon.image.SchemeHandler; +import io.noties.markwon.image.network.NetworkSchemeHandler; +import io.noties.markwon.movement.MovementMethodPlugin; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.Markwon; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonPlugin; +import io.noties.markwon.MarkwonSpansFactory; +import io.noties.markwon.MarkwonVisitor; +import io.noties.markwon.RenderProps; +import io.noties.markwon.html.HtmlPlugin; +import io.noties.markwon.html.tag.SimpleTagHandler; public class BasicPluginsActivity extends Activity { diff --git a/sample/src/main/java/ru/noties/markwon/sample/core/CoreActivity.java b/sample/src/main/java/io/noties/markwon/sample/core/CoreActivity.java similarity index 96% rename from sample/src/main/java/ru/noties/markwon/sample/core/CoreActivity.java rename to sample/src/main/java/io/noties/markwon/sample/core/CoreActivity.java index 3f8118c5..f208fa07 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/core/CoreActivity.java +++ b/sample/src/main/java/io/noties/markwon/sample/core/CoreActivity.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.sample.core; +package io.noties.markwon.sample.core; import android.app.Activity; import android.os.Bundle; @@ -9,8 +9,8 @@ import android.widget.Toast; import org.commonmark.node.Node; -import ru.noties.markwon.Markwon; -import ru.noties.markwon.core.CorePlugin; +import io.noties.markwon.core.CorePlugin; +import io.noties.markwon.Markwon; public class CoreActivity extends Activity { diff --git a/sample/src/main/java/ru/noties/markwon/sample/customextension/CustomExtensionActivity.java b/sample/src/main/java/io/noties/markwon/sample/customextension/CustomExtensionActivity.java similarity index 91% rename from sample/src/main/java/ru/noties/markwon/sample/customextension/CustomExtensionActivity.java rename to sample/src/main/java/io/noties/markwon/sample/customextension/CustomExtensionActivity.java index 71e592c6..c8615331 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/customextension/CustomExtensionActivity.java +++ b/sample/src/main/java/io/noties/markwon/sample/customextension/CustomExtensionActivity.java @@ -1,12 +1,12 @@ -package ru.noties.markwon.sample.customextension; +package io.noties.markwon.sample.customextension; import android.app.Activity; import android.os.Bundle; import android.support.annotation.Nullable; import android.widget.TextView; -import ru.noties.markwon.Markwon; -import ru.noties.markwon.sample.R; +import io.noties.markwon.Markwon; +import io.noties.markwon.sample.R; public class CustomExtensionActivity extends Activity { diff --git a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconGroupNode.java b/sample/src/main/java/io/noties/markwon/sample/customextension/IconGroupNode.java similarity index 71% rename from sample/src/main/java/ru/noties/markwon/sample/customextension/IconGroupNode.java rename to sample/src/main/java/io/noties/markwon/sample/customextension/IconGroupNode.java index 98560b49..40868396 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconGroupNode.java +++ b/sample/src/main/java/io/noties/markwon/sample/customextension/IconGroupNode.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.sample.customextension; +package io.noties.markwon.sample.customextension; import org.commonmark.node.CustomNode; diff --git a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconNode.java b/sample/src/main/java/io/noties/markwon/sample/customextension/IconNode.java similarity index 96% rename from sample/src/main/java/ru/noties/markwon/sample/customextension/IconNode.java rename to sample/src/main/java/io/noties/markwon/sample/customextension/IconNode.java index b297e4a6..c0a2f75b 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconNode.java +++ b/sample/src/main/java/io/noties/markwon/sample/customextension/IconNode.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.sample.customextension; +package io.noties.markwon.sample.customextension; import android.support.annotation.NonNull; diff --git a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconPlugin.java b/sample/src/main/java/io/noties/markwon/sample/customextension/IconPlugin.java similarity index 93% rename from sample/src/main/java/ru/noties/markwon/sample/customextension/IconPlugin.java rename to sample/src/main/java/io/noties/markwon/sample/customextension/IconPlugin.java index 42b7c8d8..bf39834c 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconPlugin.java +++ b/sample/src/main/java/io/noties/markwon/sample/customextension/IconPlugin.java @@ -1,12 +1,12 @@ -package ru.noties.markwon.sample.customextension; +package io.noties.markwon.sample.customextension; import android.support.annotation.NonNull; import android.text.TextUtils; import org.commonmark.parser.Parser; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.MarkwonVisitor; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.MarkwonVisitor; public class IconPlugin extends AbstractMarkwonPlugin { diff --git a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconProcessor.java b/sample/src/main/java/io/noties/markwon/sample/customextension/IconProcessor.java similarity index 98% rename from sample/src/main/java/ru/noties/markwon/sample/customextension/IconProcessor.java rename to sample/src/main/java/io/noties/markwon/sample/customextension/IconProcessor.java index eb7a79be..0fa1797b 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconProcessor.java +++ b/sample/src/main/java/io/noties/markwon/sample/customextension/IconProcessor.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.sample.customextension; +package io.noties.markwon.sample.customextension; import android.support.annotation.NonNull; import android.text.TextUtils; diff --git a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconSpan.java b/sample/src/main/java/io/noties/markwon/sample/customextension/IconSpan.java similarity index 97% rename from sample/src/main/java/ru/noties/markwon/sample/customextension/IconSpan.java rename to sample/src/main/java/io/noties/markwon/sample/customextension/IconSpan.java index 9d2b8b43..b055233d 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconSpan.java +++ b/sample/src/main/java/io/noties/markwon/sample/customextension/IconSpan.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.sample.customextension; +package io.noties.markwon.sample.customextension; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconSpanProvider.java b/sample/src/main/java/io/noties/markwon/sample/customextension/IconSpanProvider.java similarity index 97% rename from sample/src/main/java/ru/noties/markwon/sample/customextension/IconSpanProvider.java rename to sample/src/main/java/io/noties/markwon/sample/customextension/IconSpanProvider.java index 25049bc2..a324ae35 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconSpanProvider.java +++ b/sample/src/main/java/io/noties/markwon/sample/customextension/IconSpanProvider.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.sample.customextension; +package io.noties.markwon.sample.customextension; import android.content.Context; import android.content.res.Resources; diff --git a/sample/src/main/java/ru/noties/markwon/sample/latex/LatexActivity.java b/sample/src/main/java/io/noties/markwon/sample/latex/LatexActivity.java similarity index 94% rename from sample/src/main/java/ru/noties/markwon/sample/latex/LatexActivity.java rename to sample/src/main/java/io/noties/markwon/sample/latex/LatexActivity.java index ec4cd397..6c94afa9 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/latex/LatexActivity.java +++ b/sample/src/main/java/io/noties/markwon/sample/latex/LatexActivity.java @@ -1,13 +1,13 @@ -package ru.noties.markwon.sample.latex; +package io.noties.markwon.sample.latex; import android.app.Activity; import android.os.Bundle; import android.support.annotation.Nullable; import android.widget.TextView; -import ru.noties.markwon.Markwon; -import ru.noties.markwon.ext.latex.JLatexMathPlugin; -import ru.noties.markwon.sample.R; +import io.noties.markwon.ext.latex.JLatexMathPlugin; +import io.noties.markwon.Markwon; +import io.noties.markwon.sample.R; public class LatexActivity extends Activity { diff --git a/sample/src/main/java/ru/noties/markwon/sample/recycler/RecyclerActivity.java b/sample/src/main/java/io/noties/markwon/sample/recycler/RecyclerActivity.java similarity index 86% rename from sample/src/main/java/ru/noties/markwon/sample/recycler/RecyclerActivity.java rename to sample/src/main/java/io/noties/markwon/sample/recycler/RecyclerActivity.java index ff911a15..2c4f5b4d 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/recycler/RecyclerActivity.java +++ b/sample/src/main/java/io/noties/markwon/sample/recycler/RecyclerActivity.java @@ -1,9 +1,7 @@ -package ru.noties.markwon.sample.recycler; +package io.noties.markwon.sample.recycler; import android.app.Activity; import android.content.Context; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; import android.net.Uri; import android.os.Bundle; import android.support.annotation.NonNull; @@ -12,9 +10,6 @@ import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; -import com.squareup.picasso.Picasso; -import com.squareup.picasso.RequestCreator; - import org.commonmark.ext.gfm.tables.TableBlock; import org.commonmark.node.FencedCodeBlock; @@ -23,24 +18,22 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import io.noties.markwon.AbstractMarkwonPlugin; +import io.noties.markwon.Markwon; +import io.noties.markwon.MarkwonConfiguration; +import io.noties.markwon.MarkwonVisitor; +import io.noties.markwon.core.CorePlugin; +import io.noties.markwon.html.HtmlPlugin; +import io.noties.markwon.image.picasso.PicassoImagesPlugin; +import io.noties.markwon.recycler.MarkwonAdapter; +import io.noties.markwon.recycler.SimpleEntry; +import io.noties.markwon.recycler.table.TableEntry; +import io.noties.markwon.recycler.table.TableEntryPlugin; +import io.noties.markwon.sample.R; +import io.noties.markwon.urlprocessor.UrlProcessor; +import io.noties.markwon.urlprocessor.UrlProcessorRelativeToAbsolute; import ru.noties.debug.AndroidLogDebugOutput; import ru.noties.debug.Debug; -import ru.noties.markwon.AbstractMarkwonPlugin; -import ru.noties.markwon.Markwon; -import ru.noties.markwon.MarkwonConfiguration; -import ru.noties.markwon.MarkwonVisitor; -import ru.noties.markwon.core.CorePlugin; -import ru.noties.markwon.html.HtmlPlugin; -import ru.noties.markwon.image.AsyncDrawable; -import ru.noties.markwon.image.glide.GlideImagesPlugin; -import ru.noties.markwon.image.picasso.PicassoImagesPlugin; -import ru.noties.markwon.recycler.MarkwonAdapter; -import ru.noties.markwon.recycler.SimpleEntry; -import ru.noties.markwon.recycler.table.TableEntry; -import ru.noties.markwon.recycler.table.TableEntryPlugin; -import ru.noties.markwon.sample.R; -import ru.noties.markwon.urlprocessor.UrlProcessor; -import ru.noties.markwon.urlprocessor.UrlProcessorRelativeToAbsolute; public class RecyclerActivity extends Activity { diff --git a/sample/src/main/java/ru/noties/markwon/sample/theme/ThemeActivity.java b/sample/src/main/java/io/noties/markwon/sample/theme/ThemeActivity.java similarity index 81% rename from sample/src/main/java/ru/noties/markwon/sample/theme/ThemeActivity.java rename to sample/src/main/java/io/noties/markwon/sample/theme/ThemeActivity.java index 33ee500a..bec1afa6 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/theme/ThemeActivity.java +++ b/sample/src/main/java/io/noties/markwon/sample/theme/ThemeActivity.java @@ -1,10 +1,10 @@ -package ru.noties.markwon.sample.theme; +package io.noties.markwon.sample.theme; import android.app.Activity; import android.os.Bundle; import android.support.annotation.Nullable; -import ru.noties.markwon.sample.R; +import io.noties.markwon.sample.R; public class ThemeActivity extends Activity { diff --git a/sample/src/test/java/ru/noties/markwon/sample/MainActivityTest.java b/sample/src/test/java/io/noties/markwon/sample/MainActivityTest.java similarity index 95% rename from sample/src/test/java/ru/noties/markwon/sample/MainActivityTest.java rename to sample/src/test/java/io/noties/markwon/sample/MainActivityTest.java index dec6b07e..f5f197e9 100644 --- a/sample/src/test/java/ru/noties/markwon/sample/MainActivityTest.java +++ b/sample/src/test/java/io/noties/markwon/sample/MainActivityTest.java @@ -1,4 +1,4 @@ -package ru.noties.markwon.sample; +package io.noties.markwon.sample; import android.content.Context;