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

Add displaying of the points

Browse source
This commit is contained in:
Alex 2017-08-04 18:59:48 +03:00
parent 5e490e7c8b
commit 9321434c74
4 changed files with 156 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout/fragment_measurement_tool.xml
View file

@ -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"/>

68
OsmAnd/res/layout/measure_points_list_item.xml Normal file
View file

@ -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>

81
OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java Normal file
View file

@ -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);
}
}
}

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

@ -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;
}