From e069d66b66e521a4974f4ff9e514fc257a0996bf Mon Sep 17 00:00:00 2001
From: PaulStets <stetsenko.pavlo@gmail.com>
Date: Fri, 26 Jan 2018 16:49:52 +0200
Subject: [PATCH 1/3] Fixed #4873

---
 .../MeasurementToolFragment.java               |  3 +--
 .../adapter/MeasurementToolAdapter.java        | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 0245c0ce75..5e3dd47ac4 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -705,9 +705,8 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 			}
 
 			@Override
-			public void onItemClick(View view) {
+			public void onItemClick(int position) {
 				if (mapActivity != null && measurementLayer != null) {
-					int position = pointsRv.indexOfChild(view);
 					if (pointsListOpened) {
 						hidePointsList();
 					}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index effb5e6442..caa20b9106 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -8,8 +8,10 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import net.osmand.plus.GPXUtilities.WptPt;
@@ -52,12 +54,6 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		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) {
-				listener.onItemClick(view);
-			}
-		});
 		return new MeasureToolItemVH(view);
 	}
 
@@ -129,6 +125,12 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 				listener.onRemoveClick(holder.getAdapterPosition());
 			}
 		});
+		holder.holderLayout.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				listener.onItemClick(holder.getAdapterPosition());
+			}
+		});
 	}
 
 	@Override
@@ -150,6 +152,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 
 	static class MeasureToolItemVH extends RecyclerView.ViewHolder {
 
+		final FrameLayout holderLayout;
 		final ImageView iconReorder;
 		final ImageView icon;
 		final TextView title;
@@ -160,6 +163,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 
 		MeasureToolItemVH(View view) {
 			super(view);
+			holderLayout = (FrameLayout) 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);
@@ -174,7 +178,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 
 		void onRemoveClick(int position);
 
-		void onItemClick(View view);
+		void onItemClick(int position);
 
 		void onDragStarted(RecyclerView.ViewHolder holder);
 

From 939ba0558aeddaebf6a9f555824fa4319bb59c0e Mon Sep 17 00:00:00 2001
From: PaulStets <stetsenko.pavlo@gmail.com>
Date: Fri, 26 Jan 2018 16:51:56 +0200
Subject: [PATCH 2/3] Removed unused import

---
 .../plus/measurementtool/adapter/MeasurementToolAdapter.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index caa20b9106..293fd57816 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -11,7 +11,6 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import net.osmand.plus.GPXUtilities.WptPt;

From bffea36c300c3813ba28c6d110556e11e33f2a96 Mon Sep 17 00:00:00 2001
From: PaulStets <stetsenko.pavlo@gmail.com>
Date: Fri, 26 Jan 2018 17:03:02 +0200
Subject: [PATCH 3/3] Use itemView

---
 .../plus/measurementtool/adapter/MeasurementToolAdapter.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index 293fd57816..c123cf5c15 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -8,7 +8,6 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -124,7 +123,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 				listener.onRemoveClick(holder.getAdapterPosition());
 			}
 		});
-		holder.holderLayout.setOnClickListener(new View.OnClickListener() {
+		holder.itemView.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				listener.onItemClick(holder.getAdapterPosition());
@@ -151,7 +150,6 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 
 	static class MeasureToolItemVH extends RecyclerView.ViewHolder {
 
-		final FrameLayout holderLayout;
 		final ImageView iconReorder;
 		final ImageView icon;
 		final TextView title;
@@ -162,7 +160,6 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 
 		MeasureToolItemVH(View view) {
 			super(view);
-			holderLayout = (FrameLayout) 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);