From bfb6ba671ee39b48825f2c86c0e41c2b0bd202aa Mon Sep 17 00:00:00 2001 From: rsudev Date: Tue, 24 Dec 2013 13:05:58 +0100 Subject: Fixes #3462, Wrong attribute icon in OC.de cache Additionally some new icons for oc attributes --- main/project/attributes/iconlist.txt | 10 +- main/project/attributes/svgs/historic_site.svg | 50 ++++++++++ main/project/attributes/svgs/kids_2.svg | 105 +++++++++++++++++++++ main/project/attributes/svgs/magnetic.svg | 54 +++++++++++ main/project/attributes/svgs/usb_cache.svg | 52 ++++++++++ main/res/drawable-mdpi/attribute_historic_site.png | Bin 0 -> 1163 bytes main/res/drawable-mdpi/attribute_kids_2.png | Bin 0 -> 1607 bytes main/res/drawable-mdpi/attribute_magnetic.png | Bin 0 -> 1182 bytes main/res/drawable-mdpi/attribute_usb_cache.png | Bin 0 -> 1039 bytes main/res/values/strings.xml | 8 ++ main/res/values/strings_not_translatable.xml | 3 +- .../geocaching/enumerations/CacheAttribute.java | 8 +- 12 files changed, 282 insertions(+), 8 deletions(-) create mode 100644 main/project/attributes/svgs/historic_site.svg create mode 100644 main/project/attributes/svgs/kids_2.svg create mode 100644 main/project/attributes/svgs/magnetic.svg create mode 100644 main/project/attributes/svgs/usb_cache.svg create mode 100644 main/res/drawable-mdpi/attribute_historic_site.png create mode 100644 main/res/drawable-mdpi/attribute_kids_2.png create mode 100644 main/res/drawable-mdpi/attribute_magnetic.png create mode 100644 main/res/drawable-mdpi/attribute_usb_cache.png (limited to 'main') diff --git a/main/project/attributes/iconlist.txt b/main/project/attributes/iconlist.txt index 37ddf1b..382c3e8 100644 --- a/main/project/attributes/iconlist.txt +++ b/main/project/attributes/iconlist.txt @@ -80,7 +80,7 @@ camping | 31 | | | | PD | USA National Park Serv stroller | 41 | | | | PD | USA National Park Service | http://thenounproject.com/noun/stroller/#icon-No161 fuel | 58 | | | | PD | | http://thenounproject.com/noun/gas/#icon-No155 food | 59 | | | | PD | Roger Cook, Don Shanosky | http://thenounproject.com/noun/restaurant/#icon-No33 -oc_only | | 6 | | x | PD | koem | selfmade +oc_only | | 6 | 1 | x | PD | koem | selfmade link_only | | 7 | | x | PD | koem | selfmade letterbox | | 8 | 4 | | CC0 | | http://thenounproject.com/noun/post-office/#icon-No2404 railway | | 10 | 60 | | CC0 | | http://thenounproject.com/noun/train/#icon-No4420 @@ -112,20 +112,20 @@ ask_owner | | 58 | 17 | x | PD | koem # unknown | -1 | -1 | -1 | x | PD | koem | selfmade geotour | 67 | | | | CC0 | James Keuning | http://thenounproject.com/noun/suitcase/#icon-No9097 +kids_2 | | | 70 | x | PD | | http://thenounproject.com/noun/teddy-bear/#icon-No6843 +historic_site | | | 29 | | PD | Reuben | http://thenounproject.com/term/castle/12390/ +magnetic | | | 6 | | PD | | http://thenounproject.com/term/magnet/698/ +usb_cache | | | 10 | | CCBY | Kenneth van Alt | http://thenounproject.com/term/usb/1824/ ### In need of icons survey_marker | | | 2 | wherigo | | | 3 | geohotel | | | 5 | -magnetic | | | 6 | audio_cache | | | 7 | offset_cache | | | 8 | -usb_cache | | | 10 | pedestrian_only | | | 20 | nature_cache | | | 28 | -historic_site | | | 29 | byop | | | 50 | shovel | | | 51 | quick_cache | | | 68 | -kids | | | 70 | safari_cache | | | 72 | specific_access | | | 73 | diff --git a/main/project/attributes/svgs/historic_site.svg b/main/project/attributes/svgs/historic_site.svg new file mode 100644 index 0000000..fef0ab3 --- /dev/null +++ b/main/project/attributes/svgs/historic_site.svg @@ -0,0 +1,50 @@ + +image/svg+xml \ No newline at end of file diff --git a/main/project/attributes/svgs/kids_2.svg b/main/project/attributes/svgs/kids_2.svg new file mode 100644 index 0000000..6f9849d --- /dev/null +++ b/main/project/attributes/svgs/kids_2.svg @@ -0,0 +1,105 @@ + +image/svg+xml + + + + + + + + + + + + \ No newline at end of file diff --git a/main/project/attributes/svgs/magnetic.svg b/main/project/attributes/svgs/magnetic.svg new file mode 100644 index 0000000..b6be067 --- /dev/null +++ b/main/project/attributes/svgs/magnetic.svg @@ -0,0 +1,54 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/main/project/attributes/svgs/usb_cache.svg b/main/project/attributes/svgs/usb_cache.svg new file mode 100644 index 0000000..ef3cf03 --- /dev/null +++ b/main/project/attributes/svgs/usb_cache.svg @@ -0,0 +1,52 @@ + +image/svg+xml \ No newline at end of file diff --git a/main/res/drawable-mdpi/attribute_historic_site.png b/main/res/drawable-mdpi/attribute_historic_site.png new file mode 100644 index 0000000..9a9a7dd Binary files /dev/null and b/main/res/drawable-mdpi/attribute_historic_site.png differ diff --git a/main/res/drawable-mdpi/attribute_kids_2.png b/main/res/drawable-mdpi/attribute_kids_2.png new file mode 100644 index 0000000..be801af Binary files /dev/null and b/main/res/drawable-mdpi/attribute_kids_2.png differ diff --git a/main/res/drawable-mdpi/attribute_magnetic.png b/main/res/drawable-mdpi/attribute_magnetic.png new file mode 100644 index 0000000..a9f3c24 Binary files /dev/null and b/main/res/drawable-mdpi/attribute_magnetic.png differ diff --git a/main/res/drawable-mdpi/attribute_usb_cache.png b/main/res/drawable-mdpi/attribute_usb_cache.png new file mode 100644 index 0000000..e7a7d5f Binary files /dev/null and b/main/res/drawable-mdpi/attribute_usb_cache.png differ diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 7c74481..4f16860 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -1161,6 +1161,14 @@ No unknown attribute present Part of GeoTour Not part of GeoTour + Take your children + Do not take your children + Historic site + No historic site + Magnetic cache + No magnetic cache + Dead drop USB cache + No dead drop USB cache To make geocaching easier, to make users lazier. diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml index e5db27c..87cc291 100644 --- a/main/res/values/strings_not_translatable.xml +++ b/main/res/values/strings_not_translatable.xml @@ -90,7 +90,8 @@ · zenobios (code, loc. DE EN)\n \n · Mapsforge (OSM-rendering)\n - · The Noun Project (basis for attribute icons)\n + · The Noun Project (basis for attribute icons):\n +    · USB by Kenneth Von Alt from The Noun Project\n · The Apache Commons Project\n · Android Icons (CC-BY 3.0)\n · RRZE Icon set (CC-BY-SA 3.0)\n diff --git a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java index 31fc023..4ace4a8 100644 --- a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java +++ b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java @@ -79,7 +79,7 @@ public enum CacheAttribute { STROLLER(41, -1, "stroller", R.drawable.attribute_stroller, R.string.attribute_stroller_yes, R.string.attribute_stroller_no), FUEL(58, -1, "fuel", R.drawable.attribute_fuel, R.string.attribute_fuel_yes, R.string.attribute_fuel_no), FOOD(59, -1, "food", R.drawable.attribute_food, R.string.attribute_food_yes, R.string.attribute_food_no), - OC_ONLY(-1, -1, "oc_only", R.drawable.attribute_oc_only, R.string.attribute_oc_only_yes, R.string.attribute_oc_only_no), + OC_ONLY(-1, 1, "oc_only", R.drawable.attribute_oc_only, R.string.attribute_oc_only_yes, R.string.attribute_oc_only_no), LINK_ONLY(-1, -1, "link_only", R.drawable.attribute_link_only, R.string.attribute_link_only_yes, R.string.attribute_link_only_no), LETTERBOX(-1, 4, "letterbox", R.drawable.attribute_letterbox, R.string.attribute_letterbox_yes, R.string.attribute_letterbox_no), RAILWAY(-1, 60, "railway", R.drawable.attribute_railway, R.string.attribute_railway_yes, R.string.attribute_railway_no), @@ -109,7 +109,11 @@ public enum CacheAttribute { OTHER_CACHE(-1, 13, "other_cache", R.drawable.attribute_other_cache, R.string.attribute_other_cache_yes, R.string.attribute_other_cache_no), ASK_OWNER(-1, 17, "ask_owner", R.drawable.attribute_ask_owner, R.string.attribute_ask_owner_yes, R.string.attribute_ask_owner_no), UNKNOWN(-1, -1, "unknown", R.drawable.attribute_unknown, R.string.attribute_unknown_yes, R.string.attribute_unknown_no), - GEOTOUR(67, -1, "geotour", R.drawable.attribute_geotour, R.string.attribute_geotour_yes, R.string.attribute_geotour_no); + GEOTOUR(67, -1, "geotour", R.drawable.attribute_geotour, R.string.attribute_geotour_yes, R.string.attribute_geotour_no), + KIDS_2(-1, 70, "kids_2", R.drawable.attribute_kids_2, R.string.attribute_kids_2_yes, R.string.attribute_kids_2_no), + HISTORIC_SITE(-1, 29, "historic_site", R.drawable.attribute_historic_site, R.string.attribute_historic_site_yes, R.string.attribute_historic_site_no), + MAGNETIC(-1, 6, "magnetic", R.drawable.attribute_magnetic, R.string.attribute_magnetic_yes, R.string.attribute_magnetic_no), + USB_CACHE(-1, 10, "usb_cache", R.drawable.attribute_usb_cache, R.string.attribute_usb_cache_yes, R.string.attribute_usb_cache_no); // THIS LIST IS GENERATED: don't change anything here but read // project/attributes/readme.txt -- cgit v1.1