diff options
| author | rsudev <rasch@munin-soft.de> | 2012-02-28 07:44:30 +0100 |
|---|---|---|
| committer | rsudev <rasch@munin-soft.de> | 2012-02-28 07:44:30 +0100 |
| commit | bb755ff6bdf21435b4a39ba32f841ee4439d3f1c (patch) | |
| tree | ec0aac71a001a2b048cb3cb0f9ea88091faa8968 | |
| parent | b2d7a2b2c80ad45eac36549c9a486678b40241f6 (diff) | |
| download | cgeo-bb755ff6bdf21435b4a39ba32f841ee4439d3f1c.zip cgeo-bb755ff6bdf21435b4a39ba32f841ee4439d3f1c.tar.gz cgeo-bb755ff6bdf21435b4a39ba32f841ee4439d3f1c.tar.bz2 | |
Fixes #1185, ?-icon for new live map
- introduces a new icon for 'unknown'
- correct usage of unknown in cgeopopup
| -rw-r--r-- | main/res/drawable-hdpi/type_unknown.png | bin | 385 -> 1274 bytes | |||
| -rw-r--r-- | main/res/drawable/type_unknown.png | bin | 287 -> 805 bytes | |||
| -rw-r--r-- | main/src/cgeo/geocaching/cgeopopup.java | 3 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/enumerations/CacheType.java | 2 |
4 files changed, 2 insertions, 3 deletions
diff --git a/main/res/drawable-hdpi/type_unknown.png b/main/res/drawable-hdpi/type_unknown.png Binary files differindex 4950469..ffb6454 100644 --- a/main/res/drawable-hdpi/type_unknown.png +++ b/main/res/drawable-hdpi/type_unknown.png diff --git a/main/res/drawable/type_unknown.png b/main/res/drawable/type_unknown.png Binary files differindex 5a48bee..23bdb32 100644 --- a/main/res/drawable/type_unknown.png +++ b/main/res/drawable/type_unknown.png diff --git a/main/src/cgeo/geocaching/cgeopopup.java b/main/src/cgeo/geocaching/cgeopopup.java index ce6c0ef..e558ede 100644 --- a/main/src/cgeo/geocaching/cgeopopup.java +++ b/main/src/cgeo/geocaching/cgeopopup.java @@ -3,7 +3,6 @@ package cgeo.geocaching; import cgeo.geocaching.activity.AbstractActivity; import cgeo.geocaching.apps.cache.navi.NavigationAppFactory; import cgeo.geocaching.enumerations.CacheSize; -import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.enumerations.LoadFlags; import cgeo.geocaching.enumerations.LogType; import cgeo.geocaching.gcvote.GCVote; @@ -245,7 +244,7 @@ public class cgeopopup extends AbstractActivity { itemName.setText(res.getString(R.string.cache_type)); - String cacheType = cache.getType() != CacheType.UNKNOWN ? cache.getType().getL10n() : CacheType.MYSTERY.getL10n(); + String cacheType = cache.getType().getL10n(); String cacheSize = cache.getSize() != CacheSize.UNKNOWN ? " (" + cache.getSize().getL10n() + ")" : ""; itemValue.setText(cacheType + cacheSize); detailsList.addView(itemLayout); diff --git a/main/src/cgeo/geocaching/enumerations/CacheType.java b/main/src/cgeo/geocaching/enumerations/CacheType.java index ca4e999..abf9d83 100644 --- a/main/src/cgeo/geocaching/enumerations/CacheType.java +++ b/main/src/cgeo/geocaching/enumerations/CacheType.java @@ -29,7 +29,7 @@ public enum CacheType { PROJECT_APE("ape", "project ape cache", "2555690d-b2bc-4b55-b5ac-0cb704c0b768", R.string.ape, R.drawable.type_ape), GCHQ("gchq", "groundspeak hq", "416f2494-dc17-4b6a-9bab-1a29dd292d8c", R.string.gchq, R.drawable.type_hq), GPS_EXHIBIT("gps", "gps cache exhibit", "72e69af2-7986-4990-afd9-bc16cbbb4ce3", R.string.gps, R.drawable.type_traditional), // icon missing - UNKNOWN("unknown", "unknown", "", R.string.unknown, R.drawable.type_mystery), // icon missing + UNKNOWN("unknown", "unknown", "", R.string.unknown, R.drawable.type_unknown), /** No real cache type -> filter */ ALL("all", "display all caches", "9a79e6ce-3344-409c-bbe9-496530baf758", R.string.all_types, R.drawable.type_mystery); |
