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

Migrate to androidx

Browse Source
This commit is contained in:
Zac Sweers 2019-06-04 02:00:54 -05:00
parent 9437187d49
commit d2c8a2ef2d
196 changed files with 368 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/debug/java/ru/noties/markwon/debug/DebugCheckboxDrawableView.java
View File

@ -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;

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

@ -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;

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

@ -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;

4
app/src/main/java/ru/noties/markwon/MainActivity.java
View File

@ -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;

4
app/src/main/java/ru/noties/markwon/MarkdownLoader.java
View File

@ -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;

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

@ -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;

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

@ -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;

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

@ -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 {

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

@ -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;

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

@ -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;

4
app/src/main/java/ru/noties/markwon/Views.java
View File

@ -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")

4
app/src/main/java/ru/noties/markwon/gif/GifAwareAsyncDrawable.java
View File

@ -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;

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

@ -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;

6
app/src/main/java/ru/noties/markwon/gif/GifPlaceholder.java
View File

@ -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 {

4
app/src/main/java/ru/noties/markwon/gif/GifProcessor.java
View File

@ -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;

6
build.gradle
View File

@ -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",

2
gradle.properties
View File

@ -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

2
markwon-core/src/main/java/ru/noties/markwon/AbstractMarkwonPlugin.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/LinkResolverDef.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/Markwon.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/MarkwonBuilderImpl.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/MarkwonConfiguration.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/MarkwonImpl.java
View File

@ -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;

6
markwon-core/src/main/java/ru/noties/markwon/MarkwonNodeRenderer.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/MarkwonPlugin.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/MarkwonReducer.java
View File

@ -1,6 +1,6 @@
package ru.noties.markwon;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.commonmark.node.Node;

4
markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactory.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/MarkwonSpansFactoryImpl.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitor.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/MarkwonVisitorImpl.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/Prop.java
View File

@ -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 <em>property</em>.

4
markwon-core/src/main/java/ru/noties/markwon/RenderProps.java
View File

@ -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

4
markwon-core/src/main/java/ru/noties/markwon/RenderPropsImpl.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/SpanFactory.java
View File

@ -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

6
markwon-core/src/main/java/ru/noties/markwon/SpannableBuilder.java
View File

@ -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;

6
markwon-core/src/main/java/ru/noties/markwon/core/CorePlugin.java
View File

@ -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;

10
markwon-core/src/main/java/ru/noties/markwon/core/MarkwonTheme.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/core/SimpleBlockNodeVisitor.java
View File

@ -1,6 +1,6 @@
package ru.noties.markwon.core;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.commonmark.node.Node;

4
markwon-core/src/main/java/ru/noties/markwon/core/factory/BlockQuoteSpanFactory.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeBlockSpanFactory.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/core/factory/CodeSpanFactory.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/core/factory/EmphasisSpanFactory.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/core/factory/HeadingSpanFactory.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/core/factory/LinkSpanFactory.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/core/factory/ListItemSpanFactory.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/core/factory/StrongEmphasisSpanFactory.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/core/factory/ThematicBreakSpanFactory.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/core/spans/BlockQuoteSpan.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/core/spans/BulletListItemSpan.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeBlockSpan.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/core/spans/CodeSpan.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/core/spans/CustomTypefaceSpan.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/core/spans/HeadingSpan.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/core/spans/LinkSpan.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/core/spans/OrderedListItemSpan.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/core/spans/ThematicBreakSpan.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/html/HtmlTag.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParser.java
View File

@ -1,6 +1,6 @@
package ru.noties.markwon.html;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.util.List;

2
markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlParserNoOp.java
View File

@ -1,6 +1,6 @@
package ru.noties.markwon.html;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.util.Collections;

4
markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRenderer.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererImpl.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/html/MarkwonHtmlRendererNoOp.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/html/TagHandler.java
View File

@ -1,6 +1,6 @@
package ru.noties.markwon.html;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import ru.noties.markwon.MarkwonVisitor;

6
markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawable.java
View File

@ -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 {

4
markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoader.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderImpl.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableLoaderNoOp.java
View File

@ -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

2
markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableScheduler.java
View File

@ -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;

8
markwon-core/src/main/java/ru/noties/markwon/image/AsyncDrawableSpan.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/image/DrawableUtils.java
View File

@ -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

2
markwon-core/src/main/java/ru/noties/markwon/image/ImageItem.java
View File

@ -1,6 +1,6 @@
package ru.noties.markwon.image;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.io.InputStream;

4
markwon-core/src/main/java/ru/noties/markwon/image/ImageMediaDecoder.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/image/ImageSize.java
View File

@ -1,6 +1,6 @@
package ru.noties.markwon.image;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
/**
* @since 1.0.1

4
markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolver.java
View File

@ -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

4
markwon-core/src/main/java/ru/noties/markwon/image/ImageSizeResolverDef.java
View File

@ -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

4
markwon-core/src/main/java/ru/noties/markwon/image/ImageSpanFactory.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/image/ImagesPlugin.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/image/MediaDecoder.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/image/SchemeHandler.java
View File

@ -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

2
markwon-core/src/main/java/ru/noties/markwon/image/data/DataUri.java
View File

@ -1,6 +1,6 @@
package ru.noties.markwon.image.data;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
public class DataUri {

4
markwon-core/src/main/java/ru/noties/markwon/image/data/DataUriDecoder.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/image/data/DataUriParser.java
View File

@ -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 {

4
markwon-core/src/main/java/ru/noties/markwon/image/data/DataUriSchemeHandler.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/image/file/FileSchemeHandler.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/image/network/NetworkSchemeHandler.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/movement/MovementMethodPlugin.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/priority/Priority.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/priority/PriorityProcessor.java
View File

@ -1,6 +1,6 @@
package ru.noties.markwon.priority;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.util.List;

2
markwon-core/src/main/java/ru/noties/markwon/priority/PriorityProcessorImpl.java
View File

@ -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;

4
markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlight.java
View File

@ -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 {

4
markwon-core/src/main/java/ru/noties/markwon/syntax/SyntaxHighlightNoOp.java
View File

@ -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

2
markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessor.java
View File

@ -1,6 +1,6 @@
package ru.noties.markwon.urlprocessor;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
public interface UrlProcessor {
@NonNull

4
markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorAndroidAssets.java
View File

@ -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;
/**

2
markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorNoOp.java
View File

@ -1,6 +1,6 @@
package ru.noties.markwon.urlprocessor;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
public class UrlProcessorNoOp implements UrlProcessor {
@NonNull

4
markwon-core/src/main/java/ru/noties/markwon/urlprocessor/UrlProcessorRelativeToAbsolute.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/utils/Dip.java
View File

@ -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 {

2
markwon-core/src/main/java/ru/noties/markwon/utils/DrawableUtils.java
View File

@ -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}

4
markwon-core/src/main/java/ru/noties/markwon/utils/DumpNodes.java
View File

@ -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;

2
markwon-core/src/main/java/ru/noties/markwon/utils/NoCopySpannableFactory.java
View File

@ -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;

2
markwon-core/src/test/java/ru/noties/markwon/AbstractMarkwonVisitorImpl.java
View File

@ -1,6 +1,6 @@
package ru.noties.markwon;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.commonmark.node.Node;

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