From 8f36889cd02b3d2c2b96b17b6b72983dec201b9c Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 26 Sep 2017 18:29:36 +0300
Subject: [PATCH] Add dividers

---
 OsmAnd/res/layout/map_marker_item_new.xml              |  6 ++++++
 .../net/osmand/plus/mapmarkers/PlanRouteFragment.java  |  3 +++
 .../mapmarkers/adapters/MapMarkerItemViewHolder.java   |  2 ++
 .../mapmarkers/adapters/MapMarkersListAdapter.java     | 10 +++++++---
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/map_marker_item_new.xml b/OsmAnd/res/layout/map_marker_item_new.xml
index baad498b0e..98c29f7025 100644
--- a/OsmAnd/res/layout/map_marker_item_new.xml
+++ b/OsmAnd/res/layout/map_marker_item_new.xml
@@ -7,6 +7,12 @@
     android:descendantFocusability="blocksDescendants"
     android:orientation="vertical">
 
+    <include
+        android:id="@+id/top_divider"
+        layout="@layout/list_item_divider"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
     <LinearLayout
         android:id="@+id/main_layout"
         android:layout_width="match_parent"
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
index 5992c29004..e571d25b4a 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
@@ -205,6 +205,9 @@ public class PlanRouteFragment extends Fragment implements OsmAndLocationListene
 				}
 			}
 		});
+		boolean isSmartphone = getResources().getConfiguration().smallestScreenWidthDp < 600;
+		markersRv.setPadding(0, 0, 0, AndroidUtils.dpToPx(mapActivity, isSmartphone ? 72 : 108));
+		markersRv.setClipToPadding(false);
 		markersRv.setLayoutManager(new LinearLayoutManager(getContext()));
 		markersRv.setAdapter(adapter);
 
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkerItemViewHolder.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkerItemViewHolder.java
index 9b22c32409..975b0ec541 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkerItemViewHolder.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkerItemViewHolder.java
@@ -12,6 +12,7 @@ import net.osmand.plus.R;
 public class MapMarkerItemViewHolder extends RecyclerView.ViewHolder {
 
 	final View mainLayout;
+	final View topDivider;
 	final ImageView iconDirection;
 	final ImageView iconReorder;
 	final ImageView icon;
@@ -31,6 +32,7 @@ public class MapMarkerItemViewHolder extends RecyclerView.ViewHolder {
 	public MapMarkerItemViewHolder(View view) {
 		super(view);
 		mainLayout = view.findViewById(R.id.main_layout);
+		topDivider = view.findViewById(R.id.top_divider);
 		iconDirection = (ImageView) view.findViewById(R.id.map_marker_direction_icon);
 		iconReorder = (ImageView) view.findViewById(R.id.map_marker_reorder_icon);
 		icon = (ImageView) view.findViewById(R.id.map_marker_icon);
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java
index 56db113ffe..0648d29be4 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java
@@ -86,11 +86,15 @@ public class MapMarkersListAdapter extends RecyclerView.Adapter<MapMarkerItemVie
 
 		if (pos == 0 || pos == getItemCount() - 1) {
 			holder.firstDescription.setVisibility(View.VISIBLE);
-			holder.firstDescription.setText(pos == 0
-					? mapActivity.getString(R.string.shared_string_control_start) + " • "
-					: mapActivity.getString(R.string.shared_string_finish) + " • ");
+			if (pos == 0) {
+				holder.topDivider.setVisibility(View.VISIBLE);
+				holder.firstDescription.setText(mapActivity.getString(R.string.shared_string_control_start) + " • ");
+			} else {
+				holder.firstDescription.setText(mapActivity.getString(R.string.shared_string_finish) + " • ");
+			}
 		} else {
 			holder.firstDescription.setVisibility(View.GONE);
+			holder.topDivider.setVisibility(View.GONE);
 		}
 
 		if (pos == getItemCount() - 1) {