diff --git a/OsmAnd/res/layout-land/fragment_plan_route.xml b/OsmAnd/res/layout-land/fragment_plan_route.xml index 874e5f1f9a..7123151125 100644 --- a/OsmAnd/res/layout-land/fragment_plan_route.xml +++ b/OsmAnd/res/layout-land/fragment_plan_route.xml @@ -51,33 +51,53 @@ + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:orientation="vertical"> + + + + + + + - - + android:textSize="@dimen/default_sub_text_size" + tools:text="3 markers"/> + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:orientation="vertical"> + + + + + + + - - + android:textSize="@dimen/default_sub_text_size" + tools:text="3 markers"/> + Markers Coordinates format Use system keyboard Choose coordinate format before start. You can always change it by tapping Options. diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java index 30c979bc8c..c8b5bac64a 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java @@ -78,6 +78,7 @@ public class PlanRouteFragment extends Fragment implements OsmAndLocationListene private ImageView upDownIconIv; private TextView distanceTv; private TextView timeTv; + private TextView countTv; @Nullable @Override @@ -113,6 +114,7 @@ public class PlanRouteFragment extends Fragment implements OsmAndLocationListene distanceTv = (TextView) mainView.findViewById(R.id.markers_distance_text_view); timeTv = (TextView) mainView.findViewById(R.id.markers_time_text_view); + countTv = (TextView) mainView.findViewById(R.id.markers_count_text_view); enterPlanRouteMode(); @@ -459,6 +461,8 @@ public class PlanRouteFragment extends Fragment implements OsmAndLocationListene int seconds = (int) (dist / appMode.getDefaultSpeed()); timeTv.setText("~ " + OsmAndFormatter.getFormattedDuration(seconds, mapActivity.getMyApplication())); } + + countTv.setText(mapActivity.getString(R.string.shared_string_markers) + ": " + selectedCount); } } diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java index dfa1c47a3a..5ded437f6a 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java @@ -65,18 +65,20 @@ public class MapMarkersListAdapter extends RecyclerView.Adapter