From ae07af70509a1276a9508fbfbda0170b6ae0d623 Mon Sep 17 00:00:00 2001 From: rsudev Date: Fri, 24 Feb 2012 23:37:16 +0100 Subject: Fixes #934, Marker for stored caches - Adds a small floppy icon in the 'own' position on stored, not own caches --- main/res/drawable-hdpi/marker_stored.png | Bin 0 -> 663 bytes main/res/drawable/marker_stored.png | Bin 0 -> 483 bytes main/res/values/strings.xml | 1 + main/src/cgeo/geocaching/maps/CGeoMap.java | 5 +++++ 4 files changed, 6 insertions(+) create mode 100644 main/res/drawable-hdpi/marker_stored.png create mode 100644 main/res/drawable/marker_stored.png diff --git a/main/res/drawable-hdpi/marker_stored.png b/main/res/drawable-hdpi/marker_stored.png new file mode 100644 index 0000000..6447bbf Binary files /dev/null and b/main/res/drawable-hdpi/marker_stored.png differ diff --git a/main/res/drawable/marker_stored.png b/main/res/drawable/marker_stored.png new file mode 100644 index 0000000..6689e26 Binary files /dev/null and b/main/res/drawable/marker_stored.png differ diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index cccb474..ef1ceed 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -1002,6 +1002,7 @@ · The Noun Project (basis for attribute icons)\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/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index 004118f..0038807 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -1855,6 +1855,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto .append(cache.hasUserModifiedCoords()) .append(cache.getPersonalNote()) .append(cache.isLogOffline()) + .append(cache.getListId() > 0) .toHashCode(); LayerDrawable ldFromCache = CGeoMap.overlaysCache.get(hashcode); @@ -1886,6 +1887,10 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto if ( cache.isOwn() ) { layers.add(getResources().getDrawable(R.drawable.marker_own)); insets.add(INSET_OWN[resolution]); + // if not, checked if stored + } else if (cache.getListId() > 0) { + layers.add(getResources().getDrawable(R.drawable.marker_stored)); + insets.add(INSET_OWN[resolution]); } // found if (cache.isFound()) { -- cgit v1.1