diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-05-23 02:07:01 -0700 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-05-23 02:07:01 -0700 |
| commit | 153505a81e1855448d7b21f991807a58bf15785d (patch) | |
| tree | ddcdedc9818068c0c52472fe648bc2dba977c8da | |
| parent | 111397fbb12bc6023dc067bf46db3fc3e5cf72e2 (diff) | |
| parent | d543cfeaa7f9b943d16a6b73d9765051fc6fd159 (diff) | |
| download | cgeo-153505a81e1855448d7b21f991807a58bf15785d.zip cgeo-153505a81e1855448d7b21f991807a58bf15785d.tar.gz cgeo-153505a81e1855448d7b21f991807a58bf15785d.tar.bz2 | |
Merge pull request #2763 from campbeb/fix2728
Fix #2728 - Support for Block Party cache type
| -rw-r--r-- | main/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/enumerations/CacheType.java | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 34543f1..54038d0 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -34,6 +34,7 @@ <string name="ape">Project APE Cache</string> <string name="gchq">Groundspeak HQ</string> <string name="gps">GPS Adventures Exhibit</string> + <string name="block">Groundspeak Block Party</string> <string name="unknown">Unknown Type</string> <!-- cache sizes --> diff --git a/main/src/cgeo/geocaching/enumerations/CacheType.java b/main/src/cgeo/geocaching/enumerations/CacheType.java index 528d3fa..fc8a867 100644 --- a/main/src/cgeo/geocaching/enumerations/CacheType.java +++ b/main/src/cgeo/geocaching/enumerations/CacheType.java @@ -29,6 +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 + BLOCK_PARTY("block", "Groundspeak Block Party", "bc2f3df2-1aab-4601-b2ff-b5091f6c02e3", R.string.block, R.drawable.type_event), // 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_unknown); @@ -88,7 +89,8 @@ public enum CacheType { } public boolean isEvent() { - return CacheType.EVENT == this || CacheType.MEGA_EVENT == this || CacheType.CITO == this || CacheType.LOSTANDFOUND == this; + return CacheType.EVENT == this || CacheType.MEGA_EVENT == this || CacheType.CITO == this || + CacheType.LOSTANDFOUND == this || CacheType.BLOCK_PARTY == this; } @Override @@ -98,7 +100,7 @@ public enum CacheType { /** * Whether this type contains the given cache. - * + * * @param cache * @return true if this is the ALL type or if this type equals the type of the cache. */ |