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

Change LinkSpan to extend URLSpan. Allow default linkColor (if not set explicitly)

Browse Source
This commit is contained in:
Dimitry Ivanov 2018-04-15 17:52:32 +03:00
parent 35c39d0f6d
commit af7d58c59a
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/src/main/java/ru/noties/markwon/spans/LinkSpan.java
View File

@ -3,9 +3,10 @@ package ru.noties.markwon.spans;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.text.TextPaint; import android.text.TextPaint;
import android.text.style.ClickableSpan; import android.text.style.ClickableSpan;
import android.text.style.URLSpan;
import android.view.View; import android.view.View;
public class LinkSpan extends ClickableSpan { public class LinkSpan extends URLSpan {
public interface Resolver { public interface Resolver {
void resolve(View view, @NonNull String link); void resolve(View view, @NonNull String link);
@ -16,6 +17,7 @@ public class LinkSpan extends ClickableSpan {
private final Resolver resolver; private final Resolver resolver;
public LinkSpan(@NonNull SpannableTheme theme, @NonNull String link, @NonNull Resolver resolver) { public LinkSpan(@NonNull SpannableTheme theme, @NonNull String link, @NonNull Resolver resolver) {
super(link);
this.theme = theme; this.theme = theme;
this.link = link; this.link = link;
this.resolver = resolver; this.resolver = resolver;

22
library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java
View File

@ -76,9 +76,11 @@ public class SpannableTheme {
final int linkColor = resolve(context, android.R.attr.textColorLink); final int linkColor = resolve(context, android.R.attr.textColorLink);
final int backgroundColor = resolve(context, android.R.attr.colorBackground); final int backgroundColor = resolve(context, android.R.attr.colorBackground);
// before 1.0.5 build had `linkColor` set, but in order for spans to use default link color
// set directly in widget (or any caller), we should not pass it here
final Dip dip = new Dip(context); final Dip dip = new Dip(context);
return new Builder() return new Builder()
.linkColor(linkColor)
.codeMultilineMargin(dip.toPx(8)) .codeMultilineMargin(dip.toPx(8))
.blockMargin(dip.toPx(24)) .blockMargin(dip.toPx(24))
.blockQuoteWidth(dip.toPx(4)) .blockQuoteWidth(dip.toPx(4))
@ -214,12 +216,30 @@ public class SpannableTheme {
this.taskListDrawable = builder.taskListDrawable; this.taskListDrawable = builder.taskListDrawable;
} }
/**
* @since 1.0.5
*/
public void applyLinkStyle(@NonNull TextPaint paint) {
paint.setUnderlineText(true);
if (linkColor != 0) {
paint.setColor(linkColor);
} else {
// if linkColor is not specified during configuration -> use default one
paint.setColor(paint.linkColor);
}
}
public void applyLinkStyle(@NonNull Paint paint) { public void applyLinkStyle(@NonNull Paint paint) {
paint.setUnderlineText(true); paint.setUnderlineText(true);
if (linkColor != 0) { if (linkColor != 0) {
// by default we will be using text color // by default we will be using text color
paint.setColor(linkColor); paint.setColor(linkColor);
} else {
// @since 1.0.5, if link color is specified during configuration, _try_ to use the
// default one (if provided paint is an instance of TextPaint)
if (paint instanceof TextPaint) {
paint.setColor(((TextPaint) paint).linkColor);
}
} }
} }