diff options
129 files changed, 181 insertions, 240 deletions
diff --git a/main/res/drawable-hdpi/marker_cache_ape.png b/main/res/drawable-hdpi/marker_cache_ape.png Binary files differdeleted file mode 100644 index ea23ab5..0000000 --- a/main/res/drawable-hdpi/marker_cache_ape.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_ape_disabled.png b/main/res/drawable-hdpi/marker_cache_ape_disabled.png Binary files differdeleted file mode 100644 index bec7d35..0000000 --- a/main/res/drawable-hdpi/marker_cache_ape_disabled.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_ape_found.png b/main/res/drawable-hdpi/marker_cache_ape_found.png Binary files differdeleted file mode 100644 index 88a3c60..0000000 --- a/main/res/drawable-hdpi/marker_cache_ape_found.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_ape_own.png b/main/res/drawable-hdpi/marker_cache_ape_own.png Binary files differdeleted file mode 100644 index 789dfce..0000000 --- a/main/res/drawable-hdpi/marker_cache_ape_own.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_cito.png b/main/res/drawable-hdpi/marker_cache_cito.png Binary files differdeleted file mode 100644 index 7316474..0000000 --- a/main/res/drawable-hdpi/marker_cache_cito.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_cito_disabled.png b/main/res/drawable-hdpi/marker_cache_cito_disabled.png Binary files differdeleted file mode 100644 index 46ec516..0000000 --- a/main/res/drawable-hdpi/marker_cache_cito_disabled.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_cito_found.png b/main/res/drawable-hdpi/marker_cache_cito_found.png Binary files differdeleted file mode 100644 index 52cab85..0000000 --- a/main/res/drawable-hdpi/marker_cache_cito_found.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_cito_own.png b/main/res/drawable-hdpi/marker_cache_cito_own.png Binary files differdeleted file mode 100644 index a5ccea7..0000000 --- a/main/res/drawable-hdpi/marker_cache_cito_own.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_earth.png b/main/res/drawable-hdpi/marker_cache_earth.png Binary files differdeleted file mode 100644 index 67fe6a8..0000000 --- a/main/res/drawable-hdpi/marker_cache_earth.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_earth_disabled.png b/main/res/drawable-hdpi/marker_cache_earth_disabled.png Binary files differdeleted file mode 100644 index 314abd9..0000000 --- a/main/res/drawable-hdpi/marker_cache_earth_disabled.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_earth_found.png b/main/res/drawable-hdpi/marker_cache_earth_found.png Binary files differdeleted file mode 100644 index ed35305..0000000 --- a/main/res/drawable-hdpi/marker_cache_earth_found.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_earth_own.png b/main/res/drawable-hdpi/marker_cache_earth_own.png Binary files differdeleted file mode 100644 index ff40ae7..0000000 --- a/main/res/drawable-hdpi/marker_cache_earth_own.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_event.png b/main/res/drawable-hdpi/marker_cache_event.png Binary files differdeleted file mode 100644 index ca4a992..0000000 --- a/main/res/drawable-hdpi/marker_cache_event.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_event_disabled.png b/main/res/drawable-hdpi/marker_cache_event_disabled.png Binary files differdeleted file mode 100644 index 07009a2..0000000 --- a/main/res/drawable-hdpi/marker_cache_event_disabled.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_event_found.png b/main/res/drawable-hdpi/marker_cache_event_found.png Binary files differdeleted file mode 100644 index 8a353f7..0000000 --- a/main/res/drawable-hdpi/marker_cache_event_found.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_event_own.png b/main/res/drawable-hdpi/marker_cache_event_own.png Binary files differdeleted file mode 100644 index 5eac369..0000000 --- a/main/res/drawable-hdpi/marker_cache_event_own.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_gchq.png b/main/res/drawable-hdpi/marker_cache_gchq.png Binary files differdeleted file mode 100644 index 8a325af..0000000 --- a/main/res/drawable-hdpi/marker_cache_gchq.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_gchq_disabled.png b/main/res/drawable-hdpi/marker_cache_gchq_disabled.png Binary files differdeleted file mode 100644 index 2758ef1..0000000 --- a/main/res/drawable-hdpi/marker_cache_gchq_disabled.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_gchq_found.png b/main/res/drawable-hdpi/marker_cache_gchq_found.png Binary files differdeleted file mode 100644 index 5fb2f14..0000000 --- a/main/res/drawable-hdpi/marker_cache_gchq_found.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_gchq_own.png b/main/res/drawable-hdpi/marker_cache_gchq_own.png Binary files differdeleted file mode 100644 index bedc59e..0000000 --- a/main/res/drawable-hdpi/marker_cache_gchq_own.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_letterbox.png b/main/res/drawable-hdpi/marker_cache_letterbox.png Binary files differdeleted file mode 100644 index ec15411..0000000 --- a/main/res/drawable-hdpi/marker_cache_letterbox.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_letterbox_disabled.png b/main/res/drawable-hdpi/marker_cache_letterbox_disabled.png Binary files differdeleted file mode 100644 index 8637e64..0000000 --- a/main/res/drawable-hdpi/marker_cache_letterbox_disabled.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_letterbox_found.png b/main/res/drawable-hdpi/marker_cache_letterbox_found.png Binary files differdeleted file mode 100644 index ef34447..0000000 --- a/main/res/drawable-hdpi/marker_cache_letterbox_found.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_letterbox_own.png b/main/res/drawable-hdpi/marker_cache_letterbox_own.png Binary files differdeleted file mode 100644 index 8523796..0000000 --- a/main/res/drawable-hdpi/marker_cache_letterbox_own.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_mega.png b/main/res/drawable-hdpi/marker_cache_mega.png Binary files differdeleted file mode 100644 index d30387d..0000000 --- a/main/res/drawable-hdpi/marker_cache_mega.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_mega_disabled.png b/main/res/drawable-hdpi/marker_cache_mega_disabled.png Binary files differdeleted file mode 100644 index 6f0930e..0000000 --- a/main/res/drawable-hdpi/marker_cache_mega_disabled.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_mega_found.png b/main/res/drawable-hdpi/marker_cache_mega_found.png Binary files differdeleted file mode 100644 index 607a74b..0000000 --- a/main/res/drawable-hdpi/marker_cache_mega_found.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_mega_own.png b/main/res/drawable-hdpi/marker_cache_mega_own.png Binary files differdeleted file mode 100644 index e90a31e..0000000 --- a/main/res/drawable-hdpi/marker_cache_mega_own.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_multi.png b/main/res/drawable-hdpi/marker_cache_multi.png Binary files differdeleted file mode 100644 index 78fa60c..0000000 --- a/main/res/drawable-hdpi/marker_cache_multi.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_multi_disabled.png b/main/res/drawable-hdpi/marker_cache_multi_disabled.png Binary files differdeleted file mode 100644 index e84b8b6..0000000 --- a/main/res/drawable-hdpi/marker_cache_multi_disabled.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_multi_found.png b/main/res/drawable-hdpi/marker_cache_multi_found.png Binary files differdeleted file mode 100644 index a3b42ae..0000000 --- a/main/res/drawable-hdpi/marker_cache_multi_found.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_multi_own.png b/main/res/drawable-hdpi/marker_cache_multi_own.png Binary files differdeleted file mode 100644 index de70369..0000000 --- a/main/res/drawable-hdpi/marker_cache_multi_own.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_mystery.png b/main/res/drawable-hdpi/marker_cache_mystery.png Binary files differdeleted file mode 100644 index 0ac038b..0000000 --- a/main/res/drawable-hdpi/marker_cache_mystery.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_mystery_disabled.png b/main/res/drawable-hdpi/marker_cache_mystery_disabled.png Binary files differdeleted file mode 100644 index 08553cf..0000000 --- a/main/res/drawable-hdpi/marker_cache_mystery_disabled.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_mystery_found.png b/main/res/drawable-hdpi/marker_cache_mystery_found.png Binary files differdeleted file mode 100644 index ffd852e..0000000 --- a/main/res/drawable-hdpi/marker_cache_mystery_found.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_mystery_own.png b/main/res/drawable-hdpi/marker_cache_mystery_own.png Binary files differdeleted file mode 100644 index 7e51d30..0000000 --- a/main/res/drawable-hdpi/marker_cache_mystery_own.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_traditional.png b/main/res/drawable-hdpi/marker_cache_traditional.png Binary files differdeleted file mode 100644 index 8a325af..0000000 --- a/main/res/drawable-hdpi/marker_cache_traditional.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_traditional_disabled.png b/main/res/drawable-hdpi/marker_cache_traditional_disabled.png Binary files differdeleted file mode 100644 index 2758ef1..0000000 --- a/main/res/drawable-hdpi/marker_cache_traditional_disabled.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_traditional_found.png b/main/res/drawable-hdpi/marker_cache_traditional_found.png Binary files differdeleted file mode 100644 index 5fb2f14..0000000 --- a/main/res/drawable-hdpi/marker_cache_traditional_found.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_traditional_own.png b/main/res/drawable-hdpi/marker_cache_traditional_own.png Binary files differdeleted file mode 100644 index bedc59e..0000000 --- a/main/res/drawable-hdpi/marker_cache_traditional_own.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_virtual.png b/main/res/drawable-hdpi/marker_cache_virtual.png Binary files differdeleted file mode 100644 index e743ad4..0000000 --- a/main/res/drawable-hdpi/marker_cache_virtual.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_virtual_disabled.png b/main/res/drawable-hdpi/marker_cache_virtual_disabled.png Binary files differdeleted file mode 100644 index 9b4146c..0000000 --- a/main/res/drawable-hdpi/marker_cache_virtual_disabled.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_virtual_found.png b/main/res/drawable-hdpi/marker_cache_virtual_found.png Binary files differdeleted file mode 100644 index 9bb2eaa..0000000 --- a/main/res/drawable-hdpi/marker_cache_virtual_found.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_virtual_own.png b/main/res/drawable-hdpi/marker_cache_virtual_own.png Binary files differdeleted file mode 100644 index 3e813b5..0000000 --- a/main/res/drawable-hdpi/marker_cache_virtual_own.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_webcam.png b/main/res/drawable-hdpi/marker_cache_webcam.png Binary files differdeleted file mode 100644 index b1612ea..0000000 --- a/main/res/drawable-hdpi/marker_cache_webcam.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_webcam_disabled.png b/main/res/drawable-hdpi/marker_cache_webcam_disabled.png Binary files differdeleted file mode 100644 index 90099d2..0000000 --- a/main/res/drawable-hdpi/marker_cache_webcam_disabled.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_webcam_found.png b/main/res/drawable-hdpi/marker_cache_webcam_found.png Binary files differdeleted file mode 100644 index 8892e18..0000000 --- a/main/res/drawable-hdpi/marker_cache_webcam_found.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_webcam_own.png b/main/res/drawable-hdpi/marker_cache_webcam_own.png Binary files differdeleted file mode 100644 index 4d28310..0000000 --- a/main/res/drawable-hdpi/marker_cache_webcam_own.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_wherigo.png b/main/res/drawable-hdpi/marker_cache_wherigo.png Binary files differdeleted file mode 100644 index 5520e35..0000000 --- a/main/res/drawable-hdpi/marker_cache_wherigo.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_wherigo_disabled.png b/main/res/drawable-hdpi/marker_cache_wherigo_disabled.png Binary files differdeleted file mode 100644 index 9cd4d0a..0000000 --- a/main/res/drawable-hdpi/marker_cache_wherigo_disabled.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_wherigo_found.png b/main/res/drawable-hdpi/marker_cache_wherigo_found.png Binary files differdeleted file mode 100644 index dc8af16..0000000 --- a/main/res/drawable-hdpi/marker_cache_wherigo_found.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_cache_wherigo_own.png b/main/res/drawable-hdpi/marker_cache_wherigo_own.png Binary files differdeleted file mode 100644 index 718d733..0000000 --- a/main/res/drawable-hdpi/marker_cache_wherigo_own.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_waypoint_flag.png b/main/res/drawable-hdpi/marker_waypoint_flag.png Binary files differdeleted file mode 100644 index a15e26f..0000000 --- a/main/res/drawable-hdpi/marker_waypoint_flag.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_waypoint_pkg.png b/main/res/drawable-hdpi/marker_waypoint_pkg.png Binary files differdeleted file mode 100644 index 251c5e5..0000000 --- a/main/res/drawable-hdpi/marker_waypoint_pkg.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_waypoint_puzzle.png b/main/res/drawable-hdpi/marker_waypoint_puzzle.png Binary files differdeleted file mode 100644 index 1f51df5..0000000 --- a/main/res/drawable-hdpi/marker_waypoint_puzzle.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_waypoint_stage.png b/main/res/drawable-hdpi/marker_waypoint_stage.png Binary files differdeleted file mode 100644 index ffbf39b..0000000 --- a/main/res/drawable-hdpi/marker_waypoint_stage.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_waypoint_trailhead.png b/main/res/drawable-hdpi/marker_waypoint_trailhead.png Binary files differdeleted file mode 100644 index fe2e46a..0000000 --- a/main/res/drawable-hdpi/marker_waypoint_trailhead.png +++ /dev/null diff --git a/main/res/drawable-hdpi/marker_waypoint_waypoint.png b/main/res/drawable-hdpi/marker_waypoint_waypoint.png Binary files differdeleted file mode 100644 index 872359f..0000000 --- a/main/res/drawable-hdpi/marker_waypoint_waypoint.png +++ /dev/null diff --git a/main/res/drawable/marker.png b/main/res/drawable/marker.png Binary files differindex 4e0e7c7..f6e0e10 100644 --- a/main/res/drawable/marker.png +++ b/main/res/drawable/marker.png diff --git a/main/res/drawable/marker_cache_ape.png b/main/res/drawable/marker_cache_ape.png Binary files differdeleted file mode 100644 index 246dada..0000000 --- a/main/res/drawable/marker_cache_ape.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_ape_disabled.png b/main/res/drawable/marker_cache_ape_disabled.png Binary files differdeleted file mode 100644 index 5df88ce..0000000 --- a/main/res/drawable/marker_cache_ape_disabled.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_ape_found.png b/main/res/drawable/marker_cache_ape_found.png Binary files differdeleted file mode 100644 index 90eb602..0000000 --- a/main/res/drawable/marker_cache_ape_found.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_ape_own.png b/main/res/drawable/marker_cache_ape_own.png Binary files differdeleted file mode 100644 index a71690c..0000000 --- a/main/res/drawable/marker_cache_ape_own.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_cito.png b/main/res/drawable/marker_cache_cito.png Binary files differdeleted file mode 100644 index a541a54..0000000 --- a/main/res/drawable/marker_cache_cito.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_cito_disabled.png b/main/res/drawable/marker_cache_cito_disabled.png Binary files differdeleted file mode 100644 index 4c3bedd..0000000 --- a/main/res/drawable/marker_cache_cito_disabled.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_cito_found.png b/main/res/drawable/marker_cache_cito_found.png Binary files differdeleted file mode 100644 index 4f9416b..0000000 --- a/main/res/drawable/marker_cache_cito_found.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_cito_own.png b/main/res/drawable/marker_cache_cito_own.png Binary files differdeleted file mode 100644 index 47124d3..0000000 --- a/main/res/drawable/marker_cache_cito_own.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_earth.png b/main/res/drawable/marker_cache_earth.png Binary files differdeleted file mode 100644 index 95f056a..0000000 --- a/main/res/drawable/marker_cache_earth.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_earth_disabled.png b/main/res/drawable/marker_cache_earth_disabled.png Binary files differdeleted file mode 100644 index a12e72a..0000000 --- a/main/res/drawable/marker_cache_earth_disabled.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_earth_found.png b/main/res/drawable/marker_cache_earth_found.png Binary files differdeleted file mode 100644 index ec6731b..0000000 --- a/main/res/drawable/marker_cache_earth_found.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_earth_own.png b/main/res/drawable/marker_cache_earth_own.png Binary files differdeleted file mode 100644 index 9c6b9a3..0000000 --- a/main/res/drawable/marker_cache_earth_own.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_event.png b/main/res/drawable/marker_cache_event.png Binary files differdeleted file mode 100644 index b273b5e..0000000 --- a/main/res/drawable/marker_cache_event.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_event_disabled.png b/main/res/drawable/marker_cache_event_disabled.png Binary files differdeleted file mode 100644 index c88a2ed..0000000 --- a/main/res/drawable/marker_cache_event_disabled.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_event_found.png b/main/res/drawable/marker_cache_event_found.png Binary files differdeleted file mode 100644 index 2925827..0000000 --- a/main/res/drawable/marker_cache_event_found.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_event_own.png b/main/res/drawable/marker_cache_event_own.png Binary files differdeleted file mode 100644 index 0d6d9e7..0000000 --- a/main/res/drawable/marker_cache_event_own.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_gchq.png b/main/res/drawable/marker_cache_gchq.png Binary files differdeleted file mode 100644 index 01ea439..0000000 --- a/main/res/drawable/marker_cache_gchq.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_gchq_disabled.png b/main/res/drawable/marker_cache_gchq_disabled.png Binary files differdeleted file mode 100644 index 139112c..0000000 --- a/main/res/drawable/marker_cache_gchq_disabled.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_gchq_found.png b/main/res/drawable/marker_cache_gchq_found.png Binary files differdeleted file mode 100644 index ca12c03..0000000 --- a/main/res/drawable/marker_cache_gchq_found.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_gchq_own.png b/main/res/drawable/marker_cache_gchq_own.png Binary files differdeleted file mode 100644 index 3fb647b..0000000 --- a/main/res/drawable/marker_cache_gchq_own.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_letterbox.png b/main/res/drawable/marker_cache_letterbox.png Binary files differdeleted file mode 100644 index 16ac2f4..0000000 --- a/main/res/drawable/marker_cache_letterbox.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_letterbox_disabled.png b/main/res/drawable/marker_cache_letterbox_disabled.png Binary files differdeleted file mode 100644 index a8a668e..0000000 --- a/main/res/drawable/marker_cache_letterbox_disabled.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_letterbox_found.png b/main/res/drawable/marker_cache_letterbox_found.png Binary files differdeleted file mode 100644 index def6ddd..0000000 --- a/main/res/drawable/marker_cache_letterbox_found.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_letterbox_own.png b/main/res/drawable/marker_cache_letterbox_own.png Binary files differdeleted file mode 100644 index 66bcddd..0000000 --- a/main/res/drawable/marker_cache_letterbox_own.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_mega.png b/main/res/drawable/marker_cache_mega.png Binary files differdeleted file mode 100644 index be17934..0000000 --- a/main/res/drawable/marker_cache_mega.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_mega_disabled.png b/main/res/drawable/marker_cache_mega_disabled.png Binary files differdeleted file mode 100644 index efefd18..0000000 --- a/main/res/drawable/marker_cache_mega_disabled.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_mega_found.png b/main/res/drawable/marker_cache_mega_found.png Binary files differdeleted file mode 100644 index 022f393..0000000 --- a/main/res/drawable/marker_cache_mega_found.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_mega_own.png b/main/res/drawable/marker_cache_mega_own.png Binary files differdeleted file mode 100644 index d754d40..0000000 --- a/main/res/drawable/marker_cache_mega_own.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_multi.png b/main/res/drawable/marker_cache_multi.png Binary files differdeleted file mode 100644 index 0d814d1..0000000 --- a/main/res/drawable/marker_cache_multi.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_multi_disabled.png b/main/res/drawable/marker_cache_multi_disabled.png Binary files differdeleted file mode 100644 index 7a2f2c5..0000000 --- a/main/res/drawable/marker_cache_multi_disabled.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_multi_found.png b/main/res/drawable/marker_cache_multi_found.png Binary files differdeleted file mode 100644 index 0a36003..0000000 --- a/main/res/drawable/marker_cache_multi_found.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_multi_own.png b/main/res/drawable/marker_cache_multi_own.png Binary files differdeleted file mode 100644 index 491ef54..0000000 --- a/main/res/drawable/marker_cache_multi_own.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_mystery.png b/main/res/drawable/marker_cache_mystery.png Binary files differdeleted file mode 100644 index 2feaf96..0000000 --- a/main/res/drawable/marker_cache_mystery.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_mystery_disabled.png b/main/res/drawable/marker_cache_mystery_disabled.png Binary files differdeleted file mode 100644 index ea7b9fe..0000000 --- a/main/res/drawable/marker_cache_mystery_disabled.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_mystery_found.png b/main/res/drawable/marker_cache_mystery_found.png Binary files differdeleted file mode 100644 index 1ab1ffc..0000000 --- a/main/res/drawable/marker_cache_mystery_found.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_mystery_own.png b/main/res/drawable/marker_cache_mystery_own.png Binary files differdeleted file mode 100644 index c34e0c5..0000000 --- a/main/res/drawable/marker_cache_mystery_own.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_traditional.png b/main/res/drawable/marker_cache_traditional.png Binary files differdeleted file mode 100644 index 01ea439..0000000 --- a/main/res/drawable/marker_cache_traditional.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_traditional_disabled.png b/main/res/drawable/marker_cache_traditional_disabled.png Binary files differdeleted file mode 100644 index 139112c..0000000 --- a/main/res/drawable/marker_cache_traditional_disabled.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_traditional_found.png b/main/res/drawable/marker_cache_traditional_found.png Binary files differdeleted file mode 100644 index ca12c03..0000000 --- a/main/res/drawable/marker_cache_traditional_found.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_traditional_own.png b/main/res/drawable/marker_cache_traditional_own.png Binary files differdeleted file mode 100644 index 3fb647b..0000000 --- a/main/res/drawable/marker_cache_traditional_own.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_virtual.png b/main/res/drawable/marker_cache_virtual.png Binary files differdeleted file mode 100644 index be75ce6..0000000 --- a/main/res/drawable/marker_cache_virtual.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_virtual_disabled.png b/main/res/drawable/marker_cache_virtual_disabled.png Binary files differdeleted file mode 100644 index 7c933e9..0000000 --- a/main/res/drawable/marker_cache_virtual_disabled.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_virtual_found.png b/main/res/drawable/marker_cache_virtual_found.png Binary files differdeleted file mode 100644 index 69accd6..0000000 --- a/main/res/drawable/marker_cache_virtual_found.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_virtual_own.png b/main/res/drawable/marker_cache_virtual_own.png Binary files differdeleted file mode 100644 index dfaa535..0000000 --- a/main/res/drawable/marker_cache_virtual_own.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_webcam.png b/main/res/drawable/marker_cache_webcam.png Binary files differdeleted file mode 100644 index 212848b..0000000 --- a/main/res/drawable/marker_cache_webcam.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_webcam_disabled.png b/main/res/drawable/marker_cache_webcam_disabled.png Binary files differdeleted file mode 100644 index 341544a..0000000 --- a/main/res/drawable/marker_cache_webcam_disabled.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_webcam_found.png b/main/res/drawable/marker_cache_webcam_found.png Binary files differdeleted file mode 100644 index f08b721..0000000 --- a/main/res/drawable/marker_cache_webcam_found.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_webcam_own.png b/main/res/drawable/marker_cache_webcam_own.png Binary files differdeleted file mode 100644 index c8ba409..0000000 --- a/main/res/drawable/marker_cache_webcam_own.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_wherigo.png b/main/res/drawable/marker_cache_wherigo.png Binary files differdeleted file mode 100644 index e366d65..0000000 --- a/main/res/drawable/marker_cache_wherigo.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_wherigo_disabled.png b/main/res/drawable/marker_cache_wherigo_disabled.png Binary files differdeleted file mode 100644 index 6729b4c..0000000 --- a/main/res/drawable/marker_cache_wherigo_disabled.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_wherigo_found.png b/main/res/drawable/marker_cache_wherigo_found.png Binary files differdeleted file mode 100644 index debd765..0000000 --- a/main/res/drawable/marker_cache_wherigo_found.png +++ /dev/null diff --git a/main/res/drawable/marker_cache_wherigo_own.png b/main/res/drawable/marker_cache_wherigo_own.png Binary files differdeleted file mode 100644 index d50e419..0000000 --- a/main/res/drawable/marker_cache_wherigo_own.png +++ /dev/null diff --git a/main/res/drawable/marker_waypoint_flag.png b/main/res/drawable/marker_waypoint_flag.png Binary files differdeleted file mode 100644 index 8196707..0000000 --- a/main/res/drawable/marker_waypoint_flag.png +++ /dev/null diff --git a/main/res/drawable/marker_waypoint_pkg.png b/main/res/drawable/marker_waypoint_pkg.png Binary files differdeleted file mode 100644 index 71ea97a..0000000 --- a/main/res/drawable/marker_waypoint_pkg.png +++ /dev/null diff --git a/main/res/drawable/marker_waypoint_puzzle.png b/main/res/drawable/marker_waypoint_puzzle.png Binary files differdeleted file mode 100644 index 42d9842..0000000 --- a/main/res/drawable/marker_waypoint_puzzle.png +++ /dev/null diff --git a/main/res/drawable/marker_waypoint_stage.png b/main/res/drawable/marker_waypoint_stage.png Binary files differdeleted file mode 100644 index dae742e..0000000 --- a/main/res/drawable/marker_waypoint_stage.png +++ /dev/null diff --git a/main/res/drawable/marker_waypoint_trailhead.png b/main/res/drawable/marker_waypoint_trailhead.png Binary files differdeleted file mode 100644 index 3db756f..0000000 --- a/main/res/drawable/marker_waypoint_trailhead.png +++ /dev/null diff --git a/main/res/drawable/marker_waypoint_waypoint.png b/main/res/drawable/marker_waypoint_waypoint.png Binary files differdeleted file mode 100644 index 50974d3..0000000 --- a/main/res/drawable/marker_waypoint_waypoint.png +++ /dev/null diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 9611212..0c2bcb4 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -967,6 +967,9 @@ <!-- changelog --> <string name="changelog">\n <b>next release</b>\n + · new: changed markers in the map with additional informations for stored caches:\n + Personal Note available, Modified coordinates, non-reliable coordinates (orange circle)\n + · fix: caches with modified coordinates are displayed at the modified coords and not at the original coords\n · \n \n\n <b>04.01.2012</b>\n diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index 3b55bc9..f3c12cc 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -605,7 +605,7 @@ public class CacheDetailActivity extends AbstractActivity { } else { setTitle(cache.getGeocode().toUpperCase()); } - ((TextView) findViewById(R.id.actionbar_title)).setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(cgBase.getCacheIcon(cache.getType())), null, null, null); + ((TextView) findViewById(R.id.actionbar_title)).setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(cache.getType().markerId), null, null, null); // add available pages (remove old pages first) pageOrder.clear(); diff --git a/main/src/cgeo/geocaching/CacheListAdapter.java b/main/src/cgeo/geocaching/CacheListAdapter.java index 4599e73..e417166 100644 --- a/main/src/cgeo/geocaching/CacheListAdapter.java +++ b/main/src/cgeo/geocaching/CacheListAdapter.java @@ -94,7 +94,7 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> { pixelDensity = metrics.density; for (final CacheType cacheType : CacheType.values()) { - gcIconDrawables.put(cacheType, activity.getResources().getDrawable(cgBase.getCacheIcon(cacheType))); + gcIconDrawables.put(cacheType, activity.getResources().getDrawable(cacheType.markerId)); } if (Settings.isLightSkin()) { diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java index 69a35fe..a1c681e 100644 --- a/main/src/cgeo/geocaching/cgBase.java +++ b/main/src/cgeo/geocaching/cgBase.java @@ -135,8 +135,6 @@ public class cgBase { private static Context context; private static Resources res; - final private static Map<String, Integer> gcIcons = new HashMap<String, Integer>(); - private static final int NB_DOWNLOAD_RETRIES = 4; public static final int UPDATE_LOAD_PROGRESS_DETAIL = 42186; @@ -715,7 +713,7 @@ public class cgBase { final JSONObject extra = dataJSON.getJSONObject("cs"); if (extra != null && extra.length() > 0) { int count = extra.getInt("count"); - // unused, meaning not clearn boolean li = extra.getBoolean("li"); + // unused, meaning not clear boolean li = extra.getBoolean("li"); // expected meaning pm=premium member boolean pm = extra.getBoolean("pm"); if (Settings.isPremiumMember() && !pm) { @@ -1093,6 +1091,7 @@ public class cgBase { final cgWaypoint waypoint = new cgWaypoint(res.getString(R.string.cache_coordinates_original), WaypointType.WAYPOINT); waypoint.setCoords(new Geopoint(originalCoords)); cache.addWaypoint(waypoint); + cache.setUserModifiedCoords(true); } } catch (Geopoint.GeopointException e) { } @@ -2869,122 +2868,6 @@ public class cgBase { return out; } - public static int getCacheIcon(final CacheType cacheType) { - final String type = cacheType.id; - fillIconsMap(); - Integer iconId = gcIcons.get("type_" + type); - if (iconId != null) { - return iconId; - } - // fallback to traditional if some icon type is not correct - return gcIcons.get("type_traditional"); - } - - public static int getCacheMarkerIcon(final CacheType cacheType, final boolean own, final boolean found, final boolean disabled) { - fillIconsMap(); - - int icon = -1; - String iconTxt = null; - - final String type = cacheType != null ? cacheType.id : null; - - if (StringUtils.isNotBlank(type)) { - if (own) { - iconTxt = type + "-own"; - } else if (found) { - iconTxt = type + "-found"; - } else if (disabled) { - iconTxt = type + "-disabled"; - } else { - iconTxt = type; - } - } else { - iconTxt = CacheType.TRADITIONAL.id; - } - - if (gcIcons.containsKey(iconTxt)) { - icon = gcIcons.get(iconTxt); - } else { - icon = gcIcons.get(CacheType.TRADITIONAL.id); - } - - return icon; - } - - private static void fillIconsMap() { - if (gcIcons.isEmpty()) { - gcIcons.put("type_ape", R.drawable.type_ape); - gcIcons.put("type_cito", R.drawable.type_cito); - gcIcons.put("type_earth", R.drawable.type_earth); - gcIcons.put("type_event", R.drawable.type_event); - gcIcons.put("type_letterbox", R.drawable.type_letterbox); - gcIcons.put("type_mega", R.drawable.type_mega); - gcIcons.put("type_multi", R.drawable.type_multi); - gcIcons.put("type_traditional", R.drawable.type_traditional); - gcIcons.put("type_virtual", R.drawable.type_virtual); - gcIcons.put("type_webcam", R.drawable.type_webcam); - gcIcons.put("type_wherigo", R.drawable.type_wherigo); - gcIcons.put("type_mystery", R.drawable.type_mystery); - gcIcons.put("type_gchq", R.drawable.type_hq); - // default markers - gcIcons.put(CacheType.PROJECT_APE.id, R.drawable.marker_cache_ape); - gcIcons.put(CacheType.CITO.id, R.drawable.marker_cache_cito); - gcIcons.put(CacheType.EARTH.id, R.drawable.marker_cache_earth); - gcIcons.put(CacheType.EVENT.id, R.drawable.marker_cache_event); - gcIcons.put(CacheType.LETTERBOX.id, R.drawable.marker_cache_letterbox); - gcIcons.put(CacheType.MEGA_EVENT.id, R.drawable.marker_cache_mega); - gcIcons.put(CacheType.MULTI.id, R.drawable.marker_cache_multi); - gcIcons.put(CacheType.TRADITIONAL.id, R.drawable.marker_cache_traditional); - gcIcons.put(CacheType.VIRTUAL.id, R.drawable.marker_cache_virtual); - gcIcons.put(CacheType.WEBCAM.id, R.drawable.marker_cache_webcam); - gcIcons.put(CacheType.WHERIGO.id, R.drawable.marker_cache_wherigo); - gcIcons.put(CacheType.MYSTERY.id, R.drawable.marker_cache_mystery); - gcIcons.put(CacheType.GCHQ.id, R.drawable.marker_cache_gchq); - // own cache markers - gcIcons.put("ape-own", R.drawable.marker_cache_ape_own); - gcIcons.put("cito-own", R.drawable.marker_cache_cito_own); - gcIcons.put("earth-own", R.drawable.marker_cache_earth_own); - gcIcons.put("event-own", R.drawable.marker_cache_event_own); - gcIcons.put("letterbox-own", R.drawable.marker_cache_letterbox_own); - gcIcons.put("mega-own", R.drawable.marker_cache_mega_own); - gcIcons.put("multi-own", R.drawable.marker_cache_multi_own); - gcIcons.put("traditional-own", R.drawable.marker_cache_traditional_own); - gcIcons.put("virtual-own", R.drawable.marker_cache_virtual_own); - gcIcons.put("webcam-own", R.drawable.marker_cache_webcam_own); - gcIcons.put("wherigo-own", R.drawable.marker_cache_wherigo_own); - gcIcons.put("mystery-own", R.drawable.marker_cache_mystery_own); - gcIcons.put("gchq-own", R.drawable.marker_cache_gchq_own); - // found cache markers - gcIcons.put("ape-found", R.drawable.marker_cache_ape_found); - gcIcons.put("cito-found", R.drawable.marker_cache_cito_found); - gcIcons.put("earth-found", R.drawable.marker_cache_earth_found); - gcIcons.put("event-found", R.drawable.marker_cache_event_found); - gcIcons.put("letterbox-found", R.drawable.marker_cache_letterbox_found); - gcIcons.put("mega-found", R.drawable.marker_cache_mega_found); - gcIcons.put("multi-found", R.drawable.marker_cache_multi_found); - gcIcons.put("traditional-found", R.drawable.marker_cache_traditional_found); - gcIcons.put("virtual-found", R.drawable.marker_cache_virtual_found); - gcIcons.put("webcam-found", R.drawable.marker_cache_webcam_found); - gcIcons.put("wherigo-found", R.drawable.marker_cache_wherigo_found); - gcIcons.put("mystery-found", R.drawable.marker_cache_mystery_found); - gcIcons.put("gchq-found", R.drawable.marker_cache_gchq_found); - // disabled cache markers - gcIcons.put("ape-disabled", R.drawable.marker_cache_ape_disabled); - gcIcons.put("cito-disabled", R.drawable.marker_cache_cito_disabled); - gcIcons.put("earth-disabled", R.drawable.marker_cache_earth_disabled); - gcIcons.put("event-disabled", R.drawable.marker_cache_event_disabled); - gcIcons.put("letterbox-disabled", R.drawable.marker_cache_letterbox_disabled); - gcIcons.put("mega-disabled", R.drawable.marker_cache_mega_disabled); - gcIcons.put("multi-disabled", R.drawable.marker_cache_multi_disabled); - gcIcons.put("traditional-disabled", R.drawable.marker_cache_traditional_disabled); - gcIcons.put("virtual-disabled", R.drawable.marker_cache_virtual_disabled); - gcIcons.put("webcam-disabled", R.drawable.marker_cache_webcam_disabled); - gcIcons.put("wherigo-disabled", R.drawable.marker_cache_wherigo_disabled); - gcIcons.put("mystery-disabled", R.drawable.marker_cache_mystery_disabled); - gcIcons.put("gchq-disabled", R.drawable.marker_cache_gchq_disabled); - } - } - public static boolean runNavigation(Activity activity, Resources res, Settings settings, final Geopoint coords) { return runNavigation(activity, res, settings, coords, null); } diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java index 220f2fa..fe15c41 100644 --- a/main/src/cgeo/geocaching/cgCache.java +++ b/main/src/cgeo/geocaching/cgCache.java @@ -55,7 +55,7 @@ public class cgCache implements ICache { private String ownerReal = ""; private Date hidden = null; private String hint = ""; - private CacheSize size = null; + private CacheSize size = CacheSize.UNKNOWN; private float difficulty = 0; private float terrain = 0; private Float direction = null; @@ -87,6 +87,7 @@ public class cgCache implements ICache { private List<cgTrackable> inventory = null; private Map<LogType, Integer> logCounts = new HashMap<LogType, Integer>(); private boolean logOffline = false; + private boolean userModifiedCoords = false; // temporary values private boolean statusChecked = false; private boolean statusCheckedView = false; @@ -166,7 +167,7 @@ public class cgCache implements ICache { if (StringUtils.isBlank(hint)) { hint = other.hint; } - if (size == null) { + if (size == null || CacheSize.UNKNOWN == size) { size = other.size; } if (difficulty == 0) { @@ -240,6 +241,12 @@ public class cgCache implements ICache { if (logCounts.size() == 0) { logCounts = other.logCounts; } + if (userModifiedCoords == false) { + userModifiedCoords = other.userModifiedCoords; + } + if (reliableLatLon == false) { + reliableLatLon = other.reliableLatLon; + } return isEqualTo(other); } @@ -1082,6 +1089,14 @@ public class cgCache implements ICache { return CollectionUtils.isNotEmpty(waypoints); } + public boolean hasUserModifiedCoords() { + return userModifiedCoords; + } + + public void setUserModifiedCoords(boolean coordsChanged) { + this.userModifiedCoords = coordsChanged; + } + /** * @param index * @return <code>true</code>, if the waypoint was duplicated diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java index f6039c1..455b225 100644 --- a/main/src/cgeo/geocaching/cgData.java +++ b/main/src/cgeo/geocaching/cgData.java @@ -1304,6 +1304,7 @@ public class cgData { values.put("favourite", cache.isFavorite() ? 1 : 0); values.put("inventoryunknown", cache.getInventoryItems()); values.put("onWatchlist", cache.isOnWatchlist() ? 1 : 0); + values.put("coordsChanged", cache.hasUserModifiedCoords() ? 1 : 0); boolean statusOk = true; @@ -2059,7 +2060,7 @@ public class cgData { local_cci[34] = cursor.getColumnIndex("inventoryunknown"); local_cci[35] = cursor.getColumnIndex("onWatchlist"); local_cci[36] = cursor.getColumnIndex("reliable_latlon"); - // local_cci[37] = cursor.getColumnIndex("coordsChanged"); + local_cci[37] = cursor.getColumnIndex("coordsChanged"); local_cci[38] = cursor.getColumnIndex("latitude"); local_cci[39] = cursor.getColumnIndex("longitude"); cacheColumnIndex = local_cci; @@ -2122,7 +2123,7 @@ public class cgData { cache.setInventoryItems(cursor.getInt(cacheColumnIndex[34])); cache.setOnWatchlist(cursor.getInt(cacheColumnIndex[35]) == 1); cache.setReliableLatLon(cursor.getInt(cacheColumnIndex[36]) > 0); - //cache.setCoordsChanged(cursor.getInt(cacheColumnIndex[37]) > 0); + cache.setUserModifiedCoords(cursor.getInt(cacheColumnIndex[37]) > 0); return cache; } diff --git a/main/src/cgeo/geocaching/cgWaypoint.java b/main/src/cgeo/geocaching/cgWaypoint.java index 4bad2ce..ed0e038 100644 --- a/main/src/cgeo/geocaching/cgWaypoint.java +++ b/main/src/cgeo/geocaching/cgWaypoint.java @@ -47,7 +47,7 @@ public class cgWaypoint implements IWaypoint, Comparable<cgWaypoint> { } public void setIcon(final Resources res, final TextView nameView) { - nameView.setCompoundDrawablesWithIntrinsicBounds(res.getDrawable(waypointType.drawableId), null, null, null); + nameView.setCompoundDrawablesWithIntrinsicBounds(res.getDrawable(waypointType.markerId), null, null, null); } public void merge(final cgWaypoint old) { diff --git a/main/src/cgeo/geocaching/cgeopopup.java b/main/src/cgeo/geocaching/cgeopopup.java index d207ab7..bdc3d1b 100644 --- a/main/src/cgeo/geocaching/cgeopopup.java +++ b/main/src/cgeo/geocaching/cgeopopup.java @@ -232,7 +232,7 @@ public class cgeopopup extends AbstractActivity { detailsList.removeAllViews(); // actionbar icon - ((TextView) findViewById(R.id.actionbar_title)).setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(cgBase.getCacheIcon(cache.getType())), null, null, null); + ((TextView) findViewById(R.id.actionbar_title)).setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(cache.getType().markerId), null, null, null); // cache type itemLayout = (RelativeLayout) inflater.inflate(R.layout.cache_item, null); diff --git a/main/src/cgeo/geocaching/enumerations/CacheType.java b/main/src/cgeo/geocaching/enumerations/CacheType.java index acad3a7..ca4e999 100644 --- a/main/src/cgeo/geocaching/enumerations/CacheType.java +++ b/main/src/cgeo/geocaching/enumerations/CacheType.java @@ -13,37 +13,40 @@ import java.util.Map; * @author koem */ public enum CacheType { - TRADITIONAL("traditional", "traditional cache", "32bc9333-5e52-4957-b0f6-5a2c8fc7b257", R.string.traditional), - MULTI("multi", "multi-cache", "a5f6d0ad-d2f2-4011-8c14-940a9ebf3c74", R.string.multi), - MYSTERY("mystery", "unknown cache", "40861821-1835-4e11-b666-8d41064d03fe", R.string.mystery), - LETTERBOX("letterbox", "letterbox hybrid", "4bdd8fb2-d7bc-453f-a9c5-968563b15d24", R.string.letterbox), - EVENT("event", "event cache", "69eb8534-b718-4b35-ae3c-a856a55b0874", R.string.event), - MEGA_EVENT("mega", "mega-event cache", "69eb8535-b718-4b35-ae3c-a856a55b0874", R.string.mega), - EARTH("earth", "earthcache", "c66f5cf3-9523-4549-b8dd-759cd2f18db8", R.string.earth), - CITO("cito", "cache in trash out event", "57150806-bc1a-42d6-9cf0-538d171a2d22", R.string.cito), - WEBCAM("webcam", "webcam cache", "31d2ae3c-c358-4b5f-8dcd-2185bf472d3d", R.string.webcam), - VIRTUAL("virtual", "virtual cache", "294d4360-ac86-4c83-84dd-8113ef678d7e", R.string.virtual), - WHERIGO("wherigo", "wherigo cache", "0544fa55-772d-4e5c-96a9-36a51ebcf5c9", R.string.wherigo), - LOSTANDFOUND("lostfound", "lost & found", "3ea6533d-bb52-42fe-b2d2-79a3424d4728", R.string.lostfound), - PROJECT_APE("ape", "project ape cache", "2555690d-b2bc-4b55-b5ac-0cb704c0b768", R.string.ape), - GCHQ("gchq", "groundspeak hq", "416f2494-dc17-4b6a-9bab-1a29dd292d8c", R.string.gchq), - GPS_EXHIBIT("gps", "gps cache exhibit", "72e69af2-7986-4990-afd9-bc16cbbb4ce3", R.string.gps), - UNKNOWN("unknown", "unknown", "", R.string.unknown), + + TRADITIONAL("traditional", "traditional cache", "32bc9333-5e52-4957-b0f6-5a2c8fc7b257", R.string.traditional, R.drawable.type_traditional), + MULTI("multi", "multi-cache", "a5f6d0ad-d2f2-4011-8c14-940a9ebf3c74", R.string.multi, R.drawable.type_multi), + MYSTERY("mystery", "unknown cache", "40861821-1835-4e11-b666-8d41064d03fe", R.string.mystery, R.drawable.type_mystery), + LETTERBOX("letterbox", "letterbox hybrid", "4bdd8fb2-d7bc-453f-a9c5-968563b15d24", R.string.letterbox, R.drawable.type_letterbox), + EVENT("event", "event cache", "69eb8534-b718-4b35-ae3c-a856a55b0874", R.string.event, R.drawable.type_event), + MEGA_EVENT("mega", "mega-event cache", "69eb8535-b718-4b35-ae3c-a856a55b0874", R.string.mega, R.drawable.type_mega), + EARTH("earth", "earthcache", "c66f5cf3-9523-4549-b8dd-759cd2f18db8", R.string.earth, R.drawable.type_earth), + CITO("cito", "cache in trash out event", "57150806-bc1a-42d6-9cf0-538d171a2d22", R.string.cito, R.drawable.type_cito), + WEBCAM("webcam", "webcam cache", "31d2ae3c-c358-4b5f-8dcd-2185bf472d3d", R.string.webcam, R.drawable.type_webcam), + VIRTUAL("virtual", "virtual cache", "294d4360-ac86-4c83-84dd-8113ef678d7e", R.string.virtual, R.drawable.type_virtual), + WHERIGO("wherigo", "wherigo cache", "0544fa55-772d-4e5c-96a9-36a51ebcf5c9", R.string.wherigo, R.drawable.type_wherigo), + LOSTANDFOUND("lostfound", "lost & found", "3ea6533d-bb52-42fe-b2d2-79a3424d4728", R.string.lostfound, R.drawable.type_event), // icon missing + 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 /** No real cache type -> filter */ - ALL("all", "display all caches", "9a79e6ce-3344-409c-bbe9-496530baf758", R.string.all_types); + ALL("all", "display all caches", "9a79e6ce-3344-409c-bbe9-496530baf758", R.string.all_types, R.drawable.type_mystery); public final String id; public final String pattern; public final String guid; private final int stringId; private String l10n; // not final because the locale can be changed + public final int markerId; - private CacheType(String id, String pattern, String guid, int stringId) { + private CacheType(String id, String pattern, String guid, int stringId, int markerId) { this.id = id; this.pattern = pattern; this.guid = guid; this.stringId = stringId; setL10n(); + this.markerId = markerId; } private final static Map<String, CacheType> FIND_BY_ID; diff --git a/main/src/cgeo/geocaching/enumerations/WaypointType.java b/main/src/cgeo/geocaching/enumerations/WaypointType.java index 9fd783d..4a76723 100644 --- a/main/src/cgeo/geocaching/enumerations/WaypointType.java +++ b/main/src/cgeo/geocaching/enumerations/WaypointType.java @@ -12,23 +12,21 @@ import java.util.Map; * @author koem */ public enum WaypointType { - FINAL("flag", R.string.wp_final, R.drawable.waypoint_flag, R.drawable.marker_waypoint_flag), - OWN("own", R.string.wp_waypoint, R.drawable.waypoint_waypoint, R.drawable.marker_waypoint_waypoint), - PARKING("pkg", R.string.wp_pkg, R.drawable.waypoint_pkg, R.drawable.marker_waypoint_pkg), - PUZZLE("puzzle", R.string.wp_puzzle, R.drawable.waypoint_puzzle, R.drawable.marker_waypoint_puzzle), - STAGE("stage", R.string.wp_stage, R.drawable.waypoint_stage, R.drawable.marker_waypoint_stage), - TRAILHEAD("trailhead", R.string.wp_trailhead, R.drawable.waypoint_trailhead, R.drawable.marker_waypoint_trailhead), - WAYPOINT("waypoint", R.string.wp_waypoint, R.drawable.waypoint_waypoint, R.drawable.marker_waypoint_waypoint); + FINAL("flag", R.string.wp_final, R.drawable.waypoint_flag), + OWN("own", R.string.wp_waypoint, R.drawable.waypoint_waypoint), + PARKING("pkg", R.string.wp_pkg, R.drawable.waypoint_pkg), + PUZZLE("puzzle", R.string.wp_puzzle, R.drawable.waypoint_puzzle), + STAGE("stage", R.string.wp_stage, R.drawable.waypoint_stage), + TRAILHEAD("trailhead", R.string.wp_trailhead, R.drawable.waypoint_trailhead), + WAYPOINT("waypoint", R.string.wp_waypoint, R.drawable.waypoint_waypoint); public final String id; public final int stringId; - public final int drawableId; public final int markerId; - private WaypointType(String id, int stringId, int drawableId, int markerId) { + private WaypointType(String id, int stringId, int markerId) { this.id = id; this.stringId = stringId; - this.drawableId = drawableId; this.markerId = markerId; } diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index 2fa4ea9..3ba8d90 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -33,6 +33,7 @@ import cgeo.geocaching.utils.CancellableHandler; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.HashCodeBuilder; import android.app.Activity; import android.app.ProgressDialog; @@ -41,6 +42,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.res.Resources; import android.graphics.drawable.Drawable; +import android.graphics.drawable.LayerDrawable; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -143,8 +145,15 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory private ScaleOverlay overlayScale = null; private PositionOverlay overlayPosition = null; // data for overlays + private static final int[][] INSET_RELIABLE = { { 0, 0, 0, 0 }, { 0, 0, 0, 0 } }; // center, 33x40 / 45x51 + private static final int[][] INSET_TYPE = { { 5, 8, 6, 10 }, { 4, 7, 5, 8 } }; // center, 22x22 / 36x36 + private static final int[][] INSET_OWN = { { 21, 0, 0, 26 }, { 25, 0, 0, 35 } }; // top right, 12x12 / 16x16 + private static final int[][] INSET_FOUND = { { 0, 0, 21, 28 }, { 0, 0, 25, 35 } }; // top left, 12x12 / 16x16 + private static final int[][] INSET_USERMODIFIEDCOORDS = { { 21, 28, 0, 0 }, { 19, 25, 0, 0 } }; // bottom right, 12x12 / 26x26 + private static final int[][] INSET_PERSONALNOTE = { { 0, 28, 21, 0 }, { 0, 25, 19, 0 } }; // bottom left, 12x12 / 26x26 + + private static Map<Integer, LayerDrawable> overlaysCache = new HashMap<Integer, LayerDrawable>(); private int cachesCnt = 0; - private Map<Integer, Drawable> iconsCache = new HashMap<Integer, Drawable>(); /** List of caches in the viewport */ private List<cgCache> caches = new ArrayList<cgCache>(); /** List of users in the viewport */ @@ -1352,10 +1361,10 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory continue; } - items.add(getWaypointItem(new cgCoord(oneWaypoint), oneWaypoint.getWaypointType())); + items.add(getItem(new cgCoord(oneWaypoint), null, oneWaypoint)); } } - items.add(getCacheItem(new cgCoord(cacheOne), cacheOne.getType(), cacheOne.isOwn(), cacheOne.isFound(), cacheOne.isDisabled())); + items.add(getItem(new cgCoord(cacheOne), cacheOne, null)); } overlayCaches.updateItems(items); @@ -1382,66 +1391,6 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory working = false; } } - - /** - * Returns a OverlayItem representing the cache - * - * @param cgCoord - * The coords - * @param type - * String name - * @param own - * true for own caches - * @param found - * true for found - * @param disabled - * true for disabled - * @return - */ - private CachesOverlayItemImpl getCacheItem(final cgCoord cgCoord, final CacheType type, final boolean own, final boolean found, final boolean disabled) { - return getItem(cgCoord, cgBase.getCacheMarkerIcon(type, own, found, disabled), type); - } - - /** - * Returns a OverlayItem representing the waypoint - * - * @param cgCoord - * The coords - * @param type - * The waypoint's type - * @return - */ - private CachesOverlayItemImpl getWaypointItem(cgCoord cgCoord, WaypointType type) { - return getItem(cgCoord, type != null ? type.markerId : WaypointType.WAYPOINT.markerId, null); - } - - /** - * Returns a OverlayItem represented by an icon - * - * @param cgCoord - * The coords - * @param icon - * The icon - * @param cacheType - * cacheType, this will influence the style of the circles drawn around it - * @return - */ - private CachesOverlayItemImpl getItem(cgCoord cgCoord, int icon, final CacheType cacheType) { - coordinates.add(cgCoord); - CachesOverlayItemImpl item = mapProvider.getCachesOverlayItem(cgCoord, cacheType); - - Drawable pin = null; - if (iconsCache.containsKey(icon)) { - pin = iconsCache.get(icon); - } else { - pin = getResources().getDrawable(icon); - pin.setBounds(0, 0, pin.getIntrinsicWidth(), pin.getIntrinsicHeight()); - iconsCache.put(icon, pin); - } - item.setMarker(pin); - - return item; - } } /** @@ -1559,27 +1508,9 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory coord.setCoords(coordsIntent); coord.setName("some place"); - coordinates.add(coord); - final CachesOverlayItemImpl item = mapProvider.getCachesOverlayItem(coord, null); - - final int icon; - if (waypointTypeIntent != null) { - icon = waypointTypeIntent.markerId; - } - else { - icon = WaypointType.WAYPOINT.markerId; - } - - Drawable pin = null; - if (iconsCache.containsKey(icon)) { - pin = iconsCache.get(icon); - } else { - pin = getResources().getDrawable(icon); - pin.setBounds(0, 0, pin.getIntrinsicWidth(), pin.getIntrinsicHeight()); - iconsCache.put(icon, pin); - } - item.setMarker(pin); + final cgWaypoint waypoint = new cgWaypoint("some place", waypointTypeIntent != null ? waypointTypeIntent : WaypointType.WAYPOINT); + final CachesOverlayItemImpl item = getItem(coord, null, waypoint); overlayCaches.updateItems(item); displayHandler.sendEmptyMessage(INVALIDATE_MAP); @@ -1893,4 +1824,113 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory mapIntent.putExtra(EXTRAS_MAP_TITLE, geocode); fromActivity.startActivity(mapIntent); } + + /** + * Returns a OverlayItem represented by an icon + * + * @param coord + * The coords + * @param cache + * Cache + * @param waypoint + * Waypoint. Mutally exclusive with cache + * @return + */ + private CachesOverlayItemImpl getItem(cgCoord coord, cgCache cache, cgWaypoint waypoint) { + coordinates.add(coord); + + if (cache != null) { + + CachesOverlayItemImpl item = mapProvider.getCachesOverlayItem(coord, cache.getType()); + + int hashcode = new HashCodeBuilder() + .append(cache.isReliableLatLon()) + .append(cache.getType().id) + .append(cache.isDisabled()) + .append(cache.isOwn()) + .append(cache.isFound()) + .append(cache.hasUserModifiedCoords()) + .append(cache.getPersonalNote()) + .toHashCode(); + + LayerDrawable ldFromCache = CGeoMap.overlaysCache.get(hashcode); + if (ldFromCache != null) { + item.setMarker(ldFromCache); + return item; + } + + ArrayList<Drawable> layers = new ArrayList<Drawable>(); + ArrayList<int[]> insets = new ArrayList<int[]>(); + + + // background: disabled or not + Drawable marker = getResources().getDrawable(R.drawable.marker); + if (cache.isDisabled()) { + marker = getResources().getDrawable(R.drawable.marker_disabled); + } + layers.add(marker); + int resolution = marker.getIntrinsicWidth() > 40 ? 1 : 0; + // reliable or not + if (!cache.isReliableLatLon()) { + insets.add(INSET_RELIABLE[resolution]); + layers.add(getResources().getDrawable(R.drawable.marker_notreliable)); + } + // cache type + layers.add(getResources().getDrawable(cache.getType().markerId)); + insets.add(INSET_TYPE[resolution]); + // own + if ( cache.isOwn() ) { + layers.add(getResources().getDrawable(R.drawable.marker_own)); + insets.add(INSET_OWN[resolution]); + } + // found + if (cache.isFound()) { + layers.add(getResources().getDrawable(R.drawable.marker_found)); + insets.add(INSET_FOUND[resolution]); + } + // user modified coords + if (cache.hasUserModifiedCoords()) { + layers.add(getResources().getDrawable(R.drawable.marker_usermodifiedcoords)); + insets.add(INSET_USERMODIFIEDCOORDS[resolution]); + } + // personal note + if (cache.getPersonalNote() != null) { + layers.add(getResources().getDrawable(R.drawable.marker_personalnote)); + insets.add(INSET_PERSONALNOTE[resolution]); + } + + + LayerDrawable ld = new LayerDrawable(layers.toArray(new Drawable[layers.size()])); + + int index = 1; + for ( int[] inset : insets) { + ld.setLayerInset(index++, inset[0], inset[1], inset[2], inset[3]); + } + + CGeoMap.overlaysCache.put(hashcode, ld); + + item.setMarker(ld); + return item; + + } else if (waypoint != null) { + + CachesOverlayItemImpl item = mapProvider.getCachesOverlayItem(coord, null); + Drawable[] layers = new Drawable[2]; + layers[0] = getResources().getDrawable(R.drawable.marker); + layers[1] = getResources().getDrawable(waypoint.getWaypointType().markerId); + + LayerDrawable ld = new LayerDrawable(layers); + if (layers[0].getIntrinsicWidth() > 40) { + ld.setLayerInset(1, 9, 12, 10, 13); + } else { + ld.setLayerInset(1, 9, 12, 8, 12); + } + item.setMarker(ld); + return item; + } + + return null; + + } + } diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java index 55d66ec..a630b17 100644 --- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java +++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java @@ -194,8 +194,6 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> { public static void testSearchByViewport() { GC2JVEH cache = new GC2JVEH(); - assertEquals(StatusCode.NO_ERROR, cgBase.login()); - final String token = cgBase.getMapUserToken(new Handler()); final Viewport viewport = new Viewport(cache.getCoords(), 0.003, 0.003); final ParseResult search = cgBase.searchByViewport(token, viewport); |
