me/Fedilab
1
0
Fork 0
forked from mirrors/Fedilab
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix default link color

Browse source
This commit is contained in:
Thomas 2022-12-16 09:31:01 +01:00
parent e0953ff5af
commit 81dd820d0a
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/app/fedilab/android/helper/SpannableHelper.java
View file

@ -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,7 +474,9 @@ public class SpannableHelper {
@Override @Override
public void updateDrawState(@NonNull TextPaint ds) { public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds); super.updateDrawState(ds);
ds.setColor(linkColor); if (linkColor != -1) {
ds.setColor(linkColor);
}
} }
}, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
@ -701,7 +703,9 @@ 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);
ds.setColor(linkColor); if (linkColor != -1) {
ds.setColor(linkColor);
}
} }
}, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
} }
@ -735,7 +739,9 @@ 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);
ds.setColor(linkColor); if (linkColor != -1) {
ds.setColor(linkColor);
}
} }
}, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
} }
@ -772,7 +778,9 @@ 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);
ds.setColor(linkColor); if (linkColor != -1) {
ds.setColor(linkColor);
}
} }
}, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
} }
@ -929,7 +937,9 @@ 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);
ds.setColor(linkColor); if (linkColor != -1) {
ds.setColor(linkColor);
}
} }
}, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
@ -1078,7 +1088,9 @@ 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);
ds.setColor(linkColor); if (linkColor != -1) {
ds.setColor(linkColor);
}
} }
}, },
startPosition, endPosition, startPosition, endPosition,