From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Sun, 10 Dec 2017 21:20:24 +0000 (+0100)
Subject: Simplify NonLinkClickableSpan.
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=4b0aa089555e54ebc9bf26f58096fb808b72420b

Simplify NonLinkClickableSpan.
---

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 863e20b..34e37d6 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -1772,7 +1772,7 @@ public class DictionaryActivity extends ActionBarActivity {
         textView.setMovementMethod(LinkMovementMethod.getInstance());
         final Matcher matcher = CHAR_DASH.matcher(text);
         while (matcher.find()) {
-            spannable.setSpan(new NonLinkClickableSpan(textColorFg), matcher.start(),
+            spannable.setSpan(new NonLinkClickableSpan(), matcher.start(),
                               matcher.end(),
                               Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
         }
diff --git a/src/com/hughes/android/util/NonLinkClickableSpan.java b/src/com/hughes/android/util/NonLinkClickableSpan.java
index 46857d7..645d0c9 100644
--- a/src/com/hughes/android/util/NonLinkClickableSpan.java
+++ b/src/com/hughes/android/util/NonLinkClickableSpan.java
@@ -23,10 +23,7 @@ public class NonLinkClickableSpan extends ClickableSpan {
     // The singleton pattern doesn't work here--we need a separate instance for
     // each span.
 
-    final int color;
-
-    public NonLinkClickableSpan(int color) {
-        this.color = color;
+    public NonLinkClickableSpan() {
     }
 
     // Won't see these on a long-click.
@@ -38,9 +35,6 @@ public class NonLinkClickableSpan extends ClickableSpan {
 
     @Override
     public void updateDrawState(TextPaint ds) {
-        super.updateDrawState(ds);
-        ds.setUnderlineText(false);
-        ds.setColor(color);
     }
 
 }