From db18af870f1d4cbace8bece138124e86a1019683 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 2 Aug 2017 11:25:08 +0300
Subject: [PATCH 001/174] Show empty state in my tracks

---
 OsmAnd/res/layout/available_gpx.xml                         | 6 ++++++
 .../src/net/osmand/plus/myplaces/AvailableGPXFragment.java  | 3 +++
 OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java  | 4 +---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/available_gpx.xml b/OsmAnd/res/layout/available_gpx.xml
index 56f9dc4bf5..a9c72849b1 100644
--- a/OsmAnd/res/layout/available_gpx.xml
+++ b/OsmAnd/res/layout/available_gpx.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  android:layout_width="match_parent"
 			  android:layout_height="match_parent"
+              android:background="?attr/ctx_menu_info_view_bg"
 			  android:orientation="vertical">
 
  	<ExpandableListView
@@ -17,4 +18,9 @@
         android:drawSelectorOnTop="false"
 		android:groupIndicator="@android:color/transparent"/>
 
+	<TextView
+		android:id="@android:id/empty"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index 05c658efe4..cdb44da1dd 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -327,6 +327,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 		footerView = inflater.inflate(R.layout.list_shadow_footer, null, false);
 		listView.addFooterView(footerView);
+		TextView emptyTextView = (TextView) v.findViewById(android.R.id.empty);
+		emptyTextView.setText("There are no gpx items");
+		listView.setEmptyView(emptyTextView);
 		if (this.adapter != null) {
 			listView.setAdapter(this.adapter);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java b/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
index 54182345a1..aabb05828e 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
@@ -148,9 +148,7 @@ public class FavoritesActivity extends TabActivity {
 
 		List<TabItem> mTabs = new ArrayList<>();
 		mTabs.add(getTabIndicator(FAV_TAB, FavoritesTreeFragment.class));
-		if (hasGpx) {
-			mTabs.add(getTabIndicator(GPX_TAB, AvailableGPXFragment.class));
-		}
+		mTabs.add(getTabIndicator(GPX_TAB, AvailableGPXFragment.class));
 		OsmandPlugin.addMyPlacesTabPlugins(this, mTabs, getIntent());
 		return mTabs;
 	}

From 68e85bbbf3bc05c8049cfb7e665fb6704cb2de42 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 3 Aug 2017 15:32:49 +0300
Subject: [PATCH 002/174] Add empty states

---
 OsmAnd/res/layout/available_gpx.xml           | 50 ++++++++++++++---
 OsmAnd/res/layout/favorites_tree.xml          | 54 +++++++++++++++++--
 OsmAnd/res/values-large/sizes.xml             |  7 +++
 OsmAnd/res/values/sizes.xml                   |  7 +++
 OsmAnd/res/values/strings.xml                 |  4 ++
 .../activities/FavoritesTreeFragment.java     | 18 +++++++
 .../plus/myplaces/AvailableGPXFragment.java   | 14 +++--
 7 files changed, 140 insertions(+), 14 deletions(-)

diff --git a/OsmAnd/res/layout/available_gpx.xml b/OsmAnd/res/layout/available_gpx.xml
index a9c72849b1..1b301f6fbb 100644
--- a/OsmAnd/res/layout/available_gpx.xml
+++ b/OsmAnd/res/layout/available_gpx.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:layout_width="match_parent"
-			  android:layout_height="match_parent"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              xmlns:tools="http://schemas.android.com/tools"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:background="?attr/ctx_menu_info_view_bg"
-			  android:orientation="vertical">
+              android:orientation="vertical">
 
  	<ExpandableListView
 		android:id="@android:id/list"
@@ -18,9 +20,45 @@
         android:drawSelectorOnTop="false"
 		android:groupIndicator="@android:color/transparent"/>
 
-	<TextView
+	<LinearLayout
+		android:gravity="center_horizontal"
 		android:id="@android:id/empty"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"/>
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<ImageView
+            android:layout_marginTop="@dimen/my_places_empty_state_image_margin_top"
+            android:layout_marginBottom="@dimen/my_places_empty_state_image_margin_bottom"
+            android:id="@+id/empty_state_image_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:src="@drawable/ic_empty_state_trip_night_result"/>
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:layout_marginBottom="@dimen/my_places_empty_state_text_interval"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:text="@string/empty_state_my_tracks"
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"
+            android:textSize="@dimen/my_places_empty_state_text_size"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:text="@string/empty_state_my_tracks_desc"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
+
+        <Button
+            android:layout_marginTop="@dimen/my_places_empty_state_button_margin_top"
+            android:id="@+id/import_button"
+            style="@style/DialogActionButton"
+            android:text="@string/shared_string_import"/>
+
+	</LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/favorites_tree.xml b/OsmAnd/res/layout/favorites_tree.xml
index 22324a0e79..b97bed8562 100644
--- a/OsmAnd/res/layout/favorites_tree.xml
+++ b/OsmAnd/res/layout/favorites_tree.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/MainLayout"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
+              xmlns:tools="http://schemas.android.com/tools"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
+              android:id="@+id/MainLayout"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical"
+              android:background="?attr/ctx_menu_info_view_bg">
 
     <ExpandableListView
         android:id="@android:id/list"
@@ -16,6 +19,47 @@
         android:divider="@null"
         android:dividerHeight="0dp"
         android:drawSelectorOnTop="false"
-        android:groupIndicator="@android:color/transparent" />
+        android:groupIndicator="@android:color/transparent"/>
+
+    <LinearLayout
+        android:gravity="center_horizontal"
+        android:id="@android:id/empty"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:layout_marginTop="@dimen/my_places_empty_state_image_margin_top"
+            android:layout_marginBottom="@dimen/my_places_empty_state_image_margin_bottom"
+            android:id="@+id/empty_state_image_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:src="@drawable/ic_empty_state_favorites_night_result"/>
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:layout_marginBottom="@dimen/my_places_empty_state_text_interval"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:text="@string/empty_state_favourites"
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"
+            android:textSize="@dimen/my_places_empty_state_text_size"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:text="@string/empty_state_favourites_desc"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
+
+        <Button
+            android:layout_marginTop="@dimen/my_places_empty_state_button_margin_top"
+            android:id="@+id/import_button"
+            style="@style/DialogActionButton"
+            android:text="@string/shared_string_import"/>
+
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index 375e91283d..84276e0ce5 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -78,5 +78,12 @@
 	<dimen name="default_split_segments_overview">15sp</dimen>
 	<dimen name="default_split_segments_data">15sp</dimen>
 	<dimen name="default_split_segments_sub">12sp</dimen>
+
+	<dimen name="my_places_empty_state_image_margin_top">63dp</dimen>
+	<dimen name="my_places_empty_state_image_margin_bottom">45dp</dimen>
+	<dimen name="my_places_empty_state_text_interval">12dp</dimen>
+	<dimen name="my_places_empty_state_button_margin_top">30dp</dimen>
+	<dimen name="my_places_empty_state_text_size">20sp</dimen>
+	<dimen name="my_places_empty_state_text_desc_size">18sp</dimen>
     
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 5860d32a21..3c7d935f32 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -143,4 +143,11 @@
 
 	<dimen name="splash_screen_logo_top">150dp</dimen>
 	<dimen name="splash_screen_text_bottom">128dp</dimen>
+
+	<dimen name="my_places_empty_state_image_margin_top">42dp</dimen>
+	<dimen name="my_places_empty_state_image_margin_bottom">30dp</dimen>
+	<dimen name="my_places_empty_state_text_interval">8dp</dimen>
+	<dimen name="my_places_empty_state_button_margin_top">20dp</dimen>
+	<dimen name="my_places_empty_state_text_size">18sp</dimen>
+	<dimen name="my_places_empty_state_text_desc_size">16sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 03eeb868bc..9fa0446b58 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2662,4 +2662,8 @@
     <string name="retry">Retry</string>
     <string name="add_gpx_waypoint_bottom_sheet_title">Add gpx waypoint</string>
     <string name="shared_string_create">Create</string>
+    <string name="empty_state_my_tracks">Add and Record Tracks</string>
+    <string name="empty_state_my_tracks_desc">Record or import tracks to view</string>
+    <string name="empty_state_favourites">Add Favorites</string>
+    <string name="empty_state_favourites_desc">Add favorites on map or import them from filesystem</string>
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index 9d305cb72c..68f7815dfe 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -21,6 +21,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.ExpandableListView;
 import android.widget.Filter;
@@ -76,6 +77,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 	private FavouritesAdapter favouritesAdapter = new FavouritesAdapter();
 	private FavouritesDbHelper helper;
 
+	private OsmandApplication app;
 	private boolean selectionMode = false;
 	private Set<FavouritePoint> favoritesSelected = new LinkedHashSet<>();
 	private Set<FavoriteGroup> groupsToDelete = new LinkedHashSet<>();
@@ -88,6 +90,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 	@Override
 	public void onAttach(Context context) {
 		super.onAttach(context);
+		this.app = (OsmandApplication) getActivity().getApplication();
 
 		helper = getMyApplication().getFavorites();
 		favouritesAdapter.synchronizeGroups();
@@ -156,6 +159,17 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 			footerView = inflater.inflate(R.layout.list_shadow_footer, null, false);
 			listView.addFooterView(footerView);
 		}
+		View emptyView = view.findViewById(android.R.id.empty);
+		ImageView emptyImageView = (ImageView) emptyView.findViewById(R.id.empty_state_image_view);
+		emptyImageView.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_empty_state_favorites_day_result : R.drawable.ic_empty_state_favorites_night_result);
+		Button importButton = (Button) emptyView.findViewById(R.id.import_button);
+		importButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				addTrack();
+			}
+		});
+		listView.setEmptyView(emptyView);
 		listView.setAdapter(favouritesAdapter);
 		setListView(listView);
 		setHasOptionsMenu(true);
@@ -467,6 +481,10 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 		}
 	}
 
+	private void addTrack() {
+		((FavoritesActivity) getActivity()).addTrack();
+	}
+
 	public void shareFavorites(final FavoriteGroup group) {
 		final AsyncTask<Void, Void, Void> exportTask = new AsyncTask<Void, Void, Void>() {
 
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index 306b325524..ed70f41a77 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -327,9 +327,17 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 		footerView = inflater.inflate(R.layout.list_shadow_footer, null, false);
 		listView.addFooterView(footerView);
-		TextView emptyTextView = (TextView) v.findViewById(android.R.id.empty);
-		emptyTextView.setText("There are no gpx items");
-		listView.setEmptyView(emptyTextView);
+		View emptyView = v.findViewById(android.R.id.empty);
+		ImageView emptyImageView = (ImageView) emptyView.findViewById(R.id.empty_state_image_view);
+		emptyImageView.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_empty_state_trip_day_result : R.drawable.ic_empty_state_trip_night_result);
+		Button importButton = (Button) emptyView.findViewById(R.id.import_button);
+		importButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				addTrack();
+			}
+		});
+		listView.setEmptyView(emptyView);
 		if (this.adapter != null) {
 			listView.setAdapter(this.adapter);
 		}

From 9321434c74eea60e4147ed53e285955768498a6e Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 4 Aug 2017 18:59:48 +0300
Subject: [PATCH 003/174] Add displaying of the points

---
 .../res/layout/fragment_measurement_tool.xml  |  2 +-
 .../res/layout/measure_points_list_item.xml   | 68 ++++++++++++++++
 .../MeasurementToolAdapter.java               | 81 +++++++++++++++++++
 .../MeasurementToolFragment.java              |  6 ++
 4 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 OsmAnd/res/layout/measure_points_list_item.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 9b2d999161..3b1093abcc 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -92,7 +92,7 @@
             <include layout="@layout/card_bottom_divider"/>
 
             <android.support.v7.widget.RecyclerView
-                android:id="@+id/points_recycler_view"
+                android:id="@+id/measure_points_recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="215dp"/>
 
diff --git a/OsmAnd/res/layout/measure_points_list_item.xml b/OsmAnd/res/layout/measure_points_list_item.xml
new file mode 100644
index 0000000000..0c06b7e645
--- /dev/null
+++ b/OsmAnd/res/layout/measure_points_list_item.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="48dp">
+
+    <android.support.v7.widget.AppCompatImageView
+        android:id="@+id/measure_point_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_marginEnd="24dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="24dp"
+        android:layout_marginStart="16dp"
+        tools:src="@drawable/ic_action_measure_point"/>
+
+    <ImageButton
+        android:id="@+id/measure_point_remove_image_button"
+        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="16dp"
+        android:layout_marginStart="16dp"
+        android:background="@null"
+        tools:src="@drawable/ic_action_remove_dark"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toEndOf="@+id/measure_point_icon"
+        android:layout_toLeftOf="@id/measure_point_remove_image_button"
+        android:layout_toRightOf="@+id/measure_point_icon"
+        android:layout_toStartOf="@id/measure_point_remove_image_button"
+        android:orientation="vertical">
+
+        <android.support.v7.widget.AppCompatTextView
+            android:id="@+id/measure_point_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="@dimen/default_desc_text_size"
+            tools:text="@string/plugin_distance_point"/>
+
+        <android.support.v7.widget.AppCompatTextView
+            android:id="@+id/measure_point_descr"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="@dimen/default_sub_text_size"
+            tools:text="@string/shared_string_control_start"/>
+    </LinearLayout>
+
+    <View
+        android:layout_width="wrap_content"
+        android:layout_height="1dp"
+        android:layout_alignParentBottom="true"
+        android:layout_toEndOf="@+id/measure_point_icon"
+        android:layout_toRightOf="@+id/measure_point_icon"
+        android:background="?attr/dashboard_divider"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
new file mode 100644
index 0000000000..8d4d1817bf
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
@@ -0,0 +1,81 @@
+package net.osmand.plus.measurementtool;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import net.osmand.plus.GPXUtilities.WptPt;
+import net.osmand.plus.IconsCache;
+import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.util.MapUtils;
+
+import java.util.List;
+
+class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter.Holder> {
+
+	private MapActivity mapActivity;
+	private List<WptPt> points;
+
+	public MeasurementToolAdapter(MapActivity mapActivity, List<WptPt> points) {
+		this.mapActivity = mapActivity;
+		this.points = points;
+	}
+
+	@Override
+	public Holder onCreateViewHolder(ViewGroup viewGroup, int i) {
+		View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.measure_points_list_item, viewGroup, false);
+		return new Holder(view);
+	}
+
+	@Override
+	public void onBindViewHolder(final Holder holder, int pos) {
+		IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
+		holder.icon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_measure_point));
+		holder.title.setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
+		if (pos < 1) {
+			holder.descr.setText(mapActivity.getString(R.string.shared_string_control_start));
+		} else {
+			float dist = 0;
+			for (int i = 1; i <= pos; i++) {
+				dist += MapUtils.getDistance(points.get(i - 1).lat, points.get(i - 1).lon,
+						points.get(i).lat, points.get(i).lon);
+			}
+			holder.descr.setText(OsmAndFormatter.getFormattedDistance(dist, mapActivity.getMyApplication()));
+		}
+		holder.deleteBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_remove_dark));
+		holder.deleteBtn.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				Toast.makeText(mapActivity, "Remove: " + holder.getAdapterPosition(), Toast.LENGTH_SHORT).show();
+			}
+		});
+	}
+
+	@Override
+	public int getItemCount() {
+		return points.size();
+	}
+
+	static class Holder extends RecyclerView.ViewHolder {
+
+		final ImageView icon;
+		final TextView title;
+		final TextView descr;
+		final ImageButton deleteBtn;
+
+		public Holder(View view) {
+			super(view);
+			icon = (ImageView) view.findViewById(R.id.measure_point_icon);
+			title = (TextView) view.findViewById(R.id.measure_point_title);
+			descr = (TextView) view.findViewById(R.id.measure_point_descr);
+			deleteBtn = (ImageButton) view.findViewById(R.id.measure_point_remove_image_button);
+		}
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 52b63cc52b..ecc11e895c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -10,6 +10,8 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SwitchCompat;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -188,6 +190,10 @@ public class MeasurementToolFragment extends Fragment {
 			mapActivity.showTopToolbar(toolBarController);
 		}
 
+		RecyclerView rv = mainView.findViewById(R.id.measure_points_recycler_view);
+		rv.setLayoutManager(new LinearLayoutManager(getContext()));
+		rv.setAdapter(new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints()));
+
 		return view;
 	}
 

From 240bcd8f01b6cae3bcf809bc26bfab36815afb03 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 4 Aug 2017 19:00:58 +0300
Subject: [PATCH 004/174] Styling

---
 .../layout-land/empty_state_favourites.xml    | 54 +++++++++++++++++++
 .../res/layout-land/empty_state_my_tracks.xml | 54 +++++++++++++++++++
 OsmAnd/res/layout/available_gpx.xml           | 43 +--------------
 OsmAnd/res/layout/empty_state_favourites.xml  | 46 ++++++++++++++++
 OsmAnd/res/layout/empty_state_my_tracks.xml   | 46 ++++++++++++++++
 OsmAnd/res/layout/favorites_tree.xml          | 43 +--------------
 OsmAnd/res/values-large/sizes.xml             |  1 +
 OsmAnd/res/values/sizes.xml                   |  1 +
 8 files changed, 204 insertions(+), 84 deletions(-)
 create mode 100644 OsmAnd/res/layout-land/empty_state_favourites.xml
 create mode 100644 OsmAnd/res/layout-land/empty_state_my_tracks.xml
 create mode 100644 OsmAnd/res/layout/empty_state_favourites.xml
 create mode 100644 OsmAnd/res/layout/empty_state_my_tracks.xml

diff --git a/OsmAnd/res/layout-land/empty_state_favourites.xml b/OsmAnd/res/layout-land/empty_state_favourites.xml
new file mode 100644
index 0000000000..8eae7cb645
--- /dev/null
+++ b/OsmAnd/res/layout-land/empty_state_favourites.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:id="@android:id/empty"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center"
+              android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/empty_state_image_view"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        tools:src="@drawable/ic_empty_state_favorites_night_result"/>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/my_places_empty_state_text_interval"
+            android:background="@null"
+            android:text="@string/empty_state_favourites"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="@dimen/my_places_empty_state_text_size"
+            osmand:typeface="@string/font_roboto_medium"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/empty_state_text_desc_margin"
+            android:layout_marginRight="@dimen/empty_state_text_desc_margin"
+            android:background="@null"
+            android:gravity="center"
+            android:text="@string/empty_state_favourites_desc"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
+
+        <Button
+            android:id="@+id/import_button"
+            style="@style/DialogActionButton"
+            android:layout_marginTop="@dimen/my_places_empty_state_button_margin_top"
+            android:text="@string/shared_string_import"/>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout-land/empty_state_my_tracks.xml b/OsmAnd/res/layout-land/empty_state_my_tracks.xml
new file mode 100644
index 0000000000..785e8cafea
--- /dev/null
+++ b/OsmAnd/res/layout-land/empty_state_my_tracks.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:id="@android:id/empty"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center"
+              android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/empty_state_image_view"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        tools:src="@drawable/ic_empty_state_trip_night_result"/>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/my_places_empty_state_text_interval"
+            android:background="@null"
+            android:text="@string/empty_state_my_tracks"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="@dimen/my_places_empty_state_text_size"
+            osmand:typeface="@string/font_roboto_medium"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/empty_state_text_desc_margin"
+            android:layout_marginRight="@dimen/empty_state_text_desc_margin"
+            android:background="@null"
+            android:gravity="center"
+            android:text="@string/empty_state_my_tracks_desc"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
+
+        <Button
+            android:id="@+id/import_button"
+            style="@style/DialogActionButton"
+            android:layout_marginTop="@dimen/my_places_empty_state_button_margin_top"
+            android:text="@string/shared_string_import"/>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/available_gpx.xml b/OsmAnd/res/layout/available_gpx.xml
index 1b301f6fbb..227b73b025 100644
--- a/OsmAnd/res/layout/available_gpx.xml
+++ b/OsmAnd/res/layout/available_gpx.xml
@@ -2,8 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              xmlns:tools="http://schemas.android.com/tools"
-              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:background="?attr/ctx_menu_info_view_bg"
               android:orientation="vertical">
 
@@ -20,45 +18,6 @@
         android:drawSelectorOnTop="false"
 		android:groupIndicator="@android:color/transparent"/>
 
-	<LinearLayout
-		android:gravity="center_horizontal"
-		android:id="@android:id/empty"
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<ImageView
-            android:layout_marginTop="@dimen/my_places_empty_state_image_margin_top"
-            android:layout_marginBottom="@dimen/my_places_empty_state_image_margin_bottom"
-            android:id="@+id/empty_state_image_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:src="@drawable/ic_empty_state_trip_night_result"/>
-
-        <net.osmand.plus.widgets.TextViewEx
-            android:layout_marginBottom="@dimen/my_places_empty_state_text_interval"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:text="@string/empty_state_my_tracks"
-            android:textColor="?android:attr/textColorPrimary"
-            osmand:typeface="@string/font_roboto_medium"
-            android:textSize="@dimen/my_places_empty_state_text_size"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:text="@string/empty_state_my_tracks_desc"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
-
-        <Button
-            android:layout_marginTop="@dimen/my_places_empty_state_button_margin_top"
-            android:id="@+id/import_button"
-            style="@style/DialogActionButton"
-            android:text="@string/shared_string_import"/>
-
-	</LinearLayout>
+	<include layout="@layout/empty_state_my_tracks"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/empty_state_favourites.xml b/OsmAnd/res/layout/empty_state_favourites.xml
new file mode 100644
index 0000000000..67601184b4
--- /dev/null
+++ b/OsmAnd/res/layout/empty_state_favourites.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
+              android:id="@android:id/empty"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center_horizontal"
+              android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/empty_state_image_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/my_places_empty_state_image_margin_bottom"
+        android:layout_marginTop="@dimen/my_places_empty_state_image_margin_top"
+        tools:src="@drawable/ic_empty_state_favorites_night_result"/>
+
+    <net.osmand.plus.widgets.TextViewEx
+        osmand:typeface="@string/font_roboto_medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/my_places_empty_state_text_interval"
+        android:background="@null"
+        android:text="@string/empty_state_favourites"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="@dimen/my_places_empty_state_text_size"/>
+
+    <TextView
+        android:gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@null"
+        android:layout_marginLeft="@dimen/empty_state_text_desc_margin"
+        android:layout_marginRight="@dimen/empty_state_text_desc_margin"
+        android:text="@string/empty_state_favourites_desc"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
+
+    <Button
+        android:id="@+id/import_button"
+        style="@style/DialogActionButton"
+        android:layout_marginTop="@dimen/my_places_empty_state_button_margin_top"
+        android:text="@string/shared_string_import"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/empty_state_my_tracks.xml b/OsmAnd/res/layout/empty_state_my_tracks.xml
new file mode 100644
index 0000000000..f7b474059d
--- /dev/null
+++ b/OsmAnd/res/layout/empty_state_my_tracks.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:id="@android:id/empty"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center_horizontal"
+              android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/empty_state_image_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/my_places_empty_state_image_margin_bottom"
+        android:layout_marginTop="@dimen/my_places_empty_state_image_margin_top"
+        tools:src="@drawable/ic_empty_state_trip_night_result"/>
+
+    <net.osmand.plus.widgets.TextViewEx
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/my_places_empty_state_text_interval"
+        android:background="@null"
+        android:text="@string/empty_state_my_tracks"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="@dimen/my_places_empty_state_text_size"
+        osmand:typeface="@string/font_roboto_medium"/>
+
+    <TextView
+        android:gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@null"
+        android:layout_marginLeft="@dimen/empty_state_text_desc_margin"
+        android:layout_marginRight="@dimen/empty_state_text_desc_margin"
+        android:text="@string/empty_state_my_tracks_desc"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
+
+    <Button
+        android:id="@+id/import_button"
+        style="@style/DialogActionButton"
+        android:layout_marginTop="@dimen/my_places_empty_state_button_margin_top"
+        android:text="@string/shared_string_import"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/favorites_tree.xml b/OsmAnd/res/layout/favorites_tree.xml
index b97bed8562..b7e0d85994 100644
--- a/OsmAnd/res/layout/favorites_tree.xml
+++ b/OsmAnd/res/layout/favorites_tree.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:id="@+id/MainLayout"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
@@ -21,45 +19,6 @@
         android:drawSelectorOnTop="false"
         android:groupIndicator="@android:color/transparent"/>
 
-    <LinearLayout
-        android:gravity="center_horizontal"
-        android:id="@android:id/empty"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:layout_marginTop="@dimen/my_places_empty_state_image_margin_top"
-            android:layout_marginBottom="@dimen/my_places_empty_state_image_margin_bottom"
-            android:id="@+id/empty_state_image_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:src="@drawable/ic_empty_state_favorites_night_result"/>
-
-        <net.osmand.plus.widgets.TextViewEx
-            android:layout_marginBottom="@dimen/my_places_empty_state_text_interval"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:text="@string/empty_state_favourites"
-            android:textColor="?android:attr/textColorPrimary"
-            osmand:typeface="@string/font_roboto_medium"
-            android:textSize="@dimen/my_places_empty_state_text_size"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:text="@string/empty_state_favourites_desc"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
-
-        <Button
-            android:layout_marginTop="@dimen/my_places_empty_state_button_margin_top"
-            android:id="@+id/import_button"
-            style="@style/DialogActionButton"
-            android:text="@string/shared_string_import"/>
-
-    </LinearLayout>
+    <include layout="@layout/empty_state_favourites"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index 84276e0ce5..dfceed1d08 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -85,5 +85,6 @@
 	<dimen name="my_places_empty_state_button_margin_top">30dp</dimen>
 	<dimen name="my_places_empty_state_text_size">20sp</dimen>
 	<dimen name="my_places_empty_state_text_desc_size">18sp</dimen>
+	<dimen name="empty_state_text_desc_margin">68dp</dimen>
     
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 3c7d935f32..925beb26e1 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -150,4 +150,5 @@
 	<dimen name="my_places_empty_state_button_margin_top">20dp</dimen>
 	<dimen name="my_places_empty_state_text_size">18sp</dimen>
 	<dimen name="my_places_empty_state_text_desc_size">16sp</dimen>
+	<dimen name="empty_state_text_desc_margin">45dp</dimen>
 </resources>
\ No newline at end of file

From cda30a29571108e4e168bf21adab96f697744da1 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 7 Aug 2017 13:05:11 +0300
Subject: [PATCH 005/174] Add the ability to delete points from the list; add
 small changes

---
 .../MeasurementToolAdapter.java               | 17 ++++++++---
 .../MeasurementToolFragment.java              | 29 +++++++++++++++++--
 .../measurementtool/MeasurementToolLayer.java | 10 +++++--
 3 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
index 8d4d1817bf..8304957b3b 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
@@ -7,7 +7,6 @@ import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.IconsCache;
@@ -22,12 +21,17 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 
 	private MapActivity mapActivity;
 	private List<WptPt> points;
+	private RemovePointListener listener;
 
-	public MeasurementToolAdapter(MapActivity mapActivity, List<WptPt> points) {
+	MeasurementToolAdapter(MapActivity mapActivity, List<WptPt> points) {
 		this.mapActivity = mapActivity;
 		this.points = points;
 	}
 
+	public void setListener(RemovePointListener listener) {
+		this.listener = listener;
+	}
+
 	@Override
 	public Holder onCreateViewHolder(ViewGroup viewGroup, int i) {
 		View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.measure_points_list_item, viewGroup, false);
@@ -53,7 +57,8 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 		holder.deleteBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				Toast.makeText(mapActivity, "Remove: " + holder.getAdapterPosition(), Toast.LENGTH_SHORT).show();
+				points.remove(holder.getAdapterPosition());
+				listener.onPointRemove();
 			}
 		});
 	}
@@ -70,7 +75,7 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 		final TextView descr;
 		final ImageButton deleteBtn;
 
-		public Holder(View view) {
+		Holder(View view) {
 			super(view);
 			icon = (ImageView) view.findViewById(R.id.measure_point_icon);
 			title = (TextView) view.findViewById(R.id.measure_point_title);
@@ -78,4 +83,8 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 			deleteBtn = (ImageButton) view.findViewById(R.id.measure_point_remove_image_button);
 		}
 	}
+
+	interface RemovePointListener {
+		void onPointRemove();
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index c9c6cd1261..3f27bfc949 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -55,6 +55,7 @@ public class MeasurementToolFragment extends Fragment {
 	public static final String TAG = "MeasurementToolFragment";
 
 	private MeasurementToolBarController toolBarController;
+	private MeasurementToolAdapter adapter;
 	private TextView distanceTv;
 	private TextView pointsTv;
 	private String pointsSt;
@@ -111,10 +112,13 @@ public class MeasurementToolFragment extends Fragment {
 				if (measurementLayer.undoPointOnClick()) {
 					enable(undoBtn);
 				} else {
-					disable(undoBtn);
+					disable(undoBtn, upDownBtn);
+					downBtnOnClick(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
 				}
+				adapter.notifyDataSetChanged();
 				enable(redoBtn);
 				updateText();
+				mapActivity.refreshMap();
 			}
 		});
 
@@ -127,8 +131,10 @@ public class MeasurementToolFragment extends Fragment {
 				} else {
 					disable(redoBtn);
 				}
-				enable(undoBtn);
+				adapter.notifyDataSetChanged();
+				enable(undoBtn, upDownBtn);
 				updateText();
+				mapActivity.refreshMap();
 			}
 		});
 
@@ -139,6 +145,7 @@ public class MeasurementToolFragment extends Fragment {
 				enable(undoBtn, upDownBtn);
 				disable(redoBtn);
 				updateText();
+				adapter.notifyDataSetChanged();
 			}
 		});
 
@@ -190,9 +197,24 @@ public class MeasurementToolFragment extends Fragment {
 			mapActivity.showTopToolbar(toolBarController);
 		}
 
+		adapter = new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints());
+		adapter.setListener(new MeasurementToolAdapter.RemovePointListener() {
+			@Override
+			public void onPointRemove() {
+				adapter.notifyDataSetChanged();
+				measurementLayer.resetCachePoints();
+				disable(redoBtn);
+				updateText();
+				mapActivity.refreshMap();
+				if (measurementLayer.getPointsCount() < 1) {
+					downBtnOnClick(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
+					disable(upDownBtn, undoBtn);
+				}
+			}
+		});
 		RecyclerView rv = mainView.findViewById(R.id.measure_points_recycler_view);
 		rv.setLayoutManager(new LinearLayoutManager(getContext()));
-		rv.setAdapter(new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints()));
+		rv.setAdapter(adapter);
 
 		return view;
 	}
@@ -342,6 +364,7 @@ public class MeasurementToolFragment extends Fragment {
 	public void onDestroyView() {
 		super.onDestroyView();
 		exitMeasurementMode();
+		adapter.setListener(null);
 	}
 
 	private MapActivity getMapActivity() {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 1ea5208cc6..6399e949ba 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -34,7 +34,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private Bitmap centerIconNight;
 	private Bitmap pointIcon;
 	private Paint bitmapPaint;
-	private RenderingLineAttributes lineAttrs = new RenderingLineAttributes("rulerLine");
+	private RenderingLineAttributes lineAttrs = new RenderingLineAttributes("measureDistanceLine");
 	private Path path = new Path();
 	private int marginX;
 	private int marginY;
@@ -70,7 +70,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return measurementPoints.size();
 	}
 
-	public LinkedList<WptPt> getMeasurementPoints() {
+	LinkedList<WptPt> getMeasurementPoints() {
 		return measurementPoints;
 	}
 
@@ -141,6 +141,10 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		canvas.rotate(tb.getRotate(), center.x, center.y);
 	}
 
+	void resetCachePoints() {
+		cacheMeasurementPoints = new LinkedList<>(measurementPoints);
+	}
+
 	void addPointOnClick() {
 		RotatedTileBox tb = view.getCurrentRotatedTileBox();
 		LatLon l = tb.getLatLonFromPixel(tb.getCenterPixelX(), tb.getCenterPixelY());
@@ -154,7 +158,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		} else {
 			measurementPoints.add(pt);
 		}
-		cacheMeasurementPoints = new LinkedList<>(measurementPoints);
+		resetCachePoints();
 		view.refreshMap();
 	}
 

From 3066ba2ee0f7aa8115415457b5f0e0388ba676a9 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 7 Aug 2017 14:59:18 +0300
Subject: [PATCH 006/174] Fix layouts

---
 OsmAnd/res/layout/fragment_measurement_tool.xml        | 10 +++++-----
 OsmAnd/res/layout/measure_points_list_item.xml         |  7 +++++--
 .../plus/measurementtool/MeasurementToolAdapter.java   |  4 ++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 3b1093abcc..79ae72fa65 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -81,12 +81,11 @@
             android:layout_height="1dp"
             android:background="?attr/dashboard_divider"/>
 
-        <LinearLayout
+        <FrameLayout
             android:id="@+id/points_list_container"
             android:layout_width="match_parent"
             android:layout_height="220dp"
             android:background="@color/ctx_menu_info_view_bg_dark"
-            android:orientation="vertical"
             android:visibility="gone">
 
             <include layout="@layout/card_bottom_divider"/>
@@ -94,14 +93,15 @@
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/measure_points_recycler_view"
                 android:layout_width="match_parent"
-                android:layout_height="215dp"/>
+                android:layout_height="match_parent"/>
 
             <ImageView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="5dp"
+                android:layout_gravity="bottom"
                 android:scaleType="fitXY"
                 android:src="@drawable/bg_shadow_onmap"/>
-        </LinearLayout>
+        </FrameLayout>
 
         <RelativeLayout
             android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/measure_points_list_item.xml b/OsmAnd/res/layout/measure_points_list_item.xml
index 0c06b7e645..a24901c3c1 100644
--- a/OsmAnd/res/layout/measure_points_list_item.xml
+++ b/OsmAnd/res/layout/measure_points_list_item.xml
@@ -25,9 +25,11 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="16dp"
-        android:layout_marginStart="16dp"
         android:background="@null"
+        android:paddingBottom="12dp"
+        android:paddingEnd="16dp"
+        android:paddingStart="16dp"
+        android:paddingTop="12dp"
         tools:src="@drawable/ic_action_remove_dark"/>
 
     <LinearLayout
@@ -58,6 +60,7 @@
     </LinearLayout>
 
     <View
+        android:id="@+id/points_divider"
         android:layout_width="wrap_content"
         android:layout_height="1dp"
         android:layout_alignParentBottom="true"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
index 8304957b3b..8eb26781fa 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
@@ -35,6 +35,10 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 	@Override
 	public Holder onCreateViewHolder(ViewGroup viewGroup, int i) {
 		View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.measure_points_list_item, viewGroup, false);
+		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		if (!nightMode) {
+			view.findViewById(R.id.points_divider).setBackgroundResource(R.drawable.divider);
+		}
 		return new Holder(view);
 	}
 

From 2ef81d2048daada3d23f3184f5119d91cecfe256 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 7 Aug 2017 17:05:57 +0300
Subject: [PATCH 007/174] Replace RecyclerView with ListView

---
 .../res/layout/fragment_measurement_tool.xml  |  6 +--
 .../MeasurementToolAdapter.java               | 54 ++++++++++---------
 .../MeasurementToolFragment.java              | 15 +++---
 3 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 79ae72fa65..6b684dfd9b 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -84,14 +84,14 @@
         <FrameLayout
             android:id="@+id/points_list_container"
             android:layout_width="match_parent"
-            android:layout_height="220dp"
+            android:layout_height="180dp"
             android:background="@color/ctx_menu_info_view_bg_dark"
             android:visibility="gone">
 
             <include layout="@layout/card_bottom_divider"/>
 
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/measure_points_recycler_view"
+            <ListView
+                android:id="@+id/measure_points_list_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"/>
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
index 8eb26781fa..7c9346334a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
@@ -1,9 +1,13 @@
 package net.osmand.plus.measurementtool;
 
-import android.support.v7.widget.RecyclerView;
+import android.content.Context;
+import android.support.annotation.LayoutRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -17,33 +21,39 @@ import net.osmand.util.MapUtils;
 
 import java.util.List;
 
-class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter.Holder> {
+class MeasurementToolAdapter extends ArrayAdapter<WptPt> {
 
 	private MapActivity mapActivity;
 	private List<WptPt> points;
 	private RemovePointListener listener;
 
-	MeasurementToolAdapter(MapActivity mapActivity, List<WptPt> points) {
-		this.mapActivity = mapActivity;
+	MeasurementToolAdapter(@NonNull Context context, @LayoutRes int resource, List<WptPt> points) {
+		super(context, resource, points);
+		this.mapActivity = (MapActivity) context;
 		this.points = points;
 	}
 
-	public void setListener(RemovePointListener listener) {
+	void setRemovePointListener(RemovePointListener listener) {
 		this.listener = listener;
 	}
 
+	@NonNull
 	@Override
-	public Holder onCreateViewHolder(ViewGroup viewGroup, int i) {
-		View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.measure_points_list_item, viewGroup, false);
-		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
-		if (!nightMode) {
-			view.findViewById(R.id.points_divider).setBackgroundResource(R.drawable.divider);
-		}
-		return new Holder(view);
-	}
+	public View getView(final int pos, @Nullable View view, @NonNull ViewGroup parent) {
+		ViewHolder holder;
+
+		if (view == null) {
+			view = LayoutInflater.from(parent.getContext()).inflate(R.layout.measure_points_list_item, parent, false);
+			final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+			if (!nightMode) {
+				view.findViewById(R.id.points_divider).setBackgroundResource(R.drawable.divider);
+			}
+			holder = new ViewHolder(view);
+			view.setTag(holder);
+		} else {
+			holder = (ViewHolder) view.getTag();
+		}
 
-	@Override
-	public void onBindViewHolder(final Holder holder, int pos) {
 		IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
 		holder.icon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_measure_point));
 		holder.title.setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
@@ -61,26 +71,22 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 		holder.deleteBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				points.remove(holder.getAdapterPosition());
+				points.remove(pos);
 				listener.onPointRemove();
 			}
 		});
+
+		return view;
 	}
 
-	@Override
-	public int getItemCount() {
-		return points.size();
-	}
-
-	static class Holder extends RecyclerView.ViewHolder {
+	private static class ViewHolder {
 
 		final ImageView icon;
 		final TextView title;
 		final TextView descr;
 		final ImageButton deleteBtn;
 
-		Holder(View view) {
-			super(view);
+		ViewHolder(View view) {
 			icon = (ImageView) view.findViewById(R.id.measure_point_icon);
 			title = (TextView) view.findViewById(R.id.measure_point_title);
 			descr = (TextView) view.findViewById(R.id.measure_point_descr);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 3f27bfc949..fa93a95231 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -10,8 +10,6 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SwitchCompat;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -24,6 +22,7 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -197,8 +196,8 @@ public class MeasurementToolFragment extends Fragment {
 			mapActivity.showTopToolbar(toolBarController);
 		}
 
-		adapter = new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints());
-		adapter.setListener(new MeasurementToolAdapter.RemovePointListener() {
+		adapter = new MeasurementToolAdapter(getMapActivity(), R.layout.measure_points_list_item, measurementLayer.getMeasurementPoints());
+		adapter.setRemovePointListener(new MeasurementToolAdapter.RemovePointListener() {
 			@Override
 			public void onPointRemove() {
 				adapter.notifyDataSetChanged();
@@ -212,9 +211,9 @@ public class MeasurementToolFragment extends Fragment {
 				}
 			}
 		});
-		RecyclerView rv = mainView.findViewById(R.id.measure_points_recycler_view);
-		rv.setLayoutManager(new LinearLayoutManager(getContext()));
-		rv.setAdapter(adapter);
+		ListView lv = mainView.findViewById(R.id.measure_points_list_view);
+		lv.setDivider(null);
+		lv.setAdapter(adapter);
 
 		return view;
 	}
@@ -364,7 +363,7 @@ public class MeasurementToolFragment extends Fragment {
 	public void onDestroyView() {
 		super.onDestroyView();
 		exitMeasurementMode();
-		adapter.setListener(null);
+		adapter.setRemovePointListener(null);
 	}
 
 	private MapActivity getMapActivity() {

From 191505c0c2547fbc76a304ab8fb68ed711cf6806 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 7 Aug 2017 17:28:58 +0300
Subject: [PATCH 008/174] Add ability to move map to the selected point

---
 OsmAnd/res/layout/measure_points_list_item.xml             | 4 +++-
 .../plus/measurementtool/MeasurementToolFragment.java      | 7 +++++++
 .../osmand/plus/measurementtool/MeasurementToolLayer.java  | 5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/layout/measure_points_list_item.xml b/OsmAnd/res/layout/measure_points_list_item.xml
index a24901c3c1..7932721f15 100644
--- a/OsmAnd/res/layout/measure_points_list_item.xml
+++ b/OsmAnd/res/layout/measure_points_list_item.xml
@@ -3,7 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="48dp">
+    android:layout_height="48dp"
+    android:descendantFocusability="blocksDescendants">
 
     <android.support.v7.widget.AppCompatImageView
         android:id="@+id/measure_point_icon"
@@ -26,6 +27,7 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:background="@null"
+        android:focusableInTouchMode="true"
         android:paddingBottom="12dp"
         android:paddingEnd="16dp"
         android:paddingStart="16dp"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index fa93a95231..050a8331f0 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -19,6 +19,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -214,6 +215,12 @@ public class MeasurementToolFragment extends Fragment {
 		ListView lv = mainView.findViewById(R.id.measure_points_list_view);
 		lv.setDivider(null);
 		lv.setAdapter(adapter);
+		lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+			@Override
+			public void onItemClick(AdapterView<?> adapterView, View view, int pos, long l) {
+				measurementLayer.moveMapToPoint(pos);
+			}
+		});
 
 		return view;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 6399e949ba..d699016cf4 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -178,6 +178,11 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return cacheMeasurementPoints.size() > measurementPoints.size();
 	}
 
+	void moveMapToPoint(int pos) {
+		WptPt pt = measurementPoints.get(pos);
+		view.getAnimatedDraggingThread().startMoving(pt.getLatitude(), pt.getLongitude(), view.getZoom(), true);
+	}
+
 	@Override
 	public void destroyLayer() {
 

From cade8b05f2865eb0d1f5e67a74360a597cd13006 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 7 Aug 2017 17:52:15 +0300
Subject: [PATCH 009/174] Add final modifiers

---
 .../plus/measurementtool/MeasurementToolAdapter.java   |  4 ++--
 .../plus/measurementtool/MeasurementToolLayer.java     | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
index 7c9346334a..5062915c27 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
@@ -23,8 +23,8 @@ import java.util.List;
 
 class MeasurementToolAdapter extends ArrayAdapter<WptPt> {
 
-	private MapActivity mapActivity;
-	private List<WptPt> points;
+	private final MapActivity mapActivity;
+	private final List<WptPt> points;
 	private RemovePointListener listener;
 
 	MeasurementToolAdapter(@NonNull Context context, @LayoutRes int resource, List<WptPt> points) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index d699016cf4..722b59b5b2 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -28,18 +28,18 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 
 	private OsmandMapTileView view;
 	private boolean inMeasurementMode;
-	private LinkedList<WptPt> measurementPoints = new LinkedList<>();
+	private final LinkedList<WptPt> measurementPoints = new LinkedList<>();
 	private LinkedList<WptPt> cacheMeasurementPoints = new LinkedList<>();
 	private Bitmap centerIconDay;
 	private Bitmap centerIconNight;
 	private Bitmap pointIcon;
 	private Paint bitmapPaint;
-	private RenderingLineAttributes lineAttrs = new RenderingLineAttributes("measureDistanceLine");
-	private Path path = new Path();
+	private final RenderingLineAttributes lineAttrs = new RenderingLineAttributes("measureDistanceLine");
+	private final Path path = new Path();
 	private int marginX;
 	private int marginY;
-	private TIntArrayList tx = new TIntArrayList();
-	private TIntArrayList ty = new TIntArrayList();
+	private final TIntArrayList tx = new TIntArrayList();
+	private final TIntArrayList ty = new TIntArrayList();
 
 	@Override
 	public void initLayer(OsmandMapTileView view) {

From 43a1873af25c6f90c4623103393f4a08d49b138b Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Mon, 7 Aug 2017 18:03:40 +0300
Subject: [PATCH 010/174] Fix empty states

---
 .../layout-land/empty_state_favourites.xml    |  24 ++--
 .../res/layout-land/empty_state_my_tracks.xml |  24 ++--
 OsmAnd/res/layout/empty_state_favourites.xml  |   4 +-
 OsmAnd/res/layout/empty_state_my_tracks.xml   |   4 +-
 OsmAnd/res/values-land/sizes.xml              |   3 +
 OsmAnd/res/values-large-land/sizes.xml        |   5 +
 OsmAnd/res/values-large/sizes.xml             |   6 +-
 OsmAnd/res/values/sizes.xml                   |   6 +-
 OsmAnd/res/values/strings.xml                 |   2 +
 .../activities/FavoritesTreeFragment.java     |  12 +-
 .../osmand/plus/helpers/GpxImportHelper.java  | 130 +++++++++++++-----
 .../plus/myplaces/FavoritesActivity.java      |  37 +++--
 12 files changed, 183 insertions(+), 74 deletions(-)
 create mode 100644 OsmAnd/res/values-large-land/sizes.xml

diff --git a/OsmAnd/res/layout-land/empty_state_favourites.xml b/OsmAnd/res/layout-land/empty_state_favourites.xml
index 8eae7cb645..e3a77b04ab 100644
--- a/OsmAnd/res/layout-land/empty_state_favourites.xml
+++ b/OsmAnd/res/layout-land/empty_state_favourites.xml
@@ -5,21 +5,28 @@
               android:id="@android:id/empty"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              android:gravity="center"
               android:orientation="horizontal">
 
     <ImageView
+        android:layout_marginTop="@dimen/my_places_empty_state_image_margin_top"
+        android:layout_marginBottom="@dimen/my_places_empty_state_image_margin_bottom"
+        android:adjustViewBounds="true"
+        android:layout_marginLeft="@dimen/my_places_empty_state_image_margin_left"
+        android:layout_marginStart="@dimen/my_places_empty_state_image_margin_left"
         android:id="@+id/empty_state_image_view"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
         tools:src="@drawable/ic_empty_state_favorites_night_result"/>
 
     <LinearLayout
-        android:layout_width="0dp"
+        android:clipToPadding="false"
+        android:paddingLeft="@dimen/my_places_empty_state_text_button_padding_left"
+        android:paddingStart="@dimen/my_places_empty_state_text_button_padding_left"
+        android:paddingRight="@dimen/my_places_empty_state_text_button_padding_right"
+        android:paddingEnd="@dimen/my_places_empty_state_text_button_padding_right"
+        android:paddingTop="@dimen/my_places_empty_state_text_button_padding_top"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
         android:orientation="vertical">
 
         <net.osmand.plus.widgets.TextViewEx
@@ -35,10 +42,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/empty_state_text_desc_margin"
-            android:layout_marginRight="@dimen/empty_state_text_desc_margin"
             android:background="@null"
-            android:gravity="center"
             android:text="@string/empty_state_favourites_desc"
             android:textColor="?android:attr/textColorSecondary"
             android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
diff --git a/OsmAnd/res/layout-land/empty_state_my_tracks.xml b/OsmAnd/res/layout-land/empty_state_my_tracks.xml
index 785e8cafea..80863986be 100644
--- a/OsmAnd/res/layout-land/empty_state_my_tracks.xml
+++ b/OsmAnd/res/layout-land/empty_state_my_tracks.xml
@@ -5,21 +5,28 @@
               android:id="@android:id/empty"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              android:gravity="center"
               android:orientation="horizontal">
 
     <ImageView
+        android:layout_marginTop="@dimen/my_places_empty_state_image_margin_top"
+        android:layout_marginBottom="@dimen/my_places_empty_state_image_margin_bottom"
+        android:adjustViewBounds="true"
+        android:layout_marginLeft="@dimen/my_places_empty_state_image_margin_left"
+        android:layout_marginStart="@dimen/my_places_empty_state_image_margin_left"
         android:id="@+id/empty_state_image_view"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
         tools:src="@drawable/ic_empty_state_trip_night_result"/>
 
     <LinearLayout
-        android:layout_width="0dp"
+        android:clipToPadding="false"
+        android:paddingLeft="@dimen/my_places_empty_state_text_button_padding_left"
+        android:paddingStart="@dimen/my_places_empty_state_text_button_padding_left"
+        android:paddingRight="@dimen/my_places_empty_state_text_button_padding_right"
+        android:paddingEnd="@dimen/my_places_empty_state_text_button_padding_right"
+        android:paddingTop="@dimen/my_places_empty_state_text_button_padding_top"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
         android:orientation="vertical">
 
         <net.osmand.plus.widgets.TextViewEx
@@ -35,10 +42,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/empty_state_text_desc_margin"
-            android:layout_marginRight="@dimen/empty_state_text_desc_margin"
             android:background="@null"
-            android:gravity="center"
             android:text="@string/empty_state_my_tracks_desc"
             android:textColor="?android:attr/textColorSecondary"
             android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
diff --git a/OsmAnd/res/layout/empty_state_favourites.xml b/OsmAnd/res/layout/empty_state_favourites.xml
index 67601184b4..ca57095bbc 100644
--- a/OsmAnd/res/layout/empty_state_favourites.xml
+++ b/OsmAnd/res/layout/empty_state_favourites.xml
@@ -31,8 +31,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@null"
-        android:layout_marginLeft="@dimen/empty_state_text_desc_margin"
-        android:layout_marginRight="@dimen/empty_state_text_desc_margin"
+        android:layout_marginLeft="@dimen/my_places_empty_state_text_desc_margin"
+        android:layout_marginRight="@dimen/my_places_empty_state_text_desc_margin"
         android:text="@string/empty_state_favourites_desc"
         android:textColor="?android:attr/textColorSecondary"
         android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
diff --git a/OsmAnd/res/layout/empty_state_my_tracks.xml b/OsmAnd/res/layout/empty_state_my_tracks.xml
index f7b474059d..b3da13be38 100644
--- a/OsmAnd/res/layout/empty_state_my_tracks.xml
+++ b/OsmAnd/res/layout/empty_state_my_tracks.xml
@@ -31,8 +31,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@null"
-        android:layout_marginLeft="@dimen/empty_state_text_desc_margin"
-        android:layout_marginRight="@dimen/empty_state_text_desc_margin"
+        android:layout_marginLeft="@dimen/my_places_empty_state_text_desc_margin"
+        android:layout_marginRight="@dimen/my_places_empty_state_text_desc_margin"
         android:text="@string/empty_state_my_tracks_desc"
         android:textColor="?android:attr/textColorSecondary"
         android:textSize="@dimen/my_places_empty_state_text_desc_size"/>
diff --git a/OsmAnd/res/values-land/sizes.xml b/OsmAnd/res/values-land/sizes.xml
index 7cf56d5d90..4e116e39e1 100644
--- a/OsmAnd/res/values-land/sizes.xml
+++ b/OsmAnd/res/values-land/sizes.xml
@@ -4,4 +4,7 @@
 
     <dimen name="splash_screen_logo_top">24dp</dimen>
     <dimen name="splash_screen_text_bottom">48dp</dimen>
+
+    <dimen name="my_places_empty_state_image_margin_top">39dp</dimen>
+    <dimen name="my_places_empty_state_image_margin_bottom">39dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-large-land/sizes.xml b/OsmAnd/res/values-large-land/sizes.xml
new file mode 100644
index 0000000000..2d48ca5083
--- /dev/null
+++ b/OsmAnd/res/values-large-land/sizes.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="my_places_empty_state_image_margin_top">59dp</dimen>
+    <dimen name="my_places_empty_state_image_margin_bottom">59dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index dfceed1d08..2de1e4ff3d 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -85,6 +85,10 @@
 	<dimen name="my_places_empty_state_button_margin_top">30dp</dimen>
 	<dimen name="my_places_empty_state_text_size">20sp</dimen>
 	<dimen name="my_places_empty_state_text_desc_size">18sp</dimen>
-	<dimen name="empty_state_text_desc_margin">68dp</dimen>
+	<dimen name="my_places_empty_state_text_desc_margin">68dp</dimen>
+	<dimen name="my_places_empty_state_image_margin_left">138dp</dimen>
+	<dimen name="my_places_empty_state_text_button_padding_left">72dp</dimen>
+	<dimen name="my_places_empty_state_text_button_padding_right">90dp</dimen>
+	<dimen name="my_places_empty_state_text_button_padding_top">96dp</dimen>
     
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 925beb26e1..aa41eae132 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -150,5 +150,9 @@
 	<dimen name="my_places_empty_state_button_margin_top">20dp</dimen>
 	<dimen name="my_places_empty_state_text_size">18sp</dimen>
 	<dimen name="my_places_empty_state_text_desc_size">16sp</dimen>
-	<dimen name="empty_state_text_desc_margin">45dp</dimen>
+	<dimen name="my_places_empty_state_text_desc_margin">45dp</dimen>
+	<dimen name="my_places_empty_state_image_margin_left">92dp</dimen>
+	<dimen name="my_places_empty_state_text_button_padding_left">48dp</dimen>
+	<dimen name="my_places_empty_state_text_button_padding_right">60dp</dimen>
+	<dimen name="my_places_empty_state_text_button_padding_top">64dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 9fa0446b58..eee4d8b722 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2666,4 +2666,6 @@
     <string name="empty_state_my_tracks_desc">Record or import tracks to view</string>
     <string name="empty_state_favourites">Add Favorites</string>
     <string name="empty_state_favourites_desc">Add favorites on map or import them from filesystem</string>
+    <string name="import_track">Import track</string>
+    <string name="import_track_desc">File %1$s does not contain waypoints, import it as a track?</string>
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index 68f7815dfe..d038d93105 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -72,6 +72,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 	public static final int SHARE_ID = 4;
 	public static final int SELECT_MAP_MARKERS_ID = 5;
 	public static final int SELECT_MAP_MARKERS_ACTION_MODE_ID = 6;
+	public static final int IMPORT_FAVOURITES_ID = 7;
 	public static final String GROUP_EXPANDED_POSTFIX = "_group_expanded";
 
 	private FavouritesAdapter favouritesAdapter = new FavouritesAdapter();
@@ -166,7 +167,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 		importButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				addTrack();
+				importFavourites();
 			}
 		});
 		listView.setEmptyView(emptyView);
@@ -251,6 +252,9 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 		} else if (item.getItemId() == DELETE_ACTION_ID) {
 			deleteFavoritesAction();
 			return true;
+		} else if (item.getItemId() == IMPORT_FAVOURITES_ID) {
+			importFavourites();
+			return true;
 		} else {
 			return super.onOptionsItemSelected(item);
 		}
@@ -282,6 +286,8 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 
 
 		if (!MenuItemCompat.isActionViewExpanded(mi)) {
+			createMenuItem(menu, IMPORT_FAVOURITES_ID, R.string.shared_string_add_to_favorites, R.drawable.ic_action_plus,
+					R.drawable.ic_action_plus, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 			createMenuItem(menu, SHARE_ID, R.string.shared_string_share, R.drawable.ic_action_gshare_dark,
 					R.drawable.ic_action_gshare_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 			if (getSettings().USE_MAP_MARKERS.get()) {
@@ -481,8 +487,8 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 		}
 	}
 
-	private void addTrack() {
-		((FavoritesActivity) getActivity()).addTrack();
+	private void importFavourites() {
+		((FavoritesActivity) getActivity()).importFavourites();
 	}
 
 	public void shareFavorites(final FavoriteGroup group) {
diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java
index 26c75ebd4b..1cae32b6bc 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java
@@ -21,6 +21,7 @@ import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.myplaces.FavoritesActivity;
 import net.osmand.plus.views.OsmandMapTileView;
 
 import java.io.ByteArrayInputStream;
@@ -88,6 +89,21 @@ public class GpxImportHelper {
 		return false;
 	}
 
+	public void handleFavouritesImport(Uri uri) {
+		String scheme = uri.getScheme();
+		boolean isFileIntent = "file".equals(scheme);
+		boolean isContentIntent = "content".equals(scheme);
+		boolean isOsmandSubdir = isSubDirectory(app.getAppPath(IndexConstants.GPX_INDEX_DIR), new File(uri.getPath()));
+		final boolean saveFile = !isFileIntent || !isOsmandSubdir;
+		String fileName = "";
+		if (isFileIntent) {
+			fileName = new File(uri.getPath()).getName();
+		} else if (isContentIntent) {
+			fileName = getNameFromContentUri(uri);
+		}
+		handleFavouritesImport(uri, fileName, saveFile, false, true);
+	}
+
 	public void handleFileImport(final Uri intentUri, final String fileName, final boolean useImportDir) {
 		final boolean isFileIntent = "file".equals(intentUri.getScheme());
 		final boolean isOsmandSubdir = isSubDirectory(app.getAppPath(IndexConstants.GPX_INDEX_DIR), new File(intentUri.getPath()));
@@ -99,7 +115,7 @@ public class GpxImportHelper {
 		} else if (fileName != null && fileName.endsWith(KMZ_SUFFIX)) {
 			handleKmzImport(intentUri, fileName, saveFile, useImportDir);
 		} else {
-			handleFavouritesImport(intentUri, fileName, saveFile, useImportDir);
+			handleFavouritesImport(intentUri, fileName, saveFile, useImportDir, false);
 		}
 	}
 
@@ -155,12 +171,12 @@ public class GpxImportHelper {
 			@Override
 			protected void onPostExecute(GPXFile result) {
 				progress.dismiss();
-				handleResult(result, fileName, save, useImportDir);
+				handleResult(result, fileName, save, useImportDir, false);
 			}
 		}.execute();
 	}
 
-	private void handleFavouritesImport(final Uri gpxFile, final String fileName, final boolean save, final boolean useImportDir) {
+	private void handleFavouritesImport(final Uri gpxFile, final String fileName, final boolean save, final boolean useImportDir, final boolean forceImportFavourites) {
 		new AsyncTask<Void, Void, GPXFile>() {
 			ProgressDialog progress = null;
 
@@ -193,12 +209,12 @@ public class GpxImportHelper {
 			@Override
 			protected void onPostExecute(final GPXFile result) {
 				progress.dismiss();
-				importFavourites(result, fileName, save, useImportDir);
+				importFavourites(result, fileName, save, useImportDir, forceImportFavourites);
 			}
 		}.execute();
 	}
 
-	private void importFavoritesImpl(final GPXFile gpxFile) {
+	private void importFavoritesImpl(final GPXFile gpxFile, final String fileName, final boolean forceImportFavourites) {
 		new AsyncTask<Void, Void, GPXFile>() {
 			ProgressDialog progress = null;
 
@@ -209,7 +225,7 @@ public class GpxImportHelper {
 
 			@Override
 			protected GPXFile doInBackground(Void... nothing) {
-				final List<FavouritePoint> favourites = asFavourites(gpxFile.points);
+				final List<FavouritePoint> favourites = asFavourites(gpxFile.points, fileName, forceImportFavourites);
 				final FavouritesDbHelper favoritesHelper = app.getFavorites();
 				for (final FavouritePoint favourite : favourites) {
 					favoritesHelper.deleteFavourite(favourite, false);
@@ -225,6 +241,8 @@ public class GpxImportHelper {
 				progress.dismiss();
 				Toast.makeText(activity, R.string.fav_imported_sucessfully, Toast.LENGTH_LONG).show();
 				final Intent newIntent = new Intent(activity, app.getAppCustomization().getFavoritesActivity());
+				newIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+				newIntent.putExtra(FavoritesActivity.OPEN_FAVOURITES_TAB, true);
 				activity.startActivity(newIntent);
 			}
 		}.execute();
@@ -277,7 +295,7 @@ public class GpxImportHelper {
 			@Override
 			protected void onPostExecute(GPXFile result) {
 				progress.dismiss();
-				handleResult(result, name, save, useImportDir);
+				handleResult(result, name, save, useImportDir, false);
 			}
 
 		}.execute();
@@ -322,13 +340,13 @@ public class GpxImportHelper {
 			@Override
 			protected void onPostExecute(GPXFile result) {
 				progress.dismiss();
-				handleResult(result, name, save, useImportDir);
+				handleResult(result, name, save, useImportDir, false);
 			}
 		}.execute();
 	}
 
 	private void handleResult(final GPXFile result, final String name, final boolean save,
-							  final boolean useImportDir) {
+							  final boolean useImportDir, boolean forceImportFavourites) {
 		if (result != null) {
 			if (result.warning != null) {
 				Toast.makeText(activity, result.warning, Toast.LENGTH_LONG).show();
@@ -372,6 +390,12 @@ public class GpxImportHelper {
 					})
 					.show();
 		}
+		if (forceImportFavourites) {
+			final Intent newIntent = new Intent(activity, app.getAppCustomization().getFavoritesActivity());
+			newIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+			newIntent.putExtra(FavoritesActivity.OPEN_MY_PLACES_TAB, true);
+			activity.startActivity(newIntent);
+		}
 	}
 
 	private String saveImport(final GPXFile gpxFile, final String fileName, final boolean useImportDir) {
@@ -467,38 +491,76 @@ public class GpxImportHelper {
 	}
 
 	private void importFavourites(final GPXFile gpxFile, final String fileName, final boolean save,
-								  final boolean useImportDir) {
+								  final boolean useImportDir, final boolean forceImportFavourites) {
 		if (gpxFile == null || gpxFile.points == null || gpxFile.points.size() == 0) {
-			handleResult(gpxFile, fileName, save, useImportDir);
-			return;
-		}
-		final DialogInterface.OnClickListener importFavouritesListener = new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				switch (which) {
-					case DialogInterface.BUTTON_POSITIVE:
-						importFavoritesImpl(gpxFile);
-						break;
-					case DialogInterface.BUTTON_NEGATIVE:
-						handleResult(gpxFile, fileName, save, useImportDir);
-						break;
-				}
-			}
-		};
+			if (forceImportFavourites) {
+				final DialogInterface.OnClickListener importAsTrackListener = new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						switch (which) {
+							case DialogInterface.BUTTON_POSITIVE:
+								handleResult(gpxFile, fileName, save, useImportDir, true);
+								break;
+							case DialogInterface.BUTTON_NEGATIVE:
+								dialog.dismiss();
+								break;
+						}
+					}
+				};
 
-		new AlertDialog.Builder(activity)
-				.setTitle(R.string.shared_string_import2osmand)
-				.setMessage(R.string.import_file_favourites)
-				.setPositiveButton(R.string.shared_string_import, importFavouritesListener)
-				.setNegativeButton(R.string.shared_string_save, importFavouritesListener)
-				.show();
+				new AlertDialog.Builder(activity)
+						.setTitle(R.string.import_track)
+						.setMessage(activity.getString(R.string.import_track_desc, fileName))
+						.setPositiveButton(R.string.shared_string_import, importAsTrackListener)
+						.setNegativeButton(R.string.shared_string_cancel, importAsTrackListener)
+						.show();
+				return;
+			} else {
+				handleResult(gpxFile, fileName, save, useImportDir, false);
+				return;
+			}
+		}
+
+		if (forceImportFavourites) {
+			importFavoritesImpl(gpxFile, fileName, true);
+		} else {
+			final DialogInterface.OnClickListener importFavouritesListener = new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					switch (which) {
+						case DialogInterface.BUTTON_POSITIVE:
+							importFavoritesImpl(gpxFile, fileName, false);
+							break;
+						case DialogInterface.BUTTON_NEGATIVE:
+							handleResult(gpxFile, fileName, save, useImportDir, false);
+							break;
+					}
+				}
+			};
+
+			new AlertDialog.Builder(activity)
+					.setTitle(R.string.shared_string_import2osmand)
+					.setMessage(R.string.import_file_favourites)
+					.setPositiveButton(R.string.shared_string_import, importFavouritesListener)
+					.setNegativeButton(R.string.shared_string_save, importFavouritesListener)
+					.show();
+		}
 	}
 
-	private List<FavouritePoint> asFavourites(final List<GPXUtilities.WptPt> wptPts) {
+	private List<FavouritePoint> asFavourites(final List<GPXUtilities.WptPt> wptPts, String fileName, boolean forceImportFavourites) {
 		final List<FavouritePoint> favourites = new ArrayList<>();
 		for (GPXUtilities.WptPt p : wptPts) {
 			if (p.name != null) {
-				final String fpCat = (p.category != null) ? p.category : "";
+				final String fpCat;
+				if (p.category == null) {
+					if (forceImportFavourites) {
+						fpCat = fileName;
+					} else {
+						fpCat = "";
+					}
+				} else {
+					fpCat = p.category;
+				}
 				final FavouritePoint fp = new FavouritePoint(p.lat, p.lon, p.name, fpCat);
 				if (p.desc != null) {
 					fp.setDescription(p.desc);
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java b/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
index aabb05828e..f58fb91504 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
@@ -41,6 +41,10 @@ import java.util.List;
 public class FavoritesActivity extends TabActivity {
 
 	private static final int OPEN_GPX_DOCUMENT_REQUEST = 1006;
+	private static final int IMPORT_FAVOURITES_REQUEST = 1007;
+
+	public static final String OPEN_FAVOURITES_TAB = "open_favourites_tab";
+	public static final String OPEN_MY_PLACES_TAB = "open_my_places_tab";
 
 	public static final int  GPX_TAB = R.string.shared_string_my_tracks;
 	public static final int  FAV_TAB = R.string.shared_string_my_favorites;
@@ -67,6 +71,16 @@ public class FavoritesActivity extends TabActivity {
 		List<TabItem> mTabs = getTabItems();
 		setTabs(mTabs);
 		// setupHomeButton();
+
+		ViewPager mViewPager = (ViewPager) findViewById(R.id.pager);
+		Intent intent = getIntent();
+		if (intent != null) {
+			if (intent.hasExtra(OPEN_FAVOURITES_TAB) && intent.getBooleanExtra(OPEN_FAVOURITES_TAB, false)) {
+				mViewPager.setCurrentItem(0, false);
+			} else if (intent.hasExtra(OPEN_MY_PLACES_TAB) && intent.getBooleanExtra(OPEN_MY_PLACES_TAB, false)) {
+				mViewPager.setCurrentItem(1, false);
+			}
+		}
 	}
 
 	@TargetApi(Build.VERSION_CODES.KITKAT)
@@ -76,6 +90,13 @@ public class FavoritesActivity extends TabActivity {
 		startActivityForResult(intent, OPEN_GPX_DOCUMENT_REQUEST);
 	}
 
+	@TargetApi(Build.VERSION_CODES.KITKAT)
+	public void importFavourites() {
+		Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+		intent.setType("*/*");
+		startActivityForResult(intent, IMPORT_FAVOURITES_REQUEST);
+	}
+
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		if (requestCode == OPEN_GPX_DOCUMENT_REQUEST && resultCode == Activity.RESULT_OK) {
@@ -101,6 +122,11 @@ public class FavoritesActivity extends TabActivity {
 					}
 				}
 			}
+		} else if (requestCode == IMPORT_FAVOURITES_REQUEST && resultCode == Activity.RESULT_OK) {
+			if (data != null) {
+				Uri uri = data.getData();
+				gpxImportHelper.handleFavouritesImport(uri);
+			}
 		} else {
 			super.onActivityResult(requestCode, resultCode, data);
 		}
@@ -135,17 +161,6 @@ public class FavoritesActivity extends TabActivity {
 	}
 
 	private List<TabItem> getTabItems() {
-		File[] lf = ((OsmandApplication) getApplication()).getAppPath(IndexConstants.GPX_INDEX_DIR).listFiles();
-		boolean hasGpx = false;
-		if (lf != null) {
-			for (File t : lf) {
-				if (t.isDirectory() || (t.getName().toLowerCase().endsWith(".gpx"))) {
-					hasGpx = true;
-					break;
-				}
-			}
-		}
-
 		List<TabItem> mTabs = new ArrayList<>();
 		mTabs.add(getTabIndicator(FAV_TAB, FavoritesTreeFragment.class));
 		mTabs.add(getTabIndicator(GPX_TAB, AvailableGPXFragment.class));

From 8921d283f6df50593d06d13b545b7d0db528840a Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 7 Aug 2017 18:07:46 +0300
Subject: [PATCH 011/174] Set alpha for shadow

---
 OsmAnd/res/layout/fragment_measurement_tool.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 6b684dfd9b..c655043bbd 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -99,6 +99,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="5dp"
                 android:layout_gravity="bottom"
+                android:alpha="0.5"
                 android:scaleType="fitXY"
                 android:src="@drawable/bg_shadow_onmap"/>
         </FrameLayout>

From e7bc8e4140dcd89020a25e19af4bef9b6dff51e7 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 7 Aug 2017 18:39:13 +0300
Subject: [PATCH 012/174] Add an upper position for the center of the map

---
 .../res/layout/fragment_measurement_tool.xml  |  2 +-
 .../src/net/osmand/plus/OsmandSettings.java   |  3 ++-
 .../cards/dialogs/ContextMenuCardDialog.java  |  7 ++----
 .../MeasurementToolFragment.java              | 22 +++++++++++++++++++
 .../plus/views/MapQuickActionLayer.java       |  2 +-
 .../osmand/plus/views/OsmandMapTileView.java  |  4 +++-
 6 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index c655043bbd..b146c796ca 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -84,7 +84,7 @@
         <FrameLayout
             android:id="@+id/points_list_container"
             android:layout_width="match_parent"
-            android:layout_height="180dp"
+            android:layout_height="220dp"
             android:background="@color/ctx_menu_info_view_bg_dark"
             android:visibility="gone">
 
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 93b7f97da9..03147d4e8b 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1244,7 +1244,8 @@ public class OsmandSettings {
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final int CENTER_CONSTANT = 0;
 	public static final int BOTTOM_CONSTANT = 1;
-	public static final int MIDDLE_CONSTANT = 2;
+	public static final int MIDDLE_BOTTOM_CONSTANT = 2;
+	public static final int MIDDLE_TOP_CONSTANT = 3;
 	public final CommonPreference<Boolean> CENTER_POSITION_ON_MAP = new BooleanPreference("center_position_on_map", false).makeProfile();
 
 	// this value string is synchronized with settings_pref.xml preference name
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/dialogs/ContextMenuCardDialog.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/dialogs/ContextMenuCardDialog.java
index 29fc6b6395..1474b371d7 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/dialogs/ContextMenuCardDialog.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/dialogs/ContextMenuCardDialog.java
@@ -3,7 +3,6 @@ package net.osmand.plus.mapcontextmenu.builders.cards.dialogs;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 
 import net.osmand.plus.OsmandSettings;
@@ -12,8 +11,6 @@ import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.mapillary.MapillaryImageDialog;
 import net.osmand.plus.views.OsmandMapTileView;
 
-import java.util.List;
-
 public abstract class ContextMenuCardDialog {
 
 	private MapActivity mapActivity;
@@ -109,9 +106,9 @@ public abstract class ContextMenuCardDialog {
 	private void shiftMapPosition() {
 		OsmandMapTileView mapView = mapActivity.getMapView();
 		if (AndroidUiHelper.isOrientationPortrait(mapActivity)) {
-			if (mapView.getMapPosition() != OsmandSettings.MIDDLE_CONSTANT) {
+			if (mapView.getMapPosition() != OsmandSettings.MIDDLE_BOTTOM_CONSTANT) {
 				prevMapPosition = mapView.getMapPosition();
-				mapView.setMapPosition(OsmandSettings.MIDDLE_CONSTANT);
+				mapView.setMapPosition(OsmandSettings.MIDDLE_BOTTOM_CONSTANT);
 			}
 		} else {
 			mapView.setMapPositionX(1);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 050a8331f0..d5d49242aa 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -36,6 +36,7 @@ import net.osmand.plus.IconsCache;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
 import net.osmand.plus.widgets.IconPopupMenu;
@@ -48,6 +49,7 @@ import java.util.LinkedList;
 import java.util.Locale;
 
 import static net.osmand.plus.GPXUtilities.GPXFile;
+import static net.osmand.plus.OsmandSettings.MIDDLE_TOP_CONSTANT;
 import static net.osmand.plus.helpers.GpxImportHelper.GPX_SUFFIX;
 
 public class MeasurementToolFragment extends Fragment {
@@ -62,6 +64,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	private boolean wasCollapseButtonVisible;
 	private boolean pointsDetailsOpened;
+	private int previousMapPosition;
 
 	@Nullable
 	@Override
@@ -229,12 +232,28 @@ public class MeasurementToolFragment extends Fragment {
 		pointsDetailsOpened = true;
 		view.findViewById(R.id.points_list_container).setVisibility(View.VISIBLE);
 		((ImageButton) view.findViewById(R.id.up_down_button)).setImageDrawable(icon);
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			OsmandMapTileView tileView = mapActivity.getMapView();
+			previousMapPosition = tileView.getMapPosition();
+			tileView.setMapPosition(MIDDLE_TOP_CONSTANT);
+			mapActivity.refreshMap();
+		}
 	}
 
 	private void downBtnOnClick(View view, Drawable icon) {
 		pointsDetailsOpened = false;
 		view.findViewById(R.id.points_list_container).setVisibility(View.GONE);
 		((ImageButton) view.findViewById(R.id.up_down_button)).setImageDrawable(icon);
+		setPreviousMapPosition();
+	}
+
+	private void setPreviousMapPosition() {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			mapActivity.getMapView().setMapPosition(previousMapPosition);
+			mapActivity.refreshMap();
+		}
 	}
 
 	private void saveAsGpxOnClick(MapActivity mapActivity) {
@@ -371,6 +390,9 @@ public class MeasurementToolFragment extends Fragment {
 		super.onDestroyView();
 		exitMeasurementMode();
 		adapter.setRemovePointListener(null);
+		if (pointsDetailsOpened) {
+			setPreviousMapPosition();
+		}
 	}
 
 	private MapActivity getMapActivity() {
diff --git a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
index c5365d41ff..f5129c680a 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
@@ -218,7 +218,7 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
 
     private void enterMovingMode(RotatedTileBox tileBox) {
         previousMapPosition = view.getMapPosition();
-        view.setMapPosition(OsmandSettings.MIDDLE_CONSTANT);
+        view.setMapPosition(OsmandSettings.MIDDLE_BOTTOM_CONSTANT);
         MapContextMenu menu = mapActivity.getContextMenu();
 
         LatLon ll = menu.isActive() && tileBox.containsLatLon(menu.getLatLon()) ? menu.getLatLon() : tileBox.getCenterLatLon();
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index 2553ffaaad..4ddb967c7d 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -578,8 +578,10 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 		final float ratioy;
 		if (mapPosition == OsmandSettings.BOTTOM_CONSTANT) {
 			ratioy = 0.85f;
-		} else if (mapPosition == OsmandSettings.MIDDLE_CONSTANT) {
+		} else if (mapPosition == OsmandSettings.MIDDLE_BOTTOM_CONSTANT) {
 			ratioy = 0.70f;
+		} else if (mapPosition == OsmandSettings.MIDDLE_TOP_CONSTANT) {
+			ratioy = 0.25f;
 		} else {
 			ratioy = 0.5f;
 		}

From 469216e68152a39d89bcf59509f1949ea2b6f75c Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 8 Aug 2017 12:13:45 +0300
Subject: [PATCH 013/174] Interacting with chart on tap

---
 .../plus/myplaces/TrackSegmentFragment.java   | 200 ++++++++++--------
 1 file changed, 106 insertions(+), 94 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index 47c1816cee..4756a13fea 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -139,6 +139,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 	private RotatedTileBox rotatedTileBox;
 	private Bitmap mapBitmap;
 	private Bitmap mapTrackBitmap;
+	private boolean chartClicked;
 
 	@Override
 	public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -1073,6 +1074,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		@Override
 		public Object instantiateItem(ViewGroup container, int position) {
 
+			chartClicked = false;
 			GPXTabItemType tabType = tabTypes[position];
 			View view = null;
 			switch (tabType) {
@@ -1091,102 +1093,112 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 				if (gpxItem != null) {
 					GPXTrackAnalysis analysis = gpxItem.analysis;
 					final LineChart chart = (LineChart) view.findViewById(R.id.chart);
-					chart.setOnTouchListener(new View.OnTouchListener() {
+					chart.setHighlightPerDragEnabled(false);
+					chart.setOnClickListener(new View.OnClickListener() {
 						@Override
-						public boolean onTouch(View v, MotionEvent event) {
-							getListView().requestDisallowInterceptTouchEvent(true);
-							switch (event.getAction()) {
-								case android.view.MotionEvent.ACTION_DOWN:
-									listViewYPos = event.getRawY();
-									break;
-								case android.view.MotionEvent.ACTION_MOVE:
-									scrollBy(Math.round(listViewYPos - event.getRawY()));
-									listViewYPos = event.getRawY();
-									break;
-							}
-							return false;
-						}
-					});
-					chart.setOnChartValueSelectedListener(new OnChartValueSelectedListener() {
-						@Override
-						public void onValueSelected(Entry e, Highlight h) {
-							WptPt wpt = getPoint(chart, h.getX());
-							if (wpt != null) {
-								selectedPointLatLon = new LatLon(wpt.lat, wpt.lon);
-								Bitmap bmp = drawSelectedPoint();
-								imageView.setImageDrawable(new BitmapDrawable(app.getResources(), bmp));
-							}
-						}
-
-						@Override
-						public void onNothingSelected() {
-
-						}
-					});
-					final View finalView = view;
-					chart.setOnChartGestureListener(new OnChartGestureListener() {
-
-						float highlightDrawX = -1;
-
-						@Override
-						public void onChartGestureStart(MotionEvent me, ChartGesture lastPerformedGesture) {
-							if (chart.getHighlighted() != null && chart.getHighlighted().length > 0) {
-								highlightDrawX = chart.getHighlighted()[0].getDrawX();
-							} else {
-								highlightDrawX = -1;
-							}
-						}
-
-						@Override
-						public void onChartGestureEnd(MotionEvent me, ChartGesture lastPerformedGesture) {
-							gpxItem.chartMatrix = new Matrix(chart.getViewPortHandler().getMatrixTouch());
-							Highlight[] highlights = chart.getHighlighted();
-							if (highlights != null && highlights.length > 0) {
-								gpxItem.chartHighlightPos = highlights[0].getX();
-							} else {
-								gpxItem.chartHighlightPos = -1;
-							}
-							for (int i = 0; i < getCount(); i++) {
-								View v = getViewAtPosition(i);
-								if (v != finalView) {
-									updateChart(i);
-								}
-							}
-						}
-
-						@Override
-						public void onChartLongPressed(MotionEvent me) {
-						}
-
-						@Override
-						public void onChartDoubleTapped(MotionEvent me) {
-						}
-
-						@Override
-						public void onChartSingleTapped(MotionEvent me) {
-						}
-
-						@Override
-						public void onChartFling(MotionEvent me1, MotionEvent me2, float velocityX, float velocityY) {
-						}
-
-						@Override
-						public void onChartScale(MotionEvent me, float scaleX, float scaleY) {
-						}
-
-						@Override
-						public void onChartTranslate(MotionEvent me, float dX, float dY) {
-							if (highlightDrawX != -1) {
-								Highlight h = chart.getHighlightByTouchPoint(highlightDrawX, 0f);
-								if (h != null) {
-									chart.highlightValue(h);
-									WptPt wpt = getPoint(chart, h.getX());
-									if (wpt != null) {
-										selectedPointLatLon = new LatLon(wpt.lat, wpt.lon);
-										Bitmap bmp = drawSelectedPoint();
-										imageView.setImageDrawable(new BitmapDrawable(app.getResources(), bmp));
+						public void onClick(View view) {
+							if (!chartClicked) {
+								chartClicked = true;
+								chart.setHighlightPerDragEnabled(true);
+								chart.setOnTouchListener(new View.OnTouchListener() {
+									@Override
+									public boolean onTouch(View v, MotionEvent event) {
+										getListView().requestDisallowInterceptTouchEvent(true);
+										switch (event.getAction()) {
+											case android.view.MotionEvent.ACTION_DOWN:
+												listViewYPos = event.getRawY();
+												break;
+											case android.view.MotionEvent.ACTION_MOVE:
+												scrollBy(Math.round(listViewYPos - event.getRawY()));
+												listViewYPos = event.getRawY();
+												break;
+										}
+										return false;
 									}
-								}
+								});
+								chart.setOnChartValueSelectedListener(new OnChartValueSelectedListener() {
+									@Override
+									public void onValueSelected(Entry e, Highlight h) {
+										WptPt wpt = getPoint(chart, h.getX());
+										if (wpt != null) {
+											selectedPointLatLon = new LatLon(wpt.lat, wpt.lon);
+											Bitmap bmp = drawSelectedPoint();
+											imageView.setImageDrawable(new BitmapDrawable(app.getResources(), bmp));
+										}
+									}
+
+									@Override
+									public void onNothingSelected() {
+
+									}
+								});
+								final View finalView = view;
+								chart.setOnChartGestureListener(new OnChartGestureListener() {
+
+									float highlightDrawX = -1;
+
+									@Override
+									public void onChartGestureStart(MotionEvent me, ChartGesture lastPerformedGesture) {
+										if (chart.getHighlighted() != null && chart.getHighlighted().length > 0) {
+											highlightDrawX = chart.getHighlighted()[0].getDrawX();
+										} else {
+											highlightDrawX = -1;
+										}
+									}
+
+									@Override
+									public void onChartGestureEnd(MotionEvent me, ChartGesture lastPerformedGesture) {
+										gpxItem.chartMatrix = new Matrix(chart.getViewPortHandler().getMatrixTouch());
+										Highlight[] highlights = chart.getHighlighted();
+										if (highlights != null && highlights.length > 0) {
+											gpxItem.chartHighlightPos = highlights[0].getX();
+										} else {
+											gpxItem.chartHighlightPos = -1;
+										}
+										for (int i = 0; i < getCount(); i++) {
+											View v = getViewAtPosition(i);
+											if (v != finalView) {
+												updateChart(i);
+											}
+										}
+									}
+
+									@Override
+									public void onChartLongPressed(MotionEvent me) {
+									}
+
+									@Override
+									public void onChartDoubleTapped(MotionEvent me) {
+									}
+
+									@Override
+									public void onChartSingleTapped(MotionEvent me) {
+									}
+
+									@Override
+									public void onChartFling(MotionEvent me1, MotionEvent me2, float velocityX, float velocityY) {
+									}
+
+									@Override
+									public void onChartScale(MotionEvent me, float scaleX, float scaleY) {
+									}
+
+									@Override
+									public void onChartTranslate(MotionEvent me, float dX, float dY) {
+										if (highlightDrawX != -1) {
+											Highlight h = chart.getHighlightByTouchPoint(highlightDrawX, 0f);
+											if (h != null) {
+												chart.highlightValue(h);
+												WptPt wpt = getPoint(chart, h.getX());
+												if (wpt != null) {
+													selectedPointLatLon = new LatLon(wpt.lat, wpt.lon);
+													Bitmap bmp = drawSelectedPoint();
+													imageView.setImageDrawable(new BitmapDrawable(app.getResources(), bmp));
+												}
+											}
+										}
+									}
+								});
 							}
 						}
 					});

From e32243a56e7b80dbb52ce6a81cedd3ee95b7900e Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 8 Aug 2017 12:44:41 +0300
Subject: [PATCH 014/174] Add fabs on overview screen

---
 OsmAnd/res/layout/points_tree.xml             |   3 +-
 OsmAnd/res/layout/track_segments_tree.xml     | 107 ++++++++++++++++++
 .../osmand/plus/activities/TrackActivity.java |  27 ++++-
 .../plus/myplaces/TrackPointFragment.java     |  17 +--
 .../plus/myplaces/TrackSegmentFragment.java   |  64 ++++++++++-
 5 files changed, 197 insertions(+), 21 deletions(-)
 create mode 100644 OsmAnd/res/layout/track_segments_tree.xml

diff --git a/OsmAnd/res/layout/points_tree.xml b/OsmAnd/res/layout/points_tree.xml
index 1b1e97e048..296e09695b 100644
--- a/OsmAnd/res/layout/points_tree.xml
+++ b/OsmAnd/res/layout/points_tree.xml
@@ -5,8 +5,7 @@
                 xmlns:osmand="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/MainLayout"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:layout_height="match_parent">
 
     <ExpandableListView
         android:id="@android:id/list"
diff --git a/OsmAnd/res/layout/track_segments_tree.xml b/OsmAnd/res/layout/track_segments_tree.xml
new file mode 100644
index 0000000000..df56f12a0f
--- /dev/null
+++ b/OsmAnd/res/layout/track_segments_tree.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                xmlns:osmand="http://schemas.android.com/apk/res-auto"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:orientation="vertical">
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="0dp"
+        android:layout_marginRight="0dp"
+        android:layout_marginTop="0dp"/>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/menu_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_margin="16dp"
+        android:contentDescription="@string/quick_action_new_action"
+        android:src="@drawable/ic_action_plus"
+        app:backgroundTint="@color/dashboard_blue"
+        app:fabSize="normal"/>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/waypoint_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/menu_fab"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="24dp"
+        android:contentDescription="@string/quick_action_new_action"
+        android:src="@drawable/ic_action_marker_dark"
+        android:visibility="gone"
+        app:backgroundTint="@color/dashboard_blue"
+        app:fabSize="mini"
+        tools:visibility="visible"/>
+
+    <FrameLayout
+        android:id="@+id/waypoint_text_layout"
+        android:layout_toLeftOf="@id/waypoint_fab"
+        android:layout_toStartOf="@id/waypoint_fab"
+        android:layout_above="@id/menu_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/waypoint_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/add_waypoint"/>
+
+    </FrameLayout>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/route_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/waypoint_fab"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="16dp"
+        android:layout_marginRight="24dp"
+        android:contentDescription="@string/quick_action_new_action"
+        android:src="@drawable/ic_action_markers_dark"
+        android:visibility="gone"
+        app:backgroundTint="@color/dashboard_blue"
+        app:fabSize="mini"
+        tools:visibility="visible"/>
+
+    <FrameLayout
+        android:id="@+id/route_text_layout"
+        android:layout_toLeftOf="@id/route_fab"
+        android:layout_toStartOf="@id/route_fab"
+        android:layout_above="@id/waypoint_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginBottom="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/route_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/add_route_point"/>
+
+    </FrameLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
index 3c27ce8e25..ff238d8b59 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
@@ -13,6 +13,8 @@ import android.view.MenuItem;
 import android.view.View;
 
 import net.osmand.AndroidUtils;
+import net.osmand.data.LatLon;
+import net.osmand.data.PointDescription;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
@@ -21,11 +23,13 @@ import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.OsmAndAppCustomization;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.myplaces.FavoritesActivity;
 import net.osmand.plus.myplaces.SplitSegmentFragment;
 import net.osmand.plus.myplaces.TrackPointFragment;
 import net.osmand.plus.myplaces.TrackSegmentFragment;
+import net.osmand.plus.views.AddGpxPointBottomSheetHelper;
 import net.osmand.plus.views.controls.PagerSlidingTabStrip;
 
 import java.io.File;
@@ -39,6 +43,7 @@ public class TrackActivity extends TabActivity {
 	public static final String OPEN_POINTS_TAB = "OPEN_POINTS_TAB";
 	public static final String CURRENT_RECORDING = "CURRENT_RECORDING";
 	protected List<WeakReference<Fragment>> fragList = new ArrayList<>();
+	private OsmandApplication app;
 	protected PagerSlidingTabStrip slidingTabLayout;
 	private File file = null;
 	private GPXFile gpxFile;
@@ -56,7 +61,8 @@ public class TrackActivity extends TabActivity {
 
 	@Override
 	public void onCreate(Bundle icicle) {
-		((OsmandApplication) getApplication()).applyTheme(this);
+		this.app = getMyApplication();
+		app.applyTheme(this);
 		super.onCreate(icicle);
 		Intent intent = getIntent();
 		if (intent == null || (!intent.hasExtra(TRACK_FILE_NAME) &&
@@ -83,6 +89,25 @@ public class TrackActivity extends TabActivity {
 		setContentView(R.layout.tab_content);
 	}
 
+	public void addPoint(PointDescription pointDescription) {
+		Intent currentIntent = getIntent();
+		if (currentIntent != null) {
+			currentIntent.putExtra(TrackActivity.OPEN_POINTS_TAB, true);
+		}
+		final OsmandSettings settings = app.getSettings();
+		GPXFile gpx = getGpx();
+		LatLon location = settings.getLastKnownMapLocation();
+		if (gpx != null && location != null) {
+			settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
+					settings.getLastKnownMapZoom(),
+					pointDescription,
+					false,
+					new AddGpxPointBottomSheetHelper.NewGpxPoint(gpx, pointDescription));
+
+			MapActivity.launchMapActivityMoveToTop(this);
+		}
+	}
+
 	protected void setGpxDataItem(GpxDataItem gpxDataItem) {
 		this.gpxDataItem = gpxDataItem;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index d4bd49e319..84e293891c 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -178,22 +178,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 	}
 
 	private void addPoint(PointDescription pointDescription) {
-		Intent currentIntent = getTrackActivity().getIntent();
-		if (currentIntent != null) {
-			currentIntent.putExtra(TrackActivity.OPEN_POINTS_TAB, true);
-		}
-		final OsmandSettings settings = app.getSettings();
-		GPXFile gpx = getGpx();
-		LatLon location = settings.getLastKnownMapLocation();
-		if (gpx != null && location != null) {
-			settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
-					settings.getLastKnownMapZoom(),
-					pointDescription,
-					false,
-					new NewGpxPoint(gpx, pointDescription));
-
-			MapActivity.launchMapActivityMoveToTop(getActivity());
-		}
+		getTrackActivity().addPoint(pointDescription);
 	}
 
 	private void openMenu() {
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index 4756a13fea..72537be686 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -17,6 +17,7 @@ import android.os.Handler;
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v4.view.PagerAdapter;
@@ -140,6 +141,12 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 	private Bitmap mapBitmap;
 	private Bitmap mapTrackBitmap;
 	private boolean chartClicked;
+	private boolean menuOpened = false;
+	private FloatingActionButton menuFab;
+	private FloatingActionButton waypointFab;
+	private View waypointTextLayout;
+	private FloatingActionButton routePointFab;
+	private View routePointTextLayout;
 
 	@Override
 	public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -158,8 +165,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		setHasOptionsMenu(true);
-		View view = getActivity().getLayoutInflater().inflate(R.layout.update_index, container, false);
-		view.findViewById(R.id.header_layout).setVisibility(View.GONE);
+		View view = getActivity().getLayoutInflater().inflate(R.layout.track_segments_tree, container, false);
 
 		ListView listView = (ListView) view.findViewById(android.R.id.list);
 		listView.setDivider(null);
@@ -170,6 +176,38 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		tv.setTextSize(24);
 		listView.setEmptyView(tv);
 
+		menuFab = (FloatingActionButton) view.findViewById(R.id.menu_fab);
+		menuFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (menuOpened) {
+					closeMenu();
+				} else {
+					openMenu();
+				}
+			}
+		});
+
+		waypointFab = (FloatingActionButton) view.findViewById(R.id.waypoint_fab);
+		waypointFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_waypoint));
+				addPoint(pointDescription);
+			}
+		});
+		waypointTextLayout = view.findViewById(R.id.waypoint_text_layout);
+
+		routePointFab = (FloatingActionButton) view.findViewById(R.id.route_fab);
+		routePointFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
+				addPoint(pointDescription);
+			}
+		});
+		routePointTextLayout = view.findViewById(R.id.route_text_layout);
+
 		paint = new Paint();
 		paint.setStyle(Paint.Style.STROKE);
 		paint.setAntiAlias(true);
@@ -188,6 +226,28 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		return view;
 	}
 
+	private void addPoint(PointDescription pointDescription) {
+		getTrackActivity().addPoint(pointDescription);
+	}
+
+	private void openMenu() {
+		menuFab.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_action_remove_dark));
+		waypointFab.setVisibility(View.VISIBLE);
+		waypointTextLayout.setVisibility(View.VISIBLE);
+		routePointFab.setVisibility(View.VISIBLE);
+		routePointTextLayout.setVisibility(View.VISIBLE);
+		menuOpened = true;
+	}
+
+	private void closeMenu() {
+		menuFab.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_action_plus));
+		waypointFab.setVisibility(View.GONE);
+		waypointTextLayout.setVisibility(View.GONE);
+		routePointFab.setVisibility(View.GONE);
+		routePointTextLayout.setVisibility(View.GONE);
+		menuOpened = false;
+	}
+
 	public TrackActivity getTrackActivity() {
 		return (TrackActivity) getActivity();
 	}

From 3dcc410fd7a1600e429e69e424372e64f36862d4 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 8 Aug 2017 12:49:47 +0300
Subject: [PATCH 015/174] Replace ListView with RecyclerView

---
 .../res/layout/fragment_measurement_tool.xml  |  4 +-
 .../MeasurementToolAdapter.java               | 77 +++++++++++--------
 .../MeasurementToolFragment.java              | 17 ++--
 3 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index b146c796ca..6e2250ea2e 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -90,8 +90,8 @@
 
             <include layout="@layout/card_bottom_divider"/>
 
-            <ListView
-                android:id="@+id/measure_points_list_view"
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/measure_points_recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"/>
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
index 5062915c27..57ae8e9b63 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
@@ -1,13 +1,9 @@
 package net.osmand.plus.measurementtool;
 
-import android.content.Context;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -21,39 +17,44 @@ import net.osmand.util.MapUtils;
 
 import java.util.List;
 
-class MeasurementToolAdapter extends ArrayAdapter<WptPt> {
+class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter.Holder> {
 
-	private final MapActivity mapActivity;
-	private final List<WptPt> points;
-	private RemovePointListener listener;
+	private MapActivity mapActivity;
+	private List<WptPt> points;
+	private RemovePointListener removePointListener;
+	private ItemClickListener itemClickListener;
 
-	MeasurementToolAdapter(@NonNull Context context, @LayoutRes int resource, List<WptPt> points) {
-		super(context, resource, points);
-		this.mapActivity = (MapActivity) context;
+	MeasurementToolAdapter(MapActivity mapActivity, List<WptPt> points) {
+		this.mapActivity = mapActivity;
 		this.points = points;
 	}
 
 	void setRemovePointListener(RemovePointListener listener) {
-		this.listener = listener;
+		this.removePointListener = listener;
+	}
+
+	public void setItemClickListener(ItemClickListener itemClickListener) {
+		this.itemClickListener = itemClickListener;
 	}
 
-	@NonNull
 	@Override
-	public View getView(final int pos, @Nullable View view, @NonNull ViewGroup parent) {
-		ViewHolder holder;
-
-		if (view == null) {
-			view = LayoutInflater.from(parent.getContext()).inflate(R.layout.measure_points_list_item, parent, false);
-			final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
-			if (!nightMode) {
-				view.findViewById(R.id.points_divider).setBackgroundResource(R.drawable.divider);
-			}
-			holder = new ViewHolder(view);
-			view.setTag(holder);
-		} else {
-			holder = (ViewHolder) view.getTag();
+	public Holder onCreateViewHolder(ViewGroup viewGroup, int i) {
+		View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.measure_points_list_item, viewGroup, false);
+		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		if (!nightMode) {
+			view.findViewById(R.id.points_divider).setBackgroundResource(R.drawable.divider);
 		}
+		view.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				itemClickListener.onItemClick(view);
+			}
+		});
+		return new Holder(view);
+	}
 
+	@Override
+	public void onBindViewHolder(final Holder holder, int pos) {
 		IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
 		holder.icon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_measure_point));
 		holder.title.setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
@@ -71,22 +72,26 @@ class MeasurementToolAdapter extends ArrayAdapter<WptPt> {
 		holder.deleteBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				points.remove(pos);
-				listener.onPointRemove();
+				points.remove(holder.getAdapterPosition());
+				removePointListener.onPointRemove();
 			}
 		});
-
-		return view;
 	}
 
-	private static class ViewHolder {
+	@Override
+	public int getItemCount() {
+		return points.size();
+	}
+
+	static class Holder extends RecyclerView.ViewHolder {
 
 		final ImageView icon;
 		final TextView title;
 		final TextView descr;
 		final ImageButton deleteBtn;
 
-		ViewHolder(View view) {
+		Holder(View view) {
+			super(view);
 			icon = (ImageView) view.findViewById(R.id.measure_point_icon);
 			title = (TextView) view.findViewById(R.id.measure_point_title);
 			descr = (TextView) view.findViewById(R.id.measure_point_descr);
@@ -97,4 +102,8 @@ class MeasurementToolAdapter extends ArrayAdapter<WptPt> {
 	interface RemovePointListener {
 		void onPointRemove();
 	}
-}
+
+	interface ItemClickListener {
+		void onItemClick(View view);
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index d5d49242aa..9279ba54a2 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -10,6 +10,8 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SwitchCompat;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -19,11 +21,9 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -200,7 +200,7 @@ public class MeasurementToolFragment extends Fragment {
 			mapActivity.showTopToolbar(toolBarController);
 		}
 
-		adapter = new MeasurementToolAdapter(getMapActivity(), R.layout.measure_points_list_item, measurementLayer.getMeasurementPoints());
+		adapter = new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints());
 		adapter.setRemovePointListener(new MeasurementToolAdapter.RemovePointListener() {
 			@Override
 			public void onPointRemove() {
@@ -215,12 +215,13 @@ public class MeasurementToolFragment extends Fragment {
 				}
 			}
 		});
-		ListView lv = mainView.findViewById(R.id.measure_points_list_view);
-		lv.setDivider(null);
-		lv.setAdapter(adapter);
-		lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+		final RecyclerView rv = mainView.findViewById(R.id.measure_points_recycler_view);
+		rv.setLayoutManager(new LinearLayoutManager(getContext()));
+		rv.setAdapter(adapter);
+		adapter.setItemClickListener(new MeasurementToolAdapter.ItemClickListener() {
 			@Override
-			public void onItemClick(AdapterView<?> adapterView, View view, int pos, long l) {
+			public void onItemClick(View view) {
+				int pos = rv.indexOfChild(view);
 				measurementLayer.moveMapToPoint(pos);
 			}
 		});

From 8f00527bd77c3d79502d4b679e90ce752de674c2 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 8 Aug 2017 12:54:13 +0300
Subject: [PATCH 016/174] Add small changes

---
 .../plus/measurementtool/MeasurementToolAdapter.java       | 4 ++--
 .../plus/measurementtool/MeasurementToolFragment.java      | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
index 57ae8e9b63..a2c4e79f69 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
@@ -19,8 +19,8 @@ import java.util.List;
 
 class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter.Holder> {
 
-	private MapActivity mapActivity;
-	private List<WptPt> points;
+	private final MapActivity mapActivity;
+	private final List<WptPt> points;
 	private RemovePointListener removePointListener;
 	private ItemClickListener itemClickListener;
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 9279ba54a2..82d4440e6b 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -201,6 +201,7 @@ public class MeasurementToolFragment extends Fragment {
 		}
 
 		adapter = new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints());
+		final RecyclerView rv = mainView.findViewById(R.id.measure_points_recycler_view);
 		adapter.setRemovePointListener(new MeasurementToolAdapter.RemovePointListener() {
 			@Override
 			public void onPointRemove() {
@@ -215,9 +216,6 @@ public class MeasurementToolFragment extends Fragment {
 				}
 			}
 		});
-		final RecyclerView rv = mainView.findViewById(R.id.measure_points_recycler_view);
-		rv.setLayoutManager(new LinearLayoutManager(getContext()));
-		rv.setAdapter(adapter);
 		adapter.setItemClickListener(new MeasurementToolAdapter.ItemClickListener() {
 			@Override
 			public void onItemClick(View view) {
@@ -225,6 +223,8 @@ public class MeasurementToolFragment extends Fragment {
 				measurementLayer.moveMapToPoint(pos);
 			}
 		});
+		rv.setLayoutManager(new LinearLayoutManager(getContext()));
+		rv.setAdapter(adapter);
 
 		return view;
 	}
@@ -391,6 +391,7 @@ public class MeasurementToolFragment extends Fragment {
 		super.onDestroyView();
 		exitMeasurementMode();
 		adapter.setRemovePointListener(null);
+		adapter.setItemClickListener(null);
 		if (pointsDetailsOpened) {
 			setPreviousMapPosition();
 		}

From 30d18b9797ff01919bcc51db4c5f7957643d87bc Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 8 Aug 2017 12:56:37 +0300
Subject: [PATCH 017/174] Add empty space for fab on overview screen

---
 .../src/net/osmand/plus/myplaces/TrackSegmentFragment.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index 72537be686..6e6ad2846a 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -35,6 +35,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.CompoundButton;
@@ -221,6 +222,11 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		headerView = getActivity().getLayoutInflater().inflate(R.layout.gpx_item_list_header, null, false);
 		listView.addHeaderView(headerView);
 		listView.addFooterView(getActivity().getLayoutInflater().inflate(R.layout.list_shadow_footer, null, false));
+		View emptyView = new View(getActivity());
+		emptyView.setLayoutParams(new AbsListView.LayoutParams(
+				AbsListView.LayoutParams.MATCH_PARENT,
+				AndroidUtils.dpToPx(getActivity(), 72)));
+		listView.addFooterView(emptyView);
 		updateHeader();
 		setListAdapter(adapter);
 		return view;

From 137ce99023412d541d6ed5fc703b6fb0baca28ae Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 8 Aug 2017 13:22:14 +0300
Subject: [PATCH 018/174] Add fab for add line action

---
 OsmAnd/res/layout/points_tree.xml             | 42 ++++++++++++++++++-
 OsmAnd/res/layout/track_segments_tree.xml     | 42 ++++++++++++++++++-
 OsmAnd/res/values/strings.xml                 |  1 +
 .../osmand/plus/activities/TrackActivity.java |  4 ++
 .../plus/myplaces/TrackPointFragment.java     | 19 +++++++++
 .../plus/myplaces/TrackSegmentFragment.java   | 19 +++++++++
 6 files changed, 125 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/layout/points_tree.xml b/OsmAnd/res/layout/points_tree.xml
index 296e09695b..6d9af2a4ab 100644
--- a/OsmAnd/res/layout/points_tree.xml
+++ b/OsmAnd/res/layout/points_tree.xml
@@ -27,7 +27,7 @@
         android:layout_alignParentRight="true"
         android:layout_margin="16dp"
         android:contentDescription="@string/quick_action_new_action"
-        android:src="@drawable/ic_action_plus"
+        tools:src="@drawable/ic_action_plus"
         app:backgroundTint="@color/dashboard_blue"
         app:fabSize="normal"/>
 
@@ -109,4 +109,44 @@
 
     </FrameLayout>
 
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/line_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/route_fab"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="16dp"
+        android:layout_marginRight="24dp"
+        android:contentDescription="@string/quick_action_new_action"
+        android:src="@drawable/ic_action_polygom_dark"
+        android:visibility="gone"
+        app:backgroundTint="@color/dashboard_blue"
+        app:fabSize="mini"
+        tools:visibility="visible"/>
+
+    <FrameLayout
+        android:id="@+id/line_text_layout"
+        android:layout_toLeftOf="@id/line_fab"
+        android:layout_toStartOf="@id/line_fab"
+        android:layout_above="@id/route_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginBottom="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/line_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/add_line"/>
+
+    </FrameLayout>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/track_segments_tree.xml b/OsmAnd/res/layout/track_segments_tree.xml
index df56f12a0f..ee8115cfe9 100644
--- a/OsmAnd/res/layout/track_segments_tree.xml
+++ b/OsmAnd/res/layout/track_segments_tree.xml
@@ -23,7 +23,7 @@
         android:layout_alignParentRight="true"
         android:layout_margin="16dp"
         android:contentDescription="@string/quick_action_new_action"
-        android:src="@drawable/ic_action_plus"
+        tools:src="@drawable/ic_action_plus"
         app:backgroundTint="@color/dashboard_blue"
         app:fabSize="normal"/>
 
@@ -104,4 +104,44 @@
             android:text="@string/add_route_point"/>
 
     </FrameLayout>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/line_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/route_fab"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="16dp"
+        android:layout_marginRight="24dp"
+        android:contentDescription="@string/quick_action_new_action"
+        android:src="@drawable/ic_action_polygom_dark"
+        android:visibility="gone"
+        app:backgroundTint="@color/dashboard_blue"
+        app:fabSize="mini"
+        tools:visibility="visible"/>
+
+    <FrameLayout
+        android:id="@+id/line_text_layout"
+        android:layout_toLeftOf="@id/line_fab"
+        android:layout_toStartOf="@id/line_fab"
+        android:layout_above="@id/route_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginBottom="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/line_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/add_line"/>
+
+    </FrameLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index a32a2ac34c..6ed9ecce85 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2665,6 +2665,7 @@
     <string name="retry">Retry</string>
     <string name="add_route_point">Add Route Point</string>
     <string name="add_waypoint">Add Waypoint</string>
+    <string name="add_line">Add Line</string>
     <string name="save_gpx_waypoint">Save GPX Waypoint</string>
     <string name="save_route_point">Save Route Point</string>
     <string name="waypoint_one">Waypoint 1</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
index ff238d8b59..1fb2824599 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
@@ -108,6 +108,10 @@ public class TrackActivity extends TabActivity {
 		}
 	}
 
+	public void addLine() {
+
+	}
+
 	protected void setGpxDataItem(GpxDataItem gpxDataItem) {
 		this.gpxDataItem = gpxDataItem;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index 84e293891c..8cbd52b5d6 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -99,6 +99,8 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 	private View waypointTextLayout;
 	private FloatingActionButton routePointFab;
 	private View routePointTextLayout;
+	private FloatingActionButton lineFab;
+	private View lineTextLayout;
 
 	@Override
 	public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -166,6 +168,15 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 		});
 		routePointTextLayout = view.findViewById(R.id.route_text_layout);
 
+		lineFab = (FloatingActionButton) view.findViewById(R.id.line_fab);
+		lineFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				addLine();
+			}
+		});
+		lineTextLayout = view.findViewById(R.id.line_text_layout);
+
 		TextView tv = new TextView(getActivity());
 		tv.setText(R.string.none_selected_gpx);
 		tv.setTextSize(24);
@@ -181,12 +192,18 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 		getTrackActivity().addPoint(pointDescription);
 	}
 
+	private void addLine() {
+		getTrackActivity().addLine();
+	}
+
 	private void openMenu() {
 		menuFab.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_action_remove_dark));
 		waypointFab.setVisibility(View.VISIBLE);
 		waypointTextLayout.setVisibility(View.VISIBLE);
 		routePointFab.setVisibility(View.VISIBLE);
 		routePointTextLayout.setVisibility(View.VISIBLE);
+		lineFab.setVisibility(View.VISIBLE);
+		lineTextLayout.setVisibility(View.VISIBLE);
 		menuOpened = true;
 	}
 
@@ -196,6 +213,8 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 		waypointTextLayout.setVisibility(View.GONE);
 		routePointFab.setVisibility(View.GONE);
 		routePointTextLayout.setVisibility(View.GONE);
+		lineFab.setVisibility(View.GONE);
+		lineTextLayout.setVisibility(View.GONE);
 		menuOpened = false;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index 6e6ad2846a..a66ec133d4 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -148,6 +148,8 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 	private View waypointTextLayout;
 	private FloatingActionButton routePointFab;
 	private View routePointTextLayout;
+	private FloatingActionButton lineFab;
+	private View lineTextLayout;
 
 	@Override
 	public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -209,6 +211,15 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		});
 		routePointTextLayout = view.findViewById(R.id.route_text_layout);
 
+		lineFab = (FloatingActionButton) view.findViewById(R.id.line_fab);
+		lineFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				addLine();
+			}
+		});
+		lineTextLayout = view.findViewById(R.id.line_text_layout);
+
 		paint = new Paint();
 		paint.setStyle(Paint.Style.STROKE);
 		paint.setAntiAlias(true);
@@ -236,12 +247,18 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		getTrackActivity().addPoint(pointDescription);
 	}
 
+	private void addLine() {
+		getTrackActivity().addLine();
+	}
+
 	private void openMenu() {
 		menuFab.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_action_remove_dark));
 		waypointFab.setVisibility(View.VISIBLE);
 		waypointTextLayout.setVisibility(View.VISIBLE);
 		routePointFab.setVisibility(View.VISIBLE);
 		routePointTextLayout.setVisibility(View.VISIBLE);
+		lineFab.setVisibility(View.VISIBLE);
+		lineTextLayout.setVisibility(View.VISIBLE);
 		menuOpened = true;
 	}
 
@@ -251,6 +268,8 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		waypointTextLayout.setVisibility(View.GONE);
 		routePointFab.setVisibility(View.GONE);
 		routePointTextLayout.setVisibility(View.GONE);
+		lineFab.setVisibility(View.GONE);
+		lineTextLayout.setVisibility(View.GONE);
 		menuOpened = false;
 	}
 

From a6381c86efa0b1db939a832989dae45fa0c8e40d Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 8 Aug 2017 13:28:19 +0300
Subject: [PATCH 019/174] Close fab menu on scroll in overview screen

---
 .../osmand/plus/myplaces/TrackSegmentFragment.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index a66ec133d4..ba65930194 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -160,6 +160,20 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 	@Override
 	public void onActivityCreated(Bundle savedInstanceState) {
 		super.onActivityCreated(savedInstanceState);
+		getListView().setOnScrollListener(new AbsListView.OnScrollListener() {
+			@Override
+			public void onScrollStateChanged(AbsListView absListView, int i) {
+				if (i == AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL) {
+					if (menuOpened) {
+						closeMenu();
+					}
+				}
+			}
+
+			@Override
+			public void onScroll(AbsListView absListView, int i, int i1, int i2) {
+			}
+		});
 		getListView().setBackgroundColor(getResources().getColor(
 				getMyApplication().getSettings().isLightContent() ? R.color.ctx_menu_info_view_bg_light
 						: R.color.ctx_menu_info_view_bg_dark));

From 59ed65326ec29da867f29ab4f26bb70683be235a Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 8 Aug 2017 13:29:22 +0300
Subject: [PATCH 020/174] Fix fab drawables

---
 OsmAnd/res/layout/points_tree.xml         | 2 +-
 OsmAnd/res/layout/track_segments_tree.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/layout/points_tree.xml b/OsmAnd/res/layout/points_tree.xml
index 6d9af2a4ab..fabb898d62 100644
--- a/OsmAnd/res/layout/points_tree.xml
+++ b/OsmAnd/res/layout/points_tree.xml
@@ -27,7 +27,7 @@
         android:layout_alignParentRight="true"
         android:layout_margin="16dp"
         android:contentDescription="@string/quick_action_new_action"
-        tools:src="@drawable/ic_action_plus"
+        android:src="@drawable/ic_action_plus"
         app:backgroundTint="@color/dashboard_blue"
         app:fabSize="normal"/>
 
diff --git a/OsmAnd/res/layout/track_segments_tree.xml b/OsmAnd/res/layout/track_segments_tree.xml
index ee8115cfe9..b084bde401 100644
--- a/OsmAnd/res/layout/track_segments_tree.xml
+++ b/OsmAnd/res/layout/track_segments_tree.xml
@@ -23,7 +23,7 @@
         android:layout_alignParentRight="true"
         android:layout_margin="16dp"
         android:contentDescription="@string/quick_action_new_action"
-        tools:src="@drawable/ic_action_plus"
+        android:src="@drawable/ic_action_plus"
         app:backgroundTint="@color/dashboard_blue"
         app:fabSize="normal"/>
 

From 568caff3915667c25ee39fdaa2e33a37a05b4ae6 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 8 Aug 2017 13:33:41 +0300
Subject: [PATCH 021/174] Open / Close the points list by clicking on the title

---
 OsmAnd/res/layout/fragment_measurement_tool.xml          | 7 ++++---
 .../plus/measurementtool/MeasurementToolFragment.java    | 9 +++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 6e2250ea2e..7d9a86432d 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -17,6 +17,7 @@
         android:orientation="vertical">
 
         <RelativeLayout
+            android:id="@+id/up_down_row"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingBottom="12dp"
@@ -36,16 +37,16 @@
                 android:background="@null"
                 tools:src="@drawable/ic_action_ruler"/>
 
-            <ImageButton
+            <ImageView
                 android:id="@+id/up_down_button"
                 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="16dp"
+                android:layout_marginStart="16dp"
                 android:background="@null"
-                android:paddingEnd="16dp"
-                android:paddingStart="16dp"
                 tools:src="@drawable/ic_action_arrow_down"/>
 
             <TextView
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 82d4440e6b..ff0254940d 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -92,9 +92,10 @@ public class MeasurementToolFragment extends Fragment {
 		((ImageView) mainView.findViewById(R.id.ruler_icon))
 				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_ruler, R.color.color_myloc_distance));
 
-		final ImageButton upDownBtn = ((ImageButton) mainView.findViewById(R.id.up_down_button));
+		final ImageView upDownBtn = ((ImageView) mainView.findViewById(R.id.up_down_button));
 		upDownBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
-		upDownBtn.setOnClickListener(new View.OnClickListener() {
+
+		mainView.findViewById(R.id.up_down_row).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				if (!pointsDetailsOpened) {
@@ -232,7 +233,7 @@ public class MeasurementToolFragment extends Fragment {
 	private void upBtnOnClick(View view, Drawable icon) {
 		pointsDetailsOpened = true;
 		view.findViewById(R.id.points_list_container).setVisibility(View.VISIBLE);
-		((ImageButton) view.findViewById(R.id.up_down_button)).setImageDrawable(icon);
+		((ImageView) view.findViewById(R.id.up_down_button)).setImageDrawable(icon);
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
 			OsmandMapTileView tileView = mapActivity.getMapView();
@@ -245,7 +246,7 @@ public class MeasurementToolFragment extends Fragment {
 	private void downBtnOnClick(View view, Drawable icon) {
 		pointsDetailsOpened = false;
 		view.findViewById(R.id.points_list_container).setVisibility(View.GONE);
-		((ImageButton) view.findViewById(R.id.up_down_button)).setImageDrawable(icon);
+		((ImageView) view.findViewById(R.id.up_down_button)).setImageDrawable(icon);
 		setPreviousMapPosition();
 	}
 

From c5bc873de4cf3371a0f0269e696fc4a2dbdcd5a1 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 8 Aug 2017 13:41:51 +0300
Subject: [PATCH 022/174] Create fabOnClickListener

---
 .../plus/myplaces/TrackPointFragment.java     | 60 +++++++++----------
 .../plus/myplaces/TrackSegmentFragment.java   | 60 +++++++++----------
 2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index 8cbd52b5d6..a5d1500491 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -130,6 +130,32 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 						: R.color.ctx_menu_info_view_bg_dark));
 	}
 
+	private View.OnClickListener onFabClickListener = new View.OnClickListener() {
+		@Override
+		public void onClick(View view) {
+			switch (view.getId()) {
+				case R.id.menu_fab:
+					if (menuOpened) {
+						closeMenu();
+					} else {
+						openMenu();
+					}
+					break;
+				case R.id.waypoint_fab:
+					PointDescription pointWptDescription = new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_waypoint));
+					addPoint(pointWptDescription);
+					break;
+				case R.id.route_fab:
+					PointDescription pointRteDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
+					addPoint(pointRteDescription);
+					break;
+				case R.id.line_fab:
+					addLine();
+					break;
+			}
+		}
+	};
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View view = inflater.inflate(R.layout.points_tree, container, false);
@@ -137,44 +163,18 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 		setHasOptionsMenu(true);
 
 		menuFab = (FloatingActionButton) view.findViewById(R.id.menu_fab);
-		menuFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				if (menuOpened) {
-					closeMenu();
-				} else {
-					openMenu();
-				}
-			}
-		});
+		menuFab.setOnClickListener(onFabClickListener);
 
 		waypointFab = (FloatingActionButton) view.findViewById(R.id.waypoint_fab);
-		waypointFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_waypoint));
-				addPoint(pointDescription);
-			}
-		});
+		waypointFab.setOnClickListener(onFabClickListener);
 		waypointTextLayout = view.findViewById(R.id.waypoint_text_layout);
 
 		routePointFab = (FloatingActionButton) view.findViewById(R.id.route_fab);
-		routePointFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
-				addPoint(pointDescription);
-			}
-		});
+		routePointFab.setOnClickListener(onFabClickListener);
 		routePointTextLayout = view.findViewById(R.id.route_text_layout);
 
 		lineFab = (FloatingActionButton) view.findViewById(R.id.line_fab);
-		lineFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				addLine();
-			}
-		});
+		lineFab.setOnClickListener(onFabClickListener);
 		lineTextLayout = view.findViewById(R.id.line_text_layout);
 
 		TextView tv = new TextView(getActivity());
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index ba65930194..8ec1e1771c 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -179,6 +179,32 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 						: R.color.ctx_menu_info_view_bg_dark));
 	}
 
+	private View.OnClickListener onFabClickListener = new View.OnClickListener() {
+		@Override
+		public void onClick(View view) {
+			switch (view.getId()) {
+				case R.id.menu_fab:
+					if (menuOpened) {
+						closeMenu();
+					} else {
+						openMenu();
+					}
+					break;
+				case R.id.waypoint_fab:
+					PointDescription pointWptDescription = new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_waypoint));
+					addPoint(pointWptDescription);
+					break;
+				case R.id.route_fab:
+					PointDescription pointRteDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
+					addPoint(pointRteDescription);
+					break;
+				case R.id.line_fab:
+					addLine();
+					break;
+			}
+		}
+	};
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		setHasOptionsMenu(true);
@@ -194,44 +220,18 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		listView.setEmptyView(tv);
 
 		menuFab = (FloatingActionButton) view.findViewById(R.id.menu_fab);
-		menuFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				if (menuOpened) {
-					closeMenu();
-				} else {
-					openMenu();
-				}
-			}
-		});
+		menuFab.setOnClickListener(onFabClickListener);
 
 		waypointFab = (FloatingActionButton) view.findViewById(R.id.waypoint_fab);
-		waypointFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_waypoint));
-				addPoint(pointDescription);
-			}
-		});
+		waypointFab.setOnClickListener(onFabClickListener);
 		waypointTextLayout = view.findViewById(R.id.waypoint_text_layout);
 
 		routePointFab = (FloatingActionButton) view.findViewById(R.id.route_fab);
-		routePointFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
-				addPoint(pointDescription);
-			}
-		});
+		routePointFab.setOnClickListener(onFabClickListener);
 		routePointTextLayout = view.findViewById(R.id.route_text_layout);
 
 		lineFab = (FloatingActionButton) view.findViewById(R.id.line_fab);
-		lineFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				addLine();
-			}
-		});
+		lineFab.setOnClickListener(onFabClickListener);
 		lineTextLayout = view.findViewById(R.id.line_text_layout);
 
 		paint = new Paint();

From ab023859a1f4289e1d4753e6415cea19fec0711c Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 8 Aug 2017 14:03:04 +0300
Subject: [PATCH 023/174] Add ability to add point on single tap

---
 .../MeasurementToolFragment.java              | 28 +++++++++++++++----
 .../measurementtool/MeasurementToolLayer.java | 23 +++++++++++++++
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index ff0254940d..72f5d87590 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -145,11 +145,14 @@ public class MeasurementToolFragment extends Fragment {
 		mainView.findViewById(R.id.add_point_button).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				measurementLayer.addPointOnClick();
-				enable(undoBtn, upDownBtn);
-				disable(redoBtn);
-				updateText();
-				adapter.notifyDataSetChanged();
+				addPoint(undoBtn, upDownBtn, redoBtn);
+			}
+		});
+
+		measurementLayer.setOnSingleTapListener(new MeasurementToolLayer.OnSingleTapListener() {
+			@Override
+			public void onSingleTap() {
+				addPoint(undoBtn, upDownBtn, redoBtn);
 			}
 		});
 
@@ -230,6 +233,17 @@ public class MeasurementToolFragment extends Fragment {
 		return view;
 	}
 
+	private void addPoint(View undoBtn, View upDownBtn, View redoBtn) {
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (measurementLayer != null) {
+			measurementLayer.addPointOnClick();
+			enable(undoBtn, upDownBtn);
+			disable(redoBtn);
+			updateText();
+			adapter.notifyDataSetChanged();
+		}
+	}
+
 	private void upBtnOnClick(View view, Drawable icon) {
 		pointsDetailsOpened = true;
 		view.findViewById(R.id.points_list_container).setVisibility(View.VISIBLE);
@@ -396,6 +410,10 @@ public class MeasurementToolFragment extends Fragment {
 		if (pointsDetailsOpened) {
 			setPreviousMapPosition();
 		}
+		MeasurementToolLayer layer = getMeasurementLayer();
+		if (layer != null) {
+			layer.setOnSingleTapListener(null);
+		}
 	}
 
 	private MapActivity getMapActivity() {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 722b59b5b2..63b80cc6dc 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -6,6 +6,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PointF;
+import android.view.MotionEvent;
 
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
@@ -40,6 +41,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private int marginY;
 	private final TIntArrayList tx = new TIntArrayList();
 	private final TIntArrayList ty = new TIntArrayList();
+	private OnSingleTapListener singleTapListener;
 
 	@Override
 	public void initLayer(OsmandMapTileView view) {
@@ -58,6 +60,10 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		marginX = pointIcon.getWidth() / 2;
 	}
 
+	public void setOnSingleTapListener(OnSingleTapListener listener) {
+		this.singleTapListener = listener;
+	}
+
 	public boolean isInMeasurementMode() {
 		return inMeasurementMode;
 	}
@@ -91,6 +97,19 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		view.refreshMap();
 	}
 
+	@Override
+	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
+		if (inMeasurementMode && singleTapListener != null) {
+			singleTapListener.onSingleTap();
+		}
+		return false;
+	}
+
+	@Override
+	public boolean onTouchEvent(MotionEvent event, RotatedTileBox tileBox) {
+		return super.onTouchEvent(event, tileBox);
+	}
+
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings settings) {
 		if (inMeasurementMode) {
@@ -222,4 +241,8 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	public boolean isObjectClickable(Object o) {
 		return !isInMeasurementMode();
 	}
+
+	interface OnSingleTapListener {
+		void onSingleTap();
+	}
 }

From ca7c57328631e098279472ac9ce64c50afd7be18 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 8 Aug 2017 18:59:50 +0300
Subject: [PATCH 024/174] Add saving to gpx segment

---
 OsmAnd/res/menu/measurement_tool_menu.xml     |  5 ++
 OsmAnd/res/values/strings.xml                 |  1 +
 OsmAnd/src/net/osmand/plus/GPXUtilities.java  | 22 ++++++-
 .../osmand/plus/activities/MapActivity.java   | 14 ++++
 .../osmand/plus/activities/TrackActivity.java | 27 ++++++++
 .../MeasurementToolFragment.java              | 65 +++++++++++++++----
 6 files changed, 121 insertions(+), 13 deletions(-)

diff --git a/OsmAnd/res/menu/measurement_tool_menu.xml b/OsmAnd/res/menu/measurement_tool_menu.xml
index c39cdaa767..c4065601b6 100644
--- a/OsmAnd/res/menu/measurement_tool_menu.xml
+++ b/OsmAnd/res/menu/measurement_tool_menu.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:visible="false"
+        android:id="@+id/action_save_as_new_segment"
+        android:icon="@drawable/ic_action_polygom_dark"
+        android:title="@string/save_as_new_segment"/>
     <item
         android:id="@+id/action_save_as_gpx"
         android:icon="@drawable/ic_action_polygom_dark"
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 6ed9ecce85..aa91adc611 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2676,4 +2676,5 @@
     <string name="empty_state_favourites_desc">Add favorites on map or import them from filesystem</string>
     <string name="import_track">Import track</string>
     <string name="import_track_desc">File %1$s does not contain waypoints, import it as a track?</string>
+    <string name="save_as_new_segment">Save as new segment</string>
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index add5920fad..bf37c31cb1 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -880,7 +880,7 @@ public class GPXUtilities {
 			if (routes.size() == 0) {
 				routes.add(new Route());
 			}
-			Route currentRoute = routes.get(routes.size() -1);
+			Route currentRoute = routes.get(routes.size() - 1);
 			currentRoute.points.add(pt);
 
 			modifiedTime = System.currentTimeMillis();
@@ -888,6 +888,26 @@ public class GPXUtilities {
 			return pt;
 		}
 
+		public void addTrkSegment(List<WptPt> points) {
+			Track generalTrack = getGeneralTrack();
+			if (generalTrack != null) {
+				tracks.remove(generalTrack);
+				this.generalTrack = null;
+				this.generalSegment = null;
+			}
+
+			TrkSegment segment = new TrkSegment();
+			segment.points.addAll(points);
+
+			if (tracks.size() == 0) {
+				tracks.add(new Track());
+			}
+			Track lastTrack = tracks.get(tracks.size() - 1);
+			lastTrack.segments.add(segment);
+
+			modifiedTime = System.currentTimeMillis();
+		}
+
 		public void updateWptPt(WptPt pt, double lat, double lon, long time, String description, String name, String category, int color) {
 			int index = points.indexOf(pt);
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 897c35e7d1..88704c75d8 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -70,6 +70,7 @@ import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.search.SearchActivity;
+import net.osmand.plus.activities.TrackActivity.NewGpxLine;
 import net.osmand.plus.base.FailSafeFuntions;
 import net.osmand.plus.base.MapViewTrackingUtilities;
 import net.osmand.plus.dashboard.DashboardOnMap;
@@ -929,6 +930,9 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 				} else if (toShow instanceof NewGpxPoint) {
 					NewGpxPoint newGpxPoint = (NewGpxPoint) toShow;
 					getMapLayers().getContextMenuLayer().enterAddGpxPointMode(newGpxPoint);
+				} else if (toShow instanceof NewGpxLine) {
+					NewGpxLine newGpxLine = (NewGpxLine) toShow;
+					openAddingNewGpxLine(newGpxLine);
 				} else {
 					mapContextMenu.show(latLonToShow, mapLabelToShow, toShow);
 				}
@@ -942,6 +946,16 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		}
 	}
 
+	private void openAddingNewGpxLine(NewGpxLine newGpxLine) {
+		MeasurementToolFragment fragment = new MeasurementToolFragment();
+		fragment.setNewGpxLine(newGpxLine);
+		getSupportFragmentManager()
+				.beginTransaction()
+				.add(R.id.bottomFragmentContainer, fragment, MeasurementToolFragment.TAG)
+				.addToBackStack(MeasurementToolFragment.TAG)
+				.commitAllowingStateLoss();
+	}
+
 	public OsmandApplication getMyApplication() {
 		return ((OsmandApplication) getApplication());
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
index 1fb2824599..cdb618e7ab 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
@@ -18,6 +18,7 @@ import net.osmand.data.PointDescription;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
+import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
@@ -109,7 +110,21 @@ public class TrackActivity extends TabActivity {
 	}
 
 	public void addLine() {
+		GPXFile gpxFile = getGpx();
+		NewGpxLine newGpxLine = new NewGpxLine(gpxFile);
+		WptPt pointToShow = gpxFile != null ? gpxFile.findPointToShow() : null;
+		if (pointToShow != null) {
+			LatLon location = new LatLon(pointToShow.getLatitude(), pointToShow.getLongitude());
+			final OsmandSettings settings = app.getSettings();
+			settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
+					settings.getLastKnownMapZoom(),
+					new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_line)),
+					false,
+					newGpxLine
+			);
 
+			MapActivity.launchMapActivityMoveToTop(this);
+		}
 	}
 
 	protected void setGpxDataItem(GpxDataItem gpxDataItem) {
@@ -333,4 +348,16 @@ public class TrackActivity extends TabActivity {
 	public GpxDataItem getGpxDataItem() {
 		return gpxDataItem;
 	}
+
+	public static class NewGpxLine {
+		private GPXFile gpxFile;
+
+		public NewGpxLine(GPXFile gpxFile) {
+			this.gpxFile = gpxFile;
+		}
+
+		public GPXFile getGpxFile() {
+			return gpxFile;
+		}
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index ff0254940d..95edec929f 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -32,9 +32,11 @@ import net.osmand.IndexConstants;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.Route;
 import net.osmand.plus.GPXUtilities.WptPt;
+import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.IconsCache;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.TrackActivity.NewGpxLine;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
@@ -46,6 +48,7 @@ import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Locale;
 
 import static net.osmand.plus.GPXUtilities.GPXFile;
@@ -65,6 +68,11 @@ public class MeasurementToolFragment extends Fragment {
 	private boolean wasCollapseButtonVisible;
 	private boolean pointsDetailsOpened;
 	private int previousMapPosition;
+	private NewGpxLine newGpxLine;
+
+	public void setNewGpxLine(NewGpxLine newGpxLine) {
+		this.newGpxLine = newGpxLine;
+	}
 
 	@Nullable
 	@Override
@@ -173,12 +181,26 @@ public class MeasurementToolFragment extends Fragment {
 					popup.getMenuInflater().inflate(R.menu.measurement_tool_menu, popup.getMenu());
 					final Menu menu = popup.getMenu();
 					IconsCache ic = mapActivity.getMyApplication().getIconsCache();
-					menu.findItem(R.id.action_save_as_gpx).setIcon(ic.getThemedIcon(R.drawable.ic_action_polygom_dark));
+					MenuItem saveAsNewSegmentMenuItem = menu.findItem(R.id.action_save_as_new_segment);
+					MenuItem saveAsGpxTrack = menu.findItem(R.id.action_save_as_gpx);
+					saveAsNewSegmentMenuItem.setIcon(ic.getThemedIcon(R.drawable.ic_action_polygom_dark));
+					saveAsGpxTrack.setIcon(ic.getThemedIcon(R.drawable.ic_action_polygom_dark));
+					if (newGpxLine != null) {
+						saveAsNewSegmentMenuItem.setVisible(true);
+						saveAsGpxTrack.setVisible(false);
+					}
 					menu.findItem(R.id.action_clear_all).setIcon(ic.getThemedIcon(R.drawable.ic_action_reset_to_default_dark));
 					popup.setOnMenuItemClickListener(new IconPopupMenu.OnMenuItemClickListener() {
 						@Override
 						public boolean onMenuItemClick(MenuItem menuItem) {
 							switch (menuItem.getItemId()) {
+								case R.id.action_save_as_new_segment:
+									if (measurementLayer.getPointsCount() > 0) {
+										saveAsNewSegment(mapActivity);
+									} else {
+										Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
+									}
+									return true;
 								case R.id.action_save_as_gpx:
 									if (measurementLayer.getPointsCount() > 0) {
 										saveAsGpxOnClick(mapActivity);
@@ -258,6 +280,13 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
+	private void saveAsNewSegment(MapActivity mapActivity) {
+		GPXFile gpx = newGpxLine.getGpxFile();
+		SelectedGpxFile selectedGpxFile = mapActivity.getMyApplication().getSelectedGpxHelper().getSelectedFileByPath(gpx.path);
+		boolean showOnMap = selectedGpxFile != null;
+		saveGpx(null, null, showOnMap);
+	}
+
 	private void saveAsGpxOnClick(MapActivity mapActivity) {
 		final File dir = mapActivity.getMyApplication().getAppPath(IndexConstants.GPX_INDEX_DIR);
 		final LayoutInflater inflater = mapActivity.getLayoutInflater();
@@ -342,23 +371,35 @@ public class MeasurementToolFragment extends Fragment {
 
 			@Override
 			protected String doInBackground(Void... voids) {
-				toSave = new File(dir, fileName);
-				GPXFile gpx = new GPXFile();
 				MeasurementToolLayer measurementLayer = getMeasurementLayer();
-				if (measurementLayer != null) {
-					LinkedList<WptPt> points = measurementLayer.getMeasurementPoints();
-					if (points.size() == 1) {
-						gpx.points.add(points.getFirst());
-					} else if (points.size() > 1) {
-						Route rt = new Route();
-						gpx.routes.add(rt);
-						rt.points.addAll(points);
+				GPXFile gpx;
+				if (newGpxLine != null) {
+					gpx = newGpxLine.getGpxFile();
+					toSave = new File(gpx.path);
+					if (measurementLayer != null) {
+						List<WptPt> points = measurementLayer.getMeasurementPoints();
+						gpx.addTrkSegment(points);
+					}
+				} else {
+					gpx = new GPXFile();
+					toSave = new File(dir, fileName);
+					if (measurementLayer != null) {
+						LinkedList<WptPt> points = measurementLayer.getMeasurementPoints();
+						if (points.size() == 1) {
+							gpx.points.add(points.getFirst());
+						} else if (points.size() > 1) {
+							Route rt = new Route();
+							gpx.routes.add(rt);
+							rt.points.addAll(points);
+						}
 					}
 				}
 				MapActivity activity = getMapActivity();
 				if (activity != null) {
 					String res = GPXUtilities.writeGpxFile(toSave, gpx, activity.getMyApplication());
-					gpx.path = toSave.getAbsolutePath();
+					if (newGpxLine == null) {
+						gpx.path = toSave.getAbsolutePath();
+					}
 					if (showOnMap) {
 						activity.getMyApplication().getSelectedGpxHelper().selectGpxFile(gpx, true, false);
 					}

From aa641516c94ef9c8ac1d9ad042399fc456ee7d45 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 8 Aug 2017 19:07:12 +0300
Subject: [PATCH 025/174] Use Command pattern for undo and redo; add small
 improvements

---
 .../res/layout/fragment_measurement_tool.xml  | 14 +++--
 .../MeasurementToolAdapter.java               |  7 ++-
 .../MeasurementToolFragment.java              | 26 +++++----
 .../measurementtool/MeasurementToolLayer.java | 53 +++++++++----------
 .../command/AddPointCommand.java              | 37 +++++++++++++
 .../plus/measurementtool/command/Command.java | 10 ++++
 .../command/CommandManager.java               | 46 ++++++++++++++++
 .../command/RemovePointCommand.java           | 33 ++++++++++++
 8 files changed, 183 insertions(+), 43 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/command/Command.java
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 7d9a86432d..a1561c3d2f 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -117,8 +117,12 @@
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
                 android:background="@null"
-                android:paddingEnd="16dp"
+                android:paddingBottom="14dp"
+                android:paddingEnd="12dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="12dp"
                 android:paddingStart="16dp"
+                android:paddingTop="14dp"
                 tools:src="@drawable/ic_action_undo_dark"/>
 
             <ImageButton
@@ -129,8 +133,12 @@
                 android:layout_toEndOf="@id/undo_point_button"
                 android:layout_toRightOf="@id/undo_point_button"
                 android:background="@null"
-                android:paddingEnd="8dp"
-                android:paddingStart="8dp"
+                android:paddingBottom="14dp"
+                android:paddingEnd="16dp"
+                android:paddingLeft="12dp"
+                android:paddingRight="16dp"
+                android:paddingStart="12dp"
+                android:paddingTop="14dp"
                 tools:src="@drawable/ic_action_redo_dark"/>
 
             <Button
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
index a2c4e79f69..c832ce2ac1 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
@@ -33,7 +33,7 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 		this.removePointListener = listener;
 	}
 
-	public void setItemClickListener(ItemClickListener itemClickListener) {
+	void setItemClickListener(ItemClickListener itemClickListener) {
 		this.itemClickListener = itemClickListener;
 	}
 
@@ -72,8 +72,7 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 		holder.deleteBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				points.remove(holder.getAdapterPosition());
-				removePointListener.onPointRemove();
+				removePointListener.onPointRemove(holder.getAdapterPosition());
 			}
 		});
 	}
@@ -100,7 +99,7 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 	}
 
 	interface RemovePointListener {
-		void onPointRemove();
+		void onPointRemove(int position);
 	}
 
 	interface ItemClickListener {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index f8898ace6e..1af0efb188 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -38,6 +38,9 @@ import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.TrackActivity.NewGpxLine;
 import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.measurementtool.command.AddPointCommand;
+import net.osmand.plus.measurementtool.command.CommandManager;
+import net.osmand.plus.measurementtool.command.RemovePointCommand;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
@@ -59,6 +62,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	public static final String TAG = "MeasurementToolFragment";
 
+	private CommandManager commandManager = new CommandManager();
 	private MeasurementToolBarController toolBarController;
 	private MeasurementToolAdapter adapter;
 	private TextView distanceTv;
@@ -121,7 +125,8 @@ public class MeasurementToolFragment extends Fragment {
 		undoBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				if (measurementLayer.undoPointOnClick()) {
+				commandManager.undo();
+				if (commandManager.canUndo()) {
 					enable(undoBtn);
 				} else {
 					disable(undoBtn, upDownBtn);
@@ -130,7 +135,6 @@ public class MeasurementToolFragment extends Fragment {
 				adapter.notifyDataSetChanged();
 				enable(redoBtn);
 				updateText();
-				mapActivity.refreshMap();
 			}
 		});
 
@@ -138,7 +142,8 @@ public class MeasurementToolFragment extends Fragment {
 		redoBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				if (measurementLayer.redoPointOnClick()) {
+				commandManager.redo();
+				if (commandManager.canRedo()) {
 					enable(redoBtn);
 				} else {
 					disable(redoBtn);
@@ -146,7 +151,6 @@ public class MeasurementToolFragment extends Fragment {
 				adapter.notifyDataSetChanged();
 				enable(undoBtn, upDownBtn);
 				updateText();
-				mapActivity.refreshMap();
 			}
 		});
 
@@ -213,8 +217,10 @@ public class MeasurementToolFragment extends Fragment {
 									return true;
 								case R.id.action_clear_all:
 									measurementLayer.clearPoints();
+									downBtnOnClick(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
 									disable(undoBtn, redoBtn, upDownBtn);
 									updateText();
+									commandManager.clear();
 									return true;
 							}
 							return false;
@@ -230,15 +236,17 @@ public class MeasurementToolFragment extends Fragment {
 		final RecyclerView rv = mainView.findViewById(R.id.measure_points_recycler_view);
 		adapter.setRemovePointListener(new MeasurementToolAdapter.RemovePointListener() {
 			@Override
-			public void onPointRemove() {
+			public void onPointRemove(int position) {
+				commandManager.execute(new RemovePointCommand(measurementLayer, position));
 				adapter.notifyDataSetChanged();
-				measurementLayer.resetCachePoints();
 				disable(redoBtn);
 				updateText();
-				mapActivity.refreshMap();
 				if (measurementLayer.getPointsCount() < 1) {
 					downBtnOnClick(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
-					disable(upDownBtn, undoBtn);
+					disable(upDownBtn);
+					if (!commandManager.canUndo()) {
+						disable(undoBtn);
+					}
 				}
 			}
 		});
@@ -258,7 +266,7 @@ public class MeasurementToolFragment extends Fragment {
 	private void addPoint(View undoBtn, View upDownBtn, View redoBtn) {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
-			measurementLayer.addPointOnClick();
+			commandManager.execute(new AddPointCommand(measurementLayer));
 			enable(undoBtn, upDownBtn);
 			disable(redoBtn);
 			updateText();
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 63b80cc6dc..56cb23c46f 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -30,7 +30,6 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private OsmandMapTileView view;
 	private boolean inMeasurementMode;
 	private final LinkedList<WptPt> measurementPoints = new LinkedList<>();
-	private LinkedList<WptPt> cacheMeasurementPoints = new LinkedList<>();
 	private Bitmap centerIconDay;
 	private Bitmap centerIconNight;
 	private Bitmap pointIcon;
@@ -60,7 +59,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		marginX = pointIcon.getWidth() / 2;
 	}
 
-	public void setOnSingleTapListener(OnSingleTapListener listener) {
+	void setOnSingleTapListener(OnSingleTapListener listener) {
 		this.singleTapListener = listener;
 	}
 
@@ -72,7 +71,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		this.inMeasurementMode = inMeasurementMode;
 	}
 
-	int getPointsCount() {
+	public int getPointsCount() {
 		return measurementPoints.size();
 	}
 
@@ -93,7 +92,6 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 
 	void clearPoints() {
 		measurementPoints.clear();
-		cacheMeasurementPoints.clear();
 		view.refreshMap();
 	}
 
@@ -160,11 +158,12 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		canvas.rotate(tb.getRotate(), center.x, center.y);
 	}
 
-	void resetCachePoints() {
-		cacheMeasurementPoints = new LinkedList<>(measurementPoints);
+	public void addPoint(int position, WptPt point) {
+		measurementPoints.add(position, point);
+		view.refreshMap();
 	}
 
-	void addPointOnClick() {
+	public WptPt addPoint(int position) {
 		RotatedTileBox tb = view.getCurrentRotatedTileBox();
 		LatLon l = tb.getLatLonFromPixel(tb.getCenterPixelX(), tb.getCenterPixelY());
 		WptPt pt = new WptPt();
@@ -172,34 +171,34 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		pt.lon = l.getLongitude();
 		if (measurementPoints.size() > 0) {
 			if (!measurementPoints.get(measurementPoints.size() - 1).equals(pt)) {
-				measurementPoints.add(pt);
+				measurementPoints.add(position, pt);
+				view.refreshMap();
+				return pt;
 			}
 		} else {
-			measurementPoints.add(pt);
+			measurementPoints.add(position, pt);
+			view.refreshMap();
+			return pt;
 		}
-		resetCachePoints();
-		view.refreshMap();
+		return null;
 	}
 
-	boolean undoPointOnClick() {
-		measurementPoints.remove(measurementPoints.size() - 1);
+	public WptPt removePoint(int position) {
+		WptPt res = measurementPoints.remove(position);
+		view.refreshMap();
+		return res;
+	}
+
+	public void moveMapToPoint(int pos) {
 		if (measurementPoints.size() > 0) {
-			WptPt pt = measurementPoints.get(measurementPoints.size() - 1);
+			if (pos >= measurementPoints.size()) {
+				pos = measurementPoints.size() - 1;
+			} else if (pos < 0) {
+				pos = 0;
+			}
+			WptPt pt = measurementPoints.get(pos);
 			view.getAnimatedDraggingThread().startMoving(pt.getLatitude(), pt.getLongitude(), view.getZoom(), true);
 		}
-		return measurementPoints.size() > 0;
-	}
-
-	boolean redoPointOnClick() {
-		WptPt pt = cacheMeasurementPoints.get(measurementPoints.size());
-		measurementPoints.add(pt);
-		view.getAnimatedDraggingThread().startMoving(pt.getLatitude(), pt.getLongitude(), view.getZoom(), true);
-		return cacheMeasurementPoints.size() > measurementPoints.size();
-	}
-
-	void moveMapToPoint(int pos) {
-		WptPt pt = measurementPoints.get(pos);
-		view.getAnimatedDraggingThread().startMoving(pt.getLatitude(), pt.getLongitude(), view.getZoom(), true);
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
new file mode 100644
index 0000000000..83bf725c71
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
@@ -0,0 +1,37 @@
+package net.osmand.plus.measurementtool.command;
+
+import net.osmand.plus.GPXUtilities.WptPt;
+import net.osmand.plus.measurementtool.MeasurementToolLayer;
+
+public class AddPointCommand implements Command {
+
+	private MeasurementToolLayer measurementLayer;
+	private int position;
+	private WptPt point;
+
+	public AddPointCommand(MeasurementToolLayer measurementLayer, int position) {
+		this.measurementLayer = measurementLayer;
+		this.position = position;
+	}
+
+	public AddPointCommand(MeasurementToolLayer measurementLayer) {
+		this.measurementLayer = measurementLayer;
+		position = measurementLayer.getPointsCount();
+	}
+
+	@Override
+	public boolean execute() {
+		return (point = measurementLayer.addPoint(position)) != null;
+	}
+
+	@Override
+	public void undo() {
+		measurementLayer.removePoint(position);
+	}
+
+	@Override
+	public void redo() {
+		measurementLayer.addPoint(position, point);
+		measurementLayer.moveMapToPoint(position);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/Command.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/Command.java
new file mode 100644
index 0000000000..cb09b3fffc
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/Command.java
@@ -0,0 +1,10 @@
+package net.osmand.plus.measurementtool.command;
+
+public interface Command {
+
+	boolean execute();
+
+	void undo();
+
+	void redo();
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java
new file mode 100644
index 0000000000..540f0866bc
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java
@@ -0,0 +1,46 @@
+package net.osmand.plus.measurementtool.command;
+
+import java.util.Deque;
+import java.util.LinkedList;
+
+public class CommandManager {
+
+	private Deque<Command> undoCommands = new LinkedList<>();
+	private Deque<Command> redoCommands = new LinkedList<>();
+
+	public boolean canUndo() {
+		return undoCommands.size() > 0;
+	}
+
+	public boolean canRedo() {
+		return redoCommands.size() > 0;
+	}
+
+	public void execute(Command command) {
+		if (command.execute()) {
+			undoCommands.push(command);
+			redoCommands.clear();
+		}
+	}
+
+	public void undo() {
+		if (canUndo()) {
+			Command command = undoCommands.pop();
+			redoCommands.push(command);
+			command.undo();
+		}
+	}
+
+	public void redo() {
+		if (canRedo()) {
+			Command command = redoCommands.pop();
+			undoCommands.push(command);
+			command.redo();
+		}
+	}
+
+	public void clear() {
+		undoCommands.clear();
+		redoCommands.clear();
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
new file mode 100644
index 0000000000..fd21a8a575
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
@@ -0,0 +1,33 @@
+package net.osmand.plus.measurementtool.command;
+
+import net.osmand.plus.GPXUtilities.WptPt;
+import net.osmand.plus.measurementtool.MeasurementToolLayer;
+
+public class RemovePointCommand implements Command {
+
+	private MeasurementToolLayer measurementLayer;
+	private int position;
+	private WptPt point;
+
+	public RemovePointCommand(MeasurementToolLayer measurementLayer, int position) {
+		this.measurementLayer = measurementLayer;
+		this.position = position;
+	}
+
+	@Override
+	public boolean execute() {
+		point = measurementLayer.removePoint(position);
+		return true;
+	}
+
+	@Override
+	public void undo() {
+		measurementLayer.addPoint(position, point);
+		measurementLayer.moveMapToPoint(position);
+	}
+
+	@Override
+	public void redo() {
+		measurementLayer.removePoint(position);
+	}
+}

From 2bfdea04f3f0c2aa542525efbd63105467ec0195 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 9 Aug 2017 10:26:04 +0300
Subject: [PATCH 026/174] Fit rect to map when adding segment

---
 .../osmand/plus/activities/MapActivity.java   |  2 +
 .../osmand/plus/activities/TrackActivity.java | 65 ++++++++++++++++++-
 .../plus/myplaces/TrackSegmentFragment.java   | 51 +--------------
 3 files changed, 66 insertions(+), 52 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 88704c75d8..bb3d84d043 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -932,6 +932,8 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 					getMapLayers().getContextMenuLayer().enterAddGpxPointMode(newGpxPoint);
 				} else if (toShow instanceof NewGpxLine) {
 					NewGpxLine newGpxLine = (NewGpxLine) toShow;
+					QuadRect qr = newGpxLine.getRect();
+					mapView.fitRectToMap(qr.left, qr.right, qr.top, qr.bottom, (int) qr.width(), (int) qr.height(), 0);
 					openAddingNewGpxLine(newGpxLine);
 				} else {
 					mapContextMenu.show(latLonToShow, mapLabelToShow, toShow);
diff --git a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
index cdb618e7ab..b848b69551 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
@@ -15,6 +15,7 @@ import android.view.View;
 import net.osmand.AndroidUtils;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
+import net.osmand.data.QuadRect;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
@@ -111,7 +112,8 @@ public class TrackActivity extends TabActivity {
 
 	public void addLine() {
 		GPXFile gpxFile = getGpx();
-		NewGpxLine newGpxLine = new NewGpxLine(gpxFile);
+		QuadRect rect = getRect();
+		NewGpxLine newGpxLine = new NewGpxLine(gpxFile, rect);
 		WptPt pointToShow = gpxFile != null ? gpxFile.findPointToShow() : null;
 		if (pointToShow != null) {
 			LatLon location = new LatLon(pointToShow.getLatitude(), pointToShow.getLongitude());
@@ -127,6 +129,59 @@ public class TrackActivity extends TabActivity {
 		}
 	}
 
+	public QuadRect getRect() {
+		double left = 0, right = 0;
+		double top = 0, bottom = 0;
+		if (getGpx() != null) {
+			for (GPXUtilities.Track track : getGpx().tracks) {
+				for (GPXUtilities.TrkSegment segment : track.segments) {
+					for (WptPt p : segment.points) {
+						if (left == 0 && right == 0) {
+							left = p.getLongitude();
+							right = p.getLongitude();
+							top = p.getLatitude();
+							bottom = p.getLatitude();
+						} else {
+							left = Math.min(left, p.getLongitude());
+							right = Math.max(right, p.getLongitude());
+							top = Math.max(top, p.getLatitude());
+							bottom = Math.min(bottom, p.getLatitude());
+						}
+					}
+				}
+			}
+			for (WptPt p : getGpx().points) {
+				if (left == 0 && right == 0) {
+					left = p.getLongitude();
+					right = p.getLongitude();
+					top = p.getLatitude();
+					bottom = p.getLatitude();
+				} else {
+					left = Math.min(left, p.getLongitude());
+					right = Math.max(right, p.getLongitude());
+					top = Math.max(top, p.getLatitude());
+					bottom = Math.min(bottom, p.getLatitude());
+				}
+			}
+			for (GPXUtilities.Route route : getGpx().routes) {
+				for (WptPt p : route.points) {
+					if (left == 0 && right == 0) {
+						left = p.getLongitude();
+						right = p.getLongitude();
+						top = p.getLatitude();
+						bottom = p.getLatitude();
+					} else {
+						left = Math.min(left, p.getLongitude());
+						right = Math.max(right, p.getLongitude());
+						top = Math.max(top, p.getLatitude());
+						bottom = Math.min(bottom, p.getLatitude());
+					}
+				}
+			}
+		}
+		return new QuadRect(left, top, right, bottom);
+	}
+
 	protected void setGpxDataItem(GpxDataItem gpxDataItem) {
 		this.gpxDataItem = gpxDataItem;
 	}
@@ -351,13 +406,19 @@ public class TrackActivity extends TabActivity {
 
 	public static class NewGpxLine {
 		private GPXFile gpxFile;
+		private QuadRect rect;
 
-		public NewGpxLine(GPXFile gpxFile) {
+		public NewGpxLine(GPXFile gpxFile, QuadRect rect) {
 			this.gpxFile = gpxFile;
+			this.rect = rect;
 		}
 
 		public GPXFile getGpxFile() {
 			return gpxFile;
 		}
+
+		public QuadRect getRect() {
+			return rect;
+		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index 8ec1e1771c..32efad25ca 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -698,56 +698,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 	}
 
 	private QuadRect getRect() {
-		double left = 0, right = 0;
-		double top = 0, bottom = 0;
-		if (getGpx() != null) {
-			for (Track track : getGpx().tracks) {
-				for (TrkSegment segment : track.segments) {
-					for (WptPt p : segment.points) {
-						if (left == 0 && right == 0) {
-							left = p.getLongitude();
-							right = p.getLongitude();
-							top = p.getLatitude();
-							bottom = p.getLatitude();
-						} else {
-							left = Math.min(left, p.getLongitude());
-							right = Math.max(right, p.getLongitude());
-							top = Math.max(top, p.getLatitude());
-							bottom = Math.min(bottom, p.getLatitude());
-						}
-					}
-				}
-			}
-			for (WptPt p : getGpx().points) {
-				if (left == 0 && right == 0) {
-					left = p.getLongitude();
-					right = p.getLongitude();
-					top = p.getLatitude();
-					bottom = p.getLatitude();
-				} else {
-					left = Math.min(left, p.getLongitude());
-					right = Math.max(right, p.getLongitude());
-					top = Math.max(top, p.getLatitude());
-					bottom = Math.min(bottom, p.getLatitude());
-				}
-			}
-			for (Route route : getGpx().routes) {
-				for (WptPt p : route.points) {
-					if (left == 0 && right == 0) {
-						left = p.getLongitude();
-						right = p.getLongitude();
-						top = p.getLatitude();
-						bottom = p.getLatitude();
-					} else {
-						left = Math.min(left, p.getLongitude());
-						right = Math.max(right, p.getLongitude());
-						top = Math.max(top, p.getLatitude());
-						bottom = Math.min(bottom, p.getLatitude());
-					}
-				}
-			}
-		}
-		return new QuadRect(left, top, right, bottom);
+		return getTrackActivity().getRect();
 	}
 
 	private List<GpxDisplayGroup> getOriginalGroups() {

From f0827226be89f667ab385c98be970e0a8e4eb2bc Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 9 Aug 2017 10:31:12 +0300
Subject: [PATCH 027/174] Refactor code

---
 .../MeasurementToolAdapter.java               | 22 +++++-------
 .../MeasurementToolFragment.java              | 34 +++++++++----------
 .../measurementtool/MeasurementToolLayer.java |  6 ----
 .../command/AddPointCommand.java              |  4 +--
 .../command/CommandManager.java               |  4 +--
 .../command/RemovePointCommand.java           |  4 +--
 6 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
index c832ce2ac1..2cadefb5ab 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
@@ -21,20 +21,15 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 
 	private final MapActivity mapActivity;
 	private final List<WptPt> points;
-	private RemovePointListener removePointListener;
-	private ItemClickListener itemClickListener;
+	private MeasurementAdapterListener adapterListener;
 
 	MeasurementToolAdapter(MapActivity mapActivity, List<WptPt> points) {
 		this.mapActivity = mapActivity;
 		this.points = points;
 	}
 
-	void setRemovePointListener(RemovePointListener listener) {
-		this.removePointListener = listener;
-	}
-
-	void setItemClickListener(ItemClickListener itemClickListener) {
-		this.itemClickListener = itemClickListener;
+	void setAdapterListener(MeasurementAdapterListener listener) {
+		this.adapterListener = listener;
 	}
 
 	@Override
@@ -47,7 +42,7 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 		view.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				itemClickListener.onItemClick(view);
+				adapterListener.onItemClick(view);
 			}
 		});
 		return new Holder(view);
@@ -72,7 +67,7 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 		holder.deleteBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				removePointListener.onPointRemove(holder.getAdapterPosition());
+				adapterListener.onPointRemove(holder.getAdapterPosition());
 			}
 		});
 	}
@@ -98,11 +93,10 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 		}
 	}
 
-	interface RemovePointListener {
-		void onPointRemove(int position);
-	}
+	interface MeasurementAdapterListener {
+
+		void onPointRemove(int position);
 
-	interface ItemClickListener {
 		void onItemClick(View view);
 	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 1af0efb188..93323753e6 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -62,7 +62,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	public static final String TAG = "MeasurementToolFragment";
 
-	private CommandManager commandManager = new CommandManager();
+	private final CommandManager commandManager = new CommandManager();
 	private MeasurementToolBarController toolBarController;
 	private MeasurementToolAdapter adapter;
 	private TextView distanceTv;
@@ -70,7 +70,7 @@ public class MeasurementToolFragment extends Fragment {
 	private String pointsSt;
 
 	private boolean wasCollapseButtonVisible;
-	private boolean pointsDetailsOpened;
+	private boolean pointsListOpened;
 	private int previousMapPosition;
 	private NewGpxLine newGpxLine;
 
@@ -110,10 +110,10 @@ public class MeasurementToolFragment extends Fragment {
 		mainView.findViewById(R.id.up_down_row).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				if (!pointsDetailsOpened) {
-					upBtnOnClick(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_down));
+				if (!pointsListOpened) {
+					showPointsList(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_down));
 				} else {
-					downBtnOnClick(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
+					hidePointsList(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
 				}
 			}
 		});
@@ -130,7 +130,7 @@ public class MeasurementToolFragment extends Fragment {
 					enable(undoBtn);
 				} else {
 					disable(undoBtn, upDownBtn);
-					downBtnOnClick(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
+					hidePointsList(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
 				}
 				adapter.notifyDataSetChanged();
 				enable(redoBtn);
@@ -217,7 +217,7 @@ public class MeasurementToolFragment extends Fragment {
 									return true;
 								case R.id.action_clear_all:
 									measurementLayer.clearPoints();
-									downBtnOnClick(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
+									hidePointsList(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
 									disable(undoBtn, redoBtn, upDownBtn);
 									updateText();
 									commandManager.clear();
@@ -234,7 +234,7 @@ public class MeasurementToolFragment extends Fragment {
 
 		adapter = new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints());
 		final RecyclerView rv = mainView.findViewById(R.id.measure_points_recycler_view);
-		adapter.setRemovePointListener(new MeasurementToolAdapter.RemovePointListener() {
+		adapter.setAdapterListener(new MeasurementToolAdapter.MeasurementAdapterListener() {
 			@Override
 			public void onPointRemove(int position) {
 				commandManager.execute(new RemovePointCommand(measurementLayer, position));
@@ -242,15 +242,14 @@ public class MeasurementToolFragment extends Fragment {
 				disable(redoBtn);
 				updateText();
 				if (measurementLayer.getPointsCount() < 1) {
-					downBtnOnClick(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
+					hidePointsList(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
 					disable(upDownBtn);
 					if (!commandManager.canUndo()) {
 						disable(undoBtn);
 					}
 				}
 			}
-		});
-		adapter.setItemClickListener(new MeasurementToolAdapter.ItemClickListener() {
+
 			@Override
 			public void onItemClick(View view) {
 				int pos = rv.indexOfChild(view);
@@ -274,8 +273,8 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
-	private void upBtnOnClick(View view, Drawable icon) {
-		pointsDetailsOpened = true;
+	private void showPointsList(View view, Drawable icon) {
+		pointsListOpened = true;
 		view.findViewById(R.id.points_list_container).setVisibility(View.VISIBLE);
 		((ImageView) view.findViewById(R.id.up_down_button)).setImageDrawable(icon);
 		MapActivity mapActivity = getMapActivity();
@@ -287,8 +286,8 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
-	private void downBtnOnClick(View view, Drawable icon) {
-		pointsDetailsOpened = false;
+	private void hidePointsList(View view, Drawable icon) {
+		pointsListOpened = false;
 		view.findViewById(R.id.points_list_container).setVisibility(View.GONE);
 		((ImageView) view.findViewById(R.id.up_down_button)).setImageDrawable(icon);
 		setPreviousMapPosition();
@@ -454,9 +453,8 @@ public class MeasurementToolFragment extends Fragment {
 	public void onDestroyView() {
 		super.onDestroyView();
 		exitMeasurementMode();
-		adapter.setRemovePointListener(null);
-		adapter.setItemClickListener(null);
-		if (pointsDetailsOpened) {
+		adapter.setAdapterListener(null);
+		if (pointsListOpened) {
 			setPreviousMapPosition();
 		}
 		MeasurementToolLayer layer = getMeasurementLayer();
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 56cb23c46f..63e14c0766 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -6,7 +6,6 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PointF;
-import android.view.MotionEvent;
 
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
@@ -103,11 +102,6 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return false;
 	}
 
-	@Override
-	public boolean onTouchEvent(MotionEvent event, RotatedTileBox tileBox) {
-		return super.onTouchEvent(event, tileBox);
-	}
-
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings settings) {
 		if (inMeasurementMode) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
index 83bf725c71..5458611bee 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
@@ -5,8 +5,8 @@ import net.osmand.plus.measurementtool.MeasurementToolLayer;
 
 public class AddPointCommand implements Command {
 
-	private MeasurementToolLayer measurementLayer;
-	private int position;
+	private final MeasurementToolLayer measurementLayer;
+	private final int position;
 	private WptPt point;
 
 	public AddPointCommand(MeasurementToolLayer measurementLayer, int position) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java
index 540f0866bc..aada2ee5c3 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java
@@ -5,8 +5,8 @@ import java.util.LinkedList;
 
 public class CommandManager {
 
-	private Deque<Command> undoCommands = new LinkedList<>();
-	private Deque<Command> redoCommands = new LinkedList<>();
+	private final Deque<Command> undoCommands = new LinkedList<>();
+	private final Deque<Command> redoCommands = new LinkedList<>();
 
 	public boolean canUndo() {
 		return undoCommands.size() > 0;
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
index fd21a8a575..7fb7d336c7 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
@@ -5,8 +5,8 @@ import net.osmand.plus.measurementtool.MeasurementToolLayer;
 
 public class RemovePointCommand implements Command {
 
-	private MeasurementToolLayer measurementLayer;
-	private int position;
+	private final MeasurementToolLayer measurementLayer;
+	private final int position;
 	private WptPt point;
 
 	public RemovePointCommand(MeasurementToolLayer measurementLayer, int position) {

From 88fc407fa779813dc56af66bace7cfeab8bba5ca Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 9 Aug 2017 11:08:12 +0300
Subject: [PATCH 028/174] Add selectable background

---
 OsmAnd/res/layout/fragment_measurement_tool.xml              | 5 +++--
 OsmAnd/res/layout/measure_points_list_item.xml               | 3 ++-
 .../osmand/plus/measurementtool/MeasurementToolFragment.java | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index a1561c3d2f..e5e9b0a53b 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -20,6 +20,7 @@
             android:id="@+id/up_down_row"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
             android:paddingBottom="12dp"
             android:paddingTop="12dp">
 
@@ -116,7 +117,7 @@
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
-                android:background="@null"
+                android:background="?attr/selectableItemBackground"
                 android:paddingBottom="14dp"
                 android:paddingEnd="12dp"
                 android:paddingLeft="16dp"
@@ -132,7 +133,7 @@
                 android:layout_centerVertical="true"
                 android:layout_toEndOf="@id/undo_point_button"
                 android:layout_toRightOf="@id/undo_point_button"
-                android:background="@null"
+                android:background="?attr/selectableItemBackground"
                 android:paddingBottom="14dp"
                 android:paddingEnd="16dp"
                 android:paddingLeft="12dp"
diff --git a/OsmAnd/res/layout/measure_points_list_item.xml b/OsmAnd/res/layout/measure_points_list_item.xml
index 7932721f15..8a1bf3199f 100644
--- a/OsmAnd/res/layout/measure_points_list_item.xml
+++ b/OsmAnd/res/layout/measure_points_list_item.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="48dp"
+    android:background="?attr/selectableItemBackground"
     android:descendantFocusability="blocksDescendants">
 
     <android.support.v7.widget.AppCompatImageView
@@ -26,7 +27,7 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:background="@null"
+        android:background="?attr/selectableItemBackground"
         android:focusableInTouchMode="true"
         android:paddingBottom="12dp"
         android:paddingEnd="16dp"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 93323753e6..e909a230ef 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -110,7 +110,7 @@ public class MeasurementToolFragment extends Fragment {
 		mainView.findViewById(R.id.up_down_row).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				if (!pointsListOpened) {
+				if (!pointsListOpened && measurementLayer.getPointsCount() > 0) {
 					showPointsList(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_down));
 				} else {
 					hidePointsList(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));

From 0e25331dcb310d7d6fbb633478003aaee0f5e232 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 9 Aug 2017 12:12:43 +0300
Subject: [PATCH 029/174] Change resources

---
 .../res/layout/measure_points_list_item.xml   | 22 ++++++++++++++-----
 OsmAnd/res/values/strings.xml                 |  2 +-
 .../MeasurementToolAdapter.java               |  3 +++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/res/layout/measure_points_list_item.xml b/OsmAnd/res/layout/measure_points_list_item.xml
index 8a1bf3199f..1114c933ae 100644
--- a/OsmAnd/res/layout/measure_points_list_item.xml
+++ b/OsmAnd/res/layout/measure_points_list_item.xml
@@ -8,16 +8,26 @@
     android:descendantFocusability="blocksDescendants">
 
     <android.support.v7.widget.AppCompatImageView
-        android:id="@+id/measure_point_icon"
+        android:id="@+id/measure_point_reorder_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_marginEnd="24dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="24dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
+        android:tint="?attr/secondary_icon_color"
+        tools:src="@drawable/ic_action_reorder"/>
+
+    <android.support.v7.widget.AppCompatImageView
+        android:id="@+id/measure_point_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_toEndOf="@id/measure_point_reorder_icon"
+        android:layout_toRightOf="@id/measure_point_reorder_icon"
         tools:src="@drawable/ic_action_measure_point"/>
 
     <ImageButton
@@ -67,8 +77,8 @@
         android:layout_width="wrap_content"
         android:layout_height="1dp"
         android:layout_alignParentBottom="true"
-        android:layout_toEndOf="@+id/measure_point_icon"
-        android:layout_toRightOf="@+id/measure_point_icon"
+        android:layout_toEndOf="@+id/measure_point_reorder_icon"
+        android:layout_toRightOf="@+id/measure_point_reorder_icon"
         android:background="?attr/dashboard_divider"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index aa91adc611..1d8f78769b 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -790,7 +790,7 @@
     <string name="shared_string_clear">Clear</string>
     <string name="shared_string_clear_all">Clear all</string>
     <string name="shared_string_save">Save</string>
-    <string name="shared_string_save_as_gpx">Save as GPX track</string>
+    <string name="shared_string_save_as_gpx">Save as Track</string>
     <string name="shared_string_rename">Rename</string>
     <string name="shared_string_delete">Delete</string>
     <string name="shared_string_delete_all">Delete all</string>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
index 2cadefb5ab..dfa2551c21 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
@@ -51,6 +51,7 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 	@Override
 	public void onBindViewHolder(final Holder holder, int pos) {
 		IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
+		holder.iconReorder.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_reorder));
 		holder.icon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_measure_point));
 		holder.title.setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
 		if (pos < 1) {
@@ -79,6 +80,7 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 
 	static class Holder extends RecyclerView.ViewHolder {
 
+		final ImageView iconReorder;
 		final ImageView icon;
 		final TextView title;
 		final TextView descr;
@@ -86,6 +88,7 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 
 		Holder(View view) {
 			super(view);
+			iconReorder = (ImageView) view.findViewById(R.id.measure_point_reorder_icon);
 			icon = (ImageView) view.findViewById(R.id.measure_point_icon);
 			title = (TextView) view.findViewById(R.id.measure_point_title);
 			descr = (TextView) view.findViewById(R.id.measure_point_descr);

From efe2283f1cf1c3536d9e506179ab696271a31e20 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 9 Aug 2017 12:28:58 +0300
Subject: [PATCH 030/174] Fix adding line

---
 .../measurementtool/MeasurementToolFragment.java     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 93323753e6..009bb1a011 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -2,6 +2,7 @@ package net.osmand.plus.measurementtool;
 
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -36,6 +37,7 @@ import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.IconsCache;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.TrackActivity;
 import net.osmand.plus.activities.TrackActivity.NewGpxLine;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.measurementtool.command.AddPointCommand;
@@ -422,7 +424,8 @@ public class MeasurementToolFragment extends Fragment {
 						gpx.path = toSave.getAbsolutePath();
 					}
 					if (showOnMap) {
-						activity.getMyApplication().getSelectedGpxHelper().selectGpxFile(gpx, true, false);
+						SelectedGpxFile sf = activity.getMyApplication().getSelectedGpxHelper().selectGpxFile(gpx, true, false);
+						sf.processPoints();
 					}
 					return res;
 				}
@@ -579,6 +582,13 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void dismiss(MapActivity mapActivity) {
 		try {
+			if (newGpxLine != null) {
+				GPXFile gpx = newGpxLine.getGpxFile();
+				Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getTrackActivity());
+				newIntent.putExtra(TrackActivity.TRACK_FILE_NAME, gpx.path);
+				newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+				startActivity(newIntent);
+			}
 			mapActivity.getSupportFragmentManager().popBackStackImmediate(TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE);
 		} catch (Exception e) {
 			// ignore

From eaef53d5520d9619f53c8254d4112a98bdfead1a Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 9 Aug 2017 12:42:00 +0300
Subject: [PATCH 031/174] Refactor code

---
 .../MeasurementToolFragment.java              |  1 +
 .../{ => adapter}/MeasurementToolAdapter.java | 20 ++++++++--------
 ...easurementToolItemTouchHelperCallback.java | 23 +++++++++++++++++++
 3 files changed, 34 insertions(+), 10 deletions(-)
 rename OsmAnd/src/net/osmand/plus/measurementtool/{ => adapter}/MeasurementToolAdapter.java (82%)
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolItemTouchHelperCallback.java

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 1fe28d33ab..2317c74981 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -40,6 +40,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.TrackActivity;
 import net.osmand.plus.activities.TrackActivity.NewGpxLine;
 import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter;
 import net.osmand.plus.measurementtool.command.AddPointCommand;
 import net.osmand.plus.measurementtool.command.CommandManager;
 import net.osmand.plus.measurementtool.command.RemovePointCommand;
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
similarity index 82%
rename from OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
rename to OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index dfa2551c21..578b118c46 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.measurementtool;
+package net.osmand.plus.measurementtool.adapter;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -17,23 +17,23 @@ import net.osmand.util.MapUtils;
 
 import java.util.List;
 
-class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter.Holder> {
+public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter.MeasureToolItemVH> {
 
 	private final MapActivity mapActivity;
 	private final List<WptPt> points;
 	private MeasurementAdapterListener adapterListener;
 
-	MeasurementToolAdapter(MapActivity mapActivity, List<WptPt> points) {
+	public MeasurementToolAdapter(MapActivity mapActivity, List<WptPt> points) {
 		this.mapActivity = mapActivity;
 		this.points = points;
 	}
 
-	void setAdapterListener(MeasurementAdapterListener listener) {
+	public void setAdapterListener(MeasurementAdapterListener listener) {
 		this.adapterListener = listener;
 	}
 
 	@Override
-	public Holder onCreateViewHolder(ViewGroup viewGroup, int i) {
+	public MeasureToolItemVH onCreateViewHolder(ViewGroup viewGroup, int i) {
 		View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.measure_points_list_item, viewGroup, false);
 		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		if (!nightMode) {
@@ -45,11 +45,11 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 				adapterListener.onItemClick(view);
 			}
 		});
-		return new Holder(view);
+		return new MeasureToolItemVH(view);
 	}
 
 	@Override
-	public void onBindViewHolder(final Holder holder, int pos) {
+	public void onBindViewHolder(final MeasureToolItemVH holder, int pos) {
 		IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
 		holder.iconReorder.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_reorder));
 		holder.icon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_measure_point));
@@ -78,7 +78,7 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 		return points.size();
 	}
 
-	static class Holder extends RecyclerView.ViewHolder {
+	static class MeasureToolItemVH extends RecyclerView.ViewHolder {
 
 		final ImageView iconReorder;
 		final ImageView icon;
@@ -86,7 +86,7 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 		final TextView descr;
 		final ImageButton deleteBtn;
 
-		Holder(View view) {
+		MeasureToolItemVH(View view) {
 			super(view);
 			iconReorder = (ImageView) view.findViewById(R.id.measure_point_reorder_icon);
 			icon = (ImageView) view.findViewById(R.id.measure_point_icon);
@@ -96,7 +96,7 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 		}
 	}
 
-	interface MeasurementAdapterListener {
+	public interface MeasurementAdapterListener {
 
 		void onPointRemove(int position);
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolItemTouchHelperCallback.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolItemTouchHelperCallback.java
new file mode 100644
index 0000000000..7a69e784f2
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolItemTouchHelperCallback.java
@@ -0,0 +1,23 @@
+package net.osmand.plus.measurementtool.adapter;
+
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+
+
+public class MeasurementToolItemTouchHelperCallback extends ItemTouchHelper.Callback {
+
+	@Override
+	public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+		return 0;
+	}
+
+	@Override
+	public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder viewHolder1) {
+		return false;
+	}
+
+	@Override
+	public void onSwiped(RecyclerView.ViewHolder viewHolder, int i) {
+
+	}
+}

From 654f32652fcff939b63fbdfe765ace5af87c2419 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 9 Aug 2017 14:15:31 +0300
Subject: [PATCH 032/174] Add drag and drop for points list

---
 .../res/layout/measure_points_list_item.xml   | 147 +++++++++---------
 .../MeasurementToolFragment.java              |   9 ++
 .../adapter/MeasurementToolAdapter.java       |  28 +++-
 ...easurementToolItemTouchHelperCallback.java |  29 +++-
 4 files changed, 138 insertions(+), 75 deletions(-)

diff --git a/OsmAnd/res/layout/measure_points_list_item.xml b/OsmAnd/res/layout/measure_points_list_item.xml
index 1114c933ae..270a227fef 100644
--- a/OsmAnd/res/layout/measure_points_list_item.xml
+++ b/OsmAnd/res/layout/measure_points_list_item.xml
@@ -1,84 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<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="48dp"
-    android:background="?attr/selectableItemBackground"
     android:descendantFocusability="blocksDescendants">
 
-    <android.support.v7.widget.AppCompatImageView
-        android:id="@+id/measure_point_reorder_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_marginEnd="16dp"
-        android:layout_marginStart="16dp"
-        android:tint="?attr/secondary_icon_color"
-        tools:src="@drawable/ic_action_reorder"/>
-
-    <android.support.v7.widget.AppCompatImageView
-        android:id="@+id/measure_point_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_toEndOf="@id/measure_point_reorder_icon"
-        android:layout_toRightOf="@id/measure_point_reorder_icon"
-        tools:src="@drawable/ic_action_measure_point"/>
-
-    <ImageButton
-        android:id="@+id/measure_point_remove_image_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:background="?attr/selectableItemBackground"
-        android:focusableInTouchMode="true"
-        android:paddingBottom="12dp"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp"
-        android:paddingTop="12dp"
-        tools:src="@drawable/ic_action_remove_dark"/>
-
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_toEndOf="@+id/measure_point_icon"
-        android:layout_toLeftOf="@id/measure_point_remove_image_button"
-        android:layout_toRightOf="@+id/measure_point_icon"
-        android:layout_toStartOf="@id/measure_point_remove_image_button"
-        android:orientation="vertical">
+        android:layout_height="match_parent"
+        android:background="?attr/selectableItemBackground">
 
-        <android.support.v7.widget.AppCompatTextView
-            android:id="@+id/measure_point_title"
+        <android.support.v7.widget.AppCompatImageView
+            android:id="@+id/measure_point_reorder_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:paddingBottom="12dp"
+            android:paddingEnd="16dp"
+            android:paddingStart="16dp"
+            android:paddingTop="12dp"
+            android:tint="?attr/secondary_icon_color"
+            tools:src="@drawable/ic_action_reorder"/>
+
+        <android.support.v7.widget.AppCompatImageView
+            android:id="@+id/measure_point_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_toEndOf="@id/measure_point_reorder_icon"
+            android:layout_toRightOf="@id/measure_point_reorder_icon"
+            tools:src="@drawable/ic_action_measure_point"/>
+
+        <ImageButton
+            android:id="@+id/measure_point_remove_image_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:background="?attr/selectableItemBackground"
+            android:focusableInTouchMode="true"
+            android:paddingBottom="12dp"
+            android:paddingEnd="16dp"
+            android:paddingStart="16dp"
+            android:paddingTop="12dp"
+            tools:src="@drawable/ic_action_remove_dark"/>
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="@dimen/default_desc_text_size"
-            tools:text="@string/plugin_distance_point"/>
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@+id/measure_point_icon"
+            android:layout_toLeftOf="@id/measure_point_remove_image_button"
+            android:layout_toRightOf="@+id/measure_point_icon"
+            android:layout_toStartOf="@id/measure_point_remove_image_button"
+            android:orientation="vertical">
 
-        <android.support.v7.widget.AppCompatTextView
-            android:id="@+id/measure_point_descr"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="@dimen/default_sub_text_size"
-            tools:text="@string/shared_string_control_start"/>
-    </LinearLayout>
+            <android.support.v7.widget.AppCompatTextView
+                android:id="@+id/measure_point_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?android:textColorPrimary"
+                android:textSize="@dimen/default_desc_text_size"
+                tools:text="@string/plugin_distance_point"/>
 
-    <View
-        android:id="@+id/points_divider"
-        android:layout_width="wrap_content"
-        android:layout_height="1dp"
-        android:layout_alignParentBottom="true"
-        android:layout_toEndOf="@+id/measure_point_reorder_icon"
-        android:layout_toRightOf="@+id/measure_point_reorder_icon"
-        android:background="?attr/dashboard_divider"/>
+            <android.support.v7.widget.AppCompatTextView
+                android:id="@+id/measure_point_descr"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="@dimen/default_sub_text_size"
+                tools:text="@string/shared_string_control_start"/>
+        </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+        <View
+            android:id="@+id/points_divider"
+            android:layout_width="wrap_content"
+            android:layout_height="1dp"
+            android:layout_alignParentBottom="true"
+            android:layout_toEndOf="@+id/measure_point_reorder_icon"
+            android:layout_toRightOf="@+id/measure_point_reorder_icon"
+            android:background="?attr/dashboard_divider"/>
+    </RelativeLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 2317c74981..dd3a71a14a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -14,6 +14,7 @@ import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SwitchCompat;
+import android.support.v7.widget.helper.ItemTouchHelper;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.ContextThemeWrapper;
@@ -41,6 +42,7 @@ import net.osmand.plus.activities.TrackActivity;
 import net.osmand.plus.activities.TrackActivity.NewGpxLine;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter;
+import net.osmand.plus.measurementtool.adapter.MeasurementToolItemTouchHelperCallback;
 import net.osmand.plus.measurementtool.command.AddPointCommand;
 import net.osmand.plus.measurementtool.command.CommandManager;
 import net.osmand.plus.measurementtool.command.RemovePointCommand;
@@ -237,6 +239,8 @@ public class MeasurementToolFragment extends Fragment {
 
 		adapter = new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints());
 		final RecyclerView rv = mainView.findViewById(R.id.measure_points_recycler_view);
+		final ItemTouchHelper touchHelper = new ItemTouchHelper(new MeasurementToolItemTouchHelperCallback(adapter));
+		touchHelper.attachToRecyclerView(rv);
 		adapter.setAdapterListener(new MeasurementToolAdapter.MeasurementAdapterListener() {
 			@Override
 			public void onPointRemove(int position) {
@@ -258,6 +262,11 @@ public class MeasurementToolFragment extends Fragment {
 				int pos = rv.indexOfChild(view);
 				measurementLayer.moveMapToPoint(pos);
 			}
+
+			@Override
+			public void onDragStarted(RecyclerView.ViewHolder holder) {
+				touchHelper.startDrag(holder);
+			}
 		});
 		rv.setLayoutManager(new LinearLayoutManager(getContext()));
 		rv.setAdapter(adapter);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index 578b118c46..50429614a3 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -1,7 +1,10 @@
 package net.osmand.plus.measurementtool.adapter;
 
+import android.support.v4.content.ContextCompat;
+import android.support.v4.view.MotionEventCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
@@ -15,9 +18,11 @@ import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.util.MapUtils;
 
+import java.util.Collections;
 import java.util.List;
 
-public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter.MeasureToolItemVH> {
+public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter.MeasureToolItemVH>
+		implements MeasurementToolItemTouchHelperCallback.ItemTouchHelperAdapter {
 
 	private final MapActivity mapActivity;
 	private final List<WptPt> points;
@@ -39,6 +44,9 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		if (!nightMode) {
 			view.findViewById(R.id.points_divider).setBackgroundResource(R.drawable.divider);
 		}
+		final int backgroundColor = ContextCompat.getColor(mapActivity,
+				nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
+		view.setBackgroundColor(backgroundColor);
 		view.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
@@ -52,6 +60,15 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 	public void onBindViewHolder(final MeasureToolItemVH holder, int pos) {
 		IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
 		holder.iconReorder.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_reorder));
+		holder.iconReorder.setOnTouchListener(new View.OnTouchListener() {
+			@Override
+			public boolean onTouch(View view, MotionEvent event) {
+				if (MotionEventCompat.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
+					adapterListener.onDragStarted(holder);
+				}
+				return false;
+			}
+		});
 		holder.icon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_measure_point));
 		holder.title.setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
 		if (pos < 1) {
@@ -78,6 +95,13 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		return points.size();
 	}
 
+	@Override
+	public boolean onItemMove(int from, int to) {
+		Collections.swap(points, from, to);
+		notifyItemMoved(from, to);
+		return true;
+	}
+
 	static class MeasureToolItemVH extends RecyclerView.ViewHolder {
 
 		final ImageView iconReorder;
@@ -101,5 +125,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		void onPointRemove(int position);
 
 		void onItemClick(View view);
+
+		void onDragStarted(RecyclerView.ViewHolder holder);
 	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolItemTouchHelperCallback.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolItemTouchHelperCallback.java
index 7a69e784f2..25ebbb5668 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolItemTouchHelperCallback.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolItemTouchHelperCallback.java
@@ -6,18 +6,39 @@ import android.support.v7.widget.helper.ItemTouchHelper;
 
 public class MeasurementToolItemTouchHelperCallback extends ItemTouchHelper.Callback {
 
-	@Override
-	public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
-		return 0;
+	private final ItemTouchHelperAdapter adapter;
+
+	public MeasurementToolItemTouchHelperCallback(ItemTouchHelperAdapter adapter) {
+		this.adapter = adapter;
 	}
 
 	@Override
-	public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder viewHolder1) {
+	public boolean isLongPressDragEnabled() {
 		return false;
 	}
 
+	@Override
+	public boolean isItemViewSwipeEnabled() {
+		return false;
+	}
+
+	@Override
+	public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+		final int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
+		return makeMovementFlags(dragFlags, 0);
+	}
+
+	@Override
+	public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder source, RecyclerView.ViewHolder target) {
+		return adapter.onItemMove(source.getAdapterPosition(), target.getAdapterPosition());
+	}
+
 	@Override
 	public void onSwiped(RecyclerView.ViewHolder viewHolder, int i) {
 
 	}
+
+	interface ItemTouchHelperAdapter {
+		boolean onItemMove(int from, int to);
+	}
 }

From 284e96361ee0317b61d206058d64349cc2c42489 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 9 Aug 2017 15:06:55 +0300
Subject: [PATCH 033/174] Add undo/redo for reordering

---
 .../MeasurementToolFragment.java              | 16 ++++++++
 .../measurementtool/MeasurementToolLayer.java |  6 ++-
 .../adapter/MeasurementToolAdapter.java       | 17 ++++++---
 ...easurementToolItemTouchHelperCallback.java |  9 +++++
 .../command/ReorderPointCommand.java          | 38 +++++++++++++++++++
 5 files changed, 80 insertions(+), 6 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index dd3a71a14a..35fa73fccd 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -46,6 +46,7 @@ import net.osmand.plus.measurementtool.adapter.MeasurementToolItemTouchHelperCal
 import net.osmand.plus.measurementtool.command.AddPointCommand;
 import net.osmand.plus.measurementtool.command.CommandManager;
 import net.osmand.plus.measurementtool.command.RemovePointCommand;
+import net.osmand.plus.measurementtool.command.ReorderPointCommand;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
@@ -242,6 +243,10 @@ public class MeasurementToolFragment extends Fragment {
 		final ItemTouchHelper touchHelper = new ItemTouchHelper(new MeasurementToolItemTouchHelperCallback(adapter));
 		touchHelper.attachToRecyclerView(rv);
 		adapter.setAdapterListener(new MeasurementToolAdapter.MeasurementAdapterListener() {
+
+			private int fromPosition;
+			private int toPosition;
+
 			@Override
 			public void onPointRemove(int position) {
 				commandManager.execute(new RemovePointCommand(measurementLayer, position));
@@ -265,8 +270,19 @@ public class MeasurementToolFragment extends Fragment {
 
 			@Override
 			public void onDragStarted(RecyclerView.ViewHolder holder) {
+				fromPosition = holder.getAdapterPosition();
 				touchHelper.startDrag(holder);
 			}
+
+			@Override
+			public void onDragEnded(RecyclerView.ViewHolder holder) {
+				toPosition = holder.getAdapterPosition();
+				if (toPosition != fromPosition) {
+					commandManager.execute(new ReorderPointCommand(measurementLayer, fromPosition, toPosition));
+					adapter.notifyDataSetChanged();
+					mapActivity.refreshMap();
+				}
+			}
 		});
 		rv.setLayoutManager(new LinearLayoutManager(getContext()));
 		rv.setAdapter(adapter);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 63e14c0766..0f24f0d71e 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -74,7 +74,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return measurementPoints.size();
 	}
 
-	LinkedList<WptPt> getMeasurementPoints() {
+	public LinkedList<WptPt> getMeasurementPoints() {
 		return measurementPoints;
 	}
 
@@ -195,6 +195,10 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		}
 	}
 
+	public void refreshMap() {
+		view.refreshMap();
+	}
+
 	@Override
 	public void destroyLayer() {
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index 50429614a3..f5e893f76d 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -26,7 +26,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 
 	private final MapActivity mapActivity;
 	private final List<WptPt> points;
-	private MeasurementAdapterListener adapterListener;
+	private MeasurementAdapterListener listener;
 
 	public MeasurementToolAdapter(MapActivity mapActivity, List<WptPt> points) {
 		this.mapActivity = mapActivity;
@@ -34,7 +34,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 	}
 
 	public void setAdapterListener(MeasurementAdapterListener listener) {
-		this.adapterListener = listener;
+		this.listener = listener;
 	}
 
 	@Override
@@ -50,7 +50,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		view.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				adapterListener.onItemClick(view);
+				listener.onItemClick(view);
 			}
 		});
 		return new MeasureToolItemVH(view);
@@ -64,7 +64,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 			@Override
 			public boolean onTouch(View view, MotionEvent event) {
 				if (MotionEventCompat.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
-					adapterListener.onDragStarted(holder);
+					listener.onDragStarted(holder);
 				}
 				return false;
 			}
@@ -85,7 +85,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		holder.deleteBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				adapterListener.onPointRemove(holder.getAdapterPosition());
+				listener.onPointRemove(holder.getAdapterPosition());
 			}
 		});
 	}
@@ -102,6 +102,11 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		return true;
 	}
 
+	@Override
+	public void onItemDismiss(RecyclerView.ViewHolder holder) {
+		listener.onDragEnded(holder);
+	}
+
 	static class MeasureToolItemVH extends RecyclerView.ViewHolder {
 
 		final ImageView iconReorder;
@@ -127,5 +132,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		void onItemClick(View view);
 
 		void onDragStarted(RecyclerView.ViewHolder holder);
+
+		void onDragEnded(RecyclerView.ViewHolder holder);
 	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolItemTouchHelperCallback.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolItemTouchHelperCallback.java
index 25ebbb5668..5c5c4d1e7c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolItemTouchHelperCallback.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolItemTouchHelperCallback.java
@@ -38,7 +38,16 @@ public class MeasurementToolItemTouchHelperCallback extends ItemTouchHelper.Call
 
 	}
 
+	@Override
+	public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+		super.clearView(recyclerView, viewHolder);
+		adapter.onItemDismiss(viewHolder);
+	}
+
 	interface ItemTouchHelperAdapter {
+
 		boolean onItemMove(int from, int to);
+
+		void onItemDismiss(RecyclerView.ViewHolder holder);
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
new file mode 100644
index 0000000000..0e41a22d34
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
@@ -0,0 +1,38 @@
+package net.osmand.plus.measurementtool.command;
+
+import net.osmand.plus.measurementtool.MeasurementToolLayer;
+
+import java.util.Collections;
+
+public class ReorderPointCommand implements Command {
+
+	private final MeasurementToolLayer measurementLayer;
+	private final int from;
+	private final int to;
+
+	public ReorderPointCommand(MeasurementToolLayer measurementLayer, int from, int to) {
+		this.measurementLayer = measurementLayer;
+		this.from = from;
+		this.to = to;
+	}
+
+	@Override
+	public boolean execute() {
+		return true;
+	}
+
+	@Override
+	public void undo() {
+		swap();
+	}
+
+	@Override
+	public void redo() {
+		swap();
+	}
+
+	private void swap() {
+		Collections.swap(measurementLayer.getMeasurementPoints(), from, to);
+		measurementLayer.refreshMap();
+	}
+}

From fbb6f7837908d93875235286ed86c32891d18ae6 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 9 Aug 2017 15:18:51 +0300
Subject: [PATCH 034/174] Rename method

---
 .../osmand/plus/measurementtool/MeasurementToolFragment.java  | 2 +-
 .../plus/measurementtool/adapter/MeasurementToolAdapter.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 35fa73fccd..649ba71d67 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -248,7 +248,7 @@ public class MeasurementToolFragment extends Fragment {
 			private int toPosition;
 
 			@Override
-			public void onPointRemove(int position) {
+			public void onRemoveClick(int position) {
 				commandManager.execute(new RemovePointCommand(measurementLayer, position));
 				adapter.notifyDataSetChanged();
 				disable(redoBtn);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index f5e893f76d..54b14ec594 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -85,7 +85,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		holder.deleteBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				listener.onPointRemove(holder.getAdapterPosition());
+				listener.onRemoveClick(holder.getAdapterPosition());
 			}
 		});
 	}
@@ -127,7 +127,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 
 	public interface MeasurementAdapterListener {
 
-		void onPointRemove(int position);
+		void onRemoveClick(int position);
 
 		void onItemClick(View view);
 

From e95f4bd282dd746767aed9489f78f8f21006bfc3 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 9 Aug 2017 15:34:00 +0300
Subject: [PATCH 035/174] Add some changes

---
 .../res/layout/fragment_measurement_tool.xml  |  4 +-
 .../MeasurementToolFragment.java              | 45 +++++++++++--------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index e5e9b0a53b..79fe3f4b35 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -90,13 +90,13 @@
             android:background="@color/ctx_menu_info_view_bg_dark"
             android:visibility="gone">
 
-            <include layout="@layout/card_bottom_divider"/>
-
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/measure_points_recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"/>
 
+            <include layout="@layout/card_bottom_divider"/>
+
             <ImageView
                 android:layout_width="match_parent"
                 android:layout_height="5dp"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 649ba71d67..cfe91dc676 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -74,6 +74,12 @@ public class MeasurementToolFragment extends Fragment {
 	private TextView distanceTv;
 	private TextView pointsTv;
 	private String pointsSt;
+	private Drawable upIcon;
+	private Drawable downIcon;
+	private View pointsListContainer;
+	private ImageView upDownBtn;
+	private ImageButton undoBtn;
+	private ImageButton redoBtn;
 
 	private boolean wasCollapseButtonVisible;
 	private boolean pointsListOpened;
@@ -95,6 +101,8 @@ public class MeasurementToolFragment extends Fragment {
 		final int backgroundColor = ContextCompat.getColor(getActivity(),
 				nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
 		boolean portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
+		upIcon = iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up);
+		downIcon = iconsCache.getThemedIcon(R.drawable.ic_action_arrow_down);
 
 		pointsSt = getString(R.string.points).toLowerCase();
 
@@ -102,7 +110,8 @@ public class MeasurementToolFragment extends Fragment {
 
 		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);
-		view.findViewById(R.id.points_list_container).setBackgroundColor(backgroundColor);
+		pointsListContainer = view.findViewById(R.id.points_list_container);
+		pointsListContainer.setBackgroundColor(backgroundColor);
 
 		distanceTv = (TextView) mainView.findViewById(R.id.measurement_distance_text_view);
 		pointsTv = (TextView) mainView.findViewById(R.id.measurement_points_text_view);
@@ -110,22 +119,22 @@ public class MeasurementToolFragment extends Fragment {
 		((ImageView) mainView.findViewById(R.id.ruler_icon))
 				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_ruler, R.color.color_myloc_distance));
 
-		final ImageView upDownBtn = ((ImageView) mainView.findViewById(R.id.up_down_button));
+		upDownBtn = ((ImageView) mainView.findViewById(R.id.up_down_button));
 		upDownBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
 
 		mainView.findViewById(R.id.up_down_row).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				if (!pointsListOpened && measurementLayer.getPointsCount() > 0) {
-					showPointsList(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_down));
+					showPointsList();
 				} else {
-					hidePointsList(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
+					hidePointsList();
 				}
 			}
 		});
 
-		final ImageButton undoBtn = ((ImageButton) mainView.findViewById(R.id.undo_point_button));
-		final ImageButton redoBtn = ((ImageButton) mainView.findViewById(R.id.redo_point_button));
+		undoBtn = ((ImageButton) mainView.findViewById(R.id.undo_point_button));
+		redoBtn = ((ImageButton) mainView.findViewById(R.id.redo_point_button));
 
 		undoBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_undo_dark));
 		undoBtn.setOnClickListener(new View.OnClickListener() {
@@ -136,7 +145,7 @@ public class MeasurementToolFragment extends Fragment {
 					enable(undoBtn);
 				} else {
 					disable(undoBtn, upDownBtn);
-					hidePointsList(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
+					hidePointsList();
 				}
 				adapter.notifyDataSetChanged();
 				enable(redoBtn);
@@ -163,14 +172,14 @@ public class MeasurementToolFragment extends Fragment {
 		mainView.findViewById(R.id.add_point_button).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				addPoint(undoBtn, upDownBtn, redoBtn);
+				addPoint();
 			}
 		});
 
 		measurementLayer.setOnSingleTapListener(new MeasurementToolLayer.OnSingleTapListener() {
 			@Override
 			public void onSingleTap() {
-				addPoint(undoBtn, upDownBtn, redoBtn);
+				addPoint();
 			}
 		});
 
@@ -223,7 +232,7 @@ public class MeasurementToolFragment extends Fragment {
 									return true;
 								case R.id.action_clear_all:
 									measurementLayer.clearPoints();
-									hidePointsList(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
+									hidePointsList();
 									disable(undoBtn, redoBtn, upDownBtn);
 									updateText();
 									commandManager.clear();
@@ -254,7 +263,7 @@ public class MeasurementToolFragment extends Fragment {
 				disable(redoBtn);
 				updateText();
 				if (measurementLayer.getPointsCount() < 1) {
-					hidePointsList(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
+					hidePointsList();
 					disable(upDownBtn);
 					if (!commandManager.canUndo()) {
 						disable(undoBtn);
@@ -290,7 +299,7 @@ public class MeasurementToolFragment extends Fragment {
 		return view;
 	}
 
-	private void addPoint(View undoBtn, View upDownBtn, View redoBtn) {
+	private void addPoint() {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
 			commandManager.execute(new AddPointCommand(measurementLayer));
@@ -301,10 +310,10 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
-	private void showPointsList(View view, Drawable icon) {
+	private void showPointsList() {
 		pointsListOpened = true;
-		view.findViewById(R.id.points_list_container).setVisibility(View.VISIBLE);
-		((ImageView) view.findViewById(R.id.up_down_button)).setImageDrawable(icon);
+		pointsListContainer.setVisibility(View.VISIBLE);
+		upDownBtn.setImageDrawable(downIcon);
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
 			OsmandMapTileView tileView = mapActivity.getMapView();
@@ -314,10 +323,10 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
-	private void hidePointsList(View view, Drawable icon) {
+	private void hidePointsList() {
 		pointsListOpened = false;
-		view.findViewById(R.id.points_list_container).setVisibility(View.GONE);
-		((ImageView) view.findViewById(R.id.up_down_button)).setImageDrawable(icon);
+		pointsListContainer.setVisibility(View.GONE);
+		upDownBtn.setImageDrawable(upIcon);
 		setPreviousMapPosition();
 	}
 

From 6c8f5fba96e01f5fad9d5258dab6f12fd1e26df7 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 9 Aug 2017 16:29:22 +0300
Subject: [PATCH 036/174] Close points list on Back pressed

---
 .../osmand/plus/activities/MapActivity.java   |  2 +-
 .../MeasurementToolFragment.java              | 30 +++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index bb3d84d043..fd9e46398a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -502,7 +502,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 			}
 		}
 		if (getMeasurementToolFragment() != null) {
-			getMeasurementToolFragment().showQuitDialog();
+			getMeasurementToolFragment().showQuitDialog(true);
 			return;
 		}
 		if (mapContextMenu.isVisible() && mapContextMenu.isClosable()) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index cfe91dc676..9936f8e22c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -193,7 +193,7 @@ public class MeasurementToolFragment extends Fragment {
 			toolBarController.setOnBackButtonClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
-					showQuitDialog();
+					showQuitDialog(false);
 				}
 			});
 			toolBarController.setOnCloseButtonClickListener(new View.OnClickListener() {
@@ -593,7 +593,7 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
-	public void showQuitDialog() {
+	public void showQuitDialog(boolean hidePointsListFirst) {
 		final MapActivity mapActivity = getMapActivity();
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (mapActivity != null && measurementLayer != null) {
@@ -601,17 +601,21 @@ public class MeasurementToolFragment extends Fragment {
 				dismiss(mapActivity);
 				return;
 			}
-			new AlertDialog.Builder(mapActivity)
-					.setTitle(getString(R.string.are_you_sure))
-					.setMessage(getString(R.string.unsaved_changes_will_be_lost))
-					.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
-						@Override
-						public void onClick(DialogInterface dialog, int which) {
-							dismiss(mapActivity);
-						}
-					})
-					.setNegativeButton(R.string.shared_string_cancel, null)
-					.show();
+			if (pointsListOpened && hidePointsListFirst) {
+				hidePointsList();
+			} else {
+				new AlertDialog.Builder(mapActivity)
+						.setTitle(getString(R.string.are_you_sure))
+						.setMessage(getString(R.string.unsaved_changes_will_be_lost))
+						.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
+							@Override
+							public void onClick(DialogInterface dialog, int which) {
+								dismiss(mapActivity);
+							}
+						})
+						.setNegativeButton(R.string.shared_string_cancel, null)
+						.show();
+			}
 		}
 	}
 

From c286fa85065d7518c4f64a67b77e243ba8521779 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 9 Aug 2017 17:06:43 +0300
Subject: [PATCH 037/174] Change some logic

---
 .../MeasurementToolFragment.java              | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 9936f8e22c..2e4bd1f5da 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -83,6 +83,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	private boolean wasCollapseButtonVisible;
 	private boolean pointsListOpened;
+	private boolean saved;
 	private int previousMapPosition;
 	private NewGpxLine newGpxLine;
 
@@ -236,6 +237,7 @@ public class MeasurementToolFragment extends Fragment {
 									disable(undoBtn, redoBtn, upDownBtn);
 									updateText();
 									commandManager.clear();
+									saved = false;
 									return true;
 							}
 							return false;
@@ -262,6 +264,7 @@ public class MeasurementToolFragment extends Fragment {
 				adapter.notifyDataSetChanged();
 				disable(redoBtn);
 				updateText();
+				saved = false;
 				if (measurementLayer.getPointsCount() < 1) {
 					hidePointsList();
 					disable(upDownBtn);
@@ -290,6 +293,7 @@ public class MeasurementToolFragment extends Fragment {
 					commandManager.execute(new ReorderPointCommand(measurementLayer, fromPosition, toPosition));
 					adapter.notifyDataSetChanged();
 					mapActivity.refreshMap();
+					saved = false;
 				}
 			}
 		});
@@ -307,6 +311,7 @@ public class MeasurementToolFragment extends Fragment {
 			disable(redoBtn);
 			updateText();
 			adapter.notifyDataSetChanged();
+			saved = false;
 		}
 	}
 
@@ -475,6 +480,7 @@ public class MeasurementToolFragment extends Fragment {
 						Toast.makeText(activity,
 								MessageFormat.format(getString(R.string.gpx_saved_sucessfully), toSave.getAbsolutePath()),
 								Toast.LENGTH_LONG).show();
+						saved = true;
 					} else {
 						Toast.makeText(activity, warning, Toast.LENGTH_LONG).show();
 					}
@@ -597,25 +603,25 @@ public class MeasurementToolFragment extends Fragment {
 		final MapActivity mapActivity = getMapActivity();
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (mapActivity != null && measurementLayer != null) {
-			if (measurementLayer.getPointsCount() < 1) {
+			if (pointsListOpened && hidePointsListFirst) {
+				hidePointsList();
+				return;
+			}
+			if (measurementLayer.getPointsCount() < 1 || saved) {
 				dismiss(mapActivity);
 				return;
 			}
-			if (pointsListOpened && hidePointsListFirst) {
-				hidePointsList();
-			} else {
-				new AlertDialog.Builder(mapActivity)
-						.setTitle(getString(R.string.are_you_sure))
-						.setMessage(getString(R.string.unsaved_changes_will_be_lost))
-						.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
-							@Override
-							public void onClick(DialogInterface dialog, int which) {
-								dismiss(mapActivity);
-							}
-						})
-						.setNegativeButton(R.string.shared_string_cancel, null)
-						.show();
-			}
+			new AlertDialog.Builder(mapActivity)
+					.setTitle(getString(R.string.are_you_sure))
+					.setMessage(getString(R.string.unsaved_changes_will_be_lost))
+					.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
+						@Override
+						public void onClick(DialogInterface dialog, int which) {
+							dismiss(mapActivity);
+						}
+					})
+					.setNegativeButton(R.string.shared_string_cancel, null)
+					.show();
 		}
 	}
 

From 17ccf0c16b5223340b380720216d40b3708fe238 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 9 Aug 2017 18:12:24 +0300
Subject: [PATCH 038/174] Add undo/redo for clear all; add some improvements

---
 .../MeasurementToolFragment.java              | 35 +++++++++++--------
 .../measurementtool/MeasurementToolLayer.java |  2 +-
 .../command/ClearPointsCommand.java           | 34 ++++++++++++++++++
 .../command/CommandManager.java               |  5 ---
 4 files changed, 56 insertions(+), 20 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 2e4bd1f5da..674b1d2acc 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -44,6 +44,7 @@ import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolItemTouchHelperCallback;
 import net.osmand.plus.measurementtool.command.AddPointCommand;
+import net.osmand.plus.measurementtool.command.ClearPointsCommand;
 import net.osmand.plus.measurementtool.command.CommandManager;
 import net.osmand.plus.measurementtool.command.RemovePointCommand;
 import net.osmand.plus.measurementtool.command.ReorderPointCommand;
@@ -145,9 +146,9 @@ public class MeasurementToolFragment extends Fragment {
 				if (commandManager.canUndo()) {
 					enable(undoBtn);
 				} else {
-					disable(undoBtn, upDownBtn);
-					hidePointsList();
+					disable(undoBtn);
 				}
+				hidePointsListIfNeeded();
 				adapter.notifyDataSetChanged();
 				enable(redoBtn);
 				updateText();
@@ -164,8 +165,9 @@ public class MeasurementToolFragment extends Fragment {
 				} else {
 					disable(redoBtn);
 				}
+				hidePointsListIfNeeded();
 				adapter.notifyDataSetChanged();
-				enable(undoBtn, upDownBtn);
+				enable(undoBtn);
 				updateText();
 			}
 		});
@@ -232,11 +234,10 @@ public class MeasurementToolFragment extends Fragment {
 									}
 									return true;
 								case R.id.action_clear_all:
-									measurementLayer.clearPoints();
-									hidePointsList();
-									disable(undoBtn, redoBtn, upDownBtn);
+									commandManager.execute(new ClearPointsCommand(measurementLayer));
+									hidePointsListIfNeeded();
+									disable(redoBtn);
 									updateText();
-									commandManager.clear();
 									saved = false;
 									return true;
 							}
@@ -265,13 +266,7 @@ public class MeasurementToolFragment extends Fragment {
 				disable(redoBtn);
 				updateText();
 				saved = false;
-				if (measurementLayer.getPointsCount() < 1) {
-					hidePointsList();
-					disable(upDownBtn);
-					if (!commandManager.canUndo()) {
-						disable(undoBtn);
-					}
-				}
+				hidePointsListIfNeeded();
 			}
 
 			@Override
@@ -303,6 +298,18 @@ public class MeasurementToolFragment extends Fragment {
 		return view;
 	}
 
+	private void hidePointsListIfNeeded() {
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (measurementLayer != null) {
+			if (measurementLayer.getPointsCount() < 1) {
+				disable(upDownBtn);
+				if (pointsListOpened) {
+					hidePointsList();
+				}
+			}
+		}
+	}
+
 	private void addPoint() {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 0f24f0d71e..5603545434 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -89,7 +89,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return OsmAndFormatter.getFormattedDistance(dist, view.getApplication());
 	}
 
-	void clearPoints() {
+	public void clearPoints() {
 		measurementPoints.clear();
 		view.refreshMap();
 	}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
new file mode 100644
index 0000000000..1bacf2aa22
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
@@ -0,0 +1,34 @@
+package net.osmand.plus.measurementtool.command;
+
+import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.measurementtool.MeasurementToolLayer;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class ClearPointsCommand implements Command {
+
+	private final MeasurementToolLayer measurementLayer;
+	private List<GPXUtilities.WptPt> points;
+
+	public ClearPointsCommand(MeasurementToolLayer measurementLayer) {
+		this.measurementLayer = measurementLayer;
+	}
+
+	@Override
+	public boolean execute() {
+		points = new LinkedList<>(measurementLayer.getMeasurementPoints());
+		measurementLayer.clearPoints();
+		return true;
+	}
+
+	@Override
+	public void undo() {
+		measurementLayer.getMeasurementPoints().addAll(points);
+	}
+
+	@Override
+	public void redo() {
+		measurementLayer.clearPoints();
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java
index aada2ee5c3..3188506ded 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java
@@ -38,9 +38,4 @@ public class CommandManager {
 			command.redo();
 		}
 	}
-
-	public void clear() {
-		undoCommands.clear();
-		redoCommands.clear();
-	}
 }

From ccd69672cc4c5cc0270ee986f181ae287e35bdf5 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 9 Aug 2017 18:30:06 +0300
Subject: [PATCH 039/174] Add small changes

---
 .../measurementtool/MeasurementToolFragment.java  | 15 +++++++++------
 .../command/ClearPointsCommand.java               |  2 ++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 674b1d2acc..b7916c1bfb 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -148,7 +148,7 @@ public class MeasurementToolFragment extends Fragment {
 				} else {
 					disable(undoBtn);
 				}
-				hidePointsListIfNeeded();
+				hidePointsListIfNoPoints();
 				adapter.notifyDataSetChanged();
 				enable(redoBtn);
 				updateText();
@@ -165,7 +165,7 @@ public class MeasurementToolFragment extends Fragment {
 				} else {
 					disable(redoBtn);
 				}
-				hidePointsListIfNeeded();
+				hidePointsListIfNoPoints();
 				adapter.notifyDataSetChanged();
 				enable(undoBtn);
 				updateText();
@@ -235,8 +235,10 @@ public class MeasurementToolFragment extends Fragment {
 									return true;
 								case R.id.action_clear_all:
 									commandManager.execute(new ClearPointsCommand(measurementLayer));
-									hidePointsListIfNeeded();
-									disable(redoBtn);
+									if (pointsListOpened) {
+										hidePointsList();
+									}
+									disable(redoBtn, upDownBtn);
 									updateText();
 									saved = false;
 									return true;
@@ -266,7 +268,7 @@ public class MeasurementToolFragment extends Fragment {
 				disable(redoBtn);
 				updateText();
 				saved = false;
-				hidePointsListIfNeeded();
+				hidePointsListIfNoPoints();
 			}
 
 			@Override
@@ -287,6 +289,7 @@ public class MeasurementToolFragment extends Fragment {
 				if (toPosition != fromPosition) {
 					commandManager.execute(new ReorderPointCommand(measurementLayer, fromPosition, toPosition));
 					adapter.notifyDataSetChanged();
+					disable(redoBtn);
 					mapActivity.refreshMap();
 					saved = false;
 				}
@@ -298,7 +301,7 @@ public class MeasurementToolFragment extends Fragment {
 		return view;
 	}
 
-	private void hidePointsListIfNeeded() {
+	private void hidePointsListIfNoPoints() {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
 			if (measurementLayer.getPointsCount() < 1) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
index 1bacf2aa22..081bdfae30 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
@@ -25,10 +25,12 @@ public class ClearPointsCommand implements Command {
 	@Override
 	public void undo() {
 		measurementLayer.getMeasurementPoints().addAll(points);
+		measurementLayer.refreshMap();
 	}
 
 	@Override
 	public void redo() {
 		measurementLayer.clearPoints();
+		measurementLayer.refreshMap();
 	}
 }

From de9530af0d81d437a41db0d58b2c7496bc3f6912 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 9 Aug 2017 18:34:34 +0300
Subject: [PATCH 040/174] Add move point mode

---
 .../res/layout/fragment_measurement_tool.xml  |  68 +++++++++-
 OsmAnd/res/values/strings.xml                 |   1 +
 .../MeasurementToolFragment.java              | 109 ++++++++++++++--
 .../measurementtool/MeasurementToolLayer.java | 119 ++++++++++++++++--
 .../command/MovePointCommand.java             |  45 +++++++
 5 files changed, 323 insertions(+), 19 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 79fe3f4b35..8e56aa1a5e 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:background="@color/color_transparent"
     android:clickable="true">
 
@@ -38,6 +39,21 @@
                 android:background="@null"
                 tools:src="@drawable/ic_action_ruler"/>
 
+            <ImageView
+                android:id="@+id/move_point_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_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:background="@null"
+                tools:src="@drawable/ic_action_measure_point"
+                android:visibility="gone"/>
+
             <ImageView
                 android:id="@+id/up_down_button"
                 android:layout_width="wrap_content"
@@ -76,6 +92,21 @@
                 android:textColor="?android:textColorSecondary"
                 android:textSize="@dimen/default_list_text_size"
                 tools:text="points: 3"/>
+
+            <TextView
+                android:id="@+id/move_point_text"
+                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/move_point_icon"
+                android:layout_toRightOf="@id/move_point_icon"
+                android:textAppearance="@style/TextAppearance.ListItemTitle"
+                android:text="@string/move_point"
+                android:visibility="gone"/>
         </RelativeLayout>
 
         <View
@@ -108,7 +139,7 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="52dp">
 
             <ImageButton
                 android:id="@+id/undo_point_button"
@@ -160,6 +191,41 @@
                 android:paddingRight="8dp"
                 android:text="@string/shared_string_add"
                 android:textColor="@color/color_white"/>
+
+            <Button
+                android:id="@+id/apply_point_button"
+                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:minHeight="36dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:text="@string/shared_string_apply"
+                android:textColor="@color/color_white"
+                android:visibility="gone"/>
+
+            <net.osmand.plus.widgets.TextViewEx
+                android:id="@+id/cancel_button"
+                android:gravity="center_vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:background="?attr/selectableItemBackground"
+                android:paddingEnd="12dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="12dp"
+                android:paddingStart="16dp"
+                android:text="@string/shared_string_cancel"
+                android:textColor="?attr/color_dialog_buttons"
+                osmand:textAllCapsCompat="true"
+                osmand:typeface="@string/font_roboto_medium"
+                android:visibility="gone"/>
         </RelativeLayout>
 
     </LinearLayout>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 1d8f78769b..94384adb1b 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2677,4 +2677,5 @@
     <string name="import_track">Import track</string>
     <string name="import_track_desc">File %1$s does not contain waypoints, import it as a track?</string>
     <string name="save_as_new_segment">Save as new segment</string>
+    <string name="move_point">Move Point</string>
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index b7916c1bfb..3833d5f2d3 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -23,6 +23,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -46,12 +47,14 @@ import net.osmand.plus.measurementtool.adapter.MeasurementToolItemTouchHelperCal
 import net.osmand.plus.measurementtool.command.AddPointCommand;
 import net.osmand.plus.measurementtool.command.ClearPointsCommand;
 import net.osmand.plus.measurementtool.command.CommandManager;
+import net.osmand.plus.measurementtool.command.MovePointCommand;
 import net.osmand.plus.measurementtool.command.RemovePointCommand;
 import net.osmand.plus.measurementtool.command.ReorderPointCommand;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
 import net.osmand.plus.widgets.IconPopupMenu;
+import net.osmand.plus.widgets.TextViewEx;
 
 import java.io.File;
 import java.text.MessageFormat;
@@ -79,8 +82,14 @@ public class MeasurementToolFragment extends Fragment {
 	private Drawable downIcon;
 	private View pointsListContainer;
 	private ImageView upDownBtn;
-	private ImageButton undoBtn;
-	private ImageButton redoBtn;
+	private ImageView undoBtn;
+	private ImageView redoBtn;
+	private TextViewEx cancelButton;
+	private ImageView movePointIcon;
+	private TextView movePointText;
+	private ImageView rulerIcon;
+	private Button addPointButton;
+	private Button applyMovePointButton;
 
 	private boolean wasCollapseButtonVisible;
 	private boolean pointsListOpened;
@@ -118,16 +127,28 @@ public class MeasurementToolFragment extends Fragment {
 		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));
+		rulerIcon = (ImageView) mainView.findViewById(R.id.ruler_icon);
+		rulerIcon.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_ruler, R.color.color_myloc_distance));
 
-		upDownBtn = ((ImageView) mainView.findViewById(R.id.up_down_button));
+		movePointIcon = (ImageView) mainView.findViewById(R.id.move_point_icon);
+		movePointIcon.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_measure_point, R.color.color_myloc_distance));
+		movePointText = (TextView) mainView.findViewById(R.id.move_point_text);
+
+		upDownBtn = (ImageView) mainView.findViewById(R.id.up_down_button);
 		upDownBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
 
+		cancelButton = (TextViewEx) mainView.findViewById(R.id.cancel_button);
+		cancelButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				cancelMovePointMode();
+			}
+		});
+
 		mainView.findViewById(R.id.up_down_row).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				if (!pointsListOpened && measurementLayer.getPointsCount() > 0) {
+				if (!pointsListOpened && measurementLayer.getPointsCount() > 0 && !measurementLayer.isInMovePointMode()) {
 					showPointsList();
 				} else {
 					hidePointsList();
@@ -135,6 +156,14 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		});
 
+		applyMovePointButton = (Button) mainView.findViewById(R.id.apply_point_button);
+		applyMovePointButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				applyMovePointMode();
+			}
+		});
+
 		undoBtn = ((ImageButton) mainView.findViewById(R.id.undo_point_button));
 		redoBtn = ((ImageButton) mainView.findViewById(R.id.redo_point_button));
 
@@ -172,7 +201,8 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		});
 
-		mainView.findViewById(R.id.add_point_button).setOnClickListener(new View.OnClickListener() {
+		addPointButton = (Button) mainView.findViewById(R.id.add_point_button);
+		addPointButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				addPoint();
@@ -186,6 +216,16 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		});
 
+		measurementLayer.setOnEnterMovePointModeListener(new MeasurementToolLayer.OnEnterMovePointModeListener() {
+			@Override
+			public void onEnterMovePointMode() {
+				if (pointsListOpened) {
+					hidePointsList();
+				}
+				enterMovePointMode();
+			}
+		});
+
 		disable(undoBtn, redoBtn, upDownBtn);
 
 		enterMeasurementMode();
@@ -301,6 +341,61 @@ public class MeasurementToolFragment extends Fragment {
 		return view;
 	}
 
+	private void cancelMovePointMode() {
+		exitMovePointMode();
+		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
+		if (measurementToolLayer != null) {
+			measurementToolLayer.exitMovePointMode();
+		}
+	}
+
+	private void applyMovePointMode() {
+		exitMovePointMode();
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (measurementLayer != null) {
+			WptPt newPoint = measurementLayer.getMovedPointToApply();
+			WptPt oldPoint = measurementLayer.getPreviouslyMovedPoint();
+			int position = measurementLayer.getMovePointPosition();
+			commandManager.execute(new MovePointCommand(measurementLayer, oldPoint, newPoint, position));
+			enable(undoBtn, upDownBtn);
+			disable(redoBtn);
+			updateText();
+			adapter.notifyDataSetChanged();
+			saved = false;
+			measurementLayer.exitMovePointMode();
+			measurementLayer.refreshMap();
+		}
+
+	}
+
+	private void enterMovePointMode() {
+		rulerIcon.setVisibility(View.GONE);
+		distanceTv.setVisibility(View.GONE);
+		pointsTv.setVisibility(View.GONE);
+		upDownBtn.setVisibility(View.GONE);
+		undoBtn.setVisibility(View.GONE);
+		redoBtn.setVisibility(View.GONE);
+		addPointButton.setVisibility(View.GONE);
+		movePointIcon.setVisibility(View.VISIBLE);
+		movePointText.setVisibility(View.VISIBLE);
+		cancelButton.setVisibility(View.VISIBLE);
+		applyMovePointButton.setVisibility(View.VISIBLE);
+	}
+
+	private void exitMovePointMode() {
+		movePointIcon.setVisibility(View.GONE);
+		movePointText.setVisibility(View.GONE);
+		cancelButton.setVisibility(View.GONE);
+		applyMovePointButton.setVisibility(View.GONE);
+		rulerIcon.setVisibility(View.VISIBLE);
+		distanceTv.setVisibility(View.VISIBLE);
+		pointsTv.setVisibility(View.VISIBLE);
+		upDownBtn.setVisibility(View.VISIBLE);
+		undoBtn.setVisibility(View.VISIBLE);
+		redoBtn.setVisibility(View.VISIBLE);
+		addPointButton.setVisibility(View.VISIBLE);
+	}
+
 	private void hidePointsListIfNoPoints() {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 5603545434..04264534a8 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -6,6 +6,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PointF;
+import android.util.Log;
 
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
@@ -28,10 +29,12 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 
 	private OsmandMapTileView view;
 	private boolean inMeasurementMode;
+	private boolean inMovePointMode;
 	private final LinkedList<WptPt> measurementPoints = new LinkedList<>();
 	private Bitmap centerIconDay;
 	private Bitmap centerIconNight;
 	private Bitmap pointIcon;
+	private Bitmap movePointIcon;
 	private Paint bitmapPaint;
 	private final RenderingLineAttributes lineAttrs = new RenderingLineAttributes("measureDistanceLine");
 	private final Path path = new Path();
@@ -40,6 +43,9 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private final TIntArrayList tx = new TIntArrayList();
 	private final TIntArrayList ty = new TIntArrayList();
 	private OnSingleTapListener singleTapListener;
+	private OnEnterMovePointModeListener enterMovePointModeListener;
+	private int movePointPos;
+	private WptPt previouslyMovedPoint;
 
 	@Override
 	public void initLayer(OsmandMapTileView view) {
@@ -48,6 +54,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		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);
+		movePointIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_mapillary_location);
 
 		bitmapPaint = new Paint();
 		bitmapPaint.setAntiAlias(true);
@@ -62,10 +69,26 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		this.singleTapListener = listener;
 	}
 
+	void setOnEnterMovePointModeListener(OnEnterMovePointModeListener listener) {
+		this.enterMovePointModeListener = listener;
+	}
+
+	WptPt getPreviouslyMovedPoint() {
+		return previouslyMovedPoint;
+	}
+
+	int getMovePointPosition() {
+		return movePointPos;
+	}
+
 	public boolean isInMeasurementMode() {
 		return inMeasurementMode;
 	}
 
+	public boolean isInMovePointMode() {
+		return inMovePointMode;
+	}
+
 	void setInMeasurementMode(boolean inMeasurementMode) {
 		this.inMeasurementMode = inMeasurementMode;
 	}
@@ -102,11 +125,50 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return false;
 	}
 
+	@Override
+	public boolean onLongPressEvent(PointF point, RotatedTileBox tileBox) {
+		if (inMovePointMode || measurementPoints.size() == 0) {
+			return false;
+		}
+		double pressedPointLat = tileBox.getLatFromPixel(point.x, point.y);
+		double pressedPointLon = tileBox.getLonFromPixel(point.x, point.y);
+		getPointToMove(pressedPointLat, pressedPointLon);
+		if (movePointPos != -1) {
+			enterMovingPointMode();
+			if (inMeasurementMode && inMovePointMode && enterMovePointModeListener != null) {
+				enterMovePointModeListener.onEnterMovePointMode();
+			}
+		}
+		return false;
+	}
+
+	private void enterMovingPointMode() {
+		inMovePointMode = true;
+		moveMapToPoint(movePointPos);
+	}
+
+	private void getPointToMove(double lat, double lon) {
+		double lowestDistance = Double.MAX_VALUE;
+		for (int i = 0; i < measurementPoints.size(); i++) {
+			WptPt pt = measurementPoints.get(i);
+			double latDiff = pt.getLatitude() - lat;
+			double lonDiff = pt.getLongitude() - lon;
+			double distToPoint = Math.sqrt(Math.pow(latDiff, 2) + Math.pow(lonDiff, 2));
+			if (distToPoint < lowestDistance) {
+				lowestDistance = distToPoint;
+				previouslyMovedPoint = new WptPt(pt);
+				movePointPos = i;
+			}
+		}
+	}
+
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings settings) {
 		if (inMeasurementMode) {
 			lineAttrs.updatePaints(view, settings, tb);
-			drawCenterIcon(canvas, tb, tb.getCenterPixelPoint(), settings.isNightMode());
+			if (!inMovePointMode) {
+				drawCenterIcon(canvas, tb, tb.getCenterPixelPoint(), settings.isNightMode());
+			}
 
 			if (measurementPoints.size() > 0) {
 				path.reset();
@@ -114,8 +176,15 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 				ty.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);
+					int locX;
+					int locY;
+					if (inMovePointMode && movePointPos == i) {
+						locX = tb.getCenterPixelX();
+						locY = tb.getCenterPixelY();
+					} else {
+						locX = tb.getPixXFromLonNoRot(pt.lon);
+						locY = tb.getPixYFromLatNoRot(pt.lat);
+					}
 					if (i == 0) {
 						path.moveTo(locX, locY);
 					} else {
@@ -124,22 +193,37 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 					tx.add(locX);
 					ty.add(locY);
 				}
-				path.lineTo(tb.getCenterPixelX(), tb.getCenterPixelY());
-				tx.add(tb.getCenterPixelX());
-				ty.add(tb.getCenterPixelY());
+				if (!inMovePointMode) {
+					path.lineTo(tb.getCenterPixelX(), tb.getCenterPixelY());
+					tx.add(tb.getCenterPixelX());
+					ty.add(tb.getCenterPixelY());
+				}
 				calculatePath(tb, tx, ty, path);
 				canvas.drawPath(path, lineAttrs.paint);
-				for (WptPt pt : measurementPoints) {
-					if (tb.containsLatLon(pt.lat, pt.lon)) {
-						int locX = tb.getPixXFromLonNoRot(pt.lon);
-						int locY = tb.getPixYFromLatNoRot(pt.lat);
-						canvas.drawBitmap(pointIcon, locX - marginX, locY - marginY, bitmapPaint);
+				for (int i = 0; i < measurementPoints.size(); i++) {
+					WptPt pt = measurementPoints.get(i);
+					if (inMovePointMode && i == movePointPos) {
+						int locX = tb.getCenterPixelX();
+						int locY = tb.getCenterPixelY();
+						canvas.drawBitmap(movePointIcon, locX - marginX, locY - marginY, bitmapPaint);
+					} else {
+						if (tb.containsLatLon(pt.lat, pt.lon)) {
+							int locX = tb.getPixXFromLonNoRot(pt.lon);
+							int locY = tb.getPixYFromLatNoRot(pt.lat);
+							canvas.drawBitmap(pointIcon, locX - marginX, locY - marginY, bitmapPaint);
+						}
 					}
 				}
 			}
 		}
 	}
 
+	void exitMovePointMode() {
+		inMovePointMode = false;
+		movePointPos = -1;
+		previouslyMovedPoint = null;
+	}
+
 	private void drawCenterIcon(Canvas canvas, RotatedTileBox tb, QuadPoint center, boolean nightMode) {
 		canvas.rotate(-tb.getRotate(), center.x, center.y);
 		if (nightMode) {
@@ -177,6 +261,15 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return null;
 	}
 
+	WptPt getMovedPointToApply() {
+		RotatedTileBox tb = view.getCurrentRotatedTileBox();
+		LatLon latLon = tb.getCenterLatLon();
+		WptPt pt = measurementPoints.get(movePointPos);
+		pt.lat = latLon.getLatitude();
+		pt.lon = latLon.getLongitude();
+		return pt;
+	}
+
 	public WptPt removePoint(int position) {
 		WptPt res = measurementPoints.remove(position);
 		view.refreshMap();
@@ -242,4 +335,8 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	interface OnSingleTapListener {
 		void onSingleTap();
 	}
+
+	interface OnEnterMovePointModeListener {
+		void onEnterMovePointMode();
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
new file mode 100644
index 0000000000..aae5aa0f27
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
@@ -0,0 +1,45 @@
+package net.osmand.plus.measurementtool.command;
+
+import net.osmand.plus.GPXUtilities.WptPt;
+import net.osmand.plus.measurementtool.MeasurementToolLayer;
+
+public class MovePointCommand implements Command {
+
+	private final MeasurementToolLayer measurementLayer;
+	private final WptPt oldPoint;
+	private final WptPt newPoint;
+	private final int position;
+
+	public MovePointCommand (MeasurementToolLayer measurementLayer, WptPt oldPoint, WptPt newPoint, int position) {
+		this.measurementLayer = measurementLayer;
+		this.oldPoint = oldPoint;
+		this.newPoint = newPoint;
+		this.position = position;
+	}
+
+
+	@Override
+	public boolean execute() {
+		return true;
+	}
+
+	@Override
+	public void undo() {
+		replacePointWithOldOne();
+	}
+
+	@Override
+	public void redo() {
+		replacePointWithNewOne();
+	}
+
+	private void replacePointWithOldOne() {
+		measurementLayer.getMeasurementPoints().remove(position);
+		measurementLayer.getMeasurementPoints().add(position, oldPoint);
+	}
+
+	private void replacePointWithNewOne() {
+		measurementLayer.getMeasurementPoints().remove(position);
+		measurementLayer.getMeasurementPoints().add(position, newPoint);
+	}
+}

From ccccf81330cab7f05b04dea691cd5ef6d80b28f1 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 9 Aug 2017 18:36:26 +0300
Subject: [PATCH 041/174] Add some stuff

---
 .../plus/measurementtool/MeasurementToolFragment.java       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 3833d5f2d3..9cc84fea36 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -178,6 +178,9 @@ public class MeasurementToolFragment extends Fragment {
 					disable(undoBtn);
 				}
 				hidePointsListIfNoPoints();
+				if (measurementLayer.getPointsCount() > 0) {
+					enable(upDownBtn);
+				}
 				adapter.notifyDataSetChanged();
 				enable(redoBtn);
 				updateText();
@@ -195,6 +198,9 @@ public class MeasurementToolFragment extends Fragment {
 					disable(redoBtn);
 				}
 				hidePointsListIfNoPoints();
+				if (measurementLayer.getPointsCount() > 0) {
+					enable(upDownBtn);
+				}
 				adapter.notifyDataSetChanged();
 				enable(undoBtn);
 				updateText();

From aa35e2cb1ad4ced6bf451e68cc60cbd4199fcb05 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 9 Aug 2017 18:37:30 +0300
Subject: [PATCH 042/174] Fix processing points after saving

---
 .../osmand/plus/measurementtool/MeasurementToolFragment.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 9cc84fea36..8a81d37165 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -576,7 +576,9 @@ public class MeasurementToolFragment extends Fragment {
 					}
 					if (showOnMap) {
 						SelectedGpxFile sf = activity.getMyApplication().getSelectedGpxHelper().selectGpxFile(gpx, true, false);
-						sf.processPoints();
+						if (newGpxLine != null && sf != null) {
+							sf.processPoints();
+						}
 					}
 					return res;
 				}

From 42b216b8ddbc62ca2662808f7071783ab37719e5 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 9 Aug 2017 19:06:46 +0300
Subject: [PATCH 043/174] Mark visibility

---
 .../MeasurementToolFragment.java              | 94 +++++++++----------
 .../command/MovePointCommand.java             |  1 -
 2 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 8a81d37165..d64b839280 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -84,12 +84,6 @@ public class MeasurementToolFragment extends Fragment {
 	private ImageView upDownBtn;
 	private ImageView undoBtn;
 	private ImageView redoBtn;
-	private TextViewEx cancelButton;
-	private ImageView movePointIcon;
-	private TextView movePointText;
-	private ImageView rulerIcon;
-	private Button addPointButton;
-	private Button applyMovePointButton;
 
 	private boolean wasCollapseButtonVisible;
 	private boolean pointsListOpened;
@@ -127,18 +121,16 @@ public class MeasurementToolFragment extends Fragment {
 		distanceTv = (TextView) mainView.findViewById(R.id.measurement_distance_text_view);
 		pointsTv = (TextView) mainView.findViewById(R.id.measurement_points_text_view);
 
-		rulerIcon = (ImageView) mainView.findViewById(R.id.ruler_icon);
-		rulerIcon.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_ruler, R.color.color_myloc_distance));
+		((ImageView) mainView.findViewById(R.id.ruler_icon))
+				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_ruler, R.color.color_myloc_distance));
 
-		movePointIcon = (ImageView) mainView.findViewById(R.id.move_point_icon);
-		movePointIcon.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_measure_point, R.color.color_myloc_distance));
-		movePointText = (TextView) mainView.findViewById(R.id.move_point_text);
+		((ImageView) mainView.findViewById(R.id.move_point_icon))
+				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_measure_point, R.color.color_myloc_distance));
 
 		upDownBtn = (ImageView) mainView.findViewById(R.id.up_down_button);
 		upDownBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
 
-		cancelButton = (TextViewEx) mainView.findViewById(R.id.cancel_button);
-		cancelButton.setOnClickListener(new View.OnClickListener() {
+		((TextViewEx) mainView.findViewById(R.id.cancel_button)).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				cancelMovePointMode();
@@ -156,13 +148,13 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		});
 
-		applyMovePointButton = (Button) mainView.findViewById(R.id.apply_point_button);
-		applyMovePointButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				applyMovePointMode();
-			}
-		});
+		((Button) mainView.findViewById(R.id.apply_point_button))
+				.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						applyMovePointMode();
+					}
+				});
 
 		undoBtn = ((ImageButton) mainView.findViewById(R.id.undo_point_button));
 		redoBtn = ((ImageButton) mainView.findViewById(R.id.redo_point_button));
@@ -207,13 +199,13 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		});
 
-		addPointButton = (Button) mainView.findViewById(R.id.add_point_button);
-		addPointButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				addPoint();
-			}
-		});
+		((Button) mainView.findViewById(R.id.add_point_button))
+				.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						addPoint();
+					}
+				});
 
 		measurementLayer.setOnSingleTapListener(new MeasurementToolLayer.OnSingleTapListener() {
 			@Override
@@ -375,31 +367,35 @@ public class MeasurementToolFragment extends Fragment {
 	}
 
 	private void enterMovePointMode() {
-		rulerIcon.setVisibility(View.GONE);
-		distanceTv.setVisibility(View.GONE);
-		pointsTv.setVisibility(View.GONE);
-		upDownBtn.setVisibility(View.GONE);
-		undoBtn.setVisibility(View.GONE);
-		redoBtn.setVisibility(View.GONE);
-		addPointButton.setVisibility(View.GONE);
-		movePointIcon.setVisibility(View.VISIBLE);
-		movePointText.setVisibility(View.VISIBLE);
-		cancelButton.setVisibility(View.VISIBLE);
-		applyMovePointButton.setVisibility(View.VISIBLE);
+		mark(View.GONE,
+				R.id.ruler_icon,
+				R.id.measurement_distance_text_view,
+				R.id.measurement_points_text_view,
+				R.id.up_down_button,
+				R.id.undo_point_button,
+				R.id.redo_point_button,
+				R.id.add_point_button);
+		mark(View.VISIBLE,
+				R.id.move_point_icon,
+				R.id.move_point_text,
+				R.id.cancel_button,
+				R.id.apply_point_button);
 	}
 
 	private void exitMovePointMode() {
-		movePointIcon.setVisibility(View.GONE);
-		movePointText.setVisibility(View.GONE);
-		cancelButton.setVisibility(View.GONE);
-		applyMovePointButton.setVisibility(View.GONE);
-		rulerIcon.setVisibility(View.VISIBLE);
-		distanceTv.setVisibility(View.VISIBLE);
-		pointsTv.setVisibility(View.VISIBLE);
-		upDownBtn.setVisibility(View.VISIBLE);
-		undoBtn.setVisibility(View.VISIBLE);
-		redoBtn.setVisibility(View.VISIBLE);
-		addPointButton.setVisibility(View.VISIBLE);
+		mark(View.GONE,
+				R.id.move_point_icon,
+				R.id.move_point_text,
+				R.id.cancel_button,
+				R.id.apply_point_button);
+		mark(View.VISIBLE,
+				R.id.ruler_icon,
+				R.id.measurement_distance_text_view,
+				R.id.measurement_points_text_view,
+				R.id.up_down_button,
+				R.id.undo_point_button,
+				R.id.redo_point_button,
+				R.id.add_point_button);
 	}
 
 	private void hidePointsListIfNoPoints() {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
index aae5aa0f27..5d3823a5ee 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
@@ -17,7 +17,6 @@ public class MovePointCommand implements Command {
 		this.position = position;
 	}
 
-
 	@Override
 	public boolean execute() {
 		return true;

From f4b7e20ddeec39655cba055aa119226644a85cb2 Mon Sep 17 00:00:00 2001
From: PavelRatushnyi <pavelratushniy@gmail.com>
Date: Thu, 10 Aug 2017 01:59:50 +0300
Subject: [PATCH 044/174] Fix cancel button

---
 OsmAnd/res/layout/fragment_measurement_tool.xml             | 2 +-
 .../plus/measurementtool/MeasurementToolFragment.java       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 8e56aa1a5e..b31de2a85e 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -212,7 +212,7 @@
                 android:visibility="gone"/>
 
             <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/cancel_button"
+                android:id="@+id/cancel_point_button"
                 android:gravity="center_vertical"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index d64b839280..bac244c023 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -130,7 +130,7 @@ public class MeasurementToolFragment extends Fragment {
 		upDownBtn = (ImageView) mainView.findViewById(R.id.up_down_button);
 		upDownBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
 
-		((TextViewEx) mainView.findViewById(R.id.cancel_button)).setOnClickListener(new View.OnClickListener() {
+		((TextViewEx) mainView.findViewById(R.id.cancel_point_button)).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				cancelMovePointMode();
@@ -378,7 +378,7 @@ public class MeasurementToolFragment extends Fragment {
 		mark(View.VISIBLE,
 				R.id.move_point_icon,
 				R.id.move_point_text,
-				R.id.cancel_button,
+				R.id.cancel_point_button,
 				R.id.apply_point_button);
 	}
 
@@ -386,7 +386,7 @@ public class MeasurementToolFragment extends Fragment {
 		mark(View.GONE,
 				R.id.move_point_icon,
 				R.id.move_point_text,
-				R.id.cancel_button,
+				R.id.cancel_point_button,
 				R.id.apply_point_button);
 		mark(View.VISIBLE,
 				R.id.ruler_icon,

From 2df2f9380f85ff5c68276cab5cc95f8424c2a74b Mon Sep 17 00:00:00 2001
From: PavelRatushnyi <pavelratushniy@gmail.com>
Date: Thu, 10 Aug 2017 02:04:49 +0300
Subject: [PATCH 045/174] Refresh map after cancel moving point

---
 .../net/osmand/plus/measurementtool/MeasurementToolFragment.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index bac244c023..a052f55987 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -344,6 +344,7 @@ public class MeasurementToolFragment extends Fragment {
 		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
 		if (measurementToolLayer != null) {
 			measurementToolLayer.exitMovePointMode();
+			measurementToolLayer.refreshMap();
 		}
 	}
 

From 60a71539e7511cad8a652eef05b6268927302380 Mon Sep 17 00:00:00 2001
From: PavelRatushnyi <pavelratushniy@gmail.com>
Date: Thu, 10 Aug 2017 02:10:04 +0300
Subject: [PATCH 046/174] Disable single tap in move point mode

---
 .../net/osmand/plus/measurementtool/MeasurementToolLayer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 04264534a8..d2b4cc2d8f 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -119,7 +119,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 
 	@Override
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
-		if (inMeasurementMode && singleTapListener != null) {
+		if (inMeasurementMode && !inMovePointMode && singleTapListener != null) {
 			singleTapListener.onSingleTap();
 		}
 		return false;

From a0d41d945f6e0f1ddd76c238d07219aacb4cd71e Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 10 Aug 2017 10:25:20 +0300
Subject: [PATCH 047/174] Rename  old point

---
 .../plus/measurementtool/MeasurementToolFragment.java  |  2 +-
 .../plus/measurementtool/MeasurementToolLayer.java     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index a052f55987..07f7c92154 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -353,7 +353,7 @@ public class MeasurementToolFragment extends Fragment {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
 			WptPt newPoint = measurementLayer.getMovedPointToApply();
-			WptPt oldPoint = measurementLayer.getPreviouslyMovedPoint();
+			WptPt oldPoint = measurementLayer.getPointBeforeMovement();
 			int position = measurementLayer.getMovePointPosition();
 			commandManager.execute(new MovePointCommand(measurementLayer, oldPoint, newPoint, position));
 			enable(undoBtn, upDownBtn);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index d2b4cc2d8f..8cef78e32a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -45,7 +45,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private OnSingleTapListener singleTapListener;
 	private OnEnterMovePointModeListener enterMovePointModeListener;
 	private int movePointPos;
-	private WptPt previouslyMovedPoint;
+	private WptPt pointBeforeMovement;
 
 	@Override
 	public void initLayer(OsmandMapTileView view) {
@@ -73,8 +73,8 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		this.enterMovePointModeListener = listener;
 	}
 
-	WptPt getPreviouslyMovedPoint() {
-		return previouslyMovedPoint;
+	WptPt getPointBeforeMovement() {
+		return pointBeforeMovement;
 	}
 
 	int getMovePointPosition() {
@@ -156,7 +156,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 			double distToPoint = Math.sqrt(Math.pow(latDiff, 2) + Math.pow(lonDiff, 2));
 			if (distToPoint < lowestDistance) {
 				lowestDistance = distToPoint;
-				previouslyMovedPoint = new WptPt(pt);
+				pointBeforeMovement = new WptPt(pt);
 				movePointPos = i;
 			}
 		}
@@ -221,7 +221,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	void exitMovePointMode() {
 		inMovePointMode = false;
 		movePointPos = -1;
-		previouslyMovedPoint = null;
+		pointBeforeMovement = null;
 	}
 
 	private void drawCenterIcon(Canvas canvas, RotatedTileBox tb, QuadPoint center, boolean nightMode) {

From 66bbd3464448f2208c9c2bc7104e906fedd6c6d0 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 10 Aug 2017 10:48:52 +0300
Subject: [PATCH 048/174] Fix refreshing map when undo/redo move point

---
 .../osmand/plus/measurementtool/command/MovePointCommand.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
index 5d3823a5ee..dc84bb2af0 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
@@ -35,10 +35,12 @@ public class MovePointCommand implements Command {
 	private void replacePointWithOldOne() {
 		measurementLayer.getMeasurementPoints().remove(position);
 		measurementLayer.getMeasurementPoints().add(position, oldPoint);
+		measurementLayer.refreshMap();
 	}
 
 	private void replacePointWithNewOne() {
 		measurementLayer.getMeasurementPoints().remove(position);
 		measurementLayer.getMeasurementPoints().add(position, newPoint);
+		measurementLayer.refreshMap();
 	}
 }

From 5251bb1bb7883016132132bb406625222a68cd3d Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 10 Aug 2017 11:01:43 +0300
Subject: [PATCH 049/174] Fix exit from measure mode in move point mode

---
 .../MeasurementToolFragment.java              | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 07f7c92154..865bf5543a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -91,6 +91,8 @@ public class MeasurementToolFragment extends Fragment {
 	private int previousMapPosition;
 	private NewGpxLine newGpxLine;
 
+	private boolean inMovePointMode;
+
 	public void setNewGpxLine(NewGpxLine newGpxLine) {
 		this.newGpxLine = newGpxLine;
 	}
@@ -220,6 +222,7 @@ public class MeasurementToolFragment extends Fragment {
 				if (pointsListOpened) {
 					hidePointsList();
 				}
+				inMovePointMode = true;
 				enterMovePointMode();
 			}
 		});
@@ -340,7 +343,10 @@ public class MeasurementToolFragment extends Fragment {
 	}
 
 	private void cancelMovePointMode() {
-		exitMovePointMode();
+		if (inMovePointMode) {
+			exitMovePointMode();
+			inMovePointMode = false;
+		}
 		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
 		if (measurementToolLayer != null) {
 			measurementToolLayer.exitMovePointMode();
@@ -349,7 +355,10 @@ public class MeasurementToolFragment extends Fragment {
 	}
 
 	private void applyMovePointMode() {
-		exitMovePointMode();
+		if (inMovePointMode) {
+			exitMovePointMode();
+			inMovePointMode = false;
+		}
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
 			WptPt newPoint = measurementLayer.getMovedPointToApply();
@@ -737,6 +746,14 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void dismiss(MapActivity mapActivity) {
 		try {
+			if (inMovePointMode) {
+				exitMovePointMode();
+				inMovePointMode = false;
+			}
+			MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
+			if (measurementToolLayer != null && measurementToolLayer.isInMovePointMode()) {
+				measurementToolLayer.exitMovePointMode();
+			}
 			if (newGpxLine != null) {
 				GPXFile gpx = newGpxLine.getGpxFile();
 				Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getTrackActivity());

From 2b7f5f6f4ec30b0573f5f46fcd171b5a0e097f38 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 10 Aug 2017 11:07:45 +0300
Subject: [PATCH 050/174] Fix finding point to move

---
 .../measurementtool/MeasurementToolLayer.java | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 8cef78e32a..b83542b85c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -133,7 +133,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		double pressedPointLat = tileBox.getLatFromPixel(point.x, point.y);
 		double pressedPointLon = tileBox.getLonFromPixel(point.x, point.y);
 		getPointToMove(pressedPointLat, pressedPointLon);
-		if (movePointPos != -1) {
+		if (pointBeforeMovement != null && movePointPos != -1) {
 			enterMovingPointMode();
 			if (inMeasurementMode && inMovePointMode && enterMovePointModeListener != null) {
 				enterMovePointModeListener.onEnterMovePointMode();
@@ -148,16 +148,19 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	}
 
 	private void getPointToMove(double lat, double lon) {
+		RotatedTileBox tb = view.getCurrentRotatedTileBox();
 		double lowestDistance = Double.MAX_VALUE;
 		for (int i = 0; i < measurementPoints.size(); i++) {
 			WptPt pt = measurementPoints.get(i);
-			double latDiff = pt.getLatitude() - lat;
-			double lonDiff = pt.getLongitude() - lon;
-			double distToPoint = Math.sqrt(Math.pow(latDiff, 2) + Math.pow(lonDiff, 2));
-			if (distToPoint < lowestDistance) {
-				lowestDistance = distToPoint;
-				pointBeforeMovement = new WptPt(pt);
-				movePointPos = i;
+			if (tb.containsLatLon(pt.getLatitude(), pt.getLongitude())) {
+				double latDiff = pt.getLatitude() - lat;
+				double lonDiff = pt.getLongitude() - lon;
+				double distToPoint = Math.sqrt(Math.pow(latDiff, 2) + Math.pow(lonDiff, 2));
+				if (distToPoint < lowestDistance) {
+					lowestDistance = distToPoint;
+					pointBeforeMovement = new WptPt(pt);
+					movePointPos = i;
+				}
 			}
 		}
 	}

From 46e96a62b621eda4d3d5bff50897ed4bc0bb87a8 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 10 Aug 2017 13:02:09 +0300
Subject: [PATCH 051/174] Add menu for saving as track

---
 OsmAnd/res/menu/measurement_tool_menu.xml     |   4 +
 OsmAnd/res/values/strings.xml                 |   1 +
 .../MeasurementToolFragment.java              | 130 ++++++++++++++----
 3 files changed, 106 insertions(+), 29 deletions(-)

diff --git a/OsmAnd/res/menu/measurement_tool_menu.xml b/OsmAnd/res/menu/measurement_tool_menu.xml
index c4065601b6..459c6b3648 100644
--- a/OsmAnd/res/menu/measurement_tool_menu.xml
+++ b/OsmAnd/res/menu/measurement_tool_menu.xml
@@ -9,6 +9,10 @@
         android:id="@+id/action_save_as_gpx"
         android:icon="@drawable/ic_action_polygom_dark"
         android:title="@string/shared_string_save_as_gpx"/>
+    <item
+        android:id="@+id/action_add_segment_to_track"
+        android:icon="@drawable/ic_action_polygom_dark"
+        android:title="@string/add_segment_to_the_track"/>
     <item
         android:id="@+id/action_clear_all"
         android:icon="@drawable/ic_action_reset_to_default_dark"
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index d915bf3e3d..f6ee30ca2d 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2678,4 +2678,5 @@
     <string name="import_track_desc">File %1$s does not contain waypoints, import it as a track?</string>
     <string name="save_as_new_segment">Save as new segment</string>
     <string name="move_point">Move Point</string>
+    <string name="add_segment_to_the_track">Add segment to the track</string>
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 865bf5543a..6923953e97 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -31,6 +31,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import net.osmand.AndroidUtils;
+import net.osmand.CallbackWithObject;
 import net.osmand.IndexConstants;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.Route;
@@ -42,6 +43,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.TrackActivity;
 import net.osmand.plus.activities.TrackActivity.NewGpxLine;
 import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolItemTouchHelperCallback;
 import net.osmand.plus.measurementtool.command.AddPointCommand;
@@ -59,6 +61,7 @@ import net.osmand.plus.widgets.TextViewEx;
 import java.io.File;
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -249,11 +252,14 @@ public class MeasurementToolFragment extends Fragment {
 					IconsCache ic = mapActivity.getMyApplication().getIconsCache();
 					MenuItem saveAsNewSegmentMenuItem = menu.findItem(R.id.action_save_as_new_segment);
 					MenuItem saveAsGpxTrack = menu.findItem(R.id.action_save_as_gpx);
+					MenuItem addSegmentToTrack = menu.findItem(R.id.action_add_segment_to_track);
+					addSegmentToTrack.setIcon(ic.getThemedIcon(R.drawable.ic_action_polygom_dark));
 					saveAsNewSegmentMenuItem.setIcon(ic.getThemedIcon(R.drawable.ic_action_polygom_dark));
 					saveAsGpxTrack.setIcon(ic.getThemedIcon(R.drawable.ic_action_polygom_dark));
 					if (newGpxLine != null) {
 						saveAsNewSegmentMenuItem.setVisible(true);
 						saveAsGpxTrack.setVisible(false);
+						addSegmentToTrack.setVisible(false);
 					}
 					menu.findItem(R.id.action_clear_all).setIcon(ic.getThemedIcon(R.drawable.ic_action_reset_to_default_dark));
 					popup.setOnMenuItemClickListener(new IconPopupMenu.OnMenuItemClickListener() {
@@ -267,6 +273,13 @@ public class MeasurementToolFragment extends Fragment {
 										Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
 									}
 									return true;
+								case R.id.action_add_segment_to_track:
+									if (measurementLayer.getPointsCount() > 0) {
+//										showAddSegmentDialog(mapActivity);
+									} else {
+										Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
+									}
+									return true;
 								case R.id.action_save_as_gpx:
 									if (measurementLayer.getPointsCount() > 0) {
 										saveAsGpxOnClick(mapActivity);
@@ -342,6 +355,21 @@ public class MeasurementToolFragment extends Fragment {
 		return view;
 	}
 
+	private AlertDialog showAddSegmentDialog(final MapActivity mapActivity) {
+		CallbackWithObject<GPXFile[]> callbackWithObject = new CallbackWithObject<GPXFile[]>() {
+			@Override
+			public boolean processResult(GPXFile[] result) {
+				GPXFile gpxFile;
+				if (result != null && result.length > 0) {
+					gpxFile = result[0];
+				}
+				return true;
+			}
+		};
+
+		return GpxUiHelper.selectSingleGPXFile(mapActivity, false, callbackWithObject);
+	}
+
 	private void cancelMovePointMode() {
 		if (inMovePointMode) {
 			exitMovePointMode();
@@ -464,7 +492,7 @@ public class MeasurementToolFragment extends Fragment {
 		GPXFile gpx = newGpxLine.getGpxFile();
 		SelectedGpxFile selectedGpxFile = mapActivity.getMyApplication().getSelectedGpxHelper().getSelectedFileByPath(gpx.path);
 		boolean showOnMap = selectedGpxFile != null;
-		saveGpx(null, null, showOnMap);
+		saveGpx(gpx, showOnMap);
 	}
 
 	private void saveAsGpxOnClick(MapActivity mapActivity) {
@@ -526,14 +554,14 @@ public class MeasurementToolFragment extends Fragment {
 								fout = new File(dir, fileName);
 							}
 						}
-						saveGpx(dir, fileName, showOnMapToggle.isChecked());
+						createAndSaveGpx(dir, fileName, showOnMapToggle.isChecked());
 					}
 				})
 				.setNegativeButton(R.string.shared_string_cancel, null)
 				.show();
 	}
 
-	private void saveGpx(final File dir, final String fileName, final boolean showOnMap) {
+	private void saveGpx(final GPXFile gpx, final boolean showOnMap) {
 		new AsyncTask<Void, Void, String>() {
 
 			private ProgressDialog progressDialog;
@@ -552,39 +580,83 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			protected String doInBackground(Void... voids) {
 				MeasurementToolLayer measurementLayer = getMeasurementLayer();
-				GPXFile gpx;
-				if (newGpxLine != null) {
-					gpx = newGpxLine.getGpxFile();
-					toSave = new File(gpx.path);
-					if (measurementLayer != null) {
-						List<WptPt> points = measurementLayer.getMeasurementPoints();
-						gpx.addTrkSegment(points);
-					}
-				} else {
-					gpx = new GPXFile();
-					toSave = new File(dir, fileName);
-					if (measurementLayer != null) {
-						LinkedList<WptPt> points = measurementLayer.getMeasurementPoints();
-						if (points.size() == 1) {
-							gpx.points.add(points.getFirst());
-						} else if (points.size() > 1) {
-							Route rt = new Route();
-							gpx.routes.add(rt);
-							rt.points.addAll(points);
+				toSave = new File(gpx.path);
+				if (measurementLayer != null) {
+					List<WptPt> points = measurementLayer.getMeasurementPoints();
+					gpx.addTrkSegment(points);
+				}
+				MapActivity activity = getMapActivity();
+				if (activity != null) {
+					String res = GPXUtilities.writeGpxFile(toSave, gpx, activity.getMyApplication());
+					if (showOnMap) {
+						SelectedGpxFile sf = activity.getMyApplication().getSelectedGpxHelper().selectGpxFile(gpx, true, false);
+						if (sf != null) {
+							sf.processPoints();
 						}
 					}
+					return res;
+				}
+				return null;
+			}
+
+			@Override
+			protected void onPostExecute(String warning) {
+				MapActivity activity = getMapActivity();
+				if (activity != null) {
+					if (warning == null) {
+						Toast.makeText(activity,
+								MessageFormat.format(getString(R.string.gpx_saved_sucessfully), toSave.getAbsolutePath()),
+								Toast.LENGTH_LONG).show();
+						saved = true;
+					} else {
+						Toast.makeText(activity, warning, Toast.LENGTH_LONG).show();
+					}
+					activity.refreshMap();
+				}
+				if (progressDialog != null && progressDialog.isShowing()) {
+					progressDialog.dismiss();
+				}
+			}
+		}.execute();
+	}
+
+	private void createAndSaveGpx(final File dir, final String fileName, final boolean showOnMap) {
+		new AsyncTask<Void, Void, String>() {
+
+			private ProgressDialog progressDialog;
+			private File toSave;
+
+			@Override
+			protected void onPreExecute() {
+				MapActivity activity = getMapActivity();
+				if (activity != null) {
+					progressDialog = new ProgressDialog(activity);
+					progressDialog.setMessage(getString(R.string.saving_gpx_tracks));
+					progressDialog.show();
+				}
+			}
+
+			@Override
+			protected String doInBackground(Void... voids) {
+				toSave = new File(dir, fileName);
+				GPXFile gpx = new GPXFile();
+				MeasurementToolLayer measurementLayer = getMeasurementLayer();
+				if (measurementLayer != null) {
+					LinkedList<WptPt> points = measurementLayer.getMeasurementPoints();
+					if (points.size() == 1) {
+						gpx.points.add(points.getFirst());
+					} else if (points.size() > 1) {
+						Route rt = new Route();
+						gpx.routes.add(rt);
+						rt.points.addAll(points);
+					}
 				}
 				MapActivity activity = getMapActivity();
 				if (activity != null) {
 					String res = GPXUtilities.writeGpxFile(toSave, gpx, activity.getMyApplication());
-					if (newGpxLine == null) {
-						gpx.path = toSave.getAbsolutePath();
-					}
+					gpx.path = toSave.getAbsolutePath();
 					if (showOnMap) {
-						SelectedGpxFile sf = activity.getMyApplication().getSelectedGpxHelper().selectGpxFile(gpx, true, false);
-						if (newGpxLine != null && sf != null) {
-							sf.processPoints();
-						}
+						activity.getMyApplication().getSelectedGpxHelper().selectGpxFile(gpx, true, false);
 					}
 					return res;
 				}

From d87fcf3423921b3b6a07e96a83148c7e8905f2cc Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 10 Aug 2017 13:03:14 +0300
Subject: [PATCH 052/174] Moving point draw on top

---
 .../plus/measurementtool/MeasurementToolLayer.java     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index b83542b85c..ade1a534e3 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -203,12 +203,11 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 				}
 				calculatePath(tb, tx, ty, path);
 				canvas.drawPath(path, lineAttrs.paint);
+				WptPt pointToDrawOnTop = null;
 				for (int i = 0; i < measurementPoints.size(); i++) {
 					WptPt pt = measurementPoints.get(i);
 					if (inMovePointMode && i == movePointPos) {
-						int locX = tb.getCenterPixelX();
-						int locY = tb.getCenterPixelY();
-						canvas.drawBitmap(movePointIcon, locX - marginX, locY - marginY, bitmapPaint);
+						pointToDrawOnTop = pt;
 					} else {
 						if (tb.containsLatLon(pt.lat, pt.lon)) {
 							int locX = tb.getPixXFromLonNoRot(pt.lon);
@@ -217,6 +216,11 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 						}
 					}
 				}
+				if (pointToDrawOnTop != null) {
+					int locX = tb.getCenterPixelX();
+					int locY = tb.getCenterPixelY();
+					canvas.drawBitmap(movePointIcon, locX - marginX, locY - marginY, bitmapPaint);
+				}
 			}
 		}
 	}

From 8af25f51ce50e4f1cff5bd24bf103aeb747880b7 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Thu, 10 Aug 2017 14:00:24 +0300
Subject: [PATCH 053/174] Create bottom sheet for snap to road; do some related
 stuff

---
 ...gment_snap_to_road_bottom_sheet_dialog.xml | 58 +++++++++++++++++++
 .../res/layout/list_item_icon_and_title.xml   | 30 ++++++++++
 OsmAnd/res/menu/measurement_tool_menu.xml     | 12 +++-
 OsmAnd/res/values/strings.xml                 |  2 +
 .../MeasurementToolFragment.java              | 10 +++-
 .../SnapToRoadBottomSheetDialogFragment.java  | 52 +++++++++++++++++
 6 files changed, 161 insertions(+), 3 deletions(-)
 create mode 100644 OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
 create mode 100644 OsmAnd/res/layout/list_item_icon_and_title.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java

diff --git a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
new file mode 100644
index 0000000000..9fd046e63f
--- /dev/null
+++ b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="52dp"
+        android:paddingEnd="16dp"
+        android:paddingStart="16dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="@string/choose_navigation_type"
+            android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="44dp"
+        android:paddingEnd="16dp"
+        android:paddingStart="16dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/measurement_tool_snap_to_road_descr"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="@dimen/default_desc_text_size"/>
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/navigation_types_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="52dp">
+
+        <android.support.v7.widget.AppCompatButton
+            android:id="@+id/cancel_button"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            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:text="@string/shared_string_cancel"/>
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/list_item_icon_and_title.xml b/OsmAnd/res/layout/list_item_icon_and_title.xml
new file mode 100644
index 0000000000..c5d881834a
--- /dev/null
+++ b/OsmAnd/res/layout/list_item_icon_and_title.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="48dp"
+    android:background="?attr/selectableItemBackground"
+    android:paddingEnd="16dp"
+    android:paddingStart="16dp">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        tools:src="@drawable/ic_action_car_dark"/>
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toEndOf="@id/icon"
+        android:layout_toRightOf="@id/icon"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.ListItemTitle"
+        tools:text="@string/rendering_value_car_name"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/menu/measurement_tool_menu.xml b/OsmAnd/res/menu/measurement_tool_menu.xml
index 459c6b3648..dd2861907e 100644
--- a/OsmAnd/res/menu/measurement_tool_menu.xml
+++ b/OsmAnd/res/menu/measurement_tool_menu.xml
@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:visible="false"
         android:id="@+id/action_save_as_new_segment"
         android:icon="@drawable/ic_action_polygom_dark"
-        android:title="@string/save_as_new_segment"/>
+        android:title="@string/save_as_new_segment"
+        android:visible="false"/>
+
     <item
         android:id="@+id/action_save_as_gpx"
         android:icon="@drawable/ic_action_polygom_dark"
         android:title="@string/shared_string_save_as_gpx"/>
+
+    <item
+        android:id="@+id/action_snap_to_road"
+        android:icon="@drawable/ic_action_snap_to_road"
+        android:title="@string/snap_to_road"/>
+
     <item
         android:id="@+id/action_add_segment_to_track"
         android:icon="@drawable/ic_action_polygom_dark"
         android:title="@string/add_segment_to_the_track"/>
+
     <item
         android:id="@+id/action_clear_all"
         android:icon="@drawable/ic_action_reset_to_default_dark"
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index f6ee30ca2d..3bed4dcd3f 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_tool_snap_to_road_descr">OsmAnd will add additional points, depending on the navigation type.</string>
+    <string name="choose_navigation_type">Choose navigation type</string>
     <string name="none_point_error">Please add at least one point.</string>
     <string name="enter_gpx_name">GPX file name:</string>
     <string name="show_on_map_after_saving">Show on map after saving</string>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 6923953e97..038fb0ba8b 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -61,7 +61,6 @@ import net.osmand.plus.widgets.TextViewEx;
 import java.io.File;
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -261,6 +260,7 @@ public class MeasurementToolFragment extends Fragment {
 						saveAsGpxTrack.setVisible(false);
 						addSegmentToTrack.setVisible(false);
 					}
+					menu.findItem(R.id.action_snap_to_road).setIcon(ic.getThemedIcon(R.drawable.ic_action_snap_to_road));
 					menu.findItem(R.id.action_clear_all).setIcon(ic.getThemedIcon(R.drawable.ic_action_reset_to_default_dark));
 					popup.setOnMenuItemClickListener(new IconPopupMenu.OnMenuItemClickListener() {
 						@Override
@@ -273,6 +273,7 @@ public class MeasurementToolFragment extends Fragment {
 										Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
 									}
 									return true;
+
 								case R.id.action_add_segment_to_track:
 									if (measurementLayer.getPointsCount() > 0) {
 //										showAddSegmentDialog(mapActivity);
@@ -280,6 +281,7 @@ public class MeasurementToolFragment extends Fragment {
 										Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
 									}
 									return true;
+
 								case R.id.action_save_as_gpx:
 									if (measurementLayer.getPointsCount() > 0) {
 										saveAsGpxOnClick(mapActivity);
@@ -287,6 +289,12 @@ public class MeasurementToolFragment extends Fragment {
 										Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
 									}
 									return true;
+
+								case R.id.action_snap_to_road:
+									SnapToRoadBottomSheetDialogFragment fragment = new SnapToRoadBottomSheetDialogFragment();
+									fragment.show(mapActivity.getSupportFragmentManager(), SnapToRoadBottomSheetDialogFragment.TAG);
+									return true;
+
 								case R.id.action_clear_all:
 									commandManager.execute(new ClearPointsCommand(measurementLayer));
 									if (pointsListOpened) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
new file mode 100644
index 0000000000..4546a8582b
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -0,0 +1,52 @@
+package net.osmand.plus.measurementtool;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import net.osmand.plus.R;
+import net.osmand.plus.base.BottomSheetDialogFragment;
+
+public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragment {
+
+	public static final String TAG = "SnapToRoadBottomSheetDialogFragment";
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		final boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		final int backgroundColor = ContextCompat.getColor(getActivity(),
+				nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
+
+		View view = inflater.inflate(R.layout.fragment_snap_to_road_bottom_sheet_dialog, container, false);
+		view.setBackgroundColor(backgroundColor);
+
+		FrameLayout navigationTypesContainer = (FrameLayout) view.findViewById(R.id.navigation_types_container);
+
+		View carNavigation = inflater.inflate(R.layout.list_item_icon_and_title, navigationTypesContainer, true);
+		((ImageView) carNavigation.findViewById(R.id.icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_car_dark));
+		((TextView) carNavigation.findViewById(R.id.title)).setText(getString(R.string.rendering_value_car_name));
+		carNavigation.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				Toast.makeText(getActivity(), "Car", Toast.LENGTH_SHORT).show();
+			}
+		});
+
+		view.findViewById(R.id.cancel_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				dismiss();
+			}
+		});
+
+		return view;
+	}
+}

From ee09074abf8b5df60d7c6b4a8f1fa2406b37d2de Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Thu, 10 Aug 2017 17:48:36 +0300
Subject: [PATCH 054/174] Show application modes in bottom sheet

---
 ...gment_snap_to_road_bottom_sheet_dialog.xml | 37 ++++++++++------
 .../res/layout/list_item_icon_and_title.xml   |  1 +
 .../SnapToRoadBottomSheetDialogFragment.java  | 44 ++++++++++++-------
 3 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
index 9fd046e63f..e397dd568d 100644
--- a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
@@ -33,26 +33,35 @@
             android:textSize="@dimen/default_desc_text_size"/>
     </LinearLayout>
 
-    <FrameLayout
+    <LinearLayout
         android:id="@+id/navigation_types_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:orientation="vertical"/>
 
-    <RelativeLayout
+    <View
+        android:id="@+id/divider"
         android:layout_width="match_parent"
-        android:layout_height="52dp">
+        android:layout_height="1dp"
+        android:layout_marginTop="8dp"
+        android:background="?attr/dashboard_divider"/>
 
-        <android.support.v7.widget.AppCompatButton
-            android:id="@+id/cancel_button"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+    <FrameLayout
+        android:id="@+id/cancel_row"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="?attr/selectableItemBackground">
+
+        <TextView
+            android:id="@+id/cancel_row_text"
             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:text="@string/shared_string_cancel"/>
-    </RelativeLayout>
+            android:layout_gravity="center"
+            android:text="@string/shared_string_cancel"
+            android:textAllCaps="true"
+            android:textColor="@color/dashboard_general_button_text_light"
+            android:textSize="14sp"
+            android:textStyle="bold"/>
+    </FrameLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/list_item_icon_and_title.xml b/OsmAnd/res/layout/list_item_icon_and_title.xml
index c5d881834a..24308873c8 100644
--- a/OsmAnd/res/layout/list_item_icon_and_title.xml
+++ b/OsmAnd/res/layout/list_item_icon_and_title.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="48dp"
     android:background="?attr/selectableItemBackground"
+    android:minHeight="48dp"
     android:paddingEnd="16dp"
     android:paddingStart="16dp">
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index 4546a8582b..1c2dbc3d25 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -3,17 +3,22 @@ package net.osmand.plus.measurementtool;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
+import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
+import net.osmand.plus.ApplicationMode;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.base.BottomSheetDialogFragment;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragment {
 
 	public static final String TAG = "SnapToRoadBottomSheetDialogFragment";
@@ -21,32 +26,37 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		final OsmandSettings settings = getMyApplication().getSettings();
 		final boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 		final int backgroundColor = ContextCompat.getColor(getActivity(),
 				nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
 
-		View view = inflater.inflate(R.layout.fragment_snap_to_road_bottom_sheet_dialog, container, false);
+		View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_snap_to_road_bottom_sheet_dialog, container);
 		view.setBackgroundColor(backgroundColor);
-
-		FrameLayout navigationTypesContainer = (FrameLayout) view.findViewById(R.id.navigation_types_container);
-
-		View carNavigation = inflater.inflate(R.layout.list_item_icon_and_title, navigationTypesContainer, true);
-		((ImageView) carNavigation.findViewById(R.id.icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_car_dark));
-		((TextView) carNavigation.findViewById(R.id.title)).setText(getString(R.string.rendering_value_car_name));
-		carNavigation.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				Toast.makeText(getActivity(), "Car", Toast.LENGTH_SHORT).show();
-			}
-		});
-
-		view.findViewById(R.id.cancel_button).setOnClickListener(new View.OnClickListener() {
+		if (nightMode) {
+			((TextView) view.findViewById(R.id.cancel_row_text))
+					.setTextColor(ContextCompat.getColor(getActivity(), R.color.dashboard_general_button_text_dark));
+		} else {
+			view.findViewById(R.id.divider).setBackgroundResource(R.drawable.divider);
+		}
+		view.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				dismiss();
 			}
 		});
 
+		LinearLayout navContainer = (LinearLayout) view.findViewById(R.id.navigation_types_container);
+		final List<ApplicationMode> modes = new ArrayList<>(ApplicationMode.values(settings));
+		modes.remove(ApplicationMode.DEFAULT);
+		for (ApplicationMode mode : modes) {
+			View row = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.list_item_icon_and_title, null);
+			((ImageView) row.findViewById(R.id.icon)).setImageDrawable(getContentIcon(mode.getSmallIconDark()));
+			((TextView) row.findViewById(R.id.title)).setText(mode.toHumanString(getContext()));
+			navContainer.addView(row);
+		}
+
 		return view;
 	}
 }

From 1b821e8ab7eea191734abca50e38feccd6b60376 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Thu, 10 Aug 2017 18:46:28 +0300
Subject: [PATCH 055/174] Change the layout

---
 ...gment_snap_to_road_bottom_sheet_dialog.xml | 53 +++++++++----------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
index e397dd568d..d1b4c0cbb9 100644
--- a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
@@ -5,45 +5,42 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="52dp"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp">
+        android:layout_height="wrap_content">
 
-        <TextView
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/navigation_types_container"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:text="@string/choose_navigation_type"
-            android:textAppearance="@style/TextAppearance.ListItemTitle"/>
-    </LinearLayout>
+            android:orientation="vertical"
+            android:paddingBottom="8dp">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="44dp"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="52dp"
+                android:gravity="center_vertical"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp"
+                android:text="@string/choose_navigation_type"
+                android:textAppearance="@style/TextAppearance.ListItemTitle"/>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/measurement_tool_snap_to_road_descr"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="@dimen/default_desc_text_size"/>
-    </LinearLayout>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp"
+                android:text="@string/measurement_tool_snap_to_road_descr"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="@dimen/default_desc_text_size"/>
+        </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/navigation_types_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"/>
+    </ScrollView>
 
     <View
         android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginTop="8dp"
         android:background="?attr/dashboard_divider"/>
 
     <FrameLayout

From eba9b738413741895cab9a8684970ac633c1c7ef Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 10 Aug 2017 19:09:52 +0300
Subject: [PATCH 056/174] Fabs styling

---
 ...{points_tree.xml => track_points_tree.xml} | 76 +++++++++++-------
 OsmAnd/res/layout/track_segments_tree.xml     | 79 ++++++++++++-------
 OsmAnd/res/values/colors.xml                  |  2 +
 .../plus/myplaces/TrackPointFragment.java     | 74 +++++++++--------
 .../plus/myplaces/TrackSegmentFragment.java   | 71 ++++++++++-------
 5 files changed, 185 insertions(+), 117 deletions(-)
 rename OsmAnd/res/layout/{points_tree.xml => track_points_tree.xml} (82%)

diff --git a/OsmAnd/res/layout/points_tree.xml b/OsmAnd/res/layout/track_points_tree.xml
similarity index 82%
rename from OsmAnd/res/layout/points_tree.xml
rename to OsmAnd/res/layout/track_points_tree.xml
index fabb898d62..368b5695e3 100644
--- a/OsmAnd/res/layout/points_tree.xml
+++ b/OsmAnd/res/layout/track_points_tree.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
-                xmlns:tools="http://schemas.android.com/tools"
                 xmlns:osmand="http://schemas.android.com/apk/res-auto"
+                xmlns:tools="http://schemas.android.com/tools"
                 android:id="@+id/MainLayout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
@@ -19,11 +19,19 @@
         android:drawSelectorOnTop="false"
         android:groupIndicator="@android:color/transparent"/>
 
+    <View
+        android:id="@+id/overlay_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white_80_transparent"
+        android:visibility="gone"/>
+
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/menu_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_margin="16dp"
         android:contentDescription="@string/quick_action_new_action"
@@ -36,36 +44,40 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@id/menu_fab"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
+        android:layout_marginEnd="24dp"
         android:layout_marginRight="24dp"
         android:contentDescription="@string/quick_action_new_action"
         android:src="@drawable/ic_action_marker_dark"
         android:visibility="gone"
-        app:backgroundTint="@color/dashboard_blue"
+        app:backgroundTint="@color/fab_green"
         app:fabSize="mini"
         tools:visibility="visible"/>
 
     <FrameLayout
         android:id="@+id/waypoint_text_layout"
-        android:layout_toLeftOf="@id/waypoint_fab"
-        android:layout_toStartOf="@id/waypoint_fab"
-        android:layout_above="@id/menu_fab"
         android:layout_width="wrap_content"
         android:layout_height="40dp"
-        android:layout_marginRight="16dp"
+        android:layout_above="@id/menu_fab"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_toLeftOf="@id/waypoint_fab"
+        android:layout_toStartOf="@id/waypoint_fab"
         android:visibility="gone"
         tools:visibility="visible">
 
         <net.osmand.plus.widgets.TextViewEx
-            android:textColor="?android:attr/textColorPrimary"
-            osmand:typeface="@string/font_roboto_medium"
-            android:layout_gravity="center_vertical"
             android:id="@+id/waypoint_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="?attr/bg_card"
             android:gravity="center_vertical"
-            android:text="@string/add_waypoint"/>
+            android:padding="8dp"
+            android:text="@string/add_waypoint"
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"/>
 
     </FrameLayout>
 
@@ -74,38 +86,42 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@id/waypoint_fab"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_marginBottom="16dp"
+        android:layout_marginEnd="24dp"
         android:layout_marginRight="24dp"
         android:contentDescription="@string/quick_action_new_action"
         android:src="@drawable/ic_action_markers_dark"
         android:visibility="gone"
-        app:backgroundTint="@color/dashboard_blue"
+        app:backgroundTint="@color/fab_green"
         app:fabSize="mini"
         tools:visibility="visible"/>
 
     <FrameLayout
         android:id="@+id/route_text_layout"
-        android:layout_toLeftOf="@id/route_fab"
-        android:layout_toStartOf="@id/route_fab"
-        android:layout_above="@id/waypoint_fab"
         android:layout_width="wrap_content"
         android:layout_height="40dp"
+        android:layout_above="@id/waypoint_fab"
         android:layout_marginBottom="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_toLeftOf="@id/route_fab"
+        android:layout_toStartOf="@id/route_fab"
         android:visibility="gone"
         tools:visibility="visible">
 
         <net.osmand.plus.widgets.TextViewEx
-            android:textColor="?android:attr/textColorPrimary"
-            osmand:typeface="@string/font_roboto_medium"
-            android:layout_gravity="center_vertical"
             android:id="@+id/route_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="?attr/bg_card"
             android:gravity="center_vertical"
-            android:text="@string/add_route_point"/>
+            android:padding="8dp"
+            android:text="@string/add_route_point"
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"/>
 
     </FrameLayout>
 
@@ -114,38 +130,42 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@id/route_fab"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_marginBottom="16dp"
+        android:layout_marginEnd="24dp"
         android:layout_marginRight="24dp"
         android:contentDescription="@string/quick_action_new_action"
         android:src="@drawable/ic_action_polygom_dark"
         android:visibility="gone"
-        app:backgroundTint="@color/dashboard_blue"
+        app:backgroundTint="@color/fab_green"
         app:fabSize="mini"
         tools:visibility="visible"/>
 
     <FrameLayout
         android:id="@+id/line_text_layout"
-        android:layout_toLeftOf="@id/line_fab"
-        android:layout_toStartOf="@id/line_fab"
-        android:layout_above="@id/route_fab"
         android:layout_width="wrap_content"
         android:layout_height="40dp"
+        android:layout_above="@id/route_fab"
         android:layout_marginBottom="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_toLeftOf="@id/line_fab"
+        android:layout_toStartOf="@id/line_fab"
         android:visibility="gone"
         tools:visibility="visible">
 
         <net.osmand.plus.widgets.TextViewEx
-            android:textColor="?android:attr/textColorPrimary"
-            osmand:typeface="@string/font_roboto_medium"
-            android:layout_gravity="center_vertical"
             android:id="@+id/line_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="?attr/bg_card"
             android:gravity="center_vertical"
-            android:text="@string/add_line"/>
+            android:padding="8dp"
+            android:text="@string/add_line"
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"/>
 
     </FrameLayout>
 
diff --git a/OsmAnd/res/layout/track_segments_tree.xml b/OsmAnd/res/layout/track_segments_tree.xml
index b084bde401..30ab43a836 100644
--- a/OsmAnd/res/layout/track_segments_tree.xml
+++ b/OsmAnd/res/layout/track_segments_tree.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 xmlns:osmand="http://schemas.android.com/apk/res-auto"
                 xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:orientation="vertical">
 
     <ListView
@@ -15,11 +15,19 @@
         android:layout_marginRight="0dp"
         android:layout_marginTop="0dp"/>
 
+    <View
+        android:id="@+id/overlay_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white_80_transparent"
+        android:visibility="gone"/>
+
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/menu_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_margin="16dp"
         android:contentDescription="@string/quick_action_new_action"
@@ -32,36 +40,40 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@id/menu_fab"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
+        android:layout_marginEnd="24dp"
         android:layout_marginRight="24dp"
         android:contentDescription="@string/quick_action_new_action"
         android:src="@drawable/ic_action_marker_dark"
         android:visibility="gone"
-        app:backgroundTint="@color/dashboard_blue"
+        app:backgroundTint="@color/fab_green"
         app:fabSize="mini"
         tools:visibility="visible"/>
 
     <FrameLayout
         android:id="@+id/waypoint_text_layout"
-        android:layout_toLeftOf="@id/waypoint_fab"
-        android:layout_toStartOf="@id/waypoint_fab"
-        android:layout_above="@id/menu_fab"
         android:layout_width="wrap_content"
         android:layout_height="40dp"
-        android:layout_marginRight="16dp"
+        android:layout_above="@id/menu_fab"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_toLeftOf="@id/waypoint_fab"
+        android:layout_toStartOf="@id/waypoint_fab"
         android:visibility="gone"
         tools:visibility="visible">
 
         <net.osmand.plus.widgets.TextViewEx
-            android:textColor="?android:attr/textColorPrimary"
-            osmand:typeface="@string/font_roboto_medium"
-            android:layout_gravity="center_vertical"
             android:id="@+id/waypoint_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="?attr/bg_card"
             android:gravity="center_vertical"
-            android:text="@string/add_waypoint"/>
+            android:padding="8dp"
+            android:text="@string/add_waypoint"
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"/>
 
     </FrameLayout>
 
@@ -70,38 +82,42 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@id/waypoint_fab"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_marginBottom="16dp"
+        android:layout_marginEnd="24dp"
         android:layout_marginRight="24dp"
         android:contentDescription="@string/quick_action_new_action"
         android:src="@drawable/ic_action_markers_dark"
         android:visibility="gone"
-        app:backgroundTint="@color/dashboard_blue"
+        app:backgroundTint="@color/fab_green"
         app:fabSize="mini"
         tools:visibility="visible"/>
 
     <FrameLayout
         android:id="@+id/route_text_layout"
-        android:layout_toLeftOf="@id/route_fab"
-        android:layout_toStartOf="@id/route_fab"
-        android:layout_above="@id/waypoint_fab"
         android:layout_width="wrap_content"
         android:layout_height="40dp"
+        android:layout_above="@id/waypoint_fab"
         android:layout_marginBottom="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_toLeftOf="@id/route_fab"
+        android:layout_toStartOf="@id/route_fab"
         android:visibility="gone"
         tools:visibility="visible">
 
         <net.osmand.plus.widgets.TextViewEx
-            android:textColor="?android:attr/textColorPrimary"
-            osmand:typeface="@string/font_roboto_medium"
-            android:layout_gravity="center_vertical"
             android:id="@+id/route_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="?attr/bg_card"
             android:gravity="center_vertical"
-            android:text="@string/add_route_point"/>
+            android:padding="8dp"
+            android:text="@string/add_route_point"
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"/>
 
     </FrameLayout>
 
@@ -110,38 +126,43 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@id/route_fab"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_marginBottom="16dp"
+        android:layout_marginEnd="24dp"
         android:layout_marginRight="24dp"
         android:contentDescription="@string/quick_action_new_action"
         android:src="@drawable/ic_action_polygom_dark"
         android:visibility="gone"
-        app:backgroundTint="@color/dashboard_blue"
+        app:backgroundTint="@color/fab_green"
         app:fabSize="mini"
         tools:visibility="visible"/>
 
     <FrameLayout
         android:id="@+id/line_text_layout"
-        android:layout_toLeftOf="@id/line_fab"
-        android:layout_toStartOf="@id/line_fab"
-        android:layout_above="@id/route_fab"
         android:layout_width="wrap_content"
         android:layout_height="40dp"
+        android:layout_above="@id/route_fab"
         android:layout_marginBottom="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_toLeftOf="@id/line_fab"
+        android:layout_toStartOf="@id/line_fab"
         android:visibility="gone"
         tools:visibility="visible">
 
         <net.osmand.plus.widgets.TextViewEx
-            android:textColor="?android:attr/textColorPrimary"
-            osmand:typeface="@string/font_roboto_medium"
-            android:layout_gravity="center_vertical"
             android:id="@+id/line_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="?attr/bg_card"
             android:gravity="center_vertical"
-            android:text="@string/add_line"/>
+            android:padding="8dp"
+            android:text="@string/add_line"
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"/>
 
     </FrameLayout>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 4264d3cf00..12872af5b5 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -257,4 +257,6 @@
 	<color name="map_background_color_light">#fafafa</color>
 	<color name="map_background_color_dark">#101821</color>
 
+	<color name="fab_green">#46bd2a</color>
+
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index a5d1500491..ac114c3778 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -57,7 +57,6 @@ import net.osmand.plus.activities.TrackActivity;
 import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.base.OsmandExpandableListFragment;
 import net.osmand.plus.dialogs.DirectionsDialogs;
-import net.osmand.plus.views.AddGpxPointBottomSheetHelper.NewGpxPoint;
 import net.osmand.util.Algorithms;
 
 import java.io.File;
@@ -101,6 +100,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 	private View routePointTextLayout;
 	private FloatingActionButton lineFab;
 	private View lineTextLayout;
+	private View overlayView;
 
 	@Override
 	public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -130,51 +130,63 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 						: R.color.ctx_menu_info_view_bg_dark));
 	}
 
-	private View.OnClickListener onFabClickListener = new View.OnClickListener() {
-		@Override
-		public void onClick(View view) {
-			switch (view.getId()) {
-				case R.id.menu_fab:
-					if (menuOpened) {
-						closeMenu();
-					} else {
-						openMenu();
-					}
-					break;
-				case R.id.waypoint_fab:
-					PointDescription pointWptDescription = new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_waypoint));
-					addPoint(pointWptDescription);
-					break;
-				case R.id.route_fab:
-					PointDescription pointRteDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
-					addPoint(pointRteDescription);
-					break;
-				case R.id.line_fab:
-					addLine();
-					break;
-			}
-		}
-	};
+	private void hideTransparentOverlay() {
+		overlayView.setVisibility(View.GONE);
+	}
+
+	private void showTransparentOverlay() {
+		overlayView.setVisibility(View.VISIBLE);
+	}
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.points_tree, container, false);
+		View view = inflater.inflate(R.layout.track_points_tree, container, false);
 		ExpandableListView listView = (ExpandableListView) view.findViewById(android.R.id.list);
 		setHasOptionsMenu(true);
 
+		overlayView = view.findViewById(R.id.overlay_view);
+
 		menuFab = (FloatingActionButton) view.findViewById(R.id.menu_fab);
-		menuFab.setOnClickListener(onFabClickListener);
+		menuFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (menuOpened) {
+					hideTransparentOverlay();
+					closeMenu();
+				} else {
+					showTransparentOverlay();
+					openMenu();
+				}
+			}
+		});
 
 		waypointFab = (FloatingActionButton) view.findViewById(R.id.waypoint_fab);
-		waypointFab.setOnClickListener(onFabClickListener);
+		waypointFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_waypoint));
+				addPoint(pointDescription);
+			}
+		});
 		waypointTextLayout = view.findViewById(R.id.waypoint_text_layout);
 
 		routePointFab = (FloatingActionButton) view.findViewById(R.id.route_fab);
-		routePointFab.setOnClickListener(onFabClickListener);
+		routePointFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
+				addPoint(pointDescription);
+			}
+		});
 		routePointTextLayout = view.findViewById(R.id.route_text_layout);
 
 		lineFab = (FloatingActionButton) view.findViewById(R.id.line_fab);
-		lineFab.setOnClickListener(onFabClickListener);
+		lineFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				addLine();
+			}
+		});
 		lineTextLayout = view.findViewById(R.id.line_text_layout);
 
 		TextView tv = new TextView(getActivity());
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index 32efad25ca..409dcf200d 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -150,6 +150,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 	private View routePointTextLayout;
 	private FloatingActionButton lineFab;
 	private View lineTextLayout;
+	private View overlayView;
 
 	@Override
 	public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -179,31 +180,13 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 						: R.color.ctx_menu_info_view_bg_dark));
 	}
 
-	private View.OnClickListener onFabClickListener = new View.OnClickListener() {
-		@Override
-		public void onClick(View view) {
-			switch (view.getId()) {
-				case R.id.menu_fab:
-					if (menuOpened) {
-						closeMenu();
-					} else {
-						openMenu();
-					}
-					break;
-				case R.id.waypoint_fab:
-					PointDescription pointWptDescription = new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_waypoint));
-					addPoint(pointWptDescription);
-					break;
-				case R.id.route_fab:
-					PointDescription pointRteDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
-					addPoint(pointRteDescription);
-					break;
-				case R.id.line_fab:
-					addLine();
-					break;
-			}
-		}
-	};
+	private void hideTransparentOverlay() {
+		overlayView.setVisibility(View.GONE);
+	}
+
+	private void showTransparentOverlay() {
+		overlayView.setVisibility(View.VISIBLE);
+	}
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -219,19 +202,49 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		tv.setTextSize(24);
 		listView.setEmptyView(tv);
 
+		overlayView = view.findViewById(R.id.overlay_view);
+
 		menuFab = (FloatingActionButton) view.findViewById(R.id.menu_fab);
-		menuFab.setOnClickListener(onFabClickListener);
+		menuFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (menuOpened) {
+					hideTransparentOverlay();
+					closeMenu();
+				} else {
+					showTransparentOverlay();
+					openMenu();
+				}
+			}
+		});
 
 		waypointFab = (FloatingActionButton) view.findViewById(R.id.waypoint_fab);
-		waypointFab.setOnClickListener(onFabClickListener);
+		waypointFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_waypoint));
+				addPoint(pointDescription);
+			}
+		});
 		waypointTextLayout = view.findViewById(R.id.waypoint_text_layout);
 
 		routePointFab = (FloatingActionButton) view.findViewById(R.id.route_fab);
-		routePointFab.setOnClickListener(onFabClickListener);
+		routePointFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
+				addPoint(pointDescription);
+			}
+		});
 		routePointTextLayout = view.findViewById(R.id.route_text_layout);
 
 		lineFab = (FloatingActionButton) view.findViewById(R.id.line_fab);
-		lineFab.setOnClickListener(onFabClickListener);
+		lineFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				addLine();
+			}
+		});
 		lineTextLayout = view.findViewById(R.id.line_text_layout);
 
 		paint = new Paint();

From 8ab7f878b97996f06bebf6ab4238b340d1dfdd3a Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 10 Aug 2017 19:11:05 +0300
Subject: [PATCH 057/174] Fix overlayView when scrolling

---
 OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java   | 1 +
 OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index ac114c3778..cc897aa8e2 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -116,6 +116,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 			public void onScrollStateChanged(AbsListView absListView, int i) {
 				if (i == AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL) {
 					if (menuOpened) {
+						hideTransparentOverlay();
 						closeMenu();
 					}
 				}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index 409dcf200d..e04523a2d5 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -166,6 +166,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 			public void onScrollStateChanged(AbsListView absListView, int i) {
 				if (i == AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL) {
 					if (menuOpened) {
+						hideTransparentOverlay();
 						closeMenu();
 					}
 				}

From 658d7bdd3e0fb4306d62a879b1eb4a426b09caad Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Thu, 10 Aug 2017 19:15:10 +0300
Subject: [PATCH 058/174] Add some code

---
 ...gment_snap_to_road_bottom_sheet_dialog.xml |  1 +
 .../SnapToRoadBottomSheetDialogFragment.java  | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
index d1b4c0cbb9..14bc62c25a 100644
--- a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
@@ -6,6 +6,7 @@
     android:orientation="vertical">
 
     <ScrollView
+        android:id="@+id/navigation_types_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index 1c2dbc3d25..91a7e621ce 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -1,5 +1,6 @@
 package net.osmand.plus.measurementtool;
 
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
@@ -59,4 +60,34 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 
 		return view;
 	}
+
+	private boolean hasNavBar() {
+		int id = getResources().getIdentifier("config_showNavigationBar", "bool", "android");
+		return id > 0 && getResources().getBoolean(id);
+	}
+
+	private int getStatusBarHeight() {
+		int statusBarHeight = 0;
+		int resourceId = getResources().getIdentifier("status_bar_height", "dimen", "android");
+		if (resourceId > 0) {
+			statusBarHeight = getResources().getDimensionPixelSize(resourceId);
+		}
+		return statusBarHeight;
+	}
+
+	private int getNavigationBarHeight() {
+		if (!hasNavBar()) {
+			return 0;
+		}
+		boolean landscape = getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
+		boolean isSmartphone = getResources().getConfiguration().smallestScreenWidthDp < 600;
+		if (isSmartphone && landscape) {
+			return 0;
+		}
+		int id = getResources().getIdentifier(landscape ? "navigation_bar_height_landscape" : "navigation_bar_height", "dimen", "android");
+		if (id > 0) {
+			return getResources().getDimensionPixelSize(id);
+		}
+		return 0;
+	}
 }

From 9b79fde2265cf7d41317689044fc5bb55871ef77 Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Thu, 10 Aug 2017 23:46:16 +0300
Subject: [PATCH 059/174] Refactor code

---
 .../MeasurementToolFragment.java              | 58 +++++++++++--------
 .../measurementtool/MeasurementToolLayer.java | 30 ++--------
 .../command/AddPointCommand.java              | 10 +++-
 .../command/ClearPointsCommand.java           |  8 ++-
 .../command/MovePointCommand.java             | 14 +----
 .../command/RemovePointCommand.java           |  9 ++-
 .../command/ReorderPointCommand.java          |  9 ++-
 7 files changed, 68 insertions(+), 70 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 038fb0ba8b..a1dd58ef24 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -110,9 +110,9 @@ public class MeasurementToolFragment extends Fragment {
 		final int backgroundColor = ContextCompat.getColor(getActivity(),
 				nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
 		boolean portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
+
 		upIcon = iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up);
 		downIcon = iconsCache.getThemedIcon(R.drawable.ic_action_arrow_down);
-
 		pointsSt = getString(R.string.points).toLowerCase();
 
 		View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_measurement_tool, null);
@@ -203,13 +203,12 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		});
 
-		((Button) mainView.findViewById(R.id.add_point_button))
-				.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View view) {
-						addPoint();
-					}
-				});
+		mainView.findViewById(R.id.add_point_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				addPoint();
+			}
+		});
 
 		measurementLayer.setOnSingleTapListener(new MeasurementToolLayer.OnSingleTapListener() {
 			@Override
@@ -224,7 +223,6 @@ public class MeasurementToolFragment extends Fragment {
 				if (pointsListOpened) {
 					hidePointsList();
 				}
-				inMovePointMode = true;
 				enterMovePointMode();
 			}
 		});
@@ -335,8 +333,7 @@ public class MeasurementToolFragment extends Fragment {
 
 			@Override
 			public void onItemClick(View view) {
-				int pos = rv.indexOfChild(view);
-				measurementLayer.moveMapToPoint(pos);
+				measurementLayer.moveMapToPoint(rv.indexOfChild(view));
 			}
 
 			@Override
@@ -381,7 +378,6 @@ public class MeasurementToolFragment extends Fragment {
 	private void cancelMovePointMode() {
 		if (inMovePointMode) {
 			exitMovePointMode();
-			inMovePointMode = false;
 		}
 		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
 		if (measurementToolLayer != null) {
@@ -393,7 +389,6 @@ public class MeasurementToolFragment extends Fragment {
 	private void applyMovePointMode() {
 		if (inMovePointMode) {
 			exitMovePointMode();
-			inMovePointMode = false;
 		}
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
@@ -409,10 +404,10 @@ public class MeasurementToolFragment extends Fragment {
 			measurementLayer.exitMovePointMode();
 			measurementLayer.refreshMap();
 		}
-
 	}
 
 	private void enterMovePointMode() {
+		inMovePointMode = true;
 		mark(View.GONE,
 				R.id.ruler_icon,
 				R.id.measurement_distance_text_view,
@@ -429,6 +424,7 @@ public class MeasurementToolFragment extends Fragment {
 	}
 
 	private void exitMovePointMode() {
+		inMovePointMode = false;
 		mark(View.GONE,
 				R.id.move_point_icon,
 				R.id.move_point_text,
@@ -747,9 +743,18 @@ public class MeasurementToolFragment extends Fragment {
 			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);
+
+			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) {
@@ -771,18 +776,26 @@ public class MeasurementToolFragment extends Fragment {
 				mapActivity.hideTopToolbar(toolBarController);
 			}
 			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);
+
+			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);
 			}
 
-			measurementLayer.clearPoints();
+			measurementLayer.getMeasurementPoints().clear();
+			mapActivity.refreshMap();
 		}
 	}
 
@@ -828,7 +841,6 @@ public class MeasurementToolFragment extends Fragment {
 		try {
 			if (inMovePointMode) {
 				exitMovePointMode();
-				inMovePointMode = false;
 			}
 			MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
 			if (measurementToolLayer != null && measurementToolLayer.isInMovePointMode()) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index ade1a534e3..36570b068b 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -6,7 +6,6 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PointF;
-import android.util.Log;
 
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
@@ -85,7 +84,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return inMeasurementMode;
 	}
 
-	public boolean isInMovePointMode() {
+	boolean isInMovePointMode() {
 		return inMovePointMode;
 	}
 
@@ -112,11 +111,6 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return OsmAndFormatter.getFormattedDistance(dist, view.getApplication());
 	}
 
-	public void clearPoints() {
-		measurementPoints.clear();
-		view.refreshMap();
-	}
-
 	@Override
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
 		if (inMeasurementMode && !inMovePointMode && singleTapListener != null) {
@@ -203,6 +197,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 				}
 				calculatePath(tb, tx, ty, path);
 				canvas.drawPath(path, lineAttrs.paint);
+
 				WptPt pointToDrawOnTop = null;
 				for (int i = 0; i < measurementPoints.size(); i++) {
 					WptPt pt = measurementPoints.get(i);
@@ -243,26 +238,15 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		canvas.rotate(tb.getRotate(), center.x, center.y);
 	}
 
-	public void addPoint(int position, WptPt point) {
-		measurementPoints.add(position, point);
-		view.refreshMap();
-	}
-
 	public WptPt addPoint(int position) {
 		RotatedTileBox tb = view.getCurrentRotatedTileBox();
 		LatLon l = tb.getLatLonFromPixel(tb.getCenterPixelX(), tb.getCenterPixelY());
 		WptPt pt = new WptPt();
 		pt.lat = l.getLatitude();
 		pt.lon = l.getLongitude();
-		if (measurementPoints.size() > 0) {
-			if (!measurementPoints.get(measurementPoints.size() - 1).equals(pt)) {
-				measurementPoints.add(position, pt);
-				view.refreshMap();
-				return pt;
-			}
-		} else {
+		boolean allowed = measurementPoints.size() == 0 || !measurementPoints.get(measurementPoints.size() - 1).equals(pt);
+		if (allowed) {
 			measurementPoints.add(position, pt);
-			view.refreshMap();
 			return pt;
 		}
 		return null;
@@ -277,12 +261,6 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return pt;
 	}
 
-	public WptPt removePoint(int position) {
-		WptPt res = measurementPoints.remove(position);
-		view.refreshMap();
-		return res;
-	}
-
 	public void moveMapToPoint(int pos) {
 		if (measurementPoints.size() > 0) {
 			if (pos >= measurementPoints.size()) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
index 5458611bee..8913d04e2b 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
@@ -21,17 +21,21 @@ public class AddPointCommand implements Command {
 
 	@Override
 	public boolean execute() {
-		return (point = measurementLayer.addPoint(position)) != null;
+		point = measurementLayer.addPoint(position);
+		measurementLayer.refreshMap();
+		return point != null;
 	}
 
 	@Override
 	public void undo() {
-		measurementLayer.removePoint(position);
+		measurementLayer.getMeasurementPoints().remove(position);
+		measurementLayer.refreshMap();
 	}
 
 	@Override
 	public void redo() {
-		measurementLayer.addPoint(position, point);
+		measurementLayer.getMeasurementPoints().add(position, point);
+		measurementLayer.refreshMap();
 		measurementLayer.moveMapToPoint(position);
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
index 081bdfae30..aa16d3c701 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
@@ -17,8 +17,10 @@ public class ClearPointsCommand implements Command {
 
 	@Override
 	public boolean execute() {
-		points = new LinkedList<>(measurementLayer.getMeasurementPoints());
-		measurementLayer.clearPoints();
+		List<GPXUtilities.WptPt> pts = measurementLayer.getMeasurementPoints();
+		points = new LinkedList<>(pts);
+		pts.clear();
+		measurementLayer.refreshMap();
 		return true;
 	}
 
@@ -30,7 +32,7 @@ public class ClearPointsCommand implements Command {
 
 	@Override
 	public void redo() {
-		measurementLayer.clearPoints();
+		measurementLayer.getMeasurementPoints().clear();
 		measurementLayer.refreshMap();
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
index dc84bb2af0..4adffb72ac 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
@@ -10,7 +10,7 @@ public class MovePointCommand implements Command {
 	private final WptPt newPoint;
 	private final int position;
 
-	public MovePointCommand (MeasurementToolLayer measurementLayer, WptPt oldPoint, WptPt newPoint, int position) {
+	public MovePointCommand(MeasurementToolLayer measurementLayer, WptPt oldPoint, WptPt newPoint, int position) {
 		this.measurementLayer = measurementLayer;
 		this.oldPoint = oldPoint;
 		this.newPoint = newPoint;
@@ -24,21 +24,13 @@ public class MovePointCommand implements Command {
 
 	@Override
 	public void undo() {
-		replacePointWithOldOne();
-	}
-
-	@Override
-	public void redo() {
-		replacePointWithNewOne();
-	}
-
-	private void replacePointWithOldOne() {
 		measurementLayer.getMeasurementPoints().remove(position);
 		measurementLayer.getMeasurementPoints().add(position, oldPoint);
 		measurementLayer.refreshMap();
 	}
 
-	private void replacePointWithNewOne() {
+	@Override
+	public void redo() {
 		measurementLayer.getMeasurementPoints().remove(position);
 		measurementLayer.getMeasurementPoints().add(position, newPoint);
 		measurementLayer.refreshMap();
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
index 7fb7d336c7..367aca310a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
@@ -16,18 +16,21 @@ public class RemovePointCommand implements Command {
 
 	@Override
 	public boolean execute() {
-		point = measurementLayer.removePoint(position);
+		point = measurementLayer.getMeasurementPoints().remove(position);
+		measurementLayer.refreshMap();
 		return true;
 	}
 
 	@Override
 	public void undo() {
-		measurementLayer.addPoint(position, point);
+		measurementLayer.getMeasurementPoints().add(position, point);
+		measurementLayer.refreshMap();
 		measurementLayer.moveMapToPoint(position);
 	}
 
 	@Override
 	public void redo() {
-		measurementLayer.removePoint(position);
+		measurementLayer.getMeasurementPoints().remove(position);
+		measurementLayer.refreshMap();
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
index 0e41a22d34..1189676555 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
@@ -32,7 +32,14 @@ public class ReorderPointCommand implements Command {
 	}
 
 	private void swap() {
-		Collections.swap(measurementLayer.getMeasurementPoints(), from, to);
+		// todo: fix exception
+		try {
+			Collections.swap(measurementLayer.getMeasurementPoints(), from, to);
+		} catch (Exception e) {
+			// index out of bounds
+			// an exception occurs when to == -1 basically
+			// but maybe from == measurementPoints.size() sometimes so there is an exception
+		}
 		measurementLayer.refreshMap();
 	}
 }

From 3419175299a0eb4e6fa7e8d08eb0fefc7ae4969b Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 11 Aug 2017 11:15:14 +0300
Subject: [PATCH 060/174] Refactor saving gpx methods

---
 .../MeasurementToolFragment.java              | 123 +++++++-----------
 1 file changed, 45 insertions(+), 78 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index a1dd58ef24..9e975f9624 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -496,7 +496,7 @@ public class MeasurementToolFragment extends Fragment {
 		GPXFile gpx = newGpxLine.getGpxFile();
 		SelectedGpxFile selectedGpxFile = mapActivity.getMyApplication().getSelectedGpxHelper().getSelectedFileByPath(gpx.path);
 		boolean showOnMap = selectedGpxFile != null;
-		saveGpx(gpx, showOnMap);
+		saveExistingGpx(gpx, showOnMap);
 	}
 
 	private void saveAsGpxOnClick(MapActivity mapActivity) {
@@ -558,73 +558,22 @@ public class MeasurementToolFragment extends Fragment {
 								fout = new File(dir, fileName);
 							}
 						}
-						createAndSaveGpx(dir, fileName, showOnMapToggle.isChecked());
+						saveNewGpx(dir, fileName, showOnMapToggle.isChecked());
 					}
 				})
 				.setNegativeButton(R.string.shared_string_cancel, null)
 				.show();
 	}
 
-	private void saveGpx(final GPXFile gpx, final boolean showOnMap) {
-		new AsyncTask<Void, Void, String>() {
-
-			private ProgressDialog progressDialog;
-			private File toSave;
-
-			@Override
-			protected void onPreExecute() {
-				MapActivity activity = getMapActivity();
-				if (activity != null) {
-					progressDialog = new ProgressDialog(activity);
-					progressDialog.setMessage(getString(R.string.saving_gpx_tracks));
-					progressDialog.show();
-				}
-			}
-
-			@Override
-			protected String doInBackground(Void... voids) {
-				MeasurementToolLayer measurementLayer = getMeasurementLayer();
-				toSave = new File(gpx.path);
-				if (measurementLayer != null) {
-					List<WptPt> points = measurementLayer.getMeasurementPoints();
-					gpx.addTrkSegment(points);
-				}
-				MapActivity activity = getMapActivity();
-				if (activity != null) {
-					String res = GPXUtilities.writeGpxFile(toSave, gpx, activity.getMyApplication());
-					if (showOnMap) {
-						SelectedGpxFile sf = activity.getMyApplication().getSelectedGpxHelper().selectGpxFile(gpx, true, false);
-						if (sf != null) {
-							sf.processPoints();
-						}
-					}
-					return res;
-				}
-				return null;
-			}
-
-			@Override
-			protected void onPostExecute(String warning) {
-				MapActivity activity = getMapActivity();
-				if (activity != null) {
-					if (warning == null) {
-						Toast.makeText(activity,
-								MessageFormat.format(getString(R.string.gpx_saved_sucessfully), toSave.getAbsolutePath()),
-								Toast.LENGTH_LONG).show();
-						saved = true;
-					} else {
-						Toast.makeText(activity, warning, Toast.LENGTH_LONG).show();
-					}
-					activity.refreshMap();
-				}
-				if (progressDialog != null && progressDialog.isShowing()) {
-					progressDialog.dismiss();
-				}
-			}
-		}.execute();
+	private void saveNewGpx(File dir, String fileName, boolean checked) {
+		saveGpx(dir, fileName, checked, null);
 	}
 
-	private void createAndSaveGpx(final File dir, final String fileName, final boolean showOnMap) {
+	private void saveExistingGpx(GPXFile gpx, boolean showOnMap) {
+		saveGpx(null, null, showOnMap, gpx);
+	}
+
+	private void saveGpx(final File dir, final String fileName, final boolean showOnMap, final GPXFile gpx) {
 		new AsyncTask<Void, Void, String>() {
 
 			private ProgressDialog progressDialog;
@@ -642,27 +591,45 @@ public class MeasurementToolFragment extends Fragment {
 
 			@Override
 			protected String doInBackground(Void... voids) {
-				toSave = new File(dir, fileName);
-				GPXFile gpx = new GPXFile();
 				MeasurementToolLayer measurementLayer = getMeasurementLayer();
-				if (measurementLayer != null) {
-					LinkedList<WptPt> points = measurementLayer.getMeasurementPoints();
-					if (points.size() == 1) {
-						gpx.points.add(points.getFirst());
-					} else if (points.size() > 1) {
-						Route rt = new Route();
-						gpx.routes.add(rt);
-						rt.points.addAll(points);
-					}
-				}
 				MapActivity activity = getMapActivity();
-				if (activity != null) {
-					String res = GPXUtilities.writeGpxFile(toSave, gpx, activity.getMyApplication());
-					gpx.path = toSave.getAbsolutePath();
-					if (showOnMap) {
-						activity.getMyApplication().getSelectedGpxHelper().selectGpxFile(gpx, true, false);
+				if (gpx == null) {
+					toSave = new File(dir, fileName);
+					GPXFile gpx = new GPXFile();
+					if (measurementLayer != null) {
+						LinkedList<WptPt> points = measurementLayer.getMeasurementPoints();
+						if (points.size() == 1) {
+							gpx.points.add(points.getFirst());
+						} else if (points.size() > 1) {
+							Route rt = new Route();
+							gpx.routes.add(rt);
+							rt.points.addAll(points);
+						}
+					}
+					if (activity != null) {
+						String res = GPXUtilities.writeGpxFile(toSave, gpx, activity.getMyApplication());
+						gpx.path = toSave.getAbsolutePath();
+						if (showOnMap) {
+							activity.getMyApplication().getSelectedGpxHelper().selectGpxFile(gpx, true, false);
+						}
+						return res;
+					}
+				} else {
+					toSave = new File(gpx.path);
+					if (measurementLayer != null) {
+						List<WptPt> points = measurementLayer.getMeasurementPoints();
+						gpx.addTrkSegment(points);
+					}
+					if (activity != null) {
+						String res = GPXUtilities.writeGpxFile(toSave, gpx, activity.getMyApplication());
+						if (showOnMap) {
+							SelectedGpxFile sf = activity.getMyApplication().getSelectedGpxHelper().selectGpxFile(gpx, true, false);
+							if (sf != null) {
+								sf.processPoints();
+							}
+						}
+						return res;
 					}
-					return res;
 				}
 				return null;
 			}

From fc37aa24ed1e8506e701cd6837c801751a870905 Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 11 Aug 2017 11:22:54 +0300
Subject: [PATCH 061/174] Dynamically set the height  for scrollview

---
 ...gment_snap_to_road_bottom_sheet_dialog.xml |  2 +-
 OsmAnd/res/values/sizes.xml                   |  2 +
 .../SnapToRoadBottomSheetDialogFragment.java  | 44 ++++++++++++++++---
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
index 14bc62c25a..05224c222b 100644
--- a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
@@ -47,7 +47,7 @@
     <FrameLayout
         android:id="@+id/cancel_row"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="@dimen/snap_to_road_bottom_sheet_cancel_button_height"
         android:background="?attr/selectableItemBackground">
 
         <TextView
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index aa41eae132..c8165ab7b4 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -155,4 +155,6 @@
 	<dimen name="my_places_empty_state_text_button_padding_left">48dp</dimen>
 	<dimen name="my_places_empty_state_text_button_padding_right">60dp</dimen>
 	<dimen name="my_places_empty_state_text_button_padding_top">64dp</dimen>
+
+    <dimen name="snap_to_road_bottom_sheet_cancel_button_height">48dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index 91a7e621ce..f13b7f5456 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -1,17 +1,21 @@
 package net.osmand.plus.measurementtool;
 
 import android.content.res.Configuration;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
+import android.util.DisplayMetrics;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import net.osmand.AndroidUtils;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
@@ -33,7 +37,7 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 		final int backgroundColor = ContextCompat.getColor(getActivity(),
 				nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
 
-		View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_snap_to_road_bottom_sheet_dialog, container);
+		final View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_snap_to_road_bottom_sheet_dialog, container);
 		view.setBackgroundColor(backgroundColor);
 		if (nightMode) {
 			((TextView) view.findViewById(R.id.cancel_row_text))
@@ -58,12 +62,33 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 			navContainer.addView(row);
 		}
 
-		return view;
-	}
+		DisplayMetrics metrics = new DisplayMetrics();
+		getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
+		final int height = metrics.heightPixels;
 
-	private boolean hasNavBar() {
-		int id = getResources().getIdentifier("config_showNavigationBar", "bool", "android");
-		return id > 0 && getResources().getBoolean(id);
+		view.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+			@Override
+			public void onGlobalLayout() {
+				final View scrollView = view.findViewById(R.id.navigation_types_scroll_view);
+				int scrollViewHeight = scrollView.getHeight();
+				int dividerHeight = AndroidUtils.dpToPx(getContext(), 1);
+				int cancelButtonHeight = getContext().getResources().getDimensionPixelSize(R.dimen.snap_to_road_bottom_sheet_cancel_button_height);
+				int spaceForScrollView = height - getStatusBarHeight() - getNavBarHeight() - dividerHeight - cancelButtonHeight;
+				if (scrollViewHeight > spaceForScrollView) {
+					scrollView.getLayoutParams().height = spaceForScrollView;
+					scrollView.requestLayout();
+				}
+
+				ViewTreeObserver obs = view.getViewTreeObserver();
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+					obs.removeOnGlobalLayoutListener(this);
+				} else {
+					obs.removeGlobalOnLayoutListener(this);
+				}
+			}
+		});
+
+		return view;
 	}
 
 	private int getStatusBarHeight() {
@@ -75,7 +100,7 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 		return statusBarHeight;
 	}
 
-	private int getNavigationBarHeight() {
+	private int getNavBarHeight() {
 		if (!hasNavBar()) {
 			return 0;
 		}
@@ -90,4 +115,9 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 		}
 		return 0;
 	}
+
+	private boolean hasNavBar() {
+		int id = getResources().getIdentifier("config_showNavigationBar", "bool", "android");
+		return id > 0 && getResources().getBoolean(id);
+	}
 }

From b9b0702628f1eea2ae7cf86280143555e2e5048b Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 11 Aug 2017 12:11:16 +0300
Subject: [PATCH 062/174] Fix showing empty state after loading

---
 OsmAnd/res/layout/available_gpx.xml                          | 3 ++-
 OsmAnd/res/layout/empty_state_my_tracks.xml                  | 2 +-
 OsmAnd/res/layout/favorites_tree.xml                         | 3 ++-
 .../src/net/osmand/plus/myplaces/AvailableGPXFragment.java   | 5 +++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/layout/available_gpx.xml b/OsmAnd/res/layout/available_gpx.xml
index 227b73b025..3e397f7afe 100644
--- a/OsmAnd/res/layout/available_gpx.xml
+++ b/OsmAnd/res/layout/available_gpx.xml
@@ -18,6 +18,7 @@
         android:drawSelectorOnTop="false"
 		android:groupIndicator="@android:color/transparent"/>
 
-	<include layout="@layout/empty_state_my_tracks"/>
+	<include layout="@layout/empty_state_my_tracks"
+		android:id="@android:id/empty"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/empty_state_my_tracks.xml b/OsmAnd/res/layout/empty_state_my_tracks.xml
index b3da13be38..2e9a969609 100644
--- a/OsmAnd/res/layout/empty_state_my_tracks.xml
+++ b/OsmAnd/res/layout/empty_state_my_tracks.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:osmand="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
-              android:id="@android:id/empty"
+              android:visibility="gone"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:gravity="center_horizontal"
diff --git a/OsmAnd/res/layout/favorites_tree.xml b/OsmAnd/res/layout/favorites_tree.xml
index b7e0d85994..8c95ff1e50 100644
--- a/OsmAnd/res/layout/favorites_tree.xml
+++ b/OsmAnd/res/layout/favorites_tree.xml
@@ -19,6 +19,7 @@
         android:drawSelectorOnTop="false"
         android:groupIndicator="@android:color/transparent"/>
 
-    <include layout="@layout/empty_state_favourites"/>
+    <include layout="@layout/empty_state_favourites"
+        android:id="@android:id/empty"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index ed70f41a77..95dc1638b4 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -124,6 +124,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	private View currentGpxView;
 	private View footerView;
 	private boolean importing = false;
+	private View emptyView;
 
 	@Override
 	public void onAttach(Context activity) {
@@ -327,7 +328,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 		footerView = inflater.inflate(R.layout.list_shadow_footer, null, false);
 		listView.addFooterView(footerView);
-		View emptyView = v.findViewById(android.R.id.empty);
+		emptyView = v.findViewById(android.R.id.empty);
 		ImageView emptyImageView = (ImageView) emptyView.findViewById(R.id.empty_state_image_view);
 		emptyImageView.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_empty_state_trip_day_result : R.drawable.ic_empty_state_trip_night_result);
 		Button importButton = (Button) emptyView.findViewById(R.id.import_button);
@@ -337,7 +338,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 				addTrack();
 			}
 		});
-		listView.setEmptyView(emptyView);
 		if (this.adapter != null) {
 			listView.setAdapter(this.adapter);
 		}
@@ -1608,6 +1608,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		@Override
 		protected void onPostExecute(Void aVoid) {
 			asyncProcessor = null;
+			listView.setEmptyView(emptyView);
 		}
 	}
 

From 5796d5f2e0444e84086b0fd2eca71fcd50dc8c26 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 11 Aug 2017 13:30:52 +0300
Subject: [PATCH 063/174] Fix fabs

---
 .../plus/myplaces/TrackPointFragment.java     | 75 +++++++++++--------
 .../plus/myplaces/TrackSegmentFragment.java   | 75 +++++++++++--------
 2 files changed, 86 insertions(+), 64 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index cc897aa8e2..13e3ebd7a4 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -139,6 +139,41 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 		overlayView.setVisibility(View.VISIBLE);
 	}
 
+	private View.OnClickListener onFabClickListener = new View.OnClickListener() {
+		@Override
+		public void onClick(View view) {
+			switch (view.getId()) {
+				case R.id.overlay_view:
+					hideTransparentOverlay();
+					closeMenu();
+					break;
+				case R.id.menu_fab:
+					if (menuOpened) {
+						hideTransparentOverlay();
+						closeMenu();
+					} else {
+						showTransparentOverlay();
+						openMenu();
+					}
+					break;
+				case R.id.waypoint_text_layout:
+				case R.id.waypoint_fab:
+					PointDescription pointWptDescription = new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_waypoint));
+					addPoint(pointWptDescription);
+					break;
+				case R.id.route_text_layout:
+				case R.id.route_fab:
+					PointDescription pointRteDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
+					addPoint(pointRteDescription);
+					break;
+				case R.id.line_text_layout:
+				case R.id.line_fab:
+					addLine();
+					break;
+			}
+		}
+	};
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View view = inflater.inflate(R.layout.track_points_tree, container, false);
@@ -146,49 +181,25 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 		setHasOptionsMenu(true);
 
 		overlayView = view.findViewById(R.id.overlay_view);
+		overlayView.setOnClickListener(onFabClickListener);
 
 		menuFab = (FloatingActionButton) view.findViewById(R.id.menu_fab);
-		menuFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				if (menuOpened) {
-					hideTransparentOverlay();
-					closeMenu();
-				} else {
-					showTransparentOverlay();
-					openMenu();
-				}
-			}
-		});
+		menuFab.setOnClickListener(onFabClickListener);
 
 		waypointFab = (FloatingActionButton) view.findViewById(R.id.waypoint_fab);
-		waypointFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_waypoint));
-				addPoint(pointDescription);
-			}
-		});
+		waypointFab.setOnClickListener(onFabClickListener);
 		waypointTextLayout = view.findViewById(R.id.waypoint_text_layout);
+		waypointTextLayout.setOnClickListener(onFabClickListener);
 
 		routePointFab = (FloatingActionButton) view.findViewById(R.id.route_fab);
-		routePointFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
-				addPoint(pointDescription);
-			}
-		});
+		routePointFab.setOnClickListener(onFabClickListener);
 		routePointTextLayout = view.findViewById(R.id.route_text_layout);
+		routePointTextLayout.setOnClickListener(onFabClickListener);
 
 		lineFab = (FloatingActionButton) view.findViewById(R.id.line_fab);
-		lineFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				addLine();
-			}
-		});
+		lineFab.setOnClickListener(onFabClickListener);
 		lineTextLayout = view.findViewById(R.id.line_text_layout);
+		lineTextLayout.setOnClickListener(onFabClickListener);
 
 		TextView tv = new TextView(getActivity());
 		tv.setText(R.string.none_selected_gpx);
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index e04523a2d5..95c375d5fd 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -189,6 +189,41 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		overlayView.setVisibility(View.VISIBLE);
 	}
 
+	private View.OnClickListener onFabClickListener = new View.OnClickListener() {
+		@Override
+		public void onClick(View view) {
+			switch (view.getId()) {
+				case R.id.overlay_view:
+					hideTransparentOverlay();
+					closeMenu();
+					break;
+				case R.id.menu_fab:
+					if (menuOpened) {
+						hideTransparentOverlay();
+						closeMenu();
+					} else {
+						showTransparentOverlay();
+						openMenu();
+					}
+					break;
+				case R.id.waypoint_text_layout:
+				case R.id.waypoint_fab:
+					PointDescription pointWptDescription = new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_waypoint));
+					addPoint(pointWptDescription);
+					break;
+				case R.id.route_text_layout:
+				case R.id.route_fab:
+					PointDescription pointRteDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
+					addPoint(pointRteDescription);
+					break;
+				case R.id.line_text_layout:
+				case R.id.line_fab:
+					addLine();
+					break;
+			}
+		}
+	};
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		setHasOptionsMenu(true);
@@ -204,49 +239,25 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		listView.setEmptyView(tv);
 
 		overlayView = view.findViewById(R.id.overlay_view);
+		overlayView.setOnClickListener(onFabClickListener);
 
 		menuFab = (FloatingActionButton) view.findViewById(R.id.menu_fab);
-		menuFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				if (menuOpened) {
-					hideTransparentOverlay();
-					closeMenu();
-				} else {
-					showTransparentOverlay();
-					openMenu();
-				}
-			}
-		});
+		menuFab.setOnClickListener(onFabClickListener);
 
 		waypointFab = (FloatingActionButton) view.findViewById(R.id.waypoint_fab);
-		waypointFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_waypoint));
-				addPoint(pointDescription);
-			}
-		});
+		waypointFab.setOnClickListener(onFabClickListener);
 		waypointTextLayout = view.findViewById(R.id.waypoint_text_layout);
+		waypointTextLayout.setOnClickListener(onFabClickListener);
 
 		routePointFab = (FloatingActionButton) view.findViewById(R.id.route_fab);
-		routePointFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
-				addPoint(pointDescription);
-			}
-		});
+		routePointFab.setOnClickListener(onFabClickListener);
 		routePointTextLayout = view.findViewById(R.id.route_text_layout);
+		routePointTextLayout.setOnClickListener(onFabClickListener);
 
 		lineFab = (FloatingActionButton) view.findViewById(R.id.line_fab);
-		lineFab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				addLine();
-			}
-		});
+		lineFab.setOnClickListener(onFabClickListener);
 		lineTextLayout = view.findViewById(R.id.line_text_layout);
+		lineTextLayout.setOnClickListener(onFabClickListener);
 
 		paint = new Paint();
 		paint.setStyle(Paint.Style.STROKE);

From a78dcee68625d935fce0dd6301343bb672b25463 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 11 Aug 2017 13:51:54 +0300
Subject: [PATCH 064/174] Close context menu after adding waypoint/route point

---
 .../src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java b/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java
index 51f736222b..e807dc4084 100644
--- a/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java
+++ b/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java
@@ -129,6 +129,7 @@ public class AddGpxPointBottomSheetHelper implements OnDismissListener {
 
 	@Override
 	public void onDismiss() {
+		mapActivity.getContextMenu().close();
 		Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getTrackActivity());
 		newIntent.putExtra(TrackActivity.TRACK_FILE_NAME, newGpxPoint.getGpx().path);
 		newIntent.putExtra(TrackActivity.OPEN_POINTS_TAB, true);

From 584143f6a23372b9236088ba7c39bfa03aee9eb9 Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 11 Aug 2017 13:57:37 +0300
Subject: [PATCH 065/174] Add options menu fragment; fix layouts

---
 .../fragment_options_bottom_sheet_dialog.xml  | 205 ++++++++++++++++++
 ...gment_snap_to_road_bottom_sheet_dialog.xml |   2 +-
 .../res/layout/list_item_icon_and_title.xml   |   4 +-
 OsmAnd/res/values/strings.xml                 |   5 +-
 .../OptionsBottomSheetDialogFragment.java     |  39 ++++
 .../SnapToRoadBottomSheetDialogFragment.java  |   5 -
 6 files changed, 250 insertions(+), 10 deletions(-)
 create mode 100644 OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java

diff --git a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
new file mode 100644
index 0000000000..05da9bd3d5
--- /dev/null
+++ b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/bg_color"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="52dp"
+        android:gravity="center_vertical"
+        android:paddingEnd="16dp"
+        android:paddingStart="16dp"
+        android:text="@string/shared_string_options"
+        android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="?attr/selectableItemBackground"
+        android:minHeight="48dp"
+        android:paddingEnd="16dp"
+        android:paddingStart="16dp">
+
+        <ImageView
+            android:id="@+id/snap_to_road_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginEnd="24dp"
+            android:layout_marginRight="24dp"
+            tools:src="@drawable/ic_action_snap_to_road"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/snap_to_road_icon"
+            android:layout_toRightOf="@id/snap_to_road_icon"
+            android:maxLines="1"
+            android:text="@string/snap_to_road"
+            android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+    </RelativeLayout>
+
+    <View
+        android:layout_width="wrap_content"
+        android:layout_height="1dp"
+        android:layout_marginBottom="8dp"
+        android:layout_marginLeft="64dp"
+        android:layout_marginStart="64dp"
+        android:layout_marginTop="7dp"
+        android:background="?attr/dashboard_divider"/>
+
+    <RelativeLayout
+        android:id="@+id/save_as_new_segment_row"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="?attr/selectableItemBackground"
+        android:minHeight="48dp"
+        android:paddingEnd="16dp"
+        android:paddingStart="16dp"
+        android:visibility="gone">
+
+        <ImageView
+            android:id="@+id/save_as_new_segment_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginEnd="24dp"
+            android:layout_marginRight="24dp"
+            tools:src="@drawable/ic_action_polygom_dark"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/save_as_new_segment_icon"
+            android:layout_toRightOf="@id/save_as_new_segment_icon"
+            android:maxLines="1"
+            android:text="@string/save_as_new_segment"
+            android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/save_as_new_track_row"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="?attr/selectableItemBackground"
+        android:minHeight="48dp"
+        android:paddingEnd="16dp"
+        android:paddingStart="16dp">
+
+        <ImageView
+            android:id="@+id/save_as_new_track_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginEnd="24dp"
+            android:layout_marginRight="24dp"
+            tools:src="@drawable/ic_action_polygom_dark"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/save_as_new_track_icon"
+            android:layout_toRightOf="@id/save_as_new_track_icon"
+            android:maxLines="1"
+            android:text="@string/shared_string_save_as_gpx"
+            android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/add_to_the_track_row"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="?attr/selectableItemBackground"
+        android:minHeight="48dp"
+        android:paddingEnd="16dp"
+        android:paddingStart="16dp">
+
+        <ImageView
+            android:id="@+id/add_to_the_track_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginEnd="24dp"
+            android:layout_marginRight="24dp"
+            tools:src="@drawable/ic_action_split_interval"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/add_to_the_track_icon"
+            android:layout_toRightOf="@id/add_to_the_track_icon"
+            android:maxLines="1"
+            android:text="@string/add_segment_to_the_track"
+            android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+    </RelativeLayout>
+
+    <View
+        android:layout_width="wrap_content"
+        android:layout_height="1dp"
+        android:layout_marginBottom="8dp"
+        android:layout_marginLeft="64dp"
+        android:layout_marginStart="64dp"
+        android:layout_marginTop="7dp"
+        android:background="?attr/dashboard_divider"/>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="?attr/selectableItemBackground"
+        android:minHeight="48dp"
+        android:paddingEnd="16dp"
+        android:paddingStart="16dp">
+
+        <ImageView
+            android:id="@+id/clear_all_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginEnd="24dp"
+            android:layout_marginRight="24dp"
+            tools:src="@drawable/ic_action_reset_to_default_dark"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/clear_all_icon"
+            android:layout_toRightOf="@id/clear_all_icon"
+            android:maxLines="1"
+            android:text="@string/shared_string_clear_all"
+            android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="8dp"
+        android:background="?attr/dashboard_divider"/>
+
+    <FrameLayout
+        android:id="@+id/cancel_row"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/snap_to_road_bottom_sheet_cancel_button_height"
+        android:background="?attr/selectableItemBackground">
+
+        <TextView
+            android:id="@+id/cancel_row_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/shared_string_cancel"
+            android:textAllCaps="true"
+            android:textColor="@color/dashboard_general_button_text_light"
+            android:textSize="14sp"
+            android:textStyle="bold"/>
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
index 05224c222b..bd769dc4ac 100644
--- a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/bg_color"
     android:orientation="vertical">
 
     <ScrollView
@@ -39,7 +40,6 @@
     </ScrollView>
 
     <View
-        android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="?attr/dashboard_divider"/>
diff --git a/OsmAnd/res/layout/list_item_icon_and_title.xml b/OsmAnd/res/layout/list_item_icon_and_title.xml
index 24308873c8..e98a58a395 100644
--- a/OsmAnd/res/layout/list_item_icon_and_title.xml
+++ b/OsmAnd/res/layout/list_item_icon_and_title.xml
@@ -14,8 +14,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginRight="24dp"
         tools:src="@drawable/ic_action_car_dark"/>
 
     <TextView
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 3bed4dcd3f..c48ccb4c25 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="shared_string_options">Options</string>
     <string name="measurement_tool_snap_to_road_descr">OsmAnd will add additional points, depending on the navigation type.</string>
     <string name="choose_navigation_type">Choose navigation type</string>
     <string name="none_point_error">Please add at least one point.</string>
@@ -792,7 +793,7 @@
     <string name="shared_string_clear">Clear</string>
     <string name="shared_string_clear_all">Clear all</string>
     <string name="shared_string_save">Save</string>
-    <string name="shared_string_save_as_gpx">Save as Track</string>
+    <string name="shared_string_save_as_gpx">Save as new Track</string>
     <string name="shared_string_rename">Rename</string>
     <string name="shared_string_delete">Delete</string>
     <string name="shared_string_delete_all">Delete all</string>
@@ -2680,5 +2681,5 @@
     <string name="import_track_desc">File %1$s does not contain waypoints, import it as a track?</string>
     <string name="save_as_new_segment">Save as new segment</string>
     <string name="move_point">Move Point</string>
-    <string name="add_segment_to_the_track">Add segment to the track</string>
+    <string name="add_segment_to_the_track">Add to a track</string>
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
new file mode 100644
index 0000000000..fb2749fb6a
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@@ -0,0 +1,39 @@
+package net.osmand.plus.measurementtool;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import net.osmand.plus.R;
+import net.osmand.plus.base.BottomSheetDialogFragment;
+
+public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment {
+
+	public final static String TAG = "OptionsBottomSheetDialogFragment";
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		final boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
+
+		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_options_bottom_sheet_dialog, null);
+
+		((ImageView) mainView.findViewById(R.id.snap_to_road_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_snap_to_road));
+		((ImageView) mainView.findViewById(R.id.save_as_new_track_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_polygom_dark));
+		((ImageView) mainView.findViewById(R.id.add_to_the_track_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_split_interval));
+		((ImageView) mainView.findViewById(R.id.clear_all_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_reset_to_default_dark));
+		mainView.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				dismiss();
+			}
+		});
+
+		return mainView;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index f13b7f5456..a61f8839da 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -34,16 +34,11 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 		final OsmandSettings settings = getMyApplication().getSettings();
 		final boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
-		final int backgroundColor = ContextCompat.getColor(getActivity(),
-				nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
 
 		final View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_snap_to_road_bottom_sheet_dialog, container);
-		view.setBackgroundColor(backgroundColor);
 		if (nightMode) {
 			((TextView) view.findViewById(R.id.cancel_row_text))
 					.setTextColor(ContextCompat.getColor(getActivity(), R.color.dashboard_general_button_text_dark));
-		} else {
-			view.findViewById(R.id.divider).setBackgroundResource(R.drawable.divider);
 		}
 		view.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {
 			@Override

From c7b877aefc2ae93207eef6ffb05e0e3b3bebf0bb Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 11 Aug 2017 14:35:24 +0300
Subject: [PATCH 066/174] Add options button; move udo and redo buttons; add
 small improvements

---
 .../res/layout/fragment_measurement_tool.xml  | 76 +++++++++++--------
 .../fragment_options_bottom_sheet_dialog.xml  |  2 +-
 ...gment_snap_to_road_bottom_sheet_dialog.xml |  3 +-
 .../MeasurementToolFragment.java              | 26 ++++---
 .../SnapToRoadBottomSheetDialogFragment.java  |  6 +-
 5 files changed, 65 insertions(+), 48 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index b31de2a85e..b11908c5a1 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:background="@color/color_transparent"
     android:clickable="true">
 
@@ -51,8 +51,8 @@
                 android:layout_marginRight="16dp"
                 android:layout_marginStart="16dp"
                 android:background="@null"
-                tools:src="@drawable/ic_action_measure_point"
-                android:visibility="gone"/>
+                android:visibility="gone"
+                tools:src="@drawable/ic_action_measure_point"/>
 
             <ImageView
                 android:id="@+id/up_down_button"
@@ -104,8 +104,8 @@
                 android:layout_marginStart="8dp"
                 android:layout_toEndOf="@id/move_point_icon"
                 android:layout_toRightOf="@id/move_point_icon"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"
                 android:text="@string/move_point"
+                android:textAppearance="@style/TextAppearance.ListItemTitle"
                 android:visibility="gone"/>
         </RelativeLayout>
 
@@ -141,37 +141,53 @@
             android:layout_width="match_parent"
             android:layout_height="52dp">
 
-            <ImageButton
-                android:id="@+id/undo_point_button"
+            <net.osmand.plus.widgets.TextViewEx
+                android:id="@+id/options_button"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
+                android:layout_height="match_parent"
                 android:background="?attr/selectableItemBackground"
-                android:paddingBottom="14dp"
+                android:gravity="center_vertical"
                 android:paddingEnd="12dp"
                 android:paddingLeft="16dp"
                 android:paddingRight="12dp"
                 android:paddingStart="16dp"
-                android:paddingTop="14dp"
-                tools:src="@drawable/ic_action_undo_dark"/>
+                android:text="@string/shared_string_options"
+                android:textColor="?attr/color_dialog_buttons"
+                osmand:textAllCapsCompat="true"
+                osmand:typeface="@string/font_roboto_medium"/>
 
-            <ImageButton
-                android:id="@+id/redo_point_button"
+            <LinearLayout
+                android:id="@+id/redo_undo_container"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toEndOf="@id/undo_point_button"
-                android:layout_toRightOf="@id/undo_point_button"
-                android:background="?attr/selectableItemBackground"
-                android:paddingBottom="14dp"
-                android:paddingEnd="16dp"
-                android:paddingLeft="12dp"
-                android:paddingRight="16dp"
-                android:paddingStart="12dp"
-                android:paddingTop="14dp"
-                tools:src="@drawable/ic_action_redo_dark"/>
+                android:layout_height="match_parent"
+                android:layout_centerHorizontal="true">
+
+                <ImageButton
+                    android:id="@+id/undo_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:paddingBottom="14dp"
+                    android:paddingEnd="12dp"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="12dp"
+                    android:paddingStart="16dp"
+                    android:paddingTop="14dp"
+                    tools:src="@drawable/ic_action_undo_dark"/>
+
+                <ImageButton
+                    android:id="@+id/redo_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:paddingBottom="14dp"
+                    android:paddingEnd="16dp"
+                    android:paddingLeft="12dp"
+                    android:paddingRight="16dp"
+                    android:paddingStart="12dp"
+                    android:paddingTop="14dp"
+                    tools:src="@drawable/ic_action_redo_dark"/>
+            </LinearLayout>
 
             <Button
                 android:id="@+id/add_point_button"
@@ -213,19 +229,19 @@
 
             <net.osmand.plus.widgets.TextViewEx
                 android:id="@+id/cancel_point_button"
-                android:gravity="center_vertical"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:background="?attr/selectableItemBackground"
+                android:gravity="center_vertical"
                 android:paddingEnd="12dp"
                 android:paddingLeft="16dp"
                 android:paddingRight="12dp"
                 android:paddingStart="16dp"
                 android:text="@string/shared_string_cancel"
                 android:textColor="?attr/color_dialog_buttons"
+                android:visibility="gone"
                 osmand:textAllCapsCompat="true"
-                osmand:typeface="@string/font_roboto_medium"
-                android:visibility="gone"/>
+                osmand:typeface="@string/font_roboto_medium"/>
         </RelativeLayout>
 
     </LinearLayout>
diff --git a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
index 05da9bd3d5..0211d2cec7 100644
--- a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
@@ -197,7 +197,7 @@
             android:layout_gravity="center"
             android:text="@string/shared_string_cancel"
             android:textAllCaps="true"
-            android:textColor="@color/dashboard_general_button_text_light"
+            android:textColor="?attr/color_dialog_buttons"
             android:textSize="14sp"
             android:textStyle="bold"/>
     </FrameLayout>
diff --git a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
index bd769dc4ac..068d513c30 100644
--- a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
@@ -51,13 +51,12 @@
         android:background="?attr/selectableItemBackground">
 
         <TextView
-            android:id="@+id/cancel_row_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:text="@string/shared_string_cancel"
             android:textAllCaps="true"
-            android:textColor="@color/dashboard_general_button_text_light"
+            android:textColor="?attr/color_dialog_buttons"
             android:textSize="14sp"
             android:textStyle="bold"/>
     </FrameLayout>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 9e975f9624..fa2dc57cec 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -23,7 +23,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -56,7 +55,6 @@ import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
 import net.osmand.plus.widgets.IconPopupMenu;
-import net.osmand.plus.widgets.TextViewEx;
 
 import java.io.File;
 import java.text.MessageFormat;
@@ -134,7 +132,7 @@ public class MeasurementToolFragment extends Fragment {
 		upDownBtn = (ImageView) mainView.findViewById(R.id.up_down_button);
 		upDownBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
 
-		((TextViewEx) mainView.findViewById(R.id.cancel_point_button)).setOnClickListener(new View.OnClickListener() {
+		mainView.findViewById(R.id.cancel_point_button).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				cancelMovePointMode();
@@ -152,13 +150,19 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		});
 
-		((Button) mainView.findViewById(R.id.apply_point_button))
-				.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View view) {
-						applyMovePointMode();
-					}
-				});
+		mainView.findViewById(R.id.apply_point_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				applyMovePointMode();
+			}
+		});
+
+		mainView.findViewById(R.id.options_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				Toast.makeText(getActivity(), "options", Toast.LENGTH_SHORT).show();
+			}
+		});
 
 		undoBtn = ((ImageButton) mainView.findViewById(R.id.undo_point_button));
 		redoBtn = ((ImageButton) mainView.findViewById(R.id.redo_point_button));
@@ -413,6 +417,7 @@ public class MeasurementToolFragment extends Fragment {
 				R.id.measurement_distance_text_view,
 				R.id.measurement_points_text_view,
 				R.id.up_down_button,
+				R.id.options_button,
 				R.id.undo_point_button,
 				R.id.redo_point_button,
 				R.id.add_point_button);
@@ -435,6 +440,7 @@ public class MeasurementToolFragment extends Fragment {
 				R.id.measurement_distance_text_view,
 				R.id.measurement_points_text_view,
 				R.id.up_down_button,
+				R.id.options_button,
 				R.id.undo_point_button,
 				R.id.redo_point_button,
 				R.id.add_point_button);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index a61f8839da..b1492ceb0c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -4,7 +4,6 @@ import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
 import android.util.DisplayMetrics;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -36,10 +35,7 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
 		final View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_snap_to_road_bottom_sheet_dialog, container);
-		if (nightMode) {
-			((TextView) view.findViewById(R.id.cancel_row_text))
-					.setTextColor(ContextCompat.getColor(getActivity(), R.color.dashboard_general_button_text_dark));
-		}
+
 		view.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {

From 3ab0dee4b036588e2ff43ea6af237d91b0c7861d Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 11 Aug 2017 15:21:58 +0300
Subject: [PATCH 067/174] Add options menu

---
 .../fragment_options_bottom_sheet_dialog.xml  |  2 +
 .../MeasurementToolFragment.java              | 49 ++++++++++-
 .../OptionsBottomSheetDialogFragment.java     | 84 ++++++++++++++++++-
 3 files changed, 132 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
index 0211d2cec7..4467cc6df2 100644
--- a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
@@ -17,6 +17,7 @@
         android:textAppearance="@style/TextAppearance.ListItemTitle"/>
 
     <RelativeLayout
+        android:id="@+id/snap_to_road_row"
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="?attr/selectableItemBackground"
@@ -151,6 +152,7 @@
         android:background="?attr/dashboard_divider"/>
 
     <RelativeLayout
+        android:id="@+id/clear_all_row"
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="?attr/selectableItemBackground"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index fa2dc57cec..6707ac0dac 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -160,7 +160,54 @@ public class MeasurementToolFragment extends Fragment {
 		mainView.findViewById(R.id.options_button).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				Toast.makeText(getActivity(), "options", Toast.LENGTH_SHORT).show();
+				OptionsBottomSheetDialogFragment fragment = new OptionsBottomSheetDialogFragment();
+				fragment.setOptionsOnClickListener(new OptionsBottomSheetDialogFragment.OptionsOnClickListener() {
+					@Override
+					public void snapToRoadOnCLick() {
+						SnapToRoadBottomSheetDialogFragment fragment = new SnapToRoadBottomSheetDialogFragment();
+						fragment.show(mapActivity.getSupportFragmentManager(), SnapToRoadBottomSheetDialogFragment.TAG);
+					}
+
+					@Override
+					public void saveAsNewSegmentOnClick() {
+						if (measurementLayer.getPointsCount() > 0) {
+							saveAsNewSegment(mapActivity);
+						} else {
+							Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
+						}
+					}
+
+					@Override
+					public void saveAsNewTrackOnClick() {
+						if (measurementLayer.getPointsCount() > 0) {
+							saveAsGpxOnClick(mapActivity);
+						} else {
+							Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
+						}
+					}
+
+					@Override
+					public void addToTheTrackOnClick() {
+						if (measurementLayer.getPointsCount() > 0) {
+//										showAddSegmentDialog(mapActivity);
+						} else {
+							Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
+						}
+					}
+
+					@Override
+					public void clearAllOnClick() {
+						commandManager.execute(new ClearPointsCommand(measurementLayer));
+						if (pointsListOpened) {
+							hidePointsList();
+						}
+						disable(redoBtn, upDownBtn);
+						updateText();
+						saved = false;
+					}
+				});
+				fragment.setAddLineMode(newGpxLine != null);
+				fragment.show(mapActivity.getSupportFragmentManager(), OptionsBottomSheetDialogFragment.TAG);
 			}
 		});
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
index fb2749fb6a..11b21dd59f 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@@ -15,6 +15,17 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 
 	public final static String TAG = "OptionsBottomSheetDialogFragment";
 
+	private OptionsOnClickListener listener;
+	private boolean addLineMode;
+
+	public void setOptionsOnClickListener(OptionsOnClickListener listener) {
+		this.listener = listener;
+	}
+
+	public void setAddLineMode(boolean addLineMode) {
+		this.addLineMode = addLineMode;
+	}
+
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -24,9 +35,65 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_options_bottom_sheet_dialog, null);
 
 		((ImageView) mainView.findViewById(R.id.snap_to_road_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_snap_to_road));
-		((ImageView) mainView.findViewById(R.id.save_as_new_track_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_polygom_dark));
-		((ImageView) mainView.findViewById(R.id.add_to_the_track_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_split_interval));
 		((ImageView) mainView.findViewById(R.id.clear_all_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_reset_to_default_dark));
+		if (!addLineMode) {
+			((ImageView) mainView.findViewById(R.id.save_as_new_track_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_polygom_dark));
+			((ImageView) mainView.findViewById(R.id.add_to_the_track_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_split_interval));
+		} else {
+			mainView.findViewById(R.id.save_as_new_track_row).setVisibility(View.GONE);
+			mainView.findViewById(R.id.add_to_the_track_row).setVisibility(View.GONE);
+			mainView.findViewById(R.id.save_as_new_segment_row).setVisibility(View.VISIBLE);
+			((ImageView) mainView.findViewById(R.id.save_as_new_segment_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_polygom_dark));
+		}
+
+		mainView.findViewById(R.id.snap_to_road_row).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (listener != null) {
+					listener.snapToRoadOnCLick();
+				}
+				dismiss();
+			}
+		});
+		mainView.findViewById(R.id.clear_all_row).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (listener != null) {
+					listener.clearAllOnClick();
+				}
+				dismiss();
+			}
+		});
+		if (!addLineMode) {
+			mainView.findViewById(R.id.save_as_new_track_row).setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					if (listener != null) {
+						listener.saveAsNewTrackOnClick();
+					}
+					dismiss();
+				}
+			});
+			mainView.findViewById(R.id.add_to_the_track_row).setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					if (listener != null) {
+						listener.addToTheTrackOnClick();
+					}
+					dismiss();
+				}
+			});
+		} else {
+			mainView.findViewById(R.id.save_as_new_segment_row).setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					if (listener != null) {
+						listener.saveAsNewSegmentOnClick();
+					}
+					dismiss();
+				}
+			});
+		}
 		mainView.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
@@ -36,4 +103,17 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 
 		return mainView;
 	}
+
+	interface OptionsOnClickListener {
+
+		void snapToRoadOnCLick();
+
+		void saveAsNewSegmentOnClick();
+
+		void saveAsNewTrackOnClick();
+
+		void addToTheTrackOnClick();
+
+		void clearAllOnClick();
+	}
 }

From 468d1eb4e2ca9fb485011bd3a7c4218b75c70542 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 11 Aug 2017 15:27:28 +0300
Subject: [PATCH 068/174] Display categories from gpx waypoints

---
 OsmAnd/src/net/osmand/plus/GPXUtilities.java  | 14 ++++
 .../editors/PointEditorFragment.java          |  6 +-
 .../editors/RtePtEditorFragment.java          |  7 ++
 .../editors/SelectCategoryDialogFragment.java | 82 ++++++++++++-------
 .../editors/WptPtEditorFragment.java          | 11 +++
 5 files changed, 90 insertions(+), 30 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index bf37c31cb1..315896d9ad 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -6,6 +6,7 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.support.annotation.ColorInt;
+import android.text.TextUtils;
 
 import net.osmand.Location;
 import net.osmand.PlatformUtil;
@@ -1034,6 +1035,19 @@ public class GPXUtilities {
 			}
 			return count;
 		}
+
+		public List<String> getWaypointCategories() {
+			List<String> categories = new ArrayList<>();
+			for (WptPt pt : points) {
+				String category = pt.category;
+				if (!TextUtils.isEmpty(category)) {
+					if (!categories.contains(category)) {
+						categories.add(category);
+					}
+				}
+			}
+			return categories;
+		}
 	}
 
     public static String asString(GPXFile file, OsmandApplication ctx) {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
index 15f9925d72..0c532d421d 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
@@ -118,7 +118,7 @@ public abstract class PointEditorFragment extends Fragment {
 			public boolean onTouch(final View v, MotionEvent event) {
 				if (event.getAction() == MotionEvent.ACTION_UP) {
 					DialogFragment dialogFragment =
-							SelectCategoryDialogFragment.createInstance(getEditor().getFragmentTag());
+							createSelectCategoryDialog();
 					dialogFragment.show(getChildFragmentManager(), SelectCategoryDialogFragment.TAG);
 					return true;
 				}
@@ -176,6 +176,10 @@ public abstract class PointEditorFragment extends Fragment {
 		return view;
 	}
 
+	protected DialogFragment createSelectCategoryDialog() {
+		return SelectCategoryDialogFragment.createInstance(getEditor().getFragmentTag());
+	}
+
 	public Drawable getRowIcon(int iconId) {
 		IconsCache iconsCache = getMyApplication().getIconsCache();
 		return iconsCache.getIcon(iconId,
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/RtePtEditorFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/RtePtEditorFragment.java
index 250faf4d24..97ead03fae 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/RtePtEditorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/RtePtEditorFragment.java
@@ -1,5 +1,7 @@
 package net.osmand.plus.mapcontextmenu.editors;
 
+import android.support.v4.app.DialogFragment;
+
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
@@ -16,6 +18,11 @@ public class RtePtEditorFragment extends WptPtEditorFragment {
 		return getMapActivity().getResources().getString(R.string.save_route_point);
 	}
 
+	@Override
+	protected DialogFragment createSelectCategoryDialog() {
+		return SelectCategoryDialogFragment.createInstance(getEditor().getFragmentTag());
+	}
+
 	public static void showInstance(final MapActivity mapActivity) {
 		RtePtEditor editor = mapActivity.getContextMenu().getRtePtPointEditor();
 		//int slideInAnim = editor.getSlideInAnimation();
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/SelectCategoryDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/SelectCategoryDialogFragment.java
index 6a0587cfd2..87ed37f512 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/SelectCategoryDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/SelectCategoryDialogFragment.java
@@ -15,6 +15,7 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 
 import net.osmand.plus.FavouritesDbHelper;
+import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.IconsCache;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
@@ -40,6 +41,15 @@ public class SelectCategoryDialogFragment extends DialogFragment {
 
 	private String editorTag;
 	private CategorySelectionListener selectionListener;
+	private GPXFile gpxFile;
+
+	public void setGpxFile(GPXFile gpxFile) {
+		this.gpxFile = gpxFile;
+	}
+
+	public GPXFile getGpxFile() {
+		return gpxFile;
+	}
 
 	@NonNull
 	@Override
@@ -58,36 +68,16 @@ public class SelectCategoryDialogFragment extends DialogFragment {
 		LinearLayout ll = (LinearLayout) v.findViewById(R.id.list_container);
 
 		final FavouritesDbHelper helper = ((OsmandApplication) getActivity().getApplication()).getFavorites();
-		List<FavouritesDbHelper.FavoriteGroup> gs = helper.getFavoriteGroups();
-		for (final FavouritesDbHelper.FavoriteGroup category : gs) {
-			View itemView = getActivity().getLayoutInflater().inflate(R.layout.favorite_category_dialog_item, null);
-			Button button = (Button)itemView.findViewById(R.id.button);
-			if (category.color != 0) {
-				button.setCompoundDrawablesWithIntrinsicBounds(getIcon(getActivity(), R.drawable.ic_action_folder, category.color), null, null, null);
-			} else {
-				button.setCompoundDrawablesWithIntrinsicBounds(getIcon(getActivity(), R.drawable.ic_action_folder, getResources().getColor(R.color.color_favorite)), null, null, null);
+		if (gpxFile != null) {
+			List<String> categories = gpxFile.getWaypointCategories();
+			for (final String category : categories) {
+				addCategory(ll, category, 0);
+			}
+		} else {
+			List<FavouritesDbHelper.FavoriteGroup> gs = helper.getFavoriteGroups();
+			for (final FavouritesDbHelper.FavoriteGroup category : gs) {
+				addCategory(ll, category.name, category.color);
 			}
-			button.setCompoundDrawablePadding(dpToPx(15f));
-			String name = category.name.length() == 0 ? getString(R.string.shared_string_favorites) : category.name;
-			button.setText(name);
-			button.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-
-					PointEditor editor = ((MapActivity) getActivity()).getContextMenu().getPointEditor(editorTag);
-
-					if (editor != null) {
-						editor.setCategory(category.name);
-					}
-
-					if (selectionListener != null) {
-						selectionListener.onCategorySelected(category.name, category.color);
-					}
-
-					dismiss();
-				}
-			});
-			ll.addView(itemView);
 		}
 		View itemView = getActivity().getLayoutInflater().inflate(R.layout.favorite_category_dialog_item, null);
 		Button button = (Button)itemView.findViewById(R.id.button);
@@ -111,6 +101,40 @@ public class SelectCategoryDialogFragment extends DialogFragment {
 		return builder.create();
 	}
 
+	private void addCategory(LinearLayout ll, final String categoryName, final int categoryColor) {
+		View itemView = getActivity().getLayoutInflater().inflate(R.layout.favorite_category_dialog_item, null);
+		Button button = (Button)itemView.findViewById(R.id.button);
+		if (categoryColor != 0) {
+			button.setCompoundDrawablesWithIntrinsicBounds(getIcon(getActivity(), R.drawable.ic_action_folder, categoryColor), null, null, null);
+		} else {
+			button.setCompoundDrawablesWithIntrinsicBounds(getIcon(getActivity(), R.drawable.ic_action_folder, getResources().getColor(R.color.color_favorite)), null, null, null);
+		}
+		button.setCompoundDrawablePadding(dpToPx(15f));
+		String name = categoryName.length() == 0 ? getString(R.string.shared_string_favorites) : categoryName;
+		button.setText(name);
+		button.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+
+				PointEditor editor = ((MapActivity) getActivity()).getContextMenu().getPointEditor(editorTag);
+
+				if (editor != null) {
+					editor.setCategory(categoryName);
+					if (gpxFile != null && editor instanceof WptPtEditor) {
+						((WptPtEditor) editor).getWptPt().category = categoryName;
+					}
+				}
+
+				if (selectionListener != null) {
+					selectionListener.onCategorySelected(categoryName, categoryColor);
+				}
+
+				dismiss();
+			}
+		});
+		ll.addView(itemView);
+	}
+
 	public static SelectCategoryDialogFragment createInstance(String editorTag) {
 		SelectCategoryDialogFragment fragment = new SelectCategoryDialogFragment();
 		Bundle bundle = new Bundle();
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java
index 9bc3edb6b7..770213aa8f 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java
@@ -7,6 +7,7 @@ import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.app.DialogFragment;
 import android.view.View;
 
 import net.osmand.data.LatLon;
@@ -47,6 +48,16 @@ public class WptPtEditorFragment extends PointEditorFragment {
 		defaultColor = getResources().getColor(R.color.gpx_color_point);
 	}
 
+	@Override
+	protected DialogFragment createSelectCategoryDialog() {
+		SelectCategoryDialogFragment selectCategoryDialogFragment = SelectCategoryDialogFragment.createInstance(getEditor().getFragmentTag());
+		GPXFile gpx = editor.getGpxFile();
+		if (gpx != null) {
+			selectCategoryDialogFragment.setGpxFile(gpx);
+		}
+		return selectCategoryDialogFragment;
+	}
+
 	protected void assignEditor() {
 		editor = getMapActivity().getContextMenu().getWptPtPointEditor();
 	}

From c32e6d46812c95711e0c54fd9848353dcdbafca6 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 11 Aug 2017 15:51:53 +0300
Subject: [PATCH 069/174] Change title in add line mode

---
 .../plus/measurementtool/MeasurementToolFragment.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 6707ac0dac..0d931e0f0d 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -284,7 +284,11 @@ public class MeasurementToolFragment extends Fragment {
 
 		if (portrait) {
 			toolBarController = new MeasurementToolBarController();
-			toolBarController.setTitle(getString(R.string.measurement_tool_action_bar));
+			if (newGpxLine != null) {
+				toolBarController.setTitle(getString(R.string.add_line));
+			} else {
+				toolBarController.setTitle(getString(R.string.measurement_tool_action_bar));
+			}
 			toolBarController.setOnBackButtonClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {

From c1955d2b7d7b6e504ef5ea1f5fbe7d8e909fae52 Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 11 Aug 2017 16:25:01 +0300
Subject: [PATCH 070/174] Remove menu from action bar

---
 OsmAnd/res/menu/measurement_tool_menu.xml     | 28 --------
 .../MeasurementToolFragment.java              | 70 +------------------
 2 files changed, 2 insertions(+), 96 deletions(-)
 delete mode 100644 OsmAnd/res/menu/measurement_tool_menu.xml

diff --git a/OsmAnd/res/menu/measurement_tool_menu.xml b/OsmAnd/res/menu/measurement_tool_menu.xml
deleted file mode 100644
index dd2861907e..0000000000
--- a/OsmAnd/res/menu/measurement_tool_menu.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/action_save_as_new_segment"
-        android:icon="@drawable/ic_action_polygom_dark"
-        android:title="@string/save_as_new_segment"
-        android:visible="false"/>
-
-    <item
-        android:id="@+id/action_save_as_gpx"
-        android:icon="@drawable/ic_action_polygom_dark"
-        android:title="@string/shared_string_save_as_gpx"/>
-
-    <item
-        android:id="@+id/action_snap_to_road"
-        android:icon="@drawable/ic_action_snap_to_road"
-        android:title="@string/snap_to_road"/>
-
-    <item
-        android:id="@+id/action_add_segment_to_track"
-        android:icon="@drawable/ic_action_polygom_dark"
-        android:title="@string/add_segment_to_the_track"/>
-
-    <item
-        android:id="@+id/action_clear_all"
-        android:icon="@drawable/ic_action_reset_to_default_dark"
-        android:title="@string/shared_string_clear_all"/>
-</menu>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 0d931e0f0d..c2406472e6 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -19,8 +19,6 @@ import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
@@ -54,7 +52,6 @@ import net.osmand.plus.measurementtool.command.ReorderPointCommand;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
-import net.osmand.plus.widgets.IconPopupMenu;
 
 import java.io.File;
 import java.text.MessageFormat;
@@ -298,70 +295,7 @@ public class MeasurementToolFragment extends Fragment {
 			toolBarController.setOnCloseButtonClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
-					IconPopupMenu popup = new IconPopupMenu(mapActivity, mapActivity.findViewById(R.id.widget_top_bar_close_button));
-					popup.getMenuInflater().inflate(R.menu.measurement_tool_menu, popup.getMenu());
-					final Menu menu = popup.getMenu();
-					IconsCache ic = mapActivity.getMyApplication().getIconsCache();
-					MenuItem saveAsNewSegmentMenuItem = menu.findItem(R.id.action_save_as_new_segment);
-					MenuItem saveAsGpxTrack = menu.findItem(R.id.action_save_as_gpx);
-					MenuItem addSegmentToTrack = menu.findItem(R.id.action_add_segment_to_track);
-					addSegmentToTrack.setIcon(ic.getThemedIcon(R.drawable.ic_action_polygom_dark));
-					saveAsNewSegmentMenuItem.setIcon(ic.getThemedIcon(R.drawable.ic_action_polygom_dark));
-					saveAsGpxTrack.setIcon(ic.getThemedIcon(R.drawable.ic_action_polygom_dark));
-					if (newGpxLine != null) {
-						saveAsNewSegmentMenuItem.setVisible(true);
-						saveAsGpxTrack.setVisible(false);
-						addSegmentToTrack.setVisible(false);
-					}
-					menu.findItem(R.id.action_snap_to_road).setIcon(ic.getThemedIcon(R.drawable.ic_action_snap_to_road));
-					menu.findItem(R.id.action_clear_all).setIcon(ic.getThemedIcon(R.drawable.ic_action_reset_to_default_dark));
-					popup.setOnMenuItemClickListener(new IconPopupMenu.OnMenuItemClickListener() {
-						@Override
-						public boolean onMenuItemClick(MenuItem menuItem) {
-							switch (menuItem.getItemId()) {
-								case R.id.action_save_as_new_segment:
-									if (measurementLayer.getPointsCount() > 0) {
-										saveAsNewSegment(mapActivity);
-									} else {
-										Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
-									}
-									return true;
-
-								case R.id.action_add_segment_to_track:
-									if (measurementLayer.getPointsCount() > 0) {
-//										showAddSegmentDialog(mapActivity);
-									} else {
-										Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
-									}
-									return true;
-
-								case R.id.action_save_as_gpx:
-									if (measurementLayer.getPointsCount() > 0) {
-										saveAsGpxOnClick(mapActivity);
-									} else {
-										Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
-									}
-									return true;
-
-								case R.id.action_snap_to_road:
-									SnapToRoadBottomSheetDialogFragment fragment = new SnapToRoadBottomSheetDialogFragment();
-									fragment.show(mapActivity.getSupportFragmentManager(), SnapToRoadBottomSheetDialogFragment.TAG);
-									return true;
-
-								case R.id.action_clear_all:
-									commandManager.execute(new ClearPointsCommand(measurementLayer));
-									if (pointsListOpened) {
-										hidePointsList();
-									}
-									disable(redoBtn, upDownBtn);
-									updateText();
-									saved = false;
-									return true;
-							}
-							return false;
-						}
-					});
-					popup.show();
+					// Pasha, do your stuff here :)
 				}
 			});
 			mapActivity.showTopToolbar(toolBarController);
@@ -893,7 +827,7 @@ public class MeasurementToolFragment extends Fragment {
 			setDescrTextClrIds(R.color.primary_text_dark, R.color.primary_text_dark);
 			setBgIds(R.drawable.gradient_toolbar, R.drawable.gradient_toolbar,
 					R.drawable.gradient_toolbar, R.drawable.gradient_toolbar);
-			setCloseBtnIconIds(R.drawable.ic_overflow_menu_white, R.drawable.ic_overflow_menu_white);
+			setCloseBtnIconIds(R.drawable.ic_overflow_menu_white, R.drawable.ic_overflow_menu_white); // Pasha, change this icon :)
 			setBackBtnIconIds(R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_dark);
 			setSingleLineTitle(false);
 		}

From 6ecb7572b1d2b87b979de47e53dd1f5aa102598d Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 11 Aug 2017 16:27:55 +0300
Subject: [PATCH 071/174] Fix exiting from add gpx mode

---
 OsmAnd/src/net/osmand/plus/activities/MapActivity.java | 8 ++++++++
 OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index fd9e46398a..24a0d625e9 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -509,6 +509,9 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 			mapContextMenu.close();
 			return;
 		}
+		if (getMapLayers().getContextMenuLayer().isInAddGpxPointMode()) {
+			quitAddGpxPointMode();
+		}
 		if (prevActivityIntent != null && getSupportFragmentManager().getBackStackEntryCount() == 0) {
 			prevActivityIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
 			LatLon loc = getMapLocation();
@@ -528,6 +531,11 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 
 	}
 
+	private void quitAddGpxPointMode() {
+		getMapLayers().getContextMenuLayer().getAddGpxPointBottomSheetHelper().hide();
+		getMapLayers().getContextMenuLayer().quitAddGpxPoint();
+	}
+
 	@Override
 	protected void onRestart() {
 		super.onRestart();
diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index 0f6dc6c72d..14902589be 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -449,7 +449,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		}
 	}
 
-	private void quitAddGpxPoint() {
+	public void quitAddGpxPoint() {
 		mInAddGpxPointMode = false;
 		mark(View.VISIBLE, R.id.map_ruler_layout,
 				R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);

From 4f85af5b10b6e5bbd7de34b69266050baa2fcc0f Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 11 Aug 2017 16:52:48 +0300
Subject: [PATCH 072/174] Add small changes

---
 .../res/layout/fragment_options_bottom_sheet_dialog.xml  | 8 +++++---
 .../OptionsBottomSheetDialogFragment.java                | 9 +++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
index 4467cc6df2..0debddbc7c 100644
--- a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/bg_color"
     android:orientation="vertical">
 
-    <TextView
+    <net.osmand.plus.widgets.TextViewEx
         android:layout_width="match_parent"
         android:layout_height="52dp"
         android:gravity="center_vertical"
         android:paddingEnd="16dp"
         android:paddingStart="16dp"
         android:text="@string/shared_string_options"
-        android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+        android:textAppearance="@style/TextAppearance.ListItemTitle"
+        osmand:typeface="@string/font_roboto_medium"/>
 
     <RelativeLayout
         android:id="@+id/snap_to_road_row"
@@ -197,7 +199,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/shared_string_cancel"
+            android:text="@string/shared_string_close"
             android:textAllCaps="true"
             android:textColor="?attr/color_dialog_buttons"
             android:textSize="14sp"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
index 11b21dd59f..2a1f814dfd 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@@ -1,6 +1,8 @@
 package net.osmand.plus.measurementtool;
 
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -8,6 +10,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
+import net.osmand.AndroidUtils;
 import net.osmand.plus.R;
 import net.osmand.plus.base.BottomSheetDialogFragment;
 
@@ -33,6 +36,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_options_bottom_sheet_dialog, null);
+		AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
 
 		((ImageView) mainView.findViewById(R.id.snap_to_road_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_snap_to_road));
 		((ImageView) mainView.findViewById(R.id.clear_all_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_reset_to_default_dark));
@@ -104,6 +108,11 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 		return mainView;
 	}
 
+	@Override
+	protected Drawable getContentIcon(@DrawableRes int id) {
+		return getIcon(id, getMyApplication().getSettings().isLightContent() ? R.color.on_map_icon_color : 0);
+	}
+
 	interface OptionsOnClickListener {
 
 		void snapToRoadOnCLick();

From 6714afb316ef7ec186b1f6d25ba547babc9811ef Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 11 Aug 2017 17:35:36 +0300
Subject: [PATCH 073/174] Add borders for the controls

---
 .../res/layout/fragment_measurement_tool.xml  | 94 +++++++++++--------
 .../MeasurementToolFragment.java              | 16 +---
 2 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index b11908c5a1..fbd84bddd8 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -137,30 +137,39 @@
                 android:src="@drawable/bg_shadow_onmap"/>
         </FrameLayout>
 
-        <RelativeLayout
+        <LinearLayout
+            android:id="@+id/measure_mode_controls"
             android:layout_width="match_parent"
             android:layout_height="52dp">
 
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/options_button"
-                android:layout_width="wrap_content"
+            <FrameLayout
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center_vertical"
-                android:paddingEnd="12dp"
-                android:paddingLeft="16dp"
-                android:paddingRight="12dp"
-                android:paddingStart="16dp"
-                android:text="@string/shared_string_options"
-                android:textColor="?attr/color_dialog_buttons"
-                osmand:textAllCapsCompat="true"
-                osmand:typeface="@string/font_roboto_medium"/>
+                android:layout_weight="1">
+
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/options_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="?attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:maxLines="1"
+                    android:paddingEnd="12dp"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="12dp"
+                    android:paddingStart="16dp"
+                    android:text="@string/shared_string_options"
+                    android:textColor="?attr/color_dialog_buttons"
+                    osmand:textAllCapsCompat="true"
+                    osmand:typeface="@string/font_roboto_medium"/>
+            </FrameLayout>
 
             <LinearLayout
                 android:id="@+id/redo_undo_container"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_centerHorizontal="true">
+                android:layout_weight="1"
+                android:gravity="center_horizontal">
 
                 <ImageButton
                     android:id="@+id/undo_point_button"
@@ -189,24 +198,37 @@
                     tools:src="@drawable/ic_action_redo_dark"/>
             </LinearLayout>
 
-            <Button
-                android:id="@+id/add_point_button"
-                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:minHeight="36dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:text="@string/shared_string_add"
-                android:textColor="@color/color_white"/>
+            <FrameLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1">
+
+                <Button
+                    android:id="@+id/add_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    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:maxLines="1"
+                    android:minHeight="36dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:text="@string/shared_string_add"
+                    android:textColor="@color/color_white"/>
+            </FrameLayout>
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/move_point_mode_controls"
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            android:visibility="gone">
 
             <Button
                 android:id="@+id/apply_point_button"
@@ -224,8 +246,7 @@
                 android:paddingLeft="8dp"
                 android:paddingRight="8dp"
                 android:text="@string/shared_string_apply"
-                android:textColor="@color/color_white"
-                android:visibility="gone"/>
+                android:textColor="@color/color_white"/>
 
             <net.osmand.plus.widgets.TextViewEx
                 android:id="@+id/cancel_point_button"
@@ -239,7 +260,6 @@
                 android:paddingStart="16dp"
                 android:text="@string/shared_string_cancel"
                 android:textColor="?attr/color_dialog_buttons"
-                android:visibility="gone"
                 osmand:textAllCapsCompat="true"
                 osmand:typeface="@string/font_roboto_medium"/>
         </RelativeLayout>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index c2406472e6..f7d68147a6 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -402,15 +402,11 @@ public class MeasurementToolFragment extends Fragment {
 				R.id.measurement_distance_text_view,
 				R.id.measurement_points_text_view,
 				R.id.up_down_button,
-				R.id.options_button,
-				R.id.undo_point_button,
-				R.id.redo_point_button,
-				R.id.add_point_button);
+				R.id.measure_mode_controls);
 		mark(View.VISIBLE,
 				R.id.move_point_icon,
 				R.id.move_point_text,
-				R.id.cancel_point_button,
-				R.id.apply_point_button);
+				R.id.move_point_mode_controls);
 	}
 
 	private void exitMovePointMode() {
@@ -418,17 +414,13 @@ public class MeasurementToolFragment extends Fragment {
 		mark(View.GONE,
 				R.id.move_point_icon,
 				R.id.move_point_text,
-				R.id.cancel_point_button,
-				R.id.apply_point_button);
+				R.id.move_point_mode_controls);
 		mark(View.VISIBLE,
 				R.id.ruler_icon,
 				R.id.measurement_distance_text_view,
 				R.id.measurement_points_text_view,
 				R.id.up_down_button,
-				R.id.options_button,
-				R.id.undo_point_button,
-				R.id.redo_point_button,
-				R.id.add_point_button);
+				R.id.measure_mode_controls);
 	}
 
 	private void hidePointsListIfNoPoints() {

From bad41b8c6688fe9a754fc488be8d6be220317b41 Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 11 Aug 2017 18:07:50 +0300
Subject: [PATCH 074/174] Fix reordering bug

---
 .../plus/measurementtool/MeasurementToolFragment.java    | 2 +-
 .../measurementtool/command/ReorderPointCommand.java     | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index f7d68147a6..356c0254b1 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -334,7 +334,7 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			public void onDragEnded(RecyclerView.ViewHolder holder) {
 				toPosition = holder.getAdapterPosition();
-				if (toPosition != fromPosition) {
+				if (toPosition >= 0 && fromPosition >= 0 && toPosition != fromPosition) {
 					commandManager.execute(new ReorderPointCommand(measurementLayer, fromPosition, toPosition));
 					adapter.notifyDataSetChanged();
 					disable(redoBtn);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
index 1189676555..0e41a22d34 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
@@ -32,14 +32,7 @@ public class ReorderPointCommand implements Command {
 	}
 
 	private void swap() {
-		// todo: fix exception
-		try {
-			Collections.swap(measurementLayer.getMeasurementPoints(), from, to);
-		} catch (Exception e) {
-			// index out of bounds
-			// an exception occurs when to == -1 basically
-			// but maybe from == measurementPoints.size() sometimes so there is an exception
-		}
+		Collections.swap(measurementLayer.getMeasurementPoints(), from, to);
 		measurementLayer.refreshMap();
 	}
 }

From 707a918d05ed67674257114333912bd807583050 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 11 Aug 2017 18:08:45 +0300
Subject: [PATCH 075/174] Add save button

---
 OsmAnd/res/layout-land/map_hud_top.xml        | 21 +++++++++++++++++++
 OsmAnd/res/layout/map_hud_top.xml             | 21 +++++++++++++++++++
 .../MeasurementToolFragment.java              | 20 ++++++++++++------
 .../mapwidgets/MapInfoWidgetsFactory.java     | 14 +++++++++++++
 4 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/res/layout-land/map_hud_top.xml b/OsmAnd/res/layout-land/map_hud_top.xml
index e651de0368..d21fb04b07 100644
--- a/OsmAnd/res/layout-land/map_hud_top.xml
+++ b/OsmAnd/res/layout-land/map_hud_top.xml
@@ -3,6 +3,7 @@
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:orientation="vertical">
 
     <FrameLayout
@@ -457,6 +458,26 @@
                         android:contentDescription="@string/shared_string_close"
                         android:src="@drawable/ic_action_remove_dark"/>
 
+                    <net.osmand.plus.widgets.TextViewEx
+                        android:id="@+id/widget_top_bar_save"
+                        android:layout_width="wrap_content"
+                        android:layout_height="56dp"
+                        android:background="@null"
+                        android:ellipsize="end"
+                        android:gravity="center_vertical"
+                        android:lines="1"
+                        android:paddingRight="16dp"
+                        android:paddingEnd="16dp"
+                        android:textAllCaps="true"
+                        android:singleLine="true"
+                        android:textColor="?android:textColorPrimary"
+                        android:textSize="@dimen/default_desc_text_size"
+                        android:contentDescription="@string/shared_string_save"
+                        android:text="@string/shared_string_save"
+                        tools:visibility="visible"
+                        android:visibility="gone"
+                        osmand:typeface="@string/font_roboto_medium"/>
+
                 </LinearLayout>
 
                 <LinearLayout
diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index 5b1ac584ba..3026bd5264 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -3,6 +3,7 @@
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:orientation="vertical">
 
     <!-- TOP ROW -->
@@ -234,6 +235,26 @@
                     android:contentDescription="@string/shared_string_close"
                     android:src="@drawable/ic_action_remove_dark"/>
 
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/widget_top_bar_save"
+                    android:layout_width="wrap_content"
+                    android:layout_height="56dp"
+                    android:background="@null"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:lines="1"
+                    android:paddingRight="16dp"
+                    android:paddingEnd="16dp"
+                    android:textAllCaps="true"
+                    android:singleLine="true"
+                    android:textColor="?android:textColorPrimary"
+                    android:textSize="@dimen/default_desc_text_size"
+                    android:contentDescription="@string/shared_string_save"
+                    android:text="@string/shared_string_save"
+                    tools:visibility="visible"
+                    android:visibility="gone"
+                    osmand:typeface="@string/font_roboto_medium"/>
+
             </LinearLayout>
 
             <LinearLayout
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index f7d68147a6..b173cf782c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -280,7 +280,7 @@ public class MeasurementToolFragment extends Fragment {
 		enterMeasurementMode();
 
 		if (portrait) {
-			toolBarController = new MeasurementToolBarController();
+			toolBarController = new MeasurementToolBarController(newGpxLine);
 			if (newGpxLine != null) {
 				toolBarController.setTitle(getString(R.string.add_line));
 			} else {
@@ -292,10 +292,14 @@ public class MeasurementToolFragment extends Fragment {
 					showQuitDialog(false);
 				}
 			});
-			toolBarController.setOnCloseButtonClickListener(new View.OnClickListener() {
+			toolBarController.setOnSaveViewClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
-					// Pasha, do your stuff here :)
+					if (measurementLayer.getPointsCount() > 0) {
+						saveAsNewSegment(mapActivity);
+					} else {
+						Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
+					}
 				}
 			});
 			mapActivity.showTopToolbar(toolBarController);
@@ -810,16 +814,17 @@ public class MeasurementToolFragment extends Fragment {
 	}
 
 	private static class MeasurementToolBarController extends TopToolbarController {
+		private NewGpxLine newGpxLine;
 
-		MeasurementToolBarController() {
+		MeasurementToolBarController(NewGpxLine newGpxLine) {
 			super(MapInfoWidgetsFactory.TopToolbarControllerType.MEASUREMENT_TOOL);
+			this.newGpxLine = newGpxLine;
 			setBackBtnIconClrIds(0, 0);
-			setCloseBtnIconClrIds(0, 0);
 			setTitleTextClrIds(R.color.primary_text_dark, R.color.primary_text_dark);
 			setDescrTextClrIds(R.color.primary_text_dark, R.color.primary_text_dark);
 			setBgIds(R.drawable.gradient_toolbar, R.drawable.gradient_toolbar,
 					R.drawable.gradient_toolbar, R.drawable.gradient_toolbar);
-			setCloseBtnIconIds(R.drawable.ic_overflow_menu_white, R.drawable.ic_overflow_menu_white); // Pasha, change this icon :)
+			setCloseBtnVisible(false);
 			setBackBtnIconIds(R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_dark);
 			setSingleLineTitle(false);
 		}
@@ -828,6 +833,9 @@ public class MeasurementToolFragment extends Fragment {
 		public void updateToolbar(MapInfoWidgetsFactory.TopToolbarView view) {
 			super.updateToolbar(view);
 			view.getShadowView().setVisibility(View.GONE);
+			if (newGpxLine != null) {
+				view.getSaveView().setVisibility(View.VISIBLE);
+			}
 		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index d0911e299d..4b78628700 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -247,6 +247,7 @@ public class MapInfoWidgetsFactory {
 		OnClickListener onTitleClickListener;
 		OnClickListener onCloseButtonClickListener;
 		OnClickListener onRefreshButtonClickListener;
+		OnClickListener onSaveViewClickListener;
 
 		Runnable onCloseToolbarListener;
 
@@ -343,6 +344,10 @@ public class MapInfoWidgetsFactory {
 			this.onCloseButtonClickListener = onCloseButtonClickListener;
 		}
 
+		public void setOnSaveViewClickListener(OnClickListener onSaveViewClickListener) {
+			this.onSaveViewClickListener = onSaveViewClickListener;
+		}
+
 		public void setOnRefreshButtonClickListener(OnClickListener onRefreshButtonClickListener) {
 			this.onRefreshButtonClickListener = onRefreshButtonClickListener;
 		}
@@ -393,6 +398,7 @@ public class MapInfoWidgetsFactory {
 		private TextView descrView;
 		private ImageButton refreshButton;
 		private ImageButton closeButton;
+		private TextView saveView;
 		private View shadowView;
 		private boolean nightMode;
 
@@ -407,6 +413,7 @@ public class MapInfoWidgetsFactory {
 			refreshButton = (ImageButton) map.findViewById(R.id.widget_top_bar_refresh_button);
 			closeButton = (ImageButton) map.findViewById(R.id.widget_top_bar_close_button);
 			titleView = (TextView) map.findViewById(R.id.widget_top_bar_title);
+			saveView = (TextView) map.findViewById(R.id.widget_top_bar_save);
 			descrView = (TextView) map.findViewById(R.id.widget_top_bar_description);
 			shadowView = map.findViewById(R.id.widget_top_bar_shadow);
 			updateVisibility(false);
@@ -444,6 +451,10 @@ public class MapInfoWidgetsFactory {
 			return closeButton;
 		}
 
+		public TextView getSaveView() {
+			return saveView;
+		}
+
 		public ImageButton getRefreshButton() {
 			return refreshButton;
 		}
@@ -515,6 +526,7 @@ public class MapInfoWidgetsFactory {
 			topBarTitleLayout.setOnClickListener(controller.onTitleClickListener);
 			closeButton.setOnClickListener(controller.onCloseButtonClickListener);
 			refreshButton.setOnClickListener(controller.onRefreshButtonClickListener);
+			saveView.setOnClickListener(controller.onSaveViewClickListener);
 		}
 
 		public void updateInfo() {
@@ -553,6 +565,7 @@ public class MapInfoWidgetsFactory {
 				int descrColor = map.getResources().getColor(controller.descrTextClrDarkId);
 				titleView.setTextColor(titleColor);
 				descrView.setTextColor(descrColor);
+				saveView.setTextColor(titleColor);
 			} else {
 				topBarLayout.setBackgroundResource(AndroidUiHelper.isOrientationPortrait(map) ? controller.bgLightId : controller.bgLightLandId);
 				if (controller.backBtnIconLightId == 0) {
@@ -574,6 +587,7 @@ public class MapInfoWidgetsFactory {
 				int descrColor = map.getResources().getColor(controller.descrTextClrLightId);
 				titleView.setTextColor(titleColor);
 				descrView.setTextColor(descrColor);
+				saveView.setTextColor(titleColor);
 			}
 			if (controller.singleLineTitle) {
 				titleView.setSingleLine(true);

From 1392d73e0798675bdd32b1ca1adac192b7aa78ce Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 11 Aug 2017 18:32:59 +0300
Subject: [PATCH 076/174] Open track activity after saving

---
 .../MeasurementToolFragment.java              | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 374949aedf..bff9822ac2 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -553,14 +553,14 @@ public class MeasurementToolFragment extends Fragment {
 	}
 
 	private void saveNewGpx(File dir, String fileName, boolean checked) {
-		saveGpx(dir, fileName, checked, null);
+		saveGpx(dir, fileName, checked, null, false);
 	}
 
 	private void saveExistingGpx(GPXFile gpx, boolean showOnMap) {
-		saveGpx(null, null, showOnMap, gpx);
+		saveGpx(null, null, showOnMap, gpx, true);
 	}
 
-	private void saveGpx(final File dir, final String fileName, final boolean showOnMap, final GPXFile gpx) {
+	private void saveGpx(final File dir, final String fileName, final boolean showOnMap, final GPXFile gpx, final boolean openTrackActivity) {
 		new AsyncTask<Void, Void, String>() {
 
 			private ProgressDialog progressDialog;
@@ -624,19 +624,23 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			protected void onPostExecute(String warning) {
 				MapActivity activity = getMapActivity();
+				if (progressDialog != null && progressDialog.isShowing()) {
+					progressDialog.dismiss();
+				}
 				if (activity != null) {
+					activity.refreshMap();
 					if (warning == null) {
-						Toast.makeText(activity,
-								MessageFormat.format(getString(R.string.gpx_saved_sucessfully), toSave.getAbsolutePath()),
-								Toast.LENGTH_LONG).show();
 						saved = true;
+						if (openTrackActivity) {
+							dismiss(activity);
+						} else {
+							Toast.makeText(activity,
+									MessageFormat.format(getString(R.string.gpx_saved_sucessfully), toSave.getAbsolutePath()),
+									Toast.LENGTH_LONG).show();
+						}
 					} else {
 						Toast.makeText(activity, warning, Toast.LENGTH_LONG).show();
 					}
-					activity.refreshMap();
-				}
-				if (progressDialog != null && progressDialog.isShowing()) {
-					progressDialog.dismiss();
 				}
 			}
 		}.execute();

From 92a6e7932bafb3ad0fa8a8bd37dc756362dafa43 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 11 Aug 2017 18:50:41 +0300
Subject: [PATCH 077/174] Fix save button visibility

---
 .../measurementtool/MeasurementToolFragment.java     |  6 +++---
 .../plus/views/mapwidgets/MapInfoWidgetsFactory.java | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index bff9822ac2..5f27c858f4 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -829,6 +829,9 @@ public class MeasurementToolFragment extends Fragment {
 			setBgIds(R.drawable.gradient_toolbar, R.drawable.gradient_toolbar,
 					R.drawable.gradient_toolbar, R.drawable.gradient_toolbar);
 			setCloseBtnVisible(false);
+			if (newGpxLine != null) {
+				setSaveViewVisible(true);
+			}
 			setBackBtnIconIds(R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_dark);
 			setSingleLineTitle(false);
 		}
@@ -837,9 +840,6 @@ public class MeasurementToolFragment extends Fragment {
 		public void updateToolbar(MapInfoWidgetsFactory.TopToolbarView view) {
 			super.updateToolbar(view);
 			view.getShadowView().setVisibility(View.GONE);
-			if (newGpxLine != null) {
-				view.getSaveView().setVisibility(View.VISIBLE);
-			}
 		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index 4b78628700..97be2765e4 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -230,6 +230,7 @@ public class MapInfoWidgetsFactory {
 		int refreshBtnIconClrLightId = R.color.icon_color;
 		int refreshBtnIconClrDarkId = 0;
 		boolean refreshBtnVisible = false;
+		boolean saveViewVisible = false;
 
 		int titleTextClrLightId = R.color.primary_text_light;
 		int titleTextClrDarkId = R.color.primary_text_dark;
@@ -322,6 +323,10 @@ public class MapInfoWidgetsFactory {
 			this.refreshBtnVisible = visible;
 		}
 
+		public void setSaveViewVisible(boolean visible) {
+			this.saveViewVisible = visible;
+		}
+
 		public void setTitleTextClrIds(int titleTextClrLightId, int titleTextClrDarkId) {
 			this.titleTextClrLightId = titleTextClrLightId;
 			this.titleTextClrDarkId = titleTextClrDarkId;
@@ -609,6 +614,13 @@ public class MapInfoWidgetsFactory {
 			} else if (refreshButton.getVisibility() == View.VISIBLE) {
 				refreshButton.setVisibility(View.GONE);
 			}
+			if (controller.saveViewVisible) {
+				if (saveView.getVisibility() == View.GONE) {
+					saveView.setVisibility(View.VISIBLE);
+				}
+			} else if (saveView.getVisibility() == View.VISIBLE) {
+				saveView.setVisibility(View.GONE);
+			}
 		}
 
 		public void updateColors() {

From c13baca90352aa2a739ef3b22bc501979dbbd72e Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 11 Aug 2017 18:58:06 +0300
Subject: [PATCH 078/174] Rename save

---
 OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml | 2 +-
 OsmAnd/res/values/strings.xml                              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
index 0debddbc7c..a914596ba7 100644
--- a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
@@ -82,7 +82,7 @@
             android:layout_toEndOf="@id/save_as_new_segment_icon"
             android:layout_toRightOf="@id/save_as_new_segment_icon"
             android:maxLines="1"
-            android:text="@string/save_as_new_segment"
+            android:text="@string/shared_string_save"
             android:textAppearance="@style/TextAppearance.ListItemTitle"/>
     </RelativeLayout>
 
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index c48ccb4c25..569af28fe3 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2679,7 +2679,6 @@
     <string name="empty_state_favourites_desc">Add favorites on map or import them from filesystem</string>
     <string name="import_track">Import track</string>
     <string name="import_track_desc">File %1$s does not contain waypoints, import it as a track?</string>
-    <string name="save_as_new_segment">Save as new segment</string>
     <string name="move_point">Move Point</string>
     <string name="add_segment_to_the_track">Add to a track</string>
 </resources>

From a6d83ee530d2a8e38f59ac2c8ff16908dfd61eb6 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 11 Aug 2017 19:03:35 +0300
Subject: [PATCH 079/174] Make toolbar non static

---
 .../osmand/plus/measurementtool/MeasurementToolFragment.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 5f27c858f4..bace47cc91 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -817,12 +817,10 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
-	private static class MeasurementToolBarController extends TopToolbarController {
-		private NewGpxLine newGpxLine;
+	private class MeasurementToolBarController extends TopToolbarController {
 
 		MeasurementToolBarController(NewGpxLine newGpxLine) {
 			super(MapInfoWidgetsFactory.TopToolbarControllerType.MEASUREMENT_TOOL);
-			this.newGpxLine = newGpxLine;
 			setBackBtnIconClrIds(0, 0);
 			setTitleTextClrIds(R.color.primary_text_dark, R.color.primary_text_dark);
 			setDescrTextClrIds(R.color.primary_text_dark, R.color.primary_text_dark);

From 294215d59022d3a96442f5ab4c2f91d74b2d9746 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Mon, 14 Aug 2017 10:26:21 +0300
Subject: [PATCH 080/174] Check before closing context menu

---
 .../net/osmand/plus/views/AddGpxPointBottomSheetHelper.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java b/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java
index e807dc4084..fa242d42cf 100644
--- a/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java
+++ b/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java
@@ -129,7 +129,10 @@ public class AddGpxPointBottomSheetHelper implements OnDismissListener {
 
 	@Override
 	public void onDismiss() {
-		mapActivity.getContextMenu().close();
+		MapContextMenu contextMenu = mapActivity.getContextMenu();
+		if (contextMenu.isVisible() && contextMenu.isClosable()) {
+			contextMenu.close();
+		}
 		Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getTrackActivity());
 		newIntent.putExtra(TrackActivity.TRACK_FILE_NAME, newGpxPoint.getGpx().path);
 		newIntent.putExtra(TrackActivity.OPEN_POINTS_TAB, true);

From d51254949bc9694fdfff3e8d473a6b48f9871ed5 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 14 Aug 2017 12:12:53 +0300
Subject: [PATCH 081/174] Add support for landscape

---
 OsmAnd/res/layout-land/map_hud_bottom.xml     |  5 ++
 .../MeasurementToolFragment.java              | 55 ++++++++++---------
 .../OptionsBottomSheetDialogFragment.java     |  6 +-
 3 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/OsmAnd/res/layout-land/map_hud_bottom.xml b/OsmAnd/res/layout-land/map_hud_bottom.xml
index 8a496b8496..eb2758f078 100644
--- a/OsmAnd/res/layout-land/map_hud_bottom.xml
+++ b/OsmAnd/res/layout-land/map_hud_bottom.xml
@@ -268,4 +268,9 @@
         android:layout_gravity="bottom|left"
         tools:visibility="visible"/>
 
+    <FrameLayout
+        android:id="@+id/bottomFragmentContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index bace47cc91..49e5f2cf80 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -104,7 +104,6 @@ public class MeasurementToolFragment extends Fragment {
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 		final int backgroundColor = ContextCompat.getColor(getActivity(),
 				nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
-		boolean portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
 
 		upIcon = iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up);
 		downIcon = iconsCache.getThemedIcon(R.drawable.ic_action_arrow_down);
@@ -279,31 +278,29 @@ public class MeasurementToolFragment extends Fragment {
 
 		enterMeasurementMode();
 
-		if (portrait) {
-			toolBarController = new MeasurementToolBarController(newGpxLine);
-			if (newGpxLine != null) {
-				toolBarController.setTitle(getString(R.string.add_line));
-			} else {
-				toolBarController.setTitle(getString(R.string.measurement_tool_action_bar));
-			}
-			toolBarController.setOnBackButtonClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					showQuitDialog(false);
-				}
-			});
-			toolBarController.setOnSaveViewClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					if (measurementLayer.getPointsCount() > 0) {
-						saveAsNewSegment(mapActivity);
-					} else {
-						Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
-					}
-				}
-			});
-			mapActivity.showTopToolbar(toolBarController);
+		toolBarController = new MeasurementToolBarController(newGpxLine);
+		if (newGpxLine != null) {
+			toolBarController.setTitle(getString(R.string.add_line));
+		} else {
+			toolBarController.setTitle(getString(R.string.measurement_tool_action_bar));
 		}
+		toolBarController.setOnBackButtonClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				showQuitDialog(false);
+			}
+		});
+		toolBarController.setOnSaveViewClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				if (measurementLayer.getPointsCount() > 0) {
+					saveAsNewSegment(mapActivity);
+				} else {
+					Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
+				}
+			}
+		});
+		mapActivity.showTopToolbar(toolBarController);
 
 		adapter = new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints());
 		final RecyclerView rv = mainView.findViewById(R.id.measure_points_recycler_view);
@@ -701,8 +698,9 @@ public class MeasurementToolFragment extends Fragment {
 			measurementLayer.setInMeasurementMode(true);
 			mapActivity.refreshMap();
 			mapActivity.disableDrawer();
+			boolean portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
 
-			mark(View.INVISIBLE,
+			mark(portrait ? View.INVISIBLE : View.GONE,
 					R.id.map_left_widgets_panel,
 					R.id.map_right_widgets_panel,
 					R.id.map_center_info);
@@ -837,7 +835,10 @@ public class MeasurementToolFragment extends Fragment {
 		@Override
 		public void updateToolbar(MapInfoWidgetsFactory.TopToolbarView view) {
 			super.updateToolbar(view);
-			view.getShadowView().setVisibility(View.GONE);
+			View shadow = view.getShadowView();
+			if (shadow != null) {
+				shadow.setVisibility(View.GONE);
+			}
 		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
index 2a1f814dfd..fa085978bd 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@@ -13,6 +13,7 @@ import android.widget.ImageView;
 import net.osmand.AndroidUtils;
 import net.osmand.plus.R;
 import net.osmand.plus.base.BottomSheetDialogFragment;
+import net.osmand.plus.helpers.AndroidUiHelper;
 
 public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment {
 
@@ -34,9 +35,12 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		final boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
+		boolean portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_options_bottom_sheet_dialog, null);
-		AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
+		if (portrait) {
+			AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
+		}
 
 		((ImageView) mainView.findViewById(R.id.snap_to_road_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_snap_to_road));
 		((ImageView) mainView.findViewById(R.id.clear_all_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_reset_to_default_dark));

From e3e28211b838f80bde886923e2cf6b8d3e8f247d Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 14 Aug 2017 14:10:52 +0300
Subject: [PATCH 082/174] Replace new methods with existing

---
 .../SnapToRoadBottomSheetDialogFragment.java    | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index b1492ceb0c..231d88b6c4 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -4,7 +4,6 @@ import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.util.DisplayMetrics;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -53,9 +52,8 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 			navContainer.addView(row);
 		}
 
-		DisplayMetrics metrics = new DisplayMetrics();
-		getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
-		final int height = metrics.heightPixels;
+		final int height = AndroidUtils.getScreenHeight(getActivity());
+		final int statusbarHeight = AndroidUtils.getStatusBarHeight(getActivity());
 
 		view.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
 			@Override
@@ -64,7 +62,7 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 				int scrollViewHeight = scrollView.getHeight();
 				int dividerHeight = AndroidUtils.dpToPx(getContext(), 1);
 				int cancelButtonHeight = getContext().getResources().getDimensionPixelSize(R.dimen.snap_to_road_bottom_sheet_cancel_button_height);
-				int spaceForScrollView = height - getStatusBarHeight() - getNavBarHeight() - dividerHeight - cancelButtonHeight;
+				int spaceForScrollView = height - statusbarHeight - getNavBarHeight() - dividerHeight - cancelButtonHeight;
 				if (scrollViewHeight > spaceForScrollView) {
 					scrollView.getLayoutParams().height = spaceForScrollView;
 					scrollView.requestLayout();
@@ -82,15 +80,6 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 		return view;
 	}
 
-	private int getStatusBarHeight() {
-		int statusBarHeight = 0;
-		int resourceId = getResources().getIdentifier("status_bar_height", "dimen", "android");
-		if (resourceId > 0) {
-			statusBarHeight = getResources().getDimensionPixelSize(resourceId);
-		}
-		return statusBarHeight;
-	}
-
 	private int getNavBarHeight() {
 		if (!hasNavBar()) {
 			return 0;

From 3fb23779c4b96885750788c60a6c1f43b8dc0100 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 14 Aug 2017 15:37:09 +0300
Subject: [PATCH 083/174] Add landscape layout

---
 .../layout-land/fragment_measurement_tool.xml | 248 ++++++++++++++++++
 .../MeasurementToolFragment.java              |  57 +++-
 .../measurementtool/PointsListFragment.java   |  61 +++++
 3 files changed, 360 insertions(+), 6 deletions(-)
 create mode 100644 OsmAnd/res/layout-land/fragment_measurement_tool.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/PointsListFragment.java

diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
new file mode 100644
index 0000000000..63b883e910
--- /dev/null
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
+    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:clickable="true"
+        tools:background="@drawable/bg_bottom_menu_dark">
+
+        <RelativeLayout
+            android:id="@+id/up_down_row"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.4"
+            android:background="?attr/selectableItemBackground"
+            android:paddingBottom="14dp"
+            android:paddingTop="14dp">
+
+            <ImageView
+                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_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:background="@null"
+                tools:src="@drawable/ic_action_ruler"/>
+
+            <ImageView
+                android:id="@+id/move_point_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_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:background="@null"
+                android:visibility="gone"
+                tools:src="@drawable/ic_action_measure_point"/>
+
+            <ImageView
+                android:id="@+id/up_down_button"
+                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="16dp"
+                android:layout_marginStart="16dp"
+                android:background="@null"
+                tools:src="@drawable/ic_action_arrow_down"/>
+
+            <TextView
+                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:textAppearance="@style/TextAppearance.ListItemTitle"
+                tools:text="724 m,"/>
+
+            <TextView
+                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/measurement_distance_text_view"
+                android:layout_toLeftOf="@id/up_down_button"
+                android:layout_toRightOf="@id/measurement_distance_text_view"
+                android:layout_toStartOf="@id/up_down_button"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="@dimen/default_list_text_size"
+                tools:text="points: 3"/>
+
+            <TextView
+                android:id="@+id/move_point_text"
+                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/move_point_icon"
+                android:layout_toRightOf="@id/move_point_icon"
+                android:text="@string/move_point"
+                android:textAppearance="@style/TextAppearance.ListItemTitle"
+                android:visibility="gone"/>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:background="?attr/dashboard_divider"/>
+
+        <LinearLayout
+            android:id="@+id/measure_mode_controls"
+            android:layout_width="0dp"
+            android:layout_height="52dp"
+            android:layout_weight="0.6">
+
+            <FrameLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1">
+
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/options_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="?attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:maxLines="1"
+                    android:paddingEnd="12dp"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="12dp"
+                    android:paddingStart="16dp"
+                    android:text="@string/shared_string_options"
+                    android:textColor="?attr/color_dialog_buttons"
+                    osmand:textAllCapsCompat="true"
+                    osmand:typeface="@string/font_roboto_medium"/>
+            </FrameLayout>
+
+            <LinearLayout
+                android:id="@+id/redo_undo_container"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center_horizontal">
+
+                <ImageButton
+                    android:id="@+id/undo_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:paddingBottom="14dp"
+                    android:paddingEnd="12dp"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="12dp"
+                    android:paddingStart="16dp"
+                    android:paddingTop="14dp"
+                    tools:src="@drawable/ic_action_undo_dark"/>
+
+                <ImageButton
+                    android:id="@+id/redo_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:paddingBottom="14dp"
+                    android:paddingEnd="16dp"
+                    android:paddingLeft="12dp"
+                    android:paddingRight="16dp"
+                    android:paddingStart="12dp"
+                    android:paddingTop="14dp"
+                    tools:src="@drawable/ic_action_redo_dark"/>
+            </LinearLayout>
+
+            <FrameLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1">
+
+                <Button
+                    android:id="@+id/add_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    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:maxLines="1"
+                    android:minHeight="36dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:text="@string/shared_string_add"
+                    android:textColor="@color/color_white"/>
+            </FrameLayout>
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/move_point_mode_controls"
+            android:layout_width="0dp"
+            android:layout_height="52dp"
+            android:layout_weight="0.6"
+            android:visibility="gone">
+
+            <Button
+                android:id="@+id/apply_point_button"
+                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:minHeight="36dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:text="@string/shared_string_apply"
+                android:textColor="@color/color_white"/>
+
+            <net.osmand.plus.widgets.TextViewEx
+                android:id="@+id/cancel_point_button"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:background="?attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:paddingEnd="12dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="12dp"
+                android:paddingStart="16dp"
+                android:text="@string/shared_string_cancel"
+                android:textColor="?attr/color_dialog_buttons"
+                osmand:textAllCapsCompat="true"
+                osmand:typeface="@string/font_roboto_medium"/>
+        </RelativeLayout>
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 49e5f2cf80..13f598a35a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -70,6 +70,7 @@ public class MeasurementToolFragment extends Fragment {
 	public static final String TAG = "MeasurementToolFragment";
 
 	private final CommandManager commandManager = new CommandManager();
+	private RecyclerView rv;
 	private MeasurementToolBarController toolBarController;
 	private MeasurementToolAdapter adapter;
 	private TextView distanceTv;
@@ -78,6 +79,7 @@ public class MeasurementToolFragment extends Fragment {
 	private Drawable upIcon;
 	private Drawable downIcon;
 	private View pointsListContainer;
+	private View upDownRow;
 	private ImageView upDownBtn;
 	private ImageView undoBtn;
 	private ImageView redoBtn;
@@ -85,6 +87,7 @@ public class MeasurementToolFragment extends Fragment {
 	private boolean wasCollapseButtonVisible;
 	private boolean pointsListOpened;
 	private boolean saved;
+	private boolean portrait;
 	private int previousMapPosition;
 	private NewGpxLine newGpxLine;
 
@@ -104,6 +107,7 @@ public class MeasurementToolFragment extends Fragment {
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 		final int backgroundColor = ContextCompat.getColor(getActivity(),
 				nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
+		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
 
 		upIcon = iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up);
 		downIcon = iconsCache.getThemedIcon(R.drawable.ic_action_arrow_down);
@@ -114,7 +118,9 @@ public class MeasurementToolFragment extends Fragment {
 		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);
 		pointsListContainer = view.findViewById(R.id.points_list_container);
-		pointsListContainer.setBackgroundColor(backgroundColor);
+		if (portrait && pointsListContainer != null) {
+			pointsListContainer.setBackgroundColor(backgroundColor);
+		}
 
 		distanceTv = (TextView) mainView.findViewById(R.id.measurement_distance_text_view);
 		pointsTv = (TextView) mainView.findViewById(R.id.measurement_points_text_view);
@@ -135,7 +141,8 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		});
 
-		mainView.findViewById(R.id.up_down_row).setOnClickListener(new View.OnClickListener() {
+		upDownRow = mainView.findViewById(R.id.up_down_row);
+		upDownRow.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				if (!pointsListOpened && measurementLayer.getPointsCount() > 0 && !measurementLayer.isInMovePointMode()) {
@@ -303,7 +310,11 @@ public class MeasurementToolFragment extends Fragment {
 		mapActivity.showTopToolbar(toolBarController);
 
 		adapter = new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints());
-		final RecyclerView rv = mainView.findViewById(R.id.measure_points_recycler_view);
+		if (portrait) {
+			rv = mainView.findViewById(R.id.measure_points_recycler_view);
+		} else {
+			rv = new RecyclerView(getActivity());
+		}
 		final ItemTouchHelper touchHelper = new ItemTouchHelper(new MeasurementToolItemTouchHelperCallback(adapter));
 		touchHelper.attachToRecyclerView(rv);
 		adapter.setAdapterListener(new MeasurementToolAdapter.MeasurementAdapterListener() {
@@ -450,10 +461,14 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void showPointsList() {
 		pointsListOpened = true;
-		pointsListContainer.setVisibility(View.VISIBLE);
 		upDownBtn.setImageDrawable(downIcon);
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
+			if (portrait && pointsListContainer != null) {
+				pointsListContainer.setVisibility(View.VISIBLE);
+			} else {
+				showPointsListFragment();
+			}
 			OsmandMapTileView tileView = mapActivity.getMapView();
 			previousMapPosition = tileView.getMapPosition();
 			tileView.setMapPosition(MIDDLE_TOP_CONSTANT);
@@ -463,11 +478,42 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void hidePointsList() {
 		pointsListOpened = false;
-		pointsListContainer.setVisibility(View.GONE);
 		upDownBtn.setImageDrawable(upIcon);
+		if (portrait && pointsListContainer != null) {
+			pointsListContainer.setVisibility(View.GONE);
+		} else {
+			hidePointsListFragment();
+		}
 		setPreviousMapPosition();
 	}
 
+	private void showPointsListFragment() {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			PointsListFragment fragment = new PointsListFragment();
+			int screenHeight = AndroidUtils.getScreenHeight(mapActivity) - AndroidUtils.getStatusBarHeight(mapActivity);
+			fragment.setRv(rv);
+			fragment.setWidth(upDownRow.getWidth());
+			fragment.setHeight(screenHeight - upDownRow.getHeight());
+			mapActivity.getSupportFragmentManager().beginTransaction()
+					.add(R.id.fragmentContainer, fragment, PointsListFragment.TAG)
+					.addToBackStack(PointsListFragment.TAG)
+					.commitAllowingStateLoss();
+		}
+	}
+
+	private void hidePointsListFragment() {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			try {
+				mapActivity.getSupportFragmentManager()
+						.popBackStackImmediate(PointsListFragment.TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+			} catch (Exception e) {
+				// ignore
+			}
+		}
+	}
+
 	private void setPreviousMapPosition() {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
@@ -698,7 +744,6 @@ public class MeasurementToolFragment extends Fragment {
 			measurementLayer.setInMeasurementMode(true);
 			mapActivity.refreshMap();
 			mapActivity.disableDrawer();
-			boolean portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
 
 			mark(portrait ? View.INVISIBLE : View.GONE,
 					R.id.map_left_widgets_panel,
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/PointsListFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/PointsListFragment.java
new file mode 100644
index 0000000000..8f12703463
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/PointsListFragment.java
@@ -0,0 +1,61 @@
+package net.osmand.plus.measurementtool;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+
+public class PointsListFragment extends Fragment {
+
+	public static final String TAG = "pointsListFragment";
+
+	private RecyclerView rv;
+	private int height;
+	private int width;
+	private LinearLayout ll;
+
+	public void setRv(RecyclerView rv) {
+		this.rv = rv;
+	}
+
+	public void setHeight(int height) {
+		this.height = height;
+	}
+
+	public void setWidth(int width) {
+		this.width = width;
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+		final MapActivity mapActivity = (MapActivity) getActivity();
+		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		final int backgroundColor = ContextCompat.getColor(getActivity(),
+				nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
+
+		ll = new LinearLayout(mapActivity);
+		ll.setLayoutParams(new LinearLayout.LayoutParams(width, height));
+		ll.setOrientation(LinearLayout.VERTICAL);
+		ll.setBackgroundColor(backgroundColor);
+		ll.addView(rv);
+
+		return ll;
+	}
+
+	@Override
+	public void onDestroyView() {
+		super.onDestroyView();
+		if (ll != null) {
+			ll.removeAllViews();
+		}
+	}
+}

From 186f40350d2e320431096ad34c0c885a68e8306a Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 14 Aug 2017 17:12:54 +0300
Subject: [PATCH 084/174] Add some improvements

---
 .../MeasurementToolFragment.java              | 16 +++++-----
 .../measurementtool/PointsListFragment.java   | 32 ++++++++++++-------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 13f598a35a..e86f140f28 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -70,7 +70,7 @@ public class MeasurementToolFragment extends Fragment {
 	public static final String TAG = "MeasurementToolFragment";
 
 	private final CommandManager commandManager = new CommandManager();
-	private RecyclerView rv;
+	private RecyclerView pointsRv;
 	private MeasurementToolBarController toolBarController;
 	private MeasurementToolAdapter adapter;
 	private TextView distanceTv;
@@ -311,12 +311,12 @@ public class MeasurementToolFragment extends Fragment {
 
 		adapter = new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints());
 		if (portrait) {
-			rv = mainView.findViewById(R.id.measure_points_recycler_view);
+			pointsRv = mainView.findViewById(R.id.measure_points_recycler_view);
 		} else {
-			rv = new RecyclerView(getActivity());
+			pointsRv = new RecyclerView(getActivity());
 		}
 		final ItemTouchHelper touchHelper = new ItemTouchHelper(new MeasurementToolItemTouchHelperCallback(adapter));
-		touchHelper.attachToRecyclerView(rv);
+		touchHelper.attachToRecyclerView(pointsRv);
 		adapter.setAdapterListener(new MeasurementToolAdapter.MeasurementAdapterListener() {
 
 			private int fromPosition;
@@ -334,7 +334,7 @@ public class MeasurementToolFragment extends Fragment {
 
 			@Override
 			public void onItemClick(View view) {
-				measurementLayer.moveMapToPoint(rv.indexOfChild(view));
+				measurementLayer.moveMapToPoint(pointsRv.indexOfChild(view));
 			}
 
 			@Override
@@ -355,8 +355,8 @@ public class MeasurementToolFragment extends Fragment {
 				}
 			}
 		});
-		rv.setLayoutManager(new LinearLayoutManager(getContext()));
-		rv.setAdapter(adapter);
+		pointsRv.setLayoutManager(new LinearLayoutManager(getContext()));
+		pointsRv.setAdapter(adapter);
 
 		return view;
 	}
@@ -492,7 +492,7 @@ public class MeasurementToolFragment extends Fragment {
 		if (mapActivity != null) {
 			PointsListFragment fragment = new PointsListFragment();
 			int screenHeight = AndroidUtils.getScreenHeight(mapActivity) - AndroidUtils.getStatusBarHeight(mapActivity);
-			fragment.setRv(rv);
+			fragment.setRecyclerView(pointsRv);
 			fragment.setWidth(upDownRow.getWidth());
 			fragment.setHeight(screenHeight - upDownRow.getHeight());
 			mapActivity.getSupportFragmentManager().beginTransaction()
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/PointsListFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/PointsListFragment.java
index 8f12703463..c358fa3c75 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/PointsListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/PointsListFragment.java
@@ -5,10 +5,13 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout.LayoutParams;
 
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
@@ -20,9 +23,9 @@ public class PointsListFragment extends Fragment {
 	private RecyclerView rv;
 	private int height;
 	private int width;
-	private LinearLayout ll;
+	private FrameLayout parent;
 
-	public void setRv(RecyclerView rv) {
+	public void setRecyclerView(RecyclerView rv) {
 		this.rv = rv;
 	}
 
@@ -42,20 +45,27 @@ public class PointsListFragment extends Fragment {
 		final int backgroundColor = ContextCompat.getColor(getActivity(),
 				nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
 
-		ll = new LinearLayout(mapActivity);
-		ll.setLayoutParams(new LinearLayout.LayoutParams(width, height));
-		ll.setOrientation(LinearLayout.VERTICAL);
-		ll.setBackgroundColor(backgroundColor);
-		ll.addView(rv);
+		parent = new FrameLayout(mapActivity);
+		parent.setLayoutParams(new LayoutParams(width, height));
+		parent.setBackgroundColor(backgroundColor);
+		parent.addView(rv);
 
-		return ll;
+		ImageView shadow = new ImageView(mapActivity);
+		FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+		params.gravity = Gravity.BOTTOM;
+		shadow.setLayoutParams(params);
+		shadow.setScaleType(ImageView.ScaleType.FIT_XY);
+		shadow.setImageResource(R.drawable.bg_shadow_onmap);
+		parent.addView(shadow);
+
+		return parent;
 	}
 
 	@Override
 	public void onDestroyView() {
 		super.onDestroyView();
-		if (ll != null) {
-			ll.removeAllViews();
+		if (parent != null) {
+			parent.removeAllViews();
 		}
 	}
 }

From 3dd616590cbd0ca37c923d113fb5d9dc31a4f441 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 14 Aug 2017 17:41:24 +0300
Subject: [PATCH 085/174] Add some improvements (2)

---
 OsmAnd/res/values/sizes.xml                      |  1 +
 OsmAnd/src/net/osmand/plus/OsmandSettings.java   |  1 +
 .../measurementtool/MeasurementToolFragment.java |  7 ++++++-
 .../OptionsBottomSheetDialogFragment.java        | 16 +++++++++++++++-
 .../SnapToRoadBottomSheetDialogFragment.java     | 14 ++++++++++++++
 .../net/osmand/plus/views/OsmandMapTileView.java |  7 ++++++-
 6 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index c8165ab7b4..d1cb1205ec 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -157,4 +157,5 @@
 	<dimen name="my_places_empty_state_text_button_padding_top">64dp</dimen>
 
     <dimen name="snap_to_road_bottom_sheet_cancel_button_height">48dp</dimen>
+	<dimen name="landscape_bottom_sheet_dialog_fragment_width">360dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 03147d4e8b..d7f0a3d237 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1246,6 +1246,7 @@ public class OsmandSettings {
 	public static final int BOTTOM_CONSTANT = 1;
 	public static final int MIDDLE_BOTTOM_CONSTANT = 2;
 	public static final int MIDDLE_TOP_CONSTANT = 3;
+	public static final int LANDSCAPE_MIDDLE_RIGHT_CONSTANT = 4;
 	public final CommonPreference<Boolean> CENTER_POSITION_ON_MAP = new BooleanPreference("center_position_on_map", false).makeProfile();
 
 	// this value string is synchronized with settings_pref.xml preference name
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index e86f140f28..a99f9b19a0 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -62,6 +62,7 @@ import java.util.List;
 import java.util.Locale;
 
 import static net.osmand.plus.GPXUtilities.GPXFile;
+import static net.osmand.plus.OsmandSettings.LANDSCAPE_MIDDLE_RIGHT_CONSTANT;
 import static net.osmand.plus.OsmandSettings.MIDDLE_TOP_CONSTANT;
 import static net.osmand.plus.helpers.GpxImportHelper.GPX_SUFFIX;
 
@@ -471,7 +472,11 @@ public class MeasurementToolFragment extends Fragment {
 			}
 			OsmandMapTileView tileView = mapActivity.getMapView();
 			previousMapPosition = tileView.getMapPosition();
-			tileView.setMapPosition(MIDDLE_TOP_CONSTANT);
+			if (portrait) {
+				tileView.setMapPosition(MIDDLE_TOP_CONSTANT);
+			} else {
+				tileView.setMapPosition(LANDSCAPE_MIDDLE_RIGHT_CONSTANT);
+			}
 			mapActivity.refreshMap();
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
index fa085978bd..225e96a64a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@@ -8,6 +8,8 @@ import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.ImageView;
 
 import net.osmand.AndroidUtils;
@@ -21,6 +23,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 
 	private OptionsOnClickListener listener;
 	private boolean addLineMode;
+	private boolean portrait;
 
 	public void setOptionsOnClickListener(OptionsOnClickListener listener) {
 		this.listener = listener;
@@ -35,7 +38,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		final boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
-		boolean portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
+		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_options_bottom_sheet_dialog, null);
 		if (portrait) {
@@ -112,6 +115,17 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 		return mainView;
 	}
 
+	@Override
+	public void onStart() {
+		super.onStart();
+		if (!portrait) {
+			final Window window = getDialog().getWindow();
+			WindowManager.LayoutParams params = window.getAttributes();
+			params.width = getActivity().getResources().getDimensionPixelSize(R.dimen.landscape_bottom_sheet_dialog_fragment_width);
+			window.setAttributes(params);
+		}
+	}
+
 	@Override
 	protected Drawable getContentIcon(@DrawableRes int id) {
 		return getIcon(id, getMyApplication().getSettings().isLightContent() ? R.color.on_map_icon_color : 0);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index 231d88b6c4..81a6794140 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -9,6 +9,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -18,6 +20,7 @@ import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.base.BottomSheetDialogFragment;
+import net.osmand.plus.helpers.AndroidUiHelper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -80,6 +83,17 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 		return view;
 	}
 
+	@Override
+	public void onStart() {
+		super.onStart();
+		if (!AndroidUiHelper.isOrientationPortrait(getActivity())) {
+			final Window window = getDialog().getWindow();
+			WindowManager.LayoutParams params = window.getAttributes();
+			params.width = getActivity().getResources().getDimensionPixelSize(R.dimen.landscape_bottom_sheet_dialog_fragment_width);
+			window.setAttributes(params);
+		}
+	}
+
 	private int getNavBarHeight() {
 		if (!hasNavBar()) {
 			return 0;
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index 4ddb967c7d..79aa23f434 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -585,7 +585,12 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 		} else {
 			ratioy = 0.5f;
 		}
-		final float ratiox = mapPositionX == 0 ? 0.5f : 0.75f;
+		final float ratiox;
+		if (mapPosition == OsmandSettings.LANDSCAPE_MIDDLE_RIGHT_CONSTANT) {
+			ratiox = 0.7f;
+		} else {
+			ratiox = mapPositionX == 0 ? 0.5f : 0.75f;
+		}
 		final int cy = (int) (ratioy * view.getHeight());
 		final int cx = (int) (ratiox * view.getWidth());
 		if (currentViewport.getPixWidth() != view.getWidth() || currentViewport.getPixHeight() != view.getHeight() ||

From 1513b7ff06436b55276116dd2964b055cca3a757 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 14 Aug 2017 18:34:52 +0300
Subject: [PATCH 086/174] Add right shadow and some changes

---
 ...nt.java => MeasurePointsListFragment.java} | 26 ++++++++++++++-----
 .../MeasurementToolFragment.java              |  8 +++---
 2 files changed, 23 insertions(+), 11 deletions(-)
 rename OsmAnd/src/net/osmand/plus/measurementtool/{PointsListFragment.java => MeasurePointsListFragment.java} (67%)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/PointsListFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurePointsListFragment.java
similarity index 67%
rename from OsmAnd/src/net/osmand/plus/measurementtool/PointsListFragment.java
rename to OsmAnd/src/net/osmand/plus/measurementtool/MeasurePointsListFragment.java
index c358fa3c75..51c141fe4c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/PointsListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurePointsListFragment.java
@@ -5,6 +5,7 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
+import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,17 +14,19 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout.LayoutParams;
 
+import net.osmand.AndroidUtils;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 
-public class PointsListFragment extends Fragment {
+public class MeasurePointsListFragment extends Fragment {
 
-	public static final String TAG = "pointsListFragment";
+	public static final String TAG = "MeasurePointsListFragment";
 
 	private RecyclerView rv;
 	private int height;
 	private int width;
 	private FrameLayout parent;
+	private FrameLayout mainView;
 
 	public void setRecyclerView(RecyclerView rv) {
 		this.rv = rv;
@@ -44,11 +47,16 @@ public class PointsListFragment extends Fragment {
 		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int backgroundColor = ContextCompat.getColor(getActivity(),
 				nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
+		final TypedValue typedValueAttr = new TypedValue();
+		getActivity().getTheme().resolveAttribute(R.attr.left_menu_view_bg, typedValueAttr, true);
 
 		parent = new FrameLayout(mapActivity);
-		parent.setLayoutParams(new LayoutParams(width, height));
-		parent.setBackgroundColor(backgroundColor);
-		parent.addView(rv);
+		parent.setLayoutParams(new LayoutParams(width + AndroidUtils.dpToPx(getActivity(), 16), height));
+		parent.setBackgroundResource(typedValueAttr.resourceId);
+
+		mainView = new FrameLayout(mapActivity);
+		mainView.setLayoutParams(new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+		mainView.setBackgroundColor(backgroundColor);
 
 		ImageView shadow = new ImageView(mapActivity);
 		FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -56,7 +64,10 @@ public class PointsListFragment extends Fragment {
 		shadow.setLayoutParams(params);
 		shadow.setScaleType(ImageView.ScaleType.FIT_XY);
 		shadow.setImageResource(R.drawable.bg_shadow_onmap);
-		parent.addView(shadow);
+
+		mainView.addView(rv);
+		mainView.addView(shadow);
+		parent.addView(mainView);
 
 		return parent;
 	}
@@ -64,8 +75,9 @@ public class PointsListFragment extends Fragment {
 	@Override
 	public void onDestroyView() {
 		super.onDestroyView();
-		if (parent != null) {
+		if (parent != null && mainView != null) {
 			parent.removeAllViews();
+			mainView.removeAllViews();
 		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index a99f9b19a0..85770c46d6 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -495,14 +495,14 @@ public class MeasurementToolFragment extends Fragment {
 	private void showPointsListFragment() {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
-			PointsListFragment fragment = new PointsListFragment();
+			MeasurePointsListFragment fragment = new MeasurePointsListFragment();
 			int screenHeight = AndroidUtils.getScreenHeight(mapActivity) - AndroidUtils.getStatusBarHeight(mapActivity);
 			fragment.setRecyclerView(pointsRv);
 			fragment.setWidth(upDownRow.getWidth());
 			fragment.setHeight(screenHeight - upDownRow.getHeight());
 			mapActivity.getSupportFragmentManager().beginTransaction()
-					.add(R.id.fragmentContainer, fragment, PointsListFragment.TAG)
-					.addToBackStack(PointsListFragment.TAG)
+					.add(R.id.fragmentContainer, fragment, MeasurePointsListFragment.TAG)
+					.addToBackStack(MeasurePointsListFragment.TAG)
 					.commitAllowingStateLoss();
 		}
 	}
@@ -512,7 +512,7 @@ public class MeasurementToolFragment extends Fragment {
 		if (mapActivity != null) {
 			try {
 				mapActivity.getSupportFragmentManager()
-						.popBackStackImmediate(PointsListFragment.TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+						.popBackStackImmediate(MeasurePointsListFragment.TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE);
 			} catch (Exception e) {
 				// ignore
 			}

From 98cff00597e36ba61dec2ab6b94c4bc2c06cd278 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Mon, 14 Aug 2017 18:55:09 +0300
Subject: [PATCH 087/174] Add selected point menu

---
 .../layout-land/fragment_measurement_tool.xml |  64 ++++-
 .../res/layout/fragment_measurement_tool.xml  |  64 ++++-
 .../fragment_options_bottom_sheet_dialog.xml  |   2 +-
 ...ment_selected_menu_bottom_sheet_dialog.xml | 225 +++++++++++++++++
 ...gment_snap_to_road_bottom_sheet_dialog.xml |   2 +-
 OsmAnd/res/values/sizes.xml                   |   2 +-
 OsmAnd/res/values/strings.xml                 |   2 +
 OsmAnd/src/net/osmand/AndroidUtils.java       |  21 ++
 .../MeasurementToolFragment.java              | 236 +++++++++++++++++-
 .../measurementtool/MeasurementToolLayer.java | 184 ++++++++++----
 ...tedPointMenuBottomSheetDialogFragment.java | 171 +++++++++++++
 .../SnapToRoadBottomSheetDialogFragment.java  |  25 +-
 12 files changed, 907 insertions(+), 91 deletions(-)
 create mode 100644 OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java

diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
index 63b883e910..33399082d1 100644
--- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -52,7 +52,37 @@
                 android:layout_marginStart="16dp"
                 android:background="@null"
                 android:visibility="gone"
-                tools:src="@drawable/ic_action_measure_point"/>
+                tools:src="@drawable/ic_action_move_point"/>
+
+            <ImageView
+                android:id="@+id/add_point_after_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_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:background="@null"
+                android:visibility="gone"
+                tools:src="@drawable/ic_action_addpoint_above"/>
+
+            <ImageView
+                android:id="@+id/add_point_before_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_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:background="@null"
+                android:visibility="gone"
+                tools:src="@drawable/ic_action_addpoint_below"/>
 
             <ImageView
                 android:id="@+id/up_down_button"
@@ -107,6 +137,36 @@
                 android:text="@string/move_point"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 android:visibility="gone"/>
+
+            <TextView
+                android:id="@+id/add_point_after_text"
+                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/add_point_after_icon"
+                android:layout_toRightOf="@id/add_point_after_icon"
+                android:text="@string/add_point_after"
+                android:textAppearance="@style/TextAppearance.ListItemTitle"
+                android:visibility="gone"/>
+
+            <TextView
+                android:id="@+id/add_point_before_text"
+                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/add_point_before_icon"
+                android:layout_toRightOf="@id/add_point_before_icon"
+                android:text="@string/add_point_before"
+                android:textAppearance="@style/TextAppearance.ListItemTitle"
+                android:visibility="gone"/>
         </RelativeLayout>
 
         <View
@@ -203,7 +263,7 @@
         </LinearLayout>
 
         <RelativeLayout
-            android:id="@+id/move_point_mode_controls"
+            android:id="@+id/selected_point_controls"
             android:layout_width="0dp"
             android:layout_height="52dp"
             android:layout_weight="0.6"
diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index fbd84bddd8..2528043da9 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -52,7 +52,37 @@
                 android:layout_marginStart="16dp"
                 android:background="@null"
                 android:visibility="gone"
-                tools:src="@drawable/ic_action_measure_point"/>
+                tools:src="@drawable/ic_action_move_point"/>
+
+            <ImageView
+                android:id="@+id/add_point_after_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_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:background="@null"
+                android:visibility="gone"
+                tools:src="@drawable/ic_action_addpoint_above"/>
+
+            <ImageView
+                android:id="@+id/add_point_before_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_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:background="@null"
+                android:visibility="gone"
+                tools:src="@drawable/ic_action_addpoint_below"/>
 
             <ImageView
                 android:id="@+id/up_down_button"
@@ -107,6 +137,36 @@
                 android:text="@string/move_point"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 android:visibility="gone"/>
+
+            <TextView
+                android:id="@+id/add_point_after_text"
+                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/add_point_after_icon"
+                android:layout_toRightOf="@id/add_point_after_icon"
+                android:text="@string/add_point_after"
+                android:textAppearance="@style/TextAppearance.ListItemTitle"
+                android:visibility="gone"/>
+
+            <TextView
+                android:id="@+id/add_point_before_text"
+                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/add_point_before_icon"
+                android:layout_toRightOf="@id/add_point_before_icon"
+                android:text="@string/add_point_before"
+                android:textAppearance="@style/TextAppearance.ListItemTitle"
+                android:visibility="gone"/>
         </RelativeLayout>
 
         <View
@@ -225,7 +285,7 @@
         </LinearLayout>
 
         <RelativeLayout
-            android:id="@+id/move_point_mode_controls"
+            android:id="@+id/selected_point_controls"
             android:layout_width="match_parent"
             android:layout_height="52dp"
             android:visibility="gone">
diff --git a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
index a914596ba7..1c4798d06c 100644
--- a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
@@ -191,7 +191,7 @@
     <FrameLayout
         android:id="@+id/cancel_row"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/snap_to_road_bottom_sheet_cancel_button_height"
+        android:layout_height="@dimen/measure_distance_bottom_sheet_cancel_button_height"
         android:background="?attr/selectableItemBackground">
 
         <TextView
diff --git a/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml
new file mode 100644
index 0000000000..5c124ca9fb
--- /dev/null
+++ b/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/bg_color"
+    android:orientation="vertical">
+
+    <ScrollView
+        android:id="@+id/selected_point_options_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:paddingBottom="8dp"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:minHeight="56dp"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp">
+
+                <ImageView
+                    android:id="@+id/selected_point_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginRight="24dp"
+                    tools:src="@drawable/ic_action_measure_point"/>
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_toEndOf="@id/selected_point_icon"
+                    android:layout_toRightOf="@id/selected_point_icon"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:id="@+id/selected_point_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:maxLines="1"
+                        tools:text="Point 2"
+                        android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+
+                    <TextView
+                        android:id="@+id/selected_point_distance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:maxLines="1"
+                        android:textColor="?android:textColorSecondary"
+                        android:textSize="@dimen/default_list_text_size"
+                        tools:text="386 m"
+                        android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+
+                </LinearLayout>
+
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="?attr/dashboard_divider"
+                android:layout_marginBottom="8dp"/>
+
+            <RelativeLayout
+                android:id="@+id/move_point_row"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?attr/selectableItemBackground"
+                android:minHeight="48dp"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp">
+
+                <ImageView
+                    android:id="@+id/move_point_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginRight="24dp"
+                    tools:src="@drawable/ic_action_move_point"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@id/move_point_icon"
+                    android:layout_toRightOf="@id/move_point_icon"
+                    android:maxLines="1"
+                    android:text="@string/shared_string_move"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/delete_point_row"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?attr/selectableItemBackground"
+                android:minHeight="48dp"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp">
+
+                <ImageView
+                    android:id="@+id/delete_point_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginRight="24dp"
+                    tools:src="@drawable/ic_action_remove_dark"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@id/delete_point_icon"
+                    android:layout_toRightOf="@id/delete_point_icon"
+                    android:maxLines="1"
+                    android:text="@string/shared_string_delete"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+            </RelativeLayout>
+
+            <View
+                android:layout_width="wrap_content"
+                android:layout_height="1dp"
+                android:layout_marginBottom="8dp"
+                android:layout_marginLeft="64dp"
+                android:layout_marginStart="64dp"
+                android:layout_marginTop="7dp"
+                android:background="?attr/dashboard_divider"/>
+
+            <RelativeLayout
+                android:id="@+id/add_point_after_row"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?attr/selectableItemBackground"
+                android:minHeight="48dp"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp">
+
+                <ImageView
+                    android:id="@+id/add_point_after_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginRight="24dp"
+                    tools:src="@drawable/ic_action_addpoint_above"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@id/add_point_after_icon"
+                    android:layout_toRightOf="@id/add_point_after_icon"
+                    android:maxLines="1"
+                    android:text="@string/add_point_after"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/add_point_before_row"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?attr/selectableItemBackground"
+                android:minHeight="48dp"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp">
+
+                <ImageView
+                    android:id="@+id/add_point_before_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginRight="24dp"
+                    tools:src="@drawable/ic_action_addpoint_below"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@id/add_point_before_icon"
+                    android:layout_toRightOf="@id/add_point_before_icon"
+                    android:maxLines="1"
+                    android:text="@string/add_point_before"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+            </RelativeLayout>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?attr/dashboard_divider"/>
+
+    <FrameLayout
+        android:id="@+id/cancel_row"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/measure_distance_bottom_sheet_cancel_button_height"
+        android:background="?attr/selectableItemBackground">
+
+        <TextView
+            android:id="@+id/cancel_row_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/shared_string_close"
+            android:textAllCaps="true"
+            android:textColor="?attr/color_dialog_buttons"
+            android:textSize="14sp"
+            android:textStyle="bold"/>
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
index 068d513c30..aa2a6a3c64 100644
--- a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
@@ -47,7 +47,7 @@
     <FrameLayout
         android:id="@+id/cancel_row"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/snap_to_road_bottom_sheet_cancel_button_height"
+        android:layout_height="@dimen/measure_distance_bottom_sheet_cancel_button_height"
         android:background="?attr/selectableItemBackground">
 
         <TextView
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index d1cb1205ec..1c027babfc 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -156,6 +156,6 @@
 	<dimen name="my_places_empty_state_text_button_padding_right">60dp</dimen>
 	<dimen name="my_places_empty_state_text_button_padding_top">64dp</dimen>
 
-    <dimen name="snap_to_road_bottom_sheet_cancel_button_height">48dp</dimen>
+    <dimen name="measure_distance_bottom_sheet_cancel_button_height">48dp</dimen>
 	<dimen name="landscape_bottom_sheet_dialog_fragment_width">360dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 569af28fe3..385cac0b04 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="add_point_before">Add point before</string>
+    <string name="add_point_after">Add point after</string>
     <string name="shared_string_options">Options</string>
     <string name="measurement_tool_snap_to_road_descr">OsmAnd will add additional points, depending on the navigation type.</string>
     <string name="choose_navigation_type">Choose navigation type</string>
diff --git a/OsmAnd/src/net/osmand/AndroidUtils.java b/OsmAnd/src/net/osmand/AndroidUtils.java
index 1aebe7c028..1bece94017 100644
--- a/OsmAnd/src/net/osmand/AndroidUtils.java
+++ b/OsmAnd/src/net/osmand/AndroidUtils.java
@@ -172,6 +172,27 @@ public class AndroidUtils {
 		return result;
 	}
 
+	public static int getNavBarHeight(Context ctx) {
+		if (!hasNavBar(ctx)) {
+			return 0;
+		}
+		boolean landscape = ctx.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
+		boolean isSmartphone = ctx.getResources().getConfiguration().smallestScreenWidthDp < 600;
+		if (isSmartphone && landscape) {
+			return 0;
+		}
+		int id = ctx.getResources().getIdentifier(landscape ? "navigation_bar_height_landscape" : "navigation_bar_height", "dimen", "android");
+		if (id > 0) {
+			return ctx.getResources().getDimensionPixelSize(id);
+		}
+		return 0;
+	}
+
+	public static boolean hasNavBar(Context ctx) {
+		int id = ctx.getResources().getIdentifier("config_showNavigationBar", "bool", "android");
+		return id > 0 && ctx.getResources().getBoolean(id);
+	}
+
 	public static int getScreenHeight(Activity activity) {
 		DisplayMetrics dm = new DisplayMetrics();
 		activity.getWindowManager().getDefaultDisplay().getMetrics(dm);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 85770c46d6..891f0a64e0 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -93,6 +93,10 @@ public class MeasurementToolFragment extends Fragment {
 	private NewGpxLine newGpxLine;
 
 	private boolean inMovePointMode;
+	private boolean inAddPointAfterMode;
+	private boolean inAddPointBeforeMode;
+
+	private int positionToAddPoint = -1;
 
 	public void setNewGpxLine(NewGpxLine newGpxLine) {
 		this.newGpxLine = newGpxLine;
@@ -130,7 +134,13 @@ public class MeasurementToolFragment extends Fragment {
 				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_ruler, R.color.color_myloc_distance));
 
 		((ImageView) mainView.findViewById(R.id.move_point_icon))
-				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_measure_point, R.color.color_myloc_distance));
+				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_move_point, R.color.color_myloc_distance));
+
+		((ImageView) mainView.findViewById(R.id.add_point_after_icon))
+				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_addpoint_above, R.color.color_myloc_distance));
+
+		((ImageView) mainView.findViewById(R.id.add_point_before_icon))
+				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_addpoint_below, R.color.color_myloc_distance));
 
 		upDownBtn = (ImageView) mainView.findViewById(R.id.up_down_button);
 		upDownBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
@@ -138,7 +148,13 @@ public class MeasurementToolFragment extends Fragment {
 		mainView.findViewById(R.id.cancel_point_button).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				cancelMovePointMode();
+				if (inMovePointMode) {
+					cancelMovePointMode();
+				} else if (inAddPointAfterMode) {
+					cancelAddPointAfterMode();
+				} else if (inAddPointBeforeMode) {
+					cancelAddPointBeforeMode();
+				}
 			}
 		});
 
@@ -146,7 +162,7 @@ public class MeasurementToolFragment extends Fragment {
 		upDownRow.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				if (!pointsListOpened && measurementLayer.getPointsCount() > 0 && !measurementLayer.isInMovePointMode()) {
+				if (!pointsListOpened && measurementLayer.getPointsCount() > 0 && !measurementLayer.isInMovePointMode() && !measurementLayer.isInAddPointAfterMode() && !measurementLayer.isInAddPointBeforeMode()) {
 					showPointsList();
 				} else {
 					hidePointsList();
@@ -157,7 +173,13 @@ public class MeasurementToolFragment extends Fragment {
 		mainView.findViewById(R.id.apply_point_button).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				applyMovePointMode();
+				if (inMovePointMode) {
+					applyMovePointMode();
+				} else if (inAddPointAfterMode) {
+					applyAddPointAfterMode();
+				} else if (inAddPointBeforeMode) {
+					applyAddPointBeforeMode();
+				}
 			}
 		});
 
@@ -267,9 +289,14 @@ public class MeasurementToolFragment extends Fragment {
 
 		measurementLayer.setOnSingleTapListener(new MeasurementToolLayer.OnSingleTapListener() {
 			@Override
-			public void onSingleTap() {
+			public void onAddPoint() {
 				addPoint();
 			}
+
+			@Override
+			public void onSelectPoint() {
+				openSelectedPointMenu(mapActivity);
+			}
 		});
 
 		measurementLayer.setOnEnterMovePointModeListener(new MeasurementToolLayer.OnEnterMovePointModeListener() {
@@ -362,6 +389,54 @@ public class MeasurementToolFragment extends Fragment {
 		return view;
 	}
 
+	private void openSelectedPointMenu(MapActivity mapActivity) {
+		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
+
+		SelectedPointMenuBottomSheetDialogFragment fragment = new SelectedPointMenuBottomSheetDialogFragment();
+		fragment.setSelectedPointOptionOnClickListener(new SelectedPointMenuBottomSheetDialogFragment.SelectedPointOptionOnClickListener() {
+			@Override
+			public void moveOnClick() {
+				if (measurementLayer != null) {
+					measurementLayer.enterMovingPointMode();
+				}
+				enterMovePointMode();
+			}
+
+			@Override
+			public void deleteOnClick() {
+				if (measurementLayer != null) {
+					int position = measurementLayer.getSelectedPointPos();
+					commandManager.execute(new RemovePointCommand(measurementLayer, position));
+					adapter.notifyDataSetChanged();
+					disable(redoBtn);
+					updateText();
+					saved = false;
+					hidePointsListIfNoPoints();
+					measurementLayer.clearSelection();
+				}
+			}
+
+			@Override
+			public void addPointAfterOnClick() {
+				if (measurementLayer != null) {
+					positionToAddPoint = measurementLayer.getSelectedPointPos() + 1;
+					measurementLayer.enterAddingPointAfterMode();
+				}
+				enterAddPointAfterMode();
+			}
+
+			@Override
+			public void addPointBeforeOnClick() {
+				if (measurementLayer != null) {
+					positionToAddPoint = measurementLayer.getSelectedPointPos();
+					measurementLayer.enterAddingPointBeforeMode();
+				}
+				enterAddPointBeforeMode();
+			}
+		});
+		fragment.show(mapActivity.getSupportFragmentManager(), SelectedPointMenuBottomSheetDialogFragment.TAG);
+	}
+
 	private AlertDialog showAddSegmentDialog(final MapActivity mapActivity) {
 		CallbackWithObject<GPXFile[]> callbackWithObject = new CallbackWithObject<GPXFile[]>() {
 			@Override
@@ -384,10 +459,37 @@ public class MeasurementToolFragment extends Fragment {
 		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
 		if (measurementToolLayer != null) {
 			measurementToolLayer.exitMovePointMode();
+			measurementToolLayer.clearSelection();
 			measurementToolLayer.refreshMap();
 		}
 	}
 
+	private void cancelAddPointAfterMode() {
+		if (inAddPointAfterMode) {
+			exitAddPointAfterMode();
+		}
+		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
+		if (measurementToolLayer != null) {
+			measurementToolLayer.exitAddPointAfterMode();
+			measurementToolLayer.clearSelection();
+			measurementToolLayer.refreshMap();
+		}
+		positionToAddPoint = -1;
+	}
+
+	private void cancelAddPointBeforeMode() {
+		if (inAddPointBeforeMode) {
+			exitAddPointBeforeMode();
+		}
+		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
+		if (measurementToolLayer != null) {
+			measurementToolLayer.exitAddPointBeforeMode();
+			measurementToolLayer.clearSelection();
+			measurementToolLayer.refreshMap();
+		}
+		positionToAddPoint = -1;
+	}
+
 	private void applyMovePointMode() {
 		if (inMovePointMode) {
 			exitMovePointMode();
@@ -395,8 +497,8 @@ public class MeasurementToolFragment extends Fragment {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
 			WptPt newPoint = measurementLayer.getMovedPointToApply();
-			WptPt oldPoint = measurementLayer.getPointBeforeMovement();
-			int position = measurementLayer.getMovePointPosition();
+			WptPt oldPoint = measurementLayer.getSelectedCachedPoint();
+			int position = measurementLayer.getSelectedPointPos();
 			commandManager.execute(new MovePointCommand(measurementLayer, oldPoint, newPoint, position));
 			enable(undoBtn, upDownBtn);
 			disable(redoBtn);
@@ -404,10 +506,39 @@ public class MeasurementToolFragment extends Fragment {
 			adapter.notifyDataSetChanged();
 			saved = false;
 			measurementLayer.exitMovePointMode();
+			measurementLayer.clearSelection();
 			measurementLayer.refreshMap();
 		}
 	}
 
+	private void applyAddPointAfterMode() {
+		if (inAddPointAfterMode) {
+			exitAddPointAfterMode();
+		}
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (measurementLayer != null && positionToAddPoint != -1) {
+			addPointToPosition(positionToAddPoint);
+			measurementLayer.exitAddPointAfterMode();
+			measurementLayer.clearSelection();
+			measurementLayer.refreshMap();
+		}
+		positionToAddPoint = -1;
+	}
+
+	private void applyAddPointBeforeMode() {
+		if (inAddPointBeforeMode) {
+			exitAddPointBeforeMode();
+		}
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (measurementLayer != null && positionToAddPoint != -1) {
+			addPointToPosition(positionToAddPoint);
+			measurementLayer.exitAddPointBeforeMode();
+			measurementLayer.clearSelection();
+			measurementLayer.refreshMap();
+		}
+		positionToAddPoint = -1;
+	}
+
 	private void enterMovePointMode() {
 		inMovePointMode = true;
 		mark(View.GONE,
@@ -419,7 +550,7 @@ public class MeasurementToolFragment extends Fragment {
 		mark(View.VISIBLE,
 				R.id.move_point_icon,
 				R.id.move_point_text,
-				R.id.move_point_mode_controls);
+				R.id.selected_point_controls);
 	}
 
 	private void exitMovePointMode() {
@@ -427,7 +558,63 @@ public class MeasurementToolFragment extends Fragment {
 		mark(View.GONE,
 				R.id.move_point_icon,
 				R.id.move_point_text,
-				R.id.move_point_mode_controls);
+				R.id.selected_point_controls);
+		mark(View.VISIBLE,
+				R.id.ruler_icon,
+				R.id.measurement_distance_text_view,
+				R.id.measurement_points_text_view,
+				R.id.up_down_button,
+				R.id.measure_mode_controls);
+	}
+
+	private void enterAddPointAfterMode() {
+		inAddPointAfterMode = true;
+		mark(View.GONE,
+				R.id.ruler_icon,
+				R.id.measurement_distance_text_view,
+				R.id.measurement_points_text_view,
+				R.id.up_down_button,
+				R.id.measure_mode_controls);
+		mark(View.VISIBLE,
+				R.id.add_point_after_icon,
+				R.id.add_point_after_text,
+				R.id.selected_point_controls);
+	}
+
+	private void enterAddPointBeforeMode() {
+		inAddPointBeforeMode = true;
+		mark(View.GONE,
+				R.id.ruler_icon,
+				R.id.measurement_distance_text_view,
+				R.id.measurement_points_text_view,
+				R.id.up_down_button,
+				R.id.measure_mode_controls);
+		mark(View.VISIBLE,
+				R.id.add_point_before_icon,
+				R.id.add_point_before_text,
+				R.id.selected_point_controls);
+	}
+
+	private void exitAddPointAfterMode() {
+		inAddPointAfterMode = false;
+		mark(View.GONE,
+				R.id.add_point_after_icon,
+				R.id.add_point_after_text,
+				R.id.selected_point_controls);
+		mark(View.VISIBLE,
+				R.id.ruler_icon,
+				R.id.measurement_distance_text_view,
+				R.id.measurement_points_text_view,
+				R.id.up_down_button,
+				R.id.measure_mode_controls);
+	}
+
+	private void exitAddPointBeforeMode() {
+		inAddPointBeforeMode = false;
+		mark(View.GONE,
+				R.id.add_point_before_icon,
+				R.id.add_point_before_text,
+				R.id.selected_point_controls);
 		mark(View.VISIBLE,
 				R.id.ruler_icon,
 				R.id.measurement_distance_text_view,
@@ -460,6 +647,18 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
+	private void addPointToPosition(int position) {
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (measurementLayer != null) {
+			commandManager.execute(new AddPointCommand(measurementLayer, position));
+			enable(undoBtn, upDownBtn);
+			disable(redoBtn);
+			updateText();
+			adapter.notifyDataSetChanged();
+			saved = false;
+		}
+	}
+
 	private void showPointsList() {
 		pointsListOpened = true;
 		upDownBtn.setImageDrawable(downIcon);
@@ -848,9 +1047,24 @@ public class MeasurementToolFragment extends Fragment {
 			if (inMovePointMode) {
 				exitMovePointMode();
 			}
+			if (inAddPointAfterMode) {
+				exitAddPointAfterMode();
+			}
+			if (inAddPointBeforeMode) {
+				exitAddPointBeforeMode();
+			}
 			MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
-			if (measurementToolLayer != null && measurementToolLayer.isInMovePointMode()) {
-				measurementToolLayer.exitMovePointMode();
+			if (measurementToolLayer != null) {
+				measurementToolLayer.clearSelection();
+				if (measurementToolLayer.isInMovePointMode()) {
+					measurementToolLayer.exitMovePointMode();
+				}
+				if (measurementToolLayer.isInAddPointAfterMode()) {
+					measurementToolLayer.exitAddPointAfterMode();
+				}
+				if (measurementToolLayer.isInAddPointBeforeMode()) {
+					measurementToolLayer.exitAddPointBeforeMode();
+				}
 			}
 			if (newGpxLine != null) {
 				GPXFile gpx = newGpxLine.getGpxFile();
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 36570b068b..9effbefece 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -7,6 +7,7 @@ import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PointF;
 
+import net.osmand.AndroidUtils;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.data.QuadPoint;
@@ -29,11 +30,13 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private OsmandMapTileView view;
 	private boolean inMeasurementMode;
 	private boolean inMovePointMode;
+	private boolean inAddPointAfterMode;
+	private boolean inAddPointBeforeMode;
 	private final LinkedList<WptPt> measurementPoints = new LinkedList<>();
 	private Bitmap centerIconDay;
 	private Bitmap centerIconNight;
 	private Bitmap pointIcon;
-	private Bitmap movePointIcon;
+	private Bitmap applyingPointIcon;
 	private Paint bitmapPaint;
 	private final RenderingLineAttributes lineAttrs = new RenderingLineAttributes("measureDistanceLine");
 	private final Path path = new Path();
@@ -43,8 +46,8 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private final TIntArrayList ty = new TIntArrayList();
 	private OnSingleTapListener singleTapListener;
 	private OnEnterMovePointModeListener enterMovePointModeListener;
-	private int movePointPos;
-	private WptPt pointBeforeMovement;
+	private int selectedPointPos = -1;
+	private WptPt selectedCachedPoint;
 
 	@Override
 	public void initLayer(OsmandMapTileView view) {
@@ -53,7 +56,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		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);
-		movePointIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_mapillary_location);
+		applyingPointIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_mapillary_location);
 
 		bitmapPaint = new Paint();
 		bitmapPaint.setAntiAlias(true);
@@ -72,12 +75,12 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		this.enterMovePointModeListener = listener;
 	}
 
-	WptPt getPointBeforeMovement() {
-		return pointBeforeMovement;
+	WptPt getSelectedCachedPoint() {
+		return selectedCachedPoint;
 	}
 
-	int getMovePointPosition() {
-		return movePointPos;
+	int getSelectedPointPos() {
+		return selectedPointPos;
 	}
 
 	public boolean isInMeasurementMode() {
@@ -88,6 +91,14 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return inMovePointMode;
 	}
 
+	boolean isInAddPointAfterMode() {
+		return inAddPointAfterMode;
+	}
+
+	boolean isInAddPointBeforeMode() {
+		return inAddPointBeforeMode;
+	}
+
 	void setInMeasurementMode(boolean inMeasurementMode) {
 		this.inMeasurementMode = inMeasurementMode;
 	}
@@ -113,47 +124,69 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 
 	@Override
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
-		if (inMeasurementMode && !inMovePointMode && singleTapListener != null) {
-			singleTapListener.onSingleTap();
-		}
-		return false;
-	}
-
-	@Override
-	public boolean onLongPressEvent(PointF point, RotatedTileBox tileBox) {
-		if (inMovePointMode || measurementPoints.size() == 0) {
-			return false;
-		}
-		double pressedPointLat = tileBox.getLatFromPixel(point.x, point.y);
-		double pressedPointLon = tileBox.getLonFromPixel(point.x, point.y);
-		getPointToMove(pressedPointLat, pressedPointLon);
-		if (pointBeforeMovement != null && movePointPos != -1) {
-			enterMovingPointMode();
-			if (inMeasurementMode && inMovePointMode && enterMovePointModeListener != null) {
-				enterMovePointModeListener.onEnterMovePointMode();
+		if (singleTapListener != null) {
+			if (inMeasurementMode && !inMovePointMode && !inAddPointAfterMode && !inAddPointBeforeMode) {
+				selectPoint(point.x, point.y);
+				if (selectedPointPos != -1) {
+					singleTapListener.onSelectPoint();
+				} else {
+					singleTapListener.onAddPoint();
+				}
 			}
 		}
 		return false;
 	}
 
-	private void enterMovingPointMode() {
-		inMovePointMode = true;
-		moveMapToPoint(movePointPos);
+	public void clearSelection() {
+		selectedPointPos = -1;
+		selectedCachedPoint = null;
 	}
 
-	private void getPointToMove(double lat, double lon) {
+	@Override
+	public boolean onLongPressEvent(PointF point, RotatedTileBox tileBox) {
+		if (inMeasurementMode) {
+			if (!inMovePointMode && !inAddPointAfterMode && !inAddPointBeforeMode && measurementPoints.size() > 0) {
+				selectPoint(point.x, point.y);
+				if (selectedCachedPoint != null && selectedPointPos != -1) {
+					enterMovingPointMode();
+					if (inMeasurementMode && inMovePointMode && enterMovePointModeListener != null) {
+						enterMovePointModeListener.onEnterMovePointMode();
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+	public void enterMovingPointMode() {
+		inMovePointMode = true;
+		moveMapToPoint(selectedPointPos);
+	}
+
+	public void enterAddingPointAfterMode() {
+		inAddPointAfterMode = true;
+		moveMapToPoint(selectedPointPos);
+	}
+
+	public void enterAddingPointBeforeMode() {
+		inAddPointBeforeMode = true;
+		moveMapToPoint(selectedPointPos);
+	}
+
+	private void selectPoint(double x, double y) {
+		clearSelection();
 		RotatedTileBox tb = view.getCurrentRotatedTileBox();
-		double lowestDistance = Double.MAX_VALUE;
+		double lowestDistance = AndroidUtils.dpToPx(view.getContext(), 10);
 		for (int i = 0; i < measurementPoints.size(); i++) {
 			WptPt pt = measurementPoints.get(i);
 			if (tb.containsLatLon(pt.getLatitude(), pt.getLongitude())) {
-				double latDiff = pt.getLatitude() - lat;
-				double lonDiff = pt.getLongitude() - lon;
-				double distToPoint = Math.sqrt(Math.pow(latDiff, 2) + Math.pow(lonDiff, 2));
+				double xDiff = tb.getPixXFromLonNoRot(pt.getLongitude()) - x;
+				double yDiff = tb.getPixYFromLatNoRot(pt.getLatitude()) - y;
+				double distToPoint = Math.sqrt(Math.pow(xDiff, 2) + Math.pow(yDiff, 2));
 				if (distToPoint < lowestDistance) {
 					lowestDistance = distToPoint;
-					pointBeforeMovement = new WptPt(pt);
-					movePointPos = i;
+					selectedCachedPoint = new WptPt(pt);
+					selectedPointPos = i;
 				}
 			}
 		}
@@ -163,7 +196,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings settings) {
 		if (inMeasurementMode) {
 			lineAttrs.updatePaints(view, settings, tb);
-			if (!inMovePointMode) {
+			if (!inMovePointMode && !inAddPointAfterMode && !inAddPointBeforeMode) {
 				drawCenterIcon(canvas, tb, tb.getCenterPixelPoint(), settings.isNightMode());
 			}
 
@@ -175,7 +208,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 					WptPt pt = measurementPoints.get(i);
 					int locX;
 					int locY;
-					if (inMovePointMode && movePointPos == i) {
+					if (selectedPointPos == i && (inMovePointMode || inAddPointAfterMode || inAddPointBeforeMode)) {
 						locX = tb.getCenterPixelX();
 						locY = tb.getCenterPixelY();
 					} else {
@@ -183,14 +216,56 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 						locY = tb.getPixYFromLatNoRot(pt.lat);
 					}
 					if (i == 0) {
-						path.moveTo(locX, locY);
+						if (inAddPointAfterMode) {
+							int previousLocX = tb.getPixXFromLonNoRot(pt.lon);
+							int previousLocY = tb.getPixYFromLatNoRot(pt.lat);
+							path.moveTo(previousLocX, previousLocY);
+							tx.add(previousLocX);
+							ty.add(previousLocY);
+							path.lineTo(locX, locY);
+							tx.add(locX);
+							ty.add(locY);
+						} else if (inAddPointBeforeMode) {
+							path.moveTo(locX, locY);
+							tx.add(locX);
+							ty.add(locY);
+							int followingLocX = tb.getPixXFromLonNoRot(pt.lon);
+							int followingLocY = tb.getPixYFromLatNoRot(pt.lat);
+							path.lineTo(followingLocX, followingLocY);
+							tx.add(followingLocX);
+							ty.add(followingLocY);
+						} else {
+							path.moveTo(locX, locY);
+							tx.add(locX);
+							ty.add(locY);
+						}
 					} else {
-						path.lineTo(locX, locY);
+						if (inAddPointAfterMode) {
+							int previousLocX = tb.getPixXFromLonNoRot(pt.lon);
+							int previousLocY = tb.getPixYFromLatNoRot(pt.lat);
+							path.lineTo(previousLocX, previousLocY);
+							tx.add(previousLocX);
+							ty.add(previousLocY);
+							path.lineTo(locX, locY);
+							tx.add(locX);
+							ty.add(locY);
+						} else if (inAddPointBeforeMode) {
+							path.lineTo(locX, locY);
+							tx.add(locX);
+							ty.add(locY);
+							int followingLocX = tb.getPixXFromLonNoRot(pt.lon);
+							int followingLocY = tb.getPixYFromLatNoRot(pt.lat);
+							path.lineTo(followingLocX, followingLocY);
+							tx.add(followingLocX);
+							ty.add(followingLocY);
+						} else {
+							path.lineTo(locX, locY);
+							tx.add(locX);
+							ty.add(locY);
+						}
 					}
-					tx.add(locX);
-					ty.add(locY);
 				}
-				if (!inMovePointMode) {
+				if (!inMovePointMode && !inAddPointAfterMode && !inAddPointBeforeMode) {
 					path.lineTo(tb.getCenterPixelX(), tb.getCenterPixelY());
 					tx.add(tb.getCenterPixelX());
 					ty.add(tb.getCenterPixelY());
@@ -201,7 +276,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 				WptPt pointToDrawOnTop = null;
 				for (int i = 0; i < measurementPoints.size(); i++) {
 					WptPt pt = measurementPoints.get(i);
-					if (inMovePointMode && i == movePointPos) {
+					if (inMovePointMode && i == selectedPointPos) {
 						pointToDrawOnTop = pt;
 					} else {
 						if (tb.containsLatLon(pt.lat, pt.lon)) {
@@ -211,10 +286,10 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 						}
 					}
 				}
-				if (pointToDrawOnTop != null) {
+				if (inAddPointAfterMode || inAddPointBeforeMode || pointToDrawOnTop != null) {
 					int locX = tb.getCenterPixelX();
 					int locY = tb.getCenterPixelY();
-					canvas.drawBitmap(movePointIcon, locX - marginX, locY - marginY, bitmapPaint);
+					canvas.drawBitmap(applyingPointIcon, locX - marginX, locY - marginY, bitmapPaint);
 				}
 			}
 		}
@@ -222,8 +297,14 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 
 	void exitMovePointMode() {
 		inMovePointMode = false;
-		movePointPos = -1;
-		pointBeforeMovement = null;
+	}
+
+	public void exitAddPointAfterMode() {
+		inAddPointAfterMode = false;
+	}
+
+	public void exitAddPointBeforeMode() {
+		inAddPointBeforeMode = false;
 	}
 
 	private void drawCenterIcon(Canvas canvas, RotatedTileBox tb, QuadPoint center, boolean nightMode) {
@@ -255,7 +336,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	WptPt getMovedPointToApply() {
 		RotatedTileBox tb = view.getCurrentRotatedTileBox();
 		LatLon latLon = tb.getCenterLatLon();
-		WptPt pt = measurementPoints.get(movePointPos);
+		WptPt pt = measurementPoints.get(selectedPointPos);
 		pt.lat = latLon.getLatitude();
 		pt.lon = latLon.getLongitude();
 		return pt;
@@ -318,7 +399,10 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	}
 
 	interface OnSingleTapListener {
-		void onSingleTap();
+
+		void onAddPoint();
+
+		void onSelectPoint();
 	}
 
 	interface OnEnterMovePointModeListener {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
new file mode 100644
index 0000000000..f5e251344d
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
@@ -0,0 +1,171 @@
+package net.osmand.plus.measurementtool;
+
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.Nullable;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import net.osmand.AndroidUtils;
+import net.osmand.plus.GPXUtilities.WptPt;
+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.base.BottomSheetDialogFragment;
+import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.util.MapUtils;
+
+import java.util.List;
+
+public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialogFragment{
+	public final static String TAG = "SelectedPointMenuBottomSheetDialogFragment";
+
+	private SelectedPointOptionOnClickListener listener;
+
+	public void setSelectedPointOptionOnClickListener(SelectedPointOptionOnClickListener listener) {
+		this.listener = listener;
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		final MapActivity mapActivity = (MapActivity) getActivity();
+		final IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
+		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
+		final boolean portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
+
+		final boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
+
+		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_selected_menu_bottom_sheet_dialog, null);
+		if (portrait) {
+			AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
+		}
+
+		((ImageView) mainView.findViewById(R.id.selected_point_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_measure_point, R.color.color_myloc_distance));
+		((ImageView) mainView.findViewById(R.id.move_point_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_move_point));
+		((ImageView) mainView.findViewById(R.id.delete_point_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_remove_dark));
+		((ImageView) mainView.findViewById(R.id.add_point_after_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_addpoint_above));
+		((ImageView) mainView.findViewById(R.id.add_point_before_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_addpoint_below));
+
+		mainView.findViewById(R.id.move_point_row).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (listener != null) {
+					listener.moveOnClick();
+				}
+				dismiss();
+			}
+		});
+		mainView.findViewById(R.id.delete_point_row).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (listener != null) {
+					listener.deleteOnClick();
+				}
+				dismiss();
+			}
+		});
+		mainView.findViewById(R.id.add_point_after_row).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (listener != null) {
+					listener.addPointAfterOnClick();
+				}
+				dismiss();
+			}
+		});
+		mainView.findViewById(R.id.add_point_before_row).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (listener != null) {
+					listener.addPointBeforeOnClick();
+				}
+				dismiss();
+			}
+		});
+		mainView.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				dismiss();
+			}
+		});
+
+		List<WptPt> points = measurementLayer.getMeasurementPoints();
+		int pos = measurementLayer.getSelectedPointPos();
+		((TextView) mainView.findViewById(R.id.selected_point_title)).setText(mapActivity.getString(R.string.plugin_distance_point) + " " + (pos + 1));
+		if (pos < 1) {
+			((TextView) mainView.findViewById(R.id.selected_point_distance)).setText(mapActivity.getString(R.string.shared_string_control_start));
+		} else {
+			float dist = 0;
+			for (int i = 1; i <= pos; i++) {
+				dist += MapUtils.getDistance(points.get(i - 1).lat, points.get(i - 1).lon, points.get(i).lat, points.get(i).lon);
+			}
+			((TextView) mainView.findViewById(R.id.selected_point_distance)).setText(OsmAndFormatter.getFormattedDistance(dist, mapActivity.getMyApplication()));
+		}
+
+		final int height = AndroidUtils.getScreenHeight(getActivity());
+		final int statusbarHeight = AndroidUtils.getStatusBarHeight(getActivity());
+
+		mainView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+			@Override
+			public void onGlobalLayout() {
+				final View scrollView = mainView.findViewById(R.id.selected_point_options_scroll_view);
+				int scrollViewHeight = scrollView.getHeight();
+				int dividerHeight = AndroidUtils.dpToPx(getContext(), 1);
+				int cancelButtonHeight = getContext().getResources().getDimensionPixelSize(R.dimen.measure_distance_bottom_sheet_cancel_button_height);
+				int spaceForScrollView = height - statusbarHeight - AndroidUtils.getNavBarHeight(getActivity()) - dividerHeight - cancelButtonHeight;
+				if (scrollViewHeight > spaceForScrollView) {
+					scrollView.getLayoutParams().height = spaceForScrollView;
+					scrollView.requestLayout();
+				}
+
+				ViewTreeObserver obs = mainView.getViewTreeObserver();
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+					obs.removeOnGlobalLayoutListener(this);
+				} else {
+					obs.removeGlobalOnLayoutListener(this);
+				}
+			}
+		});
+
+		return mainView;
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		if (!AndroidUiHelper.isOrientationPortrait(getActivity())) {
+			final Window window = getDialog().getWindow();
+			WindowManager.LayoutParams params = window.getAttributes();
+			params.width = getActivity().getResources().getDimensionPixelSize(R.dimen.landscape_bottom_sheet_dialog_fragment_width);
+			window.setAttributes(params);
+		}
+	}
+
+	@Override
+	protected Drawable getContentIcon(@DrawableRes int id) {
+		return getIcon(id, getMyApplication().getSettings().isLightContent() ? R.color.on_map_icon_color : 0);
+	}
+
+	interface SelectedPointOptionOnClickListener {
+
+		void moveOnClick();
+
+		void deleteOnClick();
+
+		void addPointAfterOnClick();
+
+		void addPointBeforeOnClick();
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index 81a6794140..c8c4a874e6 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -64,8 +64,8 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 				final View scrollView = view.findViewById(R.id.navigation_types_scroll_view);
 				int scrollViewHeight = scrollView.getHeight();
 				int dividerHeight = AndroidUtils.dpToPx(getContext(), 1);
-				int cancelButtonHeight = getContext().getResources().getDimensionPixelSize(R.dimen.snap_to_road_bottom_sheet_cancel_button_height);
-				int spaceForScrollView = height - statusbarHeight - getNavBarHeight() - dividerHeight - cancelButtonHeight;
+				int cancelButtonHeight = getContext().getResources().getDimensionPixelSize(R.dimen.measure_distance_bottom_sheet_cancel_button_height);
+				int spaceForScrollView = height - statusbarHeight - AndroidUtils.getNavBarHeight(getActivity()) - dividerHeight - cancelButtonHeight;
 				if (scrollViewHeight > spaceForScrollView) {
 					scrollView.getLayoutParams().height = spaceForScrollView;
 					scrollView.requestLayout();
@@ -93,25 +93,4 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 			window.setAttributes(params);
 		}
 	}
-
-	private int getNavBarHeight() {
-		if (!hasNavBar()) {
-			return 0;
-		}
-		boolean landscape = getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
-		boolean isSmartphone = getResources().getConfiguration().smallestScreenWidthDp < 600;
-		if (isSmartphone && landscape) {
-			return 0;
-		}
-		int id = getResources().getIdentifier(landscape ? "navigation_bar_height_landscape" : "navigation_bar_height", "dimen", "android");
-		if (id > 0) {
-			return getResources().getDimensionPixelSize(id);
-		}
-		return 0;
-	}
-
-	private boolean hasNavBar() {
-		int id = getResources().getIdentifier("config_showNavigationBar", "bool", "android");
-		return id > 0 && getResources().getBoolean(id);
-	}
 }

From 643abea7bce47f3bacde4a129ddda66f35fdf8f2 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 15 Aug 2017 10:28:16 +0300
Subject: [PATCH 088/174] Fab open map to track

---
 OsmAnd/src/net/osmand/plus/activities/MapActivity.java   | 2 ++
 OsmAnd/src/net/osmand/plus/activities/TrackActivity.java | 6 ++++--
 .../osmand/plus/views/AddGpxPointBottomSheetHelper.java  | 9 ++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 24a0d625e9..1d7d3e212b 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -937,6 +937,8 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 					mapView.fitRectToMap(qr.left, qr.right, qr.top, qr.bottom, (int) qr.width(), (int) qr.height(), 0);
 				} else if (toShow instanceof NewGpxPoint) {
 					NewGpxPoint newGpxPoint = (NewGpxPoint) toShow;
+					QuadRect qr = newGpxPoint.getRect();
+					mapView.fitRectToMap(qr.left, qr.right, qr.top, qr.bottom, (int) qr.width(), (int) qr.height(), 0);
 					getMapLayers().getContextMenuLayer().enterAddGpxPointMode(newGpxPoint);
 				} else if (toShow instanceof NewGpxLine) {
 					NewGpxLine newGpxLine = (NewGpxLine) toShow;
diff --git a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
index b848b69551..829bcc4c7b 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
@@ -31,7 +31,7 @@ import net.osmand.plus.myplaces.FavoritesActivity;
 import net.osmand.plus.myplaces.SplitSegmentFragment;
 import net.osmand.plus.myplaces.TrackPointFragment;
 import net.osmand.plus.myplaces.TrackSegmentFragment;
-import net.osmand.plus.views.AddGpxPointBottomSheetHelper;
+import net.osmand.plus.views.AddGpxPointBottomSheetHelper.NewGpxPoint;
 import net.osmand.plus.views.controls.PagerSlidingTabStrip;
 
 import java.io.File;
@@ -99,12 +99,14 @@ public class TrackActivity extends TabActivity {
 		final OsmandSettings settings = app.getSettings();
 		GPXFile gpx = getGpx();
 		LatLon location = settings.getLastKnownMapLocation();
+		QuadRect rect = getRect();
+		NewGpxPoint newGpxPoint = new NewGpxPoint(gpx, pointDescription, rect);
 		if (gpx != null && location != null) {
 			settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
 					settings.getLastKnownMapZoom(),
 					pointDescription,
 					false,
-					new AddGpxPointBottomSheetHelper.NewGpxPoint(gpx, pointDescription));
+					newGpxPoint);
 
 			MapActivity.launchMapActivityMoveToTop(this);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java b/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java
index fa242d42cf..f2fc81faa7 100644
--- a/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java
+++ b/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java
@@ -8,6 +8,7 @@ import android.widget.TextView;
 
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
+import net.osmand.data.QuadRect;
 import net.osmand.data.RotatedTileBox;
 import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.IconsCache;
@@ -143,10 +144,12 @@ public class AddGpxPointBottomSheetHelper implements OnDismissListener {
 	public static class NewGpxPoint {
 		private PointDescription pointDescription;
 		private GPXFile gpx;
+		private QuadRect rect;
 
-		public NewGpxPoint(GPXFile gpx, PointDescription pointDescription) {
+		public NewGpxPoint(GPXFile gpx, PointDescription pointDescription, QuadRect rect) {
 			this.gpx = gpx;
 			this.pointDescription = pointDescription;
+			this.rect = rect;
 		}
 
 		public GPXFile getGpx() {
@@ -156,5 +159,9 @@ public class AddGpxPointBottomSheetHelper implements OnDismissListener {
 		public PointDescription getPointDescription() {
 			return pointDescription;
 		}
+
+		public QuadRect getRect() {
+			return rect;
+		}
 	}
 }

From 3186b1b63a9cb700567f68aea5834e2e552a7ff5 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 15 Aug 2017 11:15:52 +0300
Subject: [PATCH 089/174] Add scroll ability to options menu; add some
 improvements

---
 .../layout-land/fragment_measurement_tool.xml |   4 +-
 .../fragment_options_bottom_sheet_dialog.xml  | 326 +++++++++---------
 ...ment_selected_menu_bottom_sheet_dialog.xml |  22 +-
 .../OptionsBottomSheetDialogFragment.java     |  28 ++
 ...tedPointMenuBottomSheetDialogFragment.java |   7 +-
 .../SnapToRoadBottomSheetDialogFragment.java  |   6 +-
 6 files changed, 218 insertions(+), 175 deletions(-)

diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
index 33399082d1..c237fc1f6f 100644
--- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -20,7 +20,7 @@
             android:id="@+id/up_down_row"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="0.4"
+            android:layout_weight="0.45"
             android:background="?attr/selectableItemBackground"
             android:paddingBottom="14dp"
             android:paddingTop="14dp">
@@ -178,7 +178,7 @@
             android:id="@+id/measure_mode_controls"
             android:layout_width="0dp"
             android:layout_height="52dp"
-            android:layout_weight="0.6">
+            android:layout_weight="0.55">
 
             <FrameLayout
                 android:layout_width="0dp"
diff --git a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
index 1c4798d06c..d11c91aaad 100644
--- a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
@@ -8,184 +8,198 @@
     android:background="?attr/bg_color"
     android:orientation="vertical">
 
-    <net.osmand.plus.widgets.TextViewEx
+    <ScrollView
+        android:id="@+id/measure_options_scroll_view"
         android:layout_width="match_parent"
-        android:layout_height="52dp"
-        android:gravity="center_vertical"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp"
-        android:text="@string/shared_string_options"
-        android:textAppearance="@style/TextAppearance.ListItemTitle"
-        osmand:typeface="@string/font_roboto_medium"/>
+        android:layout_height="wrap_content">
 
-    <RelativeLayout
-        android:id="@+id/snap_to_road_row"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:background="?attr/selectableItemBackground"
-        android:minHeight="48dp"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp">
-
-        <ImageView
-            android:id="@+id/snap_to_road_icon"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="24dp"
-            android:layout_marginRight="24dp"
-            tools:src="@drawable/ic_action_snap_to_road"/>
+            android:orientation="vertical"
+            android:paddingBottom="8dp">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/snap_to_road_icon"
-            android:layout_toRightOf="@id/snap_to_road_icon"
-            android:maxLines="1"
-            android:text="@string/snap_to_road"
-            android:textAppearance="@style/TextAppearance.ListItemTitle"/>
-    </RelativeLayout>
+            <net.osmand.plus.widgets.TextViewEx
+                android:layout_width="match_parent"
+                android:layout_height="52dp"
+                android:gravity="center_vertical"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp"
+                android:text="@string/shared_string_options"
+                android:textAppearance="@style/TextAppearance.ListItemTitle"
+                osmand:typeface="@string/font_roboto_medium"/>
 
-    <View
-        android:layout_width="wrap_content"
-        android:layout_height="1dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginLeft="64dp"
-        android:layout_marginStart="64dp"
-        android:layout_marginTop="7dp"
-        android:background="?attr/dashboard_divider"/>
+            <RelativeLayout
+                android:id="@+id/snap_to_road_row"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?attr/selectableItemBackground"
+                android:minHeight="48dp"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp">
 
-    <RelativeLayout
-        android:id="@+id/save_as_new_segment_row"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:background="?attr/selectableItemBackground"
-        android:minHeight="48dp"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp"
-        android:visibility="gone">
+                <ImageView
+                    android:id="@+id/snap_to_road_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginRight="24dp"
+                    tools:src="@drawable/ic_action_snap_to_road"/>
 
-        <ImageView
-            android:id="@+id/save_as_new_segment_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="24dp"
-            android:layout_marginRight="24dp"
-            tools:src="@drawable/ic_action_polygom_dark"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@id/snap_to_road_icon"
+                    android:layout_toRightOf="@id/snap_to_road_icon"
+                    android:maxLines="1"
+                    android:text="@string/snap_to_road"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+            </RelativeLayout>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/save_as_new_segment_icon"
-            android:layout_toRightOf="@id/save_as_new_segment_icon"
-            android:maxLines="1"
-            android:text="@string/shared_string_save"
-            android:textAppearance="@style/TextAppearance.ListItemTitle"/>
-    </RelativeLayout>
+            <View
+                android:layout_width="wrap_content"
+                android:layout_height="1dp"
+                android:layout_marginBottom="8dp"
+                android:layout_marginLeft="64dp"
+                android:layout_marginStart="64dp"
+                android:layout_marginTop="7dp"
+                android:background="?attr/dashboard_divider"/>
 
-    <RelativeLayout
-        android:id="@+id/save_as_new_track_row"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:background="?attr/selectableItemBackground"
-        android:minHeight="48dp"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp">
+            <RelativeLayout
+                android:id="@+id/save_as_new_segment_row"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?attr/selectableItemBackground"
+                android:minHeight="48dp"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp"
+                android:visibility="gone">
 
-        <ImageView
-            android:id="@+id/save_as_new_track_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="24dp"
-            android:layout_marginRight="24dp"
-            tools:src="@drawable/ic_action_polygom_dark"/>
+                <ImageView
+                    android:id="@+id/save_as_new_segment_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginRight="24dp"
+                    tools:src="@drawable/ic_action_polygom_dark"/>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/save_as_new_track_icon"
-            android:layout_toRightOf="@id/save_as_new_track_icon"
-            android:maxLines="1"
-            android:text="@string/shared_string_save_as_gpx"
-            android:textAppearance="@style/TextAppearance.ListItemTitle"/>
-    </RelativeLayout>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@id/save_as_new_segment_icon"
+                    android:layout_toRightOf="@id/save_as_new_segment_icon"
+                    android:maxLines="1"
+                    android:text="@string/shared_string_save"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+            </RelativeLayout>
 
-    <RelativeLayout
-        android:id="@+id/add_to_the_track_row"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:background="?attr/selectableItemBackground"
-        android:minHeight="48dp"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp">
+            <RelativeLayout
+                android:id="@+id/save_as_new_track_row"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?attr/selectableItemBackground"
+                android:minHeight="48dp"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp">
 
-        <ImageView
-            android:id="@+id/add_to_the_track_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="24dp"
-            android:layout_marginRight="24dp"
-            tools:src="@drawable/ic_action_split_interval"/>
+                <ImageView
+                    android:id="@+id/save_as_new_track_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginRight="24dp"
+                    tools:src="@drawable/ic_action_polygom_dark"/>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/add_to_the_track_icon"
-            android:layout_toRightOf="@id/add_to_the_track_icon"
-            android:maxLines="1"
-            android:text="@string/add_segment_to_the_track"
-            android:textAppearance="@style/TextAppearance.ListItemTitle"/>
-    </RelativeLayout>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@id/save_as_new_track_icon"
+                    android:layout_toRightOf="@id/save_as_new_track_icon"
+                    android:maxLines="1"
+                    android:text="@string/shared_string_save_as_gpx"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+            </RelativeLayout>
 
-    <View
-        android:layout_width="wrap_content"
-        android:layout_height="1dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginLeft="64dp"
-        android:layout_marginStart="64dp"
-        android:layout_marginTop="7dp"
-        android:background="?attr/dashboard_divider"/>
+            <RelativeLayout
+                android:id="@+id/add_to_the_track_row"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?attr/selectableItemBackground"
+                android:minHeight="48dp"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp">
 
-    <RelativeLayout
-        android:id="@+id/clear_all_row"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:background="?attr/selectableItemBackground"
-        android:minHeight="48dp"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp">
+                <ImageView
+                    android:id="@+id/add_to_the_track_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginRight="24dp"
+                    tools:src="@drawable/ic_action_split_interval"/>
 
-        <ImageView
-            android:id="@+id/clear_all_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="24dp"
-            android:layout_marginRight="24dp"
-            tools:src="@drawable/ic_action_reset_to_default_dark"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@id/add_to_the_track_icon"
+                    android:layout_toRightOf="@id/add_to_the_track_icon"
+                    android:maxLines="1"
+                    android:text="@string/add_segment_to_the_track"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+            </RelativeLayout>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/clear_all_icon"
-            android:layout_toRightOf="@id/clear_all_icon"
-            android:maxLines="1"
-            android:text="@string/shared_string_clear_all"
-            android:textAppearance="@style/TextAppearance.ListItemTitle"/>
-    </RelativeLayout>
+            <View
+                android:layout_width="wrap_content"
+                android:layout_height="1dp"
+                android:layout_marginBottom="8dp"
+                android:layout_marginLeft="64dp"
+                android:layout_marginStart="64dp"
+                android:layout_marginTop="7dp"
+                android:background="?attr/dashboard_divider"/>
+
+            <RelativeLayout
+                android:id="@+id/clear_all_row"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?attr/selectableItemBackground"
+                android:minHeight="48dp"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp">
+
+                <ImageView
+                    android:id="@+id/clear_all_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginRight="24dp"
+                    tools:src="@drawable/ic_action_reset_to_default_dark"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@id/clear_all_icon"
+                    android:layout_toRightOf="@id/clear_all_icon"
+                    android:maxLines="1"
+                    android:text="@string/shared_string_clear_all"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+            </RelativeLayout>
+
+        </LinearLayout>
+
+    </ScrollView>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginTop="8dp"
         android:background="?attr/dashboard_divider"/>
 
     <FrameLayout
diff --git a/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml
index 5c124ca9fb..5c84a80758 100644
--- a/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml
@@ -13,10 +13,10 @@
         android:layout_height="wrap_content">
 
         <LinearLayout
-            android:paddingBottom="8dp"
-            android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingBottom="8dp">
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -35,30 +35,30 @@
                     tools:src="@drawable/ic_action_measure_point"/>
 
                 <LinearLayout
-                    android:orientation="vertical"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_toEndOf="@id/selected_point_icon"
                     android:layout_toRightOf="@id/selected_point_icon"
-                    android:gravity="center_vertical">
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
 
                     <TextView
                         android:id="@+id/selected_point_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:maxLines="1"
-                        tools:text="Point 2"
-                        android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+                        android:textAppearance="@style/TextAppearance.ListItemTitle"
+                        tools:text="Point 2"/>
 
                     <TextView
                         android:id="@+id/selected_point_distance"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:maxLines="1"
+                        android:textAppearance="@style/TextAppearance.ListItemTitle"
                         android:textColor="?android:textColorSecondary"
                         android:textSize="@dimen/default_list_text_size"
-                        tools:text="386 m"
-                        android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+                        tools:text="386 m"/>
 
                 </LinearLayout>
 
@@ -67,8 +67,8 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="?attr/dashboard_divider"
-                android:layout_marginBottom="8dp"/>
+                android:layout_marginBottom="8dp"
+                android:background="?attr/dashboard_divider"/>
 
             <RelativeLayout
                 android:id="@+id/move_point_row"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
index 225e96a64a..ab32770855 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@@ -1,6 +1,7 @@
 package net.osmand.plus.measurementtool;
 
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
@@ -8,6 +9,7 @@ import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.ImageView;
@@ -112,6 +114,32 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 			}
 		});
 
+		final int height = AndroidUtils.getScreenHeight(getActivity());
+		final int statusBarHeight = AndroidUtils.getStatusBarHeight(getActivity());
+		final int navBarHeight = AndroidUtils.getNavBarHeight(getActivity());
+
+		mainView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+			@Override
+			public void onGlobalLayout() {
+				final View scrollView = mainView.findViewById(R.id.measure_options_scroll_view);
+				int scrollViewHeight = scrollView.getHeight();
+				int dividerHeight = AndroidUtils.dpToPx(getContext(), 1);
+				int cancelButtonHeight = getContext().getResources().getDimensionPixelSize(R.dimen.measure_distance_bottom_sheet_cancel_button_height);
+				int spaceForScrollView = height - statusBarHeight - navBarHeight - dividerHeight - cancelButtonHeight;
+				if (scrollViewHeight > spaceForScrollView) {
+					scrollView.getLayoutParams().height = spaceForScrollView;
+					scrollView.requestLayout();
+				}
+
+				ViewTreeObserver obs = mainView.getViewTreeObserver();
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+					obs.removeOnGlobalLayoutListener(this);
+				} else {
+					obs.removeGlobalOnLayoutListener(this);
+				}
+			}
+		});
+
 		return mainView;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
index f5e251344d..ef6f26973f 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
@@ -27,7 +27,7 @@ import net.osmand.util.MapUtils;
 
 import java.util.List;
 
-public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialogFragment{
+public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialogFragment {
 	public final static String TAG = "SelectedPointMenuBottomSheetDialogFragment";
 
 	private SelectedPointOptionOnClickListener listener;
@@ -115,7 +115,8 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 		}
 
 		final int height = AndroidUtils.getScreenHeight(getActivity());
-		final int statusbarHeight = AndroidUtils.getStatusBarHeight(getActivity());
+		final int statusBarHeight = AndroidUtils.getStatusBarHeight(getActivity());
+		final int navBarHeight = AndroidUtils.getNavBarHeight(getActivity());
 
 		mainView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
 			@Override
@@ -124,7 +125,7 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 				int scrollViewHeight = scrollView.getHeight();
 				int dividerHeight = AndroidUtils.dpToPx(getContext(), 1);
 				int cancelButtonHeight = getContext().getResources().getDimensionPixelSize(R.dimen.measure_distance_bottom_sheet_cancel_button_height);
-				int spaceForScrollView = height - statusbarHeight - AndroidUtils.getNavBarHeight(getActivity()) - dividerHeight - cancelButtonHeight;
+				int spaceForScrollView = height - statusBarHeight - navBarHeight - dividerHeight - cancelButtonHeight;
 				if (scrollViewHeight > spaceForScrollView) {
 					scrollView.getLayoutParams().height = spaceForScrollView;
 					scrollView.requestLayout();
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index c8c4a874e6..21d92d6220 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -1,6 +1,5 @@
 package net.osmand.plus.measurementtool;
 
-import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -56,7 +55,8 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 		}
 
 		final int height = AndroidUtils.getScreenHeight(getActivity());
-		final int statusbarHeight = AndroidUtils.getStatusBarHeight(getActivity());
+		final int statusBarHeight = AndroidUtils.getStatusBarHeight(getActivity());
+		final int navBarHeight =  AndroidUtils.getNavBarHeight(getActivity());
 
 		view.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
 			@Override
@@ -65,7 +65,7 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 				int scrollViewHeight = scrollView.getHeight();
 				int dividerHeight = AndroidUtils.dpToPx(getContext(), 1);
 				int cancelButtonHeight = getContext().getResources().getDimensionPixelSize(R.dimen.measure_distance_bottom_sheet_cancel_button_height);
-				int spaceForScrollView = height - statusbarHeight - AndroidUtils.getNavBarHeight(getActivity()) - dividerHeight - cancelButtonHeight;
+				int spaceForScrollView = height - statusBarHeight - navBarHeight - dividerHeight - cancelButtonHeight;
 				if (scrollViewHeight > spaceForScrollView) {
 					scrollView.getLayoutParams().height = spaceForScrollView;
 					scrollView.requestLayout();

From 808c806d651e06f536ee9ac3c1e2249cf1273a7c Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 15 Aug 2017 11:39:30 +0300
Subject: [PATCH 090/174] Adding route points by fab

---
 OsmAnd/res/layout/track_points_tree.xml       |  2 +-
 OsmAnd/res/layout/track_segments_tree.xml     |  2 +-
 OsmAnd/res/values/strings.xml                 |  2 +-
 OsmAnd/src/net/osmand/plus/GPXUtilities.java  | 10 ++++++
 .../osmand/plus/activities/TrackActivity.java | 15 +++++++--
 .../MeasurementToolFragment.java              | 33 ++++++++++++-------
 .../OptionsBottomSheetDialogFragment.java     |  4 +--
 .../plus/myplaces/TrackPointFragment.java     | 10 +++---
 .../plus/myplaces/TrackSegmentFragment.java   | 11 +++----
 9 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/OsmAnd/res/layout/track_points_tree.xml b/OsmAnd/res/layout/track_points_tree.xml
index 368b5695e3..204d8bb8f2 100644
--- a/OsmAnd/res/layout/track_points_tree.xml
+++ b/OsmAnd/res/layout/track_points_tree.xml
@@ -119,7 +119,7 @@
             android:background="?attr/bg_card"
             android:gravity="center_vertical"
             android:padding="8dp"
-            android:text="@string/add_route_point"
+            android:text="@string/add_route_points"
             android:textColor="?android:attr/textColorPrimary"
             osmand:typeface="@string/font_roboto_medium"/>
 
diff --git a/OsmAnd/res/layout/track_segments_tree.xml b/OsmAnd/res/layout/track_segments_tree.xml
index 30ab43a836..ab52f6cc59 100644
--- a/OsmAnd/res/layout/track_segments_tree.xml
+++ b/OsmAnd/res/layout/track_segments_tree.xml
@@ -115,7 +115,7 @@
             android:background="?attr/bg_card"
             android:gravity="center_vertical"
             android:padding="8dp"
-            android:text="@string/add_route_point"
+            android:text="@string/add_route_points"
             android:textColor="?android:attr/textColorPrimary"
             osmand:typeface="@string/font_roboto_medium"/>
 
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 385cac0b04..301f55556c 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2668,7 +2668,7 @@
     <string name="shared_string_action_name">Action name</string>
     <string name="mappilary_no_internet_desc">You need internet to view photos from Mapillary</string>
     <string name="retry">Retry</string>
-    <string name="add_route_point">Add Route Point</string>
+    <string name="add_route_points">Add Route Points</string>
     <string name="add_waypoint">Add Waypoint</string>
     <string name="add_line">Add Line</string>
     <string name="save_gpx_waypoint">Save GPX Waypoint</string>
diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index 315896d9ad..3bc4adc94e 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -909,6 +909,16 @@ public class GPXUtilities {
 			modifiedTime = System.currentTimeMillis();
 		}
 
+		public void addRtePts(List<WptPt> points) {
+			if (routes.size() == 0) {
+				routes.add(new Route());
+			}
+			Route currentRoute = routes.get(routes.size() - 1);
+			currentRoute.points.addAll(points);
+
+			modifiedTime = System.currentTimeMillis();
+		}
+
 		public void updateWptPt(WptPt pt, double lat, double lon, long time, String description, String name, String category, int color) {
 			int index = points.indexOf(pt);
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
index 829bcc4c7b..2ef353bb0b 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
@@ -16,6 +16,7 @@ import net.osmand.AndroidUtils;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.data.QuadRect;
+import net.osmand.plus.activities.TrackActivity.NewGpxLine.LineType;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
@@ -112,10 +113,10 @@ public class TrackActivity extends TabActivity {
 		}
 	}
 
-	public void addLine() {
+	public void addLine(LineType lineType) {
 		GPXFile gpxFile = getGpx();
 		QuadRect rect = getRect();
-		NewGpxLine newGpxLine = new NewGpxLine(gpxFile, rect);
+		NewGpxLine newGpxLine = new NewGpxLine(gpxFile, rect, lineType);
 		WptPt pointToShow = gpxFile != null ? gpxFile.findPointToShow() : null;
 		if (pointToShow != null) {
 			LatLon location = new LatLon(pointToShow.getLatitude(), pointToShow.getLongitude());
@@ -407,12 +408,16 @@ public class TrackActivity extends TabActivity {
 	}
 
 	public static class NewGpxLine {
+		public enum LineType { SEGMENT, ROUTE_POINTS }
+
 		private GPXFile gpxFile;
 		private QuadRect rect;
+		private LineType lineType;
 
-		public NewGpxLine(GPXFile gpxFile, QuadRect rect) {
+		public NewGpxLine(GPXFile gpxFile, QuadRect rect, LineType lineType) {
 			this.gpxFile = gpxFile;
 			this.rect = rect;
+			this.lineType = lineType;
 		}
 
 		public GPXFile getGpxFile() {
@@ -422,5 +427,9 @@ public class TrackActivity extends TabActivity {
 		public QuadRect getRect() {
 			return rect;
 		}
+
+		public LineType getLineType() {
+			return lineType;
+		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 891f0a64e0..880151b654 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -39,6 +39,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.TrackActivity;
 import net.osmand.plus.activities.TrackActivity.NewGpxLine;
+import net.osmand.plus.activities.TrackActivity.NewGpxLine.LineType;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter;
@@ -195,9 +196,9 @@ public class MeasurementToolFragment extends Fragment {
 					}
 
 					@Override
-					public void saveAsNewSegmentOnClick() {
+					public void addToGpxOnClick() {
 						if (measurementLayer.getPointsCount() > 0) {
-							saveAsNewSegment(mapActivity);
+							addToGpx(mapActivity);
 						} else {
 							Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
 						}
@@ -329,7 +330,7 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			public void onClick(View v) {
 				if (measurementLayer.getPointsCount() > 0) {
-					saveAsNewSegment(mapActivity);
+					addToGpx(mapActivity);
 				} else {
 					Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
 				}
@@ -726,11 +727,12 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
-	private void saveAsNewSegment(MapActivity mapActivity) {
+	private void addToGpx(MapActivity mapActivity) {
 		GPXFile gpx = newGpxLine.getGpxFile();
 		SelectedGpxFile selectedGpxFile = mapActivity.getMyApplication().getSelectedGpxHelper().getSelectedFileByPath(gpx.path);
 		boolean showOnMap = selectedGpxFile != null;
-		saveExistingGpx(gpx, showOnMap);
+		LineType lineType = newGpxLine.getLineType();
+		saveExistingGpx(gpx, showOnMap, lineType);
 	}
 
 	private void saveAsGpxOnClick(MapActivity mapActivity) {
@@ -800,14 +802,14 @@ public class MeasurementToolFragment extends Fragment {
 	}
 
 	private void saveNewGpx(File dir, String fileName, boolean checked) {
-		saveGpx(dir, fileName, checked, null, false);
+		saveGpx(dir, fileName, checked, null, false, null);
 	}
 
-	private void saveExistingGpx(GPXFile gpx, boolean showOnMap) {
-		saveGpx(null, null, showOnMap, gpx, true);
+	private void saveExistingGpx(GPXFile gpx, boolean showOnMap, LineType lineType) {
+		saveGpx(null, null, showOnMap, gpx, true, lineType);
 	}
 
-	private void saveGpx(final File dir, final String fileName, final boolean showOnMap, final GPXFile gpx, final boolean openTrackActivity) {
+	private void saveGpx(final File dir, final String fileName, final boolean showOnMap, final GPXFile gpx, final boolean openTrackActivity, final LineType lineType) {
 		new AsyncTask<Void, Void, String>() {
 
 			private ProgressDialog progressDialog;
@@ -852,14 +854,23 @@ public class MeasurementToolFragment extends Fragment {
 					toSave = new File(gpx.path);
 					if (measurementLayer != null) {
 						List<WptPt> points = measurementLayer.getMeasurementPoints();
-						gpx.addTrkSegment(points);
+						switch (lineType) {
+							case SEGMENT:
+								gpx.addTrkSegment(points);
+								break;
+							case ROUTE_POINTS:
+								gpx.addRtePts(points);
+								break;
+						}
 					}
 					if (activity != null) {
 						String res = GPXUtilities.writeGpxFile(toSave, gpx, activity.getMyApplication());
 						if (showOnMap) {
 							SelectedGpxFile sf = activity.getMyApplication().getSelectedGpxHelper().selectGpxFile(gpx, true, false);
 							if (sf != null) {
-								sf.processPoints();
+								if (lineType == LineType.SEGMENT) {
+									sf.processPoints();
+								}
 							}
 						}
 						return res;
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
index ab32770855..3ae41a9e01 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@@ -101,7 +101,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 				@Override
 				public void onClick(View view) {
 					if (listener != null) {
-						listener.saveAsNewSegmentOnClick();
+						listener.addToGpxOnClick();
 					}
 					dismiss();
 				}
@@ -163,7 +163,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 
 		void snapToRoadOnCLick();
 
-		void saveAsNewSegmentOnClick();
+		void addToGpxOnClick();
 
 		void saveAsNewTrackOnClick();
 
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index 13e3ebd7a4..782aabecbc 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -35,6 +35,7 @@ import net.osmand.AndroidUtils;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
+import net.osmand.plus.activities.TrackActivity.NewGpxLine.LineType;
 import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
@@ -163,12 +164,11 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 					break;
 				case R.id.route_text_layout:
 				case R.id.route_fab:
-					PointDescription pointRteDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
-					addPoint(pointRteDescription);
+					addLine(LineType.ROUTE_POINTS);
 					break;
 				case R.id.line_text_layout:
 				case R.id.line_fab:
-					addLine();
+					addLine(LineType.SEGMENT);
 					break;
 			}
 		}
@@ -216,8 +216,8 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 		getTrackActivity().addPoint(pointDescription);
 	}
 
-	private void addLine() {
-		getTrackActivity().addLine();
+	private void addLine(LineType lineType) {
+		getTrackActivity().addLine(lineType);
 	}
 
 	private void openMenu() {
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index 224009cfca..89d08b0914 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -59,12 +59,12 @@ import net.osmand.data.PointDescription;
 import net.osmand.data.QuadRect;
 import net.osmand.data.RotatedTileBox;
 import net.osmand.data.RotatedTileBox.RotatedTileBoxBuilder;
+import net.osmand.plus.activities.TrackActivity.NewGpxLine.LineType;
 import net.osmand.plus.GPXDatabase;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.GPXUtilities.GPXTrackAnalysis;
-import net.osmand.plus.GPXUtilities.Route;
 import net.osmand.plus.GPXUtilities.Track;
 import net.osmand.plus.GPXUtilities.TrkSegment;
 import net.osmand.plus.GPXUtilities.WptPt;
@@ -213,12 +213,11 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 					break;
 				case R.id.route_text_layout:
 				case R.id.route_fab:
-					PointDescription pointRteDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
-					addPoint(pointRteDescription);
+					addLine(LineType.ROUTE_POINTS);
 					break;
 				case R.id.line_text_layout:
 				case R.id.line_fab:
-					addLine();
+					addLine(LineType.SEGMENT);
 					break;
 			}
 		}
@@ -286,8 +285,8 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		getTrackActivity().addPoint(pointDescription);
 	}
 
-	private void addLine() {
-		getTrackActivity().addLine();
+	private void addLine(LineType lineType) {
+		getTrackActivity().addLine(lineType);
 	}
 
 	private void openMenu() {

From 604202670e4bd453498c1e1e79c0c18ff9b0e5b6 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 15 Aug 2017 12:18:19 +0300
Subject: [PATCH 091/174] Fix night mode

---
 .../fragment_options_bottom_sheet_dialog.xml  |  1 +
 ...gment_snap_to_road_bottom_sheet_dialog.xml |  1 +
 .../MeasurementToolFragment.java              | 29 ++++++++++++-------
 .../OptionsBottomSheetDialogFragment.java     |  9 ++++--
 ...tedPointMenuBottomSheetDialogFragment.java |  6 ++--
 .../SnapToRoadBottomSheetDialogFragment.java  | 16 ++++++++--
 .../adapter/MeasurementToolAdapter.java       |  9 ++++--
 7 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
index d11c91aaad..9307702d3f 100644
--- a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
@@ -20,6 +20,7 @@
             android:paddingBottom="8dp">
 
             <net.osmand.plus.widgets.TextViewEx
+                android:id="@+id/options_title"
                 android:layout_width="match_parent"
                 android:layout_height="52dp"
                 android:gravity="center_vertical"
diff --git a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
index aa2a6a3c64..15eabef32f 100644
--- a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
@@ -19,6 +19,7 @@
             android:paddingBottom="8dp">
 
             <TextView
+                android:id="@+id/choose_navigation_title"
                 android:layout_width="match_parent"
                 android:layout_height="52dp"
                 android:gravity="center_vertical"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 891f0a64e0..c7443431a0 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
@@ -71,6 +72,7 @@ public class MeasurementToolFragment extends Fragment {
 	public static final String TAG = "MeasurementToolFragment";
 
 	private final CommandManager commandManager = new CommandManager();
+	private IconsCache iconsCache;
 	private RecyclerView pointsRv;
 	private MeasurementToolBarController toolBarController;
 	private MeasurementToolAdapter adapter;
@@ -89,6 +91,7 @@ public class MeasurementToolFragment extends Fragment {
 	private boolean pointsListOpened;
 	private boolean saved;
 	private boolean portrait;
+	private boolean nightMode;
 	private int previousMapPosition;
 	private NewGpxLine newGpxLine;
 
@@ -107,15 +110,15 @@ public class MeasurementToolFragment extends Fragment {
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		final MapActivity mapActivity = (MapActivity) getActivity();
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
-		final IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
-		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		iconsCache = mapActivity.getMyApplication().getIconsCache();
+		nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 		final int backgroundColor = ContextCompat.getColor(getActivity(),
 				nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
 		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
 
-		upIcon = iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up);
-		downIcon = iconsCache.getThemedIcon(R.drawable.ic_action_arrow_down);
+		upIcon = getContentIcon(R.drawable.ic_action_arrow_up);
+		downIcon = getContentIcon(R.drawable.ic_action_arrow_down);
 		pointsSt = getString(R.string.points).toLowerCase();
 
 		View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_measurement_tool, null);
@@ -131,19 +134,19 @@ public class MeasurementToolFragment extends Fragment {
 		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));
+				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_ruler, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance));
 
 		((ImageView) mainView.findViewById(R.id.move_point_icon))
-				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_move_point, R.color.color_myloc_distance));
+				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_move_point, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance));
 
 		((ImageView) mainView.findViewById(R.id.add_point_after_icon))
-				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_addpoint_above, R.color.color_myloc_distance));
+				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_addpoint_above, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance));
 
 		((ImageView) mainView.findViewById(R.id.add_point_before_icon))
-				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_addpoint_below, R.color.color_myloc_distance));
+				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_addpoint_below, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance));
 
 		upDownBtn = (ImageView) mainView.findViewById(R.id.up_down_button);
-		upDownBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
+		upDownBtn.setImageDrawable(upIcon);
 
 		mainView.findViewById(R.id.cancel_point_button).setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -240,7 +243,7 @@ public class MeasurementToolFragment extends Fragment {
 		undoBtn = ((ImageButton) mainView.findViewById(R.id.undo_point_button));
 		redoBtn = ((ImageButton) mainView.findViewById(R.id.redo_point_button));
 
-		undoBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_undo_dark));
+		undoBtn.setImageDrawable(getContentIcon(R.drawable.ic_action_undo_dark));
 		undoBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
@@ -260,7 +263,7 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		});
 
-		redoBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_redo_dark));
+		redoBtn.setImageDrawable(getContentIcon(R.drawable.ic_action_redo_dark));
 		redoBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
@@ -919,6 +922,10 @@ public class MeasurementToolFragment extends Fragment {
 		return null;
 	}
 
+	private Drawable getContentIcon(@DrawableRes int id) {
+		return iconsCache.getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.icon_color);
+	}
+
 	private void enable(View... views) {
 		for (View view : views) {
 			view.setEnabled(true);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
index ab32770855..0b9939fbc6 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@@ -18,6 +18,7 @@ import net.osmand.AndroidUtils;
 import net.osmand.plus.R;
 import net.osmand.plus.base.BottomSheetDialogFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.widgets.TextViewEx;
 
 public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment {
 
@@ -26,6 +27,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 	private OptionsOnClickListener listener;
 	private boolean addLineMode;
 	private boolean portrait;
+	private boolean nightMode;
 
 	public void setOptionsOnClickListener(OptionsOnClickListener listener) {
 		this.listener = listener;
@@ -38,7 +40,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		final boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
 
@@ -47,6 +49,9 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 			AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
 		}
 
+		if (nightMode) {
+			((TextViewEx) mainView.findViewById(R.id.options_title)).setTextColor(getResources().getColor(R.color.ctx_menu_info_text_dark));
+		}
 		((ImageView) mainView.findViewById(R.id.snap_to_road_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_snap_to_road));
 		((ImageView) mainView.findViewById(R.id.clear_all_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_reset_to_default_dark));
 		if (!addLineMode) {
@@ -156,7 +161,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 
 	@Override
 	protected Drawable getContentIcon(@DrawableRes int id) {
-		return getIcon(id, getMyApplication().getSettings().isLightContent() ? R.color.on_map_icon_color : 0);
+		return getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.on_map_icon_color);
 	}
 
 	interface OptionsOnClickListener {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
index ef6f26973f..d37bd7c9c8 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
@@ -28,9 +28,11 @@ import net.osmand.util.MapUtils;
 import java.util.List;
 
 public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialogFragment {
+
 	public final static String TAG = "SelectedPointMenuBottomSheetDialogFragment";
 
 	private SelectedPointOptionOnClickListener listener;
+	private boolean nightMode;
 
 	public void setSelectedPointOptionOnClickListener(SelectedPointOptionOnClickListener listener) {
 		this.listener = listener;
@@ -44,7 +46,7 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 		final boolean portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
 
-		final boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_selected_menu_bottom_sheet_dialog, null);
@@ -156,7 +158,7 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 
 	@Override
 	protected Drawable getContentIcon(@DrawableRes int id) {
-		return getIcon(id, getMyApplication().getSettings().isLightContent() ? R.color.on_map_icon_color : 0);
+		return getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.on_map_icon_color);
 	}
 
 	interface SelectedPointOptionOnClickListener {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index 21d92d6220..97ff505e30 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -1,7 +1,9 @@
 package net.osmand.plus.measurementtool;
 
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -28,11 +30,13 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 
 	public static final String TAG = "SnapToRoadBottomSheetDialogFragment";
 
+	private boolean nightMode;
+
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		final OsmandSettings settings = getMyApplication().getSettings();
-		final boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
 		final View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_snap_to_road_bottom_sheet_dialog, container);
@@ -43,6 +47,9 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 				dismiss();
 			}
 		});
+		if (nightMode) {
+			((TextView) view.findViewById(R.id.choose_navigation_title)).setTextColor(getResources().getColor(R.color.ctx_menu_info_text_dark));
+		}
 
 		LinearLayout navContainer = (LinearLayout) view.findViewById(R.id.navigation_types_container);
 		final List<ApplicationMode> modes = new ArrayList<>(ApplicationMode.values(settings));
@@ -56,7 +63,7 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 
 		final int height = AndroidUtils.getScreenHeight(getActivity());
 		final int statusBarHeight = AndroidUtils.getStatusBarHeight(getActivity());
-		final int navBarHeight =  AndroidUtils.getNavBarHeight(getActivity());
+		final int navBarHeight = AndroidUtils.getNavBarHeight(getActivity());
 
 		view.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
 			@Override
@@ -93,4 +100,9 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 			window.setAttributes(params);
 		}
 	}
+
+	@Override
+	protected Drawable getContentIcon(@DrawableRes int id) {
+		return getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.on_map_icon_color);
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index 54b14ec594..212f19f9ce 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -27,6 +27,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 	private final MapActivity mapActivity;
 	private final List<WptPt> points;
 	private MeasurementAdapterListener listener;
+	private boolean nightMode;
 
 	public MeasurementToolAdapter(MapActivity mapActivity, List<WptPt> points) {
 		this.mapActivity = mapActivity;
@@ -40,7 +41,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 	@Override
 	public MeasureToolItemVH onCreateViewHolder(ViewGroup viewGroup, int i) {
 		View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.measure_points_list_item, viewGroup, false);
-		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		if (!nightMode) {
 			view.findViewById(R.id.points_divider).setBackgroundResource(R.drawable.divider);
 		}
@@ -69,7 +70,8 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 				return false;
 			}
 		});
-		holder.icon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_measure_point));
+		holder.icon.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_measure_point,
+				nightMode ? R.color.ctx_menu_info_text_dark : R.color.icon_color));
 		holder.title.setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
 		if (pos < 1) {
 			holder.descr.setText(mapActivity.getString(R.string.shared_string_control_start));
@@ -81,7 +83,8 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 			}
 			holder.descr.setText(OsmAndFormatter.getFormattedDistance(dist, mapActivity.getMyApplication()));
 		}
-		holder.deleteBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_remove_dark));
+		holder.deleteBtn.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_remove_dark,
+				nightMode ? R.color.ctx_menu_info_text_dark : R.color.icon_color));
 		holder.deleteBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {

From 0b992d2b5da18c726e21faf78b1d30b83ec1a890 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 15 Aug 2017 12:50:51 +0300
Subject: [PATCH 092/174] Fix some small things

---
 .../osmand/plus/measurementtool/MeasurementToolFragment.java   | 2 +-
 .../plus/measurementtool/adapter/MeasurementToolAdapter.java   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 529a9ede09..f64673f738 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -955,7 +955,7 @@ public class MeasurementToolFragment extends Fragment {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
 			distanceTv.setText(measurementLayer.getDistanceSt() + ",");
-			pointsTv.setText(pointsSt + ": " + measurementLayer.getPointsCount());
+			pointsTv.setText((portrait ? pointsSt + ": " : "") + measurementLayer.getPointsCount());
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index 212f19f9ce..cfb87e0df7 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -72,6 +72,9 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		});
 		holder.icon.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_measure_point,
 				nightMode ? R.color.ctx_menu_info_text_dark : R.color.icon_color));
+		if (nightMode) {
+			holder.title.setTextColor(mapActivity.getMyApplication().getResources().getColor(R.color.primary_text_dark));
+		}
 		holder.title.setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
 		if (pos < 1) {
 			holder.descr.setText(mapActivity.getString(R.string.shared_string_control_start));

From d336451b3020d4b8d6c20d5ba911e45e1e52bab7 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 15 Aug 2017 13:14:10 +0300
Subject: [PATCH 093/174] Selected point menu styling

---
 .../MeasurementToolFragment.java              | 22 ++++++++++++++++++-
 .../measurementtool/MeasurementToolLayer.java |  8 ++++++-
 ...tedPointMenuBottomSheetDialogFragment.java | 19 ++++++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index f64673f738..132f4df13e 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -299,6 +299,9 @@ public class MeasurementToolFragment extends Fragment {
 
 			@Override
 			public void onSelectPoint() {
+				if (pointsListOpened) {
+					hidePointsList();
+				}
 				openSelectedPointMenu(mapActivity);
 			}
 		});
@@ -366,7 +369,19 @@ public class MeasurementToolFragment extends Fragment {
 
 			@Override
 			public void onItemClick(View view) {
-				measurementLayer.moveMapToPoint(pointsRv.indexOfChild(view));
+				int position = pointsRv.indexOfChild(view);
+				if (pointsListOpened) {
+					hidePointsList();
+				}
+				OsmandMapTileView tileView = mapActivity.getMapView();
+				if (portrait) {
+					previousMapPosition = tileView.getMapPosition();
+					tileView.setMapPosition(MIDDLE_TOP_CONSTANT);
+				}
+				mapActivity.refreshMap();
+				measurementLayer.moveMapToPoint(position);
+				measurementLayer.selectPoint(position);
+				openSelectedPointMenu(mapActivity);
 			}
 
 			@Override
@@ -437,6 +452,11 @@ public class MeasurementToolFragment extends Fragment {
 				}
 				enterAddPointBeforeMode();
 			}
+
+			@Override
+			public void onCloseMenu() {
+				setPreviousMapPosition();
+			}
 		});
 		fragment.show(mapActivity.getSupportFragmentManager(), SelectedPointMenuBottomSheetDialogFragment.TAG);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 9effbefece..b3249d438a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -176,7 +176,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private void selectPoint(double x, double y) {
 		clearSelection();
 		RotatedTileBox tb = view.getCurrentRotatedTileBox();
-		double lowestDistance = AndroidUtils.dpToPx(view.getContext(), 10);
+		double lowestDistance = AndroidUtils.dpToPx(view.getContext(), 20);
 		for (int i = 0; i < measurementPoints.size(); i++) {
 			WptPt pt = measurementPoints.get(i);
 			if (tb.containsLatLon(pt.getLatitude(), pt.getLongitude())) {
@@ -192,6 +192,12 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		}
 	}
 
+	public void selectPoint(int position) {
+		clearSelection();
+		selectedCachedPoint = new WptPt(measurementPoints.get(position));
+		selectedPointPos = position;
+	}
+
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings settings) {
 		if (inMeasurementMode) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
index d37bd7c9c8..6c76da9ad9 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
@@ -1,5 +1,6 @@
 package net.osmand.plus.measurementtool;
 
+import android.content.DialogInterface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
@@ -161,6 +162,22 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 		return getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.on_map_icon_color);
 	}
 
+	@Override
+	public void dismiss() {
+		if (listener != null) {
+			listener.onCloseMenu();
+		}
+		super.dismiss();
+	}
+
+	@Override
+	public void onCancel(DialogInterface dialog) {
+		if (listener != null) {
+			listener.onCloseMenu();
+		}
+		super.onCancel(dialog);
+	}
+
 	interface SelectedPointOptionOnClickListener {
 
 		void moveOnClick();
@@ -170,5 +187,7 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 		void addPointAfterOnClick();
 
 		void addPointBeforeOnClick();
+
+		void onCloseMenu();
 	}
 }

From a3b4f8f00107210174b22d16cea4ec8544a8be6b Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 15 Aug 2017 13:40:29 +0300
Subject: [PATCH 094/174] Remove unnecessary linear layout

---
 .../layout-land/fragment_measurement_tool.xml | 56 ++++++++-----------
 .../res/layout/fragment_measurement_tool.xml  | 56 ++++++++-----------
 2 files changed, 48 insertions(+), 64 deletions(-)

diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
index c237fc1f6f..5676e9ca2b 100644
--- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -202,39 +202,31 @@
                     osmand:typeface="@string/font_roboto_medium"/>
             </FrameLayout>
 
-            <LinearLayout
-                android:id="@+id/redo_undo_container"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_horizontal">
+            <ImageButton
+                android:id="@+id/undo_point_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:paddingBottom="14dp"
+                android:paddingEnd="12dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="12dp"
+                android:paddingStart="16dp"
+                android:paddingTop="14dp"
+                tools:src="@drawable/ic_action_undo_dark"/>
 
-                <ImageButton
-                    android:id="@+id/undo_point_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
-                    android:paddingBottom="14dp"
-                    android:paddingEnd="12dp"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="12dp"
-                    android:paddingStart="16dp"
-                    android:paddingTop="14dp"
-                    tools:src="@drawable/ic_action_undo_dark"/>
-
-                <ImageButton
-                    android:id="@+id/redo_point_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
-                    android:paddingBottom="14dp"
-                    android:paddingEnd="16dp"
-                    android:paddingLeft="12dp"
-                    android:paddingRight="16dp"
-                    android:paddingStart="12dp"
-                    android:paddingTop="14dp"
-                    tools:src="@drawable/ic_action_redo_dark"/>
-            </LinearLayout>
+            <ImageButton
+                android:id="@+id/redo_point_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:paddingBottom="14dp"
+                android:paddingEnd="16dp"
+                android:paddingLeft="12dp"
+                android:paddingRight="16dp"
+                android:paddingStart="12dp"
+                android:paddingTop="14dp"
+                tools:src="@drawable/ic_action_redo_dark"/>
 
             <FrameLayout
                 android:layout_width="0dp"
diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 2528043da9..438f7d736f 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -224,39 +224,31 @@
                     osmand:typeface="@string/font_roboto_medium"/>
             </FrameLayout>
 
-            <LinearLayout
-                android:id="@+id/redo_undo_container"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_horizontal">
+            <ImageButton
+                android:id="@+id/undo_point_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:paddingBottom="14dp"
+                android:paddingEnd="12dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="12dp"
+                android:paddingStart="16dp"
+                android:paddingTop="14dp"
+                tools:src="@drawable/ic_action_undo_dark"/>
 
-                <ImageButton
-                    android:id="@+id/undo_point_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
-                    android:paddingBottom="14dp"
-                    android:paddingEnd="12dp"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="12dp"
-                    android:paddingStart="16dp"
-                    android:paddingTop="14dp"
-                    tools:src="@drawable/ic_action_undo_dark"/>
-
-                <ImageButton
-                    android:id="@+id/redo_point_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
-                    android:paddingBottom="14dp"
-                    android:paddingEnd="16dp"
-                    android:paddingLeft="12dp"
-                    android:paddingRight="16dp"
-                    android:paddingStart="12dp"
-                    android:paddingTop="14dp"
-                    tools:src="@drawable/ic_action_redo_dark"/>
-            </LinearLayout>
+            <ImageButton
+                android:id="@+id/redo_point_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:paddingBottom="14dp"
+                android:paddingEnd="16dp"
+                android:paddingLeft="12dp"
+                android:paddingRight="16dp"
+                android:paddingStart="12dp"
+                android:paddingTop="14dp"
+                tools:src="@drawable/ic_action_redo_dark"/>
 
             <FrameLayout
                 android:layout_width="0dp"

From 197a0745bc8e30868b71e134a250cda389eb1a7c Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 15 Aug 2017 14:14:39 +0300
Subject: [PATCH 095/174] Refactor code

---
 .../MeasurementToolFragment.java              | 131 ++++++------------
 1 file changed, 41 insertions(+), 90 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 132f4df13e..dfd136ff51 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -43,6 +43,7 @@ import net.osmand.plus.activities.TrackActivity.NewGpxLine;
 import net.osmand.plus.activities.TrackActivity.NewGpxLine.LineType;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper;
+import net.osmand.plus.measurementtool.SelectedPointMenuBottomSheetDialogFragment.SelectedPointOptionOnClickListener;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolItemTouchHelperCallback;
 import net.osmand.plus.measurementtool.command.AddPointCommand;
@@ -134,17 +135,11 @@ public class MeasurementToolFragment extends Fragment {
 		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, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance));
-
-		((ImageView) mainView.findViewById(R.id.move_point_icon))
-				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_move_point, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance));
-
-		((ImageView) mainView.findViewById(R.id.add_point_after_icon))
-				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_addpoint_above, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance));
-
-		((ImageView) mainView.findViewById(R.id.add_point_before_icon))
-				.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_addpoint_below, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance));
+		int color = nightMode ? R.color.osmand_orange : R.color.color_myloc_distance;
+		((ImageView) mainView.findViewById(R.id.ruler_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_ruler, color));
+		((ImageView) mainView.findViewById(R.id.move_point_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_move_point, color));
+		((ImageView) mainView.findViewById(R.id.add_point_after_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_addpoint_above, color));
+		((ImageView) mainView.findViewById(R.id.add_point_before_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_addpoint_below, color));
 
 		upDownBtn = (ImageView) mainView.findViewById(R.id.up_down_button);
 		upDownBtn.setImageDrawable(upIcon);
@@ -166,7 +161,11 @@ public class MeasurementToolFragment extends Fragment {
 		upDownRow.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				if (!pointsListOpened && measurementLayer.getPointsCount() > 0 && !measurementLayer.isInMovePointMode() && !measurementLayer.isInAddPointAfterMode() && !measurementLayer.isInAddPointBeforeMode()) {
+				if (!pointsListOpened
+						&& measurementLayer.getPointsCount() > 0
+						&& !measurementLayer.isInMovePointMode()
+						&& !measurementLayer.isInAddPointAfterMode()
+						&& !measurementLayer.isInAddPointBeforeMode()) {
 					showPointsList();
 				} else {
 					hidePointsList();
@@ -312,14 +311,12 @@ public class MeasurementToolFragment extends Fragment {
 				if (pointsListOpened) {
 					hidePointsList();
 				}
-				enterMovePointMode();
+				switchMovePointMode(true);
 			}
 		});
 
 		disable(undoBtn, redoBtn, upDownBtn);
 
-		enterMeasurementMode();
-
 		toolBarController = new MeasurementToolBarController(newGpxLine);
 		if (newGpxLine != null) {
 			toolBarController.setTitle(getString(R.string.add_line));
@@ -405,6 +402,8 @@ public class MeasurementToolFragment extends Fragment {
 		pointsRv.setLayoutManager(new LinearLayoutManager(getContext()));
 		pointsRv.setAdapter(adapter);
 
+		enterMeasurementMode();
+
 		return view;
 	}
 
@@ -412,13 +411,13 @@ public class MeasurementToolFragment extends Fragment {
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 
 		SelectedPointMenuBottomSheetDialogFragment fragment = new SelectedPointMenuBottomSheetDialogFragment();
-		fragment.setSelectedPointOptionOnClickListener(new SelectedPointMenuBottomSheetDialogFragment.SelectedPointOptionOnClickListener() {
+		fragment.setSelectedPointOptionOnClickListener(new SelectedPointOptionOnClickListener() {
 			@Override
 			public void moveOnClick() {
 				if (measurementLayer != null) {
 					measurementLayer.enterMovingPointMode();
 				}
-				enterMovePointMode();
+				switchMovePointMode(true);
 			}
 
 			@Override
@@ -441,7 +440,7 @@ public class MeasurementToolFragment extends Fragment {
 					positionToAddPoint = measurementLayer.getSelectedPointPos() + 1;
 					measurementLayer.enterAddingPointAfterMode();
 				}
-				enterAddPointAfterMode();
+				switchAddPointAfterMode(true);
 			}
 
 			@Override
@@ -450,7 +449,7 @@ public class MeasurementToolFragment extends Fragment {
 					positionToAddPoint = measurementLayer.getSelectedPointPos();
 					measurementLayer.enterAddingPointBeforeMode();
 				}
-				enterAddPointBeforeMode();
+				switchAddPointBeforeMode(true);
 			}
 
 			@Override
@@ -478,7 +477,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void cancelMovePointMode() {
 		if (inMovePointMode) {
-			exitMovePointMode();
+			switchMovePointMode(false);
 		}
 		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
 		if (measurementToolLayer != null) {
@@ -490,7 +489,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void cancelAddPointAfterMode() {
 		if (inAddPointAfterMode) {
-			exitAddPointAfterMode();
+			switchAddPointAfterMode(false);
 		}
 		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
 		if (measurementToolLayer != null) {
@@ -503,7 +502,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void cancelAddPointBeforeMode() {
 		if (inAddPointBeforeMode) {
-			exitAddPointBeforeMode();
+			switchAddPointBeforeMode(false);
 		}
 		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
 		if (measurementToolLayer != null) {
@@ -516,7 +515,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void applyMovePointMode() {
 		if (inMovePointMode) {
-			exitMovePointMode();
+			switchMovePointMode(false);
 		}
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
@@ -537,7 +536,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void applyAddPointAfterMode() {
 		if (inAddPointAfterMode) {
-			exitAddPointAfterMode();
+			switchAddPointAfterMode(false);
 		}
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null && positionToAddPoint != -1) {
@@ -551,7 +550,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void applyAddPointBeforeMode() {
 		if (inAddPointBeforeMode) {
-			exitAddPointBeforeMode();
+			switchAddPointBeforeMode(false);
 		}
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null && positionToAddPoint != -1) {
@@ -563,83 +562,35 @@ public class MeasurementToolFragment extends Fragment {
 		positionToAddPoint = -1;
 	}
 
-	private void enterMovePointMode() {
-		inMovePointMode = true;
-		mark(View.GONE,
-				R.id.ruler_icon,
-				R.id.measurement_distance_text_view,
-				R.id.measurement_points_text_view,
-				R.id.up_down_button,
-				R.id.measure_mode_controls);
-		mark(View.VISIBLE,
+	private void switchMovePointMode(boolean enable) {
+		inMovePointMode = enable;
+		markGeneralComponents(enable ? View.GONE : View.VISIBLE);
+		mark(enable ? View.VISIBLE : View.GONE,
 				R.id.move_point_icon,
 				R.id.move_point_text,
 				R.id.selected_point_controls);
 	}
 
-	private void exitMovePointMode() {
-		inMovePointMode = false;
-		mark(View.GONE,
-				R.id.move_point_icon,
-				R.id.move_point_text,
-				R.id.selected_point_controls);
-		mark(View.VISIBLE,
-				R.id.ruler_icon,
-				R.id.measurement_distance_text_view,
-				R.id.measurement_points_text_view,
-				R.id.up_down_button,
-				R.id.measure_mode_controls);
-	}
-
-	private void enterAddPointAfterMode() {
-		inAddPointAfterMode = true;
-		mark(View.GONE,
-				R.id.ruler_icon,
-				R.id.measurement_distance_text_view,
-				R.id.measurement_points_text_view,
-				R.id.up_down_button,
-				R.id.measure_mode_controls);
-		mark(View.VISIBLE,
+	private void switchAddPointAfterMode(boolean enable) {
+		inAddPointAfterMode = enable;
+		markGeneralComponents(enable ? View.GONE : View.VISIBLE);
+		mark(enable ? View.VISIBLE : View.GONE,
 				R.id.add_point_after_icon,
 				R.id.add_point_after_text,
 				R.id.selected_point_controls);
 	}
 
-	private void enterAddPointBeforeMode() {
-		inAddPointBeforeMode = true;
-		mark(View.GONE,
-				R.id.ruler_icon,
-				R.id.measurement_distance_text_view,
-				R.id.measurement_points_text_view,
-				R.id.up_down_button,
-				R.id.measure_mode_controls);
-		mark(View.VISIBLE,
+	private void switchAddPointBeforeMode(boolean enable) {
+		inAddPointBeforeMode = enable;
+		markGeneralComponents(enable ? View.GONE : View.VISIBLE);
+		mark(enable ? View.VISIBLE : View.GONE,
 				R.id.add_point_before_icon,
 				R.id.add_point_before_text,
 				R.id.selected_point_controls);
 	}
 
-	private void exitAddPointAfterMode() {
-		inAddPointAfterMode = false;
-		mark(View.GONE,
-				R.id.add_point_after_icon,
-				R.id.add_point_after_text,
-				R.id.selected_point_controls);
-		mark(View.VISIBLE,
-				R.id.ruler_icon,
-				R.id.measurement_distance_text_view,
-				R.id.measurement_points_text_view,
-				R.id.up_down_button,
-				R.id.measure_mode_controls);
-	}
-
-	private void exitAddPointBeforeMode() {
-		inAddPointBeforeMode = false;
-		mark(View.GONE,
-				R.id.add_point_before_icon,
-				R.id.add_point_before_text,
-				R.id.selected_point_controls);
-		mark(View.VISIBLE,
+	private void markGeneralComponents(int status) {
+		mark(status,
 				R.id.ruler_icon,
 				R.id.measurement_distance_text_view,
 				R.id.measurement_points_text_view,
@@ -1083,13 +1034,13 @@ public class MeasurementToolFragment extends Fragment {
 	private void dismiss(MapActivity mapActivity) {
 		try {
 			if (inMovePointMode) {
-				exitMovePointMode();
+				switchMovePointMode(false);
 			}
 			if (inAddPointAfterMode) {
-				exitAddPointAfterMode();
+				switchAddPointAfterMode(false);
 			}
 			if (inAddPointBeforeMode) {
-				exitAddPointBeforeMode();
+				switchAddPointBeforeMode(false);
 			}
 			MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
 			if (measurementToolLayer != null) {

From 121929aa7feeac8d6b67f054e0f3f908ae6c906e Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 15 Aug 2017 14:40:36 +0300
Subject: [PATCH 096/174] Add small improvements

---
 .../measurementtool/MeasurementToolFragment.java   | 12 +++---------
 .../plus/measurementtool/MeasurementToolLayer.java | 14 +++++++-------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index dfd136ff51..175091b7af 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -1045,15 +1045,9 @@ public class MeasurementToolFragment extends Fragment {
 			MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
 			if (measurementToolLayer != null) {
 				measurementToolLayer.clearSelection();
-				if (measurementToolLayer.isInMovePointMode()) {
-					measurementToolLayer.exitMovePointMode();
-				}
-				if (measurementToolLayer.isInAddPointAfterMode()) {
-					measurementToolLayer.exitAddPointAfterMode();
-				}
-				if (measurementToolLayer.isInAddPointBeforeMode()) {
-					measurementToolLayer.exitAddPointBeforeMode();
-				}
+				measurementToolLayer.exitMovePointMode();
+				measurementToolLayer.exitAddPointAfterMode();
+				measurementToolLayer.exitAddPointBeforeMode();
 			}
 			if (newGpxLine != null) {
 				GPXFile gpx = newGpxLine.getGpxFile();
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index b3249d438a..0abc4cf423 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -137,7 +137,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return false;
 	}
 
-	public void clearSelection() {
+	void clearSelection() {
 		selectedPointPos = -1;
 		selectedCachedPoint = null;
 	}
@@ -158,17 +158,17 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return false;
 	}
 
-	public void enterMovingPointMode() {
+	void enterMovingPointMode() {
 		inMovePointMode = true;
 		moveMapToPoint(selectedPointPos);
 	}
 
-	public void enterAddingPointAfterMode() {
+	void enterAddingPointAfterMode() {
 		inAddPointAfterMode = true;
 		moveMapToPoint(selectedPointPos);
 	}
 
-	public void enterAddingPointBeforeMode() {
+	void enterAddingPointBeforeMode() {
 		inAddPointBeforeMode = true;
 		moveMapToPoint(selectedPointPos);
 	}
@@ -192,7 +192,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		}
 	}
 
-	public void selectPoint(int position) {
+	void selectPoint(int position) {
 		clearSelection();
 		selectedCachedPoint = new WptPt(measurementPoints.get(position));
 		selectedPointPos = position;
@@ -305,11 +305,11 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		inMovePointMode = false;
 	}
 
-	public void exitAddPointAfterMode() {
+	void exitAddPointAfterMode() {
 		inAddPointAfterMode = false;
 	}
 
-	public void exitAddPointBeforeMode() {
+	void exitAddPointBeforeMode() {
 		inAddPointBeforeMode = false;
 	}
 

From 865d014caffe40ae234dc39948df66bcb5f57328 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 15 Aug 2017 14:59:37 +0300
Subject: [PATCH 097/174] Change some logic

---
 .../MeasurementToolFragment.java              | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 175091b7af..41299545ee 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -315,7 +315,15 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		});
 
-		disable(undoBtn, redoBtn, upDownBtn);
+		if (!commandManager.canUndo()) {
+			disable(undoBtn);
+		}
+		if (!commandManager.canRedo()) {
+			disable(redoBtn);
+		}
+		if (measurementLayer.getPointsCount() < 1) {
+			disable(upDownBtn);
+		}
 
 		toolBarController = new MeasurementToolBarController(newGpxLine);
 		if (newGpxLine != null) {
@@ -407,6 +415,21 @@ public class MeasurementToolFragment extends Fragment {
 		return view;
 	}
 
+	@Override
+	public void onDestroyView() {
+		super.onDestroyView();
+		exitMeasurementMode();
+		adapter.setAdapterListener(null);
+		if (pointsListOpened) {
+			setPreviousMapPosition();
+		}
+		MeasurementToolLayer layer = getMeasurementLayer();
+		if (layer != null) {
+			layer.setOnSingleTapListener(null);
+			layer.setOnEnterMovePointModeListener(null);
+		}
+	}
+
 	private void openSelectedPointMenu(MapActivity mapActivity) {
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 
@@ -878,20 +901,6 @@ public class MeasurementToolFragment extends Fragment {
 		}.execute();
 	}
 
-	@Override
-	public void onDestroyView() {
-		super.onDestroyView();
-		exitMeasurementMode();
-		adapter.setAdapterListener(null);
-		if (pointsListOpened) {
-			setPreviousMapPosition();
-		}
-		MeasurementToolLayer layer = getMeasurementLayer();
-		if (layer != null) {
-			layer.setOnSingleTapListener(null);
-		}
-	}
-
 	private MapActivity getMapActivity() {
 		return (MapActivity) getActivity();
 	}

From c3b70afd1c90d6e4f429dbf63882ba08f51bbc66 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 15 Aug 2017 15:01:04 +0300
Subject: [PATCH 098/174] Route points fix and styling

---
 OsmAnd/src/net/osmand/plus/GPXUtilities.java  | 11 +++++++-
 .../MeasurementToolFragment.java              | 28 +++++++++++++++++--
 .../measurementtool/MeasurementToolLayer.java |  5 ++++
 ...tedPointMenuBottomSheetDialogFragment.java |  9 +++++-
 .../adapter/MeasurementToolAdapter.java       |  9 +++++-
 5 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index 3bc4adc94e..407124f2f2 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -824,6 +824,14 @@ public class GPXUtilities {
 			return g;
 		}
 
+		public List<WptPt> getLastRoutePoints() {
+			List<WptPt> points = new ArrayList<>();
+			if (routes.size() > 0) {
+				Route rt = routes.get(routes.size() - 1);
+				points.addAll(rt.points);
+			}
+			return points;
+		}
 
 		public boolean hasRtePt() {
 			for (Route r : routes) {
@@ -909,11 +917,12 @@ public class GPXUtilities {
 			modifiedTime = System.currentTimeMillis();
 		}
 
-		public void addRtePts(List<WptPt> points) {
+		public void setLastRoutePoints(List<WptPt> points) {
 			if (routes.size() == 0) {
 				routes.add(new Route());
 			}
 			Route currentRoute = routes.get(routes.size() - 1);
+			currentRoute.points.clear();
 			currentRoute.points.addAll(points);
 
 			modifiedTime = System.currentTimeMillis();
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 41299545ee..2378c8c81f 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -327,7 +327,12 @@ public class MeasurementToolFragment extends Fragment {
 
 		toolBarController = new MeasurementToolBarController(newGpxLine);
 		if (newGpxLine != null) {
-			toolBarController.setTitle(getString(R.string.add_line));
+			LineType lineType = newGpxLine.getLineType();
+			if (lineType == LineType.ROUTE_POINTS) {
+				toolBarController.setTitle(getString(R.string.add_route_points));
+			} else if (lineType == LineType.SEGMENT) {
+				toolBarController.setTitle(getString(R.string.add_line));
+			}
 		} else {
 			toolBarController.setTitle(getString(R.string.measurement_tool_action_bar));
 		}
@@ -412,6 +417,13 @@ public class MeasurementToolFragment extends Fragment {
 
 		enterMeasurementMode();
 
+		if (newGpxLine != null) {
+			LineType lineType = newGpxLine.getLineType();
+			if (lineType == LineType.ROUTE_POINTS) {
+				displayRoutePoints(mapActivity);
+			}
+		}
+
 		return view;
 	}
 
@@ -430,6 +442,18 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
+	private void displayRoutePoints(MapActivity mapActivity) {
+		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
+
+		GPXFile gpx = newGpxLine.getGpxFile();
+		List<WptPt> points = gpx.getLastRoutePoints();
+		if (measurementLayer != null) {
+			measurementLayer.setMeasurementPoints(points);
+			adapter.notifyDataSetChanged();
+			updateText();
+		}
+	}
+
 	private void openSelectedPointMenu(MapActivity mapActivity) {
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 
@@ -856,7 +880,7 @@ public class MeasurementToolFragment extends Fragment {
 								gpx.addTrkSegment(points);
 								break;
 							case ROUTE_POINTS:
-								gpx.addRtePts(points);
+								gpx.setLastRoutePoints(points);
 								break;
 						}
 					}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 0abc4cf423..8daf6992f0 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -111,6 +111,11 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return measurementPoints;
 	}
 
+	public void setMeasurementPoints(List<WptPt> points) {
+		measurementPoints.clear();
+		measurementPoints.addAll(points);
+	}
+
 	String getDistanceSt() {
 		float dist = 0;
 		if (measurementPoints.size() > 0) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
index 6c76da9ad9..f5a1f2fabe 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
@@ -6,6 +6,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -106,7 +107,13 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 
 		List<WptPt> points = measurementLayer.getMeasurementPoints();
 		int pos = measurementLayer.getSelectedPointPos();
-		((TextView) mainView.findViewById(R.id.selected_point_title)).setText(mapActivity.getString(R.string.plugin_distance_point) + " " + (pos + 1));
+		WptPt pt = points.get(pos);
+		String pointTitle = pt.name;
+		if (!TextUtils.isEmpty(pointTitle)) {
+			((TextView) mainView.findViewById(R.id.selected_point_title)).setText(pointTitle);
+		} else {
+			((TextView) mainView.findViewById(R.id.selected_point_title)).setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
+		}
 		if (pos < 1) {
 			((TextView) mainView.findViewById(R.id.selected_point_distance)).setText(mapActivity.getString(R.string.shared_string_control_start));
 		} else {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index cfb87e0df7..4bfab038d1 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -3,6 +3,7 @@ package net.osmand.plus.measurementtool.adapter;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.MotionEventCompat;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -75,7 +76,13 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		if (nightMode) {
 			holder.title.setTextColor(mapActivity.getMyApplication().getResources().getColor(R.color.primary_text_dark));
 		}
-		holder.title.setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
+		WptPt pt = points.get(pos);
+		String pointTitle = pt.name;
+		if (!TextUtils.isEmpty(pointTitle)) {
+			holder.title.setText(pointTitle);
+		} else {
+			holder.title.setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
+		}
 		if (pos < 1) {
 			holder.descr.setText(mapActivity.getString(R.string.shared_string_control_start));
 		} else {

From 18b2910a1ee998c83db0c07b54a3281dae585a1e Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 15 Aug 2017 15:21:40 +0300
Subject: [PATCH 099/174] Add point to tap position

---
 .../MeasurementToolFragment.java              | 16 +++++++++++++--
 .../measurementtool/MeasurementToolLayer.java | 20 ++++++++++++++++++-
 .../command/AddPointCommand.java              | 10 ++++++++--
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 2378c8c81f..f5a5d22823 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -286,7 +286,7 @@ public class MeasurementToolFragment extends Fragment {
 		mainView.findViewById(R.id.add_point_button).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				addPoint();
+				addCenterPoint();
 			}
 		});
 
@@ -660,7 +660,19 @@ public class MeasurementToolFragment extends Fragment {
 	private void addPoint() {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
-			commandManager.execute(new AddPointCommand(measurementLayer));
+			commandManager.execute(new AddPointCommand(measurementLayer, false));
+			enable(undoBtn, upDownBtn);
+			disable(redoBtn);
+			updateText();
+			adapter.notifyDataSetChanged();
+			saved = false;
+		}
+	}
+
+	private void addCenterPoint() {
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (measurementLayer != null) {
+			commandManager.execute(new AddPointCommand(measurementLayer, true));
 			enable(undoBtn, upDownBtn);
 			disable(redoBtn);
 			updateText();
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 8daf6992f0..5043cff19c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -48,6 +48,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private OnEnterMovePointModeListener enterMovePointModeListener;
 	private int selectedPointPos = -1;
 	private WptPt selectedCachedPoint;
+	private LatLon pressedPointLatLon;
 
 	@Override
 	public void initLayer(OsmandMapTileView view) {
@@ -135,6 +136,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 				if (selectedPointPos != -1) {
 					singleTapListener.onSelectPoint();
 				} else {
+					pressedPointLatLon = tileBox.getLatLonFromPixel(point.x, point.y);
 					singleTapListener.onAddPoint();
 				}
 			}
@@ -330,7 +332,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		canvas.rotate(tb.getRotate(), center.x, center.y);
 	}
 
-	public WptPt addPoint(int position) {
+	public WptPt addCenterPoint(int position) {
 		RotatedTileBox tb = view.getCurrentRotatedTileBox();
 		LatLon l = tb.getLatLonFromPixel(tb.getCenterPixelX(), tb.getCenterPixelY());
 		WptPt pt = new WptPt();
@@ -344,6 +346,22 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return null;
 	}
 
+	public WptPt addPoint(int position) {
+		if (pressedPointLatLon != null) {
+			WptPt pt = new WptPt();
+			pt.lat = pressedPointLatLon.getLatitude();
+			pt.lon = pressedPointLatLon.getLongitude();
+			boolean allowed = measurementPoints.size() == 0 || !measurementPoints.get(measurementPoints.size() - 1).equals(pt);
+			if (allowed) {
+				measurementPoints.add(position, pt);
+				moveMapToPoint(position);
+				pressedPointLatLon = null;
+				return pt;
+			}
+		}
+		return null;
+	}
+
 	WptPt getMovedPointToApply() {
 		RotatedTileBox tb = view.getCurrentRotatedTileBox();
 		LatLon latLon = tb.getCenterLatLon();
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
index 8913d04e2b..8eb11ecc35 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
@@ -8,20 +8,26 @@ public class AddPointCommand implements Command {
 	private final MeasurementToolLayer measurementLayer;
 	private final int position;
 	private WptPt point;
+	private boolean center;
 
 	public AddPointCommand(MeasurementToolLayer measurementLayer, int position) {
 		this.measurementLayer = measurementLayer;
 		this.position = position;
 	}
 
-	public AddPointCommand(MeasurementToolLayer measurementLayer) {
+	public AddPointCommand(MeasurementToolLayer measurementLayer, boolean center) {
 		this.measurementLayer = measurementLayer;
+		this.center = center;
 		position = measurementLayer.getPointsCount();
 	}
 
 	@Override
 	public boolean execute() {
-		point = measurementLayer.addPoint(position);
+		if (center) {
+			point = measurementLayer.addCenterPoint(position);
+		} else {
+			point = measurementLayer.addPoint(position);
+		}
 		measurementLayer.refreshMap();
 		return point != null;
 	}

From 6baed758a9ac047dcf8c357d09ef309c0bb7aab3 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 15 Aug 2017 15:36:01 +0300
Subject: [PATCH 100/174] Fix adding point not in center

---
 .../net/osmand/plus/measurementtool/command/AddPointCommand.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
index 8eb11ecc35..02b5cbf7d0 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
@@ -12,6 +12,7 @@ public class AddPointCommand implements Command {
 
 	public AddPointCommand(MeasurementToolLayer measurementLayer, int position) {
 		this.measurementLayer = measurementLayer;
+		this.center = true;
 		this.position = position;
 	}
 

From dd5017a42e99593a10053adf8d2d1c781ce810d6 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 15 Aug 2017 15:36:41 +0300
Subject: [PATCH 101/174] Always clear pressedLatLon

---
 .../net/osmand/plus/measurementtool/MeasurementToolLayer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 5043cff19c..3badbda38b 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -351,11 +351,11 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 			WptPt pt = new WptPt();
 			pt.lat = pressedPointLatLon.getLatitude();
 			pt.lon = pressedPointLatLon.getLongitude();
+			pressedPointLatLon = null;
 			boolean allowed = measurementPoints.size() == 0 || !measurementPoints.get(measurementPoints.size() - 1).equals(pt);
 			if (allowed) {
 				measurementPoints.add(position, pt);
 				moveMapToPoint(position);
-				pressedPointLatLon = null;
 				return pt;
 			}
 		}

From d9527ff6b8e8f1ceac7ca807bb28bd182ac9795a Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 15 Aug 2017 17:18:19 +0300
Subject: [PATCH 102/174] Add shadows

---
 .../bg_bottom_sheet_sides_landscape_dark.xml  | 11 ++++++
 .../bg_bottom_sheet_sides_landscape_light.xml | 11 ++++++
 ...g_bottom_sheet_topsides_landscape_dark.xml | 11 ++++++
 ..._bottom_sheet_topsides_landscape_light.xml | 11 ++++++
 .../OptionsBottomSheetDialogFragment.java     | 17 +++++++--
 ...tedPointMenuBottomSheetDialogFragment.java | 23 +++++++++---
 .../SnapToRoadBottomSheetDialogFragment.java  | 37 +++++++++++++------
 7 files changed, 100 insertions(+), 21 deletions(-)
 create mode 100644 OsmAnd/res/drawable/bg_bottom_sheet_sides_landscape_dark.xml
 create mode 100644 OsmAnd/res/drawable/bg_bottom_sheet_sides_landscape_light.xml
 create mode 100644 OsmAnd/res/drawable/bg_bottom_sheet_topsides_landscape_dark.xml
 create mode 100644 OsmAnd/res/drawable/bg_bottom_sheet_topsides_landscape_light.xml

diff --git a/OsmAnd/res/drawable/bg_bottom_sheet_sides_landscape_dark.xml b/OsmAnd/res/drawable/bg_bottom_sheet_sides_landscape_dark.xml
new file mode 100644
index 0000000000..eff45a9496
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_bottom_sheet_sides_landscape_dark.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <nine-patch android:src="@drawable/bg_shadow_bottomsheet_sides"/>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/bg_color_dark"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/bg_bottom_sheet_sides_landscape_light.xml b/OsmAnd/res/drawable/bg_bottom_sheet_sides_landscape_light.xml
new file mode 100644
index 0000000000..56b0695473
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_bottom_sheet_sides_landscape_light.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <nine-patch android:src="@drawable/bg_shadow_bottomsheet_sides"/>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/bg_color_light"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/bg_bottom_sheet_topsides_landscape_dark.xml b/OsmAnd/res/drawable/bg_bottom_sheet_topsides_landscape_dark.xml
new file mode 100644
index 0000000000..8e8827fc1d
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_bottom_sheet_topsides_landscape_dark.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <nine-patch android:src="@drawable/bg_shadow_bottomsheet_topsides"/>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/bg_color_dark"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/bg_bottom_sheet_topsides_landscape_light.xml b/OsmAnd/res/drawable/bg_bottom_sheet_topsides_landscape_light.xml
new file mode 100644
index 0000000000..d35d49da33
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_bottom_sheet_topsides_landscape_light.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <nine-patch android:src="@drawable/bg_shadow_bottomsheet_topsides"/>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/bg_color_light"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
index 3a8828046b..9e00d27831 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@@ -40,8 +40,8 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
+		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_options_bottom_sheet_dialog, null);
@@ -119,7 +119,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 			}
 		});
 
-		final int height = AndroidUtils.getScreenHeight(getActivity());
+		final int screenHeight = AndroidUtils.getScreenHeight(getActivity());
 		final int statusBarHeight = AndroidUtils.getStatusBarHeight(getActivity());
 		final int navBarHeight = AndroidUtils.getNavBarHeight(getActivity());
 
@@ -130,12 +130,23 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 				int scrollViewHeight = scrollView.getHeight();
 				int dividerHeight = AndroidUtils.dpToPx(getContext(), 1);
 				int cancelButtonHeight = getContext().getResources().getDimensionPixelSize(R.dimen.measure_distance_bottom_sheet_cancel_button_height);
-				int spaceForScrollView = height - statusBarHeight - navBarHeight - dividerHeight - cancelButtonHeight;
+				int spaceForScrollView = screenHeight - statusBarHeight - navBarHeight - dividerHeight - cancelButtonHeight;
 				if (scrollViewHeight > spaceForScrollView) {
 					scrollView.getLayoutParams().height = spaceForScrollView;
 					scrollView.requestLayout();
 				}
 
+				if (!portrait) {
+					if (screenHeight - statusBarHeight - mainView.getHeight()
+							>= AndroidUtils.dpToPx(getActivity(), 8)) {
+						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
+								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
+					} else {
+						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
+								R.drawable.bg_bottom_sheet_sides_landscape_light, R.drawable.bg_bottom_sheet_sides_landscape_dark);
+					}
+				}
+
 				ViewTreeObserver obs = mainView.getViewTreeObserver();
 				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
 					obs.removeOnGlobalLayoutListener(this);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
index f5a1f2fabe..a2e23897b0 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
@@ -35,6 +35,7 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 
 	private SelectedPointOptionOnClickListener listener;
 	private boolean nightMode;
+	private boolean portrait;
 
 	public void setSelectedPointOptionOnClickListener(SelectedPointOptionOnClickListener listener) {
 		this.listener = listener;
@@ -46,10 +47,9 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 		final MapActivity mapActivity = (MapActivity) getActivity();
 		final IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
-		final boolean portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
-
-		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
+		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_selected_menu_bottom_sheet_dialog, null);
 		if (portrait) {
@@ -124,7 +124,7 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 			((TextView) mainView.findViewById(R.id.selected_point_distance)).setText(OsmAndFormatter.getFormattedDistance(dist, mapActivity.getMyApplication()));
 		}
 
-		final int height = AndroidUtils.getScreenHeight(getActivity());
+		final int screenHeight = AndroidUtils.getScreenHeight(getActivity());
 		final int statusBarHeight = AndroidUtils.getStatusBarHeight(getActivity());
 		final int navBarHeight = AndroidUtils.getNavBarHeight(getActivity());
 
@@ -135,12 +135,23 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 				int scrollViewHeight = scrollView.getHeight();
 				int dividerHeight = AndroidUtils.dpToPx(getContext(), 1);
 				int cancelButtonHeight = getContext().getResources().getDimensionPixelSize(R.dimen.measure_distance_bottom_sheet_cancel_button_height);
-				int spaceForScrollView = height - statusBarHeight - navBarHeight - dividerHeight - cancelButtonHeight;
+				int spaceForScrollView = screenHeight - statusBarHeight - navBarHeight - dividerHeight - cancelButtonHeight;
 				if (scrollViewHeight > spaceForScrollView) {
 					scrollView.getLayoutParams().height = spaceForScrollView;
 					scrollView.requestLayout();
 				}
 
+				if (!portrait) {
+					if (screenHeight - statusBarHeight - mainView.getHeight()
+							>= AndroidUtils.dpToPx(getActivity(), 8)) {
+						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
+								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
+					} else {
+						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
+								R.drawable.bg_bottom_sheet_sides_landscape_light, R.drawable.bg_bottom_sheet_sides_landscape_dark);
+					}
+				}
+
 				ViewTreeObserver obs = mainView.getViewTreeObserver();
 				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
 					obs.removeOnGlobalLayoutListener(this);
@@ -156,7 +167,7 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 	@Override
 	public void onStart() {
 		super.onStart();
-		if (!AndroidUiHelper.isOrientationPortrait(getActivity())) {
+		if (!portrait) {
 			final Window window = getDialog().getWindow();
 			WindowManager.LayoutParams params = window.getAttributes();
 			params.width = getActivity().getResources().getDimensionPixelSize(R.dimen.landscape_bottom_sheet_dialog_fragment_width);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index 97ff505e30..27eef7d3ad 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -31,27 +31,29 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 	public static final String TAG = "SnapToRoadBottomSheetDialogFragment";
 
 	private boolean nightMode;
+	private boolean portrait;
 
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		final OsmandSettings settings = getMyApplication().getSettings();
-		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
+		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
 
-		final View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_snap_to_road_bottom_sheet_dialog, container);
+		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_snap_to_road_bottom_sheet_dialog, container);
 
-		view.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {
+		mainView.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				dismiss();
 			}
 		});
 		if (nightMode) {
-			((TextView) view.findViewById(R.id.choose_navigation_title)).setTextColor(getResources().getColor(R.color.ctx_menu_info_text_dark));
+			((TextView) mainView.findViewById(R.id.choose_navigation_title)).setTextColor(getResources().getColor(R.color.ctx_menu_info_text_dark));
 		}
 
-		LinearLayout navContainer = (LinearLayout) view.findViewById(R.id.navigation_types_container);
+		LinearLayout navContainer = (LinearLayout) mainView.findViewById(R.id.navigation_types_container);
 		final List<ApplicationMode> modes = new ArrayList<>(ApplicationMode.values(settings));
 		modes.remove(ApplicationMode.DEFAULT);
 		for (ApplicationMode mode : modes) {
@@ -61,24 +63,35 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 			navContainer.addView(row);
 		}
 
-		final int height = AndroidUtils.getScreenHeight(getActivity());
+		final int screenHeight = AndroidUtils.getScreenHeight(getActivity());
 		final int statusBarHeight = AndroidUtils.getStatusBarHeight(getActivity());
 		final int navBarHeight = AndroidUtils.getNavBarHeight(getActivity());
 
-		view.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+		mainView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
 			@Override
 			public void onGlobalLayout() {
-				final View scrollView = view.findViewById(R.id.navigation_types_scroll_view);
+				final View scrollView = mainView.findViewById(R.id.navigation_types_scroll_view);
 				int scrollViewHeight = scrollView.getHeight();
 				int dividerHeight = AndroidUtils.dpToPx(getContext(), 1);
 				int cancelButtonHeight = getContext().getResources().getDimensionPixelSize(R.dimen.measure_distance_bottom_sheet_cancel_button_height);
-				int spaceForScrollView = height - statusBarHeight - navBarHeight - dividerHeight - cancelButtonHeight;
+				int spaceForScrollView = screenHeight - statusBarHeight - navBarHeight - dividerHeight - cancelButtonHeight;
 				if (scrollViewHeight > spaceForScrollView) {
 					scrollView.getLayoutParams().height = spaceForScrollView;
 					scrollView.requestLayout();
 				}
 
-				ViewTreeObserver obs = view.getViewTreeObserver();
+				if (!portrait) {
+					if (screenHeight - statusBarHeight - mainView.getHeight()
+							>= AndroidUtils.dpToPx(getActivity(), 8)) {
+						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
+								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
+					} else {
+						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
+								R.drawable.bg_bottom_sheet_sides_landscape_light, R.drawable.bg_bottom_sheet_sides_landscape_dark);
+					}
+				}
+
+				ViewTreeObserver obs = mainView.getViewTreeObserver();
 				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
 					obs.removeOnGlobalLayoutListener(this);
 				} else {
@@ -87,13 +100,13 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 			}
 		});
 
-		return view;
+		return mainView;
 	}
 
 	@Override
 	public void onStart() {
 		super.onStart();
-		if (!AndroidUiHelper.isOrientationPortrait(getActivity())) {
+		if (!portrait) {
 			final Window window = getDialog().getWindow();
 			WindowManager.LayoutParams params = window.getAttributes();
 			params.width = getActivity().getResources().getDimensionPixelSize(R.dimen.landscape_bottom_sheet_dialog_fragment_width);

From 26a07b83a5c8c566f8293f11165b85c0a7abeeeb Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 15 Aug 2017 17:37:58 +0300
Subject: [PATCH 103/174] Save fragment instance

---
 .../net/osmand/plus/activities/MapActivity.java | 12 +-----------
 .../plus/activities/MapActivityActions.java     |  7 +------
 .../MeasurementToolFragment.java                | 17 ++++++++++++++++-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 1d7d3e212b..9b6b5aa3ef 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -944,7 +944,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 					NewGpxLine newGpxLine = (NewGpxLine) toShow;
 					QuadRect qr = newGpxLine.getRect();
 					mapView.fitRectToMap(qr.left, qr.right, qr.top, qr.bottom, (int) qr.width(), (int) qr.height(), 0);
-					openAddingNewGpxLine(newGpxLine);
+					MeasurementToolFragment.showInstance(getSupportFragmentManager(), newGpxLine);
 				} else {
 					mapContextMenu.show(latLonToShow, mapLabelToShow, toShow);
 				}
@@ -958,16 +958,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		}
 	}
 
-	private void openAddingNewGpxLine(NewGpxLine newGpxLine) {
-		MeasurementToolFragment fragment = new MeasurementToolFragment();
-		fragment.setNewGpxLine(newGpxLine);
-		getSupportFragmentManager()
-				.beginTransaction()
-				.add(R.id.bottomFragmentContainer, fragment, MeasurementToolFragment.TAG)
-				.addToBackStack(MeasurementToolFragment.TAG)
-				.commitAllowingStateLoss();
-	}
-
 	public OsmandApplication getMyApplication() {
 		return ((OsmandApplication) getApplication());
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 31d29d860b..094a7d1179 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -764,12 +764,7 @@ public class MapActivityActions implements DialogProvider {
 				.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();
+						MeasurementToolFragment.showInstance(mapActivity.getSupportFragmentManager(), null);
 						return true;
 					}
 				}).createItem());
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index f5a5d22823..5c1f607da1 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -1101,7 +1101,7 @@ public class MeasurementToolFragment extends Fragment {
 				newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 				startActivity(newIntent);
 			}
-			mapActivity.getSupportFragmentManager().popBackStackImmediate(TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+			mapActivity.getSupportFragmentManager().beginTransaction().remove(this).commitAllowingStateLoss();
 		} catch (Exception e) {
 			// ignore
 		}
@@ -1133,4 +1133,19 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		}
 	}
+
+	public static boolean showInstance(FragmentManager fragmentManager, NewGpxLine newGpxLine) {
+		try {
+			MeasurementToolFragment fragment = new MeasurementToolFragment();
+			fragment.setNewGpxLine(newGpxLine);
+			fragment.setRetainInstance(true);
+			fragmentManager
+					.beginTransaction()
+					.add(R.id.bottomFragmentContainer, fragment, MeasurementToolFragment.TAG)
+					.commitAllowingStateLoss();
+			return true;
+		} catch (Exception e) {
+			return false;
+		}
+	}
 }

From 8e94406753eb0cc8ee7021a85d795e12bab9e022 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 15 Aug 2017 18:54:59 +0300
Subject: [PATCH 104/174] Fix night theme

---
 .../measurementtool/OptionsBottomSheetDialogFragment.java  | 2 +-
 .../SelectedPointMenuBottomSheetDialogFragment.java        | 7 ++++---
 .../SnapToRoadBottomSheetDialogFragment.java               | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
index 9e00d27831..7cfa850328 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@@ -40,9 +40,9 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
+		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_options_bottom_sheet_dialog, null);
 		if (portrait) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
index a2e23897b0..00b706d935 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
@@ -45,18 +45,19 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		final MapActivity mapActivity = (MapActivity) getActivity();
+		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
 		final IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
-		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
-		portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_selected_menu_bottom_sheet_dialog, null);
 		if (portrait) {
 			AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
 		}
 
-		((ImageView) mainView.findViewById(R.id.selected_point_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_measure_point, R.color.color_myloc_distance));
+		int color = nightMode ? R.color.osmand_orange : R.color.color_myloc_distance;
+		((ImageView) mainView.findViewById(R.id.selected_point_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_measure_point, color));
 		((ImageView) mainView.findViewById(R.id.move_point_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_move_point));
 		((ImageView) mainView.findViewById(R.id.delete_point_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_remove_dark));
 		((ImageView) mainView.findViewById(R.id.add_point_after_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_addpoint_above));
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index 27eef7d3ad..bb97ef348f 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -36,10 +36,10 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		final OsmandSettings settings = getMyApplication().getSettings();
-		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
+		final OsmandSettings settings = getMyApplication().getSettings();
+		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_snap_to_road_bottom_sheet_dialog, container);
 

From dc4fd7180247a108005d3d2f385ffd74b808a0af Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 15 Aug 2017 18:58:58 +0300
Subject: [PATCH 105/174] Fix code style

---
 .../MeasurementToolFragment.java              | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 5c1f607da1..85b0169b74 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -1107,6 +1107,20 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
+	public static boolean showInstance(FragmentManager fragmentManager, NewGpxLine newGpxLine) {
+		try {
+			MeasurementToolFragment fragment = new MeasurementToolFragment();
+			fragment.setNewGpxLine(newGpxLine);
+			fragment.setRetainInstance(true);
+			fragmentManager.beginTransaction()
+					.add(R.id.bottomFragmentContainer, fragment, MeasurementToolFragment.TAG)
+					.commitAllowingStateLoss();
+			return true;
+		} catch (Exception e) {
+			return false;
+		}
+	}
+
 	private class MeasurementToolBarController extends TopToolbarController {
 
 		MeasurementToolBarController(NewGpxLine newGpxLine) {
@@ -1133,19 +1147,4 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		}
 	}
-
-	public static boolean showInstance(FragmentManager fragmentManager, NewGpxLine newGpxLine) {
-		try {
-			MeasurementToolFragment fragment = new MeasurementToolFragment();
-			fragment.setNewGpxLine(newGpxLine);
-			fragment.setRetainInstance(true);
-			fragmentManager
-					.beginTransaction()
-					.add(R.id.bottomFragmentContainer, fragment, MeasurementToolFragment.TAG)
-					.commitAllowingStateLoss();
-			return true;
-		} catch (Exception e) {
-			return false;
-		}
-	}
 }

From 17412ef7839e4ae65c461643585fbaea5d76da7e Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 15 Aug 2017 19:00:59 +0300
Subject: [PATCH 106/174] Fix points on rotate

---
 .../MeasurementToolFragment.java              | 44 +++++++++++--------
 .../measurementtool/MeasurementToolLayer.java | 19 ++++++--
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 85b0169b74..b363c5933c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -96,6 +96,7 @@ public class MeasurementToolFragment extends Fragment {
 	private boolean nightMode;
 	private int previousMapPosition;
 	private NewGpxLine newGpxLine;
+	private boolean routePointsAdded;
 
 	private boolean inMovePointMode;
 	private boolean inAddPointAfterMode;
@@ -103,6 +104,8 @@ public class MeasurementToolFragment extends Fragment {
 
 	private int positionToAddPoint = -1;
 
+	private List<WptPt> measurementPoints = new LinkedList<>();
+
 	public void setNewGpxLine(NewGpxLine newGpxLine) {
 		this.newGpxLine = newGpxLine;
 	}
@@ -112,6 +115,10 @@ public class MeasurementToolFragment extends Fragment {
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		final MapActivity mapActivity = (MapActivity) getActivity();
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
+		measurementLayer.setMeasurementPoints(measurementPoints);
+		measurementLayer.setInMovePointMode(inMovePointMode);
+		measurementLayer.setInAddPointBeforeMode(inAddPointBeforeMode);
+		measurementLayer.setInAddPointAfterMode(inAddPointAfterMode);
 		iconsCache = mapActivity.getMyApplication().getIconsCache();
 		nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
@@ -417,10 +424,11 @@ public class MeasurementToolFragment extends Fragment {
 
 		enterMeasurementMode();
 
-		if (newGpxLine != null) {
+		if (newGpxLine != null && !routePointsAdded) {
 			LineType lineType = newGpxLine.getLineType();
 			if (lineType == LineType.ROUTE_POINTS) {
 				displayRoutePoints(mapActivity);
+				routePointsAdded = true;
 			}
 		}
 
@@ -435,8 +443,21 @@ public class MeasurementToolFragment extends Fragment {
 		if (pointsListOpened) {
 			setPreviousMapPosition();
 		}
+		if (inMovePointMode) {
+			switchMovePointMode(false);
+		}
+		if (inAddPointAfterMode) {
+			switchAddPointAfterMode(false);
+		}
+		if (inAddPointBeforeMode) {
+			switchAddPointBeforeMode(false);
+		}
 		MeasurementToolLayer layer = getMeasurementLayer();
 		if (layer != null) {
+			layer.clearSelection();
+			layer.exitMovePointMode();
+			layer.exitAddPointAfterMode();
+			layer.exitAddPointBeforeMode();
 			layer.setOnSingleTapListener(null);
 			layer.setOnEnterMovePointModeListener(null);
 		}
@@ -448,7 +469,7 @@ public class MeasurementToolFragment extends Fragment {
 		GPXFile gpx = newGpxLine.getGpxFile();
 		List<WptPt> points = gpx.getLastRoutePoints();
 		if (measurementLayer != null) {
-			measurementLayer.setMeasurementPoints(points);
+			measurementPoints.addAll(points);
 			adapter.notifyDataSetChanged();
 			updateText();
 		}
@@ -866,9 +887,9 @@ public class MeasurementToolFragment extends Fragment {
 					toSave = new File(dir, fileName);
 					GPXFile gpx = new GPXFile();
 					if (measurementLayer != null) {
-						LinkedList<WptPt> points = measurementLayer.getMeasurementPoints();
+						List<WptPt> points = measurementLayer.getMeasurementPoints();
 						if (points.size() == 1) {
-							gpx.points.add(points.getFirst());
+							gpx.points.add(points.get(0));
 						} else if (points.size() > 1) {
 							Route rt = new Route();
 							gpx.routes.add(rt);
@@ -1033,7 +1054,6 @@ public class MeasurementToolFragment extends Fragment {
 				collapseButton.setVisibility(View.VISIBLE);
 			}
 
-			measurementLayer.getMeasurementPoints().clear();
 			mapActivity.refreshMap();
 		}
 	}
@@ -1078,21 +1098,9 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void dismiss(MapActivity mapActivity) {
 		try {
-			if (inMovePointMode) {
-				switchMovePointMode(false);
-			}
-			if (inAddPointAfterMode) {
-				switchAddPointAfterMode(false);
-			}
-			if (inAddPointBeforeMode) {
-				switchAddPointBeforeMode(false);
-			}
 			MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
 			if (measurementToolLayer != null) {
-				measurementToolLayer.clearSelection();
-				measurementToolLayer.exitMovePointMode();
-				measurementToolLayer.exitAddPointAfterMode();
-				measurementToolLayer.exitAddPointBeforeMode();
+				measurementToolLayer.getMeasurementPoints().clear();
 			}
 			if (newGpxLine != null) {
 				GPXFile gpx = newGpxLine.getGpxFile();
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 3badbda38b..dab2aabf04 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -32,7 +32,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private boolean inMovePointMode;
 	private boolean inAddPointAfterMode;
 	private boolean inAddPointBeforeMode;
-	private final LinkedList<WptPt> measurementPoints = new LinkedList<>();
+	private List<WptPt> measurementPoints = new LinkedList<>();
 	private Bitmap centerIconDay;
 	private Bitmap centerIconNight;
 	private Bitmap pointIcon;
@@ -104,17 +104,28 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		this.inMeasurementMode = inMeasurementMode;
 	}
 
+	void setInMovePointMode(boolean inMovePointMode) {
+		this.inMovePointMode = inMovePointMode;
+	}
+
+	void setInAddPointAfterMode(boolean inAddPointAfterMode) {
+		this.inAddPointAfterMode = inAddPointAfterMode;
+	}
+
+	void setInAddPointBeforeMode(boolean inAddPointBeforeMode) {
+		this.inAddPointBeforeMode = inAddPointBeforeMode;
+	}
+
 	public int getPointsCount() {
 		return measurementPoints.size();
 	}
 
-	public LinkedList<WptPt> getMeasurementPoints() {
+	public List<WptPt> getMeasurementPoints() {
 		return measurementPoints;
 	}
 
 	public void setMeasurementPoints(List<WptPt> points) {
-		measurementPoints.clear();
-		measurementPoints.addAll(points);
+		measurementPoints = points;
 	}
 
 	String getDistanceSt() {

From 5a7f28b29dd6707aeca071fe5f5f80c3fe3763ed Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 16 Aug 2017 10:26:50 +0300
Subject: [PATCH 107/174] Remove unnecessary code

---
 .../measurementtool/MeasurementToolFragment.java     |  3 ---
 .../plus/measurementtool/MeasurementToolLayer.java   | 12 ------------
 2 files changed, 15 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index b363c5933c..c3838cbd31 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -116,9 +116,6 @@ public class MeasurementToolFragment extends Fragment {
 		final MapActivity mapActivity = (MapActivity) getActivity();
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 		measurementLayer.setMeasurementPoints(measurementPoints);
-		measurementLayer.setInMovePointMode(inMovePointMode);
-		measurementLayer.setInAddPointBeforeMode(inAddPointBeforeMode);
-		measurementLayer.setInAddPointAfterMode(inAddPointAfterMode);
 		iconsCache = mapActivity.getMyApplication().getIconsCache();
 		nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index dab2aabf04..1f6057dce7 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -104,18 +104,6 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		this.inMeasurementMode = inMeasurementMode;
 	}
 
-	void setInMovePointMode(boolean inMovePointMode) {
-		this.inMovePointMode = inMovePointMode;
-	}
-
-	void setInAddPointAfterMode(boolean inAddPointAfterMode) {
-		this.inAddPointAfterMode = inAddPointAfterMode;
-	}
-
-	void setInAddPointBeforeMode(boolean inAddPointBeforeMode) {
-		this.inAddPointBeforeMode = inAddPointBeforeMode;
-	}
-
 	public int getPointsCount() {
 		return measurementPoints.size();
 	}

From 5fa9664f05902db232f2e7dd8ff16a2f919731ef Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 16 Aug 2017 11:14:12 +0300
Subject: [PATCH 108/174] Fix fabs on android 4

---
 OsmAnd/res/layout/my_places_fabs.xml      | 158 ++++++++++++++++++++++
 OsmAnd/res/layout/track_points_tree.xml   | 146 +-------------------
 OsmAnd/res/layout/track_segments_tree.xml | 146 +-------------------
 3 files changed, 160 insertions(+), 290 deletions(-)
 create mode 100644 OsmAnd/res/layout/my_places_fabs.xml

diff --git a/OsmAnd/res/layout/my_places_fabs.xml b/OsmAnd/res/layout/my_places_fabs.xml
new file mode 100644
index 0000000000..46abc9966e
--- /dev/null
+++ b/OsmAnd/res/layout/my_places_fabs.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                xmlns:tools="http://schemas.android.com/tools"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                xmlns:osmand="http://schemas.android.com/apk/res-auto">
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/menu_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:contentDescription="@string/quick_action_new_action"
+        android:src="@drawable/ic_action_plus"
+        app:backgroundTint="@color/dashboard_blue"
+        app:fabSize="normal"
+        app:useCompatPadding="true"/>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/waypoint_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/menu_fab"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="-16dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:contentDescription="@string/quick_action_new_action"
+        android:src="@drawable/ic_action_marker_dark"
+        android:visibility="gone"
+        app:backgroundTint="@color/fab_green"
+        app:fabSize="mini"
+        app:useCompatPadding="true"
+        tools:visibility="visible"/>
+
+    <FrameLayout
+        android:id="@+id/waypoint_text_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_alignBottom="@id/waypoint_fab"
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_toLeftOf="@id/waypoint_fab"
+        android:layout_toStartOf="@id/waypoint_fab"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:id="@+id/waypoint_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="?attr/bg_card"
+            android:gravity="center_vertical"
+            android:padding="8dp"
+            android:text="@string/add_waypoint"
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"/>
+
+    </FrameLayout>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/route_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/waypoint_fab"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="-16dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:contentDescription="@string/quick_action_new_action"
+        android:src="@drawable/ic_action_markers_dark"
+        android:visibility="gone"
+        app:backgroundTint="@color/fab_green"
+        app:fabSize="mini"
+        app:useCompatPadding="true"
+        tools:visibility="visible"/>
+
+    <FrameLayout
+        android:id="@+id/route_text_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_alignBottom="@id/route_fab"
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_toLeftOf="@id/route_fab"
+        android:layout_toStartOf="@id/route_fab"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:id="@+id/route_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="?attr/bg_card"
+            android:gravity="center_vertical"
+            android:padding="8dp"
+            android:text="@string/add_route_points"
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"/>
+
+    </FrameLayout>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/line_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/route_fab"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="-16dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:contentDescription="@string/quick_action_new_action"
+        android:src="@drawable/ic_action_polygom_dark"
+        android:visibility="gone"
+        app:backgroundTint="@color/fab_green"
+        app:fabSize="mini"
+        app:useCompatPadding="true"
+        tools:visibility="visible"/>
+
+    <FrameLayout
+        android:id="@+id/line_text_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_above="@id/route_fab"
+        android:layout_alignBottom="@id/line_fab"
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_toLeftOf="@id/line_fab"
+        android:layout_toStartOf="@id/line_fab"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:id="@+id/line_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="?attr/bg_card"
+            android:gravity="center_vertical"
+            android:padding="8dp"
+            android:text="@string/add_line"
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"/>
+
+    </FrameLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/track_points_tree.xml b/OsmAnd/res/layout/track_points_tree.xml
index 204d8bb8f2..83a44d7fc9 100644
--- a/OsmAnd/res/layout/track_points_tree.xml
+++ b/OsmAnd/res/layout/track_points_tree.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                xmlns:osmand="http://schemas.android.com/apk/res-auto"
-                xmlns:tools="http://schemas.android.com/tools"
                 android:id="@+id/MainLayout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
@@ -26,147 +23,6 @@
         android:background="@color/white_80_transparent"
         android:visibility="gone"/>
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/menu_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_margin="16dp"
-        android:contentDescription="@string/quick_action_new_action"
-        android:src="@drawable/ic_action_plus"
-        app:backgroundTint="@color/dashboard_blue"
-        app:fabSize="normal"/>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/waypoint_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/menu_fab"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginEnd="24dp"
-        android:layout_marginRight="24dp"
-        android:contentDescription="@string/quick_action_new_action"
-        android:src="@drawable/ic_action_marker_dark"
-        android:visibility="gone"
-        app:backgroundTint="@color/fab_green"
-        app:fabSize="mini"
-        tools:visibility="visible"/>
-
-    <FrameLayout
-        android:id="@+id/waypoint_text_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:layout_above="@id/menu_fab"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_toLeftOf="@id/waypoint_fab"
-        android:layout_toStartOf="@id/waypoint_fab"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <net.osmand.plus.widgets.TextViewEx
-            android:id="@+id/waypoint_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:background="?attr/bg_card"
-            android:gravity="center_vertical"
-            android:padding="8dp"
-            android:text="@string/add_waypoint"
-            android:textColor="?android:attr/textColorPrimary"
-            osmand:typeface="@string/font_roboto_medium"/>
-
-    </FrameLayout>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/route_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/waypoint_fab"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="16dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginRight="24dp"
-        android:contentDescription="@string/quick_action_new_action"
-        android:src="@drawable/ic_action_markers_dark"
-        android:visibility="gone"
-        app:backgroundTint="@color/fab_green"
-        app:fabSize="mini"
-        tools:visibility="visible"/>
-
-    <FrameLayout
-        android:id="@+id/route_text_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:layout_above="@id/waypoint_fab"
-        android:layout_marginBottom="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_toLeftOf="@id/route_fab"
-        android:layout_toStartOf="@id/route_fab"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <net.osmand.plus.widgets.TextViewEx
-            android:id="@+id/route_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:background="?attr/bg_card"
-            android:gravity="center_vertical"
-            android:padding="8dp"
-            android:text="@string/add_route_points"
-            android:textColor="?android:attr/textColorPrimary"
-            osmand:typeface="@string/font_roboto_medium"/>
-
-    </FrameLayout>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/line_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/route_fab"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="16dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginRight="24dp"
-        android:contentDescription="@string/quick_action_new_action"
-        android:src="@drawable/ic_action_polygom_dark"
-        android:visibility="gone"
-        app:backgroundTint="@color/fab_green"
-        app:fabSize="mini"
-        tools:visibility="visible"/>
-
-    <FrameLayout
-        android:id="@+id/line_text_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:layout_above="@id/route_fab"
-        android:layout_marginBottom="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_toLeftOf="@id/line_fab"
-        android:layout_toStartOf="@id/line_fab"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <net.osmand.plus.widgets.TextViewEx
-            android:id="@+id/line_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:background="?attr/bg_card"
-            android:gravity="center_vertical"
-            android:padding="8dp"
-            android:text="@string/add_line"
-            android:textColor="?android:attr/textColorPrimary"
-            osmand:typeface="@string/font_roboto_medium"/>
-
-    </FrameLayout>
+    <include layout="@layout/my_places_fabs"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/track_segments_tree.xml b/OsmAnd/res/layout/track_segments_tree.xml
index ab52f6cc59..a50fae2855 100644
--- a/OsmAnd/res/layout/track_segments_tree.xml
+++ b/OsmAnd/res/layout/track_segments_tree.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                xmlns:osmand="http://schemas.android.com/apk/res-auto"
-                xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
@@ -22,147 +19,6 @@
         android:background="@color/white_80_transparent"
         android:visibility="gone"/>
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/menu_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_margin="16dp"
-        android:contentDescription="@string/quick_action_new_action"
-        android:src="@drawable/ic_action_plus"
-        app:backgroundTint="@color/dashboard_blue"
-        app:fabSize="normal"/>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/waypoint_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/menu_fab"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginEnd="24dp"
-        android:layout_marginRight="24dp"
-        android:contentDescription="@string/quick_action_new_action"
-        android:src="@drawable/ic_action_marker_dark"
-        android:visibility="gone"
-        app:backgroundTint="@color/fab_green"
-        app:fabSize="mini"
-        tools:visibility="visible"/>
-
-    <FrameLayout
-        android:id="@+id/waypoint_text_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:layout_above="@id/menu_fab"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_toLeftOf="@id/waypoint_fab"
-        android:layout_toStartOf="@id/waypoint_fab"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <net.osmand.plus.widgets.TextViewEx
-            android:id="@+id/waypoint_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:background="?attr/bg_card"
-            android:gravity="center_vertical"
-            android:padding="8dp"
-            android:text="@string/add_waypoint"
-            android:textColor="?android:attr/textColorPrimary"
-            osmand:typeface="@string/font_roboto_medium"/>
-
-    </FrameLayout>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/route_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/waypoint_fab"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="16dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginRight="24dp"
-        android:contentDescription="@string/quick_action_new_action"
-        android:src="@drawable/ic_action_markers_dark"
-        android:visibility="gone"
-        app:backgroundTint="@color/fab_green"
-        app:fabSize="mini"
-        tools:visibility="visible"/>
-
-    <FrameLayout
-        android:id="@+id/route_text_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:layout_above="@id/waypoint_fab"
-        android:layout_marginBottom="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_toLeftOf="@id/route_fab"
-        android:layout_toStartOf="@id/route_fab"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <net.osmand.plus.widgets.TextViewEx
-            android:id="@+id/route_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:background="?attr/bg_card"
-            android:gravity="center_vertical"
-            android:padding="8dp"
-            android:text="@string/add_route_points"
-            android:textColor="?android:attr/textColorPrimary"
-            osmand:typeface="@string/font_roboto_medium"/>
-
-    </FrameLayout>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/line_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/route_fab"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="16dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginRight="24dp"
-        android:contentDescription="@string/quick_action_new_action"
-        android:src="@drawable/ic_action_polygom_dark"
-        android:visibility="gone"
-        app:backgroundTint="@color/fab_green"
-        app:fabSize="mini"
-        tools:visibility="visible"/>
-
-    <FrameLayout
-        android:id="@+id/line_text_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:layout_above="@id/route_fab"
-        android:layout_marginBottom="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_toLeftOf="@id/line_fab"
-        android:layout_toStartOf="@id/line_fab"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <net.osmand.plus.widgets.TextViewEx
-            android:id="@+id/line_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:background="?attr/bg_card"
-            android:gravity="center_vertical"
-            android:padding="8dp"
-            android:text="@string/add_line"
-            android:textColor="?android:attr/textColorPrimary"
-            osmand:typeface="@string/font_roboto_medium"/>
-
-    </FrameLayout>
+    <include layout="@layout/my_places_fabs"/>
 
 </RelativeLayout>
\ No newline at end of file

From caff7d1d4869bbcc82323090f75cd022c2e49e90 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 16 Aug 2017 11:22:36 +0300
Subject: [PATCH 109/174] Open track activity by pressing cancel

---
 .../net/osmand/plus/views/AddGpxPointBottomSheetHelper.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java b/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java
index f2fc81faa7..40d9b9e342 100644
--- a/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java
+++ b/OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java
@@ -68,6 +68,7 @@ public class AddGpxPointBottomSheetHelper implements OnDismissListener {
 			public void onClick(View v) {
 				hide();
 				contextMenuLayer.cancelAddGpxPoint();
+				openTrackActivity();
 			}
 		});
 	}
@@ -134,6 +135,10 @@ public class AddGpxPointBottomSheetHelper implements OnDismissListener {
 		if (contextMenu.isVisible() && contextMenu.isClosable()) {
 			contextMenu.close();
 		}
+		openTrackActivity();
+	}
+
+	private void openTrackActivity() {
 		Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getTrackActivity());
 		newIntent.putExtra(TrackActivity.TRACK_FILE_NAME, newGpxPoint.getGpx().path);
 		newIntent.putExtra(TrackActivity.OPEN_POINTS_TAB, true);

From 3fc71dd11cf96403a0313fd3bcf59f80111267ed Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 16 Aug 2017 12:05:33 +0300
Subject: [PATCH 110/174] Fix crash

---
 .../measurementtool/MeasurePointsListFragment.java   |  3 +++
 .../measurementtool/MeasurementToolFragment.java     | 12 +++++++-----
 .../plus/measurementtool/MeasurementToolLayer.java   |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurePointsListFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurePointsListFragment.java
index 51c141fe4c..9cc331bf13 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurePointsListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurePointsListFragment.java
@@ -44,6 +44,9 @@ public class MeasurePointsListFragment extends Fragment {
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		final MapActivity mapActivity = (MapActivity) getActivity();
+		if (rv == null) {
+			return null;
+		}
 		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int backgroundColor = ContextCompat.getColor(getActivity(),
 				nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index c3838cbd31..bb4ab62d0e 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -438,7 +438,7 @@ public class MeasurementToolFragment extends Fragment {
 		exitMeasurementMode();
 		adapter.setAdapterListener(null);
 		if (pointsListOpened) {
-			setPreviousMapPosition();
+			hidePointsList();
 		}
 		if (inMovePointMode) {
 			switchMovePointMode(false);
@@ -746,14 +746,13 @@ public class MeasurementToolFragment extends Fragment {
 	private void showPointsListFragment() {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
-			MeasurePointsListFragment fragment = new MeasurePointsListFragment();
 			int screenHeight = AndroidUtils.getScreenHeight(mapActivity) - AndroidUtils.getStatusBarHeight(mapActivity);
+			MeasurePointsListFragment fragment = new MeasurePointsListFragment();
 			fragment.setRecyclerView(pointsRv);
 			fragment.setWidth(upDownRow.getWidth());
 			fragment.setHeight(screenHeight - upDownRow.getHeight());
 			mapActivity.getSupportFragmentManager().beginTransaction()
 					.add(R.id.fragmentContainer, fragment, MeasurePointsListFragment.TAG)
-					.addToBackStack(MeasurePointsListFragment.TAG)
 					.commitAllowingStateLoss();
 		}
 	}
@@ -762,8 +761,11 @@ public class MeasurementToolFragment extends Fragment {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
 			try {
-				mapActivity.getSupportFragmentManager()
-						.popBackStackImmediate(MeasurePointsListFragment.TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+				FragmentManager manager = mapActivity.getSupportFragmentManager();
+				Fragment fragment = manager.findFragmentByTag(MeasurePointsListFragment.TAG);
+				if (fragment != null) {
+					manager.beginTransaction().remove(fragment).commitAllowingStateLoss();
+				}
 			} catch (Exception e) {
 				// ignore
 			}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 1f6057dce7..ef19983080 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -112,7 +112,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		return measurementPoints;
 	}
 
-	public void setMeasurementPoints(List<WptPt> points) {
+	void setMeasurementPoints(List<WptPt> points) {
 		measurementPoints = points;
 	}
 

From dfeaa512923323d743811e54139017084b5dc67a Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 16 Aug 2017 12:35:54 +0300
Subject: [PATCH 111/174] Fix crash (2)

---
 .../plus/measurementtool/MeasurementToolFragment.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index bb4ab62d0e..98a4c0714a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -74,6 +74,7 @@ public class MeasurementToolFragment extends Fragment {
 	public static final String TAG = "MeasurementToolFragment";
 
 	private final CommandManager commandManager = new CommandManager();
+	private List<WptPt> measurementPoints = new LinkedList<>();
 	private IconsCache iconsCache;
 	private RecyclerView pointsRv;
 	private MeasurementToolBarController toolBarController;
@@ -104,8 +105,6 @@ public class MeasurementToolFragment extends Fragment {
 
 	private int positionToAddPoint = -1;
 
-	private List<WptPt> measurementPoints = new LinkedList<>();
-
 	public void setNewGpxLine(NewGpxLine newGpxLine) {
 		this.newGpxLine = newGpxLine;
 	}
@@ -421,6 +420,12 @@ public class MeasurementToolFragment extends Fragment {
 
 		enterMeasurementMode();
 
+		// If rotate the screen from landscape to portrait when the list of points is displayed then
+		// the PointsListFragment will exist without view. This is necessary to remove it.
+		if (portrait) {
+			hidePointsListFragment();
+		}
+
 		if (newGpxLine != null && !routePointsAdded) {
 			LineType lineType = newGpxLine.getLineType();
 			if (lineType == LineType.ROUTE_POINTS) {

From 6cb9b80013300f61d0750232e02f97f1e068a472 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 16 Aug 2017 12:57:57 +0300
Subject: [PATCH 112/174] Close points list when exit from measurement mode

---
 .../osmand/plus/measurementtool/MeasurementToolFragment.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 98a4c0714a..02ebd2f0ad 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -1106,6 +1106,9 @@ public class MeasurementToolFragment extends Fragment {
 			if (measurementToolLayer != null) {
 				measurementToolLayer.getMeasurementPoints().clear();
 			}
+			if (pointsListOpened) {
+				hidePointsList();
+			}
 			if (newGpxLine != null) {
 				GPXFile gpx = newGpxLine.getGpxFile();
 				Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getTrackActivity());

From 9b819c305d7636981177b891e69f9de4d402fc8a Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 16 Aug 2017 13:18:08 +0300
Subject: [PATCH 113/174] Fix undo/redo after screen rotating

---
 .../MeasurementToolFragment.java              |  5 +-
 .../command/AddPointCommand.java              |  3 +-
 .../command/ClearPointsCommand.java           |  3 +-
 .../command/CommandManager.java               | 41 ---------------
 .../command/MeasurementCommandManager.java    | 52 +++++++++++++++++++
 .../command/MeasurementModeCommand.java       | 12 +++++
 .../command/MovePointCommand.java             |  3 +-
 .../command/RemovePointCommand.java           |  3 +-
 .../command/ReorderPointCommand.java          |  3 +-
 9 files changed, 72 insertions(+), 53 deletions(-)
 delete mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 02ebd2f0ad..7c6cc97984 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -48,7 +48,7 @@ import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolItemTouchHelperCallback;
 import net.osmand.plus.measurementtool.command.AddPointCommand;
 import net.osmand.plus.measurementtool.command.ClearPointsCommand;
-import net.osmand.plus.measurementtool.command.CommandManager;
+import net.osmand.plus.measurementtool.command.MeasurementCommandManager;
 import net.osmand.plus.measurementtool.command.MovePointCommand;
 import net.osmand.plus.measurementtool.command.RemovePointCommand;
 import net.osmand.plus.measurementtool.command.ReorderPointCommand;
@@ -73,7 +73,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	public static final String TAG = "MeasurementToolFragment";
 
-	private final CommandManager commandManager = new CommandManager();
+	private final MeasurementCommandManager commandManager = new MeasurementCommandManager();
 	private List<WptPt> measurementPoints = new LinkedList<>();
 	private IconsCache iconsCache;
 	private RecyclerView pointsRv;
@@ -115,6 +115,7 @@ public class MeasurementToolFragment extends Fragment {
 		final MapActivity mapActivity = (MapActivity) getActivity();
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 		measurementLayer.setMeasurementPoints(measurementPoints);
+		commandManager.resetMeasurementLayer(measurementLayer);
 		iconsCache = mapActivity.getMyApplication().getIconsCache();
 		nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
index 02b5cbf7d0..7556c306a6 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
@@ -3,9 +3,8 @@ package net.osmand.plus.measurementtool.command;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.measurementtool.MeasurementToolLayer;
 
-public class AddPointCommand implements Command {
+public class AddPointCommand extends MeasurementModeCommand {
 
-	private final MeasurementToolLayer measurementLayer;
 	private final int position;
 	private WptPt point;
 	private boolean center;
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
index aa16d3c701..ff3cab3856 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
@@ -6,9 +6,8 @@ import net.osmand.plus.measurementtool.MeasurementToolLayer;
 import java.util.LinkedList;
 import java.util.List;
 
-public class ClearPointsCommand implements Command {
+public class ClearPointsCommand extends MeasurementModeCommand {
 
-	private final MeasurementToolLayer measurementLayer;
 	private List<GPXUtilities.WptPt> points;
 
 	public ClearPointsCommand(MeasurementToolLayer measurementLayer) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java
deleted file mode 100644
index 3188506ded..0000000000
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/CommandManager.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package net.osmand.plus.measurementtool.command;
-
-import java.util.Deque;
-import java.util.LinkedList;
-
-public class CommandManager {
-
-	private final Deque<Command> undoCommands = new LinkedList<>();
-	private final Deque<Command> redoCommands = new LinkedList<>();
-
-	public boolean canUndo() {
-		return undoCommands.size() > 0;
-	}
-
-	public boolean canRedo() {
-		return redoCommands.size() > 0;
-	}
-
-	public void execute(Command command) {
-		if (command.execute()) {
-			undoCommands.push(command);
-			redoCommands.clear();
-		}
-	}
-
-	public void undo() {
-		if (canUndo()) {
-			Command command = undoCommands.pop();
-			redoCommands.push(command);
-			command.undo();
-		}
-	}
-
-	public void redo() {
-		if (canRedo()) {
-			Command command = redoCommands.pop();
-			undoCommands.push(command);
-			command.redo();
-		}
-	}
-}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java
new file mode 100644
index 0000000000..f1819d874e
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java
@@ -0,0 +1,52 @@
+package net.osmand.plus.measurementtool.command;
+
+import net.osmand.plus.measurementtool.MeasurementToolLayer;
+
+import java.util.Deque;
+import java.util.LinkedList;
+
+public class MeasurementCommandManager {
+
+	private final Deque<MeasurementModeCommand> undoCommands = new LinkedList<>();
+	private final Deque<MeasurementModeCommand> redoCommands = new LinkedList<>();
+
+	public boolean canUndo() {
+		return undoCommands.size() > 0;
+	}
+
+	public boolean canRedo() {
+		return redoCommands.size() > 0;
+	}
+
+	public void execute(MeasurementModeCommand command) {
+		if (command.execute()) {
+			undoCommands.push(command);
+			redoCommands.clear();
+		}
+	}
+
+	public void undo() {
+		if (canUndo()) {
+			MeasurementModeCommand command = undoCommands.pop();
+			redoCommands.push(command);
+			command.undo();
+		}
+	}
+
+	public void redo() {
+		if (canRedo()) {
+			MeasurementModeCommand command = redoCommands.pop();
+			undoCommands.push(command);
+			command.redo();
+		}
+	}
+
+	public void resetMeasurementLayer(MeasurementToolLayer layer) {
+		for (MeasurementModeCommand command : undoCommands) {
+			command.setMeasurementLayer(layer);
+		}
+		for (MeasurementModeCommand command : redoCommands) {
+			command.setMeasurementLayer(layer);
+		}
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java
new file mode 100644
index 0000000000..20d48372d3
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java
@@ -0,0 +1,12 @@
+package net.osmand.plus.measurementtool.command;
+
+import net.osmand.plus.measurementtool.MeasurementToolLayer;
+
+abstract class MeasurementModeCommand implements Command {
+
+	MeasurementToolLayer measurementLayer;
+
+	void setMeasurementLayer(MeasurementToolLayer layer) {
+		this.measurementLayer = layer;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
index 4adffb72ac..b5cd4252f1 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
@@ -3,9 +3,8 @@ package net.osmand.plus.measurementtool.command;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.measurementtool.MeasurementToolLayer;
 
-public class MovePointCommand implements Command {
+public class MovePointCommand extends MeasurementModeCommand {
 
-	private final MeasurementToolLayer measurementLayer;
 	private final WptPt oldPoint;
 	private final WptPt newPoint;
 	private final int position;
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
index 367aca310a..dea29a4e9d 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
@@ -3,9 +3,8 @@ package net.osmand.plus.measurementtool.command;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.measurementtool.MeasurementToolLayer;
 
-public class RemovePointCommand implements Command {
+public class RemovePointCommand extends MeasurementModeCommand {
 
-	private final MeasurementToolLayer measurementLayer;
 	private final int position;
 	private WptPt point;
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
index 0e41a22d34..ecaf081d9c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
@@ -4,9 +4,8 @@ import net.osmand.plus.measurementtool.MeasurementToolLayer;
 
 import java.util.Collections;
 
-public class ReorderPointCommand implements Command {
+public class ReorderPointCommand extends MeasurementModeCommand {
 
-	private final MeasurementToolLayer measurementLayer;
 	private final int from;
 	private final int to;
 

From 6eca185f376fed8f6e1d20ebf9bef46e30a79832 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 16 Aug 2017 13:35:40 +0300
Subject: [PATCH 114/174] Save selected point menu on rotate

---
 .../MeasurementToolFragment.java              | 133 +++++++++++-------
 .../measurementtool/MeasurementToolLayer.java |  26 +++-
 2 files changed, 102 insertions(+), 57 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 7c6cc97984..c61c06ded9 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -103,18 +103,82 @@ public class MeasurementToolFragment extends Fragment {
 	private boolean inAddPointAfterMode;
 	private boolean inAddPointBeforeMode;
 
+	private int selectedPointPos = -1;
+	private WptPt selectedCachedPoint;
+
 	private int positionToAddPoint = -1;
 
 	public void setNewGpxLine(NewGpxLine newGpxLine) {
 		this.newGpxLine = newGpxLine;
 	}
 
+	private SelectedPointOptionOnClickListener createSelectedPointOptionOnClickListener() {
+		final MeasurementToolLayer measurementLayer = getMeasurementLayer();
+
+		return new SelectedPointOptionOnClickListener() {
+			@Override
+			public void moveOnClick() {
+				if (measurementLayer != null) {
+					measurementLayer.enterMovingPointMode();
+				}
+				switchMovePointMode(true);
+			}
+
+			@Override
+			public void deleteOnClick() {
+				clearSelection();
+				if (measurementLayer != null) {
+					int position = measurementLayer.getSelectedPointPos();
+					commandManager.execute(new RemovePointCommand(measurementLayer, position));
+					adapter.notifyDataSetChanged();
+					disable(redoBtn);
+					updateText();
+					saved = false;
+					hidePointsListIfNoPoints();
+					measurementLayer.clearSelection();
+				}
+			}
+
+			@Override
+			public void addPointAfterOnClick() {
+				if (measurementLayer != null) {
+					positionToAddPoint = measurementLayer.getSelectedPointPos() + 1;
+					measurementLayer.enterAddingPointAfterMode();
+				}
+				switchAddPointAfterMode(true);
+			}
+
+			@Override
+			public void addPointBeforeOnClick() {
+				if (measurementLayer != null) {
+					positionToAddPoint = measurementLayer.getSelectedPointPos();
+					measurementLayer.enterAddingPointBeforeMode();
+				}
+				switchAddPointBeforeMode(true);
+			}
+
+			@Override
+			public void onCloseMenu() {
+				setPreviousMapPosition();
+			}
+		};
+	}
+
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		final MapActivity mapActivity = (MapActivity) getActivity();
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 		measurementLayer.setMeasurementPoints(measurementPoints);
+		if (selectedPointPos != -1 && selectedCachedPoint != null) {
+			measurementLayer.setSelectedPointPos(selectedPointPos);
+			measurementLayer.setSelectedCachedPoint(selectedCachedPoint);
+		}
+		Fragment fragment = mapActivity.getSupportFragmentManager().findFragmentByTag(SelectedPointMenuBottomSheetDialogFragment.TAG);
+		if (fragment != null) {
+			SelectedPointMenuBottomSheetDialogFragment selectedPointMenuBottomSheetDialogFragment = (SelectedPointMenuBottomSheetDialogFragment) fragment;
+			selectedPointMenuBottomSheetDialogFragment.setSelectedPointOptionOnClickListener(createSelectedPointOptionOnClickListener());
+		}
 		commandManager.resetMeasurementLayer(measurementLayer);
 		iconsCache = mapActivity.getMyApplication().getIconsCache();
 		nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
@@ -301,11 +365,15 @@ public class MeasurementToolFragment extends Fragment {
 			}
 
 			@Override
-			public void onSelectPoint() {
+			public void onSelectPoint(int selectedPointPos, WptPt selectedCachedPoint) {
 				if (pointsListOpened) {
 					hidePointsList();
 				}
-				openSelectedPointMenu(mapActivity);
+				MeasurementToolFragment.this.selectedPointPos = selectedPointPos;
+				MeasurementToolFragment.this.selectedCachedPoint = selectedCachedPoint;
+				if (selectedPointPos != -1 && selectedCachedPoint != null) {
+					openSelectedPointMenu(mapActivity);
+				}
 			}
 		});
 
@@ -383,6 +451,7 @@ public class MeasurementToolFragment extends Fragment {
 
 			@Override
 			public void onItemClick(View view) {
+				clearSelection();
 				int position = pointsRv.indexOfChild(view);
 				if (pointsListOpened) {
 					hidePointsList();
@@ -395,7 +464,6 @@ public class MeasurementToolFragment extends Fragment {
 				mapActivity.refreshMap();
 				measurementLayer.moveMapToPoint(position);
 				measurementLayer.selectPoint(position);
-				openSelectedPointMenu(mapActivity);
 			}
 
 			@Override
@@ -457,7 +525,6 @@ public class MeasurementToolFragment extends Fragment {
 		}
 		MeasurementToolLayer layer = getMeasurementLayer();
 		if (layer != null) {
-			layer.clearSelection();
 			layer.exitMovePointMode();
 			layer.exitAddPointAfterMode();
 			layer.exitAddPointBeforeMode();
@@ -482,52 +549,7 @@ public class MeasurementToolFragment extends Fragment {
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 
 		SelectedPointMenuBottomSheetDialogFragment fragment = new SelectedPointMenuBottomSheetDialogFragment();
-		fragment.setSelectedPointOptionOnClickListener(new SelectedPointOptionOnClickListener() {
-			@Override
-			public void moveOnClick() {
-				if (measurementLayer != null) {
-					measurementLayer.enterMovingPointMode();
-				}
-				switchMovePointMode(true);
-			}
-
-			@Override
-			public void deleteOnClick() {
-				if (measurementLayer != null) {
-					int position = measurementLayer.getSelectedPointPos();
-					commandManager.execute(new RemovePointCommand(measurementLayer, position));
-					adapter.notifyDataSetChanged();
-					disable(redoBtn);
-					updateText();
-					saved = false;
-					hidePointsListIfNoPoints();
-					measurementLayer.clearSelection();
-				}
-			}
-
-			@Override
-			public void addPointAfterOnClick() {
-				if (measurementLayer != null) {
-					positionToAddPoint = measurementLayer.getSelectedPointPos() + 1;
-					measurementLayer.enterAddingPointAfterMode();
-				}
-				switchAddPointAfterMode(true);
-			}
-
-			@Override
-			public void addPointBeforeOnClick() {
-				if (measurementLayer != null) {
-					positionToAddPoint = measurementLayer.getSelectedPointPos();
-					measurementLayer.enterAddingPointBeforeMode();
-				}
-				switchAddPointBeforeMode(true);
-			}
-
-			@Override
-			public void onCloseMenu() {
-				setPreviousMapPosition();
-			}
-		});
+		fragment.setSelectedPointOptionOnClickListener(createSelectedPointOptionOnClickListener());
 		fragment.show(mapActivity.getSupportFragmentManager(), SelectedPointMenuBottomSheetDialogFragment.TAG);
 	}
 
@@ -550,6 +572,7 @@ public class MeasurementToolFragment extends Fragment {
 		if (inMovePointMode) {
 			switchMovePointMode(false);
 		}
+		clearSelection();
 		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
 		if (measurementToolLayer != null) {
 			measurementToolLayer.exitMovePointMode();
@@ -562,6 +585,7 @@ public class MeasurementToolFragment extends Fragment {
 		if (inAddPointAfterMode) {
 			switchAddPointAfterMode(false);
 		}
+		clearSelection();
 		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
 		if (measurementToolLayer != null) {
 			measurementToolLayer.exitAddPointAfterMode();
@@ -575,6 +599,7 @@ public class MeasurementToolFragment extends Fragment {
 		if (inAddPointBeforeMode) {
 			switchAddPointBeforeMode(false);
 		}
+		clearSelection();
 		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
 		if (measurementToolLayer != null) {
 			measurementToolLayer.exitAddPointBeforeMode();
@@ -588,6 +613,7 @@ public class MeasurementToolFragment extends Fragment {
 		if (inMovePointMode) {
 			switchMovePointMode(false);
 		}
+		clearSelection();
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
 			WptPt newPoint = measurementLayer.getMovedPointToApply();
@@ -609,6 +635,7 @@ public class MeasurementToolFragment extends Fragment {
 		if (inAddPointAfterMode) {
 			switchAddPointAfterMode(false);
 		}
+		clearSelection();
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null && positionToAddPoint != -1) {
 			addPointToPosition(positionToAddPoint);
@@ -619,10 +646,16 @@ public class MeasurementToolFragment extends Fragment {
 		positionToAddPoint = -1;
 	}
 
+	private void clearSelection() {
+		selectedPointPos = -1;
+		selectedCachedPoint = null;
+	}
+
 	private void applyAddPointBeforeMode() {
 		if (inAddPointBeforeMode) {
 			switchAddPointBeforeMode(false);
 		}
+		clearSelection();
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null && positionToAddPoint != -1) {
 			addPointToPosition(positionToAddPoint);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index ef19983080..943f0febbf 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -76,6 +76,14 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		this.enterMovePointModeListener = listener;
 	}
 
+	void setSelectedPointPos(int pos) {
+		selectedPointPos = pos;
+	}
+
+	void setSelectedCachedPoint(WptPt selectedCachedPoint) {
+		this.selectedCachedPoint = selectedCachedPoint;
+	}
+
 	WptPt getSelectedCachedPoint() {
 		return selectedCachedPoint;
 	}
@@ -131,10 +139,8 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
 		if (singleTapListener != null) {
 			if (inMeasurementMode && !inMovePointMode && !inAddPointAfterMode && !inAddPointBeforeMode) {
-				selectPoint(point.x, point.y);
-				if (selectedPointPos != -1) {
-					singleTapListener.onSelectPoint();
-				} else {
+				selectPoint(point.x, point.y, true);
+				if (selectedPointPos == -1) {
 					pressedPointLatLon = tileBox.getLatLonFromPixel(point.x, point.y);
 					singleTapListener.onAddPoint();
 				}
@@ -152,7 +158,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	public boolean onLongPressEvent(PointF point, RotatedTileBox tileBox) {
 		if (inMeasurementMode) {
 			if (!inMovePointMode && !inAddPointAfterMode && !inAddPointBeforeMode && measurementPoints.size() > 0) {
-				selectPoint(point.x, point.y);
+				selectPoint(point.x, point.y, false);
 				if (selectedCachedPoint != null && selectedPointPos != -1) {
 					enterMovingPointMode();
 					if (inMeasurementMode && inMovePointMode && enterMovePointModeListener != null) {
@@ -179,7 +185,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		moveMapToPoint(selectedPointPos);
 	}
 
-	private void selectPoint(double x, double y) {
+	private void selectPoint(double x, double y, boolean singleTap) {
 		clearSelection();
 		RotatedTileBox tb = view.getCurrentRotatedTileBox();
 		double lowestDistance = AndroidUtils.dpToPx(view.getContext(), 20);
@@ -196,12 +202,18 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 				}
 			}
 		}
+		if (singleTap && singleTapListener != null) {
+			singleTapListener.onSelectPoint(selectedPointPos, selectedCachedPoint);
+		}
 	}
 
 	void selectPoint(int position) {
 		clearSelection();
 		selectedCachedPoint = new WptPt(measurementPoints.get(position));
 		selectedPointPos = position;
+		if (singleTapListener != null) {
+			singleTapListener.onSelectPoint(selectedPointPos, selectedCachedPoint);
+		}
 	}
 
 	@Override
@@ -430,7 +442,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 
 		void onAddPoint();
 
-		void onSelectPoint();
+		void onSelectPoint(int selectedPointPos, WptPt selectedCachedPoint);
 	}
 
 	interface OnEnterMovePointModeListener {

From a96b2717022565a7c0544653d5b6954d2850b394 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 16 Aug 2017 13:42:45 +0300
Subject: [PATCH 115/174] Move create listener to bottom

---
 .../MeasurementToolFragment.java              | 104 +++++++++---------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index c61c06ded9..748fda3df2 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -112,58 +112,6 @@ public class MeasurementToolFragment extends Fragment {
 		this.newGpxLine = newGpxLine;
 	}
 
-	private SelectedPointOptionOnClickListener createSelectedPointOptionOnClickListener() {
-		final MeasurementToolLayer measurementLayer = getMeasurementLayer();
-
-		return new SelectedPointOptionOnClickListener() {
-			@Override
-			public void moveOnClick() {
-				if (measurementLayer != null) {
-					measurementLayer.enterMovingPointMode();
-				}
-				switchMovePointMode(true);
-			}
-
-			@Override
-			public void deleteOnClick() {
-				clearSelection();
-				if (measurementLayer != null) {
-					int position = measurementLayer.getSelectedPointPos();
-					commandManager.execute(new RemovePointCommand(measurementLayer, position));
-					adapter.notifyDataSetChanged();
-					disable(redoBtn);
-					updateText();
-					saved = false;
-					hidePointsListIfNoPoints();
-					measurementLayer.clearSelection();
-				}
-			}
-
-			@Override
-			public void addPointAfterOnClick() {
-				if (measurementLayer != null) {
-					positionToAddPoint = measurementLayer.getSelectedPointPos() + 1;
-					measurementLayer.enterAddingPointAfterMode();
-				}
-				switchAddPointAfterMode(true);
-			}
-
-			@Override
-			public void addPointBeforeOnClick() {
-				if (measurementLayer != null) {
-					positionToAddPoint = measurementLayer.getSelectedPointPos();
-					measurementLayer.enterAddingPointBeforeMode();
-				}
-				switchAddPointBeforeMode(true);
-			}
-
-			@Override
-			public void onCloseMenu() {
-				setPreviousMapPosition();
-			}
-		};
-	}
-
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -533,6 +481,58 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
+	private SelectedPointOptionOnClickListener createSelectedPointOptionOnClickListener() {
+		final MeasurementToolLayer measurementLayer = getMeasurementLayer();
+
+		return new SelectedPointOptionOnClickListener() {
+			@Override
+			public void moveOnClick() {
+				if (measurementLayer != null) {
+					measurementLayer.enterMovingPointMode();
+				}
+				switchMovePointMode(true);
+			}
+
+			@Override
+			public void deleteOnClick() {
+				clearSelection();
+				if (measurementLayer != null) {
+					int position = measurementLayer.getSelectedPointPos();
+					commandManager.execute(new RemovePointCommand(measurementLayer, position));
+					adapter.notifyDataSetChanged();
+					disable(redoBtn);
+					updateText();
+					saved = false;
+					hidePointsListIfNoPoints();
+					measurementLayer.clearSelection();
+				}
+			}
+
+			@Override
+			public void addPointAfterOnClick() {
+				if (measurementLayer != null) {
+					positionToAddPoint = measurementLayer.getSelectedPointPos() + 1;
+					measurementLayer.enterAddingPointAfterMode();
+				}
+				switchAddPointAfterMode(true);
+			}
+
+			@Override
+			public void addPointBeforeOnClick() {
+				if (measurementLayer != null) {
+					positionToAddPoint = measurementLayer.getSelectedPointPos();
+					measurementLayer.enterAddingPointBeforeMode();
+				}
+				switchAddPointBeforeMode(true);
+			}
+
+			@Override
+			public void onCloseMenu() {
+				setPreviousMapPosition();
+			}
+		};
+	}
+
 	private void displayRoutePoints(MapActivity mapActivity) {
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 

From e2dcab77c6c7f903b2f9d90c2727d4da69a6a431 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 16 Aug 2017 14:16:40 +0300
Subject: [PATCH 116/174] Add switch to options menu

---
 .../res/layout/fragment_measurement_tool.xml  |  2 +
 .../fragment_options_bottom_sheet_dialog.xml  | 37 +++++++++++++++++--
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 438f7d736f..d27e06821b 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -212,6 +212,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:background="?attr/selectableItemBackground"
+                    android:ellipsize="end"
                     android:gravity="center_vertical"
                     android:maxLines="1"
                     android:paddingEnd="12dp"
@@ -266,6 +267,7 @@
                     android:layout_marginTop="8dp"
                     android:background="@drawable/btn_round_blue"
                     android:drawableLeft="@drawable/ic_action_plus"
+                    android:ellipsize="end"
                     android:maxLines="1"
                     android:minHeight="36dp"
                     android:paddingLeft="8dp"
diff --git a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
index 9307702d3f..bbc05d9888 100644
--- a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
@@ -48,15 +48,44 @@
                     android:layout_marginRight="24dp"
                     tools:src="@drawable/ic_action_snap_to_road"/>
 
-                <TextView
+                <android.support.v7.widget.SwitchCompat
+                    android:id="@+id/snap_to_road_switch"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"/>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_toEndOf="@id/snap_to_road_icon"
+                    android:layout_toLeftOf="@id/snap_to_road_switch"
                     android:layout_toRightOf="@id/snap_to_road_icon"
-                    android:maxLines="1"
-                    android:text="@string/snap_to_road"
-                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+                    android:layout_toStartOf="@id/snap_to_road_switch"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:maxLines="1"
+                        android:text="@string/snap_to_road"
+                        android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+
+                    <TextView
+                        android:id="@+id/snap_to_road_enabled_text_view"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/shared_string_enabled"
+                        android:textColor="?android:textColorSecondary"
+                        android:textSize="@dimen/default_desc_text_size"
+                        android:visibility="gone"
+                        tools:visibility="visible"/>
+                </LinearLayout>
+
             </RelativeLayout>
 
             <View

From cb1352328b439e33bcda0683b86e25590ffe40f4 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 16 Aug 2017 14:55:46 +0300
Subject: [PATCH 117/174] Change action bar title in snap to road mode

---
 .../MeasurementToolFragment.java              | 28 +++++++++++++++
 .../SnapToRoadBottomSheetDialogFragment.java  | 36 ++++++++++++++++++-
 .../mapwidgets/MapInfoWidgetsFactory.java     |  4 +++
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 748fda3df2..4bcc340cb0 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -31,6 +31,7 @@ import android.widget.Toast;
 import net.osmand.AndroidUtils;
 import net.osmand.CallbackWithObject;
 import net.osmand.IndexConstants;
+import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.Route;
 import net.osmand.plus.GPXUtilities.WptPt;
@@ -44,6 +45,7 @@ import net.osmand.plus.activities.TrackActivity.NewGpxLine.LineType;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.measurementtool.SelectedPointMenuBottomSheetDialogFragment.SelectedPointOptionOnClickListener;
+import net.osmand.plus.measurementtool.SnapToRoadBottomSheetDialogFragment.SnapToRoadListener;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolItemTouchHelperCallback;
 import net.osmand.plus.measurementtool.command.AddPointCommand;
@@ -77,6 +79,7 @@ public class MeasurementToolFragment extends Fragment {
 	private List<WptPt> measurementPoints = new LinkedList<>();
 	private IconsCache iconsCache;
 	private RecyclerView pointsRv;
+	private String previousToolBarTitle = "";
 	private MeasurementToolBarController toolBarController;
 	private MeasurementToolAdapter adapter;
 	private TextView distanceTv;
@@ -209,7 +212,11 @@ public class MeasurementToolFragment extends Fragment {
 				fragment.setOptionsOnClickListener(new OptionsBottomSheetDialogFragment.OptionsOnClickListener() {
 					@Override
 					public void snapToRoadOnCLick() {
+						previousToolBarTitle = toolBarController.getTitle();
+						toolBarController.setTitle(getString(R.string.snap_to_road));
+						mapActivity.refreshMap();
 						SnapToRoadBottomSheetDialogFragment fragment = new SnapToRoadBottomSheetDialogFragment();
+						fragment.setListener(createSnapToRoadListener());
 						fragment.show(mapActivity.getSupportFragmentManager(), SnapToRoadBottomSheetDialogFragment.TAG);
 					}
 
@@ -533,6 +540,27 @@ public class MeasurementToolFragment extends Fragment {
 		};
 	}
 
+	private SnapToRoadListener createSnapToRoadListener() {
+		return new SnapToRoadListener() {
+
+			@Override
+			public void onDestroyView(boolean snapToRoadEnabled) {
+				if (!snapToRoadEnabled) {
+					toolBarController.setTitle(previousToolBarTitle);
+					MapActivity mapActivity = getMapActivity();
+					if (mapActivity != null) {
+						mapActivity.refreshMap();
+					}
+				}
+			}
+
+			@Override
+			public void onApplicationModeItemClick(ApplicationMode mode) {
+				Toast.makeText(getActivity(), mode.toHumanString(getActivity()), Toast.LENGTH_SHORT).show();
+			}
+		};
+	}
+
 	private void displayRoutePoints(MapActivity mapActivity) {
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index bb97ef348f..8366249b1a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -30,8 +30,14 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 
 	public static final String TAG = "SnapToRoadBottomSheetDialogFragment";
 
+	private SnapToRoadListener listener;
 	private boolean nightMode;
 	private boolean portrait;
+	private boolean snapToRoadEnabled;
+
+	public void setListener(SnapToRoadListener listener) {
+		this.listener = listener;
+	}
 
 	@Nullable
 	@Override
@@ -56,10 +62,23 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 		LinearLayout navContainer = (LinearLayout) mainView.findViewById(R.id.navigation_types_container);
 		final List<ApplicationMode> modes = new ArrayList<>(ApplicationMode.values(settings));
 		modes.remove(ApplicationMode.DEFAULT);
-		for (ApplicationMode mode : modes) {
+		View.OnClickListener onClickListener = new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				snapToRoadEnabled = true;
+				if (listener != null) {
+					listener.onApplicationModeItemClick(modes.get((int) view.getTag()));
+				}
+				dismiss();
+			}
+		};
+		for (int i = 0; i < modes.size(); i++) {
+			ApplicationMode mode = modes.get(i);
 			View row = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.list_item_icon_and_title, null);
 			((ImageView) row.findViewById(R.id.icon)).setImageDrawable(getContentIcon(mode.getSmallIconDark()));
 			((TextView) row.findViewById(R.id.title)).setText(mode.toHumanString(getContext()));
+			row.setOnClickListener(onClickListener);
+			row.setTag(i);
 			navContainer.addView(row);
 		}
 
@@ -114,8 +133,23 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 		}
 	}
 
+	@Override
+	public void onDestroyView() {
+		if (listener != null) {
+			listener.onDestroyView(snapToRoadEnabled);
+		}
+		super.onDestroyView();
+	}
+
 	@Override
 	protected Drawable getContentIcon(@DrawableRes int id) {
 		return getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.on_map_icon_color);
 	}
+
+	interface SnapToRoadListener {
+
+		void onDestroyView(boolean snapToRoadEnabled);
+
+		void onApplicationModeItemClick(ApplicationMode mode);
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index 97be2765e4..9d71526d83 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -266,6 +266,10 @@ public class MapInfoWidgetsFactory {
 			this.title = title;
 		}
 
+		public String getTitle() {
+			return title;
+		}
+
 		public void setBottomView(View bottomView) {
 			this.bottomView = bottomView;
 		}

From 8f9035c93561ab1404d6820ee38c3c23d4d55524 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 16 Aug 2017 17:32:43 +0300
Subject: [PATCH 118/174] Add switch to action bar in snap to road mode

---
 OsmAnd/res/layout-land/map_hud_top.xml        |  9 ++++
 .../fragment_options_bottom_sheet_dialog.xml  |  6 ++-
 OsmAnd/res/layout/map_hud_top.xml             |  9 ++++
 .../MeasurementToolFragment.java              | 46 ++++++++++++++++---
 .../OptionsBottomSheetDialogFragment.java     | 18 +++++++-
 .../mapwidgets/MapInfoWidgetsFactory.java     | 30 ++++++++++++
 6 files changed, 109 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/res/layout-land/map_hud_top.xml b/OsmAnd/res/layout-land/map_hud_top.xml
index d21fb04b07..1772881368 100644
--- a/OsmAnd/res/layout-land/map_hud_top.xml
+++ b/OsmAnd/res/layout-land/map_hud_top.xml
@@ -478,6 +478,15 @@
                         android:visibility="gone"
                         osmand:typeface="@string/font_roboto_medium"/>
 
+                    <android.support.v7.widget.SwitchCompat
+                        android:id="@+id/widget_top_bar_switch"
+                        android:layout_width="wrap_content"
+                        android:layout_height="56dp"
+                        android:paddingEnd="16dp"
+                        android:paddingRight="16dp"
+                        android:visibility="gone"
+                        tools:visibility="visible"/>
+
                 </LinearLayout>
 
                 <LinearLayout
diff --git a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
index bbc05d9888..7ff121d5f2 100644
--- a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
@@ -56,7 +56,11 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="16dp"
-                    android:layout_marginStart="16dp"/>
+                    android:layout_marginStart="16dp"
+                    android:background="@null"
+                    android:clickable="false"
+                    android:focusable="false"
+                    android:focusableInTouchMode="false"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index 3026bd5264..6a4ad821e0 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -255,6 +255,15 @@
                     android:visibility="gone"
                     osmand:typeface="@string/font_roboto_medium"/>
 
+                <android.support.v7.widget.SwitchCompat
+                    android:id="@+id/widget_top_bar_switch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="56dp"
+                    android:paddingEnd="16dp"
+                    android:paddingRight="16dp"
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
+
             </LinearLayout>
 
             <LinearLayout
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 4bcc340cb0..76d902c1c4 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -22,6 +22,7 @@ import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -101,6 +102,7 @@ public class MeasurementToolFragment extends Fragment {
 	private int previousMapPosition;
 	private NewGpxLine newGpxLine;
 	private boolean routePointsAdded;
+	private boolean snapToRoadEnabled;
 
 	private boolean inMovePointMode;
 	private boolean inAddPointAfterMode;
@@ -209,15 +211,20 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			public void onClick(View view) {
 				OptionsBottomSheetDialogFragment fragment = new OptionsBottomSheetDialogFragment();
+				fragment.setSnapToRoadEnabled(snapToRoadEnabled);
 				fragment.setOptionsOnClickListener(new OptionsBottomSheetDialogFragment.OptionsOnClickListener() {
 					@Override
 					public void snapToRoadOnCLick() {
-						previousToolBarTitle = toolBarController.getTitle();
-						toolBarController.setTitle(getString(R.string.snap_to_road));
-						mapActivity.refreshMap();
-						SnapToRoadBottomSheetDialogFragment fragment = new SnapToRoadBottomSheetDialogFragment();
-						fragment.setListener(createSnapToRoadListener());
-						fragment.show(mapActivity.getSupportFragmentManager(), SnapToRoadBottomSheetDialogFragment.TAG);
+						if (!snapToRoadEnabled) {
+							previousToolBarTitle = toolBarController.getTitle();
+							toolBarController.setTitle(getString(R.string.snap_to_road));
+							mapActivity.refreshMap();
+							SnapToRoadBottomSheetDialogFragment fragment = new SnapToRoadBottomSheetDialogFragment();
+							fragment.setListener(createSnapToRoadListener());
+							fragment.show(mapActivity.getSupportFragmentManager(), SnapToRoadBottomSheetDialogFragment.TAG);
+						} else {
+							disableSnapToRoadMode();
+						}
 					}
 
 					@Override
@@ -379,6 +386,15 @@ public class MeasurementToolFragment extends Fragment {
 				}
 			}
 		});
+
+		toolBarController.setOnSwitchCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+			@Override
+			public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+				if (!checked) {
+					disableSnapToRoadMode();
+				}
+			}
+		});
 		mapActivity.showTopToolbar(toolBarController);
 
 		adapter = new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints());
@@ -556,11 +572,27 @@ public class MeasurementToolFragment extends Fragment {
 
 			@Override
 			public void onApplicationModeItemClick(ApplicationMode mode) {
-				Toast.makeText(getActivity(), mode.toHumanString(getActivity()), Toast.LENGTH_SHORT).show();
+				toolBarController.setTopBarSwitchVisible(true);
+				toolBarController.setTopBarSwitchChecked(true);
+				snapToRoadEnabled = true;
+				MapActivity mapActivity = getMapActivity();
+				if (mapActivity != null) {
+					mapActivity.refreshMap();
+				}
 			}
 		};
 	}
 
+	private void disableSnapToRoadMode() {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			toolBarController.setTopBarSwitchVisible(false);
+			toolBarController.setTitle(previousToolBarTitle);
+			snapToRoadEnabled = false;
+			mapActivity.refreshMap();
+		}
+	}
+
 	private void displayRoutePoints(MapActivity mapActivity) {
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
index 7cfa850328..2fad9a7e8e 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@@ -5,6 +5,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.SwitchCompat;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -28,6 +29,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 	private boolean addLineMode;
 	private boolean portrait;
 	private boolean nightMode;
+	private boolean snapToRoadEnabled;
 
 	public void setOptionsOnClickListener(OptionsOnClickListener listener) {
 		this.listener = listener;
@@ -37,6 +39,10 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 		this.addLineMode = addLineMode;
 	}
 
+	public void setSnapToRoadEnabled(boolean snapToRoadEnabled) {
+		this.snapToRoadEnabled = snapToRoadEnabled;
+	}
+
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -52,7 +58,13 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 		if (nightMode) {
 			((TextViewEx) mainView.findViewById(R.id.options_title)).setTextColor(getResources().getColor(R.color.ctx_menu_info_text_dark));
 		}
-		((ImageView) mainView.findViewById(R.id.snap_to_road_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_snap_to_road));
+		if (snapToRoadEnabled) {
+			mainView.findViewById(R.id.snap_to_road_enabled_text_view).setVisibility(View.VISIBLE);
+			((SwitchCompat) mainView.findViewById(R.id.snap_to_road_switch)).setChecked(true);
+		}
+		((ImageView) mainView.findViewById(R.id.snap_to_road_icon)).setImageDrawable(snapToRoadEnabled
+				? getActiveIcon(R.drawable.ic_action_snap_to_road)
+				: getContentIcon(R.drawable.ic_action_snap_to_road));
 		((ImageView) mainView.findViewById(R.id.clear_all_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_reset_to_default_dark));
 		if (!addLineMode) {
 			((ImageView) mainView.findViewById(R.id.save_as_new_track_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_polygom_dark));
@@ -175,6 +187,10 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 		return getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.on_map_icon_color);
 	}
 
+	private Drawable getActiveIcon(@DrawableRes int id) {
+		return getIcon(id, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance);
+	}
+
 	interface OptionsOnClickListener {
 
 		void snapToRoadOnCLick();
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index 9d71526d83..b811242940 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -1,8 +1,10 @@
 package net.osmand.plus.views.mapwidgets;
 
 import android.graphics.drawable.Drawable;
+import android.support.v7.widget.SwitchCompat;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -229,8 +231,11 @@ public class MapInfoWidgetsFactory {
 		int refreshBtnIconDarkId = R.drawable.ic_action_refresh_dark;
 		int refreshBtnIconClrLightId = R.color.icon_color;
 		int refreshBtnIconClrDarkId = 0;
+
 		boolean refreshBtnVisible = false;
 		boolean saveViewVisible = false;
+		protected boolean topBarSwitchVisible = false;
+		protected boolean topBarSwitchChecked = false;
 
 		int titleTextClrLightId = R.color.primary_text_light;
 		int titleTextClrDarkId = R.color.primary_text_dark;
@@ -249,6 +254,7 @@ public class MapInfoWidgetsFactory {
 		OnClickListener onCloseButtonClickListener;
 		OnClickListener onRefreshButtonClickListener;
 		OnClickListener onSaveViewClickListener;
+		OnCheckedChangeListener onSwitchCheckedChangeListener;
 
 		Runnable onCloseToolbarListener;
 
@@ -331,6 +337,14 @@ public class MapInfoWidgetsFactory {
 			this.saveViewVisible = visible;
 		}
 
+		public void setTopBarSwitchVisible(boolean visible) {
+			this.topBarSwitchVisible = visible;
+		}
+
+		public void setTopBarSwitchChecked(boolean checked) {
+			this.topBarSwitchChecked = checked;
+		}
+
 		public void setTitleTextClrIds(int titleTextClrLightId, int titleTextClrDarkId) {
 			this.titleTextClrLightId = titleTextClrLightId;
 			this.titleTextClrDarkId = titleTextClrDarkId;
@@ -357,6 +371,10 @@ public class MapInfoWidgetsFactory {
 			this.onSaveViewClickListener = onSaveViewClickListener;
 		}
 
+		public void setOnSwitchCheckedChangeListener(OnCheckedChangeListener onSwitchCheckedChangeListener) {
+			this.onSwitchCheckedChangeListener = onSwitchCheckedChangeListener;
+		}
+
 		public void setOnRefreshButtonClickListener(OnClickListener onRefreshButtonClickListener) {
 			this.onRefreshButtonClickListener = onRefreshButtonClickListener;
 		}
@@ -369,6 +387,7 @@ public class MapInfoWidgetsFactory {
 			TextView titleView = view.getTitleView();
 			TextView descrView = view.getDescrView();
 			LinearLayout bottomViewLayout = view.getBottomViewLayout();
+			SwitchCompat switchCompat = view.getTopBarSwitch();
 			if (title != null) {
 				titleView.setText(title);
 				view.updateVisibility(titleView, true);
@@ -388,6 +407,10 @@ public class MapInfoWidgetsFactory {
 			} else {
 				view.updateVisibility(bottomViewLayout, false);
 			}
+			view.updateVisibility(switchCompat, topBarSwitchVisible);
+			if (topBarSwitchVisible) {
+				switchCompat.setChecked(topBarSwitchChecked);
+			}
 			if (view.getShadowView() != null) {
 				view.getShadowView().setVisibility(View.VISIBLE);
 			}
@@ -408,6 +431,7 @@ public class MapInfoWidgetsFactory {
 		private ImageButton refreshButton;
 		private ImageButton closeButton;
 		private TextView saveView;
+		private SwitchCompat topBarSwitch;
 		private View shadowView;
 		private boolean nightMode;
 
@@ -424,6 +448,7 @@ public class MapInfoWidgetsFactory {
 			titleView = (TextView) map.findViewById(R.id.widget_top_bar_title);
 			saveView = (TextView) map.findViewById(R.id.widget_top_bar_save);
 			descrView = (TextView) map.findViewById(R.id.widget_top_bar_description);
+			topBarSwitch = (SwitchCompat) map.findViewById(R.id.widget_top_bar_switch);
 			shadowView = map.findViewById(R.id.widget_top_bar_shadow);
 			updateVisibility(false);
 		}
@@ -464,6 +489,10 @@ public class MapInfoWidgetsFactory {
 			return saveView;
 		}
 
+		public SwitchCompat getTopBarSwitch() {
+			return topBarSwitch;
+		}
+
 		public ImageButton getRefreshButton() {
 			return refreshButton;
 		}
@@ -536,6 +565,7 @@ public class MapInfoWidgetsFactory {
 			closeButton.setOnClickListener(controller.onCloseButtonClickListener);
 			refreshButton.setOnClickListener(controller.onRefreshButtonClickListener);
 			saveView.setOnClickListener(controller.onSaveViewClickListener);
+			topBarSwitch.setOnCheckedChangeListener(controller.onSwitchCheckedChangeListener);
 		}
 
 		public void updateInfo() {

From eabf17ed7b30fb561d1694aff3ddea62e9448fc9 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 16 Aug 2017 18:14:19 +0300
Subject: [PATCH 119/174] Add 3 dots menu

---
 OsmAnd/res/layout/gpx_item_altitude.xml       |  11 +
 OsmAnd/res/layout/gpx_item_general.xml        |  11 +
 OsmAnd/res/layout/gpx_item_speed.xml          |  11 +
 OsmAnd/res/menu/track_segment_menu.xml        |  12 ++
 OsmAnd/res/values/strings.xml                 |   1 +
 OsmAnd/src/net/osmand/plus/GPXUtilities.java  |  56 +++++-
 .../osmand/plus/activities/TrackActivity.java |  17 +-
 .../MeasurementToolFragment.java              |  49 +++--
 .../adapter/MeasurementToolAdapter.java       |  19 +-
 .../plus/myplaces/TrackPointFragment.java     |   4 +-
 .../plus/myplaces/TrackSegmentFragment.java   | 190 +++++++++++++++++-
 11 files changed, 346 insertions(+), 35 deletions(-)
 create mode 100644 OsmAnd/res/menu/track_segment_menu.xml

diff --git a/OsmAnd/res/layout/gpx_item_altitude.xml b/OsmAnd/res/layout/gpx_item_altitude.xml
index ed7f0eda6b..cbf8de42a1 100644
--- a/OsmAnd/res/layout/gpx_item_altitude.xml
+++ b/OsmAnd/res/layout/gpx_item_altitude.xml
@@ -264,6 +264,17 @@
             android:orientation="horizontal"
             android:gravity="center">
 
+            <ImageButton
+                android:visibility="gone"
+                tools:visibility="visible"
+                android:id="@+id/overflow_menu"
+                android:background="@null"
+                android:paddingRight="16dp"
+                android:paddingLeft="16dp"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:src="@drawable/ic_overflow_menu_dark"/>
+
             <net.osmand.plus.widgets.TextViewEx
                 android:background="?attr/selectableItemBackground"
                 android:id="@+id/split_interval"
diff --git a/OsmAnd/res/layout/gpx_item_general.xml b/OsmAnd/res/layout/gpx_item_general.xml
index 36ac580246..36089fbd11 100644
--- a/OsmAnd/res/layout/gpx_item_general.xml
+++ b/OsmAnd/res/layout/gpx_item_general.xml
@@ -282,6 +282,17 @@
             android:orientation="horizontal"
             android:gravity="center">
 
+            <ImageButton
+                android:visibility="gone"
+                tools:visibility="visible"
+                android:id="@+id/overflow_menu"
+                android:background="@null"
+                android:paddingRight="16dp"
+                android:paddingLeft="16dp"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:src="@drawable/ic_overflow_menu_dark"/>
+
             <net.osmand.plus.widgets.TextViewEx
                 android:background="?attr/selectableItemBackground"
                 android:id="@+id/split_interval"
diff --git a/OsmAnd/res/layout/gpx_item_speed.xml b/OsmAnd/res/layout/gpx_item_speed.xml
index 014f2768f3..284ab9d273 100644
--- a/OsmAnd/res/layout/gpx_item_speed.xml
+++ b/OsmAnd/res/layout/gpx_item_speed.xml
@@ -264,6 +264,17 @@
             android:orientation="horizontal"
             android:gravity="center">
 
+            <ImageButton
+                android:visibility="gone"
+                tools:visibility="visible"
+                android:id="@+id/overflow_menu"
+                android:background="@null"
+                android:paddingRight="16dp"
+                android:paddingLeft="16dp"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:src="@drawable/ic_overflow_menu_dark"/>
+
             <net.osmand.plus.widgets.TextViewEx
                 android:background="?attr/selectableItemBackground"
                 android:id="@+id/split_interval"
diff --git a/OsmAnd/res/menu/track_segment_menu.xml b/OsmAnd/res/menu/track_segment_menu.xml
new file mode 100644
index 0000000000..196bb49b2f
--- /dev/null
+++ b/OsmAnd/res/menu/track_segment_menu.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/action_edit"
+        android:icon="@drawable/ic_action_edit_dark"
+        android:title="@string/shared_string_edit"/>
+
+    <item
+        android:id="@+id/action_delete"
+        android:icon="@drawable/ic_action_remove_dark"
+        android:title="@string/shared_string_delete"/>
+</menu>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 301f55556c..d0cdfd4003 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="edit_line">Edit Line</string>
     <string name="add_point_before">Add point before</string>
     <string name="add_point_after">Add point after</string>
     <string name="shared_string_options">Options</string>
diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index 407124f2f2..7d099d87ed 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -248,6 +248,7 @@ public class GPXUtilities {
 		public String name = null;
 		public String desc = null;
 		public List<TrkSegment> segments = new ArrayList<>();
+		public boolean generalTrack = false;
 
 	}
 
@@ -773,6 +774,7 @@ public class GPXUtilities {
 				track.segments = new ArrayList<>();
 				track.segments.add(generalSegment);
 				generalTrack = track;
+				track.generalTrack = true;
 			}
 			return generalTrack;
 		}
@@ -898,12 +900,7 @@ public class GPXUtilities {
 		}
 
 		public void addTrkSegment(List<WptPt> points) {
-			Track generalTrack = getGeneralTrack();
-			if (generalTrack != null) {
-				tracks.remove(generalTrack);
-				this.generalTrack = null;
-				this.generalSegment = null;
-			}
+			removeGeneralTrackIfExists();
 
 			TrkSegment segment = new TrkSegment();
 			segment.points.addAll(points);
@@ -917,6 +914,26 @@ public class GPXUtilities {
 			modifiedTime = System.currentTimeMillis();
 		}
 
+		public boolean replaceSegment(TrkSegment oldSegment, TrkSegment newSegment) {
+			removeGeneralTrackIfExists();
+
+			for (int i = 0; i < tracks.size(); i++) {
+				Track currentTrack = tracks.get(i);
+				for (int j = 0; j < currentTrack.segments.size(); j++) {
+					int segmentIndex = currentTrack.segments.indexOf(oldSegment);
+					if (segmentIndex != -1) {
+						currentTrack.segments.remove(segmentIndex);
+						currentTrack.segments.add(segmentIndex, newSegment);
+						addGeneralTrack();
+						return true;
+					}
+				}
+			}
+
+			addGeneralTrack();
+			return false;
+		}
+
 		public void setLastRoutePoints(List<WptPt> points) {
 			if (routes.size() == 0) {
 				routes.add(new Route());
@@ -950,6 +967,33 @@ public class GPXUtilities {
 			modifiedTime = System.currentTimeMillis();
 		}
 
+		private void removeGeneralTrackIfExists() {
+			Track generalTrack = getGeneralTrack();
+			if (generalTrack != null) {
+				tracks.remove(generalTrack);
+				this.generalTrack = null;
+				this.generalSegment = null;
+			}
+		}
+
+		public boolean removeTrkSegment(TrkSegment segment) {
+			removeGeneralTrackIfExists();
+
+			modifiedTime = System.currentTimeMillis();
+
+			for (int i = 0; i < tracks.size(); i++) {
+				Track currentTrack = tracks.get(i);
+				for (int j = 0; j < currentTrack.segments.size(); j++) {
+					if (currentTrack.segments.remove(segment)) {
+						addGeneralTrack();
+						return true;
+					}
+				}
+			}
+			addGeneralTrack();
+			return false;
+		}
+
 		public boolean deleteWptPt(WptPt pt) {
 			modifiedTime = System.currentTimeMillis();
 			return points.remove(pt);
diff --git a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
index 2ef353bb0b..138dabe221 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
@@ -19,6 +19,7 @@ import net.osmand.data.QuadRect;
 import net.osmand.plus.activities.TrackActivity.NewGpxLine.LineType;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.GPXUtilities.TrkSegment;
 import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper;
@@ -114,9 +115,13 @@ public class TrackActivity extends TabActivity {
 	}
 
 	public void addLine(LineType lineType) {
+		addLine(lineType, null);
+	}
+
+	public void addLine(LineType lineType, TrkSegment segment) {
 		GPXFile gpxFile = getGpx();
 		QuadRect rect = getRect();
-		NewGpxLine newGpxLine = new NewGpxLine(gpxFile, rect, lineType);
+		NewGpxLine newGpxLine = new NewGpxLine(gpxFile, rect, lineType, segment);
 		WptPt pointToShow = gpxFile != null ? gpxFile.findPointToShow() : null;
 		if (pointToShow != null) {
 			LatLon location = new LatLon(pointToShow.getLatitude(), pointToShow.getLongitude());
@@ -408,16 +413,18 @@ public class TrackActivity extends TabActivity {
 	}
 
 	public static class NewGpxLine {
-		public enum LineType { SEGMENT, ROUTE_POINTS }
+		public enum LineType { ADD_SEGMENT, ADD_ROUTE_POINTS, EDIT_SEGMENT }
 
 		private GPXFile gpxFile;
+		private TrkSegment trkSegment;
 		private QuadRect rect;
 		private LineType lineType;
 
-		public NewGpxLine(GPXFile gpxFile, QuadRect rect, LineType lineType) {
+		public NewGpxLine(GPXFile gpxFile, QuadRect rect, LineType lineType, TrkSegment trkSegment) {
 			this.gpxFile = gpxFile;
 			this.rect = rect;
 			this.lineType = lineType;
+			this.trkSegment = trkSegment;
 		}
 
 		public GPXFile getGpxFile() {
@@ -431,5 +438,9 @@ public class TrackActivity extends TabActivity {
 		public LineType getLineType() {
 			return lineType;
 		}
+
+		public TrkSegment getTrkSegment() {
+			return trkSegment;
+		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 76d902c1c4..930ec474d8 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -34,7 +34,9 @@ import net.osmand.CallbackWithObject;
 import net.osmand.IndexConstants;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.GPXUtilities.Route;
+import net.osmand.plus.GPXUtilities.TrkSegment;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.IconsCache;
@@ -67,7 +69,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 
-import static net.osmand.plus.GPXUtilities.GPXFile;
 import static net.osmand.plus.OsmandSettings.LANDSCAPE_MIDDLE_RIGHT_CONSTANT;
 import static net.osmand.plus.OsmandSettings.MIDDLE_TOP_CONSTANT;
 import static net.osmand.plus.helpers.GpxImportHelper.GPX_SUFFIX;
@@ -101,7 +102,7 @@ public class MeasurementToolFragment extends Fragment {
 	private boolean nightMode;
 	private int previousMapPosition;
 	private NewGpxLine newGpxLine;
-	private boolean routePointsAdded;
+	private boolean gpxPointsAdded;
 	private boolean snapToRoadEnabled;
 
 	private boolean inMovePointMode;
@@ -362,10 +363,12 @@ public class MeasurementToolFragment extends Fragment {
 		toolBarController = new MeasurementToolBarController(newGpxLine);
 		if (newGpxLine != null) {
 			LineType lineType = newGpxLine.getLineType();
-			if (lineType == LineType.ROUTE_POINTS) {
+			if (lineType == LineType.ADD_ROUTE_POINTS) {
 				toolBarController.setTitle(getString(R.string.add_route_points));
-			} else if (lineType == LineType.SEGMENT) {
+			} else if (lineType == LineType.ADD_SEGMENT) {
 				toolBarController.setTitle(getString(R.string.add_line));
+			} else if (lineType == LineType.EDIT_SEGMENT) {
+				toolBarController.setTitle(getString(R.string.edit_line));
 			}
 		} else {
 			toolBarController.setTitle(getString(R.string.measurement_tool_action_bar));
@@ -466,11 +469,14 @@ public class MeasurementToolFragment extends Fragment {
 			hidePointsListFragment();
 		}
 
-		if (newGpxLine != null && !routePointsAdded) {
+		if (newGpxLine != null && !gpxPointsAdded) {
 			LineType lineType = newGpxLine.getLineType();
-			if (lineType == LineType.ROUTE_POINTS) {
-				displayRoutePoints(mapActivity);
-				routePointsAdded = true;
+			if (lineType == LineType.ADD_ROUTE_POINTS) {
+				displayRoutePoints();
+				gpxPointsAdded = true;
+			} else if (lineType == LineType.EDIT_SEGMENT) {
+				displaySegmentPoints();
+				gpxPointsAdded = true;
 			}
 		}
 
@@ -593,8 +599,8 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
-	private void displayRoutePoints(MapActivity mapActivity) {
-		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
+	private void displayRoutePoints() {
+		final MeasurementToolLayer measurementLayer = getMeasurementLayer();
 
 		GPXFile gpx = newGpxLine.getGpxFile();
 		List<WptPt> points = gpx.getLastRoutePoints();
@@ -605,6 +611,18 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
+	private void displaySegmentPoints() {
+		final MeasurementToolLayer measurementLayer = getMeasurementLayer();
+
+		TrkSegment segment = newGpxLine.getTrkSegment();
+		List<WptPt> points = segment.points;
+		if (measurementLayer != null) {
+			measurementPoints.addAll(points);
+			adapter.notifyDataSetChanged();
+			updateText();
+		}
+	}
+
 	private void openSelectedPointMenu(MapActivity mapActivity) {
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 
@@ -1007,12 +1025,17 @@ public class MeasurementToolFragment extends Fragment {
 					if (measurementLayer != null) {
 						List<WptPt> points = measurementLayer.getMeasurementPoints();
 						switch (lineType) {
-							case SEGMENT:
+							case ADD_SEGMENT:
 								gpx.addTrkSegment(points);
 								break;
-							case ROUTE_POINTS:
+							case ADD_ROUTE_POINTS:
 								gpx.setLastRoutePoints(points);
 								break;
+							case EDIT_SEGMENT:
+								TrkSegment segment = new TrkSegment();
+								segment.points.addAll(points);
+								gpx.replaceSegment(newGpxLine.getTrkSegment(), segment);
+								break;
 						}
 					}
 					if (activity != null) {
@@ -1020,7 +1043,7 @@ public class MeasurementToolFragment extends Fragment {
 						if (showOnMap) {
 							SelectedGpxFile sf = activity.getMyApplication().getSelectedGpxHelper().selectGpxFile(gpx, true, false);
 							if (sf != null) {
-								if (lineType == LineType.SEGMENT) {
+								if (lineType == LineType.ADD_SEGMENT || lineType == LineType.EDIT_SEGMENT) {
 									sf.processPoints();
 								}
 							}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index 4bfab038d1..8c431c2cbf 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -83,15 +83,20 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		} else {
 			holder.title.setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
 		}
-		if (pos < 1) {
-			holder.descr.setText(mapActivity.getString(R.string.shared_string_control_start));
+		String pointDesc = pt.desc;
+		if (!TextUtils.isEmpty(pointDesc)) {
+			holder.descr.setText(pointDesc);
 		} else {
-			float dist = 0;
-			for (int i = 1; i <= pos; i++) {
-				dist += MapUtils.getDistance(points.get(i - 1).lat, points.get(i - 1).lon,
-						points.get(i).lat, points.get(i).lon);
+			if (pos < 1) {
+				holder.descr.setText(mapActivity.getString(R.string.shared_string_control_start));
+			} else {
+				float dist = 0;
+				for (int i = 1; i <= pos; i++) {
+					dist += MapUtils.getDistance(points.get(i - 1).lat, points.get(i - 1).lon,
+							points.get(i).lat, points.get(i).lon);
+				}
+				holder.descr.setText(OsmAndFormatter.getFormattedDistance(dist, mapActivity.getMyApplication()));
 			}
-			holder.descr.setText(OsmAndFormatter.getFormattedDistance(dist, mapActivity.getMyApplication()));
 		}
 		holder.deleteBtn.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_remove_dark,
 				nightMode ? R.color.ctx_menu_info_text_dark : R.color.icon_color));
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index 782aabecbc..55421714da 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -164,11 +164,11 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 					break;
 				case R.id.route_text_layout:
 				case R.id.route_fab:
-					addLine(LineType.ROUTE_POINTS);
+					addLine(LineType.ADD_ROUTE_POINTS);
 					break;
 				case R.id.line_text_layout:
 				case R.id.line_fab:
-					addLine(LineType.SEGMENT);
+					addLine(LineType.ADD_SEGMENT);
 					break;
 			}
 		}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index 89d08b0914..993af7c04b 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -97,6 +97,7 @@ import net.osmand.plus.views.controls.PagerSlidingTabStrip;
 import net.osmand.plus.views.controls.PagerSlidingTabStrip.CustomTabProvider;
 import net.osmand.plus.views.controls.WrapContentHeightViewPager;
 import net.osmand.plus.views.controls.WrapContentHeightViewPager.ViewAtPositionInterface;
+import net.osmand.plus.widgets.IconPopupMenu;
 import net.osmand.render.RenderingRulesStorage;
 import net.osmand.util.Algorithms;
 
@@ -136,6 +137,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 	private int defPointColor;
 	private Paint paintIcon;
 	private Bitmap pointSmall;
+	private SwitchCompat vis;
 
 	private ImageView imageView;
 	private RotatedTileBox rotatedTileBox;
@@ -213,11 +215,11 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 					break;
 				case R.id.route_text_layout:
 				case R.id.route_fab:
-					addLine(LineType.ROUTE_POINTS);
+					addLine(LineType.ADD_ROUTE_POINTS);
 					break;
 				case R.id.line_text_layout:
 				case R.id.line_fab:
-					addLine(LineType.SEGMENT);
+					addLine(LineType.ADD_SEGMENT);
 					break;
 			}
 		}
@@ -289,6 +291,10 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		getTrackActivity().addLine(lineType);
 	}
 
+	private void addLine(LineType lineType, TrkSegment segment) {
+		getTrackActivity().addLine(lineType, segment);
+	}
+
 	private void openMenu() {
 		menuFab.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_action_remove_dark));
 		waypointFab.setVisibility(View.VISIBLE);
@@ -436,7 +442,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		final View divider = headerView.findViewById(R.id.divider);
 		final View splitIntervalView = headerView.findViewById(R.id.split_interval_view);
 		final View colorView = headerView.findViewById(R.id.color_view);
-		final SwitchCompat vis = (SwitchCompat) headerView.findViewById(R.id.showOnMapToggle);
+		vis = (SwitchCompat) headerView.findViewById(R.id.showOnMapToggle);
 		final ProgressBar progressBar = (ProgressBar) headerView.findViewById(R.id.mapLoadProgress);
 		final boolean selected = getGpx() != null &&
 				((getGpx().showCurrentTrack && app.getSelectedGpxHelper().getSelectedCurrentRecordingTrack() != null) ||
@@ -1277,7 +1283,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 						}
 					});
 
-					IconsCache ic = app.getIconsCache();
+					final IconsCache ic = app.getIconsCache();
 					switch (tabType) {
 						case GPX_TAB_ITEM_GENERAL:
 							if (analysis != null) {
@@ -1340,6 +1346,45 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 									}
 								});
 							}
+							if (!gpxItem.group.getTrack().generalTrack) {
+								view.findViewById(R.id.overflow_menu).setVisibility(View.VISIBLE);
+								view.findViewById(R.id.overflow_menu).setOnClickListener(new View.OnClickListener() {
+									@Override
+									public void onClick(View view) {
+										IconPopupMenu popupMenu = new IconPopupMenu(getTrackActivity(), view.findViewById(R.id.overflow_menu));
+										Menu menu = popupMenu.getMenu();
+										popupMenu.getMenuInflater().inflate(R.menu.track_segment_menu, menu);
+										menu.findItem(R.id.action_edit).setIcon(ic.getThemedIcon(R.drawable.ic_action_edit_dark));
+										menu.findItem(R.id.action_delete).setIcon(ic.getThemedIcon(R.drawable.ic_action_remove_dark));
+										popupMenu.setOnMenuItemClickListener(new IconPopupMenu.OnMenuItemClickListener() {
+											@Override
+											public boolean onMenuItemClick(MenuItem item) {
+												switch (item.getItemId()) {
+													case R.id.action_edit:
+														TrkSegment segment = getTrkSegment();
+														if (segment != null) {
+															addLine(LineType.EDIT_SEGMENT, segment);
+														}
+														return true;
+													case R.id.action_delete:
+														if (deleteSegment()) {
+															GPXFile gpx = getGpx();
+															if (gpx != null) {
+																SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(gpx, vis.isChecked(), false);
+																new SaveGpxAsyncTask(gpx, vis.isChecked() ? sf : null).execute();
+															}
+														}
+														return true;
+												}
+												return false;
+											}
+										});
+										popupMenu.show();
+									}
+								});
+							} else {
+								view.findViewById(R.id.overflow_menu).setVisibility(View.GONE);
+							}
 
 							break;
 						case GPX_TAB_ITEM_ALTITUDE:
@@ -1394,6 +1439,45 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 									}
 								});
 							}
+							if (!gpxItem.group.getTrack().generalTrack) {
+								view.findViewById(R.id.overflow_menu).setVisibility(View.VISIBLE);
+								view.findViewById(R.id.overflow_menu).setOnClickListener(new View.OnClickListener() {
+									@Override
+									public void onClick(View view) {
+										IconPopupMenu popupMenu = new IconPopupMenu(getTrackActivity(), view.findViewById(R.id.overflow_menu));
+										Menu menu = popupMenu.getMenu();
+										popupMenu.getMenuInflater().inflate(R.menu.track_segment_menu, menu);
+										menu.findItem(R.id.action_edit).setIcon(ic.getThemedIcon(R.drawable.ic_action_edit_dark));
+										menu.findItem(R.id.action_delete).setIcon(ic.getThemedIcon(R.drawable.ic_action_remove_dark));
+										popupMenu.setOnMenuItemClickListener(new IconPopupMenu.OnMenuItemClickListener() {
+											@Override
+											public boolean onMenuItemClick(MenuItem item) {
+												switch (item.getItemId()) {
+													case R.id.action_edit:
+														TrkSegment segment = getTrkSegment();
+														if (segment != null) {
+															addLine(LineType.EDIT_SEGMENT, segment);
+														}
+														return true;
+													case R.id.action_delete:
+														if (deleteSegment()) {
+															GPXFile gpx = getGpx();
+															if (gpx != null) {
+																SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(gpx, vis.isChecked(), false);
+																new SaveGpxAsyncTask(gpx, vis.isChecked() ? sf : null).execute();
+															}
+														}
+														return true;
+												}
+												return false;
+											}
+										});
+										popupMenu.show();
+									}
+								});
+							} else {
+								view.findViewById(R.id.overflow_menu).setVisibility(View.GONE);
+							}
 
 							break;
 						case GPX_TAB_ITEM_SPEED:
@@ -1447,6 +1531,46 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 									}
 								});
 							}
+							if (!gpxItem.group.getTrack().generalTrack) {
+								view.findViewById(R.id.overflow_menu).setVisibility(View.VISIBLE);
+								view.findViewById(R.id.overflow_menu).setOnClickListener(new View.OnClickListener() {
+									@Override
+									public void onClick(View view) {
+										IconPopupMenu popupMenu = new IconPopupMenu(getTrackActivity(), view.findViewById(R.id.overflow_menu));
+										Menu menu = popupMenu.getMenu();
+										popupMenu.getMenuInflater().inflate(R.menu.track_segment_menu, menu);
+										menu.findItem(R.id.action_edit).setIcon(ic.getThemedIcon(R.drawable.ic_action_edit_dark));
+										menu.findItem(R.id.action_delete).setIcon(ic.getThemedIcon(R.drawable.ic_action_remove_dark));
+										popupMenu.setOnMenuItemClickListener(new IconPopupMenu.OnMenuItemClickListener() {
+											@Override
+											public boolean onMenuItemClick(MenuItem item) {
+												switch (item.getItemId()) {
+													case R.id.action_edit:
+														TrkSegment segment = getTrkSegment();
+														if (segment != null) {
+															addLine(LineType.EDIT_SEGMENT, segment);
+														}
+														return true;
+													case R.id.action_delete:
+														if (deleteSegment()) {
+															GPXFile gpx = getGpx();
+															if (gpx != null) {
+																SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(gpx, vis.isChecked(), false);
+																new SaveGpxAsyncTask(gpx, vis.isChecked() ? sf : null).execute();
+															}
+														}
+														return true;
+												}
+												return false;
+											}
+										});
+										popupMenu.show();
+									}
+								});
+							} else {
+								view.findViewById(R.id.overflow_menu).setVisibility(View.GONE);
+							}
+
 							break;
 					}
 				}
@@ -1457,6 +1581,17 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 			return view;
 		}
 
+		private boolean deleteSegment() {
+			TrkSegment segment = getTrkSegment();
+			if (segment != null) {
+				GPXFile gpx = getGpx();
+				if (gpx != null) {
+					return gpx.removeTrkSegment(segment);
+				}
+			}
+			return false;
+		}
+
 		@Override
 		public void destroyItem(ViewGroup collection, int position, Object view) {
 			views.remove(position);
@@ -1549,6 +1684,17 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 			}
 		}
 
+		private TrkSegment getTrkSegment() {
+			for (Track t : gpxItem.group.getGpx().tracks) {
+				for (TrkSegment s : t.segments) {
+					if (s.points.size() > 0 && s.points.get(0).equals(gpxItem.analysis.locationStart)) {
+						return s;
+					}
+				}
+			}
+			return null;
+		}
+
 		void openAnalyzeOnMap(GPXTabItemType tabType) {
 			LatLon location = null;
 			WptPt wpt = null;
@@ -1621,6 +1767,42 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		getTrackActivity().getSlidingTabLayout().setVisibility(View.GONE);
 	}
 
+	private class SaveGpxAsyncTask extends AsyncTask<Void, Void, Void> {
+		private final GPXFile mGpx;
+		private final SelectedGpxFile mSelectedGpx;
+		private final TrackActivity mActivity;
+
+		SaveGpxAsyncTask(GPXFile gpx, SelectedGpxFile selectedGpxFile) {
+			mGpx = gpx;
+			mActivity = getTrackActivity();
+			mSelectedGpx = selectedGpxFile;
+		}
+
+		@Override
+		protected void onPreExecute() {
+			mActivity.setSupportProgressBarIndeterminateVisibility(true);
+		}
+
+		@Override
+		protected Void doInBackground(Void... params) {
+			GPXUtilities.writeGpxFile(new File(mGpx.path), mGpx, app);
+			return null;
+		}
+
+		@Override
+		protected void onPostExecute(Void aVoid) {
+			if (mSelectedGpx != null) {
+				List<GpxDisplayGroup> groups = getDisplayGroups();
+				mSelectedGpx.setDisplayGroups(groups);
+				mSelectedGpx.processPoints();
+			}
+			updateContent();
+			if (!mActivity.isFinishing()) {
+				mActivity.setSupportProgressBarIndeterminateVisibility(false);
+			}
+		}
+	}
+
 	private class SplitTrackAsyncTask extends AsyncTask<Void, Void, Void> {
 		@Nullable
 		private final SelectedGpxFile mSelectedGpxFile;

From 50681f3e240187f13aaac8c1877e3c5d1d6078c3 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 16 Aug 2017 18:22:10 +0300
Subject: [PATCH 120/174] Change icon for different line types

---
 .../plus/measurementtool/MeasurementToolFragment.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 930ec474d8..262a7b2c68 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -158,7 +158,16 @@ public class MeasurementToolFragment extends Fragment {
 		pointsTv = (TextView) mainView.findViewById(R.id.measurement_points_text_view);
 
 		int color = nightMode ? R.color.osmand_orange : R.color.color_myloc_distance;
-		((ImageView) mainView.findViewById(R.id.ruler_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_ruler, color));
+		if (newGpxLine != null) {
+			LineType lineType = newGpxLine.getLineType();
+			if (lineType == LineType.ADD_SEGMENT || lineType == LineType.EDIT_SEGMENT) {
+				((ImageView) mainView.findViewById(R.id.ruler_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_polygom_dark, color));
+			} else {
+				((ImageView) mainView.findViewById(R.id.ruler_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_markers_dark, color));
+			}
+		} else {
+			((ImageView) mainView.findViewById(R.id.ruler_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_ruler, color));
+		}
 		((ImageView) mainView.findViewById(R.id.move_point_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_move_point, color));
 		((ImageView) mainView.findViewById(R.id.add_point_after_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_addpoint_above, color));
 		((ImageView) mainView.findViewById(R.id.add_point_before_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_addpoint_below, color));

From 41689efe1fd1d415eec18d7c5730c0eb3b8b20b2 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 16 Aug 2017 18:32:08 +0300
Subject: [PATCH 121/174] Change title in adding route points

---
 OsmAnd/res/values/strings.xml                         |  1 +
 .../plus/measurementtool/MeasurementToolFragment.java |  2 +-
 .../adapter/MeasurementToolAdapter.java               | 11 +++++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

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
     -->
+    <string name="route_point">Route point</string>
     <string name="edit_line">Edit Line</string>
     <string name="add_point_before">Add point before</string>
     <string name="add_point_after">Add point after</string>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 262a7b2c68..585a5c3a0e 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -409,7 +409,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<MeasurementTool
 	private final List<WptPt> points;
 	private MeasurementAdapterListener listener;
 	private boolean nightMode;
+	private LineType lineType;
 
-	public MeasurementToolAdapter(MapActivity mapActivity, List<WptPt> points) {
+	public MeasurementToolAdapter(MapActivity mapActivity, List<WptPt> 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<MeasurementTool
 		if (!TextUtils.isEmpty(pointTitle)) {
 			holder.title.setText(pointTitle);
 		} else {
-			holder.title.setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
+			if (lineType == LineType.ADD_ROUTE_POINTS) {
+				holder.title.setText(mapActivity.getString(R.string.route_point) + " - " + (pos + 1));
+			} else {
+				holder.title.setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
+			}
 		}
 		String pointDesc = pt.desc;
 		if (!TextUtils.isEmpty(pointDesc)) {

From b5d7e77a4b0049ded3db2a1d2bf6b7fe80a9495e Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 16 Aug 2017 18:35:41 +0300
Subject: [PATCH 122/174] Improve changing of icons

---
 .../layout-land/fragment_measurement_tool.xml | 63 +++----------------
 .../res/layout/fragment_measurement_tool.xml  | 63 +++----------------
 .../MeasurementToolFragment.java              | 59 ++++++++++-------
 3 files changed, 53 insertions(+), 132 deletions(-)

diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
index 5676e9ca2b..18d1a984b8 100644
--- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -26,7 +26,7 @@
             android:paddingTop="14dp">
 
             <ImageView
-                android:id="@+id/ruler_icon"
+                android:id="@+id/main_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
@@ -39,51 +39,6 @@
                 android:background="@null"
                 tools:src="@drawable/ic_action_ruler"/>
 
-            <ImageView
-                android:id="@+id/move_point_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_marginEnd="16dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginStart="16dp"
-                android:background="@null"
-                android:visibility="gone"
-                tools:src="@drawable/ic_action_move_point"/>
-
-            <ImageView
-                android:id="@+id/add_point_after_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_marginEnd="16dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginStart="16dp"
-                android:background="@null"
-                android:visibility="gone"
-                tools:src="@drawable/ic_action_addpoint_above"/>
-
-            <ImageView
-                android:id="@+id/add_point_before_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_marginEnd="16dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginStart="16dp"
-                android:background="@null"
-                android:visibility="gone"
-                tools:src="@drawable/ic_action_addpoint_below"/>
-
             <ImageView
                 android:id="@+id/up_down_button"
                 android:layout_width="wrap_content"
@@ -105,8 +60,8 @@
                 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:layout_toEndOf="@id/main_icon"
+                android:layout_toRightOf="@id/main_icon"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 tools:text="724 m,"/>
 
@@ -132,8 +87,8 @@
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="4dp"
                 android:layout_marginStart="8dp"
-                android:layout_toEndOf="@id/move_point_icon"
-                android:layout_toRightOf="@id/move_point_icon"
+                android:layout_toEndOf="@id/main_icon"
+                android:layout_toRightOf="@id/main_icon"
                 android:text="@string/move_point"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 android:visibility="gone"/>
@@ -147,8 +102,8 @@
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="4dp"
                 android:layout_marginStart="8dp"
-                android:layout_toEndOf="@id/add_point_after_icon"
-                android:layout_toRightOf="@id/add_point_after_icon"
+                android:layout_toEndOf="@id/main_icon"
+                android:layout_toRightOf="@id/main_icon"
                 android:text="@string/add_point_after"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 android:visibility="gone"/>
@@ -162,8 +117,8 @@
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="4dp"
                 android:layout_marginStart="8dp"
-                android:layout_toEndOf="@id/add_point_before_icon"
-                android:layout_toRightOf="@id/add_point_before_icon"
+                android:layout_toEndOf="@id/main_icon"
+                android:layout_toRightOf="@id/main_icon"
                 android:text="@string/add_point_before"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 android:visibility="gone"/>
diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index d27e06821b..469d957f9e 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -26,7 +26,7 @@
             android:paddingTop="12dp">
 
             <ImageView
-                android:id="@+id/ruler_icon"
+                android:id="@+id/main_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
@@ -39,51 +39,6 @@
                 android:background="@null"
                 tools:src="@drawable/ic_action_ruler"/>
 
-            <ImageView
-                android:id="@+id/move_point_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_marginEnd="16dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginStart="16dp"
-                android:background="@null"
-                android:visibility="gone"
-                tools:src="@drawable/ic_action_move_point"/>
-
-            <ImageView
-                android:id="@+id/add_point_after_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_marginEnd="16dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginStart="16dp"
-                android:background="@null"
-                android:visibility="gone"
-                tools:src="@drawable/ic_action_addpoint_above"/>
-
-            <ImageView
-                android:id="@+id/add_point_before_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_marginEnd="16dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginStart="16dp"
-                android:background="@null"
-                android:visibility="gone"
-                tools:src="@drawable/ic_action_addpoint_below"/>
-
             <ImageView
                 android:id="@+id/up_down_button"
                 android:layout_width="wrap_content"
@@ -105,8 +60,8 @@
                 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:layout_toEndOf="@id/main_icon"
+                android:layout_toRightOf="@id/main_icon"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 tools:text="724 m,"/>
 
@@ -132,8 +87,8 @@
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="4dp"
                 android:layout_marginStart="8dp"
-                android:layout_toEndOf="@id/move_point_icon"
-                android:layout_toRightOf="@id/move_point_icon"
+                android:layout_toEndOf="@id/main_icon"
+                android:layout_toRightOf="@id/main_icon"
                 android:text="@string/move_point"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 android:visibility="gone"/>
@@ -147,8 +102,8 @@
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="4dp"
                 android:layout_marginStart="8dp"
-                android:layout_toEndOf="@id/add_point_after_icon"
-                android:layout_toRightOf="@id/add_point_after_icon"
+                android:layout_toEndOf="@id/main_icon"
+                android:layout_toRightOf="@id/main_icon"
                 android:text="@string/add_point_after"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 android:visibility="gone"/>
@@ -162,8 +117,8 @@
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="4dp"
                 android:layout_marginStart="8dp"
-                android:layout_toEndOf="@id/add_point_before_icon"
-                android:layout_toRightOf="@id/add_point_before_icon"
+                android:layout_toEndOf="@id/main_icon"
+                android:layout_toRightOf="@id/main_icon"
                 android:text="@string/add_point_before"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 android:visibility="gone"/>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 262a7b2c68..f910a9fb0d 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -94,6 +94,7 @@ public class MeasurementToolFragment extends Fragment {
 	private ImageView upDownBtn;
 	private ImageView undoBtn;
 	private ImageView redoBtn;
+	private ImageView mainIcon;
 
 	private boolean wasCollapseButtonVisible;
 	private boolean pointsListOpened;
@@ -157,20 +158,17 @@ public class MeasurementToolFragment extends Fragment {
 		distanceTv = (TextView) mainView.findViewById(R.id.measurement_distance_text_view);
 		pointsTv = (TextView) mainView.findViewById(R.id.measurement_points_text_view);
 
-		int color = nightMode ? R.color.osmand_orange : R.color.color_myloc_distance;
+		mainIcon = (ImageView) mainView.findViewById(R.id.main_icon);
 		if (newGpxLine != null) {
 			LineType lineType = newGpxLine.getLineType();
 			if (lineType == LineType.ADD_SEGMENT || lineType == LineType.EDIT_SEGMENT) {
-				((ImageView) mainView.findViewById(R.id.ruler_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_polygom_dark, color));
+				mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_polygom_dark));
 			} else {
-				((ImageView) mainView.findViewById(R.id.ruler_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_markers_dark, color));
+				mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_markers_dark));
 			}
 		} else {
-			((ImageView) mainView.findViewById(R.id.ruler_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_ruler, color));
+			mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_ruler));
 		}
-		((ImageView) mainView.findViewById(R.id.move_point_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_move_point, color));
-		((ImageView) mainView.findViewById(R.id.add_point_after_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_addpoint_above, color));
-		((ImageView) mainView.findViewById(R.id.add_point_before_icon)).setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_addpoint_below, color));
 
 		upDownBtn = (ImageView) mainView.findViewById(R.id.up_down_button);
 		upDownBtn.setImageDrawable(upIcon);
@@ -587,23 +585,29 @@ public class MeasurementToolFragment extends Fragment {
 
 			@Override
 			public void onApplicationModeItemClick(ApplicationMode mode) {
-				toolBarController.setTopBarSwitchVisible(true);
-				toolBarController.setTopBarSwitchChecked(true);
-				snapToRoadEnabled = true;
-				MapActivity mapActivity = getMapActivity();
-				if (mapActivity != null) {
-					mapActivity.refreshMap();
-				}
+				enableSnapToRoadMode();
 			}
 		};
 	}
 
-	private void disableSnapToRoadMode() {
+	private void enableSnapToRoadMode() {
+		toolBarController.setTopBarSwitchVisible(true);
+		toolBarController.setTopBarSwitchChecked(true);
+		snapToRoadEnabled = true;
+		mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_snap_to_road));
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			mapActivity.refreshMap();
+		}
+	}
+
+	private void disableSnapToRoadMode() {
+		toolBarController.setTopBarSwitchVisible(false);
+		toolBarController.setTitle(previousToolBarTitle);
+		snapToRoadEnabled = false;
+		mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_ruler));
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
-			toolBarController.setTopBarSwitchVisible(false);
-			toolBarController.setTitle(previousToolBarTitle);
-			snapToRoadEnabled = false;
 			mapActivity.refreshMap();
 		}
 	}
@@ -633,8 +637,6 @@ public class MeasurementToolFragment extends Fragment {
 	}
 
 	private void openSelectedPointMenu(MapActivity mapActivity) {
-		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
-
 		SelectedPointMenuBottomSheetDialogFragment fragment = new SelectedPointMenuBottomSheetDialogFragment();
 		fragment.setSelectedPointOptionOnClickListener(createSelectedPointOptionOnClickListener());
 		fragment.show(mapActivity.getSupportFragmentManager(), SelectedPointMenuBottomSheetDialogFragment.TAG);
@@ -757,32 +759,37 @@ public class MeasurementToolFragment extends Fragment {
 		inMovePointMode = enable;
 		markGeneralComponents(enable ? View.GONE : View.VISIBLE);
 		mark(enable ? View.VISIBLE : View.GONE,
-				R.id.move_point_icon,
 				R.id.move_point_text,
 				R.id.selected_point_controls);
+		mainIcon.setImageDrawable(getActiveIcon(enable
+				? R.drawable.ic_action_move_point
+				: R.drawable.ic_action_ruler));
 	}
 
 	private void switchAddPointAfterMode(boolean enable) {
 		inAddPointAfterMode = enable;
 		markGeneralComponents(enable ? View.GONE : View.VISIBLE);
 		mark(enable ? View.VISIBLE : View.GONE,
-				R.id.add_point_after_icon,
 				R.id.add_point_after_text,
 				R.id.selected_point_controls);
+		mainIcon.setImageDrawable(getActiveIcon(enable
+				? R.drawable.ic_action_addpoint_above
+				: R.drawable.ic_action_ruler));
 	}
 
 	private void switchAddPointBeforeMode(boolean enable) {
 		inAddPointBeforeMode = enable;
 		markGeneralComponents(enable ? View.GONE : View.VISIBLE);
 		mark(enable ? View.VISIBLE : View.GONE,
-				R.id.add_point_before_icon,
 				R.id.add_point_before_text,
 				R.id.selected_point_controls);
+		mainIcon.setImageDrawable(getActiveIcon(enable
+				? R.drawable.ic_action_addpoint_below
+				: R.drawable.ic_action_ruler));
 	}
 
 	private void markGeneralComponents(int status) {
 		mark(status,
-				R.id.ruler_icon,
 				R.id.measurement_distance_text_view,
 				R.id.measurement_points_text_view,
 				R.id.up_down_button,
@@ -1104,6 +1111,10 @@ public class MeasurementToolFragment extends Fragment {
 		return iconsCache.getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.icon_color);
 	}
 
+	private Drawable getActiveIcon(@DrawableRes int id) {
+		return iconsCache.getIcon(id, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance);
+	}
+
 	private void enable(View... views) {
 		for (View view : views) {
 			view.setEnabled(true);

From 93762125781ed079ddf77973bb969e2caebc079f Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 16 Aug 2017 18:52:20 +0300
Subject: [PATCH 123/174] Fix adding route points

---
 OsmAnd/src/net/osmand/plus/GPXUtilities.java   | 18 ++++++++----------
 .../MeasurementToolFragment.java               |  4 ++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index 7d099d87ed..602232324e 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -826,10 +826,10 @@ public class GPXUtilities {
 			return g;
 		}
 
-		public List<WptPt> getLastRoutePoints() {
+		public List<WptPt> getRoutePoints() {
 			List<WptPt> points = new ArrayList<>();
-			if (routes.size() > 0) {
-				Route rt = routes.get(routes.size() - 1);
+			for (int i = 0; i < routes.size(); i++) {
+				Route rt = routes.get(i);
 				points.addAll(rt.points);
 			}
 			return points;
@@ -925,6 +925,7 @@ public class GPXUtilities {
 						currentTrack.segments.remove(segmentIndex);
 						currentTrack.segments.add(segmentIndex, newSegment);
 						addGeneralTrack();
+						modifiedTime = System.currentTimeMillis();
 						return true;
 					}
 				}
@@ -934,12 +935,10 @@ public class GPXUtilities {
 			return false;
 		}
 
-		public void setLastRoutePoints(List<WptPt> points) {
-			if (routes.size() == 0) {
-				routes.add(new Route());
-			}
+		public void replaceRoutePoints(List<WptPt> points) {
+			routes.clear();
+			routes.add(new Route());
 			Route currentRoute = routes.get(routes.size() - 1);
-			currentRoute.points.clear();
 			currentRoute.points.addAll(points);
 
 			modifiedTime = System.currentTimeMillis();
@@ -979,13 +978,12 @@ public class GPXUtilities {
 		public boolean removeTrkSegment(TrkSegment segment) {
 			removeGeneralTrackIfExists();
 
-			modifiedTime = System.currentTimeMillis();
-
 			for (int i = 0; i < tracks.size(); i++) {
 				Track currentTrack = tracks.get(i);
 				for (int j = 0; j < currentTrack.segments.size(); j++) {
 					if (currentTrack.segments.remove(segment)) {
 						addGeneralTrack();
+						modifiedTime = System.currentTimeMillis();
 						return true;
 					}
 				}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 585a5c3a0e..6323493659 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -612,7 +612,7 @@ public class MeasurementToolFragment extends Fragment {
 		final MeasurementToolLayer measurementLayer = getMeasurementLayer();
 
 		GPXFile gpx = newGpxLine.getGpxFile();
-		List<WptPt> points = gpx.getLastRoutePoints();
+		List<WptPt> points = gpx.getRoutePoints();
 		if (measurementLayer != null) {
 			measurementPoints.addAll(points);
 			adapter.notifyDataSetChanged();
@@ -1038,7 +1038,7 @@ public class MeasurementToolFragment extends Fragment {
 								gpx.addTrkSegment(points);
 								break;
 							case ADD_ROUTE_POINTS:
-								gpx.setLastRoutePoints(points);
+								gpx.replaceRoutePoints(points);
 								break;
 							case EDIT_SEGMENT:
 								TrkSegment segment = new TrkSegment();

From e093ed94f2402d798a79234b52a99475b5a5c4ef Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 17 Aug 2017 10:20:45 +0300
Subject: [PATCH 124/174] Fix route points in selected point menu

---
 .../MeasurementToolFragment.java              |  2 ++
 ...tedPointMenuBottomSheetDialogFragment.java | 33 ++++++++++++++-----
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 73c5361c58..53d731a317 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -132,6 +132,7 @@ public class MeasurementToolFragment extends Fragment {
 		Fragment fragment = mapActivity.getSupportFragmentManager().findFragmentByTag(SelectedPointMenuBottomSheetDialogFragment.TAG);
 		if (fragment != null) {
 			SelectedPointMenuBottomSheetDialogFragment selectedPointMenuBottomSheetDialogFragment = (SelectedPointMenuBottomSheetDialogFragment) fragment;
+			selectedPointMenuBottomSheetDialogFragment.setLineType(newGpxLine != null ? newGpxLine.getLineType() : null);
 			selectedPointMenuBottomSheetDialogFragment.setSelectedPointOptionOnClickListener(createSelectedPointOptionOnClickListener());
 		}
 		commandManager.resetMeasurementLayer(measurementLayer);
@@ -638,6 +639,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void openSelectedPointMenu(MapActivity mapActivity) {
 		SelectedPointMenuBottomSheetDialogFragment fragment = new SelectedPointMenuBottomSheetDialogFragment();
+		fragment.setLineType(newGpxLine != null ? newGpxLine.getLineType() : null);
 		fragment.setSelectedPointOptionOnClickListener(createSelectedPointOptionOnClickListener());
 		fragment.show(mapActivity.getSupportFragmentManager(), SelectedPointMenuBottomSheetDialogFragment.TAG);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
index 00b706d935..4d6a7692dc 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
@@ -23,6 +23,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;
 import net.osmand.plus.base.BottomSheetDialogFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.util.MapUtils;
@@ -36,11 +37,16 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 	private SelectedPointOptionOnClickListener listener;
 	private boolean nightMode;
 	private boolean portrait;
+	private TrackActivity.NewGpxLine.LineType lineType;
 
 	public void setSelectedPointOptionOnClickListener(SelectedPointOptionOnClickListener listener) {
 		this.listener = listener;
 	}
 
+	public void setLineType(TrackActivity.NewGpxLine.LineType lineType) {
+		this.lineType = lineType;
+	}
+
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -113,16 +119,25 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 		if (!TextUtils.isEmpty(pointTitle)) {
 			((TextView) mainView.findViewById(R.id.selected_point_title)).setText(pointTitle);
 		} else {
-			((TextView) mainView.findViewById(R.id.selected_point_title)).setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
-		}
-		if (pos < 1) {
-			((TextView) mainView.findViewById(R.id.selected_point_distance)).setText(mapActivity.getString(R.string.shared_string_control_start));
-		} else {
-			float dist = 0;
-			for (int i = 1; i <= pos; i++) {
-				dist += MapUtils.getDistance(points.get(i - 1).lat, points.get(i - 1).lon, points.get(i).lat, points.get(i).lon);
+			if (lineType == TrackActivity.NewGpxLine.LineType.ADD_ROUTE_POINTS) {
+				((TextView) mainView.findViewById(R.id.selected_point_title)).setText(mapActivity.getString(R.string.route_point) + " - " + (pos + 1));
+			} else {
+				((TextView) mainView.findViewById(R.id.selected_point_title)).setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
+			}
+		}
+		String pointDesc = pt.desc;
+		if (!TextUtils.isEmpty(pointDesc)) {
+			((TextView) mainView.findViewById(R.id.selected_point_distance)).setText(pointDesc);
+		} else {
+			if (pos < 1) {
+				((TextView) mainView.findViewById(R.id.selected_point_distance)).setText(mapActivity.getString(R.string.shared_string_control_start));
+			} else {
+				float dist = 0;
+				for (int i = 1; i <= pos; i++) {
+					dist += MapUtils.getDistance(points.get(i - 1).lat, points.get(i - 1).lon, points.get(i).lat, points.get(i).lon);
+				}
+				((TextView) mainView.findViewById(R.id.selected_point_distance)).setText(OsmAndFormatter.getFormattedDistance(dist, mapActivity.getMyApplication()));
 			}
-			((TextView) mainView.findViewById(R.id.selected_point_distance)).setText(OsmAndFormatter.getFormattedDistance(dist, mapActivity.getMyApplication()));
 		}
 
 		final int screenHeight = AndroidUtils.getScreenHeight(getActivity());

From 227e58780a9a14cfb26e1a30987714eee5b34034 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 17 Aug 2017 10:29:32 +0300
Subject: [PATCH 125/174] Fix 3 dots menu in night theme

---
 OsmAnd/res/layout/gpx_item_altitude.xml                       | 2 +-
 OsmAnd/res/layout/gpx_item_general.xml                        | 2 +-
 OsmAnd/res/layout/gpx_item_speed.xml                          | 2 +-
 OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/gpx_item_altitude.xml b/OsmAnd/res/layout/gpx_item_altitude.xml
index cbf8de42a1..db3e7d8029 100644
--- a/OsmAnd/res/layout/gpx_item_altitude.xml
+++ b/OsmAnd/res/layout/gpx_item_altitude.xml
@@ -273,7 +273,7 @@
                 android:paddingLeft="16dp"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:src="@drawable/ic_overflow_menu_dark"/>
+                tools:src="@drawable/ic_overflow_menu_dark"/>
 
             <net.osmand.plus.widgets.TextViewEx
                 android:background="?attr/selectableItemBackground"
diff --git a/OsmAnd/res/layout/gpx_item_general.xml b/OsmAnd/res/layout/gpx_item_general.xml
index 36089fbd11..bd2102de4c 100644
--- a/OsmAnd/res/layout/gpx_item_general.xml
+++ b/OsmAnd/res/layout/gpx_item_general.xml
@@ -291,7 +291,7 @@
                 android:paddingLeft="16dp"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:src="@drawable/ic_overflow_menu_dark"/>
+                tools:src="@drawable/ic_overflow_menu_dark"/>
 
             <net.osmand.plus.widgets.TextViewEx
                 android:background="?attr/selectableItemBackground"
diff --git a/OsmAnd/res/layout/gpx_item_speed.xml b/OsmAnd/res/layout/gpx_item_speed.xml
index 284ab9d273..d76578c8d8 100644
--- a/OsmAnd/res/layout/gpx_item_speed.xml
+++ b/OsmAnd/res/layout/gpx_item_speed.xml
@@ -273,7 +273,7 @@
                 android:paddingLeft="16dp"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:src="@drawable/ic_overflow_menu_dark"/>
+                tools:src="@drawable/ic_overflow_menu_dark"/>
 
             <net.osmand.plus.widgets.TextViewEx
                 android:background="?attr/selectableItemBackground"
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index 993af7c04b..9bac4d4b38 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -1347,6 +1347,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 								});
 							}
 							if (!gpxItem.group.getTrack().generalTrack) {
+								((ImageView) view.findViewById(R.id.overflow_menu)).setImageDrawable(ic.getThemedIcon(R.drawable.ic_overflow_menu_dark));
 								view.findViewById(R.id.overflow_menu).setVisibility(View.VISIBLE);
 								view.findViewById(R.id.overflow_menu).setOnClickListener(new View.OnClickListener() {
 									@Override
@@ -1440,6 +1441,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 								});
 							}
 							if (!gpxItem.group.getTrack().generalTrack) {
+								((ImageView) view.findViewById(R.id.overflow_menu)).setImageDrawable(ic.getThemedIcon(R.drawable.ic_overflow_menu_dark));
 								view.findViewById(R.id.overflow_menu).setVisibility(View.VISIBLE);
 								view.findViewById(R.id.overflow_menu).setOnClickListener(new View.OnClickListener() {
 									@Override
@@ -1532,6 +1534,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 								});
 							}
 							if (!gpxItem.group.getTrack().generalTrack) {
+								((ImageView) view.findViewById(R.id.overflow_menu)).setImageDrawable(ic.getThemedIcon(R.drawable.ic_overflow_menu_dark));
 								view.findViewById(R.id.overflow_menu).setVisibility(View.VISIBLE);
 								view.findViewById(R.id.overflow_menu).setOnClickListener(new View.OnClickListener() {
 									@Override

From 45d8cbe83b4ad63347f62d43acb4ba038ce1a634 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Thu, 17 Aug 2017 10:55:59 +0300
Subject: [PATCH 126/174] Add snap to road image button

---
 OsmAnd/res/layout-land/map_hud_bottom.xml     |  9 +++
 OsmAnd/res/layout/map_hud_bottom.xml          |  9 +++
 .../MeasurementToolFragment.java              | 55 ++++++++++++++-----
 3 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/OsmAnd/res/layout-land/map_hud_bottom.xml b/OsmAnd/res/layout-land/map_hud_bottom.xml
index eb2758f078..28441e0016 100644
--- a/OsmAnd/res/layout-land/map_hud_bottom.xml
+++ b/OsmAnd/res/layout-land/map_hud_bottom.xml
@@ -94,6 +94,15 @@
                         android:background="@drawable/btn_round"
                         android:contentDescription="@string/layer_route"
                         tools:src="@drawable/ic_action_test_light"/>
+
+                    <ImageButton
+                        android:id="@+id/snap_to_road_image_button"
+                        android:layout_width="@dimen/map_button_size"
+                        android:layout_height="@dimen/map_button_size"
+                        android:layout_gravity="bottom"
+                        android:background="@drawable/btn_circle"
+                        android:visibility="gone"
+                        tools:src="@drawable/ic_action_test_light"/>
                 </LinearLayout>
             </LinearLayout>
         </FrameLayout>
diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
index 8daa8371cb..2a8bf1d2f5 100644
--- a/OsmAnd/res/layout/map_hud_bottom.xml
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -126,6 +126,15 @@
                 android:contentDescription="@string/layer_route"
                 tools:src="@drawable/ic_action_test_light"/>
 
+            <ImageButton
+                android:id="@+id/snap_to_road_image_button"
+                android:layout_width="@dimen/map_button_size"
+                android:layout_height="@dimen/map_button_size"
+                android:layout_gravity="bottom"
+                android:background="@drawable/btn_circle"
+                android:visibility="gone"
+                tools:src="@drawable/ic_action_test_light"/>
+
             <FrameLayout
                 android:id="@+id/map_ruler_layout"
                 android:layout_width="@dimen/map_ruler_width"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 53d731a317..e53aaf1cb1 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -105,6 +105,7 @@ public class MeasurementToolFragment extends Fragment {
 	private NewGpxLine newGpxLine;
 	private boolean gpxPointsAdded;
 	private boolean snapToRoadEnabled;
+	private ApplicationMode snapToRoadAppMode;
 
 	private boolean inMovePointMode;
 	private boolean inAddPointAfterMode;
@@ -225,12 +226,7 @@ public class MeasurementToolFragment extends Fragment {
 					@Override
 					public void snapToRoadOnCLick() {
 						if (!snapToRoadEnabled) {
-							previousToolBarTitle = toolBarController.getTitle();
-							toolBarController.setTitle(getString(R.string.snap_to_road));
-							mapActivity.refreshMap();
-							SnapToRoadBottomSheetDialogFragment fragment = new SnapToRoadBottomSheetDialogFragment();
-							fragment.setListener(createSnapToRoadListener());
-							fragment.show(mapActivity.getSupportFragmentManager(), SnapToRoadBottomSheetDialogFragment.TAG);
+							showSnapToRoadMenu();
 						} else {
 							disableSnapToRoadMode();
 						}
@@ -477,6 +473,10 @@ public class MeasurementToolFragment extends Fragment {
 			hidePointsListFragment();
 		}
 
+		if (snapToRoadEnabled) {
+			enableSnapToRoadMode();
+		}
+
 		if (newGpxLine != null && !gpxPointsAdded) {
 			LineType lineType = newGpxLine.getLineType();
 			if (lineType == LineType.ADD_ROUTE_POINTS) {
@@ -518,6 +518,18 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
+	private void showSnapToRoadMenu() {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			previousToolBarTitle = toolBarController.getTitle();
+			toolBarController.setTitle(getString(R.string.snap_to_road));
+			mapActivity.refreshMap();
+			SnapToRoadBottomSheetDialogFragment fragment = new SnapToRoadBottomSheetDialogFragment();
+			fragment.setListener(createSnapToRoadListener());
+			fragment.show(mapActivity.getSupportFragmentManager(), SnapToRoadBottomSheetDialogFragment.TAG);
+		}
+	}
+
 	private SelectedPointOptionOnClickListener createSelectedPointOptionOnClickListener() {
 		final MeasurementToolLayer measurementLayer = getMeasurementLayer();
 
@@ -586,19 +598,32 @@ public class MeasurementToolFragment extends Fragment {
 
 			@Override
 			public void onApplicationModeItemClick(ApplicationMode mode) {
+				snapToRoadAppMode = mode;
 				enableSnapToRoadMode();
 			}
 		};
 	}
 
 	private void enableSnapToRoadMode() {
-		toolBarController.setTopBarSwitchVisible(true);
-		toolBarController.setTopBarSwitchChecked(true);
-		snapToRoadEnabled = true;
-		mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_snap_to_road));
-		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
-			mapActivity.refreshMap();
+		if (snapToRoadAppMode != null) {
+			toolBarController.setTopBarSwitchVisible(true);
+			toolBarController.setTopBarSwitchChecked(true);
+			snapToRoadEnabled = true;
+			mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_snap_to_road));
+			MapActivity mapActivity = getMapActivity();
+			if (mapActivity != null) {
+				ImageButton snapToRoadBtn = (ImageButton) mapActivity.findViewById(R.id.snap_to_road_image_button);
+				snapToRoadBtn.setBackgroundResource(nightMode ? R.drawable.btn_circle_night : R.drawable.btn_circle);
+				snapToRoadBtn.setImageDrawable(getActiveIcon(snapToRoadAppMode.getSmallIconDark()));
+				snapToRoadBtn.setVisibility(View.VISIBLE);
+				snapToRoadBtn.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						showSnapToRoadMenu();
+					}
+				});
+				mapActivity.refreshMap();
+			}
 		}
 	}
 
@@ -609,6 +634,7 @@ public class MeasurementToolFragment extends Fragment {
 		mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_ruler));
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
+			mapActivity.findViewById(R.id.snap_to_road_image_button).setVisibility(View.GONE);
 			mapActivity.refreshMap();
 		}
 	}
@@ -1248,6 +1274,9 @@ public class MeasurementToolFragment extends Fragment {
 			if (pointsListOpened) {
 				hidePointsList();
 			}
+			if (snapToRoadEnabled) {
+				disableSnapToRoadMode();
+			}
 			if (newGpxLine != null) {
 				GPXFile gpx = newGpxLine.getGpxFile();
 				Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getTrackActivity());

From 232e6922f6998bc0127868cca2a666e9d65bb106 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Thu, 17 Aug 2017 11:35:47 +0300
Subject: [PATCH 127/174] Add snap to road progress bar

---
 .../layout-land/fragment_measurement_tool.xml | 428 +++++++++---------
 .../res/layout/fragment_measurement_tool.xml  |   9 +
 .../MeasurementToolFragment.java              |  13 +-
 3 files changed, 242 insertions(+), 208 deletions(-)

diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
index 18d1a984b8..3c000d4272 100644
--- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -14,242 +14,258 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:clickable="true"
+        android:orientation="vertical"
         tools:background="@drawable/bg_bottom_menu_dark">
 
-        <RelativeLayout
-            android:id="@+id/up_down_row"
-            android:layout_width="0dp"
+        <ProgressBar
+            android:id="@+id/snap_to_road_progress_bar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0.45"
-            android:background="?attr/selectableItemBackground"
-            android:paddingBottom="14dp"
-            android:paddingTop="14dp">
-
-            <ImageView
-                android:id="@+id/main_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_marginEnd="16dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginStart="16dp"
-                android:background="@null"
-                tools:src="@drawable/ic_action_ruler"/>
-
-            <ImageView
-                android:id="@+id/up_down_button"
-                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="16dp"
-                android:layout_marginStart="16dp"
-                android:background="@null"
-                tools:src="@drawable/ic_action_arrow_down"/>
-
-            <TextView
-                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/main_icon"
-                android:layout_toRightOf="@id/main_icon"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"
-                tools:text="724 m,"/>
-
-            <TextView
-                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/measurement_distance_text_view"
-                android:layout_toLeftOf="@id/up_down_button"
-                android:layout_toRightOf="@id/measurement_distance_text_view"
-                android:layout_toStartOf="@id/up_down_button"
-                android:textColor="?android:textColorSecondary"
-                android:textSize="@dimen/default_list_text_size"
-                tools:text="points: 3"/>
-
-            <TextView
-                android:id="@+id/move_point_text"
-                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/main_icon"
-                android:layout_toRightOf="@id/main_icon"
-                android:text="@string/move_point"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"
-                android:visibility="gone"/>
-
-            <TextView
-                android:id="@+id/add_point_after_text"
-                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/main_icon"
-                android:layout_toRightOf="@id/main_icon"
-                android:text="@string/add_point_after"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"
-                android:visibility="gone"/>
-
-            <TextView
-                android:id="@+id/add_point_before_text"
-                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/main_icon"
-                android:layout_toRightOf="@id/main_icon"
-                android:text="@string/add_point_before"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"
-                android:visibility="gone"/>
-        </RelativeLayout>
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="?attr/dashboard_divider"/>
+            android:minHeight="0dp"
+            android:visibility="gone"
+            tools:visibility="visible"/>
 
         <LinearLayout
-            android:id="@+id/measure_mode_controls"
-            android:layout_width="0dp"
-            android:layout_height="52dp"
-            android:layout_weight="0.55">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-            <FrameLayout
+            <RelativeLayout
+                android:id="@+id/up_down_row"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_height="wrap_content"
+                android:layout_weight="0.45"
+                android:background="?attr/selectableItemBackground"
+                android:paddingBottom="14dp"
+                android:paddingTop="14dp">
 
-                <net.osmand.plus.widgets.TextViewEx
-                    android:id="@+id/options_button"
+                <ImageView
+                    android:id="@+id/main_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_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp"
+                    android:background="@null"
+                    tools:src="@drawable/ic_action_ruler"/>
+
+                <ImageView
+                    android:id="@+id/up_down_button"
+                    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="16dp"
+                    android:layout_marginStart="16dp"
+                    android:background="@null"
+                    tools:src="@drawable/ic_action_arrow_down"/>
+
+                <TextView
+                    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/main_icon"
+                    android:layout_toRightOf="@id/main_icon"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"
+                    tools:text="724 m,"/>
+
+                <TextView
+                    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/measurement_distance_text_view"
+                    android:layout_toLeftOf="@id/up_down_button"
+                    android:layout_toRightOf="@id/measurement_distance_text_view"
+                    android:layout_toStartOf="@id/up_down_button"
+                    android:textColor="?android:textColorSecondary"
+                    android:textSize="@dimen/default_list_text_size"
+                    tools:text="points: 3"/>
+
+                <TextView
+                    android:id="@+id/move_point_text"
+                    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/main_icon"
+                    android:layout_toRightOf="@id/main_icon"
+                    android:text="@string/move_point"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"
+                    android:visibility="gone"/>
+
+                <TextView
+                    android:id="@+id/add_point_after_text"
+                    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/main_icon"
+                    android:layout_toRightOf="@id/main_icon"
+                    android:text="@string/add_point_after"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"
+                    android:visibility="gone"/>
+
+                <TextView
+                    android:id="@+id/add_point_before_text"
+                    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/main_icon"
+                    android:layout_toRightOf="@id/main_icon"
+                    android:text="@string/add_point_before"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"
+                    android:visibility="gone"/>
+            </RelativeLayout>
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:background="?attr/dashboard_divider"/>
+
+            <LinearLayout
+                android:id="@+id/measure_mode_controls"
+                android:layout_width="0dp"
+                android:layout_height="52dp"
+                android:layout_weight="0.55">
+
+                <FrameLayout
+                    android:layout_width="0dp"
                     android:layout_height="match_parent"
+                    android:layout_weight="1">
+
+                    <net.osmand.plus.widgets.TextViewEx
+                        android:id="@+id/options_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:background="?attr/selectableItemBackground"
+                        android:gravity="center_vertical"
+                        android:maxLines="1"
+                        android:paddingEnd="12dp"
+                        android:paddingLeft="16dp"
+                        android:paddingRight="12dp"
+                        android:paddingStart="16dp"
+                        android:text="@string/shared_string_options"
+                        android:textColor="?attr/color_dialog_buttons"
+                        osmand:textAllCapsCompat="true"
+                        osmand:typeface="@string/font_roboto_medium"/>
+                </FrameLayout>
+
+                <ImageButton
+                    android:id="@+id/undo_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:background="?attr/selectableItemBackground"
-                    android:gravity="center_vertical"
-                    android:maxLines="1"
+                    android:paddingBottom="14dp"
                     android:paddingEnd="12dp"
                     android:paddingLeft="16dp"
                     android:paddingRight="12dp"
                     android:paddingStart="16dp"
-                    android:text="@string/shared_string_options"
-                    android:textColor="?attr/color_dialog_buttons"
-                    osmand:textAllCapsCompat="true"
-                    osmand:typeface="@string/font_roboto_medium"/>
-            </FrameLayout>
+                    android:paddingTop="14dp"
+                    tools:src="@drawable/ic_action_undo_dark"/>
 
-            <ImageButton
-                android:id="@+id/undo_point_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
-                android:paddingBottom="14dp"
-                android:paddingEnd="12dp"
-                android:paddingLeft="16dp"
-                android:paddingRight="12dp"
-                android:paddingStart="16dp"
-                android:paddingTop="14dp"
-                tools:src="@drawable/ic_action_undo_dark"/>
-
-            <ImageButton
-                android:id="@+id/redo_point_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
-                android:paddingBottom="14dp"
-                android:paddingEnd="16dp"
-                android:paddingLeft="12dp"
-                android:paddingRight="16dp"
-                android:paddingStart="12dp"
-                android:paddingTop="14dp"
-                tools:src="@drawable/ic_action_redo_dark"/>
-
-            <FrameLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <Button
-                    android:id="@+id/add_point_button"
+                <ImageButton
+                    android:id="@+id/redo_point_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="end"
+                    android:background="?attr/selectableItemBackground"
+                    android:paddingBottom="14dp"
+                    android:paddingEnd="16dp"
+                    android:paddingLeft="12dp"
+                    android:paddingRight="16dp"
+                    android:paddingStart="12dp"
+                    android:paddingTop="14dp"
+                    tools:src="@drawable/ic_action_redo_dark"/>
+
+                <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1">
+
+                    <Button
+                        android:id="@+id/add_point_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end"
+                        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:maxLines="1"
+                        android:minHeight="36dp"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
+                        android:text="@string/shared_string_add"
+                        android:textColor="@color/color_white"/>
+                </FrameLayout>
+
+            </LinearLayout>
+
+            <RelativeLayout
+                android:id="@+id/selected_point_controls"
+                android:layout_width="0dp"
+                android:layout_height="52dp"
+                android:layout_weight="0.6"
+                android:visibility="gone">
+
+                <Button
+                    android:id="@+id/apply_point_button"
+                    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:maxLines="1"
                     android:minHeight="36dp"
                     android:paddingLeft="8dp"
                     android:paddingRight="8dp"
-                    android:text="@string/shared_string_add"
+                    android:text="@string/shared_string_apply"
                     android:textColor="@color/color_white"/>
-            </FrameLayout>
+
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/cancel_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="?attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:paddingEnd="12dp"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="12dp"
+                    android:paddingStart="16dp"
+                    android:text="@string/shared_string_cancel"
+                    android:textColor="?attr/color_dialog_buttons"
+                    osmand:textAllCapsCompat="true"
+                    osmand:typeface="@string/font_roboto_medium"/>
+            </RelativeLayout>
 
         </LinearLayout>
 
-        <RelativeLayout
-            android:id="@+id/selected_point_controls"
-            android:layout_width="0dp"
-            android:layout_height="52dp"
-            android:layout_weight="0.6"
-            android:visibility="gone">
-
-            <Button
-                android:id="@+id/apply_point_button"
-                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:minHeight="36dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:text="@string/shared_string_apply"
-                android:textColor="@color/color_white"/>
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/cancel_point_button"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center_vertical"
-                android:paddingEnd="12dp"
-                android:paddingLeft="16dp"
-                android:paddingRight="12dp"
-                android:paddingStart="16dp"
-                android:text="@string/shared_string_cancel"
-                android:textColor="?attr/color_dialog_buttons"
-                osmand:textAllCapsCompat="true"
-                osmand:typeface="@string/font_roboto_medium"/>
-        </RelativeLayout>
-
     </LinearLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 469d957f9e..fb49b84a40 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -17,6 +17,15 @@
         android:clickable="true"
         android:orientation="vertical">
 
+        <ProgressBar
+            android:id="@+id/snap_to_road_progress_bar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="0dp"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+
         <RelativeLayout
             android:id="@+id/up_down_row"
             android:layout_width="match_parent"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index e53aaf1cb1..f0ad3ea232 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -26,6 +26,7 @@ import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -91,6 +92,7 @@ public class MeasurementToolFragment extends Fragment {
 	private Drawable downIcon;
 	private View pointsListContainer;
 	private View upDownRow;
+	private View mainView;
 	private ImageView upDownBtn;
 	private ImageView undoBtn;
 	private ImageView redoBtn;
@@ -150,7 +152,7 @@ public class MeasurementToolFragment extends Fragment {
 
 		View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_measurement_tool, null);
 
-		final View mainView = view.findViewById(R.id.main_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);
 		pointsListContainer = view.findViewById(R.id.points_list_container);
 		if (portrait && pointsListContainer != null) {
@@ -615,13 +617,19 @@ public class MeasurementToolFragment extends Fragment {
 				ImageButton snapToRoadBtn = (ImageButton) mapActivity.findViewById(R.id.snap_to_road_image_button);
 				snapToRoadBtn.setBackgroundResource(nightMode ? R.drawable.btn_circle_night : R.drawable.btn_circle);
 				snapToRoadBtn.setImageDrawable(getActiveIcon(snapToRoadAppMode.getSmallIconDark()));
-				snapToRoadBtn.setVisibility(View.VISIBLE);
 				snapToRoadBtn.setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View view) {
 						showSnapToRoadMenu();
 					}
 				});
+				snapToRoadBtn.setVisibility(View.VISIBLE);
+
+				ProgressBar snapToRoadProgressBar = (ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar);
+				snapToRoadProgressBar.setMinimumHeight(0);
+				snapToRoadProgressBar.setProgress(45);
+				snapToRoadProgressBar.setVisibility(View.VISIBLE);
+
 				mapActivity.refreshMap();
 			}
 		}
@@ -635,6 +643,7 @@ public class MeasurementToolFragment extends Fragment {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
 			mapActivity.findViewById(R.id.snap_to_road_image_button).setVisibility(View.GONE);
+			mainView.findViewById(R.id.snap_to_road_progress_bar).setVisibility(View.GONE);
 			mapActivity.refreshMap();
 		}
 	}

From 39cb294319f0a871a7192cfe584a9060d701f135 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Thu, 17 Aug 2017 12:11:50 +0300
Subject: [PATCH 128/174] Fix fragments after screen rotating; rename some
 methods and interfaces

---
 .../MeasurementToolFragment.java              | 154 ++++++++++--------
 .../OptionsBottomSheetDialogFragment.java     |   6 +-
 ...lectedPointBottomSheetDialogFragment.java} |  10 +-
 .../SnapToRoadBottomSheetDialogFragment.java  |   6 +-
 4 files changed, 101 insertions(+), 75 deletions(-)
 rename OsmAnd/src/net/osmand/plus/measurementtool/{SelectedPointMenuBottomSheetDialogFragment.java => SelectedPointBottomSheetDialogFragment.java} (95%)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index f0ad3ea232..c34dbc8958 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -48,8 +48,9 @@ import net.osmand.plus.activities.TrackActivity.NewGpxLine;
 import net.osmand.plus.activities.TrackActivity.NewGpxLine.LineType;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper;
-import net.osmand.plus.measurementtool.SelectedPointMenuBottomSheetDialogFragment.SelectedPointOptionOnClickListener;
-import net.osmand.plus.measurementtool.SnapToRoadBottomSheetDialogFragment.SnapToRoadListener;
+import net.osmand.plus.measurementtool.OptionsBottomSheetDialogFragment.OptionsFragmentListener;
+import net.osmand.plus.measurementtool.SelectedPointBottomSheetDialogFragment.SelectedPointFragmentListener;
+import net.osmand.plus.measurementtool.SnapToRoadBottomSheetDialogFragment.SnapToRoadFragmentListener;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolItemTouchHelperCallback;
 import net.osmand.plus.measurementtool.command.AddPointCommand;
@@ -132,12 +133,23 @@ public class MeasurementToolFragment extends Fragment {
 			measurementLayer.setSelectedPointPos(selectedPointPos);
 			measurementLayer.setSelectedCachedPoint(selectedCachedPoint);
 		}
-		Fragment fragment = mapActivity.getSupportFragmentManager().findFragmentByTag(SelectedPointMenuBottomSheetDialogFragment.TAG);
-		if (fragment != null) {
-			SelectedPointMenuBottomSheetDialogFragment selectedPointMenuBottomSheetDialogFragment = (SelectedPointMenuBottomSheetDialogFragment) fragment;
-			selectedPointMenuBottomSheetDialogFragment.setLineType(newGpxLine != null ? newGpxLine.getLineType() : null);
-			selectedPointMenuBottomSheetDialogFragment.setSelectedPointOptionOnClickListener(createSelectedPointOptionOnClickListener());
+
+		FragmentManager fragmentManager = mapActivity.getSupportFragmentManager();
+		Fragment selectedPointFragment = fragmentManager.findFragmentByTag(SelectedPointBottomSheetDialogFragment.TAG);
+		if (selectedPointFragment != null) {
+			SelectedPointBottomSheetDialogFragment fragment = (SelectedPointBottomSheetDialogFragment) selectedPointFragment;
+			fragment.setLineType(newGpxLine != null ? newGpxLine.getLineType() : null);
+			fragment.setListener(createSelectedPointFragmentListener());
 		}
+		Fragment optionsFragment = fragmentManager.findFragmentByTag(OptionsBottomSheetDialogFragment.TAG);
+		if (optionsFragment != null) {
+			((OptionsBottomSheetDialogFragment) optionsFragment).setListener(createOptionsFragmentListener());
+		}
+		Fragment snapToRoadFragment = fragmentManager.findFragmentByTag(SnapToRoadBottomSheetDialogFragment.TAG);
+		if (snapToRoadFragment != null) {
+			((SnapToRoadBottomSheetDialogFragment) snapToRoadFragment).setListener(createSnapToRoadFragmentListener());
+		}
+
 		commandManager.resetMeasurementLayer(measurementLayer);
 		iconsCache = mapActivity.getMyApplication().getIconsCache();
 		nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
@@ -224,54 +236,7 @@ public class MeasurementToolFragment extends Fragment {
 			public void onClick(View view) {
 				OptionsBottomSheetDialogFragment fragment = new OptionsBottomSheetDialogFragment();
 				fragment.setSnapToRoadEnabled(snapToRoadEnabled);
-				fragment.setOptionsOnClickListener(new OptionsBottomSheetDialogFragment.OptionsOnClickListener() {
-					@Override
-					public void snapToRoadOnCLick() {
-						if (!snapToRoadEnabled) {
-							showSnapToRoadMenu();
-						} else {
-							disableSnapToRoadMode();
-						}
-					}
-
-					@Override
-					public void addToGpxOnClick() {
-						if (measurementLayer.getPointsCount() > 0) {
-							addToGpx(mapActivity);
-						} else {
-							Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
-						}
-					}
-
-					@Override
-					public void saveAsNewTrackOnClick() {
-						if (measurementLayer.getPointsCount() > 0) {
-							saveAsGpxOnClick(mapActivity);
-						} else {
-							Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
-						}
-					}
-
-					@Override
-					public void addToTheTrackOnClick() {
-						if (measurementLayer.getPointsCount() > 0) {
-//										showAddSegmentDialog(mapActivity);
-						} else {
-							Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
-						}
-					}
-
-					@Override
-					public void clearAllOnClick() {
-						commandManager.execute(new ClearPointsCommand(measurementLayer));
-						if (pointsListOpened) {
-							hidePointsList();
-						}
-						disable(redoBtn, upDownBtn);
-						updateText();
-						saved = false;
-					}
-				});
+				fragment.setListener(createOptionsFragmentListener());
 				fragment.setAddLineMode(newGpxLine != null);
 				fragment.show(mapActivity.getSupportFragmentManager(), OptionsBottomSheetDialogFragment.TAG);
 			}
@@ -527,15 +492,77 @@ public class MeasurementToolFragment extends Fragment {
 			toolBarController.setTitle(getString(R.string.snap_to_road));
 			mapActivity.refreshMap();
 			SnapToRoadBottomSheetDialogFragment fragment = new SnapToRoadBottomSheetDialogFragment();
-			fragment.setListener(createSnapToRoadListener());
+			fragment.setListener(createSnapToRoadFragmentListener());
 			fragment.show(mapActivity.getSupportFragmentManager(), SnapToRoadBottomSheetDialogFragment.TAG);
 		}
 	}
 
-	private SelectedPointOptionOnClickListener createSelectedPointOptionOnClickListener() {
+	private OptionsFragmentListener createOptionsFragmentListener() {
+
+		final MapActivity mapActivity = getMapActivity();
 		final MeasurementToolLayer measurementLayer = getMeasurementLayer();
 
-		return new SelectedPointOptionOnClickListener() {
+		return new OptionsFragmentListener() {
+			@Override
+			public void snapToRoadOnCLick() {
+				if (!snapToRoadEnabled) {
+					showSnapToRoadMenu();
+				} else {
+					disableSnapToRoadMode();
+				}
+			}
+
+			@Override
+			public void addToGpxOnClick() {
+				if (mapActivity != null && measurementLayer != null) {
+					if (measurementLayer.getPointsCount() > 0) {
+						addToGpx(mapActivity);
+					} else {
+						Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
+					}
+				}
+			}
+
+			@Override
+			public void saveAsNewTrackOnClick() {
+				if (mapActivity != null && measurementLayer != null) {
+					if (measurementLayer.getPointsCount() > 0) {
+						saveAsGpxOnClick(mapActivity);
+					} else {
+						Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
+					}
+				}
+			}
+
+			@Override
+			public void addToTheTrackOnClick() {
+				if (mapActivity != null && measurementLayer != null) {
+					if (measurementLayer.getPointsCount() > 0) {
+//										showAddSegmentDialog(mapActivity);
+					} else {
+						Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
+					}
+				}
+			}
+
+			@Override
+			public void clearAllOnClick() {
+				commandManager.execute(new ClearPointsCommand(measurementLayer));
+				if (pointsListOpened) {
+					hidePointsList();
+				}
+				disable(redoBtn, upDownBtn);
+				updateText();
+				saved = false;
+			}
+		};
+	}
+
+	private SelectedPointFragmentListener createSelectedPointFragmentListener() {
+
+		final MeasurementToolLayer measurementLayer = getMeasurementLayer();
+
+		return new SelectedPointFragmentListener() {
 			@Override
 			public void moveOnClick() {
 				if (measurementLayer != null) {
@@ -584,9 +611,8 @@ public class MeasurementToolFragment extends Fragment {
 		};
 	}
 
-	private SnapToRoadListener createSnapToRoadListener() {
-		return new SnapToRoadListener() {
-
+	private SnapToRoadFragmentListener createSnapToRoadFragmentListener() {
+		return new SnapToRoadFragmentListener() {
 			@Override
 			public void onDestroyView(boolean snapToRoadEnabled) {
 				if (!snapToRoadEnabled) {
@@ -673,10 +699,10 @@ public class MeasurementToolFragment extends Fragment {
 	}
 
 	private void openSelectedPointMenu(MapActivity mapActivity) {
-		SelectedPointMenuBottomSheetDialogFragment fragment = new SelectedPointMenuBottomSheetDialogFragment();
+		SelectedPointBottomSheetDialogFragment fragment = new SelectedPointBottomSheetDialogFragment();
 		fragment.setLineType(newGpxLine != null ? newGpxLine.getLineType() : null);
-		fragment.setSelectedPointOptionOnClickListener(createSelectedPointOptionOnClickListener());
-		fragment.show(mapActivity.getSupportFragmentManager(), SelectedPointMenuBottomSheetDialogFragment.TAG);
+		fragment.setListener(createSelectedPointFragmentListener());
+		fragment.show(mapActivity.getSupportFragmentManager(), SelectedPointBottomSheetDialogFragment.TAG);
 	}
 
 	private AlertDialog showAddSegmentDialog(final MapActivity mapActivity) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
index 2fad9a7e8e..63b68e4191 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@@ -25,13 +25,13 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 
 	public final static String TAG = "OptionsBottomSheetDialogFragment";
 
-	private OptionsOnClickListener listener;
+	private OptionsFragmentListener listener;
 	private boolean addLineMode;
 	private boolean portrait;
 	private boolean nightMode;
 	private boolean snapToRoadEnabled;
 
-	public void setOptionsOnClickListener(OptionsOnClickListener listener) {
+	public void setListener(OptionsFragmentListener listener) {
 		this.listener = listener;
 	}
 
@@ -191,7 +191,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 		return getIcon(id, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance);
 	}
 
-	interface OptionsOnClickListener {
+	interface OptionsFragmentListener {
 
 		void snapToRoadOnCLick();
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java
similarity index 95%
rename from OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
rename to OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java
index 4d6a7692dc..670e5a4f72 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java
@@ -30,16 +30,16 @@ import net.osmand.util.MapUtils;
 
 import java.util.List;
 
-public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialogFragment {
+public class SelectedPointBottomSheetDialogFragment extends BottomSheetDialogFragment {
 
-	public final static String TAG = "SelectedPointMenuBottomSheetDialogFragment";
+	public final static String TAG = "SelectedPointBottomSheetDialogFragment";
 
-	private SelectedPointOptionOnClickListener listener;
+	private SelectedPointFragmentListener listener;
 	private boolean nightMode;
 	private boolean portrait;
 	private TrackActivity.NewGpxLine.LineType lineType;
 
-	public void setSelectedPointOptionOnClickListener(SelectedPointOptionOnClickListener listener) {
+	public void setListener(SelectedPointFragmentListener listener) {
 		this.listener = listener;
 	}
 
@@ -212,7 +212,7 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
 		super.onCancel(dialog);
 	}
 
-	interface SelectedPointOptionOnClickListener {
+	interface SelectedPointFragmentListener {
 
 		void moveOnClick();
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index 8366249b1a..cb0621ef2a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -30,12 +30,12 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 
 	public static final String TAG = "SnapToRoadBottomSheetDialogFragment";
 
-	private SnapToRoadListener listener;
+	private SnapToRoadFragmentListener listener;
 	private boolean nightMode;
 	private boolean portrait;
 	private boolean snapToRoadEnabled;
 
-	public void setListener(SnapToRoadListener listener) {
+	public void setListener(SnapToRoadFragmentListener listener) {
 		this.listener = listener;
 	}
 
@@ -146,7 +146,7 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 		return getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.on_map_icon_color);
 	}
 
-	interface SnapToRoadListener {
+	interface SnapToRoadFragmentListener {
 
 		void onDestroyView(boolean snapToRoadEnabled);
 

From 971268480d4fe1886df1da5d83b862b1e0add40d Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 17 Aug 2017 12:25:27 +0300
Subject: [PATCH 129/174] Add save as new track menu

---
 ..._save_as_new_track_bottom_sheet_dialog.xml | 123 +++++++++++++
 OsmAnd/res/values/strings.xml                 |   2 +
 .../MeasurementToolFragment.java              | 166 +++++++++++-------
 ...veAsNewTrackBottomSheetDialogFragment.java | 138 +++++++++++++++
 .../SnapToRoadBottomSheetDialogFragment.java  |   3 +
 5 files changed, 367 insertions(+), 65 deletions(-)
 create mode 100644 OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java

diff --git a/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
new file mode 100644
index 0000000000..abdc10a3af
--- /dev/null
+++ b/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="?attr/bg_color"
+              android:orientation="vertical">
+
+    <ScrollView
+        android:id="@+id/save_as_new_track_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingBottom="8dp">
+
+            <TextView
+                android:id="@+id/save_as_new_track_title"
+                android:layout_width="match_parent"
+                android:layout_height="52dp"
+                android:gravity="center_vertical"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp"
+                android:text="@string/shared_string_save_as_gpx"
+                android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp"
+                android:text="@string/measurement_tool_snap_to_road_descr"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="@dimen/default_desc_text_size"/>
+
+            <RelativeLayout
+                android:id="@+id/save_as_route_point_row"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?attr/selectableItemBackground"
+                android:minHeight="48dp"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp">
+
+                <ImageView
+                    android:id="@+id/route_point_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginRight="24dp"
+                    tools:src="@drawable/ic_action_route_points"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@id/route_point_icon"
+                    android:layout_toRightOf="@id/route_point_icon"
+                    android:maxLines="1"
+                    android:text="@string/save_as_route_point"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/save_as_line_row"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?attr/selectableItemBackground"
+                android:minHeight="48dp"
+                android:paddingEnd="16dp"
+                android:paddingStart="16dp">
+
+                <ImageView
+                    android:id="@+id/line_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginRight="24dp"
+                    tools:src="@drawable/ic_action_split_interval"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@id/line_icon"
+                    android:layout_toRightOf="@id/line_icon"
+                    android:maxLines="1"
+                    android:text="@string/save_as_line"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+            </RelativeLayout>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?attr/dashboard_divider"/>
+
+    <FrameLayout
+        android:id="@+id/cancel_row"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/measure_distance_bottom_sheet_cancel_button_height"
+        android:background="?attr/selectableItemBackground">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/shared_string_cancel"
+            android:textAllCaps="true"
+            android:textColor="?attr/color_dialog_buttons"
+            android:textSize="14sp"
+            android:textStyle="bold"/>
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 0de6bb0429..6506c8a6ec 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="save_as_route_point">Save as Route Point</string>
+    <string name="save_as_line">Save as line</string>
     <string name="route_point">Route point</string>
     <string name="edit_line">Edit Line</string>
     <string name="add_point_before">Add point before</string>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index c34dbc8958..3479de6c2c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -37,6 +37,7 @@ import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.GPXUtilities.Route;
+import net.osmand.plus.GPXUtilities.Track;
 import net.osmand.plus.GPXUtilities.TrkSegment;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
@@ -48,6 +49,7 @@ import net.osmand.plus.activities.TrackActivity.NewGpxLine;
 import net.osmand.plus.activities.TrackActivity.NewGpxLine.LineType;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper;
+import net.osmand.plus.measurementtool.SaveAsNewTrackBottomSheetDialogFragment.SaveAsNewTrackFragmentListener;
 import net.osmand.plus.measurementtool.OptionsBottomSheetDialogFragment.OptionsFragmentListener;
 import net.osmand.plus.measurementtool.SelectedPointBottomSheetDialogFragment.SelectedPointFragmentListener;
 import net.osmand.plus.measurementtool.SnapToRoadBottomSheetDialogFragment.SnapToRoadFragmentListener;
@@ -119,6 +121,8 @@ public class MeasurementToolFragment extends Fragment {
 
 	private int positionToAddPoint = -1;
 
+	private enum SaveType { ROUTE_POINT, LINE };
+
 	public void setNewGpxLine(NewGpxLine newGpxLine) {
 		this.newGpxLine = newGpxLine;
 	}
@@ -149,6 +153,11 @@ public class MeasurementToolFragment extends Fragment {
 		if (snapToRoadFragment != null) {
 			((SnapToRoadBottomSheetDialogFragment) snapToRoadFragment).setListener(createSnapToRoadFragmentListener());
 		}
+		Fragment saveAsNewTrackFragment = mapActivity.getSupportFragmentManager().findFragmentByTag(SaveAsNewTrackBottomSheetDialogFragment.TAG);
+		if (saveAsNewTrackFragment != null) {
+			SaveAsNewTrackBottomSheetDialogFragment saveAsNewTrackBottomSheetDialogFragment = (SaveAsNewTrackBottomSheetDialogFragment) saveAsNewTrackFragment;
+			saveAsNewTrackBottomSheetDialogFragment.setListener(createSaveAsNewTrackFragmentListener());
+		}
 
 		commandManager.resetMeasurementLayer(measurementLayer);
 		iconsCache = mapActivity.getMyApplication().getIconsCache();
@@ -527,7 +536,7 @@ public class MeasurementToolFragment extends Fragment {
 			public void saveAsNewTrackOnClick() {
 				if (mapActivity != null && measurementLayer != null) {
 					if (measurementLayer.getPointsCount() > 0) {
-						saveAsGpxOnClick(mapActivity);
+						openSaveAsNewTrackMenu(mapActivity);
 					} else {
 						Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
 					}
@@ -705,6 +714,26 @@ public class MeasurementToolFragment extends Fragment {
 		fragment.show(mapActivity.getSupportFragmentManager(), SelectedPointBottomSheetDialogFragment.TAG);
 	}
 
+	private void openSaveAsNewTrackMenu(MapActivity mapActivity) {
+		SaveAsNewTrackBottomSheetDialogFragment fragment = new SaveAsNewTrackBottomSheetDialogFragment();
+		fragment.setListener(createSaveAsNewTrackFragmentListener());
+		fragment.show(mapActivity.getSupportFragmentManager(), SaveAsNewTrackBottomSheetDialogFragment.TAG);
+	}
+
+	private SaveAsNewTrackFragmentListener createSaveAsNewTrackFragmentListener() {
+		return new SaveAsNewTrackFragmentListener() {
+			@Override
+			public void saveAsRoutePointOnClick() {
+				saveAsGpx(SaveType.ROUTE_POINT);
+			}
+
+			@Override
+			public void saveAsLineOnClick() {
+				saveAsGpx(SaveType.LINE);
+			}
+		};
+	}
+
 	private AlertDialog showAddSegmentDialog(final MapActivity mapActivity) {
 		CallbackWithObject<GPXFile[]> callbackWithObject = new CallbackWithObject<GPXFile[]>() {
 			@Override
@@ -984,81 +1013,84 @@ public class MeasurementToolFragment extends Fragment {
 		saveExistingGpx(gpx, showOnMap, lineType);
 	}
 
-	private void saveAsGpxOnClick(MapActivity mapActivity) {
-		final File dir = mapActivity.getMyApplication().getAppPath(IndexConstants.GPX_INDEX_DIR);
-		final LayoutInflater inflater = mapActivity.getLayoutInflater();
-		final View view = inflater.inflate(R.layout.save_gpx_dialog, null);
-		final EditText nameEt = (EditText) view.findViewById(R.id.gpx_name_et);
-		final TextView fileExistsTv = (TextView) view.findViewById(R.id.file_exists_text_view);
-		final SwitchCompat showOnMapToggle = (SwitchCompat) view.findViewById(R.id.toggle_show_on_map);
-		showOnMapToggle.setChecked(true);
-
-		final String suggestedName = new SimpleDateFormat("yyyy-M-dd_HH-mm_EEE", Locale.US).format(new Date());
-		String displayedName = suggestedName;
-		File fout = new File(dir, suggestedName + GPX_SUFFIX);
-		int ind = 1;
-		while (fout.exists()) {
-			displayedName = suggestedName + "_" + (++ind);
-			fout = new File(dir, displayedName + GPX_SUFFIX);
-		}
-		nameEt.setText(displayedName);
-		nameEt.setSelection(displayedName.length());
-
-		final boolean[] textChanged = new boolean[1];
-		nameEt.addTextChangedListener(new TextWatcher() {
-			@Override
-			public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+	private void saveAsGpx(final SaveType saveType) {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			final File dir = mapActivity.getMyApplication().getAppPath(IndexConstants.GPX_INDEX_DIR);
+			final LayoutInflater inflater = mapActivity.getLayoutInflater();
+			final View view = inflater.inflate(R.layout.save_gpx_dialog, null);
+			final EditText nameEt = (EditText) view.findViewById(R.id.gpx_name_et);
+			final TextView fileExistsTv = (TextView) view.findViewById(R.id.file_exists_text_view);
+			final SwitchCompat showOnMapToggle = (SwitchCompat) view.findViewById(R.id.toggle_show_on_map);
+			showOnMapToggle.setChecked(true);
 
+			final String suggestedName = new SimpleDateFormat("yyyy-M-dd_HH-mm_EEE", Locale.US).format(new Date());
+			String displayedName = suggestedName;
+			File fout = new File(dir, suggestedName + GPX_SUFFIX);
+			int ind = 1;
+			while (fout.exists()) {
+				displayedName = suggestedName + "_" + (++ind);
+				fout = new File(dir, displayedName + GPX_SUFFIX);
 			}
+			nameEt.setText(displayedName);
+			nameEt.setSelection(displayedName.length());
 
-			@Override
-			public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+			final boolean[] textChanged = new boolean[1];
+			nameEt.addTextChangedListener(new TextWatcher() {
+				@Override
+				public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
 
-			}
-
-			@Override
-			public void afterTextChanged(Editable editable) {
-				if (new File(dir, editable.toString() + GPX_SUFFIX).exists()) {
-					fileExistsTv.setVisibility(View.VISIBLE);
-				} else {
-					fileExistsTv.setVisibility(View.INVISIBLE);
 				}
-				textChanged[0] = true;
-			}
-		});
 
-		new AlertDialog.Builder(mapActivity)
-				.setTitle(R.string.enter_gpx_name)
-				.setView(view)
-				.setPositiveButton(R.string.shared_string_save, new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						final String name = nameEt.getText().toString();
-						String fileName = name + GPX_SUFFIX;
-						if (textChanged[0]) {
-							File fout = new File(dir, fileName);
-							int ind = 1;
-							while (fout.exists()) {
-								fileName = name + "_" + (++ind) + GPX_SUFFIX;
-								fout = new File(dir, fileName);
-							}
-						}
-						saveNewGpx(dir, fileName, showOnMapToggle.isChecked());
+				@Override
+				public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+				}
+
+				@Override
+				public void afterTextChanged(Editable editable) {
+					if (new File(dir, editable.toString() + GPX_SUFFIX).exists()) {
+						fileExistsTv.setVisibility(View.VISIBLE);
+					} else {
+						fileExistsTv.setVisibility(View.INVISIBLE);
 					}
-				})
-				.setNegativeButton(R.string.shared_string_cancel, null)
-				.show();
+					textChanged[0] = true;
+				}
+			});
+
+			new AlertDialog.Builder(mapActivity)
+					.setTitle(R.string.enter_gpx_name)
+					.setView(view)
+					.setPositiveButton(R.string.shared_string_save, new DialogInterface.OnClickListener() {
+						@Override
+						public void onClick(DialogInterface dialog, int which) {
+							final String name = nameEt.getText().toString();
+							String fileName = name + GPX_SUFFIX;
+							if (textChanged[0]) {
+								File fout = new File(dir, fileName);
+								int ind = 1;
+								while (fout.exists()) {
+									fileName = name + "_" + (++ind) + GPX_SUFFIX;
+									fout = new File(dir, fileName);
+								}
+							}
+							saveNewGpx(dir, fileName, showOnMapToggle.isChecked(), saveType);
+						}
+					})
+					.setNegativeButton(R.string.shared_string_cancel, null)
+					.show();
+		}
 	}
 
-	private void saveNewGpx(File dir, String fileName, boolean checked) {
-		saveGpx(dir, fileName, checked, null, false, null);
+	private void saveNewGpx(File dir, String fileName, boolean checked, SaveType saveType) {
+		saveGpx(dir, fileName, checked, null, false, null, saveType);
 	}
 
 	private void saveExistingGpx(GPXFile gpx, boolean showOnMap, LineType lineType) {
-		saveGpx(null, null, showOnMap, gpx, true, lineType);
+		saveGpx(null, null, showOnMap, gpx, true, lineType, null);
 	}
 
-	private void saveGpx(final File dir, final String fileName, final boolean showOnMap, final GPXFile gpx, final boolean openTrackActivity, final LineType lineType) {
+	private void saveGpx(final File dir, final String fileName, final boolean showOnMap, final GPXFile gpx, final boolean openTrackActivity, final LineType lineType, final SaveType saveType) {
 		new AsyncTask<Void, Void, String>() {
 
 			private ProgressDialog progressDialog;
@@ -1083,9 +1115,13 @@ public class MeasurementToolFragment extends Fragment {
 					GPXFile gpx = new GPXFile();
 					if (measurementLayer != null) {
 						List<WptPt> points = measurementLayer.getMeasurementPoints();
-						if (points.size() == 1) {
-							gpx.points.add(points.get(0));
-						} else if (points.size() > 1) {
+						if (saveType == SaveType.LINE) {
+							TrkSegment segment = new TrkSegment();
+							segment.points.addAll(points);
+							Track track = new Track();
+							track.segments.add(segment);
+							gpx.tracks.add(track);
+						} else if (saveType == SaveType.ROUTE_POINT) {
 							Route rt = new Route();
 							gpx.routes.add(rt);
 							rt.points.addAll(points);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java
new file mode 100644
index 0000000000..7280c37eec
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java
@@ -0,0 +1,138 @@
+package net.osmand.plus.measurementtool;
+
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import net.osmand.AndroidUtils;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.base.BottomSheetDialogFragment;
+import net.osmand.plus.helpers.AndroidUiHelper;
+
+public class SaveAsNewTrackBottomSheetDialogFragment extends BottomSheetDialogFragment {
+
+	public final static String TAG = "SaveAsNewTrackBottomSheetDialogFragment";
+
+	private SaveAsNewTrackFragmentListener listener;
+	private boolean nightMode;
+	private boolean portrait;
+
+	public void setListener(SaveAsNewTrackFragmentListener listener) {
+		this.listener = listener;
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
+		final OsmandSettings settings = getMyApplication().getSettings();
+		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
+
+		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_save_as_new_track_bottom_sheet_dialog, container);
+		if (portrait) {
+			AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
+		}
+
+		if (nightMode) {
+			((TextView) mainView.findViewById(R.id.save_as_new_track_title)).setTextColor(getResources().getColor(R.color.ctx_menu_info_text_dark));
+		}
+
+		((ImageView) mainView.findViewById(R.id.route_point_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_route_points));
+		((ImageView) mainView.findViewById(R.id.line_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_split_interval));
+
+		mainView.findViewById(R.id.save_as_line_row).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (listener != null) {
+					listener.saveAsLineOnClick();
+				}
+				dismiss();
+			}
+		});
+
+		mainView.findViewById(R.id.save_as_route_point_row).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (listener != null) {
+					listener.saveAsRoutePointOnClick();
+				}
+				dismiss();
+			}
+		});
+
+		mainView.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				dismiss();
+			}
+		});
+
+		final int screenHeight = AndroidUtils.getScreenHeight(getActivity());
+		final int statusBarHeight = AndroidUtils.getStatusBarHeight(getActivity());
+		final int navBarHeight = AndroidUtils.getNavBarHeight(getActivity());
+
+		mainView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+			@Override
+			public void onGlobalLayout() {
+				final View scrollView = mainView.findViewById(R.id.save_as_new_track_scroll_view);
+				int scrollViewHeight = scrollView.getHeight();
+				int dividerHeight = AndroidUtils.dpToPx(getContext(), 1);
+				int cancelButtonHeight = getContext().getResources().getDimensionPixelSize(R.dimen.measure_distance_bottom_sheet_cancel_button_height);
+				int spaceForScrollView = screenHeight - statusBarHeight - navBarHeight - dividerHeight - cancelButtonHeight;
+				if (scrollViewHeight > spaceForScrollView) {
+					scrollView.getLayoutParams().height = spaceForScrollView;
+					scrollView.requestLayout();
+				}
+
+				if (!portrait) {
+					if (screenHeight - statusBarHeight - mainView.getHeight()
+							>= AndroidUtils.dpToPx(getActivity(), 8)) {
+						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
+								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
+					} else {
+						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
+								R.drawable.bg_bottom_sheet_sides_landscape_light, R.drawable.bg_bottom_sheet_sides_landscape_dark);
+					}
+				}
+
+				ViewTreeObserver obs = mainView.getViewTreeObserver();
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+					obs.removeOnGlobalLayoutListener(this);
+				} else {
+					obs.removeGlobalOnLayoutListener(this);
+				}
+			}
+		});
+
+		return mainView;
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		if (!portrait) {
+			final Window window = getDialog().getWindow();
+			WindowManager.LayoutParams params = window.getAttributes();
+			params.width = getActivity().getResources().getDimensionPixelSize(R.dimen.landscape_bottom_sheet_dialog_fragment_width);
+			window.setAttributes(params);
+		}
+	}
+
+	interface SaveAsNewTrackFragmentListener {
+
+		void saveAsRoutePointOnClick();
+
+		void saveAsLineOnClick();
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index cb0621ef2a..f1adb4ac87 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -48,6 +48,9 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_snap_to_road_bottom_sheet_dialog, container);
+		if (portrait) {
+			AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
+		}
 
 		mainView.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {
 			@Override

From 5d6deb426caabcf2a41a6f5b1f008fd2046f6816 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Thu, 17 Aug 2017 12:54:34 +0300
Subject: [PATCH 130/174] Refactor code

---
 .../MeasurementToolFragment.java              | 332 ++++++++++--------
 1 file changed, 178 insertions(+), 154 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 3479de6c2c..c1f637df41 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -49,11 +49,12 @@ import net.osmand.plus.activities.TrackActivity.NewGpxLine;
 import net.osmand.plus.activities.TrackActivity.NewGpxLine.LineType;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper;
-import net.osmand.plus.measurementtool.SaveAsNewTrackBottomSheetDialogFragment.SaveAsNewTrackFragmentListener;
 import net.osmand.plus.measurementtool.OptionsBottomSheetDialogFragment.OptionsFragmentListener;
+import net.osmand.plus.measurementtool.SaveAsNewTrackBottomSheetDialogFragment.SaveAsNewTrackFragmentListener;
 import net.osmand.plus.measurementtool.SelectedPointBottomSheetDialogFragment.SelectedPointFragmentListener;
 import net.osmand.plus.measurementtool.SnapToRoadBottomSheetDialogFragment.SnapToRoadFragmentListener;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter;
+import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter.MeasurementAdapterListener;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolItemTouchHelperCallback;
 import net.osmand.plus.measurementtool.command.AddPointCommand;
 import net.osmand.plus.measurementtool.command.ClearPointsCommand;
@@ -121,7 +122,10 @@ public class MeasurementToolFragment extends Fragment {
 
 	private int positionToAddPoint = -1;
 
-	private enum SaveType { ROUTE_POINT, LINE };
+	private enum SaveType {
+		ROUTE_POINT,
+		LINE
+	}
 
 	public void setNewGpxLine(NewGpxLine newGpxLine) {
 		this.newGpxLine = newGpxLine;
@@ -132,6 +136,7 @@ public class MeasurementToolFragment extends Fragment {
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		final MapActivity mapActivity = (MapActivity) getActivity();
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
+
 		measurementLayer.setMeasurementPoints(measurementPoints);
 		if (selectedPointPos != -1 && selectedCachedPoint != null) {
 			measurementLayer.setSelectedPointPos(selectedPointPos);
@@ -155,8 +160,7 @@ public class MeasurementToolFragment extends Fragment {
 		}
 		Fragment saveAsNewTrackFragment = mapActivity.getSupportFragmentManager().findFragmentByTag(SaveAsNewTrackBottomSheetDialogFragment.TAG);
 		if (saveAsNewTrackFragment != null) {
-			SaveAsNewTrackBottomSheetDialogFragment saveAsNewTrackBottomSheetDialogFragment = (SaveAsNewTrackBottomSheetDialogFragment) saveAsNewTrackFragment;
-			saveAsNewTrackBottomSheetDialogFragment.setListener(createSaveAsNewTrackFragmentListener());
+			((SaveAsNewTrackBottomSheetDialogFragment) saveAsNewTrackFragment).setListener(createSaveAsNewTrackFragmentListener());
 		}
 
 		commandManager.resetMeasurementLayer(measurementLayer);
@@ -369,7 +373,6 @@ public class MeasurementToolFragment extends Fragment {
 				}
 			}
 		});
-
 		toolBarController.setOnSwitchCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
 			@Override
 			public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -380,7 +383,8 @@ public class MeasurementToolFragment extends Fragment {
 		});
 		mapActivity.showTopToolbar(toolBarController);
 
-		adapter = new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints(), newGpxLine != null ? newGpxLine.getLineType() : null);
+		adapter = new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints(),
+				newGpxLine != null ? newGpxLine.getLineType() : null);
 		if (portrait) {
 			pointsRv = mainView.findViewById(R.id.measure_points_recycler_view);
 		} else {
@@ -388,56 +392,7 @@ public class MeasurementToolFragment extends Fragment {
 		}
 		final ItemTouchHelper touchHelper = new ItemTouchHelper(new MeasurementToolItemTouchHelperCallback(adapter));
 		touchHelper.attachToRecyclerView(pointsRv);
-		adapter.setAdapterListener(new MeasurementToolAdapter.MeasurementAdapterListener() {
-
-			private int fromPosition;
-			private int toPosition;
-
-			@Override
-			public void onRemoveClick(int position) {
-				commandManager.execute(new RemovePointCommand(measurementLayer, position));
-				adapter.notifyDataSetChanged();
-				disable(redoBtn);
-				updateText();
-				saved = false;
-				hidePointsListIfNoPoints();
-			}
-
-			@Override
-			public void onItemClick(View view) {
-				clearSelection();
-				int position = pointsRv.indexOfChild(view);
-				if (pointsListOpened) {
-					hidePointsList();
-				}
-				OsmandMapTileView tileView = mapActivity.getMapView();
-				if (portrait) {
-					previousMapPosition = tileView.getMapPosition();
-					tileView.setMapPosition(MIDDLE_TOP_CONSTANT);
-				}
-				mapActivity.refreshMap();
-				measurementLayer.moveMapToPoint(position);
-				measurementLayer.selectPoint(position);
-			}
-
-			@Override
-			public void onDragStarted(RecyclerView.ViewHolder holder) {
-				fromPosition = holder.getAdapterPosition();
-				touchHelper.startDrag(holder);
-			}
-
-			@Override
-			public void onDragEnded(RecyclerView.ViewHolder holder) {
-				toPosition = holder.getAdapterPosition();
-				if (toPosition >= 0 && fromPosition >= 0 && toPosition != fromPosition) {
-					commandManager.execute(new ReorderPointCommand(measurementLayer, fromPosition, toPosition));
-					adapter.notifyDataSetChanged();
-					disable(redoBtn);
-					mapActivity.refreshMap();
-					saved = false;
-				}
-			}
-		});
+		adapter.setAdapterListener(createMeasurementAdapterListener(touchHelper));
 		pointsRv.setLayoutManager(new LinearLayoutManager(getContext()));
 		pointsRv.setAdapter(adapter);
 
@@ -494,6 +449,26 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
+	private MapActivity getMapActivity() {
+		return (MapActivity) getActivity();
+	}
+
+	private MeasurementToolLayer getMeasurementLayer() {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			return mapActivity.getMapLayers().getMeasurementToolLayer();
+		}
+		return null;
+	}
+
+	private Drawable getContentIcon(@DrawableRes int id) {
+		return iconsCache.getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.icon_color);
+	}
+
+	private Drawable getActiveIcon(@DrawableRes int id) {
+		return iconsCache.getIcon(id, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance);
+	}
+
 	private void showSnapToRoadMenu() {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
@@ -507,11 +482,11 @@ public class MeasurementToolFragment extends Fragment {
 	}
 
 	private OptionsFragmentListener createOptionsFragmentListener() {
-
-		final MapActivity mapActivity = getMapActivity();
-		final MeasurementToolLayer measurementLayer = getMeasurementLayer();
-
 		return new OptionsFragmentListener() {
+
+			final MapActivity mapActivity = getMapActivity();
+			final MeasurementToolLayer measurementLayer = getMeasurementLayer();
+
 			@Override
 			public void snapToRoadOnCLick() {
 				if (!snapToRoadEnabled) {
@@ -568,10 +543,10 @@ public class MeasurementToolFragment extends Fragment {
 	}
 
 	private SelectedPointFragmentListener createSelectedPointFragmentListener() {
-
-		final MeasurementToolLayer measurementLayer = getMeasurementLayer();
-
 		return new SelectedPointFragmentListener() {
+
+			final MeasurementToolLayer measurementLayer = getMeasurementLayer();
+
 			@Override
 			public void moveOnClick() {
 				if (measurementLayer != null) {
@@ -641,6 +616,82 @@ public class MeasurementToolFragment extends Fragment {
 		};
 	}
 
+	private SaveAsNewTrackFragmentListener createSaveAsNewTrackFragmentListener() {
+		return new SaveAsNewTrackFragmentListener() {
+			@Override
+			public void saveAsRoutePointOnClick() {
+				saveAsGpx(SaveType.ROUTE_POINT);
+			}
+
+			@Override
+			public void saveAsLineOnClick() {
+				saveAsGpx(SaveType.LINE);
+			}
+		};
+	}
+
+	private MeasurementAdapterListener createMeasurementAdapterListener(final ItemTouchHelper touchHelper) {
+		return new MeasurementAdapterListener() {
+
+			final MapActivity mapActivity = getMapActivity();
+			final MeasurementToolLayer measurementLayer = getMeasurementLayer();
+			private int fromPosition;
+			private int toPosition;
+
+			@Override
+			public void onRemoveClick(int position) {
+				if (measurementLayer != null) {
+					commandManager.execute(new RemovePointCommand(measurementLayer, position));
+					adapter.notifyDataSetChanged();
+					disable(redoBtn);
+					updateText();
+					saved = false;
+					hidePointsListIfNoPoints();
+				}
+			}
+
+			@Override
+			public void onItemClick(View view) {
+				if (mapActivity != null && measurementLayer != null) {
+					clearSelection();
+					int position = pointsRv.indexOfChild(view);
+					if (pointsListOpened) {
+						hidePointsList();
+					}
+					OsmandMapTileView tileView = mapActivity.getMapView();
+					if (portrait) {
+						previousMapPosition = tileView.getMapPosition();
+						tileView.setMapPosition(MIDDLE_TOP_CONSTANT);
+					}
+					mapActivity.refreshMap();
+					measurementLayer.moveMapToPoint(position);
+					measurementLayer.selectPoint(position);
+				}
+			}
+
+			@Override
+			public void onDragStarted(RecyclerView.ViewHolder holder) {
+				fromPosition = holder.getAdapterPosition();
+				touchHelper.startDrag(holder);
+			}
+
+			@Override
+			public void onDragEnded(RecyclerView.ViewHolder holder) {
+				if (mapActivity != null && measurementLayer != null) {
+					toPosition = holder.getAdapterPosition();
+					if (toPosition >= 0 && fromPosition >= 0 && toPosition != fromPosition) {
+						commandManager.execute(new ReorderPointCommand(measurementLayer, fromPosition, toPosition));
+						adapter.notifyDataSetChanged();
+						disable(redoBtn);
+						updateText();
+						mapActivity.refreshMap();
+						saved = false;
+					}
+				}
+			}
+		};
+	}
+
 	private void enableSnapToRoadMode() {
 		if (snapToRoadAppMode != null) {
 			toolBarController.setTopBarSwitchVisible(true);
@@ -720,20 +771,6 @@ public class MeasurementToolFragment extends Fragment {
 		fragment.show(mapActivity.getSupportFragmentManager(), SaveAsNewTrackBottomSheetDialogFragment.TAG);
 	}
 
-	private SaveAsNewTrackFragmentListener createSaveAsNewTrackFragmentListener() {
-		return new SaveAsNewTrackFragmentListener() {
-			@Override
-			public void saveAsRoutePointOnClick() {
-				saveAsGpx(SaveType.ROUTE_POINT);
-			}
-
-			@Override
-			public void saveAsLineOnClick() {
-				saveAsGpx(SaveType.LINE);
-			}
-		};
-	}
-
 	private AlertDialog showAddSegmentDialog(final MapActivity mapActivity) {
 		CallbackWithObject<GPXFile[]> callbackWithObject = new CallbackWithObject<GPXFile[]>() {
 			@Override
@@ -749,47 +786,6 @@ public class MeasurementToolFragment extends Fragment {
 		return GpxUiHelper.selectSingleGPXFile(mapActivity, false, callbackWithObject);
 	}
 
-	private void cancelMovePointMode() {
-		if (inMovePointMode) {
-			switchMovePointMode(false);
-		}
-		clearSelection();
-		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
-		if (measurementToolLayer != null) {
-			measurementToolLayer.exitMovePointMode();
-			measurementToolLayer.clearSelection();
-			measurementToolLayer.refreshMap();
-		}
-	}
-
-	private void cancelAddPointAfterMode() {
-		if (inAddPointAfterMode) {
-			switchAddPointAfterMode(false);
-		}
-		clearSelection();
-		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
-		if (measurementToolLayer != null) {
-			measurementToolLayer.exitAddPointAfterMode();
-			measurementToolLayer.clearSelection();
-			measurementToolLayer.refreshMap();
-		}
-		positionToAddPoint = -1;
-	}
-
-	private void cancelAddPointBeforeMode() {
-		if (inAddPointBeforeMode) {
-			switchAddPointBeforeMode(false);
-		}
-		clearSelection();
-		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
-		if (measurementToolLayer != null) {
-			measurementToolLayer.exitAddPointBeforeMode();
-			measurementToolLayer.clearSelection();
-			measurementToolLayer.refreshMap();
-		}
-		positionToAddPoint = -1;
-	}
-
 	private void applyMovePointMode() {
 		if (inMovePointMode) {
 			switchMovePointMode(false);
@@ -812,6 +808,19 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
+	private void cancelMovePointMode() {
+		if (inMovePointMode) {
+			switchMovePointMode(false);
+		}
+		clearSelection();
+		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
+		if (measurementToolLayer != null) {
+			measurementToolLayer.exitMovePointMode();
+			measurementToolLayer.clearSelection();
+			measurementToolLayer.refreshMap();
+		}
+	}
+
 	private void applyAddPointAfterMode() {
 		if (inAddPointAfterMode) {
 			switchAddPointAfterMode(false);
@@ -827,9 +836,18 @@ public class MeasurementToolFragment extends Fragment {
 		positionToAddPoint = -1;
 	}
 
-	private void clearSelection() {
-		selectedPointPos = -1;
-		selectedCachedPoint = null;
+	private void cancelAddPointAfterMode() {
+		if (inAddPointAfterMode) {
+			switchAddPointAfterMode(false);
+		}
+		clearSelection();
+		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
+		if (measurementToolLayer != null) {
+			measurementToolLayer.exitAddPointAfterMode();
+			measurementToolLayer.clearSelection();
+			measurementToolLayer.refreshMap();
+		}
+		positionToAddPoint = -1;
 	}
 
 	private void applyAddPointBeforeMode() {
@@ -847,6 +865,25 @@ public class MeasurementToolFragment extends Fragment {
 		positionToAddPoint = -1;
 	}
 
+	private void cancelAddPointBeforeMode() {
+		if (inAddPointBeforeMode) {
+			switchAddPointBeforeMode(false);
+		}
+		clearSelection();
+		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
+		if (measurementToolLayer != null) {
+			measurementToolLayer.exitAddPointBeforeMode();
+			measurementToolLayer.clearSelection();
+			measurementToolLayer.refreshMap();
+		}
+		positionToAddPoint = -1;
+	}
+
+	private void clearSelection() {
+		selectedPointPos = -1;
+		selectedCachedPoint = null;
+	}
+
 	private void switchMovePointMode(boolean enable) {
 		inMovePointMode = enable;
 		markGeneralComponents(enable ? View.GONE : View.VISIBLE);
@@ -888,18 +925,6 @@ public class MeasurementToolFragment extends Fragment {
 				R.id.measure_mode_controls);
 	}
 
-	private void hidePointsListIfNoPoints() {
-		MeasurementToolLayer measurementLayer = getMeasurementLayer();
-		if (measurementLayer != null) {
-			if (measurementLayer.getPointsCount() < 1) {
-				disable(upDownBtn);
-				if (pointsListOpened) {
-					hidePointsList();
-				}
-			}
-		}
-	}
-
 	private void addPoint() {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
@@ -968,6 +993,18 @@ public class MeasurementToolFragment extends Fragment {
 		setPreviousMapPosition();
 	}
 
+	private void hidePointsListIfNoPoints() {
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (measurementLayer != null) {
+			if (measurementLayer.getPointsCount() < 1) {
+				disable(upDownBtn);
+				if (pointsListOpened) {
+					hidePointsList();
+				}
+			}
+		}
+	}
+
 	private void showPointsListFragment() {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
@@ -1090,7 +1127,14 @@ public class MeasurementToolFragment extends Fragment {
 		saveGpx(null, null, showOnMap, gpx, true, lineType, null);
 	}
 
-	private void saveGpx(final File dir, final String fileName, final boolean showOnMap, final GPXFile gpx, final boolean openTrackActivity, final LineType lineType, final SaveType saveType) {
+	private void saveGpx(final File dir,
+						 final String fileName,
+						 final boolean showOnMap,
+						 final GPXFile gpx,
+						 final boolean openTrackActivity,
+						 final LineType lineType,
+						 final SaveType saveType) {
+
 		new AsyncTask<Void, Void, String>() {
 
 			private ProgressDialog progressDialog;
@@ -1194,26 +1238,6 @@ public class MeasurementToolFragment extends Fragment {
 		}.execute();
 	}
 
-	private MapActivity getMapActivity() {
-		return (MapActivity) getActivity();
-	}
-
-	private MeasurementToolLayer getMeasurementLayer() {
-		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
-			return mapActivity.getMapLayers().getMeasurementToolLayer();
-		}
-		return null;
-	}
-
-	private Drawable getContentIcon(@DrawableRes int id) {
-		return iconsCache.getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.icon_color);
-	}
-
-	private Drawable getActiveIcon(@DrawableRes int id) {
-		return iconsCache.getIcon(id, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance);
-	}
-
 	private void enable(View... views) {
 		for (View view : views) {
 			view.setEnabled(true);

From a8cb9d4743714fea2f9d6c66a0a78abad475d877 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 17 Aug 2017 14:18:25 +0300
Subject: [PATCH 131/174] Add images to save as menu

---
 ..._save_as_new_track_bottom_sheet_dialog.xml | 71 ++++++++++++++++++-
 OsmAnd/res/values/strings.xml                 |  2 +
 ...veAsNewTrackBottomSheetDialogFragment.java | 60 ++++++++++++----
 3 files changed, 118 insertions(+), 15 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
index abdc10a3af..8ce6ce8ac0 100644
--- a/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
@@ -32,10 +32,79 @@
                 android:layout_height="44dp"
                 android:paddingEnd="16dp"
                 android:paddingStart="16dp"
-                android:text="@string/measurement_tool_snap_to_road_descr"
+                android:text="@string/measurement_tool_save_as_new_track_descr"
                 android:textColor="?android:textColorSecondary"
                 android:textSize="@dimen/default_desc_text_size"/>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <RelativeLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_weight="1">
+
+                    <ImageView
+                        android:id="@+id/route_point_image"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:adjustViewBounds="true"
+                        android:foreground="?attr/selectableItemBackground"
+                        tools:src="@drawable/img_help_trip_route_points_night"/>
+
+                    <TextView
+                        android:id="@+id/route_point_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignLeft="@id/route_point_image"
+                        android:layout_alignStart="@id/route_point_image"
+                        android:layout_margin="8dp"
+                        android:text="@string/route_point"
+                        android:textColor="?android:textColorSecondary"
+                        android:textSize="@dimen/default_split_segments_sub"/>
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_weight="1">
+
+                    <ImageView
+                        android:id="@+id/line_image"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:adjustViewBounds="true"
+                        android:foreground="?attr/selectableItemBackground"
+                        tools:src="@drawable/img_help_trip_track_night"/>
+
+                    <TextView
+                        android:id="@+id/line_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignLeft="@id/line_image"
+                        android:layout_alignStart="@id/line_image"
+                        android:layout_margin="8dp"
+                        android:text="@string/line"
+                        android:textColor="?android:textColorSecondary"
+                        android:textSize="@dimen/default_split_segments_sub"/>
+
+                </RelativeLayout>
+
+            </LinearLayout>
+
             <RelativeLayout
                 android:id="@+id/save_as_route_point_row"
                 android:layout_width="match_parent"
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 6506c8a6ec..934e6f276a 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="line">Line</string>
     <string name="save_as_route_point">Save as Route Point</string>
     <string name="save_as_line">Save as line</string>
     <string name="route_point">Route point</string>
@@ -17,6 +18,7 @@
     <string name="add_point_after">Add point after</string>
     <string name="shared_string_options">Options</string>
     <string name="measurement_tool_snap_to_road_descr">OsmAnd will add additional points, depending on the navigation type.</string>
+    <string name="measurement_tool_save_as_new_track_descr">You can save points either as route points or as a line.</string>
     <string name="choose_navigation_type">Choose navigation type</string>
     <string name="none_point_error">Please add at least one point.</string>
     <string name="enter_gpx_name">GPX file name:</string>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java
index 7280c37eec..43f6bb8f30 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java
@@ -1,10 +1,13 @@
 package net.osmand.plus.measurementtool;
 
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
@@ -14,7 +17,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import net.osmand.AndroidUtils;
-import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.base.BottomSheetDialogFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
@@ -36,7 +38,6 @@ public class SaveAsNewTrackBottomSheetDialogFragment extends BottomSheetDialogFr
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
-		final OsmandSettings settings = getMyApplication().getSettings();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_save_as_new_track_bottom_sheet_dialog, container);
@@ -44,32 +45,38 @@ public class SaveAsNewTrackBottomSheetDialogFragment extends BottomSheetDialogFr
 			AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
 		}
 
+		final ImageView routePointImage = (ImageView) mainView.findViewById(R.id.route_point_image);
+		ImageView lineImage = (ImageView) mainView.findViewById(R.id.line_image);
 		if (nightMode) {
 			((TextView) mainView.findViewById(R.id.save_as_new_track_title)).setTextColor(getResources().getColor(R.color.ctx_menu_info_text_dark));
+
+			routePointImage.setImageResource(R.drawable.img_help_trip_route_points_night);
+			lineImage.setImageResource(R.drawable.img_help_trip_track_night);
+		} else {
+			routePointImage.setImageResource(R.drawable.img_help_trip_route_points_day);
+			lineImage.setImageResource(R.drawable.img_help_trip_track_day);
 		}
 
 		((ImageView) mainView.findViewById(R.id.route_point_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_route_points));
 		((ImageView) mainView.findViewById(R.id.line_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_split_interval));
 
-		mainView.findViewById(R.id.save_as_line_row).setOnClickListener(new View.OnClickListener() {
+		mainView.findViewById(R.id.line_text).setOnTouchListener(new View.OnTouchListener() {
 			@Override
-			public void onClick(View view) {
-				if (listener != null) {
-					listener.saveAsLineOnClick();
-				}
-				dismiss();
+			public boolean onTouch(View view, MotionEvent motionEvent) {
+				return false;
 			}
 		});
+		lineImage.setOnClickListener(saveAsLineOnClickListener);
+		mainView.findViewById(R.id.save_as_line_row).setOnClickListener(saveAsLineOnClickListener);
 
-		mainView.findViewById(R.id.save_as_route_point_row).setOnClickListener(new View.OnClickListener() {
+		mainView.findViewById(R.id.route_point_text).setOnTouchListener(new View.OnTouchListener() {
 			@Override
-			public void onClick(View view) {
-				if (listener != null) {
-					listener.saveAsRoutePointOnClick();
-				}
-				dismiss();
+			public boolean onTouch(View view, MotionEvent motionEvent) {
+				return false;
 			}
 		});
+		routePointImage.setOnClickListener(saveAsLineOnClickListener);
+		mainView.findViewById(R.id.save_as_route_point_row).setOnClickListener(saveAsRoutePointOnClickListener);
 
 		mainView.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -129,6 +136,31 @@ public class SaveAsNewTrackBottomSheetDialogFragment extends BottomSheetDialogFr
 		}
 	}
 
+	@Override
+	protected Drawable getContentIcon(@DrawableRes int id) {
+		return getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.on_map_icon_color);
+	}
+
+	private View.OnClickListener saveAsLineOnClickListener = new View.OnClickListener() {
+		@Override
+		public void onClick(View view) {
+			if (listener != null) {
+				listener.saveAsLineOnClick();
+			}
+			dismiss();
+		}
+	};
+
+	private View.OnClickListener saveAsRoutePointOnClickListener = new View.OnClickListener() {
+		@Override
+		public void onClick(View view) {
+			if (listener != null) {
+				listener.saveAsRoutePointOnClick();
+			}
+			dismiss();
+		}
+	};
+
 	interface SaveAsNewTrackFragmentListener {
 
 		void saveAsRoutePointOnClick();

From bc3683923aca4a02c82299337ea92a15bde9cd9f Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 17 Aug 2017 15:04:40 +0300
Subject: [PATCH 132/174] Add measure distance to center

---
 .../layout-land/fragment_measurement_tool.xml  | 15 +++++++++++++--
 .../res/layout/fragment_measurement_tool.xml   | 15 +++++++++++++--
 .../MeasurementToolFragment.java               | 12 ++++++++++++
 .../measurementtool/MeasurementToolLayer.java  | 18 ++++++++++++++++++
 4 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
index 3c000d4272..0f75d4d953 100644
--- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -85,13 +85,24 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_toEndOf="@id/measurement_distance_text_view"
-                    android:layout_toLeftOf="@id/up_down_button"
                     android:layout_toRightOf="@id/measurement_distance_text_view"
-                    android:layout_toStartOf="@id/up_down_button"
                     android:textColor="?android:textColorSecondary"
                     android:textSize="@dimen/default_list_text_size"
                     tools:text="points: 3"/>
 
+                <TextView
+                    android:id="@+id/distance_to_center_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@id/measurement_points_text_view"
+                    android:layout_toLeftOf="@id/up_down_button"
+                    android:layout_toRightOf="@id/measurement_points_text_view"
+                    android:layout_toStartOf="@id/up_down_button"
+                    android:textColor="?android:textColorSecondary"
+                    android:textSize="@dimen/default_list_text_size"
+                    tools:text=" – 700 m"/>
+
                 <TextView
                     android:id="@+id/move_point_text"
                     android:layout_width="wrap_content"
diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index fb49b84a40..8947121ce8 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -80,13 +80,24 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toEndOf="@id/measurement_distance_text_view"
-                android:layout_toLeftOf="@id/up_down_button"
                 android:layout_toRightOf="@id/measurement_distance_text_view"
-                android:layout_toStartOf="@id/up_down_button"
                 android:textColor="?android:textColorSecondary"
                 android:textSize="@dimen/default_list_text_size"
                 tools:text="points: 3"/>
 
+            <TextView
+                android:id="@+id/distance_to_center_text_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/measurement_points_text_view"
+                android:layout_toLeftOf="@id/up_down_button"
+                android:layout_toRightOf="@id/measurement_points_text_view"
+                android:layout_toStartOf="@id/up_down_button"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="@dimen/default_list_text_size"
+                tools:text=" – 700 m"/>
+
             <TextView
                 android:id="@+id/move_point_text"
                 android:layout_width="wrap_content"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index c1f637df41..3eff141a00 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -42,6 +42,7 @@ import net.osmand.plus.GPXUtilities.TrkSegment;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 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;
@@ -91,6 +92,7 @@ public class MeasurementToolFragment extends Fragment {
 	private MeasurementToolAdapter adapter;
 	private TextView distanceTv;
 	private TextView pointsTv;
+	private TextView distanceToCenterTv;
 	private String pointsSt;
 	private Drawable upIcon;
 	private Drawable downIcon;
@@ -186,6 +188,7 @@ public class MeasurementToolFragment extends Fragment {
 
 		distanceTv = (TextView) mainView.findViewById(R.id.measurement_distance_text_view);
 		pointsTv = (TextView) mainView.findViewById(R.id.measurement_points_text_view);
+		distanceToCenterTv = (TextView) mainView.findViewById(R.id.distance_to_center_text_view);
 
 		mainIcon = (ImageView) mainView.findViewById(R.id.main_icon);
 		if (newGpxLine != null) {
@@ -324,6 +327,14 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		});
 
+		measurementLayer.setOnMeasureDistanceToCenterListener(new MeasurementToolLayer.OnMeasureDistanceToCenter() {
+			@Override
+			public void onMeasure(float distance) {
+				String distStr = OsmAndFormatter.getFormattedDistance(distance, mapActivity.getMyApplication());
+				distanceToCenterTv.setText(" – " + distStr);
+			}
+		});
+
 		measurementLayer.setOnEnterMovePointModeListener(new MeasurementToolLayer.OnEnterMovePointModeListener() {
 			@Override
 			public void onEnterMovePointMode() {
@@ -921,6 +932,7 @@ public class MeasurementToolFragment extends Fragment {
 		mark(status,
 				R.id.measurement_distance_text_view,
 				R.id.measurement_points_text_view,
+				R.id.distance_to_center_text_view,
 				R.id.up_down_button,
 				R.id.measure_mode_controls);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 943f0febbf..2da6bbf141 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -44,6 +44,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private int marginY;
 	private final TIntArrayList tx = new TIntArrayList();
 	private final TIntArrayList ty = new TIntArrayList();
+	private OnMeasureDistanceToCenter measureDistanceToCenterListener;
 	private OnSingleTapListener singleTapListener;
 	private OnEnterMovePointModeListener enterMovePointModeListener;
 	private int selectedPointPos = -1;
@@ -76,6 +77,10 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		this.enterMovePointModeListener = listener;
 	}
 
+	void setOnMeasureDistanceToCenterListener(OnMeasureDistanceToCenter listener) {
+		this.measureDistanceToCenterListener = listener;
+	}
+
 	void setSelectedPointPos(int pos) {
 		selectedPointPos = pos;
 	}
@@ -222,6 +227,15 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 			lineAttrs.updatePaints(view, settings, tb);
 			if (!inMovePointMode && !inAddPointAfterMode && !inAddPointBeforeMode) {
 				drawCenterIcon(canvas, tb, tb.getCenterPixelPoint(), settings.isNightMode());
+				if (measureDistanceToCenterListener != null) {
+					float distance = 0;
+					if (measurementPoints.size() > 0) {
+						WptPt lastPoint = measurementPoints.get(measurementPoints.size() - 1);
+						LatLon centerLatLon = tb.getCenterLatLon();
+						distance = (float) MapUtils.getDistance(lastPoint.lat, lastPoint.lon, centerLatLon.getLatitude(), centerLatLon.getLongitude());
+					}
+					measureDistanceToCenterListener.onMeasure(distance);
+				}
 			}
 
 			if (measurementPoints.size() > 0) {
@@ -448,4 +462,8 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	interface OnEnterMovePointModeListener {
 		void onEnterMovePointMode();
 	}
+
+	interface OnMeasureDistanceToCenter {
+		void onMeasure(float distance);
+	}
 }

From 7f03ce321beeb9f356c972d21b01504c3af5d09a Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 17 Aug 2017 15:54:34 +0300
Subject: [PATCH 133/174] Add route points to track

---
 OsmAnd/src/net/osmand/plus/GPXUtilities.java  | 13 +++++++
 .../MeasurementToolFragment.java              | 39 +++++++++++--------
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index 602232324e..4cd24455c3 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -935,6 +935,19 @@ public class GPXUtilities {
 			return false;
 		}
 
+		public void addRoutePoints(List<WptPt> points) {
+			if (routes.size() == 0) {
+				Route route = new Route();
+				routes.add(route);
+			}
+
+			Route lastRoute = routes.get(routes.size() - 1);
+
+			lastRoute.points.addAll(points);
+
+			modifiedTime = System.currentTimeMillis();
+		}
+
 		public void replaceRoutePoints(List<WptPt> points) {
 			routes.clear();
 			routes.add(new Route());
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 3eff141a00..58f903d7e3 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -533,7 +533,7 @@ public class MeasurementToolFragment extends Fragment {
 			public void addToTheTrackOnClick() {
 				if (mapActivity != null && measurementLayer != null) {
 					if (measurementLayer.getPointsCount() > 0) {
-//										showAddSegmentDialog(mapActivity);
+						showAddSegmentDialog(mapActivity);
 					} else {
 						Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
 					}
@@ -789,6 +789,9 @@ public class MeasurementToolFragment extends Fragment {
 				GPXFile gpxFile;
 				if (result != null && result.length > 0) {
 					gpxFile = result[0];
+					SelectedGpxFile selectedGpxFile = mapActivity.getMyApplication().getSelectedGpxHelper().getSelectedFileByPath(gpxFile.path);
+					boolean showOnMap = selectedGpxFile != null;
+					saveExistingGpx(gpxFile, showOnMap, null, false);
 				}
 				return true;
 			}
@@ -1059,7 +1062,7 @@ public class MeasurementToolFragment extends Fragment {
 		SelectedGpxFile selectedGpxFile = mapActivity.getMyApplication().getSelectedGpxHelper().getSelectedFileByPath(gpx.path);
 		boolean showOnMap = selectedGpxFile != null;
 		LineType lineType = newGpxLine.getLineType();
-		saveExistingGpx(gpx, showOnMap, lineType);
+		saveExistingGpx(gpx, showOnMap, lineType, true);
 	}
 
 	private void saveAsGpx(final SaveType saveType) {
@@ -1135,8 +1138,8 @@ public class MeasurementToolFragment extends Fragment {
 		saveGpx(dir, fileName, checked, null, false, null, saveType);
 	}
 
-	private void saveExistingGpx(GPXFile gpx, boolean showOnMap, LineType lineType) {
-		saveGpx(null, null, showOnMap, gpx, true, lineType, null);
+	private void saveExistingGpx(GPXFile gpx, boolean showOnMap, LineType lineType, boolean openTrackActivity) {
+		saveGpx(null, null, showOnMap, gpx, openTrackActivity, lineType, null);
 	}
 
 	private void saveGpx(final File dir,
@@ -1195,18 +1198,22 @@ public class MeasurementToolFragment extends Fragment {
 					toSave = new File(gpx.path);
 					if (measurementLayer != null) {
 						List<WptPt> points = measurementLayer.getMeasurementPoints();
-						switch (lineType) {
-							case ADD_SEGMENT:
-								gpx.addTrkSegment(points);
-								break;
-							case ADD_ROUTE_POINTS:
-								gpx.replaceRoutePoints(points);
-								break;
-							case EDIT_SEGMENT:
-								TrkSegment segment = new TrkSegment();
-								segment.points.addAll(points);
-								gpx.replaceSegment(newGpxLine.getTrkSegment(), segment);
-								break;
+						if (lineType != null) {
+							switch (lineType) {
+								case ADD_SEGMENT:
+									gpx.addTrkSegment(points);
+									break;
+								case ADD_ROUTE_POINTS:
+									gpx.replaceRoutePoints(points);
+									break;
+								case EDIT_SEGMENT:
+									TrkSegment segment = new TrkSegment();
+									segment.points.addAll(points);
+									gpx.replaceSegment(newGpxLine.getTrkSegment(), segment);
+									break;
+							}
+						} else {
+							gpx.addRoutePoints(points);
 						}
 					}
 					if (activity != null) {

From fc7d91e494f369fb46fe6f332692a53755ca6c8d Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Thu, 17 Aug 2017 16:15:29 +0300
Subject: [PATCH 134/174] Fix snap to road title change

---
 .../plus/measurementtool/MeasurementToolFragment.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 58f903d7e3..c623d1d5bc 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -480,10 +480,12 @@ public class MeasurementToolFragment extends Fragment {
 		return iconsCache.getIcon(id, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance);
 	}
 
-	private void showSnapToRoadMenu() {
+	private void showSnapToRoadMenu(boolean rememberPreviousTitle) {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
-			previousToolBarTitle = toolBarController.getTitle();
+			if (rememberPreviousTitle) {
+				previousToolBarTitle = toolBarController.getTitle();
+			}
 			toolBarController.setTitle(getString(R.string.snap_to_road));
 			mapActivity.refreshMap();
 			SnapToRoadBottomSheetDialogFragment fragment = new SnapToRoadBottomSheetDialogFragment();
@@ -501,7 +503,7 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			public void snapToRoadOnCLick() {
 				if (!snapToRoadEnabled) {
-					showSnapToRoadMenu();
+					showSnapToRoadMenu(true);
 				} else {
 					disableSnapToRoadMode();
 				}
@@ -717,7 +719,7 @@ public class MeasurementToolFragment extends Fragment {
 				snapToRoadBtn.setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View view) {
-						showSnapToRoadMenu();
+						showSnapToRoadMenu(false);
 					}
 				});
 				snapToRoadBtn.setVisibility(View.VISIBLE);

From e2a21323eca7506122bc35ee3a8d7efdd66e472e Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 17 Aug 2017 17:49:35 +0300
Subject: [PATCH 135/174] Make add after or before multitask

---
 .../res/drawable/btn_round_white_border.xml   | 26 +++++++
 .../layout-land/fragment_measurement_tool.xml | 67 +++++++++++++++++-
 .../res/layout/fragment_measurement_tool.xml  | 66 +++++++++++++++++-
 .../MeasurementToolFragment.java              | 69 ++++++++++++++++---
 4 files changed, 211 insertions(+), 17 deletions(-)
 create mode 100644 OsmAnd/res/drawable/btn_round_white_border.xml

diff --git a/OsmAnd/res/drawable/btn_round_white_border.xml b/OsmAnd/res/drawable/btn_round_white_border.xml
new file mode 100644
index 0000000000..253910d05a
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_round_white_border.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="?attr/bg_color" />
+            <stroke android:color="@color/map_widget_blue_pressed" android:width="3dp"/>
+            <corners android:radius="@dimen/map_button_rect_rad" />
+        </shape>
+    </item>
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <solid android:color="?attr/bg_color" />
+            <stroke android:color="@color/searchbar_tab_inactive_light" android:width="3dp"/>
+            <corners android:radius="@dimen/map_button_rect_rad" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?attr/bg_color" />
+            <stroke android:color="@color/map_widget_blue" android:width="3dp"/>
+            <corners android:radius="@dimen/map_button_rect_rad" />
+        </shape>
+    </item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
index 0f75d4d953..8f7ee0bfeb 100644
--- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -235,14 +235,14 @@
             </LinearLayout>
 
             <RelativeLayout
-                android:id="@+id/selected_point_controls"
+                android:id="@+id/move_point_controls"
                 android:layout_width="0dp"
                 android:layout_height="52dp"
                 android:layout_weight="0.6"
                 android:visibility="gone">
 
                 <Button
-                    android:id="@+id/apply_point_button"
+                    android:id="@+id/apply_move_point_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
@@ -260,7 +260,7 @@
                     android:textColor="@color/color_white"/>
 
                 <net.osmand.plus.widgets.TextViewEx
-                    android:id="@+id/cancel_point_button"
+                    android:id="@+id/cancel_move_point_button"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:background="?attr/selectableItemBackground"
@@ -275,6 +275,67 @@
                     osmand:typeface="@string/font_roboto_medium"/>
             </RelativeLayout>
 
+            <LinearLayout
+                android:id="@+id/add_point_before_after_controls"
+                android:layout_width="0dp"
+                android:layout_weight="0.6"
+                android:layout_height="52dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/cancel_point_before_after_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="?attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:paddingEnd="12dp"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="12dp"
+                    android:paddingStart="16dp"
+                    android:text="@string/shared_string_cancel"
+                    android:textColor="?attr/color_dialog_buttons"
+                    osmand:textAllCapsCompat="true"
+                    osmand:typeface="@string/font_roboto_medium"/>
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"/>
+
+                <Button
+                    android:id="@+id/apply_point_before_after_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginTop="8dp"
+                    android:background="@drawable/btn_round_white_border"
+                    android:minHeight="36dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:text="@string/shared_string_apply"
+                    android:textColor="?attr/color_dialog_buttons"/>
+
+                <Button
+                    android:id="@+id/add_point_before_after_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    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:minHeight="36dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:text="@string/shared_string_add"
+                    android:textColor="@color/color_white"/>
+            </LinearLayout>
+
         </LinearLayout>
 
     </LinearLayout>
diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 8947121ce8..9d79388013 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -254,13 +254,13 @@
         </LinearLayout>
 
         <RelativeLayout
-            android:id="@+id/selected_point_controls"
+            android:id="@+id/move_point_controls"
             android:layout_width="match_parent"
             android:layout_height="52dp"
             android:visibility="gone">
 
             <Button
-                android:id="@+id/apply_point_button"
+                android:id="@+id/apply_move_point_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
@@ -278,7 +278,7 @@
                 android:textColor="@color/color_white"/>
 
             <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/cancel_point_button"
+                android:id="@+id/cancel_move_point_button"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:background="?attr/selectableItemBackground"
@@ -293,6 +293,66 @@
                 osmand:typeface="@string/font_roboto_medium"/>
         </RelativeLayout>
 
+        <LinearLayout
+            android:id="@+id/add_point_before_after_controls"
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <net.osmand.plus.widgets.TextViewEx
+                android:id="@+id/cancel_point_before_after_button"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:background="?attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:paddingEnd="12dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="12dp"
+                android:paddingStart="16dp"
+                android:text="@string/shared_string_cancel"
+                android:textColor="?attr/color_dialog_buttons"
+                osmand:textAllCapsCompat="true"
+                osmand:typeface="@string/font_roboto_medium"/>
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"/>
+
+            <Button
+                android:id="@+id/apply_point_before_after_point_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginTop="8dp"
+                android:background="@drawable/btn_round_white_border"
+                android:minHeight="36dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:text="@string/shared_string_apply"
+                android:textColor="?attr/color_dialog_buttons"/>
+
+            <Button
+                android:id="@+id/add_point_before_after_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                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:minHeight="36dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:text="@string/shared_string_add"
+                android:textColor="@color/color_white"/>
+        </LinearLayout>
+
     </LinearLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index c623d1d5bc..e071ec4fb2 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -205,12 +205,19 @@ public class MeasurementToolFragment extends Fragment {
 		upDownBtn = (ImageView) mainView.findViewById(R.id.up_down_button);
 		upDownBtn.setImageDrawable(upIcon);
 
-		mainView.findViewById(R.id.cancel_point_button).setOnClickListener(new View.OnClickListener() {
+		mainView.findViewById(R.id.cancel_move_point_button).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				if (inMovePointMode) {
 					cancelMovePointMode();
-				} else if (inAddPointAfterMode) {
+				}
+			}
+		});
+
+		mainView.findViewById(R.id.cancel_point_before_after_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (inAddPointAfterMode) {
 					cancelAddPointAfterMode();
 				} else if (inAddPointBeforeMode) {
 					cancelAddPointBeforeMode();
@@ -234,12 +241,19 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		});
 
-		mainView.findViewById(R.id.apply_point_button).setOnClickListener(new View.OnClickListener() {
+		mainView.findViewById(R.id.apply_move_point_button).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				if (inMovePointMode) {
 					applyMovePointMode();
-				} else if (inAddPointAfterMode) {
+				}
+			}
+		});
+
+		mainView.findViewById(R.id.apply_point_before_after_point_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (inAddPointAfterMode) {
 					applyAddPointAfterMode();
 				} else if (inAddPointBeforeMode) {
 					applyAddPointBeforeMode();
@@ -247,6 +261,17 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		});
 
+		mainView.findViewById(R.id.add_point_before_after_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (inAddPointAfterMode) {
+					addPointAfter();
+				} else if (inAddPointBeforeMode) {
+					addPointBefore();
+				}
+			}
+		});
+
 		mainView.findViewById(R.id.options_button).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
@@ -837,14 +862,26 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
+	private void addPointAfter() {
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (measurementLayer != null && positionToAddPoint != -1) {
+			addPointToPosition(positionToAddPoint);
+			selectedPointPos += 1;
+			selectedCachedPoint = new WptPt(measurementLayer.getMeasurementPoints().get(selectedPointPos));
+			measurementLayer.setSelectedPointPos(selectedPointPos);
+			measurementLayer.setSelectedCachedPoint(selectedCachedPoint);
+			measurementLayer.refreshMap();
+			positionToAddPoint += 1;
+		}
+	}
+
 	private void applyAddPointAfterMode() {
 		if (inAddPointAfterMode) {
 			switchAddPointAfterMode(false);
 		}
 		clearSelection();
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
-		if (measurementLayer != null && positionToAddPoint != -1) {
-			addPointToPosition(positionToAddPoint);
+		if (measurementLayer != null) {
 			measurementLayer.exitAddPointAfterMode();
 			measurementLayer.clearSelection();
 			measurementLayer.refreshMap();
@@ -866,14 +903,24 @@ public class MeasurementToolFragment extends Fragment {
 		positionToAddPoint = -1;
 	}
 
+	private void addPointBefore() {
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (measurementLayer != null && positionToAddPoint != -1) {
+			addPointToPosition(positionToAddPoint);
+			selectedCachedPoint = new WptPt(measurementLayer.getMeasurementPoints().get(selectedPointPos));
+			measurementLayer.setSelectedPointPos(selectedPointPos);
+			measurementLayer.setSelectedCachedPoint(selectedCachedPoint);
+			measurementLayer.refreshMap();
+		}
+	}
+
 	private void applyAddPointBeforeMode() {
 		if (inAddPointBeforeMode) {
 			switchAddPointBeforeMode(false);
 		}
 		clearSelection();
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
-		if (measurementLayer != null && positionToAddPoint != -1) {
-			addPointToPosition(positionToAddPoint);
+		if (measurementLayer != null) {
 			measurementLayer.exitAddPointBeforeMode();
 			measurementLayer.clearSelection();
 			measurementLayer.refreshMap();
@@ -905,7 +952,7 @@ public class MeasurementToolFragment extends Fragment {
 		markGeneralComponents(enable ? View.GONE : View.VISIBLE);
 		mark(enable ? View.VISIBLE : View.GONE,
 				R.id.move_point_text,
-				R.id.selected_point_controls);
+				R.id.move_point_controls);
 		mainIcon.setImageDrawable(getActiveIcon(enable
 				? R.drawable.ic_action_move_point
 				: R.drawable.ic_action_ruler));
@@ -916,7 +963,7 @@ public class MeasurementToolFragment extends Fragment {
 		markGeneralComponents(enable ? View.GONE : View.VISIBLE);
 		mark(enable ? View.VISIBLE : View.GONE,
 				R.id.add_point_after_text,
-				R.id.selected_point_controls);
+				R.id.add_point_before_after_controls);
 		mainIcon.setImageDrawable(getActiveIcon(enable
 				? R.drawable.ic_action_addpoint_above
 				: R.drawable.ic_action_ruler));
@@ -927,7 +974,7 @@ public class MeasurementToolFragment extends Fragment {
 		markGeneralComponents(enable ? View.GONE : View.VISIBLE);
 		mark(enable ? View.VISIBLE : View.GONE,
 				R.id.add_point_before_text,
-				R.id.selected_point_controls);
+				R.id.add_point_before_after_controls);
 		mainIcon.setImageDrawable(getActiveIcon(enable
 				? R.drawable.ic_action_addpoint_below
 				: R.drawable.ic_action_ruler));

From aa58bf4a12e8a334363fb359e978ac9eafcb6b50 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 17 Aug 2017 18:00:53 +0300
Subject: [PATCH 136/174] Bigger select radius for tablets

---
 OsmAnd/res/{values-sw600dp-port => values-sw600dp}/sizes.xml    | 2 ++
 OsmAnd/res/values/sizes.xml                                     | 2 ++
 .../net/osmand/plus/measurementtool/MeasurementToolLayer.java   | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)
 rename OsmAnd/res/{values-sw600dp-port => values-sw600dp}/sizes.xml (73%)

diff --git a/OsmAnd/res/values-sw600dp-port/sizes.xml b/OsmAnd/res/values-sw600dp/sizes.xml
similarity index 73%
rename from OsmAnd/res/values-sw600dp-port/sizes.xml
rename to OsmAnd/res/values-sw600dp/sizes.xml
index e4cf1852c8..5b2f539723 100644
--- a/OsmAnd/res/values-sw600dp-port/sizes.xml
+++ b/OsmAnd/res/values-sw600dp/sizes.xml
@@ -2,4 +2,6 @@
 <resources>
     <dimen name="splash_screen_logo_top">300dp</dimen>
     <dimen name="splash_screen_text_bottom">200dp</dimen>
+
+    <dimen name="measurement_tool_select_radius">48dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 1c027babfc..b9169ed80e 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -158,4 +158,6 @@
 
     <dimen name="measure_distance_bottom_sheet_cancel_button_height">48dp</dimen>
 	<dimen name="landscape_bottom_sheet_dialog_fragment_width">360dp</dimen>
+
+	<dimen name="measurement_tool_select_radius">20dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 2da6bbf141..1397deb57e 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -193,7 +193,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private void selectPoint(double x, double y, boolean singleTap) {
 		clearSelection();
 		RotatedTileBox tb = view.getCurrentRotatedTileBox();
-		double lowestDistance = AndroidUtils.dpToPx(view.getContext(), 20);
+		double lowestDistance = view.getResources().getDimension(R.dimen.measurement_tool_select_radius);
 		for (int i = 0; i < measurementPoints.size(); i++) {
 			WptPt pt = measurementPoints.get(i);
 			if (tb.containsLatLon(pt.getLatitude(), pt.getLongitude())) {

From e2100f4b04c68ccba62655924a20a42a14dc295f Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 17 Aug 2017 18:08:17 +0300
Subject: [PATCH 137/174] Save as new track menu styling

---
 ...nt_save_as_new_track_bottom_sheet_dialog.xml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
index 8ce6ce8ac0..fef2af6000 100644
--- a/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
@@ -3,6 +3,7 @@
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:background="?attr/bg_color"
               android:orientation="vertical">
 
@@ -17,7 +18,7 @@
             android:orientation="vertical"
             android:paddingBottom="8dp">
 
-            <TextView
+            <net.osmand.plus.widgets.TextViewEx
                 android:id="@+id/save_as_new_track_title"
                 android:layout_width="match_parent"
                 android:layout_height="52dp"
@@ -25,7 +26,8 @@
                 android:paddingEnd="16dp"
                 android:paddingStart="16dp"
                 android:text="@string/shared_string_save_as_gpx"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+                android:textAppearance="@style/TextAppearance.ListItemTitle"
+                osmand:typeface="@string/font_roboto_medium"/>
 
             <TextView
                 android:layout_width="match_parent"
@@ -39,7 +41,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:layout_marginBottom="16dp">
 
                 <RelativeLayout
                     android:layout_width="0dp"
@@ -65,7 +68,9 @@
                         android:layout_height="wrap_content"
                         android:layout_alignLeft="@id/route_point_image"
                         android:layout_alignStart="@id/route_point_image"
-                        android:layout_margin="8dp"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
                         android:text="@string/route_point"
                         android:textColor="?android:textColorSecondary"
                         android:textSize="@dimen/default_split_segments_sub"/>
@@ -96,7 +101,9 @@
                         android:layout_height="wrap_content"
                         android:layout_alignLeft="@id/line_image"
                         android:layout_alignStart="@id/line_image"
-                        android:layout_margin="8dp"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
                         android:text="@string/line"
                         android:textColor="?android:textColorSecondary"
                         android:textSize="@dimen/default_split_segments_sub"/>

From 353980552d143e7fe55d729b3cd51466bd99deea Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Thu, 17 Aug 2017 18:56:18 +0300
Subject: [PATCH 138/174] Use BottomSheetDialogFragment from material design

---
 ...gment_snap_to_road_bottom_sheet_dialog.xml | 54 +++++-----
 .../SnapToRoadBottomSheetDialogFragment.java  | 98 ++++++++-----------
 2 files changed, 69 insertions(+), 83 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
index 15eabef32f..86e1ad62e5 100644
--- a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<android.support.v4.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/bg_color"
-    android:orientation="vertical">
+    android:background="@drawable/bg_bottom_menu_dark">
 
-    <ScrollView
-        android:id="@+id/navigation_types_scroll_view"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:background="?attr/bg_color"
+        android:orientation="vertical">
 
         <LinearLayout
             android:id="@+id/navigation_types_container"
@@ -38,28 +38,28 @@
                 android:textSize="@dimen/default_desc_text_size"/>
         </LinearLayout>
 
-    </ScrollView>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?attr/dashboard_divider"/>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?attr/dashboard_divider"/>
+        <FrameLayout
+            android:id="@+id/cancel_row"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/measure_distance_bottom_sheet_cancel_button_height"
+            android:background="?attr/selectableItemBackground">
 
-    <FrameLayout
-        android:id="@+id/cancel_row"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/measure_distance_bottom_sheet_cancel_button_height"
-        android:background="?attr/selectableItemBackground">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/shared_string_cancel"
+                android:textAllCaps="true"
+                android:textColor="?attr/color_dialog_buttons"
+                android:textSize="14sp"
+                android:textStyle="bold"/>
+        </FrameLayout>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/shared_string_cancel"
-            android:textAllCaps="true"
-            android:textColor="?attr/color_dialog_buttons"
-            android:textSize="14sp"
-            android:textStyle="bold"/>
-    </FrameLayout>
+    </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index f1adb4ac87..9b8084ad99 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -1,32 +1,33 @@
 package net.osmand.plus.measurementtool;
 
+import android.app.Dialog;
+import android.content.DialogInterface;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
 import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
+import android.support.design.widget.BottomSheetBehavior;
+import android.support.design.widget.BottomSheetDialog;
+import android.support.v4.content.ContextCompat;
 import android.view.ContextThemeWrapper;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import net.osmand.AndroidUtils;
 import net.osmand.plus.ApplicationMode;
+import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
-import net.osmand.plus.base.BottomSheetDialogFragment;
+import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.AndroidUiHelper;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragment {
+public class SnapToRoadBottomSheetDialogFragment extends android.support.design.widget.BottomSheetDialogFragment {
 
 	public static final String TAG = "SnapToRoadBottomSheetDialogFragment";
 
@@ -39,18 +40,20 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 		this.listener = listener;
 	}
 
-	@Nullable
 	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public void setupDialog(Dialog dialog, int style) {
+		super.setupDialog(dialog, style);
+
 		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
 		final OsmandSettings settings = getMyApplication().getSettings();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
-		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_snap_to_road_bottom_sheet_dialog, container);
-		if (portrait) {
-			AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
-		}
+		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_snap_to_road_bottom_sheet_dialog, null);
+
+		AndroidUtils.setBackground(getActivity(), mainView, nightMode,
+				portrait ? R.drawable.bg_bottom_menu_light : R.drawable.bg_bottom_sheet_topsides_landscape_light,
+				portrait ? R.drawable.bg_bottom_menu_dark : R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 
 		mainView.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -58,13 +61,16 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 				dismiss();
 			}
 		});
+
 		if (nightMode) {
-			((TextView) mainView.findViewById(R.id.choose_navigation_title)).setTextColor(getResources().getColor(R.color.ctx_menu_info_text_dark));
+			((TextView) mainView.findViewById(R.id.choose_navigation_title))
+					.setTextColor(ContextCompat.getColor(getActivity(), R.color.ctx_menu_info_text_dark));
 		}
 
-		LinearLayout navContainer = (LinearLayout) mainView.findViewById(R.id.navigation_types_container);
+		LinearLayout container = (LinearLayout) mainView.findViewById(R.id.navigation_types_container);
 		final List<ApplicationMode> modes = new ArrayList<>(ApplicationMode.values(settings));
 		modes.remove(ApplicationMode.DEFAULT);
+
 		View.OnClickListener onClickListener = new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
@@ -75,6 +81,7 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 				dismiss();
 			}
 		};
+
 		for (int i = 0; i < modes.size(); i++) {
 			ApplicationMode mode = modes.get(i);
 			View row = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.list_item_icon_and_title, null);
@@ -82,47 +89,22 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 			((TextView) row.findViewById(R.id.title)).setText(mode.toHumanString(getContext()));
 			row.setOnClickListener(onClickListener);
 			row.setTag(i);
-			navContainer.addView(row);
+			container.addView(row);
 		}
 
-		final int screenHeight = AndroidUtils.getScreenHeight(getActivity());
-		final int statusBarHeight = AndroidUtils.getStatusBarHeight(getActivity());
-		final int navBarHeight = AndroidUtils.getNavBarHeight(getActivity());
-
-		mainView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-			@Override
-			public void onGlobalLayout() {
-				final View scrollView = mainView.findViewById(R.id.navigation_types_scroll_view);
-				int scrollViewHeight = scrollView.getHeight();
-				int dividerHeight = AndroidUtils.dpToPx(getContext(), 1);
-				int cancelButtonHeight = getContext().getResources().getDimensionPixelSize(R.dimen.measure_distance_bottom_sheet_cancel_button_height);
-				int spaceForScrollView = screenHeight - statusBarHeight - navBarHeight - dividerHeight - cancelButtonHeight;
-				if (scrollViewHeight > spaceForScrollView) {
-					scrollView.getLayoutParams().height = spaceForScrollView;
-					scrollView.requestLayout();
+		if (!portrait) {
+			dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+				@Override
+				public void onShow(DialogInterface dialogInterface) {
+					BottomSheetDialog dialog = (BottomSheetDialog) dialogInterface;
+					FrameLayout bottomSheet = (FrameLayout) dialog.findViewById(android.support.design.R.id.design_bottom_sheet);
+					BottomSheetBehavior.from(bottomSheet).setState(BottomSheetBehavior.STATE_EXPANDED);
 				}
+			});
+		}
 
-				if (!portrait) {
-					if (screenHeight - statusBarHeight - mainView.getHeight()
-							>= AndroidUtils.dpToPx(getActivity(), 8)) {
-						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
-								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
-					} else {
-						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
-								R.drawable.bg_bottom_sheet_sides_landscape_light, R.drawable.bg_bottom_sheet_sides_landscape_dark);
-					}
-				}
-
-				ViewTreeObserver obs = mainView.getViewTreeObserver();
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-					obs.removeOnGlobalLayoutListener(this);
-				} else {
-					obs.removeGlobalOnLayoutListener(this);
-				}
-			}
-		});
-
-		return mainView;
+		dialog.setContentView(mainView);
+		((View) mainView.getParent()).setBackgroundResource(0);
 	}
 
 	@Override
@@ -144,9 +126,13 @@ public class SnapToRoadBottomSheetDialogFragment extends BottomSheetDialogFragme
 		super.onDestroyView();
 	}
 
-	@Override
-	protected Drawable getContentIcon(@DrawableRes int id) {
-		return getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.on_map_icon_color);
+	private OsmandApplication getMyApplication() {
+		return ((MapActivity) getActivity()).getMyApplication();
+	}
+
+	private Drawable getContentIcon(@DrawableRes int id) {
+		return getMyApplication().getIconsCache()
+				.getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.on_map_icon_color);
 	}
 
 	interface SnapToRoadFragmentListener {

From 25cd46b59cfc6358c804b89631e0ec0503a00c37 Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 18 Aug 2017 10:18:39 +0300
Subject: [PATCH 139/174] Fix paddings

---
 .../fragment_options_bottom_sheet_dialog.xml  | 12 +++++++++++
 ..._save_as_new_track_bottom_sheet_dialog.xml | 20 ++++++++++++-------
 ...ment_selected_menu_bottom_sheet_dialog.xml | 11 +++++++++-
 ...gment_snap_to_road_bottom_sheet_dialog.xml |  4 ++++
 .../res/layout/list_item_icon_and_title.xml   |  2 ++
 .../res/layout/measure_points_list_item.xml   |  4 ++++
 6 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
index 7ff121d5f2..44173d60c8 100644
--- a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
@@ -25,6 +25,8 @@
                 android:layout_height="52dp"
                 android:gravity="center_vertical"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp"
                 android:text="@string/shared_string_options"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
@@ -37,6 +39,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -108,6 +112,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp"
                 android:visibility="gone">
 
@@ -138,6 +144,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -167,6 +175,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -205,6 +215,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
diff --git a/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
index fef2af6000..6899d619aa 100644
--- a/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:background="?attr/bg_color"
               android:orientation="vertical">
 
@@ -24,6 +24,8 @@
                 android:layout_height="52dp"
                 android:gravity="center_vertical"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp"
                 android:text="@string/shared_string_save_as_gpx"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
@@ -33,6 +35,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="44dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp"
                 android:text="@string/measurement_tool_save_as_new_track_descr"
                 android:textColor="?android:textColorSecondary"
@@ -41,8 +45,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_marginBottom="16dp">
+                android:layout_marginBottom="16dp"
+                android:orientation="horizontal">
 
                 <RelativeLayout
                     android:layout_width="0dp"
@@ -68,13 +72,12 @@
                         android:layout_height="wrap_content"
                         android:layout_alignLeft="@id/route_point_image"
                         android:layout_alignStart="@id/route_point_image"
-                        android:layout_marginTop="8dp"
                         android:layout_marginLeft="10dp"
                         android:layout_marginStart="10dp"
+                        android:layout_marginTop="8dp"
                         android:text="@string/route_point"
                         android:textColor="?android:textColorSecondary"
                         android:textSize="@dimen/default_split_segments_sub"/>
-
                 </RelativeLayout>
 
                 <RelativeLayout
@@ -101,13 +104,12 @@
                         android:layout_height="wrap_content"
                         android:layout_alignLeft="@id/line_image"
                         android:layout_alignStart="@id/line_image"
-                        android:layout_marginTop="8dp"
                         android:layout_marginLeft="10dp"
                         android:layout_marginStart="10dp"
+                        android:layout_marginTop="8dp"
                         android:text="@string/line"
                         android:textColor="?android:textColorSecondary"
                         android:textSize="@dimen/default_split_segments_sub"/>
-
                 </RelativeLayout>
 
             </LinearLayout>
@@ -119,6 +121,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -148,6 +152,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
diff --git a/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml
index 5c84a80758..03138ed207 100644
--- a/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml
@@ -23,6 +23,8 @@
                 android:layout_height="56dp"
                 android:minHeight="56dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -59,7 +61,6 @@
                         android:textColor="?android:textColorSecondary"
                         android:textSize="@dimen/default_list_text_size"
                         tools:text="386 m"/>
-
                 </LinearLayout>
 
             </RelativeLayout>
@@ -77,6 +78,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -106,6 +109,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -144,6 +149,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -173,6 +180,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
diff --git a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
index 86e1ad62e5..2092dea9a5 100644
--- a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
@@ -24,6 +24,8 @@
                 android:layout_height="52dp"
                 android:gravity="center_vertical"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp"
                 android:text="@string/choose_navigation_type"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"/>
@@ -32,6 +34,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="44dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp"
                 android:text="@string/measurement_tool_snap_to_road_descr"
                 android:textColor="?android:textColorSecondary"
diff --git a/OsmAnd/res/layout/list_item_icon_and_title.xml b/OsmAnd/res/layout/list_item_icon_and_title.xml
index e98a58a395..b2a7b0dfcf 100644
--- a/OsmAnd/res/layout/list_item_icon_and_title.xml
+++ b/OsmAnd/res/layout/list_item_icon_and_title.xml
@@ -7,6 +7,8 @@
     android:background="?attr/selectableItemBackground"
     android:minHeight="48dp"
     android:paddingEnd="16dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:paddingStart="16dp">
 
     <ImageView
diff --git a/OsmAnd/res/layout/measure_points_list_item.xml b/OsmAnd/res/layout/measure_points_list_item.xml
index 270a227fef..54d994d669 100644
--- a/OsmAnd/res/layout/measure_points_list_item.xml
+++ b/OsmAnd/res/layout/measure_points_list_item.xml
@@ -20,6 +20,8 @@
             android:layout_centerVertical="true"
             android:paddingBottom="12dp"
             android:paddingEnd="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
             android:paddingStart="16dp"
             android:paddingTop="12dp"
             android:tint="?attr/secondary_icon_color"
@@ -47,6 +49,8 @@
             android:focusableInTouchMode="true"
             android:paddingBottom="12dp"
             android:paddingEnd="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
             android:paddingStart="16dp"
             android:paddingTop="12dp"
             tools:src="@drawable/ic_action_remove_dark"/>

From 923614a239ec357cbb7167b1fd40d0f65f58ddf5 Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 18 Aug 2017 10:32:57 +0300
Subject: [PATCH 140/174] Fix margins

---
 OsmAnd/res/layout-land/fragment_measurement_tool.xml | 4 +++-
 OsmAnd/res/layout/fragment_measurement_tool.xml      | 2 ++
 OsmAnd/res/layout/save_gpx_dialog.xml                | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
index 8f7ee0bfeb..fa6f5193ae 100644
--- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -61,6 +61,8 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     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"/>
@@ -278,8 +280,8 @@
             <LinearLayout
                 android:id="@+id/add_point_before_after_controls"
                 android:layout_width="0dp"
-                android:layout_weight="0.6"
                 android:layout_height="52dp"
+                android:layout_weight="0.6"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
                 android:visibility="gone">
diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 9d79388013..b1e0773468 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -56,6 +56,8 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 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"/>
diff --git a/OsmAnd/res/layout/save_gpx_dialog.xml b/OsmAnd/res/layout/save_gpx_dialog.xml
index 7ae9fc7579..947b21db17 100644
--- a/OsmAnd/res/layout/save_gpx_dialog.xml
+++ b/OsmAnd/res/layout/save_gpx_dialog.xml
@@ -10,6 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:inputType="text"/>
@@ -19,6 +21,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:layout_marginStart="16dp"
         android:gravity="center_horizontal"
         android:text="@string/file_with_name_already_exists"

From c9ec0df1d1f0c8830534c4fc1a6ac12342b05726 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 18 Aug 2017 10:40:11 +0300
Subject: [PATCH 141/174] Fix adding point after

---
 .../MeasurementToolFragment.java              | 32 +++++++++++--------
 .../command/MeasurementCommandManager.java    |  4 ++-
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index e071ec4fb2..e808fabeb7 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -865,13 +865,14 @@ public class MeasurementToolFragment extends Fragment {
 	private void addPointAfter() {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null && positionToAddPoint != -1) {
-			addPointToPosition(positionToAddPoint);
-			selectedPointPos += 1;
-			selectedCachedPoint = new WptPt(measurementLayer.getMeasurementPoints().get(selectedPointPos));
-			measurementLayer.setSelectedPointPos(selectedPointPos);
-			measurementLayer.setSelectedCachedPoint(selectedCachedPoint);
-			measurementLayer.refreshMap();
-			positionToAddPoint += 1;
+			if (addPointToPosition(positionToAddPoint)) {
+				selectedPointPos += 1;
+				selectedCachedPoint = new WptPt(measurementLayer.getMeasurementPoints().get(selectedPointPos));
+				measurementLayer.setSelectedPointPos(selectedPointPos);
+				measurementLayer.setSelectedCachedPoint(selectedCachedPoint);
+				measurementLayer.refreshMap();
+				positionToAddPoint += 1;
+			}
 		}
 	}
 
@@ -906,11 +907,12 @@ public class MeasurementToolFragment extends Fragment {
 	private void addPointBefore() {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null && positionToAddPoint != -1) {
-			addPointToPosition(positionToAddPoint);
-			selectedCachedPoint = new WptPt(measurementLayer.getMeasurementPoints().get(selectedPointPos));
-			measurementLayer.setSelectedPointPos(selectedPointPos);
-			measurementLayer.setSelectedCachedPoint(selectedCachedPoint);
-			measurementLayer.refreshMap();
+			if (addPointToPosition(positionToAddPoint)) {
+				selectedCachedPoint = new WptPt(measurementLayer.getMeasurementPoints().get(selectedPointPos));
+				measurementLayer.setSelectedPointPos(selectedPointPos);
+				measurementLayer.setSelectedCachedPoint(selectedCachedPoint);
+				measurementLayer.refreshMap();
+			}
 		}
 	}
 
@@ -1013,16 +1015,18 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
-	private void addPointToPosition(int position) {
+	private boolean addPointToPosition(int position) {
+		boolean added = false;
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
-			commandManager.execute(new AddPointCommand(measurementLayer, position));
+			added = commandManager.execute(new AddPointCommand(measurementLayer, position));
 			enable(undoBtn, upDownBtn);
 			disable(redoBtn);
 			updateText();
 			adapter.notifyDataSetChanged();
 			saved = false;
 		}
+		return added;
 	}
 
 	private void showPointsList() {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java
index f1819d874e..503cae2704 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java
@@ -18,11 +18,13 @@ public class MeasurementCommandManager {
 		return redoCommands.size() > 0;
 	}
 
-	public void execute(MeasurementModeCommand command) {
+	public boolean execute(MeasurementModeCommand command) {
 		if (command.execute()) {
 			undoCommands.push(command);
 			redoCommands.clear();
+			return true;
 		}
+		return false;
 	}
 
 	public void undo() {

From a3b64abc71e00234442e4ea910c3d2a52e7487d9 Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 18 Aug 2017 10:52:58 +0300
Subject: [PATCH 142/174] Add small changes

---
 .../measurementtool/MeasurementToolFragment.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index e808fabeb7..b82c9faecc 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -145,6 +145,7 @@ public class MeasurementToolFragment extends Fragment {
 			measurementLayer.setSelectedCachedPoint(selectedCachedPoint);
 		}
 
+		// Handling screen rotation
 		FragmentManager fragmentManager = mapActivity.getSupportFragmentManager();
 		Fragment selectedPointFragment = fragmentManager.findFragmentByTag(SelectedPointBottomSheetDialogFragment.TAG);
 		if (selectedPointFragment != null) {
@@ -164,6 +165,11 @@ public class MeasurementToolFragment extends Fragment {
 		if (saveAsNewTrackFragment != null) {
 			((SaveAsNewTrackBottomSheetDialogFragment) saveAsNewTrackFragment).setListener(createSaveAsNewTrackFragmentListener());
 		}
+		// If rotate the screen from landscape to portrait when the list of points is displayed then
+		// the PointsListFragment will exist without view. This is necessary to remove it.
+		if (portrait) {
+			hidePointsListFragment();
+		}
 
 		commandManager.resetMeasurementLayer(measurementLayer);
 		iconsCache = mapActivity.getMyApplication().getIconsCache();
@@ -434,12 +440,6 @@ public class MeasurementToolFragment extends Fragment {
 
 		enterMeasurementMode();
 
-		// If rotate the screen from landscape to portrait when the list of points is displayed then
-		// the PointsListFragment will exist without view. This is necessary to remove it.
-		if (portrait) {
-			hidePointsListFragment();
-		}
-
 		if (snapToRoadEnabled) {
 			enableSnapToRoadMode();
 		}

From a0bb8852d2476ac56ddabcf5d46c32e88ae2b565 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 18 Aug 2017 11:22:57 +0300
Subject: [PATCH 143/174] Fix round button

---
 ...e_border.xml => btn_round_border_dark.xml} | 12 ++++-----
 .../res/drawable/btn_round_border_light.xml   | 26 +++++++++++++++++++
 .../layout-land/fragment_measurement_tool.xml |  2 +-
 .../res/layout/fragment_measurement_tool.xml  |  2 +-
 OsmAnd/res/values/attrs.xml                   |  1 +
 OsmAnd/res/values/styles.xml                  |  2 ++
 6 files changed, 37 insertions(+), 8 deletions(-)
 rename OsmAnd/res/drawable/{btn_round_white_border.xml => btn_round_border_dark.xml} (76%)
 create mode 100644 OsmAnd/res/drawable/btn_round_border_light.xml

diff --git a/OsmAnd/res/drawable/btn_round_white_border.xml b/OsmAnd/res/drawable/btn_round_border_dark.xml
similarity index 76%
rename from OsmAnd/res/drawable/btn_round_white_border.xml
rename to OsmAnd/res/drawable/btn_round_border_dark.xml
index 253910d05a..2298693b61 100644
--- a/OsmAnd/res/drawable/btn_round_white_border.xml
+++ b/OsmAnd/res/drawable/btn_round_border_dark.xml
@@ -3,22 +3,22 @@
 
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <solid android:color="?attr/bg_color" />
-            <stroke android:color="@color/map_widget_blue_pressed" android:width="3dp"/>
+            <solid android:color="@color/bg_color_dark" />
+            <stroke android:color="@color/map_widget_blue_pressed" android:width="1dp"/>
             <corners android:radius="@dimen/map_button_rect_rad" />
         </shape>
     </item>
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
-            <solid android:color="?attr/bg_color" />
-            <stroke android:color="@color/searchbar_tab_inactive_light" android:width="3dp"/>
+            <solid android:color="@color/bg_color_dark" />
+            <stroke android:color="@color/searchbar_tab_inactive_light" android:width="1dp"/>
             <corners android:radius="@dimen/map_button_rect_rad" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="?attr/bg_color" />
-            <stroke android:color="@color/map_widget_blue" android:width="3dp"/>
+            <solid android:color="@color/bg_color_dark" />
+            <stroke android:color="@color/map_widget_blue" android:width="1dp"/>
             <corners android:radius="@dimen/map_button_rect_rad" />
         </shape>
     </item>
diff --git a/OsmAnd/res/drawable/btn_round_border_light.xml b/OsmAnd/res/drawable/btn_round_border_light.xml
new file mode 100644
index 0000000000..409be98cc2
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_round_border_light.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/bg_color_light" />
+            <stroke android:color="@color/map_widget_blue_pressed" android:width="1dp"/>
+            <corners android:radius="@dimen/map_button_rect_rad" />
+        </shape>
+    </item>
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/bg_color_light" />
+            <stroke android:color="@color/searchbar_tab_inactive_light" android:width="1dp"/>
+            <corners android:radius="@dimen/map_button_rect_rad" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/bg_color_light" />
+            <stroke android:color="@color/map_widget_blue" android:width="1dp"/>
+            <corners android:radius="@dimen/map_button_rect_rad" />
+        </shape>
+    </item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
index fa6f5193ae..c67868f0a9 100644
--- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -314,7 +314,7 @@
                     android:layout_marginEnd="8dp"
                     android:layout_marginRight="8dp"
                     android:layout_marginTop="8dp"
-                    android:background="@drawable/btn_round_white_border"
+                    android:background="?attr/btn_round_border"
                     android:minHeight="36dp"
                     android:paddingLeft="8dp"
                     android:paddingRight="8dp"
diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index b1e0773468..0e0feba970 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -331,7 +331,7 @@
                 android:layout_marginEnd="8dp"
                 android:layout_marginRight="8dp"
                 android:layout_marginTop="8dp"
-                android:background="@drawable/btn_round_white_border"
+                android:background="?attr/btn_round_border"
                 android:minHeight="36dp"
                 android:paddingLeft="8dp"
                 android:paddingRight="8dp"
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index f768775e3a..607dd9269b 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -16,6 +16,7 @@
 		<attr name="expandable_list_item_background" format="color"/>
 		<attr name="expandable_list_background" format="color"/>
 		<attr name="bg_color" format="reference" />
+        <attr name="btn_round_border" format="reference" />
 		<attr name="bg_card" format="reference" />
         <attr name="context_menu_card" format="reference" />
         <attr name="ctx_menu_card_btn" format="reference" />
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index a4a983d4bf..816136016b 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -109,6 +109,7 @@
         <item name="actionModeBackground">@color/actionbar_light_color</item>
         <item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
         <item name="bg_color">@color/bg_color_light</item>
+        <item name="btn_round_border">@drawable/btn_round_border_light</item>
         <item name="bg_card">@drawable/bg_card_light</item>
         <item name="context_menu_card">@drawable/context_menu_card_light</item>
         <item name="bg_map_context_menu">@drawable/bg_map_context_menu_light</item>
@@ -282,6 +283,7 @@
         <item name="actionModeBackground">@color/actionbar_dark_color</item>
         <item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
         <item name="bg_color">@color/bg_color_dark</item>
+        <item name="btn_round_border">@drawable/btn_round_border_dark</item>
         <item name="bg_card">@drawable/bg_card_dark</item>
         <item name="context_menu_card">@drawable/context_menu_card_dark</item>
         <item name="bg_map_context_menu">@drawable/bg_map_context_menu_dark</item>

From 3485cde011b1ab56985cfeefe756edfab34af0da Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 18 Aug 2017 12:07:24 +0300
Subject: [PATCH 144/174] Don't show images row on api less than 17

---
 ..._save_as_new_track_bottom_sheet_dialog.xml |  1 +
 ...veAsNewTrackBottomSheetDialogFragment.java | 54 +++++++++++--------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
index 6899d619aa..81619c88c7 100644
--- a/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
@@ -43,6 +43,7 @@
                 android:textSize="@dimen/default_desc_text_size"/>
 
             <LinearLayout
+                android:id="@+id/images_row"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="16dp"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java
index 43f6bb8f30..fb85028c62 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java
@@ -18,6 +18,7 @@ import android.widget.TextView;
 
 import net.osmand.AndroidUtils;
 import net.osmand.plus.R;
+import net.osmand.plus.Version;
 import net.osmand.plus.base.BottomSheetDialogFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
 
@@ -45,37 +46,44 @@ public class SaveAsNewTrackBottomSheetDialogFragment extends BottomSheetDialogFr
 			AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
 		}
 
-		final ImageView routePointImage = (ImageView) mainView.findViewById(R.id.route_point_image);
-		ImageView lineImage = (ImageView) mainView.findViewById(R.id.line_image);
+		if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
+			mainView.findViewById(R.id.images_row).setVisibility(View.GONE);
+		} else {
+			final ImageView routePointImage = (ImageView) mainView.findViewById(R.id.route_point_image);
+			ImageView lineImage = (ImageView) mainView.findViewById(R.id.line_image);
+			if (nightMode) {
+				routePointImage.setImageResource(R.drawable.img_help_trip_route_points_night);
+				lineImage.setImageResource(R.drawable.img_help_trip_track_night);
+			} else {
+				routePointImage.setImageResource(R.drawable.img_help_trip_route_points_day);
+				lineImage.setImageResource(R.drawable.img_help_trip_track_day);
+			}
+
+			mainView.findViewById(R.id.line_text).setOnTouchListener(new View.OnTouchListener() {
+				@Override
+				public boolean onTouch(View view, MotionEvent motionEvent) {
+					return false;
+				}
+			});
+			lineImage.setOnClickListener(saveAsLineOnClickListener);
+
+			mainView.findViewById(R.id.route_point_text).setOnTouchListener(new View.OnTouchListener() {
+				@Override
+				public boolean onTouch(View view, MotionEvent motionEvent) {
+					return false;
+				}
+			});
+			routePointImage.setOnClickListener(saveAsLineOnClickListener);
+		}
+
 		if (nightMode) {
 			((TextView) mainView.findViewById(R.id.save_as_new_track_title)).setTextColor(getResources().getColor(R.color.ctx_menu_info_text_dark));
-
-			routePointImage.setImageResource(R.drawable.img_help_trip_route_points_night);
-			lineImage.setImageResource(R.drawable.img_help_trip_track_night);
-		} else {
-			routePointImage.setImageResource(R.drawable.img_help_trip_route_points_day);
-			lineImage.setImageResource(R.drawable.img_help_trip_track_day);
 		}
 
 		((ImageView) mainView.findViewById(R.id.route_point_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_route_points));
 		((ImageView) mainView.findViewById(R.id.line_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_split_interval));
 
-		mainView.findViewById(R.id.line_text).setOnTouchListener(new View.OnTouchListener() {
-			@Override
-			public boolean onTouch(View view, MotionEvent motionEvent) {
-				return false;
-			}
-		});
-		lineImage.setOnClickListener(saveAsLineOnClickListener);
 		mainView.findViewById(R.id.save_as_line_row).setOnClickListener(saveAsLineOnClickListener);
-
-		mainView.findViewById(R.id.route_point_text).setOnTouchListener(new View.OnTouchListener() {
-			@Override
-			public boolean onTouch(View view, MotionEvent motionEvent) {
-				return false;
-			}
-		});
-		routePointImage.setOnClickListener(saveAsLineOnClickListener);
 		mainView.findViewById(R.id.save_as_route_point_row).setOnClickListener(saveAsRoutePointOnClickListener);
 
 		mainView.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {

From 29f3b73066b028ef887a021b1d209c8f450c1446 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 18 Aug 2017 12:08:20 +0300
Subject: [PATCH 145/174] Fix saving as route points

---
 .../SaveAsNewTrackBottomSheetDialogFragment.java                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java
index fb85028c62..5ea34628da 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java
@@ -73,7 +73,7 @@ public class SaveAsNewTrackBottomSheetDialogFragment extends BottomSheetDialogFr
 					return false;
 				}
 			});
-			routePointImage.setOnClickListener(saveAsLineOnClickListener);
+			routePointImage.setOnClickListener(saveAsRoutePointOnClickListener);
 		}
 
 		if (nightMode) {

From 8f91e275d60db0c43357bdea51f2940d5db25b96 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 18 Aug 2017 12:35:23 +0300
Subject: [PATCH 146/174] Show all gpx in dialog when adding to track

---
 .../plus/measurementtool/MeasurementToolFragment.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index b82c9faecc..7cfff7d87a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -560,7 +560,7 @@ public class MeasurementToolFragment extends Fragment {
 			public void addToTheTrackOnClick() {
 				if (mapActivity != null && measurementLayer != null) {
 					if (measurementLayer.getPointsCount() > 0) {
-						showAddSegmentDialog(mapActivity);
+						showAddToTrackDialog(mapActivity);
 					} else {
 						Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
 					}
@@ -809,7 +809,7 @@ public class MeasurementToolFragment extends Fragment {
 		fragment.show(mapActivity.getSupportFragmentManager(), SaveAsNewTrackBottomSheetDialogFragment.TAG);
 	}
 
-	private AlertDialog showAddSegmentDialog(final MapActivity mapActivity) {
+	private AlertDialog showAddToTrackDialog(final MapActivity mapActivity) {
 		CallbackWithObject<GPXFile[]> callbackWithObject = new CallbackWithObject<GPXFile[]>() {
 			@Override
 			public boolean processResult(GPXFile[] result) {
@@ -824,7 +824,7 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		};
 
-		return GpxUiHelper.selectSingleGPXFile(mapActivity, false, callbackWithObject);
+		return GpxUiHelper.selectGPXFile(mapActivity, false, false, callbackWithObject);
 	}
 
 	private void applyMovePointMode() {

From 4c76ea27511c25b29771f5c99147ebed0241fb94 Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 18 Aug 2017 12:50:07 +0300
Subject: [PATCH 147/174] Remove unnecessary code

---
 .../measurementtool/MeasurementToolLayer.java | 71 ++++++++-----------
 1 file changed, 28 insertions(+), 43 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 1397deb57e..bb7393ad10 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -7,7 +7,6 @@ import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PointF;
 
-import net.osmand.AndroidUtils;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.data.QuadPoint;
@@ -253,54 +252,40 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 						locX = tb.getPixXFromLonNoRot(pt.lon);
 						locY = tb.getPixYFromLatNoRot(pt.lat);
 					}
-					if (i == 0) {
-						if (inAddPointAfterMode) {
-							int previousLocX = tb.getPixXFromLonNoRot(pt.lon);
-							int previousLocY = tb.getPixYFromLatNoRot(pt.lat);
+					if (inAddPointAfterMode) {
+						int previousLocX = tb.getPixXFromLonNoRot(pt.lon);
+						int previousLocY = tb.getPixYFromLatNoRot(pt.lat);
+						if (i == 0) {
 							path.moveTo(previousLocX, previousLocY);
-							tx.add(previousLocX);
-							ty.add(previousLocY);
-							path.lineTo(locX, locY);
-							tx.add(locX);
-							ty.add(locY);
-						} else if (inAddPointBeforeMode) {
-							path.moveTo(locX, locY);
-							tx.add(locX);
-							ty.add(locY);
-							int followingLocX = tb.getPixXFromLonNoRot(pt.lon);
-							int followingLocY = tb.getPixYFromLatNoRot(pt.lat);
-							path.lineTo(followingLocX, followingLocY);
-							tx.add(followingLocX);
-							ty.add(followingLocY);
 						} else {
-							path.moveTo(locX, locY);
-							tx.add(locX);
-							ty.add(locY);
-						}
-					} else {
-						if (inAddPointAfterMode) {
-							int previousLocX = tb.getPixXFromLonNoRot(pt.lon);
-							int previousLocY = tb.getPixYFromLatNoRot(pt.lat);
 							path.lineTo(previousLocX, previousLocY);
-							tx.add(previousLocX);
-							ty.add(previousLocY);
-							path.lineTo(locX, locY);
-							tx.add(locX);
-							ty.add(locY);
-						} else if (inAddPointBeforeMode) {
-							path.lineTo(locX, locY);
-							tx.add(locX);
-							ty.add(locY);
-							int followingLocX = tb.getPixXFromLonNoRot(pt.lon);
-							int followingLocY = tb.getPixYFromLatNoRot(pt.lat);
-							path.lineTo(followingLocX, followingLocY);
-							tx.add(followingLocX);
-							ty.add(followingLocY);
+						}
+						tx.add(previousLocX);
+						ty.add(previousLocY);
+						path.lineTo(locX, locY);
+						tx.add(locX);
+						ty.add(locY);
+					} else if (inAddPointBeforeMode) {
+						if (i == 0) {
+							path.moveTo(locX, locY);
 						} else {
 							path.lineTo(locX, locY);
-							tx.add(locX);
-							ty.add(locY);
 						}
+						tx.add(locX);
+						ty.add(locY);
+						int followingLocX = tb.getPixXFromLonNoRot(pt.lon);
+						int followingLocY = tb.getPixYFromLatNoRot(pt.lat);
+						path.lineTo(followingLocX, followingLocY);
+						tx.add(followingLocX);
+						ty.add(followingLocY);
+					} else {
+						if (i == 0) {
+							path.moveTo(locX, locY);
+						} else {
+							path.lineTo(locX, locY);
+						}
+						tx.add(locX);
+						ty.add(locY);
 					}
 				}
 				if (!inMovePointMode && !inAddPointAfterMode && !inAddPointBeforeMode) {

From 3e817f9ab019a60053c5f215548f2cf6a284c1c2 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 18 Aug 2017 13:57:44 +0300
Subject: [PATCH 148/174] Close modes when quit

---
 .../osmand/plus/activities/MapActivity.java   |  2 +-
 .../MeasurementToolFragment.java              | 53 +++++++++++++++++--
 2 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 9b6b5aa3ef..7c3a4d3e36 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -502,7 +502,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 			}
 		}
 		if (getMeasurementToolFragment() != null) {
-			getMeasurementToolFragment().showQuitDialog(true);
+			getMeasurementToolFragment().quit(true);
 			return;
 		}
 		if (mapContextMenu.isVisible() && mapContextMenu.isClosable()) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 7cfff7d87a..e41e0002d3 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -387,6 +387,11 @@ public class MeasurementToolFragment extends Fragment {
 		}
 
 		toolBarController = new MeasurementToolBarController(newGpxLine);
+		if (inMovePointMode || inAddPointAfterMode || inAddPointBeforeMode) {
+			toolBarController.setBackBtnIconIds(R.drawable.ic_action_mode_back, R.drawable.ic_action_mode_back);
+		} else {
+			toolBarController.setBackBtnIconIds(R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_dark);
+		}
 		if (newGpxLine != null) {
 			LineType lineType = newGpxLine.getLineType();
 			if (lineType == LineType.ADD_ROUTE_POINTS) {
@@ -402,7 +407,7 @@ public class MeasurementToolFragment extends Fragment {
 		toolBarController.setOnBackButtonClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				showQuitDialog(false);
+				quit(false);
 			}
 		});
 		toolBarController.setOnSaveViewClickListener(new View.OnClickListener() {
@@ -951,6 +956,15 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void switchMovePointMode(boolean enable) {
 		inMovePointMode = enable;
+		if (inMovePointMode) {
+			toolBarController.setBackBtnIconIds(R.drawable.ic_action_mode_back, R.drawable.ic_action_mode_back);
+		} else {
+			toolBarController.setBackBtnIconIds(R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_dark);
+		}
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			mapActivity.showTopToolbar(toolBarController);
+		}
 		markGeneralComponents(enable ? View.GONE : View.VISIBLE);
 		mark(enable ? View.VISIBLE : View.GONE,
 				R.id.move_point_text,
@@ -962,6 +976,15 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void switchAddPointAfterMode(boolean enable) {
 		inAddPointAfterMode = enable;
+		if (inAddPointAfterMode) {
+			toolBarController.setBackBtnIconIds(R.drawable.ic_action_mode_back, R.drawable.ic_action_mode_back);
+		} else {
+			toolBarController.setBackBtnIconIds(R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_dark);
+		}
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			mapActivity.showTopToolbar(toolBarController);
+		}
 		markGeneralComponents(enable ? View.GONE : View.VISIBLE);
 		mark(enable ? View.VISIBLE : View.GONE,
 				R.id.add_point_after_text,
@@ -973,6 +996,15 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void switchAddPointBeforeMode(boolean enable) {
 		inAddPointBeforeMode = enable;
+		if (inAddPointBeforeMode) {
+			toolBarController.setBackBtnIconIds(R.drawable.ic_action_mode_back, R.drawable.ic_action_mode_back);
+		} else {
+			toolBarController.setBackBtnIconIds(R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_dark);
+		}
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			mapActivity.showTopToolbar(toolBarController);
+		}
 		markGeneralComponents(enable ? View.GONE : View.VISIBLE);
 		mark(enable ? View.VISIBLE : View.GONE,
 				R.id.add_point_before_text,
@@ -1406,7 +1438,23 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
-	public void showQuitDialog(boolean hidePointsListFirst) {
+	public void quit(boolean hidePointsListFirst) {
+		if (inMovePointMode) {
+			cancelMovePointMode();
+			return;
+		}
+		if (inAddPointAfterMode) {
+			cancelAddPointAfterMode();
+			return;
+		}
+		if (inAddPointBeforeMode) {
+			cancelAddPointBeforeMode();
+			return;
+		}
+		showQuitDialog(hidePointsListFirst);
+	}
+
+	private void showQuitDialog(boolean hidePointsListFirst) {
 		final MapActivity mapActivity = getMapActivity();
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (mapActivity != null && measurementLayer != null) {
@@ -1484,7 +1532,6 @@ public class MeasurementToolFragment extends Fragment {
 			if (newGpxLine != null) {
 				setSaveViewVisible(true);
 			}
-			setBackBtnIconIds(R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_dark);
 			setSingleLineTitle(false);
 		}
 

From 05c3f0f1d599410c23b4756e9fdcacfed36c12e7 Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 18 Aug 2017 14:35:57 +0300
Subject: [PATCH 149/174] Add snap to road logic

---
 .../MeasurementToolFragment.java              | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index e41e0002d3..5d8fabcc8c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -33,6 +33,8 @@ import android.widget.Toast;
 import net.osmand.AndroidUtils;
 import net.osmand.CallbackWithObject;
 import net.osmand.IndexConstants;
+import net.osmand.Location;
+import net.osmand.data.LatLon;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
@@ -43,6 +45,8 @@ import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.IconsCache;
 import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.TrackActivity;
@@ -63,6 +67,9 @@ import net.osmand.plus.measurementtool.command.MeasurementCommandManager;
 import net.osmand.plus.measurementtool.command.MovePointCommand;
 import net.osmand.plus.measurementtool.command.RemovePointCommand;
 import net.osmand.plus.measurementtool.command.ReorderPointCommand;
+import net.osmand.plus.routing.RouteCalculationParams;
+import net.osmand.plus.routing.RouteCalculationResult;
+import net.osmand.plus.routing.RouteProvider;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
@@ -70,6 +77,7 @@ import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarControll
 import java.io.File;
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -759,6 +767,10 @@ public class MeasurementToolFragment extends Fragment {
 				snapToRoadProgressBar.setProgress(45);
 				snapToRoadProgressBar.setVisibility(View.VISIBLE);
 
+				if (measurementPoints.size() > 1) {
+					new SnapToRoadTask(mapActivity).execute();
+				}
+
 				mapActivity.refreshMap();
 			}
 		}
@@ -1519,6 +1531,62 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
+	private class SnapToRoadTask extends AsyncTask<Void, Void, RouteCalculationResult> {
+
+		private MapActivity mapActivity;
+
+		SnapToRoadTask(MapActivity mapActivity) {
+			this.mapActivity = mapActivity;
+		}
+
+		@Override
+		protected RouteCalculationResult doInBackground(Void... voids) {
+			OsmandApplication app = mapActivity.getMyApplication();
+			OsmandSettings settings = app.getSettings();
+			RouteCalculationParams params = new RouteCalculationParams();
+
+			Location start = new Location("");
+			WptPt first = measurementPoints.get(0);
+			start.setLatitude(first.getLatitude());
+			start.setLongitude(first.getLongitude());
+
+			WptPt last = measurementPoints.get(measurementPoints.size() - 1);
+			LatLon end = new LatLon(last.getLatitude(), last.getLongitude());
+
+			params.start = start;
+			params.end = end;
+			params.leftSide = settings.DRIVING_REGION.get().leftHandDriving;
+			params.fast = settings.FAST_ROUTE_MODE.getModeValue(snapToRoadAppMode);
+			params.type = settings.ROUTER_SERVICE.getModeValue(snapToRoadAppMode);
+			params.mode = snapToRoadAppMode;
+			params.ctx = app;
+
+			List<LatLon> intermediates = new ArrayList<>();
+			if (measurementPoints.size() > 2) {
+				for (int i = 1; i < measurementPoints.size() - 1; i++) {
+					WptPt pt = measurementPoints.get(i);
+					intermediates.add(new LatLon(pt.getLatitude(), pt.getLongitude()));
+				}
+				params.intermediates = intermediates;
+			}
+
+			return new RouteProvider().calculateRouteImpl(params);
+		}
+
+		@Override
+		protected void onPostExecute(RouteCalculationResult result) {
+			measurementPoints.clear();
+			for (Location loc : result.getRouteLocations()) {
+				WptPt pt = new WptPt();
+				pt.lat = loc.getLatitude();
+				pt.lon = loc.getLongitude();
+				measurementPoints.add(pt);
+			}
+			mapActivity.refreshMap();
+			super.onPostExecute(result);
+		}
+	}
+
 	private class MeasurementToolBarController extends TopToolbarController {
 
 		MeasurementToolBarController(NewGpxLine newGpxLine) {

From f06f91df941203b156892d5856a907e21d7621da Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 18 Aug 2017 16:10:09 +0300
Subject: [PATCH 150/174] Draw not all the points in add route points mode

---
 .../measurementtool/MeasurementToolLayer.java | 66 ++++++++++++++-----
 1 file changed, 51 insertions(+), 15 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index bb7393ad10..24c9417ec1 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -39,10 +39,13 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private Paint bitmapPaint;
 	private final RenderingLineAttributes lineAttrs = new RenderingLineAttributes("measureDistanceLine");
 	private final Path path = new Path();
-	private int marginX;
-	private int marginY;
+	private int marginPointIconX;
+	private int marginPointIconY;
+	private int marginApplyingPointIconX;
+	private int marginApplyingPointIconY;
 	private final TIntArrayList tx = new TIntArrayList();
 	private final TIntArrayList ty = new TIntArrayList();
+	private final TIntArrayList drawnPointsPositions = new TIntArrayList();
 	private OnMeasureDistanceToCenter measureDistanceToCenterListener;
 	private OnSingleTapListener singleTapListener;
 	private OnEnterMovePointModeListener enterMovePointModeListener;
@@ -64,8 +67,11 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		bitmapPaint.setDither(true);
 		bitmapPaint.setFilterBitmap(true);
 
-		marginY = pointIcon.getHeight() / 2;
-		marginX = pointIcon.getWidth() / 2;
+		marginPointIconY = pointIcon.getHeight() / 2;
+		marginPointIconX = pointIcon.getWidth() / 2;
+
+		marginApplyingPointIconY = applyingPointIcon.getHeight() / 2;
+		marginApplyingPointIconX = applyingPointIcon.getWidth() / 2;
 	}
 
 	void setOnSingleTapListener(OnSingleTapListener listener) {
@@ -195,7 +201,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		double lowestDistance = view.getResources().getDimension(R.dimen.measurement_tool_select_radius);
 		for (int i = 0; i < measurementPoints.size(); i++) {
 			WptPt pt = measurementPoints.get(i);
-			if (tb.containsLatLon(pt.getLatitude(), pt.getLongitude())) {
+			if (drawnPointsPositions.contains(i) && tb.containsLatLon(pt.getLatitude(), pt.getLongitude())) {
 				double xDiff = tb.getPixXFromLonNoRot(pt.getLongitude()) - x;
 				double yDiff = tb.getPixYFromLatNoRot(pt.getLatitude()) - y;
 				double distToPoint = Math.sqrt(Math.pow(xDiff, 2) + Math.pow(yDiff, 2));
@@ -223,6 +229,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings settings) {
 		if (inMeasurementMode) {
+			drawnPointsPositions.clear();
 			lineAttrs.updatePaints(view, settings, tb);
 			if (!inMovePointMode && !inAddPointAfterMode && !inAddPointBeforeMode) {
 				drawCenterIcon(canvas, tb, tb.getCenterPixelPoint(), settings.isNightMode());
@@ -241,6 +248,24 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 				path.reset();
 				tx.reset();
 				ty.reset();
+
+				int leftPointPos = -1;
+				for (int i = 0; i < measurementPoints.size(); i++) {
+					WptPt pt = measurementPoints.get(i);
+					if (tb.containsLatLon(pt.lat, pt.lon)) {
+						leftPointPos = i;
+						break;
+					}
+				}
+				int rightPointPos = -1;
+				for (int i = measurementPoints.size() - 1; i > leftPointPos; i--) {
+					WptPt pt = measurementPoints.get(i);
+					if (tb.containsLatLon(pt.lat, pt.lon)) {
+						rightPointPos = i;
+						break;
+					}
+				}
+
 				for (int i = 0; i < measurementPoints.size(); i++) {
 					WptPt pt = measurementPoints.get(i);
 					int locX;
@@ -296,23 +321,34 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 				calculatePath(tb, tx, ty, path);
 				canvas.drawPath(path, lineAttrs.paint);
 
-				WptPt pointToDrawOnTop = null;
-				for (int i = 0; i < measurementPoints.size(); i++) {
-					WptPt pt = measurementPoints.get(i);
-					if (inMovePointMode && i == selectedPointPos) {
-						pointToDrawOnTop = pt;
-					} else {
-						if (tb.containsLatLon(pt.lat, pt.lon)) {
+				if (leftPointPos != -1 && rightPointPos != -1) {
+					int pointToDraw = rightPointPos - leftPointPos;
+					int step = 1;
+					if (pointToDraw > 50) {
+						step = pointToDraw / 50;
+					}
+					for (int i = leftPointPos; i <= rightPointPos; i += step) {
+						WptPt pt = measurementPoints.get(i);
+						if (!(inMovePointMode && i == selectedPointPos)) {
 							int locX = tb.getPixXFromLonNoRot(pt.lon);
 							int locY = tb.getPixYFromLatNoRot(pt.lat);
-							canvas.drawBitmap(pointIcon, locX - marginX, locY - marginY, bitmapPaint);
+							canvas.drawBitmap(pointIcon, locX - marginPointIconX, locY - marginPointIconY, bitmapPaint);
+							drawnPointsPositions.add(i);
 						}
 					}
+				} else if (leftPointPos != -1) {
+					WptPt pt = measurementPoints.get(leftPointPos);
+					if (!(inMovePointMode && leftPointPos == selectedPointPos)) {
+						int locX = tb.getPixXFromLonNoRot(pt.lon);
+						int locY = tb.getPixYFromLatNoRot(pt.lat);
+						canvas.drawBitmap(pointIcon, locX - marginPointIconX, locY - marginPointIconY, bitmapPaint);
+						drawnPointsPositions.add(leftPointPos);
+					}
 				}
-				if (inAddPointAfterMode || inAddPointBeforeMode || pointToDrawOnTop != null) {
+				if (inAddPointAfterMode || inAddPointBeforeMode || inMovePointMode) {
 					int locX = tb.getCenterPixelX();
 					int locY = tb.getCenterPixelY();
-					canvas.drawBitmap(applyingPointIcon, locX - marginX, locY - marginY, bitmapPaint);
+					canvas.drawBitmap(applyingPointIcon, locX - marginApplyingPointIconX, locY - marginApplyingPointIconY, bitmapPaint);
 				}
 			}
 		}

From 4d6868f12294c300b23e9de41083e55520babbd9 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 18 Aug 2017 16:20:47 +0300
Subject: [PATCH 151/174] Fix drawing points if only one

---
 .../plus/measurementtool/MeasurementToolLayer.java     | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 24c9417ec1..3fb0ef7c7e 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -258,7 +258,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 					}
 				}
 				int rightPointPos = -1;
-				for (int i = measurementPoints.size() - 1; i > leftPointPos; i--) {
+				for (int i = measurementPoints.size() - 1; i >= leftPointPos; i--) {
 					WptPt pt = measurementPoints.get(i);
 					if (tb.containsLatLon(pt.lat, pt.lon)) {
 						rightPointPos = i;
@@ -336,14 +336,6 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 							drawnPointsPositions.add(i);
 						}
 					}
-				} else if (leftPointPos != -1) {
-					WptPt pt = measurementPoints.get(leftPointPos);
-					if (!(inMovePointMode && leftPointPos == selectedPointPos)) {
-						int locX = tb.getPixXFromLonNoRot(pt.lon);
-						int locY = tb.getPixYFromLatNoRot(pt.lat);
-						canvas.drawBitmap(pointIcon, locX - marginPointIconX, locY - marginPointIconY, bitmapPaint);
-						drawnPointsPositions.add(leftPointPos);
-					}
 				}
 				if (inAddPointAfterMode || inAddPointBeforeMode || inMovePointMode) {
 					int locX = tb.getCenterPixelX();

From 7de048315000e4206bbe603bd79abb8b064f0e06 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 18 Aug 2017 16:45:46 +0300
Subject: [PATCH 152/174] Move code to bottom

---
 .../measurementtool/MeasurementToolLayer.java | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 3fb0ef7c7e..2a2a869ff6 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -249,23 +249,6 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 				tx.reset();
 				ty.reset();
 
-				int leftPointPos = -1;
-				for (int i = 0; i < measurementPoints.size(); i++) {
-					WptPt pt = measurementPoints.get(i);
-					if (tb.containsLatLon(pt.lat, pt.lon)) {
-						leftPointPos = i;
-						break;
-					}
-				}
-				int rightPointPos = -1;
-				for (int i = measurementPoints.size() - 1; i >= leftPointPos; i--) {
-					WptPt pt = measurementPoints.get(i);
-					if (tb.containsLatLon(pt.lat, pt.lon)) {
-						rightPointPos = i;
-						break;
-					}
-				}
-
 				for (int i = 0; i < measurementPoints.size(); i++) {
 					WptPt pt = measurementPoints.get(i);
 					int locX;
@@ -321,6 +304,23 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 				calculatePath(tb, tx, ty, path);
 				canvas.drawPath(path, lineAttrs.paint);
 
+				int leftPointPos = -1;
+				for (int i = 0; i < measurementPoints.size(); i++) {
+					WptPt pt = measurementPoints.get(i);
+					if (tb.containsLatLon(pt.lat, pt.lon)) {
+						leftPointPos = i;
+						break;
+					}
+				}
+				int rightPointPos = -1;
+				for (int i = measurementPoints.size() - 1; i >= leftPointPos; i--) {
+					WptPt pt = measurementPoints.get(i);
+					if (tb.containsLatLon(pt.lat, pt.lon)) {
+						rightPointPos = i;
+						break;
+					}
+				}
+
 				if (leftPointPos != -1 && rightPointPos != -1) {
 					int pointToDraw = rightPointPos - leftPointPos;
 					int step = 1;

From 07c75ddc978c91949cf29d79c4bff85b947dbcf2 Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 18 Aug 2017 16:53:12 +0300
Subject: [PATCH 153/174] Add updating of progress bar

---
 .../MeasurementToolFragment.java              | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 5d8fabcc8c..7b557cf454 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -73,6 +73,7 @@ import net.osmand.plus.routing.RouteProvider;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
+import net.osmand.router.RouteCalculationProgress;
 
 import java.io.File;
 import java.text.MessageFormat;
@@ -764,11 +765,10 @@ public class MeasurementToolFragment extends Fragment {
 
 				ProgressBar snapToRoadProgressBar = (ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar);
 				snapToRoadProgressBar.setMinimumHeight(0);
-				snapToRoadProgressBar.setProgress(45);
 				snapToRoadProgressBar.setVisibility(View.VISIBLE);
 
 				if (measurementPoints.size() > 1) {
-					new SnapToRoadTask(mapActivity).execute();
+					new SnapToRoadTask(mapActivity, snapToRoadProgressBar).execute();
 				}
 
 				mapActivity.refreshMap();
@@ -1534,9 +1534,13 @@ public class MeasurementToolFragment extends Fragment {
 	private class SnapToRoadTask extends AsyncTask<Void, Void, RouteCalculationResult> {
 
 		private MapActivity mapActivity;
+		private ProgressBar progressBar;
+		private boolean calculated;
 
-		SnapToRoadTask(MapActivity mapActivity) {
+		SnapToRoadTask(MapActivity mapActivity, ProgressBar progressBar) {
 			this.mapActivity = mapActivity;
+			this.progressBar = progressBar;
+			progressBar.setProgress(0);
 		}
 
 		@Override
@@ -1560,6 +1564,7 @@ public class MeasurementToolFragment extends Fragment {
 			params.type = settings.ROUTER_SERVICE.getModeValue(snapToRoadAppMode);
 			params.mode = snapToRoadAppMode;
 			params.ctx = app;
+			params.calculationProgress = new RouteCalculationProgress();
 
 			List<LatLon> intermediates = new ArrayList<>();
 			if (measurementPoints.size() > 2) {
@@ -1570,11 +1575,32 @@ public class MeasurementToolFragment extends Fragment {
 				params.intermediates = intermediates;
 			}
 
+			updateProgress(params.calculationProgress);
+
 			return new RouteProvider().calculateRouteImpl(params);
 		}
 
+		private void updateProgress(final RouteCalculationProgress progress) {
+			mapActivity.getMyApplication().runInUIThread(new Runnable() {
+
+				@Override
+				public void run() {
+					float p = Math.max(progress.distanceFromBegin, progress.distanceFromEnd);
+					float all = progress.totalEstimatedDistance * 1.25f;
+					if (all > 0) {
+						int t = (int) Math.min(p * p / (all * all) * 100f, 99);
+						progressBar.setProgress(t);
+					}
+					if (!calculated) {
+						updateProgress(progress);
+					}
+				}
+			}, 100);
+		}
+
 		@Override
 		protected void onPostExecute(RouteCalculationResult result) {
+			calculated = true;
 			measurementPoints.clear();
 			for (Location loc : result.getRouteLocations()) {
 				WptPt pt = new WptPt();

From b059fca782801a162af408b9a0dd5d24e2637a4e Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 18 Aug 2017 17:11:21 +0300
Subject: [PATCH 154/174] Fix quiting from add route points

---
 .../plus/measurementtool/MeasurementToolFragment.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 5d8fabcc8c..8d319ffd31 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -114,7 +114,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	private boolean wasCollapseButtonVisible;
 	private boolean pointsListOpened;
-	private boolean saved;
+	private Boolean saved;
 	private boolean portrait;
 	private boolean nightMode;
 	private int previousMapPosition;
@@ -468,6 +468,10 @@ public class MeasurementToolFragment extends Fragment {
 			}
 		}
 
+		if (saved == null) {
+			saved = newGpxLine != null && newGpxLine.getLineType() == LineType.ADD_ROUTE_POINTS;
+		}
+
 		return view;
 	}
 

From 0781da19debe6e50d5ede795a45e8d4714f61d96 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 18 Aug 2017 17:17:03 +0300
Subject: [PATCH 155/174] Confirm to delete segment

---
 .../plus/myplaces/TrackSegmentFragment.java   | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index 9bac4d4b38..4ce60ffbcc 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -1,6 +1,7 @@
 package net.osmand.plus.myplaces;
 
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -22,6 +23,7 @@ import android.support.v4.content.ContextCompat;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewCompat;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.ListPopupWindow;
 import android.support.v7.widget.SwitchCompat;
 import android.util.DisplayMetrics;
@@ -1368,13 +1370,22 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 														}
 														return true;
 													case R.id.action_delete:
-														if (deleteSegment()) {
-															GPXFile gpx = getGpx();
-															if (gpx != null) {
-																SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(gpx, vis.isChecked(), false);
-																new SaveGpxAsyncTask(gpx, vis.isChecked() ? sf : null).execute();
+														AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+														builder.setMessage(R.string.recording_delete_confirm);
+														builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
+															@Override
+															public void onClick(DialogInterface dialog, int which) {
+																if (deleteSegment()) {
+																	GPXFile gpx = getGpx();
+																	if (gpx != null) {
+																		SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(gpx, vis.isChecked(), false);
+																		new SaveGpxAsyncTask(gpx, vis.isChecked() ? sf : null).execute();
+																	}
+																}
 															}
-														}
+														});
+														builder.setNegativeButton(R.string.shared_string_cancel, null);
+														builder.show();
 														return true;
 												}
 												return false;

From ec5f878b6acf0fecec0318b00b5fa2eab62a4ee7 Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 18 Aug 2017 17:26:28 +0300
Subject: [PATCH 156/174] Cancel AsyncTask when quit from SnapToRoadMode

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

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index a9c5811eda..3c7e9d7c0a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -112,6 +112,8 @@ public class MeasurementToolFragment extends Fragment {
 	private ImageView undoBtn;
 	private ImageView redoBtn;
 	private ImageView mainIcon;
+	private SnapToRoadTask currentSnapToRoadTask;
+	private ProgressBar snapToRoadProgressBar;
 
 	private boolean wasCollapseButtonVisible;
 	private boolean pointsListOpened;
@@ -767,12 +769,19 @@ public class MeasurementToolFragment extends Fragment {
 				});
 				snapToRoadBtn.setVisibility(View.VISIBLE);
 
-				ProgressBar snapToRoadProgressBar = (ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar);
-				snapToRoadProgressBar.setMinimumHeight(0);
+				if (snapToRoadProgressBar == null) {
+					snapToRoadProgressBar = (ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar);
+					snapToRoadProgressBar.setMinimumHeight(0);
+				}
 				snapToRoadProgressBar.setVisibility(View.VISIBLE);
+				snapToRoadProgressBar.setProgress(0);
 
 				if (measurementPoints.size() > 1) {
-					new SnapToRoadTask(mapActivity, snapToRoadProgressBar).execute();
+					if (currentSnapToRoadTask != null && !currentSnapToRoadTask.isCancelled()) {
+						currentSnapToRoadTask.cancel(true);
+					}
+					currentSnapToRoadTask = new SnapToRoadTask(mapActivity);
+					currentSnapToRoadTask.execute();
 				}
 
 				mapActivity.refreshMap();
@@ -791,6 +800,9 @@ public class MeasurementToolFragment extends Fragment {
 			mainView.findViewById(R.id.snap_to_road_progress_bar).setVisibility(View.GONE);
 			mapActivity.refreshMap();
 		}
+		if (currentSnapToRoadTask != null && !currentSnapToRoadTask.isCancelled()) {
+			currentSnapToRoadTask.cancel(true);
+		}
 	}
 
 	private void displayRoutePoints() {
@@ -1538,13 +1550,10 @@ public class MeasurementToolFragment extends Fragment {
 	private class SnapToRoadTask extends AsyncTask<Void, Void, RouteCalculationResult> {
 
 		private MapActivity mapActivity;
-		private ProgressBar progressBar;
 		private boolean calculated;
 
-		SnapToRoadTask(MapActivity mapActivity, ProgressBar progressBar) {
+		SnapToRoadTask(MapActivity mapActivity) {
 			this.mapActivity = mapActivity;
-			this.progressBar = progressBar;
-			progressBar.setProgress(0);
 		}
 
 		@Override
@@ -1593,9 +1602,9 @@ public class MeasurementToolFragment extends Fragment {
 					float all = progress.totalEstimatedDistance * 1.25f;
 					if (all > 0) {
 						int t = (int) Math.min(p * p / (all * all) * 100f, 99);
-						progressBar.setProgress(t);
+						snapToRoadProgressBar.setProgress(t);
 					}
-					if (!calculated) {
+					if (!calculated && !isCancelled()) {
 						updateProgress(progress);
 					}
 				}

From 45fc45d76c1a38c25832e84867be1d7749e00a36 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 18 Aug 2017 18:20:53 +0300
Subject: [PATCH 157/174] Change icons

---
 .../net/osmand/plus/measurementtool/MeasurementToolLayer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 2a2a869ff6..2fbb4a0c80 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -59,8 +59,8 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 
 		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);
-		applyingPointIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_mapillary_location);
+		pointIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_measure_point_day);
+		applyingPointIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_measure_point_move_day);
 
 		bitmapPaint = new Paint();
 		bitmapPaint.setAntiAlias(true);

From 8d21e5df3e07f21772050ee297d2aae416edeb2b Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 18 Aug 2017 18:27:41 +0300
Subject: [PATCH 158/174] Don`t draw snap to road points

---
 .../MeasurementToolFragment.java              |  6 ++++--
 .../measurementtool/MeasurementToolLayer.java | 21 ++++++++++++++++---
 .../command/ClearPointsCommand.java           |  1 +
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 3c7e9d7c0a..3a8883fca8 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -94,6 +94,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	private final MeasurementCommandManager commandManager = new MeasurementCommandManager();
 	private List<WptPt> measurementPoints = new LinkedList<>();
+	private List<WptPt> snappedToRoadPoints = new LinkedList<>();
 	private IconsCache iconsCache;
 	private RecyclerView pointsRv;
 	private String previousToolBarTitle = "";
@@ -151,6 +152,7 @@ public class MeasurementToolFragment extends Fragment {
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 
 		measurementLayer.setMeasurementPoints(measurementPoints);
+		measurementLayer.setSnappedToRoadPoints(snappedToRoadPoints);
 		if (selectedPointPos != -1 && selectedCachedPoint != null) {
 			measurementLayer.setSelectedPointPos(selectedPointPos);
 			measurementLayer.setSelectedCachedPoint(selectedCachedPoint);
@@ -1614,12 +1616,12 @@ public class MeasurementToolFragment extends Fragment {
 		@Override
 		protected void onPostExecute(RouteCalculationResult result) {
 			calculated = true;
-			measurementPoints.clear();
+			snappedToRoadPoints.clear();
 			for (Location loc : result.getRouteLocations()) {
 				WptPt pt = new WptPt();
 				pt.lat = loc.getLatitude();
 				pt.lon = loc.getLongitude();
-				measurementPoints.add(pt);
+				snappedToRoadPoints.add(pt);
 			}
 			mapActivity.refreshMap();
 			super.onPostExecute(result);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 2a2a869ff6..f188c1b94b 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -32,6 +32,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private boolean inAddPointAfterMode;
 	private boolean inAddPointBeforeMode;
 	private List<WptPt> measurementPoints = new LinkedList<>();
+	private List<WptPt> snappedToRoadPoints = new LinkedList<>();
 	private Bitmap centerIconDay;
 	private Bitmap centerIconNight;
 	private Bitmap pointIcon;
@@ -134,6 +135,14 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		measurementPoints = points;
 	}
 
+	public List<WptPt> getSnappedToRoadPoints() {
+		return snappedToRoadPoints;
+	}
+
+	public void setSnappedToRoadPoints(List<WptPt> snappedToRoadPoints) {
+		this.snappedToRoadPoints = snappedToRoadPoints;
+	}
+
 	String getDistanceSt() {
 		float dist = 0;
 		if (measurementPoints.size() > 0) {
@@ -244,13 +253,19 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 				}
 			}
 
-			if (measurementPoints.size() > 0) {
+			List<WptPt> drawPoints;
+			if (snappedToRoadPoints.size() > 0) {
+				drawPoints = snappedToRoadPoints;
+			} else {
+				drawPoints = measurementPoints;
+			}
+			if (drawPoints.size() > 0) {
 				path.reset();
 				tx.reset();
 				ty.reset();
 
-				for (int i = 0; i < measurementPoints.size(); i++) {
-					WptPt pt = measurementPoints.get(i);
+				for (int i = 0; i < drawPoints.size(); i++) {
+					WptPt pt = drawPoints.get(i);
 					int locX;
 					int locY;
 					if (selectedPointPos == i && (inMovePointMode || inAddPointAfterMode || inAddPointBeforeMode)) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
index ff3cab3856..81cdf55d7b 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
@@ -19,6 +19,7 @@ public class ClearPointsCommand extends MeasurementModeCommand {
 		List<GPXUtilities.WptPt> pts = measurementLayer.getMeasurementPoints();
 		points = new LinkedList<>(pts);
 		pts.clear();
+		measurementLayer.getSnappedToRoadPoints().clear();
 		measurementLayer.refreshMap();
 		return true;
 	}

From 5ab3d4d207d393a1599f5df82510fa92fa8103dd Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Mon, 21 Aug 2017 10:21:02 +0300
Subject: [PATCH 159/174] Fix finding right point

---
 .../plus/measurementtool/MeasurementToolLayer.java   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 02d6e59612..0e59493a7b 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -328,11 +328,13 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 					}
 				}
 				int rightPointPos = -1;
-				for (int i = measurementPoints.size() - 1; i >= leftPointPos; i--) {
-					WptPt pt = measurementPoints.get(i);
-					if (tb.containsLatLon(pt.lat, pt.lon)) {
-						rightPointPos = i;
-						break;
+				if (leftPointPos != -1) {
+					for (int i = measurementPoints.size() - 1; i >= leftPointPos; i--) {
+						WptPt pt = measurementPoints.get(i);
+						if (tb.containsLatLon(pt.lat, pt.lon)) {
+							rightPointPos = i;
+							break;
+						}
 					}
 				}
 

From bbf1e7e8b48d92b6df07575c73f815153f246e33 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Mon, 21 Aug 2017 13:56:18 +0300
Subject: [PATCH 160/174] Fix drawing many points

---
 .../measurementtool/MeasurementToolLayer.java | 42 +++++++------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 0e59493a7b..c82cd263f2 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -7,6 +7,7 @@ import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PointF;
 
+import net.osmand.AndroidUtils;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.data.QuadPoint;
@@ -319,38 +320,27 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 				calculatePath(tb, tx, ty, path);
 				canvas.drawPath(path, lineAttrs.paint);
 
-				int leftPointPos = -1;
+				int previousDrawnLocX = -1;
+				int previousDrawnLocY = -1;
 				for (int i = 0; i < measurementPoints.size(); i++) {
 					WptPt pt = measurementPoints.get(i);
 					if (tb.containsLatLon(pt.lat, pt.lon)) {
-						leftPointPos = i;
-						break;
-					}
-				}
-				int rightPointPos = -1;
-				if (leftPointPos != -1) {
-					for (int i = measurementPoints.size() - 1; i >= leftPointPos; i--) {
-						WptPt pt = measurementPoints.get(i);
-						if (tb.containsLatLon(pt.lat, pt.lon)) {
-							rightPointPos = i;
-							break;
-						}
-					}
-				}
-
-				if (leftPointPos != -1 && rightPointPos != -1) {
-					int pointToDraw = rightPointPos - leftPointPos;
-					int step = 1;
-					if (pointToDraw > 50) {
-						step = pointToDraw / 50;
-					}
-					for (int i = leftPointPos; i <= rightPointPos; i += step) {
-						WptPt pt = measurementPoints.get(i);
 						if (!(inMovePointMode && i == selectedPointPos)) {
 							int locX = tb.getPixXFromLonNoRot(pt.lon);
 							int locY = tb.getPixYFromLatNoRot(pt.lat);
-							canvas.drawBitmap(pointIcon, locX - marginPointIconX, locY - marginPointIconY, bitmapPaint);
-							drawnPointsPositions.add(i);
+							boolean xOverlap = false;
+							boolean yOverlap = false;
+							if (previousDrawnLocX != -1 && previousDrawnLocY != -1) {
+								int iconSize = AndroidUtils.dpToPx(view.getContext(), 14);
+								xOverlap = (Math.abs(locX - previousDrawnLocX)) < iconSize;
+								yOverlap = (Math.abs(locY - previousDrawnLocY)) < iconSize;
+							}
+							if (!xOverlap || !yOverlap) {
+								canvas.drawBitmap(pointIcon, locX - marginPointIconX, locY - marginPointIconY, bitmapPaint);
+								previousDrawnLocX = locX;
+								previousDrawnLocY = locY;
+								drawnPointsPositions.add(i);
+							}
 						}
 					}
 				}

From 22973b8fd14a0000efad63752399d5b2ad3c3018 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Mon, 21 Aug 2017 14:16:21 +0300
Subject: [PATCH 161/174] Fix back navigation

---
 .../osmand/plus/activities/TrackActivity.java    | 16 ++++++++++++++--
 .../measurementtool/MeasurementToolFragment.java |  1 +
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
index 138dabe221..a040a01307 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
@@ -45,6 +45,7 @@ public class TrackActivity extends TabActivity {
 
 	public static final String TRACK_FILE_NAME = "TRACK_FILE_NAME";
 	public static final String OPEN_POINTS_TAB = "OPEN_POINTS_TAB";
+	public static final String OPEN_TRACKS_LIST = "OPEN_TRACKS_LIST";
 	public static final String CURRENT_RECORDING = "CURRENT_RECORDING";
 	protected List<WeakReference<Fragment>> fragList = new ArrayList<>();
 	private OsmandApplication app;
@@ -57,7 +58,8 @@ public class TrackActivity extends TabActivity {
 	private List<GpxDisplayGroup> displayGroups;
 	private List<GpxDisplayGroup> originalGroups = new ArrayList<>();
 	private boolean stopped = false;
-	public boolean openPointsTab = false;
+	private boolean openPointsTab = false;
+	private boolean openTracksList = false;
 
 	public PagerSlidingTabStrip getSlidingTabLayout() {
 		return slidingTabLayout;
@@ -90,6 +92,9 @@ public class TrackActivity extends TabActivity {
 		if (intent.hasExtra(OPEN_POINTS_TAB)) {
 			openPointsTab = true;
 		}
+		if (intent.hasExtra(OPEN_TRACKS_LIST)) {
+			openTracksList = true;
+		}
 		setContentView(R.layout.tab_content);
 	}
 
@@ -360,7 +365,7 @@ public class TrackActivity extends TabActivity {
 						return true;
 					}
 				}
-				if (getIntent().hasExtra(MapActivity.INTENT_KEY_PARENT_MAP_ACTIVITY)) {
+				if (getIntent().hasExtra(MapActivity.INTENT_KEY_PARENT_MAP_ACTIVITY) || openTracksList) {
 					OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
 					final Intent favorites = new Intent(this, appCustomization.getFavoritesActivity());
 					getMyApplication().getSettings().FAVORITES_TAB.set(FavoritesActivity.GPX_TAB);
@@ -393,6 +398,13 @@ public class TrackActivity extends TabActivity {
 				return;
 			}
 		}
+		if (openTracksList) {
+			OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
+			final Intent favorites = new Intent(this, appCustomization.getFavoritesActivity());
+			getMyApplication().getSettings().FAVORITES_TAB.set(FavoritesActivity.GPX_TAB);
+			favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+			startActivity(favorites);
+		}
 		super.onBackPressed();
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 3a8883fca8..c0fca5c055 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -1526,6 +1526,7 @@ public class MeasurementToolFragment extends Fragment {
 				GPXFile gpx = newGpxLine.getGpxFile();
 				Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getTrackActivity());
 				newIntent.putExtra(TrackActivity.TRACK_FILE_NAME, gpx.path);
+				newIntent.putExtra(TrackActivity.OPEN_TRACKS_LIST, true);
 				newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 				startActivity(newIntent);
 			}

From 42d2cd8ade71fb0ec48285483c3d3e2e051f8245 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Mon, 21 Aug 2017 16:18:20 +0300
Subject: [PATCH 162/174] Show altitude and speed

---
 .../res/layout/measure_points_list_item.xml   | 45 ++++++++++++++++---
 OsmAnd/res/values/strings.xml                 |  2 +
 .../measurementtool/MeasurementToolLayer.java |  4 +-
 .../adapter/MeasurementToolAdapter.java       | 18 ++++++++
 4 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/res/layout/measure_points_list_item.xml b/OsmAnd/res/layout/measure_points_list_item.xml
index 54d994d669..27608314e3 100644
--- a/OsmAnd/res/layout/measure_points_list_item.xml
+++ b/OsmAnd/res/layout/measure_points_list_item.xml
@@ -72,14 +72,45 @@
                 android:textColor="?android:textColorPrimary"
                 android:textSize="@dimen/default_desc_text_size"
                 tools:text="@string/plugin_distance_point"/>
-
-            <android.support.v7.widget.AppCompatTextView
-                android:id="@+id/measure_point_descr"
+            
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="?android:textColorSecondary"
-                android:textSize="@dimen/default_sub_text_size"
-                tools:text="@string/shared_string_control_start"/>
+                android:layout_height="wrap_content">
+
+                <android.support.v7.widget.AppCompatTextView
+                    android:maxLines="1"
+                    android:id="@+id/measure_point_descr"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="?android:textColorSecondary"
+                    android:textSize="@dimen/default_sub_text_size"
+                    tools:text="@string/shared_string_control_start"/>
+
+                <android.support.v7.widget.AppCompatTextView
+                    android:maxLines="1"
+                    android:id="@+id/measure_point_ele"
+                    android:layout_toEndOf="@id/measure_point_descr"
+                    android:layout_toRightOf="@id/measure_point_descr"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="?android:textColorSecondary"
+                    android:textSize="@dimen/default_sub_text_size"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    tools:text="Altitude: 345 m"/>
+
+                <android.support.v7.widget.AppCompatTextView
+                    android:maxLines="1"
+                    android:id="@+id/measure_point_speed"
+                    android:layout_toEndOf="@id/measure_point_ele"
+                    android:layout_toRightOf="@id/measure_point_ele"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="?android:textColorSecondary"
+                    android:textSize="@dimen/default_sub_text_size"
+                    tools:text="Speed: 45 km/h"/>
+
+            </RelativeLayout>
         </LinearLayout>
 
         <View
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 934e6f276a..86f300448b 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_tool_altitude">Altitude: %1$s</string>
+    <string name="measurement_tool_speed">Speed: %1$s</string>
     <string name="line">Line</string>
     <string name="save_as_route_point">Save as Route Point</string>
     <string name="save_as_line">Save as line</string>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index c82cd263f2..ad58e056e0 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -54,6 +54,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private int selectedPointPos = -1;
 	private WptPt selectedCachedPoint;
 	private LatLon pressedPointLatLon;
+	private int iconSize;
 
 	@Override
 	public void initLayer(OsmandMapTileView view) {
@@ -74,6 +75,8 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 
 		marginApplyingPointIconY = applyingPointIcon.getHeight() / 2;
 		marginApplyingPointIconX = applyingPointIcon.getWidth() / 2;
+
+		iconSize = AndroidUtils.dpToPx(view.getContext(), 14);
 	}
 
 	void setOnSingleTapListener(OnSingleTapListener listener) {
@@ -331,7 +334,6 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 							boolean xOverlap = false;
 							boolean yOverlap = false;
 							if (previousDrawnLocX != -1 && previousDrawnLocY != -1) {
-								int iconSize = AndroidUtils.dpToPx(view.getContext(), 14);
 								xOverlap = (Math.abs(locX - previousDrawnLocX)) < iconSize;
 								yOverlap = (Math.abs(locY - previousDrawnLocY)) < iconSize;
 							}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index ffde2c8373..5de9d86ca4 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -105,6 +105,20 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 				holder.descr.setText(OsmAndFormatter.getFormattedDistance(dist, mapActivity.getMyApplication()));
 			}
 		}
+		if (lineType == LineType.EDIT_SEGMENT) {
+			double elevation = pt.ele;
+			if (!Double.isNaN(elevation)) {
+				holder.elevation.setText(mapActivity.getString(R.string.measurement_tool_altitude, OsmAndFormatter.getFormattedAlt(elevation, mapActivity.getMyApplication())));
+			} else {
+				holder.elevation.setText("");
+			}
+			float speed = (float) pt.speed;
+			if (speed != 0) {
+				holder.speed.setText(mapActivity.getString(R.string.measurement_tool_speed, OsmAndFormatter.getFormattedSpeed(speed, mapActivity.getMyApplication())));
+			} else {
+				holder.speed.setText("");
+			}
+		}
 		holder.deleteBtn.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_remove_dark,
 				nightMode ? R.color.ctx_menu_info_text_dark : R.color.icon_color));
 		holder.deleteBtn.setOnClickListener(new View.OnClickListener() {
@@ -138,6 +152,8 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		final ImageView icon;
 		final TextView title;
 		final TextView descr;
+		final TextView elevation;
+		final TextView speed;
 		final ImageButton deleteBtn;
 
 		MeasureToolItemVH(View view) {
@@ -146,6 +162,8 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 			icon = (ImageView) view.findViewById(R.id.measure_point_icon);
 			title = (TextView) view.findViewById(R.id.measure_point_title);
 			descr = (TextView) view.findViewById(R.id.measure_point_descr);
+			elevation = (TextView) view.findViewById(R.id.measure_point_ele);
+			speed = (TextView) view.findViewById(R.id.measure_point_speed);
 			deleteBtn = (ImageButton) view.findViewById(R.id.measure_point_remove_image_button);
 		}
 	}

From 9e46bb185ce8cdcbad4f87edcaf54a6c7dbc01ea Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Mon, 21 Aug 2017 16:23:19 +0300
Subject: [PATCH 163/174] Fix showing are you sure dialog

---
 .../osmand/plus/measurementtool/MeasurementToolFragment.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index c0fca5c055..a250f9c8fe 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -474,7 +474,7 @@ public class MeasurementToolFragment extends Fragment {
 		}
 
 		if (saved == null) {
-			saved = newGpxLine != null && newGpxLine.getLineType() == LineType.ADD_ROUTE_POINTS;
+			saved = newGpxLine != null && (newGpxLine.getLineType() == LineType.ADD_ROUTE_POINTS || newGpxLine.getLineType() == LineType.EDIT_SEGMENT);
 		}
 
 		return view;

From 054ea83d0f38e641f5a1a7de0f63f421a451f0a6 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 21 Aug 2017 16:29:39 +0300
Subject: [PATCH 164/174] Change snap to road logic

---
 .../MeasurementToolFragment.java              | 157 +++++--------
 .../plus/routing/RouteCalculationParams.java  |   6 +-
 .../osmand/plus/routing/RouteProvider.java    |  15 ++
 .../osmand/plus/routing/RoutingHelper.java    | 209 ++++++++++--------
 4 files changed, 199 insertions(+), 188 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index c0fca5c055..1516e7f1c8 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -45,8 +45,6 @@ import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.IconsCache;
 import net.osmand.plus.OsmAndFormatter;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.TrackActivity;
@@ -67,9 +65,8 @@ import net.osmand.plus.measurementtool.command.MeasurementCommandManager;
 import net.osmand.plus.measurementtool.command.MovePointCommand;
 import net.osmand.plus.measurementtool.command.RemovePointCommand;
 import net.osmand.plus.measurementtool.command.ReorderPointCommand;
-import net.osmand.plus.routing.RouteCalculationParams;
-import net.osmand.plus.routing.RouteCalculationResult;
-import net.osmand.plus.routing.RouteProvider;
+import net.osmand.plus.routing.RouteProvider.SnapToRoadParams;
+import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
@@ -113,8 +110,8 @@ public class MeasurementToolFragment extends Fragment {
 	private ImageView undoBtn;
 	private ImageView redoBtn;
 	private ImageView mainIcon;
-	private SnapToRoadTask currentSnapToRoadTask;
 	private ProgressBar snapToRoadProgressBar;
+	private RouteCalculationProgress calculationProgress;
 
 	private boolean wasCollapseButtonVisible;
 	private boolean pointsListOpened;
@@ -758,7 +755,7 @@ public class MeasurementToolFragment extends Fragment {
 			toolBarController.setTopBarSwitchChecked(true);
 			snapToRoadEnabled = true;
 			mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_snap_to_road));
-			MapActivity mapActivity = getMapActivity();
+			final MapActivity mapActivity = getMapActivity();
 			if (mapActivity != null) {
 				ImageButton snapToRoadBtn = (ImageButton) mapActivity.findViewById(R.id.snap_to_road_image_button);
 				snapToRoadBtn.setBackgroundResource(nightMode ? R.drawable.btn_circle_night : R.drawable.btn_circle);
@@ -775,15 +772,11 @@ public class MeasurementToolFragment extends Fragment {
 					snapToRoadProgressBar = (ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar);
 					snapToRoadProgressBar.setMinimumHeight(0);
 				}
-				snapToRoadProgressBar.setVisibility(View.VISIBLE);
-				snapToRoadProgressBar.setProgress(0);
 
 				if (measurementPoints.size() > 1) {
-					if (currentSnapToRoadTask != null && !currentSnapToRoadTask.isCancelled()) {
-						currentSnapToRoadTask.cancel(true);
-					}
-					currentSnapToRoadTask = new SnapToRoadTask(mapActivity);
-					currentSnapToRoadTask.execute();
+					snapToRoadProgressBar.setVisibility(View.VISIBLE);
+					snapToRoadProgressBar.setProgress(0);
+					doSnapToRoad(mapActivity);
 				}
 
 				mapActivity.refreshMap();
@@ -791,20 +784,71 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
+	private void doSnapToRoad(final MapActivity mapActivity) {
+		Location start = new Location("");
+		WptPt first = measurementPoints.get(0);
+		start.setLatitude(first.getLatitude());
+		start.setLongitude(first.getLongitude());
+
+		WptPt last = measurementPoints.get(measurementPoints.size() - 1);
+		LatLon end = new LatLon(last.getLatitude(), last.getLongitude());
+
+		List<LatLon> intermediates = new ArrayList<>();
+		if (measurementPoints.size() > 2) {
+			for (int i = 1; i < measurementPoints.size() - 1; i++) {
+				WptPt pt = measurementPoints.get(i);
+				intermediates.add(new LatLon(pt.getLatitude(), pt.getLongitude()));
+			}
+		}
+
+		final SnapToRoadParams params = new SnapToRoadParams();
+		params.applicationMode = snapToRoadAppMode;
+		params.calculationProgress = calculationProgress = new RouteCalculationProgress();
+		params.calculationProgressCallback = new RoutingHelper.RouteCalculationProgressCallback() {
+			@Override
+			public void updateProgress(int progress) {
+				snapToRoadProgressBar.setProgress(progress);
+			}
+
+			@Override
+			public void requestPrivateAccessRouting() {
+
+			}
+
+			@Override
+			public void finish() {
+				snapToRoadProgressBar.setVisibility(View.GONE);
+			}
+		};
+		params.listener = new SnapToRoadParams.SnapToRoadListener() {
+			@Override
+			public void onSnapToRoadDone() {
+				snappedToRoadPoints.clear();
+				for (Location loc : params.points) {
+					WptPt pt = new WptPt();
+					pt.lat = loc.getLatitude();
+					pt.lon = loc.getLongitude();
+					snappedToRoadPoints.add(pt);
+				}
+				mapActivity.refreshMap();
+			}
+		};
+
+		mapActivity.getMyApplication().getRoutingHelper().recalculateSnapToRoad(start, end, intermediates, params);
+	}
+
 	private void disableSnapToRoadMode() {
 		toolBarController.setTopBarSwitchVisible(false);
 		toolBarController.setTitle(previousToolBarTitle);
 		snapToRoadEnabled = false;
 		mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_ruler));
+		calculationProgress.isCancelled = true;
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
 			mapActivity.findViewById(R.id.snap_to_road_image_button).setVisibility(View.GONE);
 			mainView.findViewById(R.id.snap_to_road_progress_bar).setVisibility(View.GONE);
 			mapActivity.refreshMap();
 		}
-		if (currentSnapToRoadTask != null && !currentSnapToRoadTask.isCancelled()) {
-			currentSnapToRoadTask.cancel(true);
-		}
 	}
 
 	private void displayRoutePoints() {
@@ -1550,85 +1594,6 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
-	private class SnapToRoadTask extends AsyncTask<Void, Void, RouteCalculationResult> {
-
-		private MapActivity mapActivity;
-		private boolean calculated;
-
-		SnapToRoadTask(MapActivity mapActivity) {
-			this.mapActivity = mapActivity;
-		}
-
-		@Override
-		protected RouteCalculationResult doInBackground(Void... voids) {
-			OsmandApplication app = mapActivity.getMyApplication();
-			OsmandSettings settings = app.getSettings();
-			RouteCalculationParams params = new RouteCalculationParams();
-
-			Location start = new Location("");
-			WptPt first = measurementPoints.get(0);
-			start.setLatitude(first.getLatitude());
-			start.setLongitude(first.getLongitude());
-
-			WptPt last = measurementPoints.get(measurementPoints.size() - 1);
-			LatLon end = new LatLon(last.getLatitude(), last.getLongitude());
-
-			params.start = start;
-			params.end = end;
-			params.leftSide = settings.DRIVING_REGION.get().leftHandDriving;
-			params.fast = settings.FAST_ROUTE_MODE.getModeValue(snapToRoadAppMode);
-			params.type = settings.ROUTER_SERVICE.getModeValue(snapToRoadAppMode);
-			params.mode = snapToRoadAppMode;
-			params.ctx = app;
-			params.calculationProgress = new RouteCalculationProgress();
-
-			List<LatLon> intermediates = new ArrayList<>();
-			if (measurementPoints.size() > 2) {
-				for (int i = 1; i < measurementPoints.size() - 1; i++) {
-					WptPt pt = measurementPoints.get(i);
-					intermediates.add(new LatLon(pt.getLatitude(), pt.getLongitude()));
-				}
-				params.intermediates = intermediates;
-			}
-
-			updateProgress(params.calculationProgress);
-
-			return new RouteProvider().calculateRouteImpl(params);
-		}
-
-		private void updateProgress(final RouteCalculationProgress progress) {
-			mapActivity.getMyApplication().runInUIThread(new Runnable() {
-
-				@Override
-				public void run() {
-					float p = Math.max(progress.distanceFromBegin, progress.distanceFromEnd);
-					float all = progress.totalEstimatedDistance * 1.25f;
-					if (all > 0) {
-						int t = (int) Math.min(p * p / (all * all) * 100f, 99);
-						snapToRoadProgressBar.setProgress(t);
-					}
-					if (!calculated && !isCancelled()) {
-						updateProgress(progress);
-					}
-				}
-			}, 100);
-		}
-
-		@Override
-		protected void onPostExecute(RouteCalculationResult result) {
-			calculated = true;
-			snappedToRoadPoints.clear();
-			for (Location loc : result.getRouteLocations()) {
-				WptPt pt = new WptPt();
-				pt.lat = loc.getLatitude();
-				pt.lon = loc.getLongitude();
-				snappedToRoadPoints.add(pt);
-			}
-			mapActivity.refreshMap();
-			super.onPostExecute(result);
-		}
-	}
-
 	private class MeasurementToolBarController extends TopToolbarController {
 
 		MeasurementToolBarController(NewGpxLine newGpxLine) {
diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationParams.java b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationParams.java
index 88e5038851..1a5654ac7d 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationParams.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationParams.java
@@ -1,15 +1,16 @@
 package net.osmand.plus.routing;
 
-import java.util.List;
-
 import net.osmand.Location;
 import net.osmand.data.LatLon;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.routing.RouteProvider.GPXRouteParams;
 import net.osmand.plus.routing.RouteProvider.RouteService;
+import net.osmand.plus.routing.RouteProvider.SnapToRoadParams;
 import net.osmand.router.RouteCalculationProgress;
 
+import java.util.List;
+
 public class RouteCalculationParams {
 
 	public Location start;
@@ -21,6 +22,7 @@ public class RouteCalculationParams {
 	public ApplicationMode mode;
 	public RouteService type;
 	public GPXRouteParams gpxRoute;
+	public SnapToRoadParams snapToRoadParams;
 	public RouteCalculationResult previousToRecalculate;
 	public boolean onlyStartPointChanged;
 	public boolean fast;
diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
index abfdbc7f80..c4b0052ab2 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
@@ -44,11 +44,13 @@ import net.osmand.plus.TargetPointsHelper.TargetPoint;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.SettingsNavigationActivity;
 import net.osmand.plus.render.NativeOsmandLibrary;
+import net.osmand.plus.routing.RoutingHelper.RouteCalculationProgressCallback;
 import net.osmand.router.GeneralRouter;
 import net.osmand.router.GeneralRouter.GeneralRouterProfile;
 import net.osmand.router.GeneralRouter.RoutingParameter;
 import net.osmand.router.GeneralRouter.RoutingParameterType;
 import net.osmand.router.PrecalculatedRouteDirection;
+import net.osmand.router.RouteCalculationProgress;
 import net.osmand.router.RoutePlannerFrontEnd;
 import net.osmand.router.RoutePlannerFrontEnd.RouteCalculationMode;
 import net.osmand.router.RouteSegmentResult;
@@ -282,6 +284,19 @@ public class RouteProvider {
 		}
 	}
 
+	public static class SnapToRoadParams {
+
+		public ApplicationMode applicationMode;
+		public RouteCalculationProgress calculationProgress;
+		public RouteCalculationProgressCallback calculationProgressCallback;
+		public SnapToRoadListener listener;
+		public List<Location> points;
+
+		public interface SnapToRoadListener {
+			void onSnapToRoadDone();
+		}
+	}
+
 	private static Location createLocation(WptPt pt){
 		Location loc = new Location("OsmandRouteProvider");
 		loc.setLatitude(pt.lat);
diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
index f1201150a7..dcbad72858 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
@@ -19,6 +19,7 @@ import net.osmand.plus.notifications.OsmandNotification.NotificationType;
 import net.osmand.plus.routing.RouteCalculationResult.NextDirectionInfo;
 import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
 import net.osmand.plus.routing.RouteProvider.RouteService;
+import net.osmand.plus.routing.RouteProvider.SnapToRoadParams;
 import net.osmand.router.RouteCalculationProgress;
 import net.osmand.router.RouteSegmentResult;
 import net.osmand.router.TurnType;
@@ -33,38 +34,38 @@ import java.util.List;
 import static net.osmand.plus.notifications.OsmandNotification.NotificationType.NAVIGATION;
 
 public class RoutingHelper {
-	
+
 	private static final org.apache.commons.logging.Log log = PlatformUtil.getLog(RoutingHelper.class);
-	
+
 	public interface IRouteInformationListener {
-		
+
 		void newRouteIsCalculated(boolean newRoute, ValueHolder<Boolean> showToast);
-		
+
 		void routeWasCancelled();
 
 		void routeWasFinished();
 	}
-	
+
 	private static final float POSITION_TOLERANCE = 60;
-	
-	
+
+
 	private List<WeakReference<IRouteInformationListener>> listeners = new LinkedList<WeakReference<IRouteInformationListener>>();
 
 	private OsmandApplication app;
-	
+
 	private boolean isFollowingMode = false;
 	private boolean isRoutePlanningMode = false;
 	private boolean isPauseNavigation = false;
-	
+
 	private GPXRouteParamsBuilder currentGPXRoute = null;
 
 	private RouteCalculationResult route = new RouteCalculationResult("");
-	
+
 	private LatLon finalLocation;
 	private List<LatLon> intermediatePoints;
 	private Location lastProjection;
 	private Location lastFixedLocation;
-	
+
 	private static final int RECALCULATE_THRESHOLD_COUNT_CAUSING_FULL_RECALCULATE = 3;
 	private static final int RECALCULATE_THRESHOLD_CAUSING_FULL_RECALCULATE_INTERVAL = 2*60*1000;
 	private Thread currentRunningJob;
@@ -73,10 +74,10 @@ public class RoutingHelper {
 	private String lastRouteCalcErrorShort;
 	private long recalculateCountInInterval = 0;
 	private int evalWaitInterval = 0;
-	
+
 	private ApplicationMode mode;
 	private OsmandSettings settings;
-	
+
 	private RouteProvider provider;
 	private VoiceRouter voiceRouter;
 
@@ -101,12 +102,12 @@ public class RoutingHelper {
 		provider = new RouteProvider();
 		setAppMode(settings.APPLICATION_MODE.get());
 	}
-	
+
 
 	public boolean isFollowingMode() {
 		return isFollowingMode;
 	}
-	
+
 	public OsmandApplication getApplication() {
 		return app;
 	}
@@ -132,11 +133,11 @@ public class RoutingHelper {
 			app.startNavigationService(NavigationService.USED_BY_NAVIGATION, 0);
 		}
 	}
-	
+
 	public boolean isPauseNavigation() {
 		return isPauseNavigation;
 	}
-	
+
 	public void setFollowingMode(boolean follow) {
 		isFollowingMode = follow;
 		isPauseNavigation = false;
@@ -151,24 +152,24 @@ public class RoutingHelper {
 			app.startNavigationService(NavigationService.USED_BY_NAVIGATION, 0);
 		}
 	}
-	
+
 	public boolean isRoutePlanningMode() {
 		return isRoutePlanningMode;
 	}
-	
+
 	public void setRoutePlanningMode(boolean isRoutePlanningMode) {
 		this.isRoutePlanningMode = isRoutePlanningMode;
 	}
 
-	
-	
+
+
 	public synchronized void setFinalAndCurrentLocation(LatLon finalLocation, List<LatLon> intermediatePoints, Location currentLocation){
 		RouteCalculationResult previousRoute = route;
 		clearCurrentRoute(finalLocation, intermediatePoints);
 		// to update route
 		setCurrentLocation(currentLocation, false, previousRoute, true);
 	}
-	
+
 	public synchronized void clearCurrentRoute(LatLon newFinalLocation, List<LatLon> newIntermediatePoints) {
 		route = new RouteCalculationResult("");
 		isDeviatedFromRoute = false;
@@ -184,7 +185,7 @@ public class RoutingHelper {
 					if(l == null) {
 						it.remove();
 					} else {
-						l.routeWasCancelled();	
+						l.routeWasCancelled();
 					}
 				}
 			}
@@ -224,50 +225,50 @@ public class RoutingHelper {
 	public GPXRouteParamsBuilder getCurrentGPXRoute() {
 		return currentGPXRoute;
 	}
-	
+
 
 
 	public void setGpxParams(GPXRouteParamsBuilder params) {
 		currentGPXRoute = params;
-	}	
-	
+	}
+
 	public List<Location> getCurrentCalculatedRoute() {
 		return route.getImmutableAllLocations();
 	}
-	
+
 	public void setAppMode(ApplicationMode mode){
 		this.mode = mode;
 		voiceRouter.updateAppMode();
 	}
-	
+
 	public ApplicationMode getAppMode() {
 		return mode;
 	}
-	
+
 	public LatLon getFinalLocation() {
 		return finalLocation;
 	}
-	
+
 	public List<LatLon> getIntermediatePoints() {
 		return intermediatePoints;
 	}
-	
+
 	public boolean isRouteCalculated(){
 		return route.isCalculated();
 	}
-	
+
 	public VoiceRouter getVoiceRouter() {
 		return voiceRouter;
 	}
-	
+
 	public Location getLastProjection(){
 		return lastProjection;
 	}
-	
+
 	public void addListener(IRouteInformationListener l){
 		listeners.add(new WeakReference<RoutingHelper.IRouteInformationListener>(l));
 	}
-	
+
 	public boolean removeListener(IRouteInformationListener lt){
 		Iterator<WeakReference<IRouteInformationListener>> it = listeners.iterator();
 		while(it.hasNext()) {
@@ -280,14 +281,14 @@ public class RoutingHelper {
 		}
 		return false;
 	}
-	
+
 	public void updateLocation(Location currentLocation) {
 		if(isFollowingMode() || (settings.getPointToStart() == null && isRoutePlanningMode) ||
 				app.getLocationProvider().getLocationSimulation().isRouteAnimating()) {
 			setCurrentLocation(currentLocation, false);
 		}
 	}
-	
+
 	public Location setCurrentLocation(Location currentLocation, boolean returnUpdatedLocation) {
 		return setCurrentLocation(currentLocation, returnUpdatedLocation, route, false);
 	}
@@ -301,8 +302,8 @@ public class RoutingHelper {
 		List<Location> routeNodes = route.getImmutableAllLocations();
 		return getOrthogonalDistance(lastFixedLocation, routeNodes.get(route.currentRoute -1), routeNodes.get(route.currentRoute));
 	}
-	
-	private Location setCurrentLocation(Location currentLocation, boolean returnUpdatedLocation, 
+
+	private Location setCurrentLocation(Location currentLocation, boolean returnUpdatedLocation,
 			RouteCalculationResult previousRoute, boolean targetPointsChanged) {
 		Location locationProjection = currentLocation;
 		if (finalLocation == null || currentLocation == null) {
@@ -367,7 +368,7 @@ public class RoutingHelper {
 						voiceRouter.announceOffRoute(distOrth);
 					}
 				}
-				
+
 				// calculate projection of current location
 				if (currentRoute > 0) {
 					locationProjection = new Location(currentLocation);
@@ -386,8 +387,8 @@ public class RoutingHelper {
 		}
 
 		if (calculateRoute) {
-			recalculateRouteInBackground(currentLocation, finalLocation, intermediatePoints, currentGPXRoute, 
-					previousRoute.isCalculated() ? previousRoute : null, false, !targetPointsChanged);
+			recalculateRouteInBackground(currentLocation, finalLocation, intermediatePoints, currentGPXRoute,
+					previousRoute.isCalculated() ? previousRoute : null, false, !targetPointsChanged, null);
 		} else {
 			Thread job = currentRunningJob;
 			if(job instanceof RouteRecalculationThread) {
@@ -414,13 +415,13 @@ public class RoutingHelper {
 				loc.getLongitude(), from.getLatitude(), from.getLongitude(),
 				to.getLatitude(), to.getLongitude());
 	}
-	
+
 	private static LatLon getProject(Location loc, Location from, Location to) {
 		return MapUtils.getProjection(loc.getLatitude(),
 				loc.getLongitude(), from.getLatitude(), from.getLongitude(),
 				to.getLatitude(), to.getLongitude());
 	}
-	
+
 	private static int lookAheadFindMinOrthogonalDistance(Location currentLocation, List<Location> routeNodes, int currentRoute, int iterations) {
 		double newDist;
 		double dist = Double.POSITIVE_INFINITY;
@@ -444,7 +445,7 @@ public class RoutingHelper {
 		while (currentRoute + 1 < routeNodes.size()) {
 			double dist = currentLocation.distanceTo(routeNodes.get(currentRoute));
 			if(currentRoute > 0) {
-				dist = getOrthogonalDistance(currentLocation, routeNodes.get(currentRoute - 1), 
+				dist = getOrthogonalDistance(currentLocation, routeNodes.get(currentRoute - 1),
 						routeNodes.get(currentRoute));
 			}
 			boolean processed = false;
@@ -452,7 +453,7 @@ public class RoutingHelper {
 			// if not then look ahead only 3 in order to catch sharp turns
 			boolean longDistance = dist >= 250;
 			int newCurrentRoute = lookAheadFindMinOrthogonalDistance(currentLocation, routeNodes, currentRoute, longDistance ? 15 : 8);
-			double newDist = getOrthogonalDistance(currentLocation, routeNodes.get(newCurrentRoute), 
+			double newDist = getOrthogonalDistance(currentLocation, routeNodes.get(newCurrentRoute),
 					routeNodes.get(newCurrentRoute + 1));
 			if(longDistance) {
 				if(newDist < dist) {
@@ -496,7 +497,7 @@ public class RoutingHelper {
 				break;
 			}
 		}
-		
+
 		// 2. check if intermediate found
 		if(route.getIntermediatePointsToPass()  > 0
 				&& route.getDistanceToNextIntermediate(lastFixedLocation) < getArrivalDistance() * 2f && !isRoutePlanningMode) {
@@ -536,7 +537,7 @@ public class RoutingHelper {
 			//showMessage(app.getString(R.string.arrived_at_destination));
 			TargetPointsHelper targets = app.getTargetPointsHelper();
 			TargetPoint tp = targets.getPointToNavigate();
-			String description = tp == null ? "" : tp.getOnlyName(); 
+			String description = tp == null ? "" : tp.getOnlyName();
 			if(isFollowingMode) {
 				voiceRouter.arrivedDestinationPoint(description);
 			}
@@ -564,7 +565,7 @@ public class RoutingHelper {
 	private float getArrivalDistance() {
 		return ((float)settings.getApplicationMode().getArrivalDistance()) * settings.ARRIVAL_DISTANCE_FACTOR.get();
 	}
-	
+
 
 	private boolean identifyUTurnIsNeeded(Location currentLocation, float posTolerance) {
 		if (finalLocation == null || currentLocation == null || !route.isCalculated()) {
@@ -596,9 +597,9 @@ public class RoutingHelper {
 		}
 		return isOffRoute;
 	}
-	
+
 	/**
-	 * Wrong movement direction is considered when between 
+	 * Wrong movement direction is considered when between
 	 * current location bearing (determines by 2 last fixed position or provided)
 	 * and bearing from currentLocation to next (current) point
 	 * the difference is more than 60 degrees
@@ -648,11 +649,11 @@ public class RoutingHelper {
 						evalWaitInterval = Math.max(3000, evalWaitInterval * 3 / 2);
 						evalWaitInterval = Math.min(evalWaitInterval, 120000);
 					}
-					
+
 				}
 			}
 
-			
+
 			// trigger voice prompt only if new route is in forward direction
 			// If route is in wrong direction after one more setLocation it will be recalculated
 			if (!wrongMovementDirection || newRoute) {
@@ -687,23 +688,23 @@ public class RoutingHelper {
 			}
 		});
 	}
-	
+
 	public int getLeftDistance(){
 		return route.getDistanceToFinish(lastFixedLocation);
 	}
-	
+
 	public int getLeftDistanceNextIntermediate() {
 		return route.getDistanceToNextIntermediate(lastFixedLocation);
 	}
-	
+
 	public int getLeftTime() {
 		return route.getLeftTime(lastFixedLocation);
 	}
-	
+
 	public OsmandSettings getSettings() {
 		return settings;
 	}
-	
+
 	public String getGeneralRouteInformation(){
 		int dist = getLeftDistance();
 		int hours = getLeftTime() / (60 * 60);
@@ -711,11 +712,11 @@ public class RoutingHelper {
 		return app.getString(R.string.route_general_information, OsmAndFormatter.getFormattedDistance(dist, app),
 				hours, minutes);
 	}
-	
+
 	public Location getLocationFromRouteDirection(RouteDirectionInfo i){
 		return route.getLocationFromRouteDirection(i);
 	}
-	
+
 	public synchronized NextDirectionInfo getNextRouteDirectionInfo(NextDirectionInfo info, boolean toSpeak){
 		NextDirectionInfo i = route.getNextRouteDirectionInfo(info, lastProjection, toSpeak);
 		if(i != null) {
@@ -723,12 +724,12 @@ public class RoutingHelper {
 		}
 		return i;
 	}
-	
+
 	public synchronized float getCurrentMaxSpeed() {
 		return route.getCurrentMaxSpeed();
 	}
-	
-		
+
+
 	public static String formatStreetName(String name, String ref, String destination, String towards) {
 	//Hardy, 2016-08-05:
 	//Now returns: (ref) + ((" ")+name) + ((" ")+"toward "+dest) or ""
@@ -752,14 +753,14 @@ public class RoutingHelper {
 		return formattedStreetName.replace(";", ", ");
 
 	}
-	
+
 //	protected boolean isDistanceLess(float currentSpeed, double dist, double etalon, float defSpeed){
 //		if(dist < etalon || ((dist / currentSpeed) < (etalon / defSpeed))){
 //			return true;
 //		}
 //		return false;
 //	}
-	
+
 	public synchronized String getCurrentName(TurnType[] next){
 		NextDirectionInfo n = getNextRouteDirectionInfo(new NextDirectionInfo(), true);
 		Location l = lastFixedLocation;
@@ -767,7 +768,7 @@ public class RoutingHelper {
 		if(l != null && l.hasSpeed()) {
 			speed = l.getSpeed();
 		}
-		if(n.distanceTo > 0  && n.directionInfo != null && !n.directionInfo.getTurnType().isSkipToSpeak() && 
+		if(n.distanceTo > 0  && n.directionInfo != null && !n.directionInfo.getTurnType().isSkipToSpeak() &&
 				voiceRouter.isDistanceLess(speed, n.distanceTo, voiceRouter.PREPARE_DISTANCE * 0.75f, 0f)) {
 			String nm = n.directionInfo.getStreetName();
 			String rf = n.directionInfo.getRef();
@@ -781,7 +782,7 @@ public class RoutingHelper {
 		if(rs != null) {
 			String nm = rs.getObject().getName(settings.MAP_PREFERRED_LOCALE.get(), settings.MAP_TRANSLITERATE_NAMES.get());
 			String rf = rs.getObject().getRef(settings.MAP_PREFERRED_LOCALE.get(), settings.MAP_TRANSLITERATE_NAMES.get(), rs.isForwardDirection());
-			String dn = rs.getObject().getDestinationName(settings.MAP_PREFERRED_LOCALE.get(), 
+			String dn = rs.getObject().getDestinationName(settings.MAP_PREFERRED_LOCALE.get(),
 					settings.MAP_TRANSLITERATE_NAMES.get(), rs.isForwardDirection());
 			return formatStreetName(nm, rf, dn, "»");
 		}
@@ -791,11 +792,11 @@ public class RoutingHelper {
     public RouteSegmentResult getCurrentSegmentResult() {
         return route.getCurrentSegmentResult();
     }
-    
+
     public List<RouteSegmentResult> getUpcomingTunnel(float distToStart) {
     	return route.getUpcomingTunnel(distToStart);
     }
-    
+
     public synchronized NextDirectionInfo getNextRouteDirectionInfoAfter(NextDirectionInfo previous, NextDirectionInfo to, boolean toSpeak){
 		NextDirectionInfo i = route.getNextRouteDirectionInfoAfter(previous, to, toSpeak);
 		if(i != null) {
@@ -803,15 +804,15 @@ public class RoutingHelper {
 		}
 		return i;
 	}
-	
+
 	public List<RouteDirectionInfo> getRouteDirections(){
 		return route.getRouteDirections();
 	}
-	
-	
-	
+
+
+
 	private class RouteRecalculationThread extends Thread {
-		
+
 		private final RouteCalculationParams params;
 		private boolean paramsChanged;
 		private Thread prevRunningJob;
@@ -824,7 +825,7 @@ public class RoutingHelper {
 				params.calculationProgress = new RouteCalculationProgress();
 			}
 		}
-		
+
 		public boolean isParamsChanged() {
 			return paramsChanged;
 		}
@@ -832,8 +833,8 @@ public class RoutingHelper {
 		public void stopCalculation(){
 			params.calculationProgress.isCancelled = true;
 		}
-		
-		
+
+
 		@Override
 		public void run() {
 			synchronized (RoutingHelper.this) {
@@ -870,6 +871,12 @@ public class RoutingHelper {
 			synchronized (RoutingHelper.this) {
 				if (res.isCalculated()) {
 					route = res;
+					if (params.snapToRoadParams != null) {
+						params.snapToRoadParams.points = res.getRouteLocations();
+						if (params.snapToRoadParams.listener != null) {
+							params.snapToRoadParams.listener.onSnapToRoadDone();
+						}
+					}
 				} else {
 					evalWaitInterval = Math.max(3000, evalWaitInterval * 3 / 2); // for Issue #3899
 					evalWaitInterval = Math.min(evalWaitInterval, 120000);
@@ -903,14 +910,19 @@ public class RoutingHelper {
 			this.prevRunningJob = prevRunningJob;
 		}
 	}
-	
+
+	public void recalculateSnapToRoad(final Location start, final LatLon end, final List<LatLon> intermediates, SnapToRoadParams params) {
+		recalculateRouteInBackground(start, end, intermediates, null, route, true, false, params);
+	}
+
 	public void recalculateRouteDueToSettingsChange() {
 		clearCurrentRoute(finalLocation, intermediatePoints);
-		recalculateRouteInBackground(lastFixedLocation, finalLocation, intermediatePoints, currentGPXRoute, route, true, false);
+		recalculateRouteInBackground(lastFixedLocation, finalLocation, intermediatePoints, currentGPXRoute, route, true, false, null);
 	}
-	
+
 	private void recalculateRouteInBackground(final Location start, final LatLon end, final List<LatLon> intermediates,
-			final GPXRouteParamsBuilder gpxRoute, final RouteCalculationResult previousRoute, boolean paramsChanged, boolean onlyStartPointChanged){
+			final GPXRouteParamsBuilder gpxRoute, final RouteCalculationResult previousRoute, boolean paramsChanged, boolean onlyStartPointChanged,
+			final SnapToRoadParams snapToRoadParams){
 		if (start == null || end == null) {
 			return;
 		}
@@ -932,12 +944,23 @@ public class RoutingHelper {
 				recalculateCountInInterval = 0;
 			}
 			params.leftSide = settings.DRIVING_REGION.get().leftHandDriving;
+			ApplicationMode mode;
+			if (snapToRoadParams != null && snapToRoadParams.applicationMode != null) {
+				params.snapToRoadParams = snapToRoadParams;
+				mode = snapToRoadParams.applicationMode;
+			} else {
+				mode = this.mode;
+			}
 			params.fast = settings.FAST_ROUTE_MODE.getModeValue(mode);
 			params.type = settings.ROUTER_SERVICE.getModeValue(mode);
 			params.mode = mode;
 			params.ctx = app;
 			if (params.type == RouteService.OSMAND) {
-				params.calculationProgress = new RouteCalculationProgress();
+				if (snapToRoadParams != null && snapToRoadParams.calculationProgress != null) {
+					params.calculationProgress = snapToRoadParams.calculationProgress;
+				} else {
+					params.calculationProgress = new RouteCalculationProgress();
+				}
 				updateProgress(params);
 			}
 			synchronized (this) {
@@ -954,6 +977,12 @@ public class RoutingHelper {
 	}
 
 	private void updateProgress(final RouteCalculationParams params) {
+		final RouteCalculationProgressCallback progressRoute;
+		if (params.snapToRoadParams != null) {
+			progressRoute = params.snapToRoadParams.calculationProgressCallback;
+		} else {
+			progressRoute = this.progressRoute;
+		}
 		if(progressRoute != null ) {
 			app.runInUIThread(new Runnable() {
 
@@ -970,7 +999,7 @@ public class RoutingHelper {
 						Thread t = currentRunningJob;
 						if(t instanceof RouteRecalculationThread && ((RouteRecalculationThread) t).params != params) {
 							// different calculation started
-							return; 
+							return;
 						} else {
 							if (calculationProgress.requestPrivateAccessRouting) {
 								progressRoute.requestPrivateAccessRouting();
@@ -987,13 +1016,13 @@ public class RoutingHelper {
 			}, 300);
 		}
 	}
-	
+
 	public void setProgressBar(RouteCalculationProgressCallback progressRoute) {
 		this.progressRoute = progressRoute;
 	}
-	
+
 	public interface RouteCalculationProgressCallback {
-		
+
 		// set visibility
 		public void updateProgress(int progress);
 		public void requestPrivateAccessRouting();
@@ -1004,7 +1033,7 @@ public class RoutingHelper {
 	public boolean isRouteBeingCalculated(){
 		return currentRunningJob instanceof RouteRecalculationThread;
 	}
-	
+
 	private void showMessage(final String msg){
 		app.runInUIThread(new Runnable() {
 			@Override
@@ -1013,13 +1042,13 @@ public class RoutingHelper {
 			}
 		});
 	}
-	
-	
+
+
 	// NEVER returns null
 	public RouteCalculationResult getRoute() {
 		return route;
 	}
-	
+
 	public GPXFile generateGPXFileWithRoute(){
 		return provider.createOsmandRouterGPX(route, app);
 	}

From ab74af6b8153dd6c03dde36e5090602318ff909a Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 21 Aug 2017 17:10:06 +0300
Subject: [PATCH 165/174] Handle screen rotating

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

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 973c20de65..fd2475e69c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -456,7 +456,7 @@ public class MeasurementToolFragment extends Fragment {
 		enterMeasurementMode();
 
 		if (snapToRoadEnabled) {
-			enableSnapToRoadMode();
+			enableSnapToRoadMode(true);
 		}
 
 		if (newGpxLine != null && !gpxPointsAdded) {
@@ -668,7 +668,7 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			public void onApplicationModeItemClick(ApplicationMode mode) {
 				snapToRoadAppMode = mode;
-				enableSnapToRoadMode();
+				enableSnapToRoadMode(false);
 			}
 		};
 	}
@@ -749,7 +749,7 @@ public class MeasurementToolFragment extends Fragment {
 		};
 	}
 
-	private void enableSnapToRoadMode() {
+	private void enableSnapToRoadMode(boolean enableAfterRotating) {
 		if (snapToRoadAppMode != null) {
 			toolBarController.setTopBarSwitchVisible(true);
 			toolBarController.setTopBarSwitchChecked(true);
@@ -768,15 +768,14 @@ public class MeasurementToolFragment extends Fragment {
 				});
 				snapToRoadBtn.setVisibility(View.VISIBLE);
 
-				if (snapToRoadProgressBar == null) {
-					snapToRoadProgressBar = (ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar);
-					snapToRoadProgressBar.setMinimumHeight(0);
-				}
+				snapToRoadProgressBar = (ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar);
+				snapToRoadProgressBar.setMinimumHeight(0);
 
 				if (measurementPoints.size() > 1) {
-					snapToRoadProgressBar.setVisibility(View.VISIBLE);
-					snapToRoadProgressBar.setProgress(0);
-					doSnapToRoad(mapActivity);
+					if (!enableAfterRotating) {
+						snapToRoadProgressBar.setProgress(0);
+						doSnapToRoad(mapActivity);
+					}
 				}
 
 				mapActivity.refreshMap();
@@ -807,6 +806,7 @@ public class MeasurementToolFragment extends Fragment {
 		params.calculationProgressCallback = new RoutingHelper.RouteCalculationProgressCallback() {
 			@Override
 			public void updateProgress(int progress) {
+				snapToRoadProgressBar.setVisibility(View.VISIBLE);
 				snapToRoadProgressBar.setProgress(progress);
 			}
 
@@ -818,6 +818,10 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			public void finish() {
 				snapToRoadProgressBar.setVisibility(View.GONE);
+				MapActivity mapActivity = getMapActivity();
+				if (mapActivity != null) {
+					mapActivity.refreshMap();
+				}
 			}
 		};
 		params.listener = new SnapToRoadParams.SnapToRoadListener() {
@@ -830,7 +834,10 @@ public class MeasurementToolFragment extends Fragment {
 					pt.lon = loc.getLongitude();
 					snappedToRoadPoints.add(pt);
 				}
-				mapActivity.refreshMap();
+				MapActivity mapActivity = getMapActivity();
+				if (mapActivity != null) {
+					mapActivity.refreshMap();
+				}
 			}
 		};
 

From 35f36304cc973dd384770e184784e228d0f39ae7 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 21 Aug 2017 17:49:41 +0300
Subject: [PATCH 166/174] Always allow private access in Snap to road mode

---
 OsmAnd/src/net/osmand/plus/routing/RouteProvider.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
index c4b0052ab2..1cb3acc763 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
@@ -769,6 +769,9 @@ public class RouteProvider {
 				paramsR.put(key, vl);
 			}
 		}
+		if (params.snapToRoadParams != null) {
+			paramsR.put(GeneralRouter.ALLOW_PRIVATE, "true");
+		}
 		float mb = (1 << 20);
 		Runtime rt = Runtime.getRuntime();
 		// make visible

From 123e03edb345fe4833d0e2e1a860dd5fda527da0 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 21 Aug 2017 18:20:23 +0300
Subject: [PATCH 167/174] Add possibility to undo / redo snap to road

---
 .../MeasurementToolFragment.java              | 11 +++---
 .../command/ClearPointsCommand.java           | 13 ++++---
 .../command/SnapToRoadCommand.java            | 36 +++++++++++++++++++
 3 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/command/SnapToRoadCommand.java

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index fd2475e69c..9aa73d0fb5 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -65,6 +65,7 @@ import net.osmand.plus.measurementtool.command.MeasurementCommandManager;
 import net.osmand.plus.measurementtool.command.MovePointCommand;
 import net.osmand.plus.measurementtool.command.RemovePointCommand;
 import net.osmand.plus.measurementtool.command.ReorderPointCommand;
+import net.osmand.plus.measurementtool.command.SnapToRoadCommand;
 import net.osmand.plus.routing.RouteProvider.SnapToRoadParams;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.views.OsmandMapTileView;
@@ -827,16 +828,16 @@ public class MeasurementToolFragment extends Fragment {
 		params.listener = new SnapToRoadParams.SnapToRoadListener() {
 			@Override
 			public void onSnapToRoadDone() {
-				snappedToRoadPoints.clear();
+				ArrayList<WptPt> pts = new ArrayList<>(params.points.size());
 				for (Location loc : params.points) {
 					WptPt pt = new WptPt();
 					pt.lat = loc.getLatitude();
 					pt.lon = loc.getLongitude();
-					snappedToRoadPoints.add(pt);
+					pts.add(pt);
 				}
-				MapActivity mapActivity = getMapActivity();
-				if (mapActivity != null) {
-					mapActivity.refreshMap();
+				MeasurementToolLayer layer = getMeasurementLayer();
+				if (layer != null) {
+					commandManager.execute(new SnapToRoadCommand(layer, pts));
 				}
 			}
 		};
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
index 81cdf55d7b..97e4afc4d2 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
@@ -1,6 +1,6 @@
 package net.osmand.plus.measurementtool.command;
 
-import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.measurementtool.MeasurementToolLayer;
 
 import java.util.LinkedList;
@@ -8,7 +8,8 @@ import java.util.List;
 
 public class ClearPointsCommand extends MeasurementModeCommand {
 
-	private List<GPXUtilities.WptPt> points;
+	private List<WptPt> points;
+	private List<WptPt> snappedToRoadPoints;
 
 	public ClearPointsCommand(MeasurementToolLayer measurementLayer) {
 		this.measurementLayer = measurementLayer;
@@ -16,10 +17,12 @@ public class ClearPointsCommand extends MeasurementModeCommand {
 
 	@Override
 	public boolean execute() {
-		List<GPXUtilities.WptPt> pts = measurementLayer.getMeasurementPoints();
+		List<WptPt> pts = measurementLayer.getMeasurementPoints();
+		List<WptPt> snappedPts = measurementLayer.getSnappedToRoadPoints();
 		points = new LinkedList<>(pts);
+		snappedToRoadPoints = new LinkedList<>(snappedPts);
 		pts.clear();
-		measurementLayer.getSnappedToRoadPoints().clear();
+		snappedPts.clear();
 		measurementLayer.refreshMap();
 		return true;
 	}
@@ -27,12 +30,14 @@ public class ClearPointsCommand extends MeasurementModeCommand {
 	@Override
 	public void undo() {
 		measurementLayer.getMeasurementPoints().addAll(points);
+		measurementLayer.getSnappedToRoadPoints().addAll(snappedToRoadPoints);
 		measurementLayer.refreshMap();
 	}
 
 	@Override
 	public void redo() {
 		measurementLayer.getMeasurementPoints().clear();
+		measurementLayer.getSnappedToRoadPoints().clear();
 		measurementLayer.refreshMap();
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/SnapToRoadCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/SnapToRoadCommand.java
new file mode 100644
index 0000000000..cf00791eaf
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/SnapToRoadCommand.java
@@ -0,0 +1,36 @@
+package net.osmand.plus.measurementtool.command;
+
+import net.osmand.plus.GPXUtilities.WptPt;
+import net.osmand.plus.measurementtool.MeasurementToolLayer;
+
+import java.util.List;
+
+public class SnapToRoadCommand extends MeasurementModeCommand {
+
+	private List<WptPt> snappedPoints;
+
+	public SnapToRoadCommand(MeasurementToolLayer measurementLayer, List<WptPt> points) {
+		this.measurementLayer = measurementLayer;
+		this.snappedPoints = points;
+	}
+
+	@Override
+	public boolean execute() {
+		measurementLayer.getSnappedToRoadPoints().clear();
+		measurementLayer.getSnappedToRoadPoints().addAll(snappedPoints);
+		measurementLayer.refreshMap();
+		return true;
+	}
+
+	@Override
+	public void undo() {
+		measurementLayer.getSnappedToRoadPoints().clear();
+		measurementLayer.refreshMap();
+	}
+
+	@Override
+	public void redo() {
+		measurementLayer.getSnappedToRoadPoints().addAll(snappedPoints);
+		measurementLayer.refreshMap();
+	}
+}

From 53e20809e1de5527162c50a4cabeec5f0adcb765 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Mon, 21 Aug 2017 18:48:40 +0300
Subject: [PATCH 168/174] Fix finding bounds only once

---
 .../osmand/plus/measurementtool/MeasurementToolLayer.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index ad58e056e0..546a86c830 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -327,10 +327,10 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 				int previousDrawnLocY = -1;
 				for (int i = 0; i < measurementPoints.size(); i++) {
 					WptPt pt = measurementPoints.get(i);
-					if (tb.containsLatLon(pt.lat, pt.lon)) {
+					int locX = tb.getPixXFromLonNoRot(pt.lon);
+					int locY = tb.getPixYFromLatNoRot(pt.lat);
+					if (locX >= 0 && locX <= tb.getPixWidth() && locY >= 0 && locY <= tb.getPixHeight()) {
 						if (!(inMovePointMode && i == selectedPointPos)) {
-							int locX = tb.getPixXFromLonNoRot(pt.lon);
-							int locY = tb.getPixYFromLatNoRot(pt.lat);
 							boolean xOverlap = false;
 							boolean yOverlap = false;
 							if (previousDrawnLocX != -1 && previousDrawnLocY != -1) {

From 8e391b1925d445f68ce8c2ac87b6011e1e48105d Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 22 Aug 2017 11:59:06 +0300
Subject: [PATCH 169/174] Do some refactoring

---
 .../MeasurementToolFragment.java              | 129 +++++++++---------
 1 file changed, 66 insertions(+), 63 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 9aa73d0fb5..7ac9869578 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -122,12 +122,12 @@ public class MeasurementToolFragment extends Fragment {
 	private int previousMapPosition;
 	private NewGpxLine newGpxLine;
 	private boolean gpxPointsAdded;
-	private boolean snapToRoadEnabled;
 	private ApplicationMode snapToRoadAppMode;
 
 	private boolean inMovePointMode;
 	private boolean inAddPointAfterMode;
 	private boolean inAddPointBeforeMode;
+	private boolean isInSnapToRoadMode;
 
 	private int selectedPointPos = -1;
 	private WptPt selectedCachedPoint;
@@ -293,7 +293,7 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			public void onClick(View view) {
 				OptionsBottomSheetDialogFragment fragment = new OptionsBottomSheetDialogFragment();
-				fragment.setSnapToRoadEnabled(snapToRoadEnabled);
+				fragment.setSnapToRoadEnabled(isInSnapToRoadMode);
 				fragment.setListener(createOptionsFragmentListener());
 				fragment.setAddLineMode(newGpxLine != null);
 				fragment.show(mapActivity.getSupportFragmentManager(), OptionsBottomSheetDialogFragment.TAG);
@@ -456,7 +456,7 @@ public class MeasurementToolFragment extends Fragment {
 
 		enterMeasurementMode();
 
-		if (snapToRoadEnabled) {
+		if (isInSnapToRoadMode) {
 			enableSnapToRoadMode(true);
 		}
 
@@ -547,7 +547,7 @@ public class MeasurementToolFragment extends Fragment {
 
 			@Override
 			public void snapToRoadOnCLick() {
-				if (!snapToRoadEnabled) {
+				if (!isInSnapToRoadMode) {
 					showSnapToRoadMenu(true);
 				} else {
 					disableSnapToRoadMode();
@@ -754,7 +754,7 @@ public class MeasurementToolFragment extends Fragment {
 		if (snapToRoadAppMode != null) {
 			toolBarController.setTopBarSwitchVisible(true);
 			toolBarController.setTopBarSwitchChecked(true);
-			snapToRoadEnabled = true;
+			isInSnapToRoadMode = true;
 			mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_snap_to_road));
 			final MapActivity mapActivity = getMapActivity();
 			if (mapActivity != null) {
@@ -775,7 +775,7 @@ public class MeasurementToolFragment extends Fragment {
 				if (measurementPoints.size() > 1) {
 					if (!enableAfterRotating) {
 						snapToRoadProgressBar.setProgress(0);
-						doSnapToRoad(mapActivity);
+						doSnapToRoad();
 					}
 				}
 
@@ -784,71 +784,74 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
-	private void doSnapToRoad(final MapActivity mapActivity) {
-		Location start = new Location("");
-		WptPt first = measurementPoints.get(0);
-		start.setLatitude(first.getLatitude());
-		start.setLongitude(first.getLongitude());
+	private void doSnapToRoad() {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			Location start = new Location("");
+			WptPt first = measurementPoints.get(0);
+			start.setLatitude(first.getLatitude());
+			start.setLongitude(first.getLongitude());
 
-		WptPt last = measurementPoints.get(measurementPoints.size() - 1);
-		LatLon end = new LatLon(last.getLatitude(), last.getLongitude());
+			WptPt last = measurementPoints.get(measurementPoints.size() - 1);
+			LatLon end = new LatLon(last.getLatitude(), last.getLongitude());
 
-		List<LatLon> intermediates = new ArrayList<>();
-		if (measurementPoints.size() > 2) {
-			for (int i = 1; i < measurementPoints.size() - 1; i++) {
-				WptPt pt = measurementPoints.get(i);
-				intermediates.add(new LatLon(pt.getLatitude(), pt.getLongitude()));
+			List<LatLon> intermediates = new ArrayList<>();
+			if (measurementPoints.size() > 2) {
+				for (int i = 1; i < measurementPoints.size() - 1; i++) {
+					WptPt pt = measurementPoints.get(i);
+					intermediates.add(new LatLon(pt.getLatitude(), pt.getLongitude()));
+				}
 			}
+
+			final SnapToRoadParams params = new SnapToRoadParams();
+			params.applicationMode = snapToRoadAppMode;
+			params.calculationProgress = calculationProgress = new RouteCalculationProgress();
+			params.calculationProgressCallback = new RoutingHelper.RouteCalculationProgressCallback() {
+				@Override
+				public void updateProgress(int progress) {
+					snapToRoadProgressBar.setVisibility(View.VISIBLE);
+					snapToRoadProgressBar.setProgress(progress);
+				}
+
+				@Override
+				public void requestPrivateAccessRouting() {
+
+				}
+
+				@Override
+				public void finish() {
+					snapToRoadProgressBar.setVisibility(View.GONE);
+					MapActivity mapActivity = getMapActivity();
+					if (mapActivity != null) {
+						mapActivity.refreshMap();
+					}
+				}
+			};
+			params.listener = new SnapToRoadParams.SnapToRoadListener() {
+				@Override
+				public void onSnapToRoadDone() {
+					ArrayList<WptPt> pts = new ArrayList<>(params.points.size());
+					for (Location loc : params.points) {
+						WptPt pt = new WptPt();
+						pt.lat = loc.getLatitude();
+						pt.lon = loc.getLongitude();
+						pts.add(pt);
+					}
+					MeasurementToolLayer layer = getMeasurementLayer();
+					if (layer != null) {
+						commandManager.execute(new SnapToRoadCommand(layer, pts));
+					}
+				}
+			};
+
+			mapActivity.getMyApplication().getRoutingHelper().recalculateSnapToRoad(start, end, intermediates, params);
 		}
-
-		final SnapToRoadParams params = new SnapToRoadParams();
-		params.applicationMode = snapToRoadAppMode;
-		params.calculationProgress = calculationProgress = new RouteCalculationProgress();
-		params.calculationProgressCallback = new RoutingHelper.RouteCalculationProgressCallback() {
-			@Override
-			public void updateProgress(int progress) {
-				snapToRoadProgressBar.setVisibility(View.VISIBLE);
-				snapToRoadProgressBar.setProgress(progress);
-			}
-
-			@Override
-			public void requestPrivateAccessRouting() {
-
-			}
-
-			@Override
-			public void finish() {
-				snapToRoadProgressBar.setVisibility(View.GONE);
-				MapActivity mapActivity = getMapActivity();
-				if (mapActivity != null) {
-					mapActivity.refreshMap();
-				}
-			}
-		};
-		params.listener = new SnapToRoadParams.SnapToRoadListener() {
-			@Override
-			public void onSnapToRoadDone() {
-				ArrayList<WptPt> pts = new ArrayList<>(params.points.size());
-				for (Location loc : params.points) {
-					WptPt pt = new WptPt();
-					pt.lat = loc.getLatitude();
-					pt.lon = loc.getLongitude();
-					pts.add(pt);
-				}
-				MeasurementToolLayer layer = getMeasurementLayer();
-				if (layer != null) {
-					commandManager.execute(new SnapToRoadCommand(layer, pts));
-				}
-			}
-		};
-
-		mapActivity.getMyApplication().getRoutingHelper().recalculateSnapToRoad(start, end, intermediates, params);
 	}
 
 	private void disableSnapToRoadMode() {
 		toolBarController.setTopBarSwitchVisible(false);
 		toolBarController.setTitle(previousToolBarTitle);
-		snapToRoadEnabled = false;
+		isInSnapToRoadMode = false;
 		mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_ruler));
 		calculationProgress.isCancelled = true;
 		MapActivity mapActivity = getMapActivity();
@@ -1571,7 +1574,7 @@ public class MeasurementToolFragment extends Fragment {
 			if (pointsListOpened) {
 				hidePointsList();
 			}
-			if (snapToRoadEnabled) {
+			if (isInSnapToRoadMode) {
 				disableSnapToRoadMode();
 			}
 			if (newGpxLine != null) {

From 40b7e1b8e53f237514916345b3f6e2d2ec04b05b Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 22 Aug 2017 12:14:54 +0300
Subject: [PATCH 170/174] Remove unnecessary method

---
 .../MeasurementToolFragment.java              | 34 +++++++++----------
 .../measurementtool/MeasurementToolLayer.java |  4 ---
 .../command/AddPointCommand.java              |  2 +-
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 7ac9869578..f85c657198 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -247,7 +247,7 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			public void onClick(View view) {
 				if (!pointsListOpened
-						&& measurementLayer.getPointsCount() > 0
+						&& measurementPoints.size() > 0
 						&& !measurementLayer.isInMovePointMode()
 						&& !measurementLayer.isInAddPointAfterMode()
 						&& !measurementLayer.isInAddPointBeforeMode()) {
@@ -314,7 +314,7 @@ public class MeasurementToolFragment extends Fragment {
 					disable(undoBtn);
 				}
 				hidePointsListIfNoPoints();
-				if (measurementLayer.getPointsCount() > 0) {
+				if (measurementPoints.size() > 0) {
 					enable(upDownBtn);
 				}
 				adapter.notifyDataSetChanged();
@@ -334,7 +334,7 @@ public class MeasurementToolFragment extends Fragment {
 					disable(redoBtn);
 				}
 				hidePointsListIfNoPoints();
-				if (measurementLayer.getPointsCount() > 0) {
+				if (measurementPoints.size() > 0) {
 					enable(upDownBtn);
 				}
 				adapter.notifyDataSetChanged();
@@ -393,7 +393,7 @@ public class MeasurementToolFragment extends Fragment {
 		if (!commandManager.canRedo()) {
 			disable(redoBtn);
 		}
-		if (measurementLayer.getPointsCount() < 1) {
+		if (measurementPoints.size() < 1) {
 			disable(upDownBtn);
 		}
 
@@ -424,7 +424,7 @@ public class MeasurementToolFragment extends Fragment {
 		toolBarController.setOnSaveViewClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				if (measurementLayer.getPointsCount() > 0) {
+				if (measurementPoints.size() > 0) {
 					addToGpx(mapActivity);
 				} else {
 					Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
@@ -557,7 +557,7 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			public void addToGpxOnClick() {
 				if (mapActivity != null && measurementLayer != null) {
-					if (measurementLayer.getPointsCount() > 0) {
+					if (measurementPoints.size() > 0) {
 						addToGpx(mapActivity);
 					} else {
 						Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
@@ -568,7 +568,7 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			public void saveAsNewTrackOnClick() {
 				if (mapActivity != null && measurementLayer != null) {
-					if (measurementLayer.getPointsCount() > 0) {
+					if (measurementPoints.size() > 0) {
 						openSaveAsNewTrackMenu(mapActivity);
 					} else {
 						Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
@@ -579,7 +579,7 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			public void addToTheTrackOnClick() {
 				if (mapActivity != null && measurementLayer != null) {
-					if (measurementLayer.getPointsCount() > 0) {
+					if (measurementPoints.size() > 0) {
 						showAddToTrackDialog(mapActivity);
 					} else {
 						Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
@@ -772,11 +772,9 @@ public class MeasurementToolFragment extends Fragment {
 				snapToRoadProgressBar = (ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar);
 				snapToRoadProgressBar.setMinimumHeight(0);
 
-				if (measurementPoints.size() > 1) {
-					if (!enableAfterRotating) {
-						snapToRoadProgressBar.setProgress(0);
-						doSnapToRoad();
-					}
+				if (!enableAfterRotating) {
+					snapToRoadProgressBar.setProgress(0);
+					doSnapToRoad();
 				}
 
 				mapActivity.refreshMap();
@@ -786,7 +784,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void doSnapToRoad() {
 		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
+		if (mapActivity != null && measurementPoints.size() > 1) {
 			Location start = new Location("");
 			WptPt first = measurementPoints.get(0);
 			start.setLatitude(first.getLatitude());
@@ -845,6 +843,8 @@ public class MeasurementToolFragment extends Fragment {
 			};
 
 			mapActivity.getMyApplication().getRoutingHelper().recalculateSnapToRoad(start, end, intermediates, params);
+		} else {
+			calculationProgress.isCancelled = true;
 		}
 	}
 
@@ -1181,7 +1181,7 @@ public class MeasurementToolFragment extends Fragment {
 	private void hidePointsListIfNoPoints() {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
-			if (measurementLayer.getPointsCount() < 1) {
+			if (measurementPoints.size() < 1) {
 				disable(upDownBtn);
 				if (pointsListOpened) {
 					hidePointsList();
@@ -1445,7 +1445,7 @@ public class MeasurementToolFragment extends Fragment {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
 			distanceTv.setText(measurementLayer.getDistanceSt() + ",");
-			pointsTv.setText((portrait ? pointsSt + ": " : "") + measurementLayer.getPointsCount());
+			pointsTv.setText((portrait ? pointsSt + ": " : "") + measurementPoints.size());
 		}
 	}
 
@@ -1547,7 +1547,7 @@ public class MeasurementToolFragment extends Fragment {
 				hidePointsList();
 				return;
 			}
-			if (measurementLayer.getPointsCount() < 1 || saved) {
+			if (measurementPoints.size() < 1 || saved) {
 				dismiss(mapActivity);
 				return;
 			}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 546a86c830..b7e868d7c9 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -127,10 +127,6 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		this.inMeasurementMode = inMeasurementMode;
 	}
 
-	public int getPointsCount() {
-		return measurementPoints.size();
-	}
-
 	public List<WptPt> getMeasurementPoints() {
 		return measurementPoints;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
index 7556c306a6..6de9d2702c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
@@ -18,7 +18,7 @@ public class AddPointCommand extends MeasurementModeCommand {
 	public AddPointCommand(MeasurementToolLayer measurementLayer, boolean center) {
 		this.measurementLayer = measurementLayer;
 		this.center = center;
-		position = measurementLayer.getPointsCount();
+		position = measurementLayer.getMeasurementPoints().size();
 	}
 
 	@Override

From cd8c559bdb8c22249264fad8cad6b66895bf3529 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 22 Aug 2017 13:20:32 +0300
Subject: [PATCH 171/174] Recalculate snap to road after adding changes

---
 .../MeasurementToolFragment.java              | 86 +++++++++++--------
 .../command/AddPointCommand.java              |  5 ++
 .../command/ClearPointsCommand.java           |  5 ++
 .../command/MeasurementCommandManager.java    | 13 ++-
 .../command/MeasurementModeCommand.java       | 13 ++-
 .../command/MovePointCommand.java             |  5 ++
 .../command/RemovePointCommand.java           |  5 ++
 .../command/ReorderPointCommand.java          |  5 ++
 .../command/SnapToRoadCommand.java            |  5 ++
 9 files changed, 102 insertions(+), 40 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index f85c657198..0b8909183b 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -62,6 +62,7 @@ import net.osmand.plus.measurementtool.adapter.MeasurementToolItemTouchHelperCal
 import net.osmand.plus.measurementtool.command.AddPointCommand;
 import net.osmand.plus.measurementtool.command.ClearPointsCommand;
 import net.osmand.plus.measurementtool.command.MeasurementCommandManager;
+import net.osmand.plus.measurementtool.command.MeasurementModeCommand.MeasurementCommandType;
 import net.osmand.plus.measurementtool.command.MovePointCommand;
 import net.osmand.plus.measurementtool.command.RemovePointCommand;
 import net.osmand.plus.measurementtool.command.ReorderPointCommand;
@@ -307,7 +308,10 @@ public class MeasurementToolFragment extends Fragment {
 		undoBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				commandManager.undo();
+				MeasurementCommandType type = commandManager.undo();
+				if (type != null && type != MeasurementCommandType.SNAP_TO_ROAD) {
+					recalculateSnapToRoadIfNedeed();
+				}
 				if (commandManager.canUndo()) {
 					enable(undoBtn);
 				} else {
@@ -328,6 +332,7 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			public void onClick(View view) {
 				commandManager.redo();
+				recalculateSnapToRoadIfNedeed();
 				if (commandManager.canRedo()) {
 					enable(redoBtn);
 				} else {
@@ -478,6 +483,15 @@ public class MeasurementToolFragment extends Fragment {
 		return view;
 	}
 
+	private void recalculateSnapToRoadIfNedeed() {
+		if (calculationProgress != null) {
+			calculationProgress.isCancelled = true;
+		}
+		if (isInSnapToRoadMode) {
+			doSnapToRoad();
+		}
+	}
+
 	@Override
 	public void onDestroyView() {
 		super.onDestroyView();
@@ -590,6 +604,9 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			public void clearAllOnClick() {
 				commandManager.execute(new ClearPointsCommand(measurementLayer));
+				if (calculationProgress != null) {
+					calculationProgress.isCancelled = true;
+				}
 				if (pointsListOpened) {
 					hidePointsList();
 				}
@@ -617,13 +634,7 @@ public class MeasurementToolFragment extends Fragment {
 			public void deleteOnClick() {
 				clearSelection();
 				if (measurementLayer != null) {
-					int position = measurementLayer.getSelectedPointPos();
-					commandManager.execute(new RemovePointCommand(measurementLayer, position));
-					adapter.notifyDataSetChanged();
-					disable(redoBtn);
-					updateText();
-					saved = false;
-					hidePointsListIfNoPoints();
+					removePoint(measurementLayer, measurementLayer.getSelectedPointPos());
 					measurementLayer.clearSelection();
 				}
 			}
@@ -674,6 +685,16 @@ public class MeasurementToolFragment extends Fragment {
 		};
 	}
 
+	private void removePoint(MeasurementToolLayer layer, int position) {
+		commandManager.execute(new RemovePointCommand(layer, position));
+		recalculateSnapToRoadIfNedeed();
+		adapter.notifyDataSetChanged();
+		disable(redoBtn);
+		updateText();
+		saved = false;
+		hidePointsListIfNoPoints();
+	}
+
 	private SaveAsNewTrackFragmentListener createSaveAsNewTrackFragmentListener() {
 		return new SaveAsNewTrackFragmentListener() {
 			@Override
@@ -699,12 +720,7 @@ public class MeasurementToolFragment extends Fragment {
 			@Override
 			public void onRemoveClick(int position) {
 				if (measurementLayer != null) {
-					commandManager.execute(new RemovePointCommand(measurementLayer, position));
-					adapter.notifyDataSetChanged();
-					disable(redoBtn);
-					updateText();
-					saved = false;
-					hidePointsListIfNoPoints();
+					removePoint(measurementLayer, position);
 				}
 			}
 
@@ -739,6 +755,7 @@ public class MeasurementToolFragment extends Fragment {
 					toPosition = holder.getAdapterPosition();
 					if (toPosition >= 0 && fromPosition >= 0 && toPosition != fromPosition) {
 						commandManager.execute(new ReorderPointCommand(measurementLayer, fromPosition, toPosition));
+						recalculateSnapToRoadIfNedeed();
 						adapter.notifyDataSetChanged();
 						disable(redoBtn);
 						updateText();
@@ -807,7 +824,6 @@ public class MeasurementToolFragment extends Fragment {
 			params.calculationProgressCallback = new RoutingHelper.RouteCalculationProgressCallback() {
 				@Override
 				public void updateProgress(int progress) {
-					snapToRoadProgressBar.setVisibility(View.VISIBLE);
 					snapToRoadProgressBar.setProgress(progress);
 				}
 
@@ -841,9 +857,10 @@ public class MeasurementToolFragment extends Fragment {
 					}
 				}
 			};
+			snapToRoadProgressBar.setVisibility(View.VISIBLE);
 
 			mapActivity.getMyApplication().getRoutingHelper().recalculateSnapToRoad(start, end, intermediates, params);
-		} else {
+		} else if (calculationProgress != null) {
 			calculationProgress.isCancelled = true;
 		}
 	}
@@ -853,7 +870,9 @@ public class MeasurementToolFragment extends Fragment {
 		toolBarController.setTitle(previousToolBarTitle);
 		isInSnapToRoadMode = false;
 		mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_ruler));
-		calculationProgress.isCancelled = true;
+		if (calculationProgress != null) {
+			calculationProgress.isCancelled = true;
+		}
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
 			mapActivity.findViewById(R.id.snap_to_road_image_button).setVisibility(View.GONE);
@@ -928,11 +947,7 @@ public class MeasurementToolFragment extends Fragment {
 			WptPt oldPoint = measurementLayer.getSelectedCachedPoint();
 			int position = measurementLayer.getSelectedPointPos();
 			commandManager.execute(new MovePointCommand(measurementLayer, oldPoint, newPoint, position));
-			enable(undoBtn, upDownBtn);
-			disable(redoBtn);
-			updateText();
-			adapter.notifyDataSetChanged();
-			saved = false;
+			doAddOrMovePointCommonStuff();
 			measurementLayer.exitMovePointMode();
 			measurementLayer.clearSelection();
 			measurementLayer.refreshMap();
@@ -1112,11 +1127,7 @@ public class MeasurementToolFragment extends Fragment {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
 			commandManager.execute(new AddPointCommand(measurementLayer, false));
-			enable(undoBtn, upDownBtn);
-			disable(redoBtn);
-			updateText();
-			adapter.notifyDataSetChanged();
-			saved = false;
+			doAddOrMovePointCommonStuff();
 		}
 	}
 
@@ -1124,11 +1135,7 @@ public class MeasurementToolFragment extends Fragment {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
 			commandManager.execute(new AddPointCommand(measurementLayer, true));
-			enable(undoBtn, upDownBtn);
-			disable(redoBtn);
-			updateText();
-			adapter.notifyDataSetChanged();
-			saved = false;
+			doAddOrMovePointCommonStuff();
 		}
 	}
 
@@ -1137,15 +1144,20 @@ public class MeasurementToolFragment extends Fragment {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
 			added = commandManager.execute(new AddPointCommand(measurementLayer, position));
-			enable(undoBtn, upDownBtn);
-			disable(redoBtn);
-			updateText();
-			adapter.notifyDataSetChanged();
-			saved = false;
+			doAddOrMovePointCommonStuff();
 		}
 		return added;
 	}
 
+	private void doAddOrMovePointCommonStuff() {
+		recalculateSnapToRoadIfNedeed();
+		enable(undoBtn, upDownBtn);
+		disable(redoBtn);
+		updateText();
+		adapter.notifyDataSetChanged();
+		saved = false;
+	}
+
 	private void showPointsList() {
 		pointsListOpened = true;
 		upDownBtn.setImageDrawable(downIcon);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
index 6de9d2702c..1d4582dc17 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
@@ -44,4 +44,9 @@ public class AddPointCommand extends MeasurementModeCommand {
 		measurementLayer.refreshMap();
 		measurementLayer.moveMapToPoint(position);
 	}
+
+	@Override
+	MeasurementCommandType getType() {
+		return MeasurementCommandType.ADD_POINT;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
index 97e4afc4d2..f80340def6 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
@@ -40,4 +40,9 @@ public class ClearPointsCommand extends MeasurementModeCommand {
 		measurementLayer.getSnappedToRoadPoints().clear();
 		measurementLayer.refreshMap();
 	}
+
+	@Override
+	MeasurementCommandType getType() {
+		return MeasurementCommandType.CLEAR_POINTS;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java
index 503cae2704..4261271adb 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java
@@ -1,6 +1,9 @@
 package net.osmand.plus.measurementtool.command;
 
+import android.support.annotation.Nullable;
+
 import net.osmand.plus.measurementtool.MeasurementToolLayer;
+import net.osmand.plus.measurementtool.command.MeasurementModeCommand.MeasurementCommandType;
 
 import java.util.Deque;
 import java.util.LinkedList;
@@ -27,20 +30,26 @@ public class MeasurementCommandManager {
 		return false;
 	}
 
-	public void undo() {
+	@Nullable
+	public MeasurementCommandType undo() {
 		if (canUndo()) {
 			MeasurementModeCommand command = undoCommands.pop();
 			redoCommands.push(command);
 			command.undo();
+			return command.getType();
 		}
+		return null;
 	}
 
-	public void redo() {
+	@Nullable
+	public MeasurementCommandType redo() {
 		if (canRedo()) {
 			MeasurementModeCommand command = redoCommands.pop();
 			undoCommands.push(command);
 			command.redo();
+			return command.getType();
 		}
+		return null;
 	}
 
 	public void resetMeasurementLayer(MeasurementToolLayer layer) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java
index 20d48372d3..f0fb2133ea 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java
@@ -2,11 +2,22 @@ package net.osmand.plus.measurementtool.command;
 
 import net.osmand.plus.measurementtool.MeasurementToolLayer;
 
-abstract class MeasurementModeCommand implements Command {
+public abstract class MeasurementModeCommand implements Command {
 
 	MeasurementToolLayer measurementLayer;
 
 	void setMeasurementLayer(MeasurementToolLayer layer) {
 		this.measurementLayer = layer;
 	}
+
+	abstract MeasurementCommandType getType();
+
+	public enum MeasurementCommandType {
+		ADD_POINT,
+		CLEAR_POINTS,
+		MOVE_POINT,
+		REMOVE_POINT,
+		REORDER_POINT,
+		SNAP_TO_ROAD
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
index b5cd4252f1..242f981ea1 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
@@ -34,4 +34,9 @@ public class MovePointCommand extends MeasurementModeCommand {
 		measurementLayer.getMeasurementPoints().add(position, newPoint);
 		measurementLayer.refreshMap();
 	}
+
+	@Override
+	MeasurementCommandType getType() {
+		return MeasurementCommandType.MOVE_POINT;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
index dea29a4e9d..380e55e331 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
@@ -32,4 +32,9 @@ public class RemovePointCommand extends MeasurementModeCommand {
 		measurementLayer.getMeasurementPoints().remove(position);
 		measurementLayer.refreshMap();
 	}
+
+	@Override
+	MeasurementCommandType getType() {
+		return MeasurementCommandType.REMOVE_POINT;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
index ecaf081d9c..69c9218a28 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
@@ -34,4 +34,9 @@ public class ReorderPointCommand extends MeasurementModeCommand {
 		Collections.swap(measurementLayer.getMeasurementPoints(), from, to);
 		measurementLayer.refreshMap();
 	}
+
+	@Override
+	MeasurementCommandType getType() {
+		return MeasurementCommandType.REORDER_POINT;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/SnapToRoadCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/SnapToRoadCommand.java
index cf00791eaf..ceb4d1bdd2 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/SnapToRoadCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/SnapToRoadCommand.java
@@ -33,4 +33,9 @@ public class SnapToRoadCommand extends MeasurementModeCommand {
 		measurementLayer.getSnappedToRoadPoints().addAll(snappedPoints);
 		measurementLayer.refreshMap();
 	}
+
+	@Override
+	MeasurementCommandType getType() {
+		return MeasurementCommandType.SNAP_TO_ROAD;
+	}
 }

From b2352def0b4ae50e0ad397fd895325effaac419a Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 22 Aug 2017 13:32:33 +0300
Subject: [PATCH 172/174] Draw points if not overlap

---
 .../measurementtool/MeasurementToolLayer.java | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index b7e868d7c9..57157de35b 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -47,7 +47,6 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private int marginApplyingPointIconY;
 	private final TIntArrayList tx = new TIntArrayList();
 	private final TIntArrayList ty = new TIntArrayList();
-	private final TIntArrayList drawnPointsPositions = new TIntArrayList();
 	private OnMeasureDistanceToCenter measureDistanceToCenterListener;
 	private OnSingleTapListener singleTapListener;
 	private OnEnterMovePointModeListener enterMovePointModeListener;
@@ -55,6 +54,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private WptPt selectedCachedPoint;
 	private LatLon pressedPointLatLon;
 	private int iconSize;
+	private boolean overlapped;
 
 	@Override
 	public void initLayer(OsmandMapTileView view) {
@@ -158,7 +158,11 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
 		if (singleTapListener != null) {
 			if (inMeasurementMode && !inMovePointMode && !inAddPointAfterMode && !inAddPointBeforeMode) {
-				selectPoint(point.x, point.y, true);
+				if (overlapped) {
+					clearSelection();
+				} else {
+					selectPoint(point.x, point.y, true);
+				}
 				if (selectedPointPos == -1) {
 					pressedPointLatLon = tileBox.getLatLonFromPixel(point.x, point.y);
 					singleTapListener.onAddPoint();
@@ -176,7 +180,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	@Override
 	public boolean onLongPressEvent(PointF point, RotatedTileBox tileBox) {
 		if (inMeasurementMode) {
-			if (!inMovePointMode && !inAddPointAfterMode && !inAddPointBeforeMode && measurementPoints.size() > 0) {
+			if (!overlapped && !inMovePointMode && !inAddPointAfterMode && !inAddPointBeforeMode && measurementPoints.size() > 0) {
 				selectPoint(point.x, point.y, false);
 				if (selectedCachedPoint != null && selectedPointPos != -1) {
 					enterMovingPointMode();
@@ -210,7 +214,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		double lowestDistance = view.getResources().getDimension(R.dimen.measurement_tool_select_radius);
 		for (int i = 0; i < measurementPoints.size(); i++) {
 			WptPt pt = measurementPoints.get(i);
-			if (drawnPointsPositions.contains(i) && tb.containsLatLon(pt.getLatitude(), pt.getLongitude())) {
+			if (tb.containsLatLon(pt.getLatitude(), pt.getLongitude())) {
 				double xDiff = tb.getPixXFromLonNoRot(pt.getLongitude()) - x;
 				double yDiff = tb.getPixYFromLatNoRot(pt.getLatitude()) - y;
 				double distToPoint = Math.sqrt(Math.pow(xDiff, 2) + Math.pow(yDiff, 2));
@@ -238,7 +242,6 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings settings) {
 		if (inMeasurementMode) {
-			drawnPointsPositions.clear();
 			lineAttrs.updatePaints(view, settings, tb);
 			if (!inMovePointMode && !inAddPointAfterMode && !inAddPointBeforeMode) {
 				drawCenterIcon(canvas, tb, tb.getCenterPixelPoint(), settings.isNightMode());
@@ -319,6 +322,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 				calculatePath(tb, tx, ty, path);
 				canvas.drawPath(path, lineAttrs.paint);
 
+				overlapped = false;
 				int previousDrawnLocX = -1;
 				int previousDrawnLocY = -1;
 				for (int i = 0; i < measurementPoints.size(); i++) {
@@ -334,10 +338,23 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 								yOverlap = (Math.abs(locY - previousDrawnLocY)) < iconSize;
 							}
 							if (!xOverlap || !yOverlap) {
-								canvas.drawBitmap(pointIcon, locX - marginPointIconX, locY - marginPointIconY, bitmapPaint);
 								previousDrawnLocX = locX;
 								previousDrawnLocY = locY;
-								drawnPointsPositions.add(i);
+							} else {
+								overlapped = true;
+								break;
+							}
+						}
+					}
+				}
+				if (!overlapped) {
+					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 (locX >= 0 && locX <= tb.getPixWidth() && locY >= 0 && locY <= tb.getPixHeight()) {
+							if (!(inMovePointMode && i == selectedPointPos)) {
+								canvas.drawBitmap(pointIcon, locX - marginPointIconX, locY - marginPointIconY, bitmapPaint);
 							}
 						}
 					}

From b5118f54bcfc4f2f688df55392c2cd6d85ec64fb Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 22 Aug 2017 15:56:04 +0300
Subject: [PATCH 173/174] Refactor new gpx data

---
 .../osmand/plus/activities/MapActivity.java   | 10 +--
 .../osmand/plus/activities/TrackActivity.java | 44 ++--------
 .../MeasurementToolFragment.java              | 80 +++++++++----------
 .../plus/measurementtool/NewGpxData.java      | 36 +++++++++
 ...electedPointBottomSheetDialogFragment.java |  8 +-
 .../adapter/MeasurementToolAdapter.java       | 12 +--
 .../plus/myplaces/TrackPointFragment.java     | 10 +--
 .../plus/myplaces/TrackSegmentFragment.java   | 20 ++---
 8 files changed, 111 insertions(+), 109 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/NewGpxData.java

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 7c3a4d3e36..4574a0892e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -70,7 +70,6 @@ import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.search.SearchActivity;
-import net.osmand.plus.activities.TrackActivity.NewGpxLine;
 import net.osmand.plus.base.FailSafeFuntions;
 import net.osmand.plus.base.MapViewTrackingUtilities;
 import net.osmand.plus.dashboard.DashboardOnMap;
@@ -97,6 +96,7 @@ import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
 import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenuFragment;
 import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu;
 import net.osmand.plus.measurementtool.MeasurementToolFragment;
+import net.osmand.plus.measurementtool.NewGpxData;
 import net.osmand.plus.render.RendererRegistry;
 import net.osmand.plus.resources.ResourceManager;
 import net.osmand.plus.routing.RoutingHelper;
@@ -940,11 +940,11 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 					QuadRect qr = newGpxPoint.getRect();
 					mapView.fitRectToMap(qr.left, qr.right, qr.top, qr.bottom, (int) qr.width(), (int) qr.height(), 0);
 					getMapLayers().getContextMenuLayer().enterAddGpxPointMode(newGpxPoint);
-				} else if (toShow instanceof NewGpxLine) {
-					NewGpxLine newGpxLine = (NewGpxLine) toShow;
-					QuadRect qr = newGpxLine.getRect();
+				} else if (toShow instanceof NewGpxData) {
+					NewGpxData newGpxData = (NewGpxData) toShow;
+					QuadRect qr = newGpxData.getRect();
 					mapView.fitRectToMap(qr.left, qr.right, qr.top, qr.bottom, (int) qr.width(), (int) qr.height(), 0);
-					MeasurementToolFragment.showInstance(getSupportFragmentManager(), newGpxLine);
+					MeasurementToolFragment.showInstance(getSupportFragmentManager(), newGpxData);
 				} else {
 					mapContextMenu.show(latLonToShow, mapLabelToShow, toShow);
 				}
diff --git a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
index a040a01307..66d8822c71 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
@@ -16,7 +16,6 @@ import net.osmand.AndroidUtils;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.data.QuadRect;
-import net.osmand.plus.activities.TrackActivity.NewGpxLine.LineType;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.TrkSegment;
@@ -29,6 +28,7 @@ import net.osmand.plus.OsmAndAppCustomization;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
+import net.osmand.plus.measurementtool.NewGpxData;
 import net.osmand.plus.myplaces.FavoritesActivity;
 import net.osmand.plus.myplaces.SplitSegmentFragment;
 import net.osmand.plus.myplaces.TrackPointFragment;
@@ -119,14 +119,14 @@ public class TrackActivity extends TabActivity {
 		}
 	}
 
-	public void addLine(LineType lineType) {
-		addLine(lineType, null);
+	public void addNewGpxData(NewGpxData.ActionType actionType) {
+		addNewGpxData(actionType, null);
 	}
 
-	public void addLine(LineType lineType, TrkSegment segment) {
+	public void addNewGpxData(NewGpxData.ActionType actionType, TrkSegment segment) {
 		GPXFile gpxFile = getGpx();
 		QuadRect rect = getRect();
-		NewGpxLine newGpxLine = new NewGpxLine(gpxFile, rect, lineType, segment);
+		NewGpxData newGpxData = new NewGpxData(gpxFile, rect, actionType, segment);
 		WptPt pointToShow = gpxFile != null ? gpxFile.findPointToShow() : null;
 		if (pointToShow != null) {
 			LatLon location = new LatLon(pointToShow.getLatitude(), pointToShow.getLongitude());
@@ -135,7 +135,7 @@ public class TrackActivity extends TabActivity {
 					settings.getLastKnownMapZoom(),
 					new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_line)),
 					false,
-					newGpxLine
+					newGpxData
 			);
 
 			MapActivity.launchMapActivityMoveToTop(this);
@@ -423,36 +423,4 @@ public class TrackActivity extends TabActivity {
 	public GpxDataItem getGpxDataItem() {
 		return gpxDataItem;
 	}
-
-	public static class NewGpxLine {
-		public enum LineType { ADD_SEGMENT, ADD_ROUTE_POINTS, EDIT_SEGMENT }
-
-		private GPXFile gpxFile;
-		private TrkSegment trkSegment;
-		private QuadRect rect;
-		private LineType lineType;
-
-		public NewGpxLine(GPXFile gpxFile, QuadRect rect, LineType lineType, TrkSegment trkSegment) {
-			this.gpxFile = gpxFile;
-			this.rect = rect;
-			this.lineType = lineType;
-			this.trkSegment = trkSegment;
-		}
-
-		public GPXFile getGpxFile() {
-			return gpxFile;
-		}
-
-		public QuadRect getRect() {
-			return rect;
-		}
-
-		public LineType getLineType() {
-			return lineType;
-		}
-
-		public TrkSegment getTrkSegment() {
-			return trkSegment;
-		}
-	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 0b8909183b..dfb3878c7f 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -48,8 +48,6 @@ import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.TrackActivity;
-import net.osmand.plus.activities.TrackActivity.NewGpxLine;
-import net.osmand.plus.activities.TrackActivity.NewGpxLine.LineType;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.measurementtool.OptionsBottomSheetDialogFragment.OptionsFragmentListener;
@@ -121,7 +119,7 @@ public class MeasurementToolFragment extends Fragment {
 	private boolean portrait;
 	private boolean nightMode;
 	private int previousMapPosition;
-	private NewGpxLine newGpxLine;
+	private NewGpxData newGpxData;
 	private boolean gpxPointsAdded;
 	private ApplicationMode snapToRoadAppMode;
 
@@ -140,8 +138,8 @@ public class MeasurementToolFragment extends Fragment {
 		LINE
 	}
 
-	public void setNewGpxLine(NewGpxLine newGpxLine) {
-		this.newGpxLine = newGpxLine;
+	public void setNewGpxData(NewGpxData newGpxData) {
+		this.newGpxData = newGpxData;
 	}
 
 	@Nullable
@@ -162,7 +160,7 @@ public class MeasurementToolFragment extends Fragment {
 		Fragment selectedPointFragment = fragmentManager.findFragmentByTag(SelectedPointBottomSheetDialogFragment.TAG);
 		if (selectedPointFragment != null) {
 			SelectedPointBottomSheetDialogFragment fragment = (SelectedPointBottomSheetDialogFragment) selectedPointFragment;
-			fragment.setLineType(newGpxLine != null ? newGpxLine.getLineType() : null);
+			fragment.setActionType(newGpxData != null ? newGpxData.getActionType() : null);
 			fragment.setListener(createSelectedPointFragmentListener());
 		}
 		Fragment optionsFragment = fragmentManager.findFragmentByTag(OptionsBottomSheetDialogFragment.TAG);
@@ -209,9 +207,9 @@ public class MeasurementToolFragment extends Fragment {
 		distanceToCenterTv = (TextView) mainView.findViewById(R.id.distance_to_center_text_view);
 
 		mainIcon = (ImageView) mainView.findViewById(R.id.main_icon);
-		if (newGpxLine != null) {
-			LineType lineType = newGpxLine.getLineType();
-			if (lineType == LineType.ADD_SEGMENT || lineType == LineType.EDIT_SEGMENT) {
+		if (newGpxData != null) {
+			NewGpxData.ActionType actionType = newGpxData.getActionType();
+			if (actionType == NewGpxData.ActionType.ADD_SEGMENT || actionType == NewGpxData.ActionType.EDIT_SEGMENT) {
 				mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_polygom_dark));
 			} else {
 				mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_markers_dark));
@@ -296,7 +294,7 @@ public class MeasurementToolFragment extends Fragment {
 				OptionsBottomSheetDialogFragment fragment = new OptionsBottomSheetDialogFragment();
 				fragment.setSnapToRoadEnabled(isInSnapToRoadMode);
 				fragment.setListener(createOptionsFragmentListener());
-				fragment.setAddLineMode(newGpxLine != null);
+				fragment.setAddLineMode(newGpxData != null);
 				fragment.show(mapActivity.getSupportFragmentManager(), OptionsBottomSheetDialogFragment.TAG);
 			}
 		});
@@ -402,19 +400,19 @@ public class MeasurementToolFragment extends Fragment {
 			disable(upDownBtn);
 		}
 
-		toolBarController = new MeasurementToolBarController(newGpxLine);
+		toolBarController = new MeasurementToolBarController(newGpxData);
 		if (inMovePointMode || inAddPointAfterMode || inAddPointBeforeMode) {
 			toolBarController.setBackBtnIconIds(R.drawable.ic_action_mode_back, R.drawable.ic_action_mode_back);
 		} else {
 			toolBarController.setBackBtnIconIds(R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_dark);
 		}
-		if (newGpxLine != null) {
-			LineType lineType = newGpxLine.getLineType();
-			if (lineType == LineType.ADD_ROUTE_POINTS) {
+		if (newGpxData != null) {
+			NewGpxData.ActionType actionType = newGpxData.getActionType();
+			if (actionType == NewGpxData.ActionType.ADD_ROUTE_POINTS) {
 				toolBarController.setTitle(getString(R.string.add_route_points));
-			} else if (lineType == LineType.ADD_SEGMENT) {
+			} else if (actionType == NewGpxData.ActionType.ADD_SEGMENT) {
 				toolBarController.setTitle(getString(R.string.add_line));
-			} else if (lineType == LineType.EDIT_SEGMENT) {
+			} else if (actionType == NewGpxData.ActionType.EDIT_SEGMENT) {
 				toolBarController.setTitle(getString(R.string.edit_line));
 			}
 		} else {
@@ -447,7 +445,7 @@ public class MeasurementToolFragment extends Fragment {
 		mapActivity.showTopToolbar(toolBarController);
 
 		adapter = new MeasurementToolAdapter(getMapActivity(), measurementLayer.getMeasurementPoints(),
-				newGpxLine != null ? newGpxLine.getLineType() : null);
+				newGpxData != null ? newGpxData.getActionType() : null);
 		if (portrait) {
 			pointsRv = mainView.findViewById(R.id.measure_points_recycler_view);
 		} else {
@@ -465,19 +463,19 @@ public class MeasurementToolFragment extends Fragment {
 			enableSnapToRoadMode(true);
 		}
 
-		if (newGpxLine != null && !gpxPointsAdded) {
-			LineType lineType = newGpxLine.getLineType();
-			if (lineType == LineType.ADD_ROUTE_POINTS) {
+		if (newGpxData != null && !gpxPointsAdded) {
+			NewGpxData.ActionType actionType = newGpxData.getActionType();
+			if (actionType == NewGpxData.ActionType.ADD_ROUTE_POINTS) {
 				displayRoutePoints();
 				gpxPointsAdded = true;
-			} else if (lineType == LineType.EDIT_SEGMENT) {
+			} else if (actionType == NewGpxData.ActionType.EDIT_SEGMENT) {
 				displaySegmentPoints();
 				gpxPointsAdded = true;
 			}
 		}
 
 		if (saved == null) {
-			saved = newGpxLine != null && (newGpxLine.getLineType() == LineType.ADD_ROUTE_POINTS || newGpxLine.getLineType() == LineType.EDIT_SEGMENT);
+			saved = newGpxData != null && (newGpxData.getActionType() == NewGpxData.ActionType.ADD_ROUTE_POINTS || newGpxData.getActionType() == NewGpxData.ActionType.EDIT_SEGMENT);
 		}
 
 		return view;
@@ -884,7 +882,7 @@ public class MeasurementToolFragment extends Fragment {
 	private void displayRoutePoints() {
 		final MeasurementToolLayer measurementLayer = getMeasurementLayer();
 
-		GPXFile gpx = newGpxLine.getGpxFile();
+		GPXFile gpx = newGpxData.getGpxFile();
 		List<WptPt> points = gpx.getRoutePoints();
 		if (measurementLayer != null) {
 			measurementPoints.addAll(points);
@@ -896,7 +894,7 @@ public class MeasurementToolFragment extends Fragment {
 	private void displaySegmentPoints() {
 		final MeasurementToolLayer measurementLayer = getMeasurementLayer();
 
-		TrkSegment segment = newGpxLine.getTrkSegment();
+		TrkSegment segment = newGpxData.getTrkSegment();
 		List<WptPt> points = segment.points;
 		if (measurementLayer != null) {
 			measurementPoints.addAll(points);
@@ -907,7 +905,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void openSelectedPointMenu(MapActivity mapActivity) {
 		SelectedPointBottomSheetDialogFragment fragment = new SelectedPointBottomSheetDialogFragment();
-		fragment.setLineType(newGpxLine != null ? newGpxLine.getLineType() : null);
+		fragment.setActionType(newGpxData != null ? newGpxData.getActionType() : null);
 		fragment.setListener(createSelectedPointFragmentListener());
 		fragment.show(mapActivity.getSupportFragmentManager(), SelectedPointBottomSheetDialogFragment.TAG);
 	}
@@ -1240,11 +1238,11 @@ public class MeasurementToolFragment extends Fragment {
 	}
 
 	private void addToGpx(MapActivity mapActivity) {
-		GPXFile gpx = newGpxLine.getGpxFile();
+		GPXFile gpx = newGpxData.getGpxFile();
 		SelectedGpxFile selectedGpxFile = mapActivity.getMyApplication().getSelectedGpxHelper().getSelectedFileByPath(gpx.path);
 		boolean showOnMap = selectedGpxFile != null;
-		LineType lineType = newGpxLine.getLineType();
-		saveExistingGpx(gpx, showOnMap, lineType, true);
+		NewGpxData.ActionType actionType = newGpxData.getActionType();
+		saveExistingGpx(gpx, showOnMap, actionType, true);
 	}
 
 	private void saveAsGpx(final SaveType saveType) {
@@ -1320,8 +1318,8 @@ public class MeasurementToolFragment extends Fragment {
 		saveGpx(dir, fileName, checked, null, false, null, saveType);
 	}
 
-	private void saveExistingGpx(GPXFile gpx, boolean showOnMap, LineType lineType, boolean openTrackActivity) {
-		saveGpx(null, null, showOnMap, gpx, openTrackActivity, lineType, null);
+	private void saveExistingGpx(GPXFile gpx, boolean showOnMap, NewGpxData.ActionType actionType, boolean openTrackActivity) {
+		saveGpx(null, null, showOnMap, gpx, openTrackActivity, actionType, null);
 	}
 
 	private void saveGpx(final File dir,
@@ -1329,7 +1327,7 @@ public class MeasurementToolFragment extends Fragment {
 						 final boolean showOnMap,
 						 final GPXFile gpx,
 						 final boolean openTrackActivity,
-						 final LineType lineType,
+						 final NewGpxData.ActionType actionType,
 						 final SaveType saveType) {
 
 		new AsyncTask<Void, Void, String>() {
@@ -1380,8 +1378,8 @@ public class MeasurementToolFragment extends Fragment {
 					toSave = new File(gpx.path);
 					if (measurementLayer != null) {
 						List<WptPt> points = measurementLayer.getMeasurementPoints();
-						if (lineType != null) {
-							switch (lineType) {
+						if (actionType != null) {
+							switch (actionType) {
 								case ADD_SEGMENT:
 									gpx.addTrkSegment(points);
 									break;
@@ -1391,7 +1389,7 @@ public class MeasurementToolFragment extends Fragment {
 								case EDIT_SEGMENT:
 									TrkSegment segment = new TrkSegment();
 									segment.points.addAll(points);
-									gpx.replaceSegment(newGpxLine.getTrkSegment(), segment);
+									gpx.replaceSegment(newGpxData.getTrkSegment(), segment);
 									break;
 							}
 						} else {
@@ -1403,7 +1401,7 @@ public class MeasurementToolFragment extends Fragment {
 						if (showOnMap) {
 							SelectedGpxFile sf = activity.getMyApplication().getSelectedGpxHelper().selectGpxFile(gpx, true, false);
 							if (sf != null) {
-								if (lineType == LineType.ADD_SEGMENT || lineType == LineType.EDIT_SEGMENT) {
+								if (actionType == NewGpxData.ActionType.ADD_SEGMENT || actionType == NewGpxData.ActionType.EDIT_SEGMENT) {
 									sf.processPoints();
 								}
 							}
@@ -1589,8 +1587,8 @@ public class MeasurementToolFragment extends Fragment {
 			if (isInSnapToRoadMode) {
 				disableSnapToRoadMode();
 			}
-			if (newGpxLine != null) {
-				GPXFile gpx = newGpxLine.getGpxFile();
+			if (newGpxData != null) {
+				GPXFile gpx = newGpxData.getGpxFile();
 				Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getTrackActivity());
 				newIntent.putExtra(TrackActivity.TRACK_FILE_NAME, gpx.path);
 				newIntent.putExtra(TrackActivity.OPEN_TRACKS_LIST, true);
@@ -1603,10 +1601,10 @@ public class MeasurementToolFragment extends Fragment {
 		}
 	}
 
-	public static boolean showInstance(FragmentManager fragmentManager, NewGpxLine newGpxLine) {
+	public static boolean showInstance(FragmentManager fragmentManager, NewGpxData newGpxData) {
 		try {
 			MeasurementToolFragment fragment = new MeasurementToolFragment();
-			fragment.setNewGpxLine(newGpxLine);
+			fragment.setNewGpxData(newGpxData);
 			fragment.setRetainInstance(true);
 			fragmentManager.beginTransaction()
 					.add(R.id.bottomFragmentContainer, fragment, MeasurementToolFragment.TAG)
@@ -1619,7 +1617,7 @@ public class MeasurementToolFragment extends Fragment {
 
 	private class MeasurementToolBarController extends TopToolbarController {
 
-		MeasurementToolBarController(NewGpxLine newGpxLine) {
+		MeasurementToolBarController(NewGpxData newGpxData) {
 			super(MapInfoWidgetsFactory.TopToolbarControllerType.MEASUREMENT_TOOL);
 			setBackBtnIconClrIds(0, 0);
 			setTitleTextClrIds(R.color.primary_text_dark, R.color.primary_text_dark);
@@ -1627,7 +1625,7 @@ public class MeasurementToolFragment extends Fragment {
 			setBgIds(R.drawable.gradient_toolbar, R.drawable.gradient_toolbar,
 					R.drawable.gradient_toolbar, R.drawable.gradient_toolbar);
 			setCloseBtnVisible(false);
-			if (newGpxLine != null) {
+			if (newGpxData != null) {
 				setSaveViewVisible(true);
 			}
 			setSingleLineTitle(false);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/NewGpxData.java b/OsmAnd/src/net/osmand/plus/measurementtool/NewGpxData.java
new file mode 100644
index 0000000000..500c0335c7
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/NewGpxData.java
@@ -0,0 +1,36 @@
+package net.osmand.plus.measurementtool;
+
+import net.osmand.data.QuadRect;
+import net.osmand.plus.GPXUtilities;
+
+public class NewGpxData {
+	public enum ActionType { ADD_SEGMENT, ADD_ROUTE_POINTS, EDIT_SEGMENT }
+
+	private GPXUtilities.GPXFile gpxFile;
+	private GPXUtilities.TrkSegment trkSegment;
+	private QuadRect rect;
+	private ActionType actionType;
+
+	public NewGpxData(GPXUtilities.GPXFile gpxFile, QuadRect rect, ActionType actionType, GPXUtilities.TrkSegment trkSegment) {
+		this.gpxFile = gpxFile;
+		this.rect = rect;
+		this.actionType = actionType;
+		this.trkSegment = trkSegment;
+	}
+
+	public GPXUtilities.GPXFile getGpxFile() {
+		return gpxFile;
+	}
+
+	public QuadRect getRect() {
+		return rect;
+	}
+
+	public ActionType getActionType() {
+		return actionType;
+	}
+
+	public GPXUtilities.TrkSegment getTrkSegment() {
+		return trkSegment;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java
index 670e5a4f72..dbca650225 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java
@@ -37,14 +37,14 @@ public class SelectedPointBottomSheetDialogFragment extends BottomSheetDialogFra
 	private SelectedPointFragmentListener listener;
 	private boolean nightMode;
 	private boolean portrait;
-	private TrackActivity.NewGpxLine.LineType lineType;
+	private NewGpxData.ActionType actionType;
 
 	public void setListener(SelectedPointFragmentListener listener) {
 		this.listener = listener;
 	}
 
-	public void setLineType(TrackActivity.NewGpxLine.LineType lineType) {
-		this.lineType = lineType;
+	public void setActionType(NewGpxData.ActionType actionType) {
+		this.actionType = actionType;
 	}
 
 	@Nullable
@@ -119,7 +119,7 @@ public class SelectedPointBottomSheetDialogFragment extends BottomSheetDialogFra
 		if (!TextUtils.isEmpty(pointTitle)) {
 			((TextView) mainView.findViewById(R.id.selected_point_title)).setText(pointTitle);
 		} else {
-			if (lineType == TrackActivity.NewGpxLine.LineType.ADD_ROUTE_POINTS) {
+			if (actionType == NewGpxData.ActionType.ADD_ROUTE_POINTS) {
 				((TextView) mainView.findViewById(R.id.selected_point_title)).setText(mapActivity.getString(R.string.route_point) + " - " + (pos + 1));
 			} else {
 				((TextView) mainView.findViewById(R.id.selected_point_title)).setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index 5de9d86ca4..f5ed512090 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -17,7 +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.plus.measurementtool.NewGpxData;
 import net.osmand.util.MapUtils;
 
 import java.util.Collections;
@@ -30,12 +30,12 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 	private final List<WptPt> points;
 	private MeasurementAdapterListener listener;
 	private boolean nightMode;
-	private LineType lineType;
+	private NewGpxData.ActionType actionType;
 
-	public MeasurementToolAdapter(MapActivity mapActivity, List<WptPt> points, LineType lineType) {
+	public MeasurementToolAdapter(MapActivity mapActivity, List<WptPt> points, NewGpxData.ActionType actionType) {
 		this.mapActivity = mapActivity;
 		this.points = points;
-		this.lineType = lineType;
+		this.actionType = actionType;
 	}
 
 	public void setAdapterListener(MeasurementAdapterListener listener) {
@@ -84,7 +84,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		if (!TextUtils.isEmpty(pointTitle)) {
 			holder.title.setText(pointTitle);
 		} else {
-			if (lineType == LineType.ADD_ROUTE_POINTS) {
+			if (actionType == NewGpxData.ActionType.ADD_ROUTE_POINTS) {
 				holder.title.setText(mapActivity.getString(R.string.route_point) + " - " + (pos + 1));
 			} else {
 				holder.title.setText(mapActivity.getString(R.string.plugin_distance_point) + " - " + (pos + 1));
@@ -105,7 +105,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 				holder.descr.setText(OsmAndFormatter.getFormattedDistance(dist, mapActivity.getMyApplication()));
 			}
 		}
-		if (lineType == LineType.EDIT_SEGMENT) {
+		if (actionType == NewGpxData.ActionType.EDIT_SEGMENT) {
 			double elevation = pt.ele;
 			if (!Double.isNaN(elevation)) {
 				holder.elevation.setText(mapActivity.getString(R.string.measurement_tool_altitude, OsmAndFormatter.getFormattedAlt(elevation, mapActivity.getMyApplication())));
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index 55421714da..54ceae5c4c 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -35,7 +35,6 @@ import net.osmand.AndroidUtils;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
-import net.osmand.plus.activities.TrackActivity.NewGpxLine.LineType;
 import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
@@ -58,6 +57,7 @@ import net.osmand.plus.activities.TrackActivity;
 import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.base.OsmandExpandableListFragment;
 import net.osmand.plus.dialogs.DirectionsDialogs;
+import net.osmand.plus.measurementtool.NewGpxData;
 import net.osmand.util.Algorithms;
 
 import java.io.File;
@@ -164,11 +164,11 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 					break;
 				case R.id.route_text_layout:
 				case R.id.route_fab:
-					addLine(LineType.ADD_ROUTE_POINTS);
+					addNewGpxData(NewGpxData.ActionType.ADD_ROUTE_POINTS);
 					break;
 				case R.id.line_text_layout:
 				case R.id.line_fab:
-					addLine(LineType.ADD_SEGMENT);
+					addNewGpxData(NewGpxData.ActionType.ADD_SEGMENT);
 					break;
 			}
 		}
@@ -216,8 +216,8 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 		getTrackActivity().addPoint(pointDescription);
 	}
 
-	private void addLine(LineType lineType) {
-		getTrackActivity().addLine(lineType);
+	private void addNewGpxData(NewGpxData.ActionType actionType) {
+		getTrackActivity().addNewGpxData(actionType);
 	}
 
 	private void openMenu() {
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index 4ce60ffbcc..a84e07a802 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -61,7 +61,6 @@ import net.osmand.data.PointDescription;
 import net.osmand.data.QuadRect;
 import net.osmand.data.RotatedTileBox;
 import net.osmand.data.RotatedTileBox.RotatedTileBoxBuilder;
-import net.osmand.plus.activities.TrackActivity.NewGpxLine.LineType;
 import net.osmand.plus.GPXDatabase;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
@@ -90,6 +89,7 @@ import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetAxisType;
 import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetType;
 import net.osmand.plus.helpers.GpxUiHelper.OrderedLineDataSet;
+import net.osmand.plus.measurementtool.NewGpxData;
 import net.osmand.plus.render.MapRenderRepositories;
 import net.osmand.plus.resources.AsyncLoadingThread;
 import net.osmand.plus.resources.ResourceManager;
@@ -217,11 +217,11 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 					break;
 				case R.id.route_text_layout:
 				case R.id.route_fab:
-					addLine(LineType.ADD_ROUTE_POINTS);
+					addNewGpxData(NewGpxData.ActionType.ADD_ROUTE_POINTS);
 					break;
 				case R.id.line_text_layout:
 				case R.id.line_fab:
-					addLine(LineType.ADD_SEGMENT);
+					addNewGpxData(NewGpxData.ActionType.ADD_SEGMENT);
 					break;
 			}
 		}
@@ -289,12 +289,12 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		getTrackActivity().addPoint(pointDescription);
 	}
 
-	private void addLine(LineType lineType) {
-		getTrackActivity().addLine(lineType);
+	private void addNewGpxData(NewGpxData.ActionType actionType) {
+		getTrackActivity().addNewGpxData(actionType);
 	}
 
-	private void addLine(LineType lineType, TrkSegment segment) {
-		getTrackActivity().addLine(lineType, segment);
+	private void addNewGpxData(NewGpxData.ActionType actionType, TrkSegment segment) {
+		getTrackActivity().addNewGpxData(actionType, segment);
 	}
 
 	private void openMenu() {
@@ -1366,7 +1366,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 													case R.id.action_edit:
 														TrkSegment segment = getTrkSegment();
 														if (segment != null) {
-															addLine(LineType.EDIT_SEGMENT, segment);
+															addNewGpxData(NewGpxData.ActionType.EDIT_SEGMENT, segment);
 														}
 														return true;
 													case R.id.action_delete:
@@ -1469,7 +1469,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 													case R.id.action_edit:
 														TrkSegment segment = getTrkSegment();
 														if (segment != null) {
-															addLine(LineType.EDIT_SEGMENT, segment);
+															addNewGpxData(NewGpxData.ActionType.EDIT_SEGMENT, segment);
 														}
 														return true;
 													case R.id.action_delete:
@@ -1562,7 +1562,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 													case R.id.action_edit:
 														TrkSegment segment = getTrkSegment();
 														if (segment != null) {
-															addLine(LineType.EDIT_SEGMENT, segment);
+															addNewGpxData(NewGpxData.ActionType.EDIT_SEGMENT, segment);
 														}
 														return true;
 													case R.id.action_delete:

From db626d9f295135c17732035690619e98143ab895 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 22 Aug 2017 16:07:12 +0300
Subject: [PATCH 174/174] Draw only 50 points

---
 .../measurementtool/MeasurementToolLayer.java | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 57157de35b..3ca9f8402f 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -53,8 +53,8 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private int selectedPointPos = -1;
 	private WptPt selectedCachedPoint;
 	private LatLon pressedPointLatLon;
-	private int iconSize;
 	private boolean overlapped;
+	private int pointsToDraw = 50;
 
 	@Override
 	public void initLayer(OsmandMapTileView view) {
@@ -75,8 +75,6 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 
 		marginApplyingPointIconY = applyingPointIcon.getHeight() / 2;
 		marginApplyingPointIconX = applyingPointIcon.getWidth() / 2;
-
-		iconSize = AndroidUtils.dpToPx(view.getContext(), 14);
 	}
 
 	void setOnSingleTapListener(OnSingleTapListener listener) {
@@ -323,24 +321,15 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 				canvas.drawPath(path, lineAttrs.paint);
 
 				overlapped = false;
-				int previousDrawnLocX = -1;
-				int previousDrawnLocY = -1;
+				int drawn = 0;
 				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 (locX >= 0 && locX <= tb.getPixWidth() && locY >= 0 && locY <= tb.getPixHeight()) {
 						if (!(inMovePointMode && i == selectedPointPos)) {
-							boolean xOverlap = false;
-							boolean yOverlap = false;
-							if (previousDrawnLocX != -1 && previousDrawnLocY != -1) {
-								xOverlap = (Math.abs(locX - previousDrawnLocX)) < iconSize;
-								yOverlap = (Math.abs(locY - previousDrawnLocY)) < iconSize;
-							}
-							if (!xOverlap || !yOverlap) {
-								previousDrawnLocX = locX;
-								previousDrawnLocY = locY;
-							} else {
+							drawn++;
+							if (drawn > pointsToDraw) {
 								overlapped = true;
 								break;
 							}