diff --git a/app/src/debug/java/ru/noties/markwon/debug/DebugCheckboxDrawableView.java b/app/src/debug/java/ru/noties/markwon/debug/DebugCheckboxDrawableView.java index 4c9027cc..7cc08074 100644 --- a/app/src/debug/java/ru/noties/markwon/debug/DebugCheckboxDrawableView.java +++ b/app/src/debug/java/ru/noties/markwon/debug/DebugCheckboxDrawableView.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/ru/noties/markwon/App.java b/app/src/main/java/ru/noties/markwon/App.java index 5c9b3157..e8144aee 100644 --- a/app/src/main/java/ru/noties/markwon/App.java +++ b/app/src/main/java/ru/noties/markwon/App.java @@ -2,7 +2,7 @@ package ru.noties.markwon; import android.app.Application; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import ru.noties.debug.AndroidLogDebugOutput; import ru.noties.debug.Debug; diff --git a/app/src/main/java/ru/noties/markwon/AppBarItem.java b/app/src/main/java/ru/noties/markwon/AppBarItem.java index bf83e658..b1a7bdc9 100644 --- a/app/src/main/java/ru/noties/markwon/AppBarItem.java +++ b/app/src/main/java/ru/noties/markwon/AppBarItem.java @@ -1,6 +1,6 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/ru/noties/markwon/MainActivity.java b/app/src/main/java/ru/noties/markwon/MainActivity.java index fd3965b6..77408b7b 100644 --- a/app/src/main/java/ru/noties/markwon/MainActivity.java +++ b/app/src/main/java/ru/noties/markwon/MainActivity.java @@ -4,8 +4,8 @@ import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Spanned; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/ru/noties/markwon/MarkdownLoader.java b/app/src/main/java/ru/noties/markwon/MarkdownLoader.java index 02bb902d..2069c001 100644 --- a/app/src/main/java/ru/noties/markwon/MarkdownLoader.java +++ b/app/src/main/java/ru/noties/markwon/MarkdownLoader.java @@ -4,8 +4,8 @@ import android.content.ContentResolver; import android.content.Context; import android.net.Uri; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import java.io.BufferedReader; diff --git a/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java b/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java index cf2ab04c..e8d5257c 100644 --- a/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java +++ b/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java @@ -4,8 +4,8 @@ import android.content.Context; import android.net.Uri; import android.os.Handler; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Spanned; import java.util.concurrent.ExecutorService; diff --git a/app/src/main/java/ru/noties/markwon/Themes.java b/app/src/main/java/ru/noties/markwon/Themes.java index 85ab846c..73ee9f90 100644 --- a/app/src/main/java/ru/noties/markwon/Themes.java +++ b/app/src/main/java/ru/noties/markwon/Themes.java @@ -2,7 +2,7 @@ package ru.noties.markwon; import android.content.Context; import android.content.SharedPreferences; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/app/src/main/java/ru/noties/markwon/UriProcessor.java b/app/src/main/java/ru/noties/markwon/UriProcessor.java index a4fb5b85..d7e59c57 100644 --- a/app/src/main/java/ru/noties/markwon/UriProcessor.java +++ b/app/src/main/java/ru/noties/markwon/UriProcessor.java @@ -1,7 +1,7 @@ package ru.noties.markwon; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; @SuppressWarnings("WeakerAccess") public interface UriProcessor { diff --git a/app/src/main/java/ru/noties/markwon/UriProcessorImpl.java b/app/src/main/java/ru/noties/markwon/UriProcessorImpl.java index 03d29353..02d0c8b2 100644 --- a/app/src/main/java/ru/noties/markwon/UriProcessorImpl.java +++ b/app/src/main/java/ru/noties/markwon/UriProcessorImpl.java @@ -1,7 +1,7 @@ package ru.noties.markwon; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.List; diff --git a/app/src/main/java/ru/noties/markwon/UrlProcessorInitialReadme.java b/app/src/main/java/ru/noties/markwon/UrlProcessorInitialReadme.java index d9690574..24ac0ee7 100644 --- a/app/src/main/java/ru/noties/markwon/UrlProcessorInitialReadme.java +++ b/app/src/main/java/ru/noties/markwon/UrlProcessorInitialReadme.java @@ -1,7 +1,7 @@ package ru.noties.markwon; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import ru.noties.markwon.urlprocessor.UrlProcessor; diff --git a/app/src/main/java/ru/noties/markwon/Views.java b/app/src/main/java/ru/noties/markwon/Views.java index 3c172e4b..5d7fdf20 100644 --- a/app/src/main/java/ru/noties/markwon/Views.java +++ b/app/src/main/java/ru/noties/markwon/Views.java @@ -1,7 +1,7 @@ package ru.noties.markwon; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import android.view.View; @SuppressWarnings("WeakerAccess") diff --git a/app/src/main/java/ru/noties/markwon/gif/GifAwareAsyncDrawable.java b/app/src/main/java/ru/noties/markwon/gif/GifAwareAsyncDrawable.java index b5ba34ce..3a2480fe 100644 --- a/app/src/main/java/ru/noties/markwon/gif/GifAwareAsyncDrawable.java +++ b/app/src/main/java/ru/noties/markwon/gif/GifAwareAsyncDrawable.java @@ -2,8 +2,8 @@ package ru.noties.markwon.gif; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import pl.droidsonroids.gif.GifDrawable; import ru.noties.markwon.image.AsyncDrawableLoader; diff --git a/app/src/main/java/ru/noties/markwon/gif/GifAwarePlugin.java b/app/src/main/java/ru/noties/markwon/gif/GifAwarePlugin.java index 89e49384..3670b2e4 100644 --- a/app/src/main/java/ru/noties/markwon/gif/GifAwarePlugin.java +++ b/app/src/main/java/ru/noties/markwon/gif/GifAwarePlugin.java @@ -1,7 +1,7 @@ package ru.noties.markwon.gif; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.widget.TextView; import org.commonmark.node.Image; diff --git a/app/src/main/java/ru/noties/markwon/gif/GifPlaceholder.java b/app/src/main/java/ru/noties/markwon/gif/GifPlaceholder.java index 7d6dcbe1..996add31 100644 --- a/app/src/main/java/ru/noties/markwon/gif/GifPlaceholder.java +++ b/app/src/main/java/ru/noties/markwon/gif/GifPlaceholder.java @@ -6,9 +6,9 @@ import android.graphics.Paint; import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public class GifPlaceholder extends Drawable { diff --git a/app/src/main/java/ru/noties/markwon/gif/GifProcessor.java b/app/src/main/java/ru/noties/markwon/gif/GifProcessor.java index 8cdb1da5..fbf476e6 100644 --- a/app/src/main/java/ru/noties/markwon/gif/GifProcessor.java +++ b/app/src/main/java/ru/noties/markwon/gif/GifProcessor.java @@ -1,7 +1,7 @@ package ru.noties.markwon.gif; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Spannable; import android.text.Spanned; import android.text.style.ClickableSpan; diff --git a/build.gradle b/build.gradle index 31eded05..8cf700c4 100644 --- a/build.gradle +++ b/build.gradle @@ -48,14 +48,12 @@ ext { 'push-aar-gradle': 'https://raw.githubusercontent.com/noties/gradle-mvn-push/master/gradle-mvn-push-aar.gradle' ] - final def supportVersion = '28.0.0' final def commonMarkVersion = '0.12.1' final def daggerVersion = '2.10' deps = [ - 'support-annotations' : "com.android.support:support-annotations:$supportVersion", - 'support-app-compat' : "com.android.support:appcompat-v7:$supportVersion", - 'support-recycler-view' : "com.android.support:recyclerview-v7:$supportVersion", + 'support-annotations' : "androidx.annotation:annotation:1.0.2", + 'support-recycler-view' : "androidx.recyclerview:recyclerview:1.0.0", 'commonmark' : "com.atlassian.commonmark:commonmark:$commonMarkVersion", 'commonmark-strikethrough': "com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:$commonMarkVersion", 'commonmark-table' : "com.atlassian.commonmark:commonmark-ext-gfm-tables:$commonMarkVersion", diff --git a/gradle.properties b/gradle.properties index cb90cb8f..e60373b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,6 +5,8 @@ org.gradle.configureondemand=true android.enableBuildCache=true android.buildCacheDir=build/pre-dex-cache +android.useAndroidX=true +android.enableJetifier=true VERSION_NAME=3.0.1 @@ -18,4 +20,4 @@ POM_LICENCE_NAME=The Apache Software License, Version 2.0 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=noties -POM_DEVELOPER_NAME=Dimitry Ivanov \ No newline at end of file +POM_DEVELOPER_NAME=Dimitry Ivanov diff --git a/markwon-core/src/main/java/ru/noties/markwon/AbstractMarkwonPlugin.java b/markwon-core/src/main/java/ru/noties/markwon/AbstractMarkwonPlugin.java index 5492d4d0..8e7e60a9 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/AbstractMarkwonPlugin.java +++ b/markwon-core/src/main/java/ru/noties/markwon/AbstractMarkwonPlugin.java @@ -1,6 +1,6 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Spanned; import android.widget.TextView; diff --git a/markwon-core/src/main/java/ru/noties/markwon/LinkResolverDef.java b/markwon-core/src/main/java/ru/noties/markwon/LinkResolverDef.java index 4f893761..bc21a426 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/LinkResolverDef.java +++ b/markwon-core/src/main/java/ru/noties/markwon/LinkResolverDef.java @@ -5,7 +5,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.provider.Browser; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import android.view.View; diff --git a/markwon-core/src/main/java/ru/noties/markwon/Markwon.java b/markwon-core/src/main/java/ru/noties/markwon/Markwon.java index 0ac110ff..65fdf8d3 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/Markwon.java +++ b/markwon-core/src/main/java/ru/noties/markwon/Markwon.java @@ -1,8 +1,8 @@ package ru.noties.markwon; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Spanned; import android.widget.TextView; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonBuilderImpl.java b/markwon-core/src/main/java/ru/noties/markwon/MarkwonBuilderImpl.java index a390c46e..c855c48e 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonBuilderImpl.java +++ b/markwon-core/src/main/java/ru/noties/markwon/MarkwonBuilderImpl.java @@ -1,8 +1,8 @@ package ru.noties.markwon; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import android.widget.TextView; import org.commonmark.parser.Parser; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonConfiguration.java b/markwon-core/src/main/java/ru/noties/markwon/MarkwonConfiguration.java index af481ee8..00255143 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonConfiguration.java +++ b/markwon-core/src/main/java/ru/noties/markwon/MarkwonConfiguration.java @@ -1,6 +1,6 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import ru.noties.markwon.core.MarkwonTheme; import ru.noties.markwon.core.spans.LinkSpan; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonImpl.java b/markwon-core/src/main/java/ru/noties/markwon/MarkwonImpl.java index e90b7898..6bfea941 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonImpl.java +++ b/markwon-core/src/main/java/ru/noties/markwon/MarkwonImpl.java @@ -1,7 +1,7 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Spanned; import android.widget.TextView; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonNodeRenderer.java b/markwon-core/src/main/java/ru/noties/markwon/MarkwonNodeRenderer.java index 94de3c20..3a9b6326 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonNodeRenderer.java +++ b/markwon-core/src/main/java/ru/noties/markwon/MarkwonNodeRenderer.java @@ -1,9 +1,9 @@ package ru.noties.markwon; import android.content.Context; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonPlugin.java b/markwon-core/src/main/java/ru/noties/markwon/MarkwonPlugin.java index 0804848b..8913b519 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonPlugin.java +++ b/markwon-core/src/main/java/ru/noties/markwon/MarkwonPlugin.java @@ -1,6 +1,6 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Spanned; import android.widget.TextView; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonReducer.java b/markwon-core/src/main/java/ru/noties/markwon/MarkwonReducer.java index a139e3f1..8f01bc68 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonReducer.java +++ b/markwon-core/src/main/java/ru/noties/markwon/MarkwonReducer.java @@ -1,6 +1,6 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.commonmark.node.Node; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactory.java b/markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactory.java index 2ef3f47f..0dcd3338 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactory.java +++ b/markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactory.java @@ -1,7 +1,7 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.commonmark.node.Node; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactoryImpl.java b/markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactoryImpl.java index 85a4ab33..22f3551c 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactoryImpl.java +++ b/markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactoryImpl.java @@ -1,7 +1,7 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.commonmark.node.Node; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitor.java b/markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitor.java index e7a83db0..fb433a55 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitor.java +++ b/markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitor.java @@ -1,7 +1,7 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.commonmark.node.Node; import org.commonmark.node.Visitor; diff --git a/markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitorImpl.java b/markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitorImpl.java index d4f0bce6..0ca4f960 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitorImpl.java +++ b/markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitorImpl.java @@ -1,7 +1,7 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.commonmark.node.BlockQuote; import org.commonmark.node.BulletList; diff --git a/markwon-core/src/main/java/ru/noties/markwon/Prop.java b/markwon-core/src/main/java/ru/noties/markwon/Prop.java index 91b4515b..68d83684 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/Prop.java +++ b/markwon-core/src/main/java/ru/noties/markwon/Prop.java @@ -1,7 +1,7 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Class to hold data in {@link RenderProps}. Represents a certain property. diff --git a/markwon-core/src/main/java/ru/noties/markwon/RenderProps.java b/markwon-core/src/main/java/ru/noties/markwon/RenderProps.java index e28edbaf..b4938d77 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/RenderProps.java +++ b/markwon-core/src/main/java/ru/noties/markwon/RenderProps.java @@ -1,7 +1,7 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * @since 3.0.0 diff --git a/markwon-core/src/main/java/ru/noties/markwon/RenderPropsImpl.java b/markwon-core/src/main/java/ru/noties/markwon/RenderPropsImpl.java index 24557975..8bbc220c 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/RenderPropsImpl.java +++ b/markwon-core/src/main/java/ru/noties/markwon/RenderPropsImpl.java @@ -1,7 +1,7 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.HashMap; import java.util.Map; diff --git a/markwon-core/src/main/java/ru/noties/markwon/SpanFactory.java b/markwon-core/src/main/java/ru/noties/markwon/SpanFactory.java index 76e251e7..190ead19 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/SpanFactory.java +++ b/markwon-core/src/main/java/ru/noties/markwon/SpanFactory.java @@ -1,7 +1,7 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * @since 3.0.0 diff --git a/markwon-core/src/main/java/ru/noties/markwon/SpannableBuilder.java b/markwon-core/src/main/java/ru/noties/markwon/SpannableBuilder.java index 3c10f779..21720491 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/SpannableBuilder.java +++ b/markwon-core/src/main/java/ru/noties/markwon/SpannableBuilder.java @@ -1,8 +1,8 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import android.text.SpannableStringBuilder; import android.text.Spanned; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/CorePlugin.java b/markwon-core/src/main/java/ru/noties/markwon/core/CorePlugin.java index 77fa3653..a1726a87 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/CorePlugin.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/CorePlugin.java @@ -1,8 +1,8 @@ package ru.noties.markwon.core; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import android.text.Spanned; import android.text.method.LinkMovementMethod; import android.widget.TextView; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/MarkwonTheme.java b/markwon-core/src/main/java/ru/noties/markwon/core/MarkwonTheme.java index f01df083..f8ee3008 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/MarkwonTheme.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/MarkwonTheme.java @@ -3,11 +3,11 @@ package ru.noties.markwon.core; import android.content.Context; import android.graphics.Paint; import android.graphics.Typeface; -import android.support.annotation.ColorInt; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Px; -import android.support.annotation.Size; +import androidx.annotation.ColorInt; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Px; +import androidx.annotation.Size; import android.text.TextPaint; import java.util.Arrays; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/SimpleBlockNodeVisitor.java b/markwon-core/src/main/java/ru/noties/markwon/core/SimpleBlockNodeVisitor.java index 31f04081..f1fa7d13 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/SimpleBlockNodeVisitor.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/SimpleBlockNodeVisitor.java @@ -1,6 +1,6 @@ package ru.noties.markwon.core; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.commonmark.node.Node; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/BlockQuoteSpanFactory.java b/markwon-core/src/main/java/ru/noties/markwon/core/factory/BlockQuoteSpanFactory.java index cbe86db6..f45380ea 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/BlockQuoteSpanFactory.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/factory/BlockQuoteSpanFactory.java @@ -1,7 +1,7 @@ package ru.noties.markwon.core.factory; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.MarkwonConfiguration; import ru.noties.markwon.RenderProps; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeBlockSpanFactory.java b/markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeBlockSpanFactory.java index 2bf9383e..19db531c 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeBlockSpanFactory.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeBlockSpanFactory.java @@ -1,7 +1,7 @@ package ru.noties.markwon.core.factory; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.MarkwonConfiguration; import ru.noties.markwon.RenderProps; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeSpanFactory.java b/markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeSpanFactory.java index 944556fb..e676eed7 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeSpanFactory.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeSpanFactory.java @@ -1,7 +1,7 @@ package ru.noties.markwon.core.factory; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.MarkwonConfiguration; import ru.noties.markwon.RenderProps; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/EmphasisSpanFactory.java b/markwon-core/src/main/java/ru/noties/markwon/core/factory/EmphasisSpanFactory.java index d9d8331d..1ad6f456 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/EmphasisSpanFactory.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/factory/EmphasisSpanFactory.java @@ -1,7 +1,7 @@ package ru.noties.markwon.core.factory; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.MarkwonConfiguration; import ru.noties.markwon.RenderProps; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/HeadingSpanFactory.java b/markwon-core/src/main/java/ru/noties/markwon/core/factory/HeadingSpanFactory.java index bd675edd..883fcc40 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/HeadingSpanFactory.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/factory/HeadingSpanFactory.java @@ -1,7 +1,7 @@ package ru.noties.markwon.core.factory; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.MarkwonConfiguration; import ru.noties.markwon.RenderProps; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/LinkSpanFactory.java b/markwon-core/src/main/java/ru/noties/markwon/core/factory/LinkSpanFactory.java index ee97ba34..82516968 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/LinkSpanFactory.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/factory/LinkSpanFactory.java @@ -1,7 +1,7 @@ package ru.noties.markwon.core.factory; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.MarkwonConfiguration; import ru.noties.markwon.RenderProps; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/ListItemSpanFactory.java b/markwon-core/src/main/java/ru/noties/markwon/core/factory/ListItemSpanFactory.java index 06d73d2e..87a03eea 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/ListItemSpanFactory.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/factory/ListItemSpanFactory.java @@ -1,7 +1,7 @@ package ru.noties.markwon.core.factory; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.MarkwonConfiguration; import ru.noties.markwon.RenderProps; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/StrongEmphasisSpanFactory.java b/markwon-core/src/main/java/ru/noties/markwon/core/factory/StrongEmphasisSpanFactory.java index c81d6121..e7c9e777 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/StrongEmphasisSpanFactory.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/factory/StrongEmphasisSpanFactory.java @@ -1,7 +1,7 @@ package ru.noties.markwon.core.factory; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.MarkwonConfiguration; import ru.noties.markwon.RenderProps; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/factory/ThematicBreakSpanFactory.java b/markwon-core/src/main/java/ru/noties/markwon/core/factory/ThematicBreakSpanFactory.java index ecd20f32..51dce485 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/factory/ThematicBreakSpanFactory.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/factory/ThematicBreakSpanFactory.java @@ -1,7 +1,7 @@ package ru.noties.markwon.core.factory; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.MarkwonConfiguration; import ru.noties.markwon.RenderProps; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/BlockQuoteSpan.java b/markwon-core/src/main/java/ru/noties/markwon/core/spans/BlockQuoteSpan.java index ea4e353c..865e6f69 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/BlockQuoteSpan.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/spans/BlockQuoteSpan.java @@ -3,7 +3,7 @@ package ru.noties.markwon.core.spans; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Layout; import android.text.style.LeadingMarginSpan; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/BulletListItemSpan.java b/markwon-core/src/main/java/ru/noties/markwon/core/spans/BulletListItemSpan.java index 86a6c81b..0517e7e9 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/BulletListItemSpan.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/spans/BulletListItemSpan.java @@ -4,8 +4,8 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; import android.graphics.RectF; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; import android.text.Layout; import android.text.style.LeadingMarginSpan; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeBlockSpan.java b/markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeBlockSpan.java index 00109766..895911ed 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeBlockSpan.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeBlockSpan.java @@ -3,7 +3,7 @@ package ru.noties.markwon.core.spans; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Layout; import android.text.TextPaint; import android.text.style.LeadingMarginSpan; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeSpan.java b/markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeSpan.java index 856d5807..403b4692 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeSpan.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeSpan.java @@ -1,6 +1,6 @@ package ru.noties.markwon.core.spans; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextPaint; import android.text.style.MetricAffectingSpan; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/CustomTypefaceSpan.java b/markwon-core/src/main/java/ru/noties/markwon/core/spans/CustomTypefaceSpan.java index 99ae2111..0e8c1395 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/CustomTypefaceSpan.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/spans/CustomTypefaceSpan.java @@ -1,7 +1,7 @@ package ru.noties.markwon.core.spans; import android.graphics.Typeface; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; 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/ru/noties/markwon/core/spans/HeadingSpan.java index a942cc64..afef3f7b 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/HeadingSpan.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/spans/HeadingSpan.java @@ -3,8 +3,8 @@ package ru.noties.markwon.core.spans; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; import android.text.Layout; import android.text.TextPaint; import android.text.style.LeadingMarginSpan; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/LinkSpan.java b/markwon-core/src/main/java/ru/noties/markwon/core/spans/LinkSpan.java index e8f7d8f7..11c62bd1 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/LinkSpan.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/spans/LinkSpan.java @@ -1,6 +1,6 @@ package ru.noties.markwon.core.spans; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextPaint; import android.text.style.URLSpan; import android.view.View; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/OrderedListItemSpan.java b/markwon-core/src/main/java/ru/noties/markwon/core/spans/OrderedListItemSpan.java index 6be46fd5..790d5239 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/OrderedListItemSpan.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/spans/OrderedListItemSpan.java @@ -2,7 +2,7 @@ package ru.noties.markwon.core.spans; import android.graphics.Canvas; import android.graphics.Paint; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Layout; import android.text.Spanned; import android.text.TextPaint; diff --git a/markwon-core/src/main/java/ru/noties/markwon/core/spans/ThematicBreakSpan.java b/markwon-core/src/main/java/ru/noties/markwon/core/spans/ThematicBreakSpan.java index 0e06537b..b33519ba 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/core/spans/ThematicBreakSpan.java +++ b/markwon-core/src/main/java/ru/noties/markwon/core/spans/ThematicBreakSpan.java @@ -3,7 +3,7 @@ package ru.noties.markwon.core.spans; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Layout; import android.text.style.LeadingMarginSpan; diff --git a/markwon-core/src/main/java/ru/noties/markwon/html/HtmlTag.java b/markwon-core/src/main/java/ru/noties/markwon/html/HtmlTag.java index fbe417e9..88535e98 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/html/HtmlTag.java +++ b/markwon-core/src/main/java/ru/noties/markwon/html/HtmlTag.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.List; import java.util.Map; diff --git a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParser.java b/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParser.java index 01bea86a..ee1586d2 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParser.java +++ b/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParser.java @@ -1,6 +1,6 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.List; diff --git a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserNoOp.java b/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserNoOp.java index ecf6e423..22a16d08 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserNoOp.java +++ b/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserNoOp.java @@ -1,6 +1,6 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.Collections; diff --git a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRenderer.java b/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRenderer.java index 93d0411d..af1e869e 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRenderer.java +++ b/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRenderer.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Collection; diff --git a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererImpl.java b/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererImpl.java index 0f4c97e6..50b42898 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererImpl.java +++ b/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererImpl.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Collection; import java.util.Collections; diff --git a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererNoOp.java b/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererNoOp.java index 1a6ac51f..23f0f70a 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererNoOp.java +++ b/markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererNoOp.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.MarkwonVisitor; diff --git a/markwon-core/src/main/java/ru/noties/markwon/html/TagHandler.java b/markwon-core/src/main/java/ru/noties/markwon/html/TagHandler.java index 84122946..01b9ca09 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/html/TagHandler.java +++ b/markwon-core/src/main/java/ru/noties/markwon/html/TagHandler.java @@ -1,6 +1,6 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import ru.noties.markwon.MarkwonVisitor; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawable.java b/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawable.java index 25cf6363..5fd2e9e9 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawable.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawable.java @@ -6,9 +6,9 @@ import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.drawable.Animatable; import android.graphics.drawable.Drawable; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public class AsyncDrawable extends Drawable { diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoader.java b/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoader.java index 8b76acc5..b4b2f0db 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoader.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoader.java @@ -1,8 +1,8 @@ package ru.noties.markwon.image; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Collection; import java.util.HashMap; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderImpl.java b/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderImpl.java index fd7c3ad1..2606b55e 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderImpl.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderImpl.java @@ -4,8 +4,8 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Handler; import android.os.Looper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.io.IOException; import java.io.InputStream; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderNoOp.java b/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderNoOp.java index 74520fb2..cc268de9 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderNoOp.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderNoOp.java @@ -1,8 +1,8 @@ package ru.noties.markwon.image; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; class AsyncDrawableLoaderNoOp extends AsyncDrawableLoader { @Override diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableScheduler.java b/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableScheduler.java index 0093abed..188296f2 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableScheduler.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableScheduler.java @@ -4,7 +4,7 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Looper; import android.os.SystemClock; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Spanned; import android.text.style.DynamicDrawableSpan; import android.view.View; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableSpan.java b/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableSpan.java index a268ef19..b0a6ec15 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableSpan.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableSpan.java @@ -3,10 +3,10 @@ package ru.noties.markwon.image; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; -import android.support.annotation.IntDef; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.style.ReplacementSpan; import java.lang.annotation.Retention; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/DrawableUtils.java b/markwon-core/src/main/java/ru/noties/markwon/image/DrawableUtils.java index a5134d52..d10bd4d7 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/DrawableUtils.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/DrawableUtils.java @@ -2,8 +2,8 @@ package ru.noties.markwon.image; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.CheckResult; -import android.support.annotation.NonNull; +import androidx.annotation.CheckResult; +import androidx.annotation.NonNull; /** * @since 3.0.1 diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/ImageItem.java b/markwon-core/src/main/java/ru/noties/markwon/image/ImageItem.java index 2dc4b729..9f0e6a55 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/ImageItem.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/ImageItem.java @@ -1,6 +1,6 @@ package ru.noties.markwon.image; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.io.InputStream; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/ImageMediaDecoder.java b/markwon-core/src/main/java/ru/noties/markwon/image/ImageMediaDecoder.java index c510c4d8..fe81fb85 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/ImageMediaDecoder.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/ImageMediaDecoder.java @@ -5,8 +5,8 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.io.InputStream; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSize.java b/markwon-core/src/main/java/ru/noties/markwon/image/ImageSize.java index ec44ed76..e2346312 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSize.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/ImageSize.java @@ -1,6 +1,6 @@ package ru.noties.markwon.image; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** * @since 1.0.1 diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolver.java b/markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolver.java index 57284a41..87eac2bb 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolver.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolver.java @@ -1,8 +1,8 @@ package ru.noties.markwon.image; import android.graphics.Rect; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * @since 1.0.1 diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolverDef.java b/markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolverDef.java index bdf7ae48..d484d4d6 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolverDef.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolverDef.java @@ -1,8 +1,8 @@ package ru.noties.markwon.image; import android.graphics.Rect; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * @since 1.0.1 diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSpanFactory.java b/markwon-core/src/main/java/ru/noties/markwon/image/ImageSpanFactory.java index 5af5b0ec..5de9fa09 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/ImageSpanFactory.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/ImageSpanFactory.java @@ -1,7 +1,7 @@ package ru.noties.markwon.image; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.MarkwonConfiguration; import ru.noties.markwon.RenderProps; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/ImagesPlugin.java b/markwon-core/src/main/java/ru/noties/markwon/image/ImagesPlugin.java index 2f6e8117..5c058342 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/ImagesPlugin.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/ImagesPlugin.java @@ -1,7 +1,7 @@ package ru.noties.markwon.image; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Spanned; import android.widget.TextView; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/MediaDecoder.java b/markwon-core/src/main/java/ru/noties/markwon/image/MediaDecoder.java index 68d0ff33..6c65eeff 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/MediaDecoder.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/MediaDecoder.java @@ -1,8 +1,8 @@ package ru.noties.markwon.image; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.io.InputStream; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/SchemeHandler.java b/markwon-core/src/main/java/ru/noties/markwon/image/SchemeHandler.java index cac1c801..64f8f2fc 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/SchemeHandler.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/SchemeHandler.java @@ -1,8 +1,8 @@ package ru.noties.markwon.image; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * @since 3.0.0 diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUri.java b/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUri.java index 6e812c92..278a75b6 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUri.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUri.java @@ -1,6 +1,6 @@ package ru.noties.markwon.image.data; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; public class DataUri { diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUriDecoder.java b/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUriDecoder.java index 7e3d4f73..002b1f48 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUriDecoder.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUriDecoder.java @@ -1,7 +1,7 @@ package ru.noties.markwon.image.data; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Base64; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUriParser.java b/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUriParser.java index 0768ee4a..861a6a3b 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUriParser.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUriParser.java @@ -1,7 +1,7 @@ package ru.noties.markwon.image.data; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public abstract class DataUriParser { diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUriSchemeHandler.java b/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUriSchemeHandler.java index f4c87ed4..33496b30 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUriSchemeHandler.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/data/DataUriSchemeHandler.java @@ -1,8 +1,8 @@ package ru.noties.markwon.image.data; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.io.ByteArrayInputStream; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/file/FileSchemeHandler.java b/markwon-core/src/main/java/ru/noties/markwon/image/file/FileSchemeHandler.java index 712899aa..7c097062 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/file/FileSchemeHandler.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/file/FileSchemeHandler.java @@ -2,8 +2,8 @@ package ru.noties.markwon.image.file; import android.content.res.AssetManager; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.webkit.MimeTypeMap; import java.io.BufferedInputStream; diff --git a/markwon-core/src/main/java/ru/noties/markwon/image/network/NetworkSchemeHandler.java b/markwon-core/src/main/java/ru/noties/markwon/image/network/NetworkSchemeHandler.java index ebaaf803..84a7f40c 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/image/network/NetworkSchemeHandler.java +++ b/markwon-core/src/main/java/ru/noties/markwon/image/network/NetworkSchemeHandler.java @@ -1,8 +1,8 @@ package ru.noties.markwon.image.network; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.io.BufferedInputStream; import java.io.IOException; diff --git a/markwon-core/src/main/java/ru/noties/markwon/movement/MovementMethodPlugin.java b/markwon-core/src/main/java/ru/noties/markwon/movement/MovementMethodPlugin.java index 59dd04ab..3eab0aa2 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/movement/MovementMethodPlugin.java +++ b/markwon-core/src/main/java/ru/noties/markwon/movement/MovementMethodPlugin.java @@ -1,6 +1,6 @@ package ru.noties.markwon.movement; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Spanned; import android.text.method.LinkMovementMethod; import android.text.method.MovementMethod; diff --git a/markwon-core/src/main/java/ru/noties/markwon/priority/Priority.java b/markwon-core/src/main/java/ru/noties/markwon/priority/Priority.java index 5582ff72..0481e3bd 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/priority/Priority.java +++ b/markwon-core/src/main/java/ru/noties/markwon/priority/Priority.java @@ -1,6 +1,6 @@ package ru.noties.markwon.priority; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.ArrayList; import java.util.Collections; diff --git a/markwon-core/src/main/java/ru/noties/markwon/priority/PriorityProcessor.java b/markwon-core/src/main/java/ru/noties/markwon/priority/PriorityProcessor.java index 1ba1353d..e4bbd72f 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/priority/PriorityProcessor.java +++ b/markwon-core/src/main/java/ru/noties/markwon/priority/PriorityProcessor.java @@ -1,6 +1,6 @@ package ru.noties.markwon.priority; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.List; diff --git a/markwon-core/src/main/java/ru/noties/markwon/priority/PriorityProcessorImpl.java b/markwon-core/src/main/java/ru/noties/markwon/priority/PriorityProcessorImpl.java index e676a9c9..d8a9b1a9 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/priority/PriorityProcessorImpl.java +++ b/markwon-core/src/main/java/ru/noties/markwon/priority/PriorityProcessorImpl.java @@ -1,6 +1,6 @@ package ru.noties.markwon.priority; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.ArrayList; import java.util.Collections; diff --git a/markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlight.java b/markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlight.java index cf6921ee..ecddd2db 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlight.java +++ b/markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlight.java @@ -1,7 +1,7 @@ package ru.noties.markwon.syntax; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; @SuppressWarnings("WeakerAccess") public interface SyntaxHighlight { diff --git a/markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlightNoOp.java b/markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlightNoOp.java index 48a80ee2..0f663d23 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlightNoOp.java +++ b/markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlightNoOp.java @@ -1,7 +1,7 @@ package ru.noties.markwon.syntax; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public class SyntaxHighlightNoOp implements SyntaxHighlight { @NonNull diff --git a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessor.java b/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessor.java index 9ea7919e..4eb804e0 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessor.java +++ b/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessor.java @@ -1,6 +1,6 @@ package ru.noties.markwon.urlprocessor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface UrlProcessor { @NonNull diff --git a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorAndroidAssets.java b/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorAndroidAssets.java index 439d7f12..c3d2ea06 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorAndroidAssets.java +++ b/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorAndroidAssets.java @@ -1,8 +1,8 @@ package ru.noties.markwon.urlprocessor; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; /** diff --git a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorNoOp.java b/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorNoOp.java index 9d8560d6..6beb8bde 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorNoOp.java +++ b/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorNoOp.java @@ -1,6 +1,6 @@ package ru.noties.markwon.urlprocessor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class UrlProcessorNoOp implements UrlProcessor { @NonNull diff --git a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsolute.java b/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsolute.java index d99aaf4f..921a1646 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsolute.java +++ b/markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsolute.java @@ -1,7 +1,7 @@ package ru.noties.markwon.urlprocessor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.net.MalformedURLException; import java.net.URL; diff --git a/markwon-core/src/main/java/ru/noties/markwon/utils/Dip.java b/markwon-core/src/main/java/ru/noties/markwon/utils/Dip.java index 51d098e0..32755d3a 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/utils/Dip.java +++ b/markwon-core/src/main/java/ru/noties/markwon/utils/Dip.java @@ -1,7 +1,7 @@ package ru.noties.markwon.utils; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class Dip { diff --git a/markwon-core/src/main/java/ru/noties/markwon/utils/DrawableUtils.java b/markwon-core/src/main/java/ru/noties/markwon/utils/DrawableUtils.java index 0f719339..808e2572 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/utils/DrawableUtils.java +++ b/markwon-core/src/main/java/ru/noties/markwon/utils/DrawableUtils.java @@ -1,7 +1,7 @@ package ru.noties.markwon.utils; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * @deprecated Please use {@link ru.noties.markwon.image.DrawableUtils} diff --git a/markwon-core/src/main/java/ru/noties/markwon/utils/DumpNodes.java b/markwon-core/src/main/java/ru/noties/markwon/utils/DumpNodes.java index 3b45d238..977f1ea2 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/utils/DumpNodes.java +++ b/markwon-core/src/main/java/ru/noties/markwon/utils/DumpNodes.java @@ -1,7 +1,7 @@ package ru.noties.markwon.utils; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.commonmark.node.Block; import org.commonmark.node.Node; diff --git a/markwon-core/src/main/java/ru/noties/markwon/utils/NoCopySpannableFactory.java b/markwon-core/src/main/java/ru/noties/markwon/utils/NoCopySpannableFactory.java index f5eedc2a..eb9ae6d4 100644 --- a/markwon-core/src/main/java/ru/noties/markwon/utils/NoCopySpannableFactory.java +++ b/markwon-core/src/main/java/ru/noties/markwon/utils/NoCopySpannableFactory.java @@ -1,6 +1,6 @@ package ru.noties.markwon.utils; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Spannable; import android.text.SpannableString; diff --git a/markwon-core/src/test/java/ru/noties/markwon/AbstractMarkwonVisitorImpl.java b/markwon-core/src/test/java/ru/noties/markwon/AbstractMarkwonVisitorImpl.java index ea099248..6a471e57 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/AbstractMarkwonVisitorImpl.java +++ b/markwon-core/src/test/java/ru/noties/markwon/AbstractMarkwonVisitorImpl.java @@ -1,6 +1,6 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.commonmark.node.Node; diff --git a/markwon-core/src/test/java/ru/noties/markwon/MarkwonBuilderImplTest.java b/markwon-core/src/test/java/ru/noties/markwon/MarkwonBuilderImplTest.java index af3d00b1..1bfc0f8c 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/MarkwonBuilderImplTest.java +++ b/markwon-core/src/test/java/ru/noties/markwon/MarkwonBuilderImplTest.java @@ -1,6 +1,6 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Spanned; import android.widget.TextView; @@ -229,4 +229,4 @@ public class MarkwonBuilderImplTest { verify(plugin, times(0)).beforeSetText(any(TextView.class), any(Spanned.class)); verify(plugin, times(0)).afterSetText(any(TextView.class)); } -} \ No newline at end of file +} diff --git a/markwon-core/src/test/java/ru/noties/markwon/SpannableBuilderTest.java b/markwon-core/src/test/java/ru/noties/markwon/SpannableBuilderTest.java index 3535e19b..d1e68199 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/SpannableBuilderTest.java +++ b/markwon-core/src/test/java/ru/noties/markwon/SpannableBuilderTest.java @@ -1,6 +1,6 @@ package ru.noties.markwon; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.SpannableStringBuilder; import android.text.Spanned; @@ -364,4 +364,4 @@ public class SpannableBuilderTest { '}'; } } -} \ No newline at end of file +} diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/CorePluginBridge.java b/markwon-core/src/test/java/ru/noties/markwon/core/CorePluginBridge.java index 6517873b..9cee7088 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/CorePluginBridge.java +++ b/markwon-core/src/test/java/ru/noties/markwon/core/CorePluginBridge.java @@ -1,7 +1,7 @@ package ru.noties.markwon.core; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.commonmark.node.Node; diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/CorePluginTest.java b/markwon-core/src/test/java/ru/noties/markwon/core/CorePluginTest.java index dd1d43cc..eaf8e5da 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/CorePluginTest.java +++ b/markwon-core/src/test/java/ru/noties/markwon/core/CorePluginTest.java @@ -1,7 +1,7 @@ package ru.noties.markwon.core; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.method.MovementMethod; import android.widget.TextView; @@ -303,4 +303,4 @@ public class CorePluginTest { verify(textView, times(0)).setMovementMethod(any(MovementMethod.class)); } -} \ No newline at end of file +} diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/CoreTest.java b/markwon-core/src/test/java/ru/noties/markwon/core/CoreTest.java index de7c0dd0..931f59c5 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/CoreTest.java +++ b/markwon-core/src/test/java/ru/noties/markwon/core/CoreTest.java @@ -1,6 +1,6 @@ package ru.noties.markwon.core; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Spanned; import org.commonmark.node.Emphasis; diff --git a/markwon-core/src/test/java/ru/noties/markwon/core/suite/BaseSuiteTest.java b/markwon-core/src/test/java/ru/noties/markwon/core/suite/BaseSuiteTest.java index d434ed99..77c1a852 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/core/suite/BaseSuiteTest.java +++ b/markwon-core/src/test/java/ru/noties/markwon/core/suite/BaseSuiteTest.java @@ -1,7 +1,7 @@ package ru.noties.markwon.core.suite; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Spanned; import org.apache.commons.io.IOUtils; diff --git a/markwon-core/src/test/java/ru/noties/markwon/image/AsyncDrawableTest.java b/markwon-core/src/test/java/ru/noties/markwon/image/AsyncDrawableTest.java index 7dad4514..29838630 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/image/AsyncDrawableTest.java +++ b/markwon-core/src/test/java/ru/noties/markwon/image/AsyncDrawableTest.java @@ -4,8 +4,8 @@ import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.junit.Before; import org.junit.Test; @@ -100,4 +100,4 @@ public class AsyncDrawableTest { return 0; } } -} \ No newline at end of file +} diff --git a/markwon-core/src/test/java/ru/noties/markwon/image/ImageTest.java b/markwon-core/src/test/java/ru/noties/markwon/image/ImageTest.java index 69391899..9645ff6d 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/image/ImageTest.java +++ b/markwon-core/src/test/java/ru/noties/markwon/image/ImageTest.java @@ -1,8 +1,8 @@ package ru.noties.markwon.image; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.commonmark.node.Image; import org.junit.Test; diff --git a/markwon-core/src/test/java/ru/noties/markwon/image/data/DataUriSchemeHandlerTest.java b/markwon-core/src/test/java/ru/noties/markwon/image/data/DataUriSchemeHandlerTest.java index 16dc73b5..9be8455e 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/image/data/DataUriSchemeHandlerTest.java +++ b/markwon-core/src/test/java/ru/noties/markwon/image/data/DataUriSchemeHandlerTest.java @@ -1,7 +1,7 @@ package ru.noties.markwon.image.data; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.junit.Before; import org.junit.Test; @@ -111,4 +111,4 @@ public class DataUriSchemeHandlerTest { throw new RuntimeException(t); } } -} \ No newline at end of file +} diff --git a/markwon-core/src/test/java/ru/noties/markwon/priority/PriorityProcessorTest.java b/markwon-core/src/test/java/ru/noties/markwon/priority/PriorityProcessorTest.java index 2a6063ed..4e7b1064 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/priority/PriorityProcessorTest.java +++ b/markwon-core/src/test/java/ru/noties/markwon/priority/PriorityProcessorTest.java @@ -1,7 +1,7 @@ package ru.noties.markwon.priority; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.junit.Before; import org.junit.Test; @@ -492,4 +492,4 @@ public class PriorityProcessorTest { return builder.build(); } } -} \ No newline at end of file +} diff --git a/markwon-core/src/test/java/ru/noties/markwon/syntax/SyntaxHighlightTest.java b/markwon-core/src/test/java/ru/noties/markwon/syntax/SyntaxHighlightTest.java index 9c0262bb..afa4db24 100644 --- a/markwon-core/src/test/java/ru/noties/markwon/syntax/SyntaxHighlightTest.java +++ b/markwon-core/src/test/java/ru/noties/markwon/syntax/SyntaxHighlightTest.java @@ -1,8 +1,8 @@ package ru.noties.markwon.syntax; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.SpannableStringBuilder; import android.text.Spanned; @@ -131,4 +131,4 @@ public class SyntaxHighlightTest { builder.append(text); builder.setSpan(span, start, builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); } -} \ No newline at end of file +} diff --git a/markwon-ext-latex/src/main/java/ru/noties/markwon/ext/latex/JLatexMathPlugin.java b/markwon-ext-latex/src/main/java/ru/noties/markwon/ext/latex/JLatexMathPlugin.java index c4761d0c..29205c8d 100644 --- a/markwon-ext-latex/src/main/java/ru/noties/markwon/ext/latex/JLatexMathPlugin.java +++ b/markwon-ext-latex/src/main/java/ru/noties/markwon/ext/latex/JLatexMathPlugin.java @@ -2,9 +2,9 @@ package ru.noties.markwon.ext.latex; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.Px; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.Px; import org.commonmark.node.Image; import org.commonmark.parser.Parser; diff --git a/markwon-ext-strikethrough/src/main/java/ru/noties/markwon/ext/strikethrough/StrikethroughPlugin.java b/markwon-ext-strikethrough/src/main/java/ru/noties/markwon/ext/strikethrough/StrikethroughPlugin.java index f73ccc71..99b88e33 100644 --- a/markwon-ext-strikethrough/src/main/java/ru/noties/markwon/ext/strikethrough/StrikethroughPlugin.java +++ b/markwon-ext-strikethrough/src/main/java/ru/noties/markwon/ext/strikethrough/StrikethroughPlugin.java @@ -1,6 +1,6 @@ package ru.noties.markwon.ext.strikethrough; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.style.StrikethroughSpan; import org.commonmark.ext.gfm.strikethrough.Strikethrough; diff --git a/markwon-ext-strikethrough/src/test/java/ru/noties/markwon/ext/strikethrough/StrikethroughPluginTest.java b/markwon-ext-strikethrough/src/test/java/ru/noties/markwon/ext/strikethrough/StrikethroughPluginTest.java index 18cab664..d6f46a52 100644 --- a/markwon-ext-strikethrough/src/test/java/ru/noties/markwon/ext/strikethrough/StrikethroughPluginTest.java +++ b/markwon-ext-strikethrough/src/test/java/ru/noties/markwon/ext/strikethrough/StrikethroughPluginTest.java @@ -1,6 +1,6 @@ package ru.noties.markwon.ext.strikethrough; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.style.StrikethroughSpan; import org.commonmark.Extension; @@ -126,4 +126,4 @@ public class StrikethroughPluginTest { TestSpanMatcher.matches(markwon.toMarkdown(input), document); } -} \ No newline at end of file +} diff --git a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/Table.java b/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/Table.java index 12fee872..6e80bf99 100644 --- a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/Table.java +++ b/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/Table.java @@ -1,7 +1,7 @@ package ru.noties.markwon.ext.tables; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Spanned; import org.commonmark.ext.gfm.tables.TableBlock; diff --git a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TablePlugin.java b/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TablePlugin.java index f05a84fc..b34917a4 100644 --- a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TablePlugin.java +++ b/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TablePlugin.java @@ -1,7 +1,7 @@ package ru.noties.markwon.ext.tables; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Spanned; import android.widget.TextView; diff --git a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableRowSpan.java b/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableRowSpan.java index 3f9bbace..9b787134 100644 --- a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableRowSpan.java +++ b/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableRowSpan.java @@ -4,10 +4,10 @@ import android.annotation.SuppressLint; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; -import android.support.annotation.IntDef; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Layout; import android.text.StaticLayout; import android.text.TextPaint; diff --git a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableRowsScheduler.java b/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableRowsScheduler.java index b3b4c773..10cf91d5 100644 --- a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableRowsScheduler.java +++ b/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableRowsScheduler.java @@ -1,7 +1,7 @@ package ru.noties.markwon.ext.tables; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Spanned; import android.text.TextUtils; import android.view.View; diff --git a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableTheme.java b/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableTheme.java index e9b1bd47..ed47e69f 100644 --- a/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableTheme.java +++ b/markwon-ext-tables/src/main/java/ru/noties/markwon/ext/tables/TableTheme.java @@ -2,9 +2,9 @@ package ru.noties.markwon.ext.tables; import android.content.Context; import android.graphics.Paint; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Px; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Px; import ru.noties.markwon.utils.ColorUtils; import ru.noties.markwon.utils.Dip; diff --git a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListBlockParser.java b/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListBlockParser.java index 417d92a7..79362e94 100644 --- a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListBlockParser.java +++ b/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListBlockParser.java @@ -1,7 +1,7 @@ package ru.noties.markwon.ext.tasklist; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.commonmark.node.Block; import org.commonmark.parser.InlineParser; diff --git a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListDrawable.java b/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListDrawable.java index 4a02c6c4..2a2babb1 100644 --- a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListDrawable.java +++ b/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListDrawable.java @@ -8,10 +8,10 @@ import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorInt; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.ColorInt; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * @since 1.0.1 diff --git a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListPlugin.java b/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListPlugin.java index 9f74c206..81599117 100644 --- a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListPlugin.java +++ b/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListPlugin.java @@ -3,9 +3,9 @@ package ru.noties.markwon.ext.tasklist; import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import android.support.annotation.AttrRes; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; +import androidx.annotation.AttrRes; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; import android.util.TypedValue; import org.commonmark.node.Node; diff --git a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListSpan.java b/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListSpan.java index b851f382..8d7e0e2b 100644 --- a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListSpan.java +++ b/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListSpan.java @@ -3,7 +3,7 @@ package ru.noties.markwon.ext.tasklist; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Layout; import android.text.style.LeadingMarginSpan; diff --git a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListSpanFactory.java b/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListSpanFactory.java index bd68ede3..aef93707 100644 --- a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListSpanFactory.java +++ b/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListSpanFactory.java @@ -1,8 +1,8 @@ package ru.noties.markwon.ext.tasklist; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.MarkwonConfiguration; import ru.noties.markwon.RenderProps; diff --git a/markwon-ext-tasklist/src/test/java/ru/noties/markwon/ext/tasklist/TaskListTest.java b/markwon-ext-tasklist/src/test/java/ru/noties/markwon/ext/tasklist/TaskListTest.java index 6097312a..567d5a15 100644 --- a/markwon-ext-tasklist/src/test/java/ru/noties/markwon/ext/tasklist/TaskListTest.java +++ b/markwon-ext-tasklist/src/test/java/ru/noties/markwon/ext/tasklist/TaskListTest.java @@ -1,6 +1,6 @@ package ru.noties.markwon.ext.tasklist; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.apache.commons.io.IOUtils; import org.junit.Test; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/AppendableUtils.java b/markwon-html/src/main/java/ru/noties/markwon/html/AppendableUtils.java index 5e890174..41ef7ac7 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/AppendableUtils.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/AppendableUtils.java @@ -1,6 +1,6 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.io.IOException; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/CssInlineStyleParser.java b/markwon-html/src/main/java/ru/noties/markwon/html/CssInlineStyleParser.java index c9d7c1fc..064bb570 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/CssInlineStyleParser.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/CssInlineStyleParser.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import java.util.Iterator; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/CssProperty.java b/markwon-html/src/main/java/ru/noties/markwon/html/CssProperty.java index 70bc6d88..29894265 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/CssProperty.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/CssProperty.java @@ -1,6 +1,6 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class CssProperty { diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/HtmlEmptyTagReplacement.java b/markwon-html/src/main/java/ru/noties/markwon/html/HtmlEmptyTagReplacement.java index c191b59d..71e363c2 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/HtmlEmptyTagReplacement.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/HtmlEmptyTagReplacement.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * This class will be used to append some text to output in order to diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/HtmlPlugin.java b/markwon-html/src/main/java/ru/noties/markwon/html/HtmlPlugin.java index d087058e..4b0b7a57 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/HtmlPlugin.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/HtmlPlugin.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.commonmark.node.HtmlBlock; import org.commonmark.node.HtmlInline; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/HtmlTagImpl.java b/markwon-html/src/main/java/ru/noties/markwon/html/HtmlTagImpl.java index 7c07360a..a3476124 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/HtmlTagImpl.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/HtmlTagImpl.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Collections; import java.util.List; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserImpl.java b/markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserImpl.java index 6d715510..821b2e22 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserImpl.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserImpl.java @@ -1,8 +1,8 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import java.util.ArrayList; import java.util.Arrays; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/TrimmingAppender.java b/markwon-html/src/main/java/ru/noties/markwon/html/TrimmingAppender.java index 4f884b00..4af19634 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/TrimmingAppender.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/TrimmingAppender.java @@ -1,6 +1,6 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import static ru.noties.markwon.html.AppendableUtils.appendQuietly; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/CommonMarkEntities.java b/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/CommonMarkEntities.java index ec362312..53f6b47b 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/CommonMarkEntities.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/nodes/CommonMarkEntities.java @@ -1,6 +1,6 @@ package ru.noties.markwon.html.jsoup.nodes; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.commonmark.internal.util.Html5Entities; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/Token.java b/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/Token.java index 887cc61c..fbe06248 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/Token.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/jsoup/parser/Token.java @@ -1,6 +1,6 @@ package ru.noties.markwon.html.jsoup.parser; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import ru.noties.markwon.html.jsoup.helper.Validate; import ru.noties.markwon.html.jsoup.nodes.Attributes; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/span/SubScriptSpan.java b/markwon-html/src/main/java/ru/noties/markwon/html/span/SubScriptSpan.java index 5ab51160..bcc3a941 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/span/SubScriptSpan.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/span/SubScriptSpan.java @@ -1,6 +1,6 @@ package ru.noties.markwon.html.span; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextPaint; import android.text.style.MetricAffectingSpan; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/span/SuperScriptSpan.java b/markwon-html/src/main/java/ru/noties/markwon/html/span/SuperScriptSpan.java index 7375309a..9addf6ec 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/span/SuperScriptSpan.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/span/SuperScriptSpan.java @@ -1,6 +1,6 @@ package ru.noties.markwon.html.span; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextPaint; import android.text.style.MetricAffectingSpan; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/BlockquoteHandler.java b/markwon-html/src/main/java/ru/noties/markwon/html/tag/BlockquoteHandler.java index 930a8dda..4c6a080a 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/BlockquoteHandler.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/tag/BlockquoteHandler.java @@ -1,6 +1,6 @@ package ru.noties.markwon.html.tag; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.commonmark.node.BlockQuote; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/EmphasisHandler.java b/markwon-html/src/main/java/ru/noties/markwon/html/tag/EmphasisHandler.java index fe546ee0..4cbec72f 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/EmphasisHandler.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/tag/EmphasisHandler.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html.tag; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.commonmark.node.Emphasis; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/HeadingHandler.java b/markwon-html/src/main/java/ru/noties/markwon/html/tag/HeadingHandler.java index a7de3a47..7575e8e0 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/HeadingHandler.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/tag/HeadingHandler.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html.tag; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.commonmark.node.Heading; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageHandler.java b/markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageHandler.java index 4e7ffa54..e66ccfa7 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageHandler.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageHandler.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html.tag; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import org.commonmark.node.Image; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageSizeParserImpl.java b/markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageSizeParserImpl.java index 236f53be..1d4109f5 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageSizeParserImpl.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/tag/ImageSizeParserImpl.java @@ -1,8 +1,8 @@ package ru.noties.markwon.html.tag; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import java.util.Map; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/LinkHandler.java b/markwon-html/src/main/java/ru/noties/markwon/html/tag/LinkHandler.java index 04e768e9..147e5d22 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/LinkHandler.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/tag/LinkHandler.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html.tag; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import org.commonmark.node.Link; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/ListHandler.java b/markwon-html/src/main/java/ru/noties/markwon/html/tag/ListHandler.java index 66f76cc0..a46addc4 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/ListHandler.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/tag/ListHandler.java @@ -1,6 +1,6 @@ package ru.noties.markwon.html.tag; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.commonmark.node.ListItem; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/SimpleTagHandler.java b/markwon-html/src/main/java/ru/noties/markwon/html/tag/SimpleTagHandler.java index d5717c20..37d759da 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/SimpleTagHandler.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/tag/SimpleTagHandler.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html.tag; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.MarkwonConfiguration; import ru.noties.markwon.MarkwonVisitor; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/StrikeHandler.java b/markwon-html/src/main/java/ru/noties/markwon/html/tag/StrikeHandler.java index 2771501e..d88912c9 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/StrikeHandler.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/tag/StrikeHandler.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html.tag; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.style.StrikethroughSpan; import ru.noties.markwon.MarkwonConfiguration; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/StrongEmphasisHandler.java b/markwon-html/src/main/java/ru/noties/markwon/html/tag/StrongEmphasisHandler.java index 8e604b7f..cba1c950 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/StrongEmphasisHandler.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/tag/StrongEmphasisHandler.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html.tag; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.commonmark.node.StrongEmphasis; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/SubScriptHandler.java b/markwon-html/src/main/java/ru/noties/markwon/html/tag/SubScriptHandler.java index 5ddc5697..d91e1f62 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/SubScriptHandler.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/tag/SubScriptHandler.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html.tag; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.MarkwonConfiguration; import ru.noties.markwon.RenderProps; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/SuperScriptHandler.java b/markwon-html/src/main/java/ru/noties/markwon/html/tag/SuperScriptHandler.java index 77147c99..593d5ac2 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/SuperScriptHandler.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/tag/SuperScriptHandler.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html.tag; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.MarkwonConfiguration; import ru.noties.markwon.RenderProps; diff --git a/markwon-html/src/main/java/ru/noties/markwon/html/tag/UnderlineHandler.java b/markwon-html/src/main/java/ru/noties/markwon/html/tag/UnderlineHandler.java index eaa397a6..da83a610 100644 --- a/markwon-html/src/main/java/ru/noties/markwon/html/tag/UnderlineHandler.java +++ b/markwon-html/src/main/java/ru/noties/markwon/html/tag/UnderlineHandler.java @@ -1,6 +1,6 @@ package ru.noties.markwon.html.tag; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.style.UnderlineSpan; import ru.noties.markwon.MarkwonVisitor; diff --git a/markwon-html/src/test/java/ru/noties/markwon/html/CssInlineStyleParserTest.java b/markwon-html/src/test/java/ru/noties/markwon/html/CssInlineStyleParserTest.java index cc105137..fbd664c3 100644 --- a/markwon-html/src/test/java/ru/noties/markwon/html/CssInlineStyleParserTest.java +++ b/markwon-html/src/test/java/ru/noties/markwon/html/CssInlineStyleParserTest.java @@ -1,6 +1,6 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.junit.Before; import org.junit.Test; @@ -243,4 +243,4 @@ public class CssInlineStyleParserTest { action.apply(t); } -} \ No newline at end of file +} diff --git a/markwon-html/src/test/java/ru/noties/markwon/html/MarkwonHtmlParserImplTest.java b/markwon-html/src/test/java/ru/noties/markwon/html/MarkwonHtmlParserImplTest.java index c614d36c..2b45fa1d 100644 --- a/markwon-html/src/test/java/ru/noties/markwon/html/MarkwonHtmlParserImplTest.java +++ b/markwon-html/src/test/java/ru/noties/markwon/html/MarkwonHtmlParserImplTest.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.junit.Test; import org.junit.runner.RunWith; @@ -879,4 +879,4 @@ public class MarkwonHtmlParserImplTest { private static void with(@NonNull T t, @NonNull Action action) { action.apply(t); } -} \ No newline at end of file +} diff --git a/markwon-html/src/test/java/ru/noties/markwon/html/tag/ImageSizeParserImplTest.java b/markwon-html/src/test/java/ru/noties/markwon/html/tag/ImageSizeParserImplTest.java index ffa9fdc6..eee2df72 100644 --- a/markwon-html/src/test/java/ru/noties/markwon/html/tag/ImageSizeParserImplTest.java +++ b/markwon-html/src/test/java/ru/noties/markwon/html/tag/ImageSizeParserImplTest.java @@ -1,7 +1,7 @@ package ru.noties.markwon.html.tag; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.junit.Assert; import org.junit.Before; @@ -180,4 +180,4 @@ public class ImageSizeParserImplTest { private static ImageSize.Dimension dimension(float value, @Nullable String unit) { return new ImageSize.Dimension(value, unit); } -} \ No newline at end of file +} diff --git a/markwon-image-gif/src/main/java/ru/noties/markwon/image/gif/GifMediaDecoder.java b/markwon-image-gif/src/main/java/ru/noties/markwon/image/gif/GifMediaDecoder.java index 6f5eda18..80573d13 100644 --- a/markwon-image-gif/src/main/java/ru/noties/markwon/image/gif/GifMediaDecoder.java +++ b/markwon-image-gif/src/main/java/ru/noties/markwon/image/gif/GifMediaDecoder.java @@ -1,8 +1,8 @@ package ru.noties.markwon.image.gif; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/markwon-image-gif/src/main/java/ru/noties/markwon/image/gif/GifPlugin.java b/markwon-image-gif/src/main/java/ru/noties/markwon/image/gif/GifPlugin.java index d0db857e..ccad1d4f 100644 --- a/markwon-image-gif/src/main/java/ru/noties/markwon/image/gif/GifPlugin.java +++ b/markwon-image-gif/src/main/java/ru/noties/markwon/image/gif/GifPlugin.java @@ -1,6 +1,6 @@ package ru.noties.markwon.image.gif; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import ru.noties.markwon.AbstractMarkwonPlugin; import ru.noties.markwon.image.AsyncDrawableLoader; diff --git a/markwon-image-okhttp/src/main/java/ru/noties/markwon/image/okhttp/OkHttpImagesPlugin.java b/markwon-image-okhttp/src/main/java/ru/noties/markwon/image/okhttp/OkHttpImagesPlugin.java index fe43c289..37287816 100644 --- a/markwon-image-okhttp/src/main/java/ru/noties/markwon/image/okhttp/OkHttpImagesPlugin.java +++ b/markwon-image-okhttp/src/main/java/ru/noties/markwon/image/okhttp/OkHttpImagesPlugin.java @@ -1,6 +1,6 @@ package ru.noties.markwon.image.okhttp; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.Arrays; diff --git a/markwon-image-okhttp/src/main/java/ru/noties/markwon/image/okhttp/OkHttpSchemeHandler.java b/markwon-image-okhttp/src/main/java/ru/noties/markwon/image/okhttp/OkHttpSchemeHandler.java index eaf73bd6..112a29c1 100644 --- a/markwon-image-okhttp/src/main/java/ru/noties/markwon/image/okhttp/OkHttpSchemeHandler.java +++ b/markwon-image-okhttp/src/main/java/ru/noties/markwon/image/okhttp/OkHttpSchemeHandler.java @@ -1,8 +1,8 @@ package ru.noties.markwon.image.okhttp; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.io.IOException; import java.io.InputStream; diff --git a/markwon-image-svg/src/main/java/ru/noties/markwon/image/svg/SvgMediaDecoder.java b/markwon-image-svg/src/main/java/ru/noties/markwon/image/svg/SvgMediaDecoder.java index 5ee71c61..681f94b4 100644 --- a/markwon-image-svg/src/main/java/ru/noties/markwon/image/svg/SvgMediaDecoder.java +++ b/markwon-image-svg/src/main/java/ru/noties/markwon/image/svg/SvgMediaDecoder.java @@ -5,8 +5,8 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.caverock.androidsvg.SVG; import com.caverock.androidsvg.SVGParseException; diff --git a/markwon-image-svg/src/main/java/ru/noties/markwon/image/svg/SvgPlugin.java b/markwon-image-svg/src/main/java/ru/noties/markwon/image/svg/SvgPlugin.java index be357480..aa196c66 100644 --- a/markwon-image-svg/src/main/java/ru/noties/markwon/image/svg/SvgPlugin.java +++ b/markwon-image-svg/src/main/java/ru/noties/markwon/image/svg/SvgPlugin.java @@ -1,7 +1,7 @@ package ru.noties.markwon.image.svg; import android.content.res.Resources; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import ru.noties.markwon.AbstractMarkwonPlugin; import ru.noties.markwon.image.AsyncDrawableLoader; diff --git a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableBorderDrawable.java b/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableBorderDrawable.java index 06a89f24..ce60351f 100644 --- a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableBorderDrawable.java +++ b/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableBorderDrawable.java @@ -5,10 +5,10 @@ import android.graphics.ColorFilter; import android.graphics.Paint; import android.graphics.PixelFormat; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.Px; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.Px; class TableBorderDrawable extends Drawable { diff --git a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntry.java b/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntry.java index 5ff8b25e..3cc2574b 100644 --- a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntry.java +++ b/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntry.java @@ -4,12 +4,12 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.res.Resources; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorInt; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Px; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.ColorInt; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Px; +import androidx.annotation.VisibleForTesting; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntryPlugin.java b/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntryPlugin.java index a92400ee..80ca0fb7 100644 --- a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntryPlugin.java +++ b/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntryPlugin.java @@ -1,7 +1,7 @@ package ru.noties.markwon.recycler.table; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.commonmark.ext.gfm.tables.TablesExtension; import org.commonmark.parser.Parser; diff --git a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntryTheme.java b/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntryTheme.java index e9b9b7ca..a0213d46 100644 --- a/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntryTheme.java +++ b/markwon-recycler-table/src/main/java/ru/noties/markwon/recycler/table/TableEntryTheme.java @@ -1,9 +1,9 @@ package ru.noties.markwon.recycler.table; import android.graphics.Paint; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Px; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Px; import ru.noties.markwon.ext.tables.TableTheme; import ru.noties.markwon.utils.ColorUtils; diff --git a/markwon-recycler/src/main/java/ru/noties/markwon/recycler/MarkwonAdapter.java b/markwon-recycler/src/main/java/ru/noties/markwon/recycler/MarkwonAdapter.java index 64241d55..74af0450 100644 --- a/markwon-recycler/src/main/java/ru/noties/markwon/recycler/MarkwonAdapter.java +++ b/markwon-recycler/src/main/java/ru/noties/markwon/recycler/MarkwonAdapter.java @@ -1,18 +1,15 @@ package ru.noties.markwon.recycler; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; - -import org.commonmark.node.Node; - +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import java.util.List; - +import org.commonmark.node.Node; import ru.noties.markwon.Markwon; import ru.noties.markwon.MarkwonReducer; diff --git a/markwon-recycler/src/main/java/ru/noties/markwon/recycler/MarkwonAdapterImpl.java b/markwon-recycler/src/main/java/ru/noties/markwon/recycler/MarkwonAdapterImpl.java index 30b093f5..554395c0 100644 --- a/markwon-recycler/src/main/java/ru/noties/markwon/recycler/MarkwonAdapterImpl.java +++ b/markwon-recycler/src/main/java/ru/noties/markwon/recycler/MarkwonAdapterImpl.java @@ -1,6 +1,6 @@ package ru.noties.markwon.recycler; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.SparseArray; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/markwon-recycler/src/main/java/ru/noties/markwon/recycler/SimpleEntry.java b/markwon-recycler/src/main/java/ru/noties/markwon/recycler/SimpleEntry.java index 93ef0d30..e3c48792 100644 --- a/markwon-recycler/src/main/java/ru/noties/markwon/recycler/SimpleEntry.java +++ b/markwon-recycler/src/main/java/ru/noties/markwon/recycler/SimpleEntry.java @@ -1,8 +1,8 @@ package ru.noties.markwon.recycler; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; import android.text.Spanned; import android.view.LayoutInflater; import android.view.View; diff --git a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxHighlight.java b/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxHighlight.java index bb016796..04b5af2f 100644 --- a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxHighlight.java +++ b/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxHighlight.java @@ -1,7 +1,7 @@ package ru.noties.markwon.syntax; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.SpannableStringBuilder; import android.text.TextUtils; diff --git a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxVisitor.java b/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxVisitor.java index cd7f2f04..29233e9c 100644 --- a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxVisitor.java +++ b/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxVisitor.java @@ -1,6 +1,6 @@ package ru.noties.markwon.syntax; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.SpannableStringBuilder; import ru.noties.prism4j.AbsVisitor; diff --git a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jTheme.java b/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jTheme.java index 3932bafc..7405b8ca 100644 --- a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jTheme.java +++ b/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jTheme.java @@ -1,7 +1,7 @@ package ru.noties.markwon.syntax; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; import android.text.SpannableStringBuilder; import ru.noties.prism4j.Prism4j; diff --git a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeBase.java b/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeBase.java index 5cf784df..7d987d3d 100644 --- a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeBase.java +++ b/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeBase.java @@ -1,10 +1,10 @@ package ru.noties.markwon.syntax; -import android.support.annotation.ColorInt; -import android.support.annotation.FloatRange; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.ColorInt; +import androidx.annotation.FloatRange; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.style.ForegroundColorSpan; diff --git a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDarkula.java b/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDarkula.java index 4d4016bf..30adfd11 100644 --- a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDarkula.java +++ b/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDarkula.java @@ -1,8 +1,8 @@ package ru.noties.markwon.syntax; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.SpannableStringBuilder; import android.text.Spanned; diff --git a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDefault.java b/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDefault.java index b729ed76..974fec5e 100644 --- a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDefault.java +++ b/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDefault.java @@ -1,8 +1,8 @@ package ru.noties.markwon.syntax; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.style.BackgroundColorSpan; diff --git a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/SyntaxHighlightPlugin.java b/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/SyntaxHighlightPlugin.java index b07f5c6e..b8ff8014 100644 --- a/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/SyntaxHighlightPlugin.java +++ b/markwon-syntax-highlight/src/main/java/ru/noties/markwon/syntax/SyntaxHighlightPlugin.java @@ -1,7 +1,7 @@ package ru.noties.markwon.syntax; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.noties.markwon.AbstractMarkwonPlugin; import ru.noties.markwon.MarkwonConfiguration; diff --git a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpan.java b/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpan.java index f979d633..38d4c8f6 100644 --- a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpan.java +++ b/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpan.java @@ -1,6 +1,6 @@ package ru.noties.markwon.test; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.ArrayList; import java.util.Collections; diff --git a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanDocument.java b/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanDocument.java index ef876311..59ea3d7e 100644 --- a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanDocument.java +++ b/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanDocument.java @@ -1,6 +1,6 @@ package ru.noties.markwon.test; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.List; diff --git a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanEnumerator.java b/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanEnumerator.java index 1c2172db..64269ae2 100644 --- a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanEnumerator.java +++ b/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanEnumerator.java @@ -1,6 +1,6 @@ package ru.noties.markwon.test; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class TestSpanEnumerator { diff --git a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanMatcher.java b/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanMatcher.java index 03bc2ace..99a53d74 100644 --- a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanMatcher.java +++ b/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanMatcher.java @@ -1,6 +1,6 @@ package ru.noties.markwon.test; -import android.support.annotation.NonNull; +import androidx.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/ru/noties/markwon/test/TestSpanSpan.java index d9669cb2..43435430 100644 --- a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanSpan.java +++ b/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanSpan.java @@ -1,6 +1,6 @@ package ru.noties.markwon.test; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.List; import java.util.Map; diff --git a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanText.java b/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanText.java index 8a34a410..ea04fbd0 100644 --- a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanText.java +++ b/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanText.java @@ -1,6 +1,6 @@ package ru.noties.markwon.test; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.Collections; import java.util.List; diff --git a/sample/src/main/java/ru/noties/markwon/sample/MainActivity.java b/sample/src/main/java/ru/noties/markwon/sample/MainActivity.java index 16205066..425f6d4f 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/MainActivity.java +++ b/sample/src/main/java/ru/noties/markwon/sample/MainActivity.java @@ -4,14 +4,12 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.View; - +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import java.util.Arrays; - import ru.noties.adapt.Adapt; import ru.noties.adapt.OnClickViewProcessor; import ru.noties.debug.AndroidLogDebugOutput; diff --git a/sample/src/main/java/ru/noties/markwon/sample/SampleItem.java b/sample/src/main/java/ru/noties/markwon/sample/SampleItem.java index e21444ba..172b33f6 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/SampleItem.java +++ b/sample/src/main/java/ru/noties/markwon/sample/SampleItem.java @@ -1,6 +1,6 @@ package ru.noties.markwon.sample; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; public enum SampleItem { diff --git a/sample/src/main/java/ru/noties/markwon/sample/SampleItemDecoration.java b/sample/src/main/java/ru/noties/markwon/sample/SampleItemDecoration.java index 580b2763..37bf3c1e 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/SampleItemDecoration.java +++ b/sample/src/main/java/ru/noties/markwon/sample/SampleItemDecoration.java @@ -3,10 +3,10 @@ package ru.noties.markwon.sample; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; -import android.support.annotation.ColorInt; -import android.support.annotation.Px; -import android.support.v7.widget.RecyclerView; import android.view.View; +import androidx.annotation.ColorInt; +import androidx.annotation.Px; +import androidx.recyclerview.widget.RecyclerView; class SampleItemDecoration extends RecyclerView.ItemDecoration { diff --git a/sample/src/main/java/ru/noties/markwon/sample/SampleItemView.java b/sample/src/main/java/ru/noties/markwon/sample/SampleItemView.java index dc4432aa..590f0c03 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/SampleItemView.java +++ b/sample/src/main/java/ru/noties/markwon/sample/SampleItemView.java @@ -1,6 +1,6 @@ package ru.noties.markwon.sample; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Spannable; import android.text.Spanned; import android.view.LayoutInflater; diff --git a/sample/src/main/java/ru/noties/markwon/sample/basicplugins/BasicPluginsActivity.java b/sample/src/main/java/ru/noties/markwon/sample/basicplugins/BasicPluginsActivity.java index 0728be6c..2055c884 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/basicplugins/BasicPluginsActivity.java +++ b/sample/src/main/java/ru/noties/markwon/sample/basicplugins/BasicPluginsActivity.java @@ -4,8 +4,8 @@ import android.app.Activity; import android.graphics.Color; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.text.style.ForegroundColorSpan; import android.widget.TextView; diff --git a/sample/src/main/java/ru/noties/markwon/sample/core/CoreActivity.java b/sample/src/main/java/ru/noties/markwon/sample/core/CoreActivity.java index 3f8118c5..1f708ead 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/core/CoreActivity.java +++ b/sample/src/main/java/ru/noties/markwon/sample/core/CoreActivity.java @@ -2,7 +2,7 @@ package ru.noties.markwon.sample.core; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.Spanned; import android.widget.TextView; import android.widget.Toast; diff --git a/sample/src/main/java/ru/noties/markwon/sample/customextension/CustomExtensionActivity.java b/sample/src/main/java/ru/noties/markwon/sample/customextension/CustomExtensionActivity.java index 4a9c2fd9..a40f5841 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/customextension/CustomExtensionActivity.java +++ b/sample/src/main/java/ru/noties/markwon/sample/customextension/CustomExtensionActivity.java @@ -2,7 +2,7 @@ package ru.noties.markwon.sample.customextension; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.widget.TextView; import ru.noties.markwon.Markwon; diff --git a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconNode.java b/sample/src/main/java/ru/noties/markwon/sample/customextension/IconNode.java index b297e4a6..0a73bea4 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconNode.java +++ b/sample/src/main/java/ru/noties/markwon/sample/customextension/IconNode.java @@ -1,6 +1,6 @@ package ru.noties.markwon.sample.customextension; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.commonmark.node.CustomNode; import org.commonmark.node.Delimited; diff --git a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconPlugin.java b/sample/src/main/java/ru/noties/markwon/sample/customextension/IconPlugin.java index 3de96315..a3dd738e 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconPlugin.java +++ b/sample/src/main/java/ru/noties/markwon/sample/customextension/IconPlugin.java @@ -1,6 +1,6 @@ package ru.noties.markwon.sample.customextension; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import org.commonmark.parser.Parser; diff --git a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconProcessor.java b/sample/src/main/java/ru/noties/markwon/sample/customextension/IconProcessor.java index eb7a79be..898c25b9 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconProcessor.java +++ b/sample/src/main/java/ru/noties/markwon/sample/customextension/IconProcessor.java @@ -1,6 +1,6 @@ package ru.noties.markwon.sample.customextension; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import org.commonmark.node.Node; diff --git a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconSpan.java b/sample/src/main/java/ru/noties/markwon/sample/customextension/IconSpan.java index 9d2b8b43..1c61ce5c 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconSpan.java +++ b/sample/src/main/java/ru/noties/markwon/sample/customextension/IconSpan.java @@ -4,9 +4,9 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.style.ReplacementSpan; import java.lang.annotation.Retention; diff --git a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconSpanProvider.java b/sample/src/main/java/ru/noties/markwon/sample/customextension/IconSpanProvider.java index 25049bc2..91bcdbe1 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/customextension/IconSpanProvider.java +++ b/sample/src/main/java/ru/noties/markwon/sample/customextension/IconSpanProvider.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; @SuppressWarnings("WeakerAccess") public abstract class IconSpanProvider { diff --git a/sample/src/main/java/ru/noties/markwon/sample/latex/LatexActivity.java b/sample/src/main/java/ru/noties/markwon/sample/latex/LatexActivity.java index d4143a76..b5a3b24f 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/latex/LatexActivity.java +++ b/sample/src/main/java/ru/noties/markwon/sample/latex/LatexActivity.java @@ -2,7 +2,7 @@ package ru.noties.markwon.sample.latex; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.widget.TextView; import ru.noties.markwon.Markwon; diff --git a/sample/src/main/java/ru/noties/markwon/sample/recycler/RecyclerActivity.java b/sample/src/main/java/ru/noties/markwon/sample/recycler/RecyclerActivity.java index adeb6c4b..03f883b9 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/recycler/RecyclerActivity.java +++ b/sample/src/main/java/ru/noties/markwon/sample/recycler/RecyclerActivity.java @@ -4,20 +4,17 @@ import android.app.Activity; import android.content.Context; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.text.TextUtils; - -import org.commonmark.ext.gfm.tables.TableBlock; -import org.commonmark.node.FencedCodeBlock; - +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; - +import org.commonmark.ext.gfm.tables.TableBlock; +import org.commonmark.node.FencedCodeBlock; import ru.noties.debug.AndroidLogDebugOutput; import ru.noties.debug.Debug; import ru.noties.markwon.AbstractMarkwonPlugin; diff --git a/sample/src/main/java/ru/noties/markwon/sample/theme/ThemeActivity.java b/sample/src/main/java/ru/noties/markwon/sample/theme/ThemeActivity.java index 33ee500a..2f41f3f4 100644 --- a/sample/src/main/java/ru/noties/markwon/sample/theme/ThemeActivity.java +++ b/sample/src/main/java/ru/noties/markwon/sample/theme/ThemeActivity.java @@ -2,7 +2,7 @@ package ru.noties.markwon.sample.theme; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import ru.noties.markwon.sample.R; diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml index 26bc9906..c4f259e6 100644 --- a/sample/src/main/res/layout/activity_main.xml +++ b/sample/src/main/res/layout/activity_main.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - \ No newline at end of file + diff --git a/sample/src/main/res/layout/activity_recycler.xml b/sample/src/main/res/layout/activity_recycler.xml index 1405e07c..1b8dc100 100644 --- a/sample/src/main/res/layout/activity_recycler.xml +++ b/sample/src/main/res/layout/activity_recycler.xml @@ -1,5 +1,5 @@ - \ No newline at end of file + android:layout_height="match_parent" />