1 files changed, 13 insertions, 15 deletions
diff --git a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
index 0a750e0..39531f1 100644
--- a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
+++ b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
@@ -4,7 +4,7 @@ import butterknife.ButterKnife;
 import butterknife.InjectView;
 import butterknife.Optional;
 
-import cgeo.geocaching.activity.AbstractActivity;
+import cgeo.geocaching.activity.AbstractActionBarActivity;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
 import cgeo.geocaching.geopoint.DistanceParser;
 import cgeo.geocaching.geopoint.Geopoint;
@@ -44,7 +44,7 @@ import android.widget.TextView;
 
 import java.util.List;
 
-public class NavigateAnyPointActivity extends AbstractActivity {
+public class NavigateAnyPointActivity extends AbstractActionBarActivity implements CoordinatesInputDialog.CoordinateUpdate {
 
     @InjectView(R.id.historyList) protected ListView historyListView;
 
@@ -278,18 +278,17 @@ public class NavigateAnyPointActivity extends AbstractActivity {
             if (latButton.getText().length() > 0 && lonButton.getText().length() > 0) {
                 gp = new Geopoint(latButton.getText().toString() + " " + lonButton.getText().toString());
             }
-            CoordinatesInputDialog coordsDialog = new CoordinatesInputDialog(NavigateAnyPointActivity.this, null, gp, app.currentGeo());
+            CoordinatesInputDialog coordsDialog = CoordinatesInputDialog.getInstance(null, gp, app.currentGeo());
             coordsDialog.setCancelable(true);
-            coordsDialog.setOnCoordinateUpdate(new CoordinatesInputDialog.CoordinateUpdate() {
-                @Override
-                public void update(Geopoint gp) {
-                    latButton.setText(gp.format(GeopointFormatter.Format.LAT_DECMINUTE));
-                    lonButton.setText(gp.format(GeopointFormatter.Format.LON_DECMINUTE));
-                    changed = true;
-                }
-            });
-            coordsDialog.show();
+            coordsDialog.show(getSupportFragmentManager(),"wpedit_dialog");
         }
+
+    }
+    @Override
+    public void updateCoordinates(Geopoint gp) {
+        latButton.setText(gp.format(GeopointFormatter.Format.LAT_DECMINUTE));
+        lonButton.setText(gp.format(GeopointFormatter.Format.LON_DECMINUTE));
+        changed = true;
     }
 
     private static class ChangeDistanceUnit implements OnItemSelectedListener {
@@ -328,7 +327,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
             menu.findItem(R.id.menu_default_navigation).setVisible(visible);
             menu.findItem(R.id.menu_caches_around).setVisible(visible);
 
-            menu.findItem(R.id.menu_clear_history).setEnabled(!getHistoryOfSearchedLocations().isEmpty());
+            menu.findItem(R.id.menu_clear_history).setVisible(!getHistoryOfSearchedLocations().isEmpty());
         } catch (RuntimeException e) {
             // nothing
         }
@@ -362,9 +361,8 @@ public class NavigateAnyPointActivity extends AbstractActivity {
             case R.id.menu_navigate:
                 NavigationAppFactory.showNavigationMenu(this, null, null, coords);
                 return true;
-            default:
-                return false;
         }
+        return super.onOptionsItemSelected(item);
     }
 
     private void addToHistory(final Geopoint coords) {