diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index d0cdfd4003..0de6bb0429 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -9,6 +9,7 @@ 3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy --> + Route point Edit Line Add point before Add point after diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java index f910a9fb0d..430be925d3 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java @@ -407,7 +407,7 @@ public class MeasurementToolFragment extends Fragment { }); mapActivity.showTopToolbar(toolBarController); - adapter = new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints()); + adapter = new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints(), newGpxLine != null ? newGpxLine.getLineType() : null); if (portrait) { pointsRv = mainView.findViewById(R.id.measure_points_recycler_view); } else { diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java index 8c431c2cbf..ffde2c8373 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java @@ -17,6 +17,7 @@ import net.osmand.plus.IconsCache; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; +import net.osmand.plus.activities.TrackActivity.NewGpxLine.LineType; import net.osmand.util.MapUtils; import java.util.Collections; @@ -29,10 +30,12 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter points; private MeasurementAdapterListener listener; private boolean nightMode; + private LineType lineType; - public MeasurementToolAdapter(MapActivity mapActivity, List points) { + public MeasurementToolAdapter(MapActivity mapActivity, List points, LineType lineType) { this.mapActivity = mapActivity; this.points = points; + this.lineType = lineType; } public void setAdapterListener(MeasurementAdapterListener listener) { @@ -81,7 +84,11 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter