aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/project/attributes/iconlist.txt2
-rwxr-xr-xmain/project/attributes/makeicons1res.sh2
-rw-r--r--main/project/attributes/readme.txt3
-rw-r--r--main/project/attributes/svgs/geotour.svg72
-rw-r--r--main/res/drawable-mdpi/attribute_geotour.pngbin0 -> 961 bytes
-rw-r--r--main/res/values/cache_attributes.xml4
-rw-r--r--main/res/values/strings.xml4
-rw-r--r--main/src/cgeo/geocaching/enumerations/CacheAttribute.java3
-rw-r--r--main/src/cgeo/geocaching/files/GPXParser.java1
9 files changed, 89 insertions, 2 deletions
diff --git a/main/project/attributes/iconlist.txt b/main/project/attributes/iconlist.txt
index 8b75ab6..9d7584e 100644
--- a/main/project/attributes/iconlist.txt
+++ b/main/project/attributes/iconlist.txt
@@ -110,3 +110,5 @@ other_cache | | 57 | x | PD | koem | se
ask_owner | | 58 | x | PD | koem | selfmade
#
unknown | -1 | -1 | x | PD | koem | selfmade
+geotour | 67 | | | CC0 | James Keuning | http://thenounproject.com/noun/suitcase/#icon-No9097
+
diff --git a/main/project/attributes/makeicons1res.sh b/main/project/attributes/makeicons1res.sh
index 85e9fd7..d0413cf 100755
--- a/main/project/attributes/makeicons1res.sh
+++ b/main/project/attributes/makeicons1res.sh
@@ -7,7 +7,9 @@ require () {
}
require optipng
+#part of ImageMagick package
require convert
+#part of ImageMagick package
require composite
require sed
diff --git a/main/project/attributes/readme.txt b/main/project/attributes/readme.txt
index 9b56328..f6af0db 100644
--- a/main/project/attributes/readme.txt
+++ b/main/project/attributes/readme.txt
@@ -69,3 +69,6 @@ If you made new icons:
./listEnStrings.sh will list all attribute strings from strings.xml and creates empty string tags for missing strings. The output of the missing string tags lack a ">" sign so that you get a compiler error as a reminder, when you inserted them into values/strings.xml.
+7. Edit res/values/cache_attributes.xml so that filtering can be performed with new attribute
+
+8. Edit src/cgeo/geocaching/files/GPXParser.java so attribute is recognized in GPX import
diff --git a/main/project/attributes/svgs/geotour.svg b/main/project/attributes/svgs/geotour.svg
new file mode 100644
index 0000000..c615c37
--- /dev/null
+++ b/main/project/attributes/svgs/geotour.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="88.75"
+ height="83.125"
+ viewBox="0 0 71 66.5"
+ version="1.1"
+ id="svg2"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="geotour.svg">
+ <sodipodi:namedview
+ pagecolor="#009674"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1366"
+ inkscape:window-height="702"
+ id="namedview10"
+ showgrid="true"
+ inkscape:zoom="4"
+ inkscape:cx="49.222291"
+ inkscape:cy="32.85486"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg2"
+ inkscape:snap-grids="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ originy="-10.312499px"
+ originx="-5.6249999px"
+ snapvisiblegridlinesonly="true"
+ enabled="true"
+ visible="true"
+ empspacing="5"
+ id="grid2991"
+ type="xygrid" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata14">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs12" />
+ <path
+ sodipodi:nodetypes="sccccccccssccccsscssccssccsscsc"
+ inkscape:connector-curvature="0"
+ id="rect2983"
+ d="M 35.5,0 C 32.173466,0 28.832789,0.597736 24.39741,1.796264 l 0,9.592816 -8.839641,0 0,55.11092 39.884462,0 0,-55.11092 -8.839641,0 c 0,0 0.110884,-6.3567879 0,-9.592816 C 42.167211,0.597736 38.826534,0 35.5,0 z m 0,4.547988 c 2.217689,0 4.429721,0.3509981 6.64741,1.0701151 l 0,5.7709769 -13.29482,0 0,-5.7709769 C 31.070279,4.8989861 33.282311,4.547988 35.5,4.547988 z M 5.233068,11.38908 C 2.069078,11.45462 0,11.971529 0,16.166379 0.221769,31.088062 0,56.928586 0,61.722701 0,66.516816 2.24739,66.5 6.6827691,66.5 l 4.4198209,0 0,-55.11092 -4.4198209,0 c -0.493858,0 -0.997702,-0.0094 -1.4497011,0 z m 54.664343,0 0,55.11092 4.41982,0 C 68.374172,66.5 71,66.51682 71,61.722701 71,56.928586 70.778231,31.088062 71,16.166379 71,11.372264 68.75261,11.38908 64.317231,11.38908 z"
+ style="fill:#ffffff;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/main/res/drawable-mdpi/attribute_geotour.png b/main/res/drawable-mdpi/attribute_geotour.png
new file mode 100644
index 0000000..f1f0c24
--- /dev/null
+++ b/main/res/drawable-mdpi/attribute_geotour.png
Binary files differ
diff --git a/main/res/values/cache_attributes.xml b/main/res/values/cache_attributes.xml
index 815e007..c392b6f 100644
--- a/main/res/values/cache_attributes.xml
+++ b/main/res/values/cache_attributes.xml
@@ -69,10 +69,14 @@
<item>frontyard_no</item>
<item>teamwork_yes</item>
<item>teamwork_no</item>
+
+ <!-- attributes (specials -> yes, no) -->
<item>landf_yes</item>
<item>landf_no</item>
<item>partnership_yes</item>
<item>partnership_no</item>
+ <item>geotour_yes</item>
+ <item>geotour_no</item>
<!-- attributes (equipment -> required, not required) -->
<item>fee_yes</item>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index dd0f937..1a5d2d1 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -1052,7 +1052,9 @@
<string name="attribute_ask_owner_no">Don\'t ask owner for start conditions</string>
<string name="attribute_unknown_yes">Unknown attribute present</string>
<string name="attribute_unknown_no">No unknown attribute present</string>
-
+ <string name="attribute_geotour_yes">Part of GeoTour</string>
+ <string name="attribute_geotour_no">Not part of GeoTour</string>
+
<!-- next things -->
<string name="legal_note">To use the services of Geocaching.com, terms and conditions of the <a href="http://www.geocaching.com/about/termsofuse.aspx">Groundspeak disclaimer</a> have to be agreed.</string>
<string name="quote">To make geocaching easier, to make users lazier.</string>
diff --git a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
index 339516b..243f63d 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
@@ -108,7 +108,8 @@ public enum CacheAttribute {
ARITHMETIC(-1, 56, "arithmetic", R.drawable.attribute_arithmetic, R.string.attribute_arithmetic_yes, R.string.attribute_arithmetic_no),
OTHER_CACHE(-1, 57, "other_cache", R.drawable.attribute_other_cache, R.string.attribute_other_cache_yes, R.string.attribute_other_cache_no),
ASK_OWNER(-1, 58, "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);
+ 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);
// THIS LIST IS GENERATED: don't change anything here but read
// project/attributes/readme.txt
diff --git a/main/src/cgeo/geocaching/files/GPXParser.java b/main/src/cgeo/geocaching/files/GPXParser.java
index 96c90cc..4150b87 100644
--- a/main/src/cgeo/geocaching/files/GPXParser.java
+++ b/main/src/cgeo/geocaching/files/GPXParser.java
@@ -183,6 +183,7 @@ public abstract class GPXParser extends FileParser {
R.string.attribute_treeclimbing_yes, // 64
R.string.attribute_frontyard_yes, // 65
R.string.attribute_teamwork_yes, // 66
+ R.string.attribute_geotour_yes, // 67
};
private static final String YES = "_yes";
private static final String NO = "_no";
generated by cgit v1.1 at 2025-11-10 20:52:32 +0000