diff --git a/README.md b/README.md index dd397986..cda46461 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,13 @@ compile 'ru.noties:markwon-image-loader:1.0.0' // optional --- +Demonstration of default styles (the only thing customized is image loader): + +![light](./art/markwon_light.gif) +![dark](./art/markwon_dark.gif) + +--- + ## Supported markdown features: * Emphasis (`*`, `_`) * Strong emphasis (`**`, `__`) diff --git a/app/src/main/assets/art/markwon_logo.png b/app/src/main/assets/art/markwon_logo.png deleted file mode 120000 index 16f26621..00000000 --- a/app/src/main/assets/art/markwon_logo.png +++ /dev/null @@ -1 +0,0 @@ -../../../../../art/markwon_logo.png \ No newline at end of file diff --git a/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java b/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java index dbbe368a..21b0ae7a 100644 --- a/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java +++ b/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java @@ -47,7 +47,7 @@ public class MarkdownRenderer { final UrlProcessor urlProcessor; if (uri == null) { - urlProcessor = new UrlProcessorAndroidAssets(); + urlProcessor = new UrlProcessorInitialReadme(); } else { urlProcessor = new UrlProcessorRelativeToAbsolute(uri.toString()); } diff --git a/app/src/main/java/ru/noties/markwon/UrlProcessorInitialReadme.java b/app/src/main/java/ru/noties/markwon/UrlProcessorInitialReadme.java new file mode 100644 index 00000000..8f18a55e --- /dev/null +++ b/app/src/main/java/ru/noties/markwon/UrlProcessorInitialReadme.java @@ -0,0 +1,26 @@ +package ru.noties.markwon; + +import android.net.Uri; +import android.support.annotation.NonNull; +import android.text.TextUtils; + +class UrlProcessorInitialReadme implements UrlProcessor { + + private static final String GITHUB_BASE = "https://github.com/noties/Markwon/raw/master/"; + + private final UrlProcessorRelativeToAbsolute processor + = new UrlProcessorRelativeToAbsolute(GITHUB_BASE); + + @NonNull + @Override + public String process(@NonNull String destination) { + String out; + final Uri uri = Uri.parse(destination); + if (TextUtils.isEmpty(uri.getScheme())) { + out = processor.process(destination); + } else { + out = destination; + } + return out; + } +} diff --git a/art/markwon_dark.gif b/art/markwon_dark.gif new file mode 100644 index 00000000..dbeb4789 Binary files /dev/null and b/art/markwon_dark.gif differ diff --git a/art/markwon_light.gif b/art/markwon_light.gif new file mode 100644 index 00000000..d1120661 Binary files /dev/null and b/art/markwon_light.gif differ diff --git a/library-image-loader/src/main/java/ru/noties/markwon/il/AsyncDrawableLoader.java b/library-image-loader/src/main/java/ru/noties/markwon/il/AsyncDrawableLoader.java index a9574d13..01711df5 100644 --- a/library-image-loader/src/main/java/ru/noties/markwon/il/AsyncDrawableLoader.java +++ b/library-image-loader/src/main/java/ru/noties/markwon/il/AsyncDrawableLoader.java @@ -11,6 +11,7 @@ import android.os.Handler; import android.os.Looper; import android.support.annotation.NonNull; import android.text.TextUtils; +import android.util.Log; import com.caverock.androidsvg.SVG; import com.caverock.androidsvg.SVGParseException; @@ -73,6 +74,7 @@ public class AsyncDrawableLoader implements AsyncDrawable.Loader { @Override public void load(@NonNull String destination, @NonNull AsyncDrawable drawable) { + Log.e("ASYNC", destination); // if drawable is not a link -> show loading placeholder... requests.put(destination, execute(destination, drawable)); }