From 81dd820d0aad0f2c754822269ec05d47320a4414 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 16 Dec 2022 09:31:01 +0100 Subject: [PATCH] fix default link color --- .../android/helper/SpannableHelper.java | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java b/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java index 03e9a52c5..6179f6b92 100644 --- a/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java +++ b/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java @@ -125,7 +125,7 @@ public class SpannableHelper { linkColor = link_color; } } else { - linkColor = ThemeHelper.getAttColor(context, R.attr.linkColor); + linkColor = -1; } SpannableString initialContent; @@ -474,7 +474,9 @@ public class SpannableHelper { @Override public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); - ds.setColor(linkColor); + if (linkColor != -1) { + ds.setColor(linkColor); + } } }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); @@ -701,7 +703,9 @@ public class SpannableHelper { public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); ds.setUnderlineText(false); - ds.setColor(linkColor); + if (linkColor != -1) { + ds.setColor(linkColor); + } } }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); } @@ -735,7 +739,9 @@ public class SpannableHelper { public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); ds.setUnderlineText(false); - ds.setColor(linkColor); + if (linkColor != -1) { + ds.setColor(linkColor); + } } }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); } @@ -772,7 +778,9 @@ public class SpannableHelper { public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); ds.setUnderlineText(false); - ds.setColor(linkColor); + if (linkColor != -1) { + ds.setColor(linkColor); + } } }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); } @@ -929,7 +937,9 @@ public class SpannableHelper { public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); ds.setUnderlineText(false); - ds.setColor(linkColor); + if (linkColor != -1) { + ds.setColor(linkColor); + } } }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); @@ -1078,7 +1088,9 @@ public class SpannableHelper { public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); ds.setUnderlineText(false); - ds.setColor(linkColor); + if (linkColor != -1) { + ds.setColor(linkColor); + } } }, startPosition, endPosition,