From 8bc22701fbef17c24de6f2f8af282da08eba5766 Mon Sep 17 00:00:00 2001
From: koem <koem@petoria.de>
Date: Sat, 9 Feb 2013 18:14:29 +1300
Subject: Icons for OC

- new icons for opencaching
- changed some icons because of copyright
- english strings for opencaching attributes
- german strings for opencaching attributes
- new script to show (missing) strings for attributes
- new script to edit svg files from thenounproject.com
- new script to generate enums
- ocicons.html: list of all OC icons
---
 main/src/cgeo/geocaching/CacheDetailActivity.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'main/src/cgeo/geocaching/CacheDetailActivity.java')

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 03c0bcf..7921bc4 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1046,8 +1046,8 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 }
 
                 final boolean strikethru = !CacheAttribute.isEnabled(attributeName);
-                final CacheAttribute attrib = CacheAttribute.getByGcRawName(CacheAttribute.trimAttributeName(attributeName));
-                if (attrib != CacheAttribute.UNKNOWN) {
+                final CacheAttribute attrib = CacheAttribute.getByRawName(CacheAttribute.trimAttributeName(attributeName));
+                if (attrib != null) {
                     noAttributeIconsFound = false;
                     Drawable d = res.getDrawable(attrib.drawableId);
                     iv.setImageDrawable(d);
@@ -1061,7 +1061,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                         fl.addView(strikethruImage);
                     }
                 } else {
-                    Drawable d = res.getDrawable(R.drawable.attribute_icon_not_found);
+                    Drawable d = res.getDrawable(R.drawable.attribute_unknown);
                     iv.setImageDrawable(d);
                 }
 
@@ -1088,10 +1088,11 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             for (String attributeName : cache.getAttributes()) {
                 final boolean enabled = CacheAttribute.isEnabled(attributeName);
                 // search for a translation of the attribute
-                CacheAttribute attrib = CacheAttribute.getByGcRawName(CacheAttribute.trimAttributeName(attributeName));
-                if (attrib != CacheAttribute.UNKNOWN) {
-                    attributeName = attrib.getL10n(enabled);
+                CacheAttribute attrib = CacheAttribute.getByRawName(CacheAttribute.trimAttributeName(attributeName));
+                if (attrib == null) {
+                    attrib = CacheAttribute.UNKNOWN;
                 }
+                attributeName = attrib.getGcL10n(enabled);
                 if (buffer.length() > 0) {
                     buffer.append('\n');
                 }
-- 
cgit v1.1


From c1228f54411e11f373efb9c9d3205ec04ff9c0c7 Mon Sep 17 00:00:00 2001
From: koem <koem@petoria.de>
Date: Mon, 11 Feb 2013 11:26:50 +1300
Subject: Unit-Tests ++ - and Maintenance Icon Color changed to alert-red

---
 main/src/cgeo/geocaching/CacheDetailActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main/src/cgeo/geocaching/CacheDetailActivity.java')

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 7921bc4..a3535a6 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1092,7 +1092,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 if (attrib == null) {
                     attrib = CacheAttribute.UNKNOWN;
                 }
-                attributeName = attrib.getGcL10n(enabled);
+                attributeName = attrib.getL10n(enabled);
                 if (buffer.length() > 0) {
                     buffer.append('\n');
                 }
-- 
cgit v1.1