From a221ba7ea3c4f9ff0c9af9dbe01a242b93017a1c Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Sun, 5 Nov 2017 12:55:36 +0300 Subject: [PATCH] Small clean-up --- .../java/ru/noties/markwon/SpannableConfiguration.java | 1 + .../src/main/java/ru/noties/markwon/SpannedReversed.java | 3 +++ .../java/ru/noties/markwon/UrlProcessorAndroidAssets.java | 1 + .../noties/markwon/renderer/SpannableMarkdownVisitor.java | 5 +---- .../main/java/ru/noties/markwon/spans/BlockQuoteSpan.java | 4 +--- .../main/java/ru/noties/markwon/spans/TaskListSpan.java | 8 ++++++-- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/library/src/main/java/ru/noties/markwon/SpannableConfiguration.java b/library/src/main/java/ru/noties/markwon/SpannableConfiguration.java index aa9b6f15..aa1af671 100644 --- a/library/src/main/java/ru/noties/markwon/SpannableConfiguration.java +++ b/library/src/main/java/ru/noties/markwon/SpannableConfiguration.java @@ -60,6 +60,7 @@ public class SpannableConfiguration { return htmlParser; } + @SuppressWarnings("unused") public static class Builder { private final Context context; diff --git a/library/src/main/java/ru/noties/markwon/SpannedReversed.java b/library/src/main/java/ru/noties/markwon/SpannedReversed.java index a5ad65eb..3fd7f566 100644 --- a/library/src/main/java/ru/noties/markwon/SpannedReversed.java +++ b/library/src/main/java/ru/noties/markwon/SpannedReversed.java @@ -2,5 +2,8 @@ package ru.noties.markwon; import android.text.Spanned; +/** + * @since 1.0.1 + */ interface SpannedReversed extends Spanned { } diff --git a/library/src/main/java/ru/noties/markwon/UrlProcessorAndroidAssets.java b/library/src/main/java/ru/noties/markwon/UrlProcessorAndroidAssets.java index 82faf4e2..b2b09006 100644 --- a/library/src/main/java/ru/noties/markwon/UrlProcessorAndroidAssets.java +++ b/library/src/main/java/ru/noties/markwon/UrlProcessorAndroidAssets.java @@ -5,6 +5,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; +@SuppressWarnings({"unused", "WeakerAccess"}) public class UrlProcessorAndroidAssets implements UrlProcessor { private final UrlProcessorRelativeToAbsolute assetsProcessor diff --git a/library/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java b/library/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java index 72dc1f28..75c70c32 100644 --- a/library/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java +++ b/library/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java @@ -113,10 +113,7 @@ public class SpannableMarkdownVisitor extends AbstractVisitor { visitChildren(blockQuote); - setSpan(length, new BlockQuoteSpan( - configuration.theme(), - blockQuoteIndent - )); + setSpan(length, new BlockQuoteSpan(configuration.theme())); blockQuoteIndent -= 1; diff --git a/library/src/main/java/ru/noties/markwon/spans/BlockQuoteSpan.java b/library/src/main/java/ru/noties/markwon/spans/BlockQuoteSpan.java index 66b6a3e1..04dfe78a 100644 --- a/library/src/main/java/ru/noties/markwon/spans/BlockQuoteSpan.java +++ b/library/src/main/java/ru/noties/markwon/spans/BlockQuoteSpan.java @@ -12,11 +12,9 @@ public class BlockQuoteSpan implements LeadingMarginSpan { private final SpannableTheme theme; private final Rect rect = ObjectsPool.rect(); private final Paint paint = ObjectsPool.paint(); - private final int indent; - public BlockQuoteSpan(@NonNull SpannableTheme theme, int indent) { + public BlockQuoteSpan(@NonNull SpannableTheme theme) { this.theme = theme; - this.indent = indent; } @Override diff --git a/library/src/main/java/ru/noties/markwon/spans/TaskListSpan.java b/library/src/main/java/ru/noties/markwon/spans/TaskListSpan.java index b56d48d7..172b952c 100644 --- a/library/src/main/java/ru/noties/markwon/spans/TaskListSpan.java +++ b/library/src/main/java/ru/noties/markwon/spans/TaskListSpan.java @@ -12,6 +12,10 @@ import android.text.style.LeadingMarginSpan; */ public class TaskListSpan implements LeadingMarginSpan { + private static final int[] STATE_CHECKED = new int[]{android.R.attr.state_checked}; + + private static final int[] STATE_NONE = new int[0]; + private final SpannableTheme theme; private final int blockIndent; private final boolean isDone; @@ -54,9 +58,9 @@ public class TaskListSpan implements LeadingMarginSpan { if (drawable.isStateful()) { final int[] state; if (isDone) { - state = new int[]{android.R.attr.state_checked}; + state = STATE_CHECKED; } else { - state = new int[0]; + state = STATE_NONE; } drawable.setState(state); }