fix default link color

maths
Thomas 2 years ago
parent e0953ff5af
commit 81dd820d0a

@ -125,7 +125,7 @@ public class SpannableHelper {
linkColor = link_color; linkColor = link_color;
} }
} else { } else {
linkColor = ThemeHelper.getAttColor(context, R.attr.linkColor); linkColor = -1;
} }
SpannableString initialContent; SpannableString initialContent;
@ -474,8 +474,10 @@ public class SpannableHelper {
@Override @Override
public void updateDrawState(@NonNull TextPaint ds) { public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds); super.updateDrawState(ds);
if (linkColor != -1) {
ds.setColor(linkColor); ds.setColor(linkColor);
} }
}
}, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
} }
@ -701,8 +703,10 @@ public class SpannableHelper {
public void updateDrawState(@NonNull TextPaint ds) { public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds); super.updateDrawState(ds);
ds.setUnderlineText(false); ds.setUnderlineText(false);
if (linkColor != -1) {
ds.setColor(linkColor); ds.setColor(linkColor);
} }
}
}, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
} }
} }
@ -735,8 +739,10 @@ public class SpannableHelper {
public void updateDrawState(@NonNull TextPaint ds) { public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds); super.updateDrawState(ds);
ds.setUnderlineText(false); ds.setUnderlineText(false);
if (linkColor != -1) {
ds.setColor(linkColor); ds.setColor(linkColor);
} }
}
}, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
} }
} }
@ -772,8 +778,10 @@ public class SpannableHelper {
public void updateDrawState(@NonNull TextPaint ds) { public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds); super.updateDrawState(ds);
ds.setUnderlineText(false); ds.setUnderlineText(false);
if (linkColor != -1) {
ds.setColor(linkColor); ds.setColor(linkColor);
} }
}
}, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
} }
} }
@ -929,8 +937,10 @@ public class SpannableHelper {
public void updateDrawState(@NonNull TextPaint ds) { public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds); super.updateDrawState(ds);
ds.setUnderlineText(false); ds.setUnderlineText(false);
if (linkColor != -1) {
ds.setColor(linkColor); ds.setColor(linkColor);
} }
}
}, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
} }
@ -1078,8 +1088,10 @@ public class SpannableHelper {
public void updateDrawState(@NonNull TextPaint ds) { public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds); super.updateDrawState(ds);
ds.setUnderlineText(false); ds.setUnderlineText(false);
if (linkColor != -1) {
ds.setColor(linkColor); ds.setColor(linkColor);
} }
}
}, },
startPosition, endPosition, startPosition, endPosition,
Spanned.SPAN_INCLUSIVE_EXCLUSIVE); Spanned.SPAN_INCLUSIVE_EXCLUSIVE);

Loading…
Cancel
Save