Merge pull request #1252 from RoadRunner-/wpnav

Add quick access to default navigation to waypoints in waypoint list in cache details view

1 files changed, 16 insertions, 1 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index d29ed9b..4649477 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -2386,7 +2386,7 @@ public class CacheDetailActivity extends AbstractActivity {
                 List<cgWaypoint> sortedWaypoints = new ArrayList<cgWaypoint>(cache.getWaypoints());
                 Collections.sort(sortedWaypoints);
 
-                for (cgWaypoint wpt : sortedWaypoints) {
+                for (final cgWaypoint wpt : sortedWaypoints) {
                     waypointView = (LinearLayout) getLayoutInflater().inflate(R.layout.waypoint_item, null);
 
                     // coordinates
@@ -2440,6 +2440,21 @@ public class CacheDetailActivity extends AbstractActivity {
                         }
                     }
 
+                    View wpNavView = waypointView.findViewById(R.id.wpDefaultNavigation);
+                    wpNavView.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            NavigationAppFactory.startDefaultNavigationApplication(geolocation, CacheDetailActivity.this, null, wpt, null);
+                        }
+                    });
+                    wpNavView.setOnLongClickListener(new View.OnLongClickListener() {
+                        @Override
+                        public boolean onLongClick(View v) {
+                            NavigationAppFactory.startDefaultNavigationApplication2(geolocation, CacheDetailActivity.this, null, wpt, null);
+                            return true;
+                        }
+                    });
+
                     registerForContextMenu(waypointView);
                     waypointView.setOnClickListener(new WaypointInfoClickListener());