diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 3cce6bdbdb..d9115c377e 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -114,7 +114,8 @@
-
+
+
diff --git a/OsmAnd/res/layout/route_point_info.xml b/OsmAnd/res/layout/route_point_info.xml
new file mode 100644
index 0000000000..82f7446a92
--- /dev/null
+++ b/OsmAnd/res/layout/route_point_info.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/route_steps_main.xml b/OsmAnd/res/layout/route_steps_main.xml
new file mode 100644
index 0000000000..c75202ca3a
--- /dev/null
+++ b/OsmAnd/res/layout/route_steps_main.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/menu/route_step_menu.xml b/OsmAnd/res/menu/route_step_menu.xml
new file mode 100644
index 0000000000..d4fad37613
--- /dev/null
+++ b/OsmAnd/res/menu/route_step_menu.xml
@@ -0,0 +1,13 @@
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 3110677bfe..0af3c8388f 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -877,6 +877,8 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
Right panel:
Left panel:
Parking
+ Route steps
+ All route points
GPX recording
Speed
Destination
@@ -1874,4 +1876,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
Play sound on photo shot
Choose whether to play a sound when shooting photos
Invalid format: %s
+ Mark as next
+ Show on map
diff --git a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
index 2a65f6b05b..8f8bde4a75 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
@@ -85,8 +85,9 @@ public abstract class OsmandPlugin {
installedPlugins.add(parking);
}
- final RouteStepsPlugin routeSteps = new RouteStepsPlugin(app);
- installPlugin(ROUTE_STEPS_PLUGIN_COMPONENT, RouteStepsPlugin.ID, app, routeSteps);
+ //final RouteStepsPlugin routeSteps = new RouteStepsPlugin(app);
+ //installPlugin(ROUTE_STEPS_PLUGIN_COMPONENT, RouteStepsPlugin.ID, app, routeSteps);
+ installedPlugins.add(new RouteStepsPlugin(app));
installPlugin(OSMODROID_PLUGIN_COMPONENT, OsMoDroidPlugin.ID, app, new OsMoDroidPlugin(app));
installedPlugins.add(new OsmEditingPlugin(app));
diff --git a/OsmAnd/src/net/osmand/plus/routesteps/RouteStepsActivity.java b/OsmAnd/src/net/osmand/plus/routesteps/RouteStepsActivity.java
new file mode 100644
index 0000000000..d770857279
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/routesteps/RouteStepsActivity.java
@@ -0,0 +1,363 @@
+package net.osmand.plus.routesteps;
+
+import alice.tuprolog.Int;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.text.format.DateFormat;
+import android.util.Log;
+import android.view.*;
+import android.widget.*;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import net.osmand.CallbackWithObject;
+import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.helpers.GpxUiHelper;
+import net.osmand.plus.views.ContextMenuLayer;
+
+import java.io.File;
+import java.util.*;
+
+/**
+ * Created by Bars on 13.06.2014.
+ */
+public class RouteStepsActivity extends SherlockFragmentActivity {
+
+ private static final String VISITED_KEY = "IsVisited";
+ private static final String POINT_KEY = "Point";
+ private static final String CURRENT_ROUTE_KEY = "CurrentRoute";
+
+ private File file;
+ private GPXUtilities.GPXFile gpx;
+ private OsmandApplication app;
+
+ private GPXUtilities.Route currentRoute;
+ private List pointsList;
+
+ private List pointsStatus;
+ //saves indexed of sorted list
+ private List pointsIndex;
+ //needed to save user selection
+ private List pointsChangedState;
+ private List pointsStartState;
+
+ private RouteStepsPlugin plugin;
+
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.setContentView(R.layout.route_steps_main);
+ this.app = (OsmandApplication) getApplication();
+ getPlugin();
+ getGpx();
+
+ if (gpx != null){
+ preparePoints();
+ }
+
+ Button done = (Button) findViewById(R.id.done);
+ done.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ saveStatus();
+ }
+ });
+
+ super.onCreate(savedInstanceState);
+ }
+
+
+ private void getPlugin(){
+ List plugins = OsmandPlugin.getEnabledPlugins();
+ for (OsmandPlugin plugin: plugins){
+ if (plugin instanceof RouteStepsPlugin){
+ this.plugin = (RouteStepsPlugin) plugin;
+ }
+ }
+
+ }
+
+ private void getGpx(){
+ if (plugin.getGpx() != null){
+ this.gpx = plugin.getGpx();
+ } else {
+ GpxUiHelper.selectGPXFile(this,false,false, new CallbackWithObject() {
+ @Override
+ public boolean processResult(GPXUtilities.GPXFile[] result) {
+ gpx = result[0];
+ preparePoints();
+ plugin.setGpx(gpx);
+ return false;
+ }
+ });
+ }
+ }
+
+ private void preparePoints(){
+ loadCurrentRoute();
+ pointsList = currentRoute.points;
+ sortPoints();
+ pointsStatus = getAllPointsStatus();
+ pointsStartState = getPointsState();
+ pointsChangedState = new ArrayList(pointsStartState);
+ displayListView();
+ }
+
+ private void displayListView() {
+ ArrayList pointItemsList = new ArrayList();
+ for (int i = 0; i < pointsList.size(); i++) {
+ String pointName = pointsList.get(i).name;
+ if (pointsStatus.get(i) != 0) {
+ String dateString= DateFormat.format("MM/dd/yyyy", new Date(pointsStatus.get(i))).toString();
+ pointItemsList.add(new PointItem(true, pointName, dateString));
+ } else {
+ pointItemsList.add(new PointItem(false, pointName, ""));
+ }
+ }
+
+ PointItemAdapter adapter = new PointItemAdapter(this, R.layout.route_point_info, pointItemsList);
+ final ListView listView = (ListView) findViewById(R.id.pointsListView);
+ listView.setAdapter(adapter);
+
+ listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+ @Override
+ public void onItemClick(AdapterView adapterView, View view, int i, long l) {
+ final PopupMenu menu = new PopupMenu(RouteStepsActivity.this, view);
+
+ menu.getMenuInflater().inflate(R.menu.route_step_menu, menu.getMenu());
+
+ menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem menuItem) {
+ if (menuItem.getTitle().equals("Mark as next")){
+
+ } else {
+ //AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuItem.getMenuInfo();
+ ///int position = info.position;
+ //GPXUtilities.WptPt point = pointsList.get(position);
+ //app.getSettings().setMapLocationToShow();
+ }
+ return true;
+ }
+ });
+
+ menu.show();
+ }
+ });
+ }
+
+ private void loadCurrentRoute() {
+ if (gpx.routes.size() < 1) {
+ return;
+ }
+
+ Map map = gpx.getExtensionsToRead();
+ if (map.containsKey(CURRENT_ROUTE_KEY)) {
+ String routeName = map.get(CURRENT_ROUTE_KEY);
+
+ for (GPXUtilities.Route route : gpx.routes) {
+ if (route.name.equals(routeName)) {
+ currentRoute = route;
+ return;
+ }
+ }
+ }
+ currentRoute = gpx.routes.get(0);
+ }
+
+ private List getAllPointsStatus() {
+ List pointsStatus = new ArrayList();
+ for (int i = 0; i < pointsList.size(); i++) {
+ pointsStatus.add(getPointStatus(pointsIndex.get(i)));
+ }
+
+ return pointsStatus;
+ }
+
+ private void saveStatus(){
+ for (int i = 0; i < pointsChangedState.size(); i++) {
+ boolean newValue = pointsChangedState.get(i);
+ //if values is the same - there's no need to save data
+ if (newValue != pointsStartState.get(i)) {
+ int indexToWrite = pointsIndex.get(i);
+ setPointStatus(indexToWrite, newValue);
+ }
+ }
+
+ saveGPXFile();
+ finish();
+ }
+
+ private void sortPoints(){
+ List listToSort = new ArrayList();
+ List indexItemsAtTheEnd = new ArrayList();
+ pointsIndex = new ArrayList();
+
+
+ for (int i =0; i< pointsList.size(); i++){
+ long status = getPointStatus(i);
+ if (status == 0L){
+ listToSort.add(pointsList.get(i));
+ pointsIndex.add(i);
+ } else{
+ indexItemsAtTheEnd.add(i);
+ }
+ }
+
+ for (int i : indexItemsAtTheEnd){
+ listToSort.add(pointsList.get(i));
+ pointsIndex.add(i);
+ }
+
+ pointsList = listToSort;
+ }
+
+ private void saveGPXFile() {
+ GPXUtilities.writeGpxFile(new File(gpx.path), gpx, app);
+ }
+
+ private long getPointStatus(int numberOfPoint) {
+ Map map = currentRoute.getExtensionsToRead();
+
+ String mapKey = POINT_KEY + numberOfPoint + VISITED_KEY;
+ if (map.containsKey(mapKey)) {
+ String value = map.get(mapKey);
+ return (Long.valueOf(value));
+ }
+
+ return 0L;
+ }
+
+ //saves point status value to gpx extention file
+ private void setPointStatus(int numberOfPoint, boolean status) {
+ Map map = currentRoute.getExtensionsToWrite();
+
+ String mapKey = POINT_KEY + numberOfPoint + VISITED_KEY;
+ if (status) {
+ //value is current time
+ Calendar c = Calendar.getInstance();
+ long number = c.getTimeInMillis();
+ map.put(mapKey, String.valueOf(number));
+ } else if (map.containsKey(mapKey)) {
+ map.remove(mapKey);
+ }
+
+ }
+
+ public List getPointsState() {
+ List status = new ArrayList();
+ for (int i = 0; i < pointsStatus.size(); i++) {
+ if (pointsStatus.get(i) == 0) {
+ status.add(false);
+ } else {
+ status.add(true);
+ }
+ }
+ return status;
+ }
+
+ private boolean[] toPrimitiveArray(final List booleanList) {
+ final boolean[] primitives = new boolean[booleanList.size()];
+ int index = 0;
+ for (Boolean object : booleanList) {
+ primitives[index++] = object;
+ }
+ return primitives;
+ }
+
+ private class PointItemAdapter extends ArrayAdapter {
+ private RouteStepsActivity ctx;
+ private ArrayList pointsList;
+
+ public PointItemAdapter(Context context, int textViewResourceId, ArrayList pointsList) {
+ super(context, textViewResourceId, pointsList);
+ ctx = (RouteStepsActivity) context;
+ this.pointsList = new ArrayList();
+ this.pointsList.addAll(pointsList);
+ }
+
+ private class ViewHolder {
+ TextView index;
+ TextView name;
+ TextView date;
+ CheckBox visited;
+
+ }
+
+ @Override
+ public View getView(final int position, View convertView, ViewGroup parent) {
+ ViewHolder holder = null;
+ Log.v("ConvertView", String.valueOf(position));
+ if (convertView == null) {
+ LayoutInflater vi = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ convertView = vi.inflate(R.layout.route_point_info, null);
+
+ holder = new ViewHolder();
+ holder.index = (TextView) convertView.findViewById(R.id.index);
+ holder.date = (TextView) convertView.findViewById(R.id.date);
+ holder.name = (TextView) convertView.findViewById(R.id.name);
+ holder.visited = (CheckBox) convertView.findViewById(R.id.checkBox1);
+ convertView.setTag(holder);
+
+ holder.visited.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ CheckBox ch = (CheckBox) view;
+ RelativeLayout parent = (RelativeLayout) ch.getParent();
+ TextView text = (TextView) parent.getChildAt(0);
+ pointsChangedState.set(Integer.parseInt(text.getText().toString()), ch.isChecked());
+ }
+ });
+ } else {
+ holder = (ViewHolder) convertView.getTag();
+ }
+
+ PointItem point = pointsList.get(position);
+ holder.index.setText(String.valueOf(position));
+ holder.visited.setChecked(point.isSelected());
+ String pointName = point.getName();
+ int pos = pointName.indexOf(":");
+ holder.name.setText(pointName.substring(0, pos));
+ if (point.isSelected()){
+ holder.date.setText(String.valueOf(point.getTime()));
+ } else{
+ holder.date.setText("");
+ }
+
+ return convertView;
+ }
+
+ }
+
+ private class PointItem {
+ private boolean visited;
+ private String name;
+ private String time;
+
+ public PointItem(boolean visited, String name, String time) {
+ this.visited = visited;
+ this.name = name;
+ this.time = time;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getTime() {
+ return time;
+ }
+
+ public boolean isSelected() {
+ return visited;
+ }
+
+ public void setSelected(boolean selected) {
+ this.visited = selected;
+ }
+ }
+}
diff --git a/OsmAnd/src/net/osmand/plus/routesteps/RouteStepsPlugin.java b/OsmAnd/src/net/osmand/plus/routesteps/RouteStepsPlugin.java
index e859c433a7..da8dbdc3d7 100644
--- a/OsmAnd/src/net/osmand/plus/routesteps/RouteStepsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/routesteps/RouteStepsPlugin.java
@@ -3,11 +3,21 @@ package net.osmand.plus.routesteps;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.Paint;
+import android.view.View;
+import net.osmand.data.LatLon;
import net.osmand.plus.*;
import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.views.AnimateDraggingMapThread;
+import net.osmand.plus.views.MapInfoLayer;
+import net.osmand.plus.views.OsmandMapLayer;
+import net.osmand.plus.views.OsmandMapTileView;
+import net.osmand.plus.views.mapwidgets.TextInfoWidget;
import java.io.File;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.List;
import java.util.Map;
@@ -18,11 +28,6 @@ public class RouteStepsPlugin extends OsmandPlugin {
public static final String ID = "osmand.route.stepsPlugin";
- private static final String VISITED_KEY = "IsVisited";
- private static final String POINT_KEY = "Point";
- private static final String CURRENT_ROUTE_KEY = "CurrentRoute";
-
-
private OsmandApplication app;
private GPXUtilities.GPXFile gpx;
private File file;
@@ -31,35 +36,35 @@ public class RouteStepsPlugin extends OsmandPlugin {
private int currentPointPos;
private RouteStepsLayer routeStepsLayer;
private List pointsList;
- private List pointsStatus;
+ private TextInfoWidget routeStepsControl;
-
- public RouteStepsPlugin(OsmandApplication app){
+ public RouteStepsPlugin(OsmandApplication app) {
+ ApplicationMode. regWidget("route_steps", (ApplicationMode[]) null);
this.app = app;
- this.file = new File("/storage/emulated/0/osmand/tracks/","504.gpx");
- gpx = GPXUtilities.loadGPXFile(app, file);
- loadCurrentRoute();
- pointsList = currentRoute.points;
- pointsStatus = new ArrayList(pointsList.size());
- getAllPointsStatus();
+// this.file = new File("/storage/emulated/0/osmand/tracks/", "504.gpx");
+// gpx = GPXUtilities.loadGPXFile(app, file);
}
- public void setGpxFile(GPXUtilities.GPXFile file){ this.gpx = file;}
+ public void setGpxFile(GPXUtilities.GPXFile file) {
+ this.gpx = file;
+ }
- public void saveGPXFile(){ GPXUtilities.writeGpxFile(file,gpx,app); }
-
- public void setCurrentPoint(GPXUtilities.WptPt point){
+ public void setCurrentPoint(GPXUtilities.WptPt point) {
currentPoint = point;
int number = findPointPosition(point);
currentPointPos = number;
}
- public void setCurrentPoint(int number){
+ public void setCurrentPoint(int number) {
currentPoint = pointsList.get(number);
currentPointPos = number;
}
+ public List getPoints() {
+ return currentRoute.points;
+ }
+
@Override
public String getId() {
return ID;
@@ -80,149 +85,42 @@ public class RouteStepsPlugin extends OsmandPlugin {
return true;
}
- @Override
+ public GPXUtilities.GPXFile getGpx(){ return gpx;}
+
+ public void setGpx(GPXUtilities.GPXFile gpx) { this.gpx = gpx;}
+
public void registerLayers(MapActivity activity) {
// remove old if existing after turn
- if(routeStepsLayer != null) {
+ if (routeStepsLayer != null) {
activity.getMapView().removeLayer(routeStepsLayer);
}
routeStepsLayer = new RouteStepsLayer(activity, this);
activity.getMapView().addLayer(routeStepsLayer, 5.5f);
- //registerWidget(activity);
+ registerWidget(activity);
}
- public List getPoints() {return currentRoute.points;}
-
-
- public boolean getPointStatus(int numberOfPoint) {
- Map map = currentRoute.getExtensionsToRead();
-
- String mapKey = POINT_KEY + numberOfPoint + VISITED_KEY;
- if (map.containsKey(mapKey)){
- String value = map.get(mapKey);
- return (value.equals("true"));
+ private void registerWidget(MapActivity activity) {
+ MapInfoLayer mapInfoLayer = activity.getMapLayers().getMapInfoLayer();
+ if (mapInfoLayer != null) {
+ routeStepsControl = createRouteStepsInfoControl(activity, mapInfoLayer.getPaintText(), mapInfoLayer.getPaintSubText());
+ mapInfoLayer.getMapInfoControls().registerSideWidget(routeStepsControl,
+ R.drawable.widget_parking, R.string.map_widget_route_steps, "route_steps", false, 8);
+ mapInfoLayer.recreateControls();
}
-
- return false;
}
- //saves point status value to gpx extention file
- public void setPointStatus(int numberOfPoint, boolean status) {
- Map map = currentRoute.getExtensionsToWrite();
-
- String mapKey = POINT_KEY + numberOfPoint + VISITED_KEY;
- if (status){
- map.put(mapKey, "true");
+ public GPXUtilities.WptPt getNextPoint() {
+ if (pointsList.size() > currentPointPos + 1) {
+ return pointsList.get(currentPointPos + 1);
} else {
- map.put(mapKey, "false");
- }
- }
-
- public GPXUtilities.WptPt getNextPoint(){
- if (pointsList.size() > currentPointPos +1){
- return pointsList.get(currentPointPos+1);
- } else{
return null;
}
}
- private void loadCurrentRoute() {
- if (gpx.routes.size() < 1){
- return;
- }
-
- Map map = gpx.getExtensionsToRead();
- if (map.containsKey(CURRENT_ROUTE_KEY)){
- String routeName = map.get(CURRENT_ROUTE_KEY);
- int i = 0;
- for(GPXUtilities.Route route : gpx.routes){
- if (route.name.equals(routeName)){
- currentRoute = route;
- return;
- }
- i++;
- }
- }
- currentRoute = gpx.routes.get(0);
- }
-
- @Override
- public void registerMapContextMenuActions(final MapActivity mapActivity,
- final double latitude, final double longitude,
- ContextMenuAdapter adapter, Object selectedObj) {
-
- ContextMenuAdapter.OnContextMenuClick addListener = new ContextMenuAdapter.OnContextMenuClick() {
- @Override
- public void onContextMenuClick(int resId, int pos,
- boolean isChecked, DialogInterface dialog) {
- if (resId == R.string.context_menu_item_show_route_points) {
- showStepsDialog(mapActivity);
- }
- }
- };
- adapter.item(R.string.context_menu_item_show_route_points)
- .icons( R.drawable.ic_action_parking_dark, R.drawable.ic_action_parking_light).listen(addListener).reg();
-
- }
-
- private void getAllPointsStatus(){
- for(int i=0; i< pointsList.size(); i++){
- pointsStatus.add(getPointStatus(i));
- }
- }
-
- private void showStepsDialog(MapActivity mapActivity){
-
- List pointNames = new ArrayList();
- //this array need to collect user selection during dialogue
- final List pointsIntermediateState = new ArrayList(pointsStatus);
- for(GPXUtilities.WptPt point : pointsList){
- pointNames.add(point.name);
- }
-
- AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
- builder.setTitle("All available points");
- builder.setMultiChoiceItems(pointNames.toArray(new String[pointNames.size()]), toPrimitiveArray(pointsIntermediateState), new DialogInterface.OnMultiChoiceClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int i, boolean isChecked) {
- //saving user choice
- pointsIntermediateState.set(i,isChecked);
- }
- });
- builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int i) {
- for (int j=0; j< pointsIntermediateState.size(); j++){
- boolean newValue = pointsIntermediateState.get(j);
- //if values is the same - there's no need to save data
- if (newValue != pointsStatus.get(j)){
- setPointStatus(j,newValue);
- }
- }
- pointsStatus = new ArrayList(pointsIntermediateState);
- saveGPXFile();
- }
- });
- builder.setNegativeButton("Cancel", null);
-
- builder.show();
-
- }
-
- private boolean[] toPrimitiveArray(final List booleanList) {
- final boolean[] primitives = new boolean[booleanList.size()];
- int index = 0;
- for (Boolean object : booleanList) {
- primitives[index++] = object;
- }
- return primitives;
- }
-
-
- private int findPointPosition(GPXUtilities.WptPt point){
+ public int findPointPosition(GPXUtilities.WptPt point) {
int i = 0;
- for (GPXUtilities.WptPt item : pointsList){
- if (item.equals(point)){
+ for (GPXUtilities.WptPt item : pointsList) {
+ if (item.equals(point)) {
return i;
}
i++;
@@ -230,4 +128,46 @@ public class RouteStepsPlugin extends OsmandPlugin {
return -1;
}
+ @Override
+ public void updateLayers(OsmandMapTileView mapView, MapActivity activity) {
+
+ if (routeStepsLayer == null){
+ registerLayers(activity);
+ }
+
+ if (routeStepsControl == null) {
+ registerWidget(activity);
+ }
+ }
+
+ private TextInfoWidget createRouteStepsInfoControl(final MapActivity map, Paint paintText, Paint paintSubText) {
+ TextInfoWidget routeStepsControl = new TextInfoWidget(map, 0, paintText, paintSubText) {
+
+ @Override
+ public boolean updateInfo(OsmandMapLayer.DrawSettings drawSettings) {
+ if (gpx != null) {
+ OsmandMapTileView view = map.getMapView();
+ setText("test", "test");
+ } else {
+ setText("No gpx", "");
+
+ }
+ return true;
+ }
+
+ };
+ routeStepsControl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(app, RouteStepsActivity.class);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ app.startActivity(intent);
+ }
+ });
+ routeStepsControl.setText(null, null);
+ routeStepsControl.setImageDrawable(map.getResources().getDrawable(R.drawable.widget_parking));
+ return routeStepsControl;
+ }
+
+
}
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/StackWidgetView.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/StackWidgetView.java
index 0a2b7ff875..d836816928 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/StackWidgetView.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/StackWidgetView.java
@@ -86,7 +86,7 @@ public class StackWidgetView extends ViewGroup {
public void addStackView(BaseMapWidget v) {
- stackViews.add(v);
+ stackViews.add(v);
v.setShadowColor(shadowColor);
StackWidgetView.this.addView(v, getChildCount());
}
diff --git a/plugins/Osmand-RouteSteps/.classpath b/plugins/Osmand-RouteSteps/.classpath
deleted file mode 100644
index 7bc01d9a9c..0000000000
--- a/plugins/Osmand-RouteSteps/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/plugins/Osmand-RouteSteps/.gitignore b/plugins/Osmand-RouteSteps/.gitignore
deleted file mode 100644
index 85bd1cacd6..0000000000
--- a/plugins/Osmand-RouteSteps/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-gen
-raw
-obj
-*.iml
\ No newline at end of file
diff --git a/plugins/Osmand-RouteSteps/.project b/plugins/Osmand-RouteSteps/.project
deleted file mode 100644
index 1c708327e5..0000000000
--- a/plugins/Osmand-RouteSteps/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- Osmand-ParkingPlugin
-
-
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/plugins/Osmand-RouteSteps/AndroidManifest.xml b/plugins/Osmand-RouteSteps/AndroidManifest.xml
deleted file mode 100644
index 4937306599..0000000000
--- a/plugins/Osmand-RouteSteps/AndroidManifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/plugins/Osmand-RouteSteps/project.properties b/plugins/Osmand-RouteSteps/project.properties
deleted file mode 100644
index 4ab125693c..0000000000
--- a/plugins/Osmand-RouteSteps/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-19
diff --git a/plugins/Osmand-RouteSteps/res/drawable-hdpi/ic_launcher.png b/plugins/Osmand-RouteSteps/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e5b8..0000000000
Binary files a/plugins/Osmand-RouteSteps/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/plugins/Osmand-RouteSteps/res/drawable-hdpi/icon.png b/plugins/Osmand-RouteSteps/res/drawable-hdpi/icon.png
deleted file mode 100644
index 1426adff51..0000000000
Binary files a/plugins/Osmand-RouteSteps/res/drawable-hdpi/icon.png and /dev/null differ
diff --git a/plugins/Osmand-RouteSteps/res/drawable-ldpi/ic_launcher.png b/plugins/Osmand-RouteSteps/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 99238729d8..0000000000
Binary files a/plugins/Osmand-RouteSteps/res/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/plugins/Osmand-RouteSteps/res/drawable-ldpi/icon.png b/plugins/Osmand-RouteSteps/res/drawable-ldpi/icon.png
deleted file mode 100644
index c99e8a25f7..0000000000
Binary files a/plugins/Osmand-RouteSteps/res/drawable-ldpi/icon.png and /dev/null differ
diff --git a/plugins/Osmand-RouteSteps/res/drawable-mdpi/ic_launcher.png b/plugins/Osmand-RouteSteps/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047dfa4..0000000000
Binary files a/plugins/Osmand-RouteSteps/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/plugins/Osmand-RouteSteps/res/drawable-mdpi/icon.png b/plugins/Osmand-RouteSteps/res/drawable-mdpi/icon.png
deleted file mode 100644
index 15eeaf60c2..0000000000
Binary files a/plugins/Osmand-RouteSteps/res/drawable-mdpi/icon.png and /dev/null differ
diff --git a/plugins/Osmand-RouteSteps/res/drawable-xhdpi/ic_launcher.png b/plugins/Osmand-RouteSteps/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d760f0..0000000000
Binary files a/plugins/Osmand-RouteSteps/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/plugins/Osmand-RouteSteps/res/drawable-xhdpi/icon.png b/plugins/Osmand-RouteSteps/res/drawable-xhdpi/icon.png
deleted file mode 100644
index 8c9caab40c..0000000000
Binary files a/plugins/Osmand-RouteSteps/res/drawable-xhdpi/icon.png and /dev/null differ
diff --git a/plugins/Osmand-RouteSteps/res/layout/main.xml b/plugins/Osmand-RouteSteps/res/layout/main.xml
deleted file mode 100644
index 97ef22b8eb..0000000000
--- a/plugins/Osmand-RouteSteps/res/layout/main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/plugins/Osmand-RouteSteps/res/values-af/strings.xml b/plugins/Osmand-RouteSteps/res/values-af/strings.xml
deleted file mode 100644
index 00f84ee5f0..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-af/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Nee
- Ja
- OsmAnd is nie geïnstalleer nie
- OsmAnd Parkering
- OsmAnd Parkering inlegmodule is geïnstalleer en aangeskakel in OsmAnd verstellings.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-ar/strings.xml b/plugins/Osmand-RouteSteps/res/values-ar/strings.xml
deleted file mode 100644
index 66b615414f..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-ar/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-ليس
- نعم
- لم يتم تثبيت OsmAnd
- وقوف السيارات
- يتم تثبيت البرنامج المساعد OsmAnd وقوف السيارات وتمكينها في إعدادات OsmAnd
-
diff --git a/plugins/Osmand-RouteSteps/res/values-bg/strings.xml b/plugins/Osmand-RouteSteps/res/values-bg/strings.xml
deleted file mode 100644
index 60cea88590..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-bg/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Не
- Да
- Приложението OsmAnd не е инсталирано
- Добавка Parking за OsmAnd
- Добавката Parking е инсталирана и включена в настройките на OsmAnd.
-
\ No newline at end of file
diff --git a/plugins/Osmand-RouteSteps/res/values-bs/strings.xml b/plugins/Osmand-RouteSteps/res/values-bs/strings.xml
deleted file mode 100644
index 7ebdef8fd4..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-bs/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Ne
- Da
- OsmAnd is not installed
- OsmAnd Parking Plugin
- OsmAnd Parking Plugin is installed and enabled in OsmAnd settings.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-ca/strings.xml b/plugins/Osmand-RouteSteps/res/values-ca/strings.xml
deleted file mode 100644
index c9bc1274ce..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-ca/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Sí
-No
-L\'OsmAnd no està instal·lat
-OsmAnd Aparcament
-El connector OsmAnd Aparcament està instal·lat i activat a la configuració de l\'OsmAnd.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-cs/strings.xml b/plugins/Osmand-RouteSteps/res/values-cs/strings.xml
deleted file mode 100644
index e3df9fb7f7..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-cs/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Ne
- Ano
- OsmAnd není nainstalován
- OsmAnd parkování
- OsmAnd modul parkování je nainstalován a aktivován v nastavení OsmAnd.
-
\ No newline at end of file
diff --git a/plugins/Osmand-RouteSteps/res/values-cy/strings.xml b/plugins/Osmand-RouteSteps/res/values-cy/strings.xml
deleted file mode 100644
index 81fcead2f0..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-cy/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/plugins/Osmand-RouteSteps/res/values-da/strings.xml b/plugins/Osmand-RouteSteps/res/values-da/strings.xml
deleted file mode 100644
index 973e1604b5..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-da/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Nej
- Ja
- OsmAnd er ikke installeret
- OsmAnd parkering
- OsmAnd udvidelsen Parkering er installeret og aktiveret i OsmAnd indstillinger.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-de/strings.xml b/plugins/Osmand-RouteSteps/res/values-de/strings.xml
deleted file mode 100644
index f37e97c596..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-de/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Nein
- Ja
- OsmAnd ist nicht installiert
- OsmAnd Parkplatz-Plugin
- OsmAnd Parkplatz-Plugin wurde installiert und in den OsmAnd-Einstellungen aktiviert.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-es/strings.xml b/plugins/Osmand-RouteSteps/res/values-es/strings.xml
deleted file mode 100644
index cefb255837..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-es/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-No
- Sí
- OsmAnd no está instalado
- Aparcamiento de OsmAnd
- El Plugin Aparcamiento de OsmAnd está instalado y activado en la configuración de OsmAnd.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-eu/strings.xml b/plugins/Osmand-RouteSteps/res/values-eu/strings.xml
deleted file mode 100644
index d248d687b0..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-eu/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Ez
- Bai
- OsmAnd ez dago instalatuta
- OsmAnd Parking Plugin
- OsmAnd Parking Plugin instalatuta eta aktibatuta dago OsmAnd-en konfigurazioan.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-fa/strings.xml b/plugins/Osmand-RouteSteps/res/values-fa/strings.xml
deleted file mode 100644
index 70e3a99dc6..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-fa/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-بله
- خیر
- OsmAnd نصب نشده است
- پارکینگ OsmAnd
- افزونه پارکینگ OsmAnd نصب شده و در تنظیمات OsmAnd فعال شده است.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-fi/strings.xml b/plugins/Osmand-RouteSteps/res/values-fi/strings.xml
deleted file mode 100644
index b77225eed0..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-fi/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-Ei
- Kyllä
- OsmAnd ei ole asennettu
- OsmAnd Parking
- OsmAnd Parking lisäosa on asennettu ja aktivoitu OsmAnd:in asetuksista.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-fr/strings.xml b/plugins/Osmand-RouteSteps/res/values-fr/strings.xml
deleted file mode 100644
index 9b7e9a2a5e..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-fr/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Non
- Oui
- OsmAnd n\'est pas installé
- Greffon Parking pour OsmAnd
- Le greffon Parking est installé et activé dans les paramètres de OsmAnd.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-he/strings.xml b/plugins/Osmand-RouteSteps/res/values-he/strings.xml
deleted file mode 100644
index bd9bf023f8..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-he/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-לא
- כן
- התכנית OsmAnd אינה מותקנת
- חנייה עם OsmAnd
- תוסף החנייה של OsmAnd מותקן ומופעל בהגדרות של OsmAnd.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-hi/strings.xml b/plugins/Osmand-RouteSteps/res/values-hi/strings.xml
deleted file mode 100644
index c247215176..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-hi/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- नही
- हा
- OsmAnd is not installed
- ओएसएमएएनडी पार्किंग प्लगिन
- OsmAnd Parking Plugin is installed and enabled in OsmAnd settings.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-hr/strings.xml b/plugins/Osmand-RouteSteps/res/values-hr/strings.xml
deleted file mode 100644
index 34253e4f3d..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-hr/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-Ne
- Da
- OsmAnd nije instaliran
- OsmAnd Parkiralište
- OsmAnd dodatak za parkirališta je instaliran i omogućen u OsmAnd postavkama.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-hu/strings.xml b/plugins/Osmand-RouteSteps/res/values-hu/strings.xml
deleted file mode 100644
index 126b300b69..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-hu/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Nem
- Igen
- Az OsmAnd nincs feltelepítve
- OsmAnd Parkolás
- OsmAnd Parkolási Bővítmény feltelepítve és engedélyezve az OsmAnd beállításaiban.
-
\ No newline at end of file
diff --git a/plugins/Osmand-RouteSteps/res/values-hy/strings.xml b/plugins/Osmand-RouteSteps/res/values-hy/strings.xml
deleted file mode 100644
index 5d916d6389..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-hy/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- No
- Yes
- OsmAnd is not installed
- OsmAnd Parking Plugin
- OsmAnd Parking Plugin is installed and enabled in OsmAnd settings.
-
\ No newline at end of file
diff --git a/plugins/Osmand-RouteSteps/res/values-id/strings.xml b/plugins/Osmand-RouteSteps/res/values-id/strings.xml
deleted file mode 100644
index 5d916d6389..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-id/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- No
- Yes
- OsmAnd is not installed
- OsmAnd Parking Plugin
- OsmAnd Parking Plugin is installed and enabled in OsmAnd settings.
-
\ No newline at end of file
diff --git a/plugins/Osmand-RouteSteps/res/values-it/strings.xml b/plugins/Osmand-RouteSteps/res/values-it/strings.xml
deleted file mode 100644
index 0bc0d6a835..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-it/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-No
- Si
- OsmAnd non è installato
- OsmAnd Parking
- Il Plugin Parcheggio per OsmAnd è installato e abilitato nelle impostazioni di OsmAnd.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-ja/strings.xml b/plugins/Osmand-RouteSteps/res/values-ja/strings.xml
deleted file mode 100644
index 603d75d5d5..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-ja/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-いいえ
- はい
- OsmAndがインストールされていません
- OsmAnd駐車場
- OsmAnd駐車場プラグインはインストールされており、設定は有効です。
-
diff --git a/plugins/Osmand-RouteSteps/res/values-ka/strings.xml b/plugins/Osmand-RouteSteps/res/values-ka/strings.xml
deleted file mode 100644
index 0120525c58..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-ka/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- არა
- დიახ
- OsmAnd ჩადგმული არაა
- OsmAnd პარკინგი
- OsmAnd-ის პარკინგის დამატება ჩადგმულია და ჩართულია პარამეტრებში.
-
\ No newline at end of file
diff --git a/plugins/Osmand-RouteSteps/res/values-lt/strings.xml b/plugins/Osmand-RouteSteps/res/values-lt/strings.xml
deleted file mode 100644
index c7640f8192..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-lt/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Ne
- Taip
- OsmAnd programa neįdiegta
- OsmAnd parkavimo įskiepis
- OsmAnd Parkavimo įskiepis įdiegiamas ir aktyvuojamas OsmAnd nustatymuose.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-lv/strings.xml b/plugins/Osmand-RouteSteps/res/values-lv/strings.xml
deleted file mode 100644
index 4341d84c65..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-lv/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Nē
- Jā
- OsmAnd nav instalēts
- OsmAnd Parkošanās
- OsmAnd parkošanās spraudnis ir instalēts un iespējots OsmAnd uzstādījumos.
-
\ No newline at end of file
diff --git a/plugins/Osmand-RouteSteps/res/values-mn/strings.xml b/plugins/Osmand-RouteSteps/res/values-mn/strings.xml
deleted file mode 100644
index 9c5ad89af1..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-mn/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/plugins/Osmand-RouteSteps/res/values-mr/strings.xml b/plugins/Osmand-RouteSteps/res/values-mr/strings.xml
deleted file mode 100644
index bb2f935183..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-mr/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- नाही
- हो
- ओएसएमएएनडि इन्स्टॉल केलेले नाही
- ओएसएमएएनडि पार्किंग
- ओएसएमएएनडि पार्किंग प्लगिन इन्स्टॉल आणि चालू केले आहे.
-
\ No newline at end of file
diff --git a/plugins/Osmand-RouteSteps/res/values-nb/strings.xml b/plugins/Osmand-RouteSteps/res/values-nb/strings.xml
deleted file mode 100644
index d4623fe95f..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-nb/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Ja
- Nei
- OsmAnd er ikke installert
- OsmAnd - parkering
- OsmAnd-pluginen er installert og aktivert i innstillingene for OsmAnd.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-nl/strings.xml b/plugins/Osmand-RouteSteps/res/values-nl/strings.xml
deleted file mode 100644
index 7386549e61..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-nl/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Nee
- Ja
- OsmAnd is niet geïnstalleerd
- OsmAnd parkeerplugin
- OsmAnd parkeerplugin is geïnstalleerd en geactiveerd in de OsmAnd-instellingen.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-pl/strings.xml b/plugins/Osmand-RouteSteps/res/values-pl/strings.xml
deleted file mode 100644
index ae0f030549..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-pl/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Nie
- Tak
- Osmand nie jest zainstalowany
- Wtyczka parkowania dla OsmAnd
- Wtyczka parkowania jest zainstalowana i włączona w ustawieniach OsmAnd.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-pt/strings.xml b/plugins/Osmand-RouteSteps/res/values-pt/strings.xml
deleted file mode 100644
index 9d28f8d8c6..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-pt/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Não
- Sim
- Osmand não está instalado
- OsmAnd Parking Plugin
- OsmAnd Parking Plugin está instalado e activado nas opções OsmAnd.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-ro/strings.xml b/plugins/Osmand-RouteSteps/res/values-ro/strings.xml
deleted file mode 100644
index 5d0369ee36..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-ro/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Nu
- Da
- OsmAnd nu este instalat
- OsmAnd Parking
- Plugin-ul OsmAnd Parking este instalat și activat în setările OsmAnd.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-ru/strings.xml b/plugins/Osmand-RouteSteps/res/values-ru/strings.xml
deleted file mode 100644
index b70765b9e5..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-ru/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Нет
- Да
- OsmAnd не установлен
- Плагин парковки OsmAnd
- Плагин парковки установлен и включен в настройках OsmAnd.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-sc/strings.xml b/plugins/Osmand-RouteSteps/res/values-sc/strings.xml
deleted file mode 100644
index 058296440b..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-sc/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Nono
- Eja
- OsmAnd no est installau
- OsmAnd Parchezu
- OsmAnd Parchezu est installau e insertau in sas impostaduras de OsmAnd.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-sk/strings.xml b/plugins/Osmand-RouteSteps/res/values-sk/strings.xml
deleted file mode 100644
index 0b3b5ad7f5..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-sk/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Nie
- Áno
- Aplikácia OsmAnd nie je nainštalovaná
- OsmAnd parkovanie
- Parkovací zásuvný modul pre OsmAnd je nainštalovaný a povolený v nastaveniach aplikácie OsmAnd.
-
\ No newline at end of file
diff --git a/plugins/Osmand-RouteSteps/res/values-sl/strings.xml b/plugins/Osmand-RouteSteps/res/values-sl/strings.xml
deleted file mode 100644
index d457d4abbb..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-sl/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-Da
- Ne
- OsmAnd ni nameščen
- OsmAnd parkiranje
- Vtičnik OsmAnd parkiranje je nameščen in omogočen v OsmAnd nastavitvah.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-sq/strings.xml b/plugins/Osmand-RouteSteps/res/values-sq/strings.xml
deleted file mode 100644
index 46ade86e72..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-sq/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Jo
- Po
- OsmAnd nuk është instaluar
- OsmAnd Parkim
- Plugini OsmAnd Parkim është instaluar dhe aktivizuar në OsmAnd settings.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-sr/strings.xml b/plugins/Osmand-RouteSteps/res/values-sr/strings.xml
deleted file mode 100644
index 9c5ad89af1..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-sr/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/plugins/Osmand-RouteSteps/res/values-sv/strings.xml b/plugins/Osmand-RouteSteps/res/values-sv/strings.xml
deleted file mode 100644
index 669e231fa1..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-sv/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-Nej
- Ja
- OsmAnd är inte installerad
- OsmAnd - parkering
- OsmAnd-pluginen Parkering är installerad och aktiverad i inställningarna för OsmAnd.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-tl/strings.xml b/plugins/Osmand-RouteSteps/res/values-tl/strings.xml
deleted file mode 100644
index 9c5ad89af1..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-tl/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/plugins/Osmand-RouteSteps/res/values-tr/strings.xml b/plugins/Osmand-RouteSteps/res/values-tr/strings.xml
deleted file mode 100644
index 01b39afda6..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-tr/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-Evet
- Hayır
-
diff --git a/plugins/Osmand-RouteSteps/res/values-uk/strings.xml b/plugins/Osmand-RouteSteps/res/values-uk/strings.xml
deleted file mode 100644
index a675bde927..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-uk/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Ні
- Так
- Osmand не встановлено
- Паркування OsmAnd
- Плагін Паркування OsmAnd встановлено та увімкнено у налаштуваннях OsmAnd.
-
diff --git a/plugins/Osmand-RouteSteps/res/values-zh-rCN/strings.xml b/plugins/Osmand-RouteSteps/res/values-zh-rCN/strings.xml
deleted file mode 100644
index bc5d807565..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-是
- 没有
- OsmAnd 未安装
- OsmAnd 停车场
- OsmAnd 停车场插件已安装，并已在 OsmAnd 设置中启用。
-
diff --git a/plugins/Osmand-RouteSteps/res/values-zh-rTW/strings.xml b/plugins/Osmand-RouteSteps/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 1d42543909..0000000000
--- a/plugins/Osmand-RouteSteps/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-否
- 是
- OsmAnd 並未安裝
- OsmAnd 停車場外掛元件已安裝，並且已在 OsmAnd 設定裡啟用。
-OsmAnd 停車場
-
diff --git a/plugins/Osmand-RouteSteps/res/values/strings.xml b/plugins/Osmand-RouteSteps/res/values/strings.xml
deleted file mode 100644
index 29cf78cf31..0000000000
--- a/plugins/Osmand-RouteSteps/res/values/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- No
- Yes
- OsmAnd is not installed
- OsmAnd Route steps
- OsmAnd Route Steps Plugin is installed and enabled in OsmAnd settings.
-
\ No newline at end of file
diff --git a/plugins/Osmand-RouteSteps/src/net/osmand/routeStepsPlugin/RouteStepsActivity.java b/plugins/Osmand-RouteSteps/src/net/osmand/routeStepsPlugin/RouteStepsActivity.java
deleted file mode 100644
index df52d215a0..0000000000
--- a/plugins/Osmand-RouteSteps/src/net/osmand/routeStepsPlugin/RouteStepsActivity.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package net.osmand.routeStepsPlugin;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.os.Bundle;
-import net.osmand.routeSteps.R;
-
-public class RouteStepsActivity extends Activity {
- private static final String OSMAND_COMPONENT = "net.osmand"; //$NON-NLS-1$
- private static final String OSMAND_COMPONENT_PLUS = "net.osmand.plus"; //$NON-NLS-1$
- private static final String OSMAND_ACTIVITY = "net.osmand.plus.activities.MainMenuActivity"; //$NON-NLS-1$
-
- /** Called when the activity is first created. */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.main);
-
- Intent intentPlus = new Intent();
- intentPlus.setComponent(new ComponentName(OSMAND_COMPONENT_PLUS, OSMAND_ACTIVITY));
- intentPlus.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
- ResolveInfo resolved = getPackageManager().resolveActivity(intentPlus, PackageManager.MATCH_DEFAULT_ONLY);
- if(resolved != null) {
- stopService(intentPlus);
- startActivity(intentPlus);
- } else {
- Intent intentNormal = new Intent();
- intentNormal.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
- intentNormal.setComponent(new ComponentName(OSMAND_COMPONENT, OSMAND_ACTIVITY));
- resolved = getPackageManager().resolveActivity(intentNormal, PackageManager.MATCH_DEFAULT_ONLY);
- if (resolved != null) {
- stopService(intentNormal);
- startActivity(intentNormal);
- } else {
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setMessage(getString(R.string.osmand_app_not_found));
- builder.setPositiveButton(getString(R.string.default_buttons_yes), new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + OSMAND_COMPONENT_PLUS));
- try {
- stopService(intent);
- startActivity(intent);
- } catch (ActivityNotFoundException e) {
- }
- }
- });
- builder.setNegativeButton(getString(R.string.default_buttons_no), null);
- builder.show();
- }
- }
- }
-
-}
\ No newline at end of file