Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed #4873

Browse source
This commit is contained in:
PaulStets 2018-01-26 16:49:52 +02:00
parent cae1baa6e5
commit e069d66b66
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
View file

@ -705,9 +705,8 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
} }
@Override @Override
public void onItemClick(View view) { public void onItemClick(int position) {
if (mapActivity != null && measurementLayer != null) { if (mapActivity != null && measurementLayer != null) {
int position = pointsRv.indexOfChild(view);
if (pointsListOpened) { if (pointsListOpened) {
hidePointsList(); hidePointsList();
} }

18
OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
View file

@ -8,8 +8,10 @@ import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import net.osmand.plus.GPXUtilities.WptPt; import net.osmand.plus.GPXUtilities.WptPt;
@ -52,12 +54,6 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
final int backgroundColor = ContextCompat.getColor(mapActivity, final int backgroundColor = ContextCompat.getColor(mapActivity,
nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light); nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
view.setBackgroundColor(backgroundColor); view.setBackgroundColor(backgroundColor);
view.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
listener.onItemClick(view);
}
});
return new MeasureToolItemVH(view); return new MeasureToolItemVH(view);
} }
@ -129,6 +125,12 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
listener.onRemoveClick(holder.getAdapterPosition()); listener.onRemoveClick(holder.getAdapterPosition());
} }
}); });
holder.holderLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
listener.onItemClick(holder.getAdapterPosition());
}
});
} }
@Override @Override
@ -150,6 +152,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
static class MeasureToolItemVH extends RecyclerView.ViewHolder { static class MeasureToolItemVH extends RecyclerView.ViewHolder {
final FrameLayout holderLayout;
final ImageView iconReorder; final ImageView iconReorder;
final ImageView icon; final ImageView icon;
final TextView title; final TextView title;
@ -160,6 +163,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
MeasureToolItemVH(View view) { MeasureToolItemVH(View view) {
super(view); super(view);
holderLayout = (FrameLayout) view;
iconReorder = (ImageView) view.findViewById(R.id.measure_point_reorder_icon); iconReorder = (ImageView) view.findViewById(R.id.measure_point_reorder_icon);
icon = (ImageView) view.findViewById(R.id.measure_point_icon); icon = (ImageView) view.findViewById(R.id.measure_point_icon);
title = (TextView) view.findViewById(R.id.measure_point_title); 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 onRemoveClick(int position);
void onItemClick(View view); void onItemClick(int position);
void onDragStarted(RecyclerView.ViewHolder holder); void onDragStarted(RecyclerView.ViewHolder holder);