Merge pull request #1748 from campbeb/fix1718

Use red text for names of archived caches - Fixes #1718

4 files changed, 13 insertions, 1 deletions

diff --git a/main/res/values/colors.xml b/main/res/values/colors.xml
index 1d965e3..7289bc7 100644
--- a/main/res/values/colors.xml
+++ b/main/res/values/colors.xml
@@ -25,5 +25,5 @@
     <color name="link">#FF00C0FF</color>
     <color name="button_enabled">#FF000000</color>
     <color name="button_disabled">#66000000</color>
-
+    <color name="archived_cache_color">#FFAC0B0B</color>
 </resources>
\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index f1d214c..23c02c6 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -64,6 +64,7 @@ import android.text.Spannable;
 import android.text.Spanned;
 import android.text.format.DateUtils;
 import android.text.method.LinkMovementMethod;
+import android.text.style.ForegroundColorSpan;
 import android.text.style.StrikethroughSpan;
 import android.text.style.StyleSpan;
 import android.view.ContextMenu;
@@ -1335,6 +1336,9 @@ public class CacheDetailActivity extends AbstractActivity {
             if (cache.isDisabled() || cache.isArchived()) { // strike
                 span.setSpan(new StrikethroughSpan(), 0, span.toString().length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
             }
+            if (cache.isArchived()) {
+                span.setSpan(new ForegroundColorSpan(res.getColor(R.color.archived_cache_color)), 0, span.toString().length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
 
             details.add(R.string.cache_name, span);
             details.add(R.string.cache_type, cache.getType().getL10n());
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index ab579c4..77e26a4 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -43,6 +43,7 @@ import android.net.Uri;
 import android.text.Html;
 import android.text.Spannable;
 import android.text.Spanned;
+import android.text.style.ForegroundColorSpan;
 import android.text.style.StrikethroughSpan;
 
 import java.net.URLDecoder;
@@ -224,6 +225,9 @@ public abstract class GCParser {
                 if (cache.isDisabled() || cache.isArchived()) { // strike
                     cache.getNameSp().setSpan(new StrikethroughSpan(), 0, cache.getNameSp().toString().length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                 }
+                if (cache.isArchived()) {
+                    cache.getNameSp().setSpan(new ForegroundColorSpan(cgeoapplication.getInstance().getResources().getColor(R.color.archived_cache_color)), 0, cache.getNameSp().toString().length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                }
             }
 
             searchResult.addCache(cache);
diff --git a/main/src/cgeo/geocaching/ui/CacheListAdapter.java b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
index 25a8fdc..976abec 100644
--- a/main/src/cgeo/geocaching/ui/CacheListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
@@ -29,6 +29,7 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.text.Spannable;
 import android.text.Spanned;
+import android.text.style.ForegroundColorSpan;
 import android.text.style.StrikethroughSpan;
 import android.util.SparseArray;
 import android.view.GestureDetector;
@@ -396,6 +397,9 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> {
             if (cache.isDisabled() || cache.isArchived()) { // strike
                 cache.getNameSp().setSpan(new StrikethroughSpan(), 0, cache.getNameSp().toString().length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
             }
+            if (cache.isArchived()) {
+                cache.getNameSp().setSpan(new ForegroundColorSpan(res.getColor(R.color.archived_cache_color)), 0, cache.getNameSp().toString().length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
         }
 
         holder.text.setText(cache.getNameSp(), TextView.BufferType.SPANNABLE);