From a473632200603ce7b1fe28a93fc0cdf942aad029 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Fri, 28 Jul 2017 17:39:32 +0300
Subject: [PATCH 1/8] Create some classes and add some code

---
 .../res/layout/fragment_measurement_tool.xml  | 119 ++++++++++++++++++
 OsmAnd/res/values/strings.xml                 |   1 +
 .../plus/activities/MapActivityActions.java   |  16 +++
 .../MeasurementToolFragment.java              |  43 +++++++
 .../measurementtool/MeasurementToolLayer.java |  30 +++++
 5 files changed, 209 insertions(+)
 create mode 100644 OsmAnd/res/layout/fragment_measurement_tool.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
new file mode 100644
index 0000000000..b9ba847709
--- /dev/null
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/color_transparent"
+    android:clickable="true">
+
+    <LinearLayout
+        android:id="@+id/main_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="@drawable/bg_bottom_menu_dark"
+        android:clickable="true"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="60dp">
+
+            <ImageButton
+                android:id="@+id/ruler_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_margin="16dp"
+                android:background="@null"
+                tools:src="@drawable/ic_action_ruler"/>
+
+            <ImageButton
+                android:id="@+id/up_down_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_margin="16dp"
+                android:background="@null"
+                tools:src="@drawable/ic_action_arrow_down"/>
+
+            <TextView
+                android:id="@+id/distance_text_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/ruler_icon"
+                android:layout_toRightOf="@id/ruler_icon"
+                android:text="724 m, "
+                android:textAppearance="@style/TextAppearance.ListItemTitle"
+                tools:text="724 m, "/>
+
+            <TextView
+                android:id="@+id/dots_text_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/distance_text_view"
+                android:layout_toLeftOf="@id/up_down_icon"
+                android:layout_toRightOf="@id/distance_text_view"
+                android:layout_toStartOf="@id/up_down_icon"
+                android:text="3 dots"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="@dimen/default_desc_text_size"
+                tools:text="3 dots"/>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?attr/dashboard_divider"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="60dp">
+
+            <ImageButton
+                android:id="@+id/previous_dot_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_margin="16dp"
+                android:background="@null"
+                tools:src="@drawable/ic_action_undo_dark"/>
+
+            <ImageButton
+                android:id="@+id/next_dot_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_margin="16dp"
+                android:layout_toEndOf="@id/previous_dot_icon"
+                android:layout_toRightOf="@id/previous_dot_icon"
+                android:background="@null"
+                tools:src="@drawable/ic_action_redo_dark"/>
+
+            <Button
+                style="@style/DialogActionButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
+                android:drawableLeft="@drawable/ic_action_plus"
+                android:text="@string/shared_string_add"/>
+        </RelativeLayout>
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 386b4aef71..78393aefe2 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
     -->
+    <string name="measurement_tool">Measurement tool</string>
     <string name="quick_action_resume_pause_navigation">Resume/Pause Navigation</string>
     <string name="quick_action_resume_pause_navigation_descr">Press this button to pause the navigation, or to resume it if it was already paused.</string>
     <string name="quick_action_show_navigation_finish_dialog">Show Finish navigation dialog</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index f14528cb0f..aad8af21fa 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -48,6 +48,7 @@ import net.osmand.plus.dashboard.DashboardOnMap.DashboardType;
 import net.osmand.plus.dialogs.FavoriteDialogs;
 import net.osmand.plus.download.IndexItem;
 import net.osmand.plus.liveupdates.OsmLiveActivity;
+import net.osmand.plus.measurementtool.MeasurementToolFragment;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
 import net.osmand.plus.routing.RoutingHelper;
@@ -695,6 +696,21 @@ public class MapActivityActions implements DialogProvider {
 					}
 				}).createItem());
 
+		optionsMenuHelper.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.measurement_tool, mapActivity)
+				.setIcon(R.drawable.ic_action_ruler)
+				.setListener(new ContextMenuAdapter.ItemClickListener() {
+					@Override
+					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int position, boolean isChecked) {
+						MeasurementToolFragment fragment = new MeasurementToolFragment();
+						mapActivity.getSupportFragmentManager()
+								.beginTransaction()
+								.add(R.id.bottomFragmentContainer, fragment, MeasurementToolFragment.TAG)
+								.addToBackStack(MeasurementToolFragment.TAG)
+								.commitAllowingStateLoss();
+						return false;
+					}
+				}).createItem());
+
 		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.get_directions, mapActivity)
 				.setIcon(R.drawable.ic_action_gdirections_dark)
 				.setListener(new ContextMenuAdapter.ItemClickListener() {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
new file mode 100644
index 0000000000..614a0e0315
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -0,0 +1,43 @@
+package net.osmand.plus.measurementtool;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import net.osmand.AndroidUtils;
+import net.osmand.plus.IconsCache;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+
+public class MeasurementToolFragment extends Fragment {
+
+	public static final String TAG = "MeasurementToolFragment";
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+		View view = inflater.inflate(R.layout.fragment_measurement_tool, container, false);
+
+		MapActivity mapActivity = (MapActivity) getActivity();
+		IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
+		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+
+		View mainView = view.findViewById(R.id.main_view);
+		AndroidUtils.setBackground(mapActivity, mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
+
+		((ImageView) mainView.findViewById(R.id.ruler_icon))
+				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_ruler, R.color.color_myloc_distance));
+		((ImageView) mainView.findViewById(R.id.up_down_icon))
+				.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
+		((ImageView) mainView.findViewById(R.id.previous_dot_icon))
+				.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_undo_dark));
+		((ImageView) mainView.findViewById(R.id.next_dot_icon))
+				.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_redo_dark));
+
+		return view;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
new file mode 100644
index 0000000000..154a114453
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -0,0 +1,30 @@
+package net.osmand.plus.measurementtool;
+
+import android.graphics.Canvas;
+
+import net.osmand.data.RotatedTileBox;
+import net.osmand.plus.views.OsmandMapLayer;
+import net.osmand.plus.views.OsmandMapTileView;
+
+public class MeasurementToolLayer extends OsmandMapLayer {
+
+	@Override
+	public void initLayer(OsmandMapTileView view) {
+
+	}
+
+	@Override
+	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings settings) {
+
+	}
+
+	@Override
+	public void destroyLayer() {
+
+	}
+
+	@Override
+	public boolean drawInScreenPixels() {
+		return false;
+	}
+}

From adb190b3596a12968f8272b609ff7b3436b8ca1b Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 31 Jul 2017 12:18:14 +0300
Subject: [PATCH 2/8] Add some code

---
 .../res/layout/fragment_measurement_tool.xml  |  1 +
 .../plus/activities/MapActivityActions.java   |  2 +-
 .../plus/activities/MapActivityLayers.java    |  9 +++
 .../MeasurementToolFragment.java              | 61 +++++++++++++++++--
 .../measurementtool/MeasurementToolLayer.java | 10 +++
 .../osmand/plus/views/MapControlsLayer.java   | 13 ++--
 6 files changed, 87 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index b9ba847709..d93ba44a20 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -102,6 +102,7 @@
                 tools:src="@drawable/ic_action_redo_dark"/>
 
             <Button
+                android:id="@+id/add_dot_button"
                 style="@style/DialogActionButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index aad8af21fa..19a617f998 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -707,7 +707,7 @@ public class MapActivityActions implements DialogProvider {
 								.add(R.id.bottomFragmentContainer, fragment, MeasurementToolFragment.TAG)
 								.addToBackStack(MeasurementToolFragment.TAG)
 								.commitAllowingStateLoss();
-						return false;
+						return true;
 					}
 				}).createItem());
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
index 2cad2d725d..37b8949691 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
@@ -28,6 +28,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.SQLiteTileSource;
 import net.osmand.plus.activities.MapActivity.ShowQuickSearchMode;
 import net.osmand.plus.helpers.GpxUiHelper;
+import net.osmand.plus.measurementtool.MeasurementToolLayer;
 import net.osmand.plus.poi.PoiFiltersHelper;
 import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.plus.quickaction.QuickActionRegistry;
@@ -88,6 +89,7 @@ public class MapActivityLayers {
 	private DownloadedRegionsLayer downloadedRegionsLayer;
 	private MapWidgetRegistry mapWidgetRegistry;
 	private QuickActionRegistry quickActionRegistry;
+	private MeasurementToolLayer measurementToolLayer;
 
 	private StateChangedListener<Integer> transparencyListener;
 
@@ -148,6 +150,9 @@ public class MapActivityLayers {
 		// 4. favorites layer
 		mFavouritesLayer = new FavouritesLayer();
 		mapView.addLayer(mFavouritesLayer, 4);
+		// 4.6 measurement tool layer
+		measurementToolLayer = new MeasurementToolLayer();
+		mapView.addLayer(measurementToolLayer, 4.6f);
 		// 5. transport layer
 		transportStopsLayer = new TransportStopsLayer(activity);
 		mapView.addLayer(transportStopsLayer, 5);
@@ -583,6 +588,10 @@ public class MapActivityLayers {
 		return mFavouritesLayer;
 	}
 
+	public MeasurementToolLayer getMeasurementToolLayer() {
+		return measurementToolLayer;
+	}
+
 	public MapTextLayer getMapTextLayer() {
 		return mapTextLayer;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 614a0e0315..531558910d 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -3,6 +3,7 @@ package net.osmand.plus.measurementtool;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,16 +18,22 @@ public class MeasurementToolFragment extends Fragment {
 
 	public static final String TAG = "MeasurementToolFragment";
 
+	private MapActivity mapActivity;
+	private MeasurementToolLayer measurementLayer;
+	private boolean wasCollapseButtonVisible;
+
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_measurement_tool, container, false);
-
-		MapActivity mapActivity = (MapActivity) getActivity();
+		mapActivity = (MapActivity) getActivity();
+		measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 		IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
 		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
-		View mainView = view.findViewById(R.id.main_view);
+		View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_measurement_tool, null);
+
+		final View mainView = view.findViewById(R.id.main_view);
 		AndroidUtils.setBackground(mapActivity, mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
 
 		((ImageView) mainView.findViewById(R.id.ruler_icon))
@@ -38,6 +45,52 @@ public class MeasurementToolFragment extends Fragment {
 		((ImageView) mainView.findViewById(R.id.next_dot_icon))
 				.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_redo_dark));
 
+		enterMeasurementMode();
+
 		return view;
 	}
+
+	@Override
+	public void onDestroyView() {
+		super.onDestroyView();
+		exitMeasurementMode();
+	}
+
+	private void enterMeasurementMode() {
+		measurementLayer.setInMeasurementMode(true);
+		mapActivity.disableDrawer();
+		mark(View.INVISIBLE, R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info,
+				R.id.map_route_info_button, R.id.map_menu_button, R.id.map_compass_button, R.id.map_layers_button,
+				R.id.map_search_button);
+
+		View collapseButton = mapActivity.findViewById(R.id.map_collapse_button);
+		if (collapseButton != null && collapseButton.getVisibility() == View.VISIBLE) {
+			wasCollapseButtonVisible = true;
+			collapseButton.setVisibility(View.INVISIBLE);
+		} else {
+			wasCollapseButtonVisible = false;
+		}
+	}
+
+	private void exitMeasurementMode() {
+		measurementLayer.setInMeasurementMode(false);
+		mapActivity.enableDrawer();
+		mark(View.VISIBLE, R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info,
+				R.id.map_route_info_button, R.id.map_menu_button, R.id.map_compass_button, R.id.map_layers_button,
+				R.id.map_search_button);
+
+		View collapseButton = mapActivity.findViewById(R.id.map_collapse_button);
+		if (collapseButton != null && wasCollapseButtonVisible) {
+			collapseButton.setVisibility(View.VISIBLE);
+		}
+	}
+
+	private void mark(int status, int... widgets) {
+		for (int widget : widgets) {
+			View v = mapActivity.findViewById(widget);
+			if (v != null) {
+				v.setVisibility(status);
+			}
+		}
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 154a114453..a027aa83fd 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -8,6 +8,16 @@ import net.osmand.plus.views.OsmandMapTileView;
 
 public class MeasurementToolLayer extends OsmandMapLayer {
 
+	private boolean inMeasurementMode;
+
+	public boolean isInMeasurementMode() {
+		return inMeasurementMode;
+	}
+
+	public void setInMeasurementMode(boolean inMeasurementMode) {
+		this.inMeasurementMode = inMeasurementMode;
+	}
+
 	@Override
 	public void initLayer(OsmandMapTileView view) {
 
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index f9d5b323cb..d22e7d65e8 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -712,7 +712,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 				((app.accessibilityEnabled() || (System.currentTimeMillis() - touchEvent < TIMEOUT_TO_SHOW_BUTTONS)) && routeFollowingMode);
 		updateMyLocation(rh, routeDialogOpened || trackDialogOpened);
 		boolean showButtons = (showRouteCalculationControls || !routeFollowingMode)
-				&& !isInChangeMarkerPositionMode() && !isInGpxDetailsMode();
+				&& !isInChangeMarkerPositionMode() && !isInGpxDetailsMode() && !isInMeasurementToolMode();
 		//routePlanningBtn.setIconResId(routeFollowingMode ? R.drawable.ic_action_gabout_dark : R.drawable.map_directions);
 		if (rh.isFollowingMode()) {
 			routePlanningBtn.setIconResId(R.drawable.map_start_navigation);
@@ -729,13 +729,14 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 		mapZoomIn.updateVisibility(!routeDialogOpened);
 		mapZoomOut.updateVisibility(!routeDialogOpened);
-		compassHud.updateVisibility(!routeDialogOpened && !trackDialogOpened && shouldShowCompass());
+		compassHud.updateVisibility(!routeDialogOpened && !trackDialogOpened && shouldShowCompass() &&
+				!isInMeasurementToolMode());
 
 		if (layersHud.setIconResId(settings.getApplicationMode().getMapIconId())) {
 			layersHud.update(app, isNight);
 		}
-		layersHud.updateVisibility(!routeDialogOpened && !trackDialogOpened);
-		quickSearchHud.updateVisibility(!routeDialogOpened && !trackDialogOpened);
+		layersHud.updateVisibility(!routeDialogOpened && !trackDialogOpened && !isInMeasurementToolMode());
+		quickSearchHud.updateVisibility(!routeDialogOpened && !trackDialogOpened && !isInMeasurementToolMode());
 
 		if (!routePlanningMode && !routeFollowingMode) {
 			if (mapView.isZooming()) {
@@ -1127,6 +1128,10 @@ public class MapControlsLayer extends OsmandMapLayer {
 		return contextMenuLayer.isInGpxDetailsMode();
 	}
 
+	private boolean isInMeasurementToolMode() {
+		return mapActivity.getMapLayers().getMeasurementToolLayer().isInMeasurementMode();
+	}
+
 	public static View.OnLongClickListener getOnClickMagnifierListener(final OsmandMapTileView view) {
 		return new View.OnLongClickListener() {
 

From a8ca8b763faade6ee0e251437dafffc6494d8c88 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 31 Jul 2017 18:13:29 +0300
Subject: [PATCH 3/8] Add improvements

---
 .../res/layout/fragment_measurement_tool.xml  | 38 ++++++++++++++-----
 OsmAnd/res/values-large/sizes.xml             |  2 +-
 OsmAnd/res/values/sizes.xml                   |  2 +-
 .../MeasurementToolFragment.java              |  8 ++--
 .../plus/views/MapQuickActionLayer.java       |  4 ++
 5 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index d93ba44a20..57f521cff4 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -19,7 +19,8 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="60dp">
+            android:paddingBottom="12dp"
+            android:paddingTop="12dp">
 
             <ImageButton
                 android:id="@+id/ruler_icon"
@@ -28,7 +29,10 @@
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
-                android:layout_margin="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
                 android:background="@null"
                 tools:src="@drawable/ic_action_ruler"/>
 
@@ -39,7 +43,10 @@
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-                android:layout_margin="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
                 android:background="@null"
                 tools:src="@drawable/ic_action_arrow_down"/>
 
@@ -48,6 +55,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
+                android:layout_marginLeft="8dp"
+                android:layout_marginStart="8dp"
                 android:layout_toEndOf="@id/ruler_icon"
                 android:layout_toRightOf="@id/ruler_icon"
                 android:text="724 m, "
@@ -65,7 +74,7 @@
                 android:layout_toStartOf="@id/up_down_icon"
                 android:text="3 dots"
                 android:textColor="?android:textColorSecondary"
-                android:textSize="@dimen/default_desc_text_size"
+                android:textSize="@dimen/default_list_text_size"
                 tools:text="3 dots"/>
         </RelativeLayout>
 
@@ -76,8 +85,7 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="60dp">
+            android:layout_height="wrap_content">
 
             <ImageButton
                 android:id="@+id/previous_dot_icon"
@@ -86,7 +94,10 @@
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
-                android:layout_margin="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
                 android:background="@null"
                 tools:src="@drawable/ic_action_undo_dark"/>
 
@@ -95,7 +106,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_margin="16dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginStart="8dp"
                 android:layout_toEndOf="@id/previous_dot_icon"
                 android:layout_toRightOf="@id/previous_dot_icon"
                 android:background="@null"
@@ -103,16 +115,22 @@
 
             <Button
                 android:id="@+id/add_dot_button"
-                style="@style/DialogActionButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
+                android:layout_marginBottom="8dp"
                 android:layout_marginEnd="8dp"
                 android:layout_marginRight="8dp"
+                android:layout_marginTop="8dp"
+                android:background="@drawable/btn_round_blue"
                 android:drawableLeft="@drawable/ic_action_plus"
-                android:text="@string/shared_string_add"/>
+                android:minHeight="36dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:text="@string/shared_string_add"
+                android:textColor="@color/color_white"/>
         </RelativeLayout>
 
     </LinearLayout>
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index b1a4c09402..375e91283d 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -39,7 +39,7 @@
 
 	<dimen name="map_button_inset_shadow">3dp</dimen>
 	<dimen name="map_button_inset">3dp</dimen>
-	<dimen name="map_button_rect_rad">4dp</dimen>
+	<dimen name="map_button_rect_rad">3dp</dimen>
 	
 
 	<dimen name="map_widget_icon_margin">3dp</dimen>
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index eee5a0487a..5860d32a21 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -89,7 +89,7 @@
 
 	<dimen name="map_button_inset_shadow">2dp</dimen>
 	<dimen name="map_button_inset">2dp</dimen>
-	<dimen name="map_button_rect_rad">3dp</dimen>
+	<dimen name="map_button_rect_rad">2dp</dimen>
 	<dimen name="map_button_stroke">1dp</dimen>
 	<dimen name="map_button_stroke_dark">1dp</dimen>
 	<dimen name="map_route_planning_land_width">320dp</dimen>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 531558910d..af7b0b2123 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -59,9 +59,9 @@ public class MeasurementToolFragment extends Fragment {
 	private void enterMeasurementMode() {
 		measurementLayer.setInMeasurementMode(true);
 		mapActivity.disableDrawer();
-		mark(View.INVISIBLE, R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info,
-				R.id.map_route_info_button, R.id.map_menu_button, R.id.map_compass_button, R.id.map_layers_button,
-				R.id.map_search_button);
+		mark(View.INVISIBLE, R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
+		mark(View.GONE, R.id.map_route_info_button, R.id.map_menu_button, R.id.map_compass_button, R.id.map_layers_button,
+				R.id.map_search_button, R.id.map_quick_actions_button);
 
 		View collapseButton = mapActivity.findViewById(R.id.map_collapse_button);
 		if (collapseButton != null && collapseButton.getVisibility() == View.VISIBLE) {
@@ -77,7 +77,7 @@ public class MeasurementToolFragment extends Fragment {
 		mapActivity.enableDrawer();
 		mark(View.VISIBLE, R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info,
 				R.id.map_route_info_button, R.id.map_menu_button, R.id.map_compass_button, R.id.map_layers_button,
-				R.id.map_search_button);
+				R.id.map_search_button, R.id.map_quick_actions_button);
 
 		View collapseButton = mapActivity.findViewById(R.id.map_collapse_button);
 		if (collapseButton != null && wasCollapseButtonVisible) {
diff --git a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
index 5a6b47ed65..2f3dbfc21b 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
@@ -25,6 +25,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
+import net.osmand.plus.measurementtool.MeasurementToolLayer;
 import net.osmand.plus.quickaction.QuickAction;
 import net.osmand.plus.quickaction.QuickActionFactory;
 import net.osmand.plus.quickaction.QuickActionRegistry;
@@ -39,6 +40,7 @@ import static net.osmand.plus.views.ContextMenuLayer.VIBRATE_SHORT;
 public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRegistry.QuickActionUpdatesListener, QuickAction.QuickActionSelectionListener {
 
     private final ContextMenuLayer    contextMenuLayer;
+	private final MeasurementToolLayer measurementToolLayer;
     private       ImageView           contextMarker;
     private final MapActivity         mapActivity;
     private final OsmandApplication   app;
@@ -63,6 +65,7 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
         app = activity.getMyApplication();
         settings = activity.getMyApplication().getSettings();
         quickActionRegistry = activity.getMapLayers().getQuickActionRegistry();
+		measurementToolLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
     }
 
 
@@ -319,6 +322,7 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
         boolean hideQuickButton = !isLayerOn ||
                 contextMenuLayer.isInChangeMarkerPositionMode() ||
 				contextMenuLayer.isInGpxDetailsMode() ||
+				measurementToolLayer.isInMeasurementMode() ||
                 mapActivity.getContextMenu().isVisible() && !mapActivity.getContextMenu().findMenuFragment().get().isRemoving() ||
                 mapActivity.getContextMenu().isVisible() && mapActivity.getContextMenu().findMenuFragment().get().isAdded() ||
                 mapActivity.getContextMenu().getMultiSelectionMenu().isVisible() && mapActivity.getContextMenu().getMultiSelectionMenu().getFragmentByTag().isAdded() ||

From 0f69f594c766052b2573578185145bdd9003a325 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 1 Aug 2017 13:15:11 +0300
Subject: [PATCH 4/8] Add functionality

---
 .../res/layout/fragment_measurement_tool.xml  |  18 +--
 OsmAnd/res/values/strings.xml                 |   2 +
 .../MeasurementToolFragment.java              |  32 +++++
 .../measurementtool/MeasurementToolLayer.java | 109 +++++++++++++++++-
 4 files changed, 148 insertions(+), 13 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 57f521cff4..47dfee7ff8 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -51,31 +51,31 @@
                 tools:src="@drawable/ic_action_arrow_down"/>
 
             <TextView
-                android:id="@+id/distance_text_view"
+                android:id="@+id/measurement_distance_text_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
+                android:layout_marginEnd="4dp"
                 android:layout_marginLeft="8dp"
+                android:layout_marginRight="4dp"
                 android:layout_marginStart="8dp"
                 android:layout_toEndOf="@id/ruler_icon"
                 android:layout_toRightOf="@id/ruler_icon"
-                android:text="724 m, "
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
-                tools:text="724 m, "/>
+                tools:text="724 m,"/>
 
             <TextView
-                android:id="@+id/dots_text_view"
+                android:id="@+id/measurement_points_text_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_toEndOf="@id/distance_text_view"
+                android:layout_toEndOf="@id/measurement_distance_text_view"
                 android:layout_toLeftOf="@id/up_down_icon"
-                android:layout_toRightOf="@id/distance_text_view"
+                android:layout_toRightOf="@id/measurement_distance_text_view"
                 android:layout_toStartOf="@id/up_down_icon"
-                android:text="3 dots"
                 android:textColor="?android:textColorSecondary"
                 android:textSize="@dimen/default_list_text_size"
-                tools:text="3 dots"/>
+                tools:text="points: 3"/>
         </RelativeLayout>
 
         <View
@@ -114,7 +114,7 @@
                 tools:src="@drawable/ic_action_redo_dark"/>
 
             <Button
-                android:id="@+id/add_dot_button"
+                android:id="@+id/add_point_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 78393aefe2..d900482c13 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,8 @@
          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
     -->
+    <string name="measurement_points">points: %o</string>
+    <string name="measurement_distance">%s,</string>
     <string name="measurement_tool">Measurement tool</string>
     <string name="quick_action_resume_pause_navigation">Resume/Pause Navigation</string>
     <string name="quick_action_resume_pause_navigation_descr">Press this button to pause the navigation, or to resume it if it was already paused.</string>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index af7b0b2123..686e06c08f 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -8,6 +8,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import net.osmand.AndroidUtils;
 import net.osmand.plus.IconsCache;
@@ -20,6 +21,12 @@ public class MeasurementToolFragment extends Fragment {
 
 	private MapActivity mapActivity;
 	private MeasurementToolLayer measurementLayer;
+
+	private TextView distanceTv;
+	private TextView pointsTv;
+	private String distanceSt;
+	private String pointsSt;
+
 	private boolean wasCollapseButtonVisible;
 
 	@Nullable
@@ -31,11 +38,17 @@ public class MeasurementToolFragment extends Fragment {
 		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
+		distanceSt = mapActivity.getString(R.string.measurement_distance);
+		pointsSt = mapActivity.getString(R.string.measurement_points);
+
 		View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_measurement_tool, null);
 
 		final View mainView = view.findViewById(R.id.main_view);
 		AndroidUtils.setBackground(mapActivity, mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
 
+		distanceTv = (TextView) mainView.findViewById(R.id.measurement_distance_text_view);
+		pointsTv = (TextView) mainView.findViewById(R.id.measurement_points_text_view);
+
 		((ImageView) mainView.findViewById(R.id.ruler_icon))
 				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_ruler, R.color.color_myloc_distance));
 		((ImageView) mainView.findViewById(R.id.up_down_icon))
@@ -45,6 +58,14 @@ public class MeasurementToolFragment extends Fragment {
 		((ImageView) mainView.findViewById(R.id.next_dot_icon))
 				.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_redo_dark));
 
+		mainView.findViewById(R.id.add_point_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				measurementLayer.addPointOnClick();
+				updateText();
+			}
+		});
+
 		enterMeasurementMode();
 
 		return view;
@@ -56,8 +77,14 @@ public class MeasurementToolFragment extends Fragment {
 		exitMeasurementMode();
 	}
 
+	private void updateText() {
+		distanceTv.setText(String.format(distanceSt, measurementLayer.getDistanceSt()));
+		pointsTv.setText(String.format(pointsSt, measurementLayer.getPointsCount()));
+	}
+
 	private void enterMeasurementMode() {
 		measurementLayer.setInMeasurementMode(true);
+		mapActivity.refreshMap();
 		mapActivity.disableDrawer();
 		mark(View.INVISIBLE, R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
 		mark(View.GONE, R.id.map_route_info_button, R.id.map_menu_button, R.id.map_compass_button, R.id.map_layers_button,
@@ -70,10 +97,13 @@ public class MeasurementToolFragment extends Fragment {
 		} else {
 			wasCollapseButtonVisible = false;
 		}
+
+		updateText();
 	}
 
 	private void exitMeasurementMode() {
 		measurementLayer.setInMeasurementMode(false);
+		mapActivity.refreshMap();
 		mapActivity.enableDrawer();
 		mark(View.VISIBLE, R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info,
 				R.id.map_route_info_button, R.id.map_menu_button, R.id.map_compass_button, R.id.map_layers_button,
@@ -83,6 +113,8 @@ public class MeasurementToolFragment extends Fragment {
 		if (collapseButton != null && wasCollapseButtonVisible) {
 			collapseButton.setVisibility(View.VISIBLE);
 		}
+
+		measurementLayer.clearPoints();
 	}
 
 	private void mark(int status, int... widgets) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index a027aa83fd..fcbe047319 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -1,31 +1,132 @@
 package net.osmand.plus.measurementtool;
 
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Path;
 
+import net.osmand.data.LatLon;
+import net.osmand.data.QuadPoint;
 import net.osmand.data.RotatedTileBox;
+import net.osmand.plus.GPXUtilities.WptPt;
+import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.R;
 import net.osmand.plus.views.OsmandMapLayer;
 import net.osmand.plus.views.OsmandMapTileView;
+import net.osmand.util.MapUtils;
+
+import java.util.LinkedList;
 
 public class MeasurementToolLayer extends OsmandMapLayer {
 
+	private OsmandMapTileView view;
 	private boolean inMeasurementMode;
+	private LinkedList<WptPt> measurementPoints = new LinkedList<>();
+	private Bitmap centerIconDay;
+	private Bitmap centerIconNight;
+	private Bitmap pointIcon;
+	private Paint bitmapPaint;
+	private RenderingLineAttributes lineAttrs;
+	private Path path;
+	private int marginX;
+	private int marginY;
+
+	@Override
+	public void initLayer(OsmandMapTileView view) {
+		this.view = view;
+
+		centerIconDay = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_ruler_center_day);
+		centerIconNight = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_ruler_center_night);
+		pointIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_pedestrian_location);
+
+		bitmapPaint = new Paint();
+		bitmapPaint.setAntiAlias(true);
+		bitmapPaint.setDither(true);
+		bitmapPaint.setFilterBitmap(true);
+
+		lineAttrs = new RenderingLineAttributes("rulerLine");
+
+		path = new Path();
+		marginY = pointIcon.getHeight() / 2;
+		marginX = pointIcon.getWidth() / 2;
+	}
 
 	public boolean isInMeasurementMode() {
 		return inMeasurementMode;
 	}
 
-	public void setInMeasurementMode(boolean inMeasurementMode) {
+	void setInMeasurementMode(boolean inMeasurementMode) {
 		this.inMeasurementMode = inMeasurementMode;
 	}
 
-	@Override
-	public void initLayer(OsmandMapTileView view) {
+	int getPointsCount() {
+		return measurementPoints.size();
+	}
 
+	String getDistanceSt() {
+		float dist = 0;
+		if (measurementPoints.size() > 0) {
+			for (int i = 1; i < measurementPoints.size(); i++) {
+				dist += MapUtils.getDistance(measurementPoints.get(i - 1).lat, measurementPoints.get(i - 1).lon,
+						measurementPoints.get(i).lat, measurementPoints.get(i).lon);
+			}
+		}
+		return OsmAndFormatter.getFormattedDistance(dist, view.getApplication());
+	}
+
+	void clearPoints() {
+		measurementPoints.clear();
 	}
 
 	@Override
-	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings settings) {
+	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings settings) {
+		if (inMeasurementMode) {
+			lineAttrs.updatePaints(view, settings, tb);
+			drawCenterIcon(canvas, tb, tb.getCenterPixelPoint(), settings.isNightMode());
 
+			if (measurementPoints.size() > 0) {
+				path.reset();
+				for (int i = 0; i < measurementPoints.size(); i++) {
+					WptPt pt = measurementPoints.get(i);
+					int locX = tb.getPixXFromLonNoRot(pt.lon);
+					int locY = tb.getPixYFromLatNoRot(pt.lat);
+					if (i == 0) {
+						path.moveTo(locX, locY);
+					} else {
+						path.lineTo(locX, locY);
+					}
+
+					if (tb.containsLatLon(pt.lat, pt.lon)) {
+						canvas.drawBitmap(pointIcon, locX - marginX, locY - marginY, bitmapPaint);
+					}
+				}
+				path.lineTo(tb.getCenterPixelX(), tb.getCenterPixelY());
+				canvas.drawPath(path, lineAttrs.paint);
+			}
+		}
+	}
+
+	private void drawCenterIcon(Canvas canvas, RotatedTileBox tb, QuadPoint center, boolean nightMode) {
+		canvas.rotate(-tb.getRotate(), center.x, center.y);
+		if (nightMode) {
+			canvas.drawBitmap(centerIconNight, center.x - centerIconNight.getWidth() / 2,
+					center.y - centerIconNight.getHeight() / 2, bitmapPaint);
+		} else {
+			canvas.drawBitmap(centerIconDay, center.x - centerIconDay.getWidth() / 2,
+					center.y - centerIconDay.getHeight() / 2, bitmapPaint);
+		}
+		canvas.rotate(tb.getRotate(), center.x, center.y);
+	}
+
+	void addPointOnClick() {
+		RotatedTileBox tb = view.getCurrentRotatedTileBox();
+		LatLon l = tb.getLatLonFromPixel(tb.getCenterPixelX(), tb.getCenterPixelY());
+		WptPt pt = new WptPt();
+		pt.lat = l.getLatitude();
+		pt.lon = l.getLongitude();
+		measurementPoints.add(pt);
+		view.refreshMap();
 	}
 
 	@Override

From 4c7e97d7e7a825314c8280e5a70dc66b3dee3aa8 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 1 Aug 2017 13:25:35 +0300
Subject: [PATCH 5/8] Remove unnecessary strings

---
 OsmAnd/res/values/strings.xml                             | 2 --
 .../plus/measurementtool/MeasurementToolFragment.java     | 8 +++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index d900482c13..78393aefe2 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,8 +9,6 @@
          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
     -->
-    <string name="measurement_points">points: %o</string>
-    <string name="measurement_distance">%s,</string>
     <string name="measurement_tool">Measurement tool</string>
     <string name="quick_action_resume_pause_navigation">Resume/Pause Navigation</string>
     <string name="quick_action_resume_pause_navigation_descr">Press this button to pause the navigation, or to resume it if it was already paused.</string>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 686e06c08f..e3195dd10a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -24,7 +24,6 @@ public class MeasurementToolFragment extends Fragment {
 
 	private TextView distanceTv;
 	private TextView pointsTv;
-	private String distanceSt;
 	private String pointsSt;
 
 	private boolean wasCollapseButtonVisible;
@@ -38,8 +37,7 @@ public class MeasurementToolFragment extends Fragment {
 		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
-		distanceSt = mapActivity.getString(R.string.measurement_distance);
-		pointsSt = mapActivity.getString(R.string.measurement_points);
+		pointsSt = mapActivity.getString(R.string.points).toLowerCase();
 
 		View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_measurement_tool, null);
 
@@ -78,8 +76,8 @@ public class MeasurementToolFragment extends Fragment {
 	}
 
 	private void updateText() {
-		distanceTv.setText(String.format(distanceSt, measurementLayer.getDistanceSt()));
-		pointsTv.setText(String.format(pointsSt, measurementLayer.getPointsCount()));
+		distanceTv.setText(measurementLayer.getDistanceSt() + ",");
+		pointsTv.setText(pointsSt + ": " + measurementLayer.getPointsCount());
 	}
 
 	private void enterMeasurementMode() {

From 1f9a7518d59306a2422d5425078799999b521fce Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 1 Aug 2017 13:46:46 +0300
Subject: [PATCH 6/8] Add calculatePath() to onDraw()

---
 .../measurementtool/MeasurementToolLayer.java  | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index fcbe047319..73a28ef780 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -18,6 +18,8 @@ import net.osmand.util.MapUtils;
 
 import java.util.LinkedList;
 
+import gnu.trove.list.array.TIntArrayList;
+
 public class MeasurementToolLayer extends OsmandMapLayer {
 
 	private OsmandMapTileView view;
@@ -27,10 +29,12 @@ public class MeasurementToolLayer extends OsmandMapLayer {
 	private Bitmap centerIconNight;
 	private Bitmap pointIcon;
 	private Paint bitmapPaint;
-	private RenderingLineAttributes lineAttrs;
-	private Path path;
+	private RenderingLineAttributes lineAttrs = new RenderingLineAttributes("rulerLine");
+	private Path path = new Path();
 	private int marginX;
 	private int marginY;
+	private TIntArrayList tx = new TIntArrayList();
+	private TIntArrayList ty = new TIntArrayList();
 
 	@Override
 	public void initLayer(OsmandMapTileView view) {
@@ -45,9 +49,6 @@ public class MeasurementToolLayer extends OsmandMapLayer {
 		bitmapPaint.setDither(true);
 		bitmapPaint.setFilterBitmap(true);
 
-		lineAttrs = new RenderingLineAttributes("rulerLine");
-
-		path = new Path();
 		marginY = pointIcon.getHeight() / 2;
 		marginX = pointIcon.getWidth() / 2;
 	}
@@ -87,6 +88,8 @@ public class MeasurementToolLayer extends OsmandMapLayer {
 
 			if (measurementPoints.size() > 0) {
 				path.reset();
+				tx.reset();
+				ty.reset();
 				for (int i = 0; i < measurementPoints.size(); i++) {
 					WptPt pt = measurementPoints.get(i);
 					int locX = tb.getPixXFromLonNoRot(pt.lon);
@@ -96,12 +99,17 @@ public class MeasurementToolLayer extends OsmandMapLayer {
 					} else {
 						path.lineTo(locX, locY);
 					}
+					tx.add(locX);
+					ty.add(locY);
 
 					if (tb.containsLatLon(pt.lat, pt.lon)) {
 						canvas.drawBitmap(pointIcon, locX - marginX, locY - marginY, bitmapPaint);
 					}
 				}
 				path.lineTo(tb.getCenterPixelX(), tb.getCenterPixelY());
+				tx.add(tb.getCenterPixelX());
+				ty.add(tb.getCenterPixelY());
+				calculatePath(tb, tx, ty, path);
 				canvas.drawPath(path, lineAttrs.paint);
 			}
 		}

From 3f742be6ec6ecfe66f57817c7f665ef4e6d35d2e Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 1 Aug 2017 15:16:42 +0300
Subject: [PATCH 7/8] Fix possible NPE

---
 .../MeasurementToolFragment.java              | 74 +++++++++++--------
 1 file changed, 43 insertions(+), 31 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index e3195dd10a..2c816b87fb 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -19,7 +19,6 @@ public class MeasurementToolFragment extends Fragment {
 
 	public static final String TAG = "MeasurementToolFragment";
 
-	private MapActivity mapActivity;
 	private MeasurementToolLayer measurementLayer;
 
 	private TextView distanceTv;
@@ -31,7 +30,7 @@ public class MeasurementToolFragment extends Fragment {
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-		mapActivity = (MapActivity) getActivity();
+		MapActivity mapActivity = (MapActivity) getActivity();
 		measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 		IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
 		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
@@ -75,51 +74,64 @@ public class MeasurementToolFragment extends Fragment {
 		exitMeasurementMode();
 	}
 
+	private MapActivity getMapActivity() {
+		return (MapActivity) getActivity();
+	}
+
 	private void updateText() {
 		distanceTv.setText(measurementLayer.getDistanceSt() + ",");
 		pointsTv.setText(pointsSt + ": " + measurementLayer.getPointsCount());
 	}
 
 	private void enterMeasurementMode() {
-		measurementLayer.setInMeasurementMode(true);
-		mapActivity.refreshMap();
-		mapActivity.disableDrawer();
-		mark(View.INVISIBLE, R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
-		mark(View.GONE, R.id.map_route_info_button, R.id.map_menu_button, R.id.map_compass_button, R.id.map_layers_button,
-				R.id.map_search_button, R.id.map_quick_actions_button);
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			measurementLayer.setInMeasurementMode(true);
+			mapActivity.refreshMap();
+			mapActivity.disableDrawer();
+			mark(View.INVISIBLE, R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
+			mark(View.GONE, R.id.map_route_info_button, R.id.map_menu_button, R.id.map_compass_button, R.id.map_layers_button,
+					R.id.map_search_button, R.id.map_quick_actions_button);
 
-		View collapseButton = mapActivity.findViewById(R.id.map_collapse_button);
-		if (collapseButton != null && collapseButton.getVisibility() == View.VISIBLE) {
-			wasCollapseButtonVisible = true;
-			collapseButton.setVisibility(View.INVISIBLE);
-		} else {
-			wasCollapseButtonVisible = false;
+			View collapseButton = mapActivity.findViewById(R.id.map_collapse_button);
+			if (collapseButton != null && collapseButton.getVisibility() == View.VISIBLE) {
+				wasCollapseButtonVisible = true;
+				collapseButton.setVisibility(View.INVISIBLE);
+			} else {
+				wasCollapseButtonVisible = false;
+			}
+
+			updateText();
 		}
-
-		updateText();
 	}
 
 	private void exitMeasurementMode() {
-		measurementLayer.setInMeasurementMode(false);
-		mapActivity.refreshMap();
-		mapActivity.enableDrawer();
-		mark(View.VISIBLE, R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info,
-				R.id.map_route_info_button, R.id.map_menu_button, R.id.map_compass_button, R.id.map_layers_button,
-				R.id.map_search_button, R.id.map_quick_actions_button);
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			measurementLayer.setInMeasurementMode(false);
+			mapActivity.refreshMap();
+			mapActivity.enableDrawer();
+			mark(View.VISIBLE, R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info,
+					R.id.map_route_info_button, R.id.map_menu_button, R.id.map_compass_button, R.id.map_layers_button,
+					R.id.map_search_button, R.id.map_quick_actions_button);
 
-		View collapseButton = mapActivity.findViewById(R.id.map_collapse_button);
-		if (collapseButton != null && wasCollapseButtonVisible) {
-			collapseButton.setVisibility(View.VISIBLE);
+			View collapseButton = mapActivity.findViewById(R.id.map_collapse_button);
+			if (collapseButton != null && wasCollapseButtonVisible) {
+				collapseButton.setVisibility(View.VISIBLE);
+			}
+
+			measurementLayer.clearPoints();
 		}
-
-		measurementLayer.clearPoints();
 	}
 
 	private void mark(int status, int... widgets) {
-		for (int widget : widgets) {
-			View v = mapActivity.findViewById(widget);
-			if (v != null) {
-				v.setVisibility(status);
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			for (int widget : widgets) {
+				View v = mapActivity.findViewById(widget);
+				if (v != null) {
+					v.setVisibility(status);
+				}
 			}
 		}
 	}

From 36d4f5d4ab1e0e0763636724ae81b8a296b596d1 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 1 Aug 2017 15:28:28 +0300
Subject: [PATCH 8/8] Fix possible NPE (2)

---
 .../MeasurementToolFragment.java              | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 2c816b87fb..ef3eb32057 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -19,8 +19,6 @@ public class MeasurementToolFragment extends Fragment {
 
 	public static final String TAG = "MeasurementToolFragment";
 
-	private MeasurementToolLayer measurementLayer;
-
 	private TextView distanceTv;
 	private TextView pointsTv;
 	private String pointsSt;
@@ -31,7 +29,7 @@ public class MeasurementToolFragment extends Fragment {
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		MapActivity mapActivity = (MapActivity) getActivity();
-		measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
+		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 		IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
 		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
@@ -78,14 +76,26 @@ public class MeasurementToolFragment extends Fragment {
 		return (MapActivity) getActivity();
 	}
 
+	private MeasurementToolLayer getMeasurementLayer() {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			return mapActivity.getMapLayers().getMeasurementToolLayer();
+		}
+		return null;
+	}
+
 	private void updateText() {
-		distanceTv.setText(measurementLayer.getDistanceSt() + ",");
-		pointsTv.setText(pointsSt + ": " + measurementLayer.getPointsCount());
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (measurementLayer != null) {
+			distanceTv.setText(measurementLayer.getDistanceSt() + ",");
+			pointsTv.setText(pointsSt + ": " + measurementLayer.getPointsCount());
+		}
 	}
 
 	private void enterMeasurementMode() {
 		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (mapActivity != null && measurementLayer != null) {
 			measurementLayer.setInMeasurementMode(true);
 			mapActivity.refreshMap();
 			mapActivity.disableDrawer();
@@ -107,7 +117,8 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void exitMeasurementMode() {
 		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (mapActivity != null && measurementLayer != null) {
 			measurementLayer.setInMeasurementMode(false);
 			mapActivity.refreshMap();
 			mapActivity.enableDrawer();