From aafbd8585c21cbe51a90e1553fdfe6b32cb53cfc Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Wed, 29 Jul 2020 12:00:11 +0300 Subject: [PATCH] Update after merging 270 PR --- CHANGELOG.md | 4 ++++ app-sample/build.gradle | 2 +- docs/docs/v4/core/theme.md | 4 ++++ .../src/main/java/io/noties/markwon/core/MarkwonTheme.java | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f91bcb7..4e775722 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ #### Added * `core` - `MovementMethodPlugin.none()`, `MovementMethodPlugin.link()` factory methods * `core` - `CorePlugin` `hasExplicitMovementMethod` configuration method to **not** add implicit `LinkMovementMethod` in `afterSetText` +* `core` - `MarkwonTheme` `isLinkedUnderlined` attribute for links([#270])
Thanks to [@dallasgutauckis] * `ext-latex` - `JLatexMathTheme.Padding.of(int,int,int,int)` factory method * `app-sample` - example application @@ -28,6 +29,9 @@ [#235]: https://github.com/noties/Markwon/issues/235 [#241]: https://github.com/noties/Markwon/issues/241 [#259]: https://github.com/noties/Markwon/issues/259 +[#270]: https://github.com/noties/Markwon/pull/270 + +[@dallasgutauckis]: https://github.com/dallasgutauckis # 4.4.0 diff --git a/app-sample/build.gradle b/app-sample/build.gradle index cdfad78d..d6dec350 100644 --- a/app-sample/build.gradle +++ b/app-sample/build.gradle @@ -96,7 +96,7 @@ android { } } } else { - // it seems to be a bug in NDK handling, github fail to build the project withe the: + // it seems to be a bug in NDK handling, github fail to build the project with the: // `com.android.builder.errors.EvalIssueException: No version of NDK matched the requested version 21.0.6113669. Versions available locally: 21.3.6528147` ndkVersion '21.3.6528147' } diff --git a/docs/docs/v4/core/theme.md b/docs/docs/v4/core/theme.md index 672babc6..2d7161ba 100644 --- a/docs/docs/v4/core/theme.md +++ b/docs/docs/v4/core/theme.md @@ -27,6 +27,10 @@ Controls the color of a [link](#) * `TextPaint#linkColor` will be used to determine linkColor of a context +## Link underline + + + ## Block margin Starting margin before text content for the: diff --git a/markwon-core/src/main/java/io/noties/markwon/core/MarkwonTheme.java b/markwon-core/src/main/java/io/noties/markwon/core/MarkwonTheme.java index 37e0a5a8..34a37893 100644 --- a/markwon-core/src/main/java/io/noties/markwon/core/MarkwonTheme.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/MarkwonTheme.java @@ -118,7 +118,7 @@ public class MarkwonTheme { protected final int linkColor; // specifies whether we underline links, by default is true - // @since 4.4.1 + // @since $SNAPSHOT; protected final boolean isLinkedUnderlined; // used in quote, lists @@ -462,7 +462,7 @@ public class MarkwonTheme { public static class Builder { private int linkColor; - private boolean isLinkUnderlined = true; // @since 4.4.1 + private boolean isLinkUnderlined = true; // @since $SNAPSHOT; private int blockMargin; private int blockQuoteWidth; private int blockQuoteColor;