From 970945c9a7077d87b685ed252cb3fab67d1f10f8 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Thu, 5 Oct 2017 15:38:17 +0300
Subject: [PATCH 01/10] Remove unnecessary code

---
 OsmAnd/res/layout/fragment_plan_route.xml     | 68 -------------------
 ...plan_route_options_bottom_sheet_dialog.xml |  2 +-
 .../plus/mapmarkers/PlanRouteFragment.java    | 18 +----
 3 files changed, 2 insertions(+), 86 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_plan_route.xml b/OsmAnd/res/layout/fragment_plan_route.xml
index a4d2861a8a..ae5f8807fc 100644
--- a/OsmAnd/res/layout/fragment_plan_route.xml
+++ b/OsmAnd/res/layout/fragment_plan_route.xml
@@ -113,11 +113,6 @@
                 osmand:typeface="@string/font_roboto_medium"/>
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dashboard_divider"/>
-
         <FrameLayout
             android:id="@+id/markers_list_container"
             android:layout_width="match_parent"
@@ -132,71 +127,8 @@
                 android:layout_height="match_parent"/>
 
             <include layout="@layout/card_bottom_divider"/>
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="5dp"
-                android:layout_gravity="bottom"
-                android:alpha="0.5"
-                android:scaleType="fitXY"
-                android:src="@drawable/bg_shadow_onmap"/>
         </FrameLayout>
 
-        <LinearLayout
-            android:id="@+id/buttons_row"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/measurement_tool_controls_height">
-
-            <LinearLayout
-                android:id="@+id/sort_button"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:background="?attr/selectableItemBackground"
-                android:paddingLeft="@dimen/bottom_sheet_content_margin"
-                android:paddingRight="@dimen/bottom_sheet_content_margin">
-
-                <ImageView
-                    android:id="@+id/sort_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:background="@null"
-                    tools:src="@drawable/ic_action_list_sort"/>
-
-                <net.osmand.plus.widgets.TextViewEx
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/measurement_tool_button_margin"
-                    android:layout_marginStart="@dimen/measurement_tool_button_margin"
-                    android:ellipsize="end"
-                    android:gravity="center_vertical"
-                    android:maxLines="1"
-                    android:text="@string/shared_string_sort"
-                    android:textColor="?attr/color_dialog_buttons"
-                    osmand:textAllCapsCompat="true"
-                    osmand:typeface="@string/font_roboto_medium"/>
-            </LinearLayout>
-
-            <Space
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"/>
-
-            <Button
-                android:id="@+id/save_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|center_vertical"
-                android:layout_marginEnd="@dimen/measurement_tool_button_margin"
-                android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                android:background="@drawable/btn_round_blue"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:minHeight="@dimen/measurement_tool_button_height"
-                android:text="@string/shared_string_save"
-                android:textColor="@color/color_white"/>
-        </LinearLayout>
-
     </LinearLayout>
 
 </FrameLayout>
diff --git a/OsmAnd/res/layout/fragment_plan_route_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_plan_route_options_bottom_sheet_dialog.xml
index 7b17f3a440..c0d074fafd 100644
--- a/OsmAnd/res/layout/fragment_plan_route_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_plan_route_options_bottom_sheet_dialog.xml
@@ -216,7 +216,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/shared_string_cancel"
+            android:text="@string/shared_string_close"
             android:textAllCaps="true"
             android:textColor="?attr/color_dialog_buttons"
             android:textSize="@dimen/default_desc_text_size"
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
index 0eb07e5415..37f0df38af 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
@@ -151,7 +151,6 @@ public class PlanRouteFragment extends Fragment {
 
 		upDownIconIv = (ImageView) mainView.findViewById(R.id.up_down_icon);
 		upDownIconIv.setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_up));
-		((ImageView) mainView.findViewById(R.id.sort_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_list_sort));
 
 		mainView.findViewById(R.id.up_down_row).setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -185,20 +184,6 @@ public class PlanRouteFragment extends Fragment {
 			}
 		});
 
-		mainView.findViewById(R.id.sort_button).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				Toast.makeText(mapActivity, "Sort", Toast.LENGTH_SHORT).show();
-			}
-		});
-
-		mainView.findViewById(R.id.save_button).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				Toast.makeText(mapActivity, "Save", Toast.LENGTH_SHORT).show();
-			}
-		});
-
 		toolbarController = new PlanRouteToolbarController();
 		toolbarController.setBackBtnIconIds(R.drawable.ic_action_mode_back, R.drawable.ic_action_mode_back);
 		toolbarController.setTitle(getString(R.string.plan_route));
@@ -304,8 +289,7 @@ public class PlanRouteFragment extends Fragment {
 			public void onGlobalLayout() {
 				if (portrait) {
 					int upDownRowH = mainView.findViewById(R.id.up_down_row).getHeight();
-					int buttonsRowH = mainView.findViewById(R.id.buttons_row).getHeight();
-					int listContainerH = availableHeight - upDownRowH - buttonsRowH;
+					int listContainerH = availableHeight - upDownRowH;
 					View listContainer = mainView.findViewById(R.id.markers_list_container);
 					listContainer.getLayoutParams().height = listContainerH;
 					listContainer.requestLayout();

From 8f9896dcd834d56296a1951a287ecc54a86c2fa4 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Thu, 5 Oct 2017 17:48:10 +0300
Subject: [PATCH 02/10] Fix backgrounds in night theme

---
 .../CoordinateInputBottomSheetDialogFragment.java     |  5 ++---
 .../HistoryMarkerMenuBottomSheetDialogFragment.java   |  6 +++---
 .../mapmarkers/OptionsBottomSheetDialogFragment.java  |  6 +++---
 .../mapmarkers/OrderByBottomSheetDialogFragment.java  |  6 +++---
 .../PlanRouteOptionsBottomSheetDialogFragment.java    |  4 ++--
 .../SaveAsTrackBottomSheetDialogFragment.java         | 11 +++--------
 .../ShowDirectionBottomSheetDialogFragment.java       |  4 ++--
 7 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java
index 413e330aae..3721a6f52d 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java
@@ -7,7 +7,6 @@ import android.os.Bundle;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.SwitchCompat;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -183,10 +182,10 @@ public class CoordinateInputBottomSheetDialogFragment extends BottomSheetDialogF
 				if (!portrait) {
 					if (screenHeight - statusBarHeight - mainView.getHeight()
 							>= AndroidUtils.dpToPx(getActivity(), 8)) {
-						AndroidUtils.setBackground(getActivity(), mainView, false,
+						AndroidUtils.setBackground(getActivity(), mainView, night,
 								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 					} else {
-						AndroidUtils.setBackground(getActivity(), mainView, false,
+						AndroidUtils.setBackground(getActivity(), mainView, night,
 								R.drawable.bg_bottom_sheet_sides_landscape_light, R.drawable.bg_bottom_sheet_sides_landscape_dark);
 					}
 				}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java
index 6d751f9138..bdd6947c25 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java
@@ -43,7 +43,7 @@ public class HistoryMarkerMenuBottomSheetDialogFragment extends BottomSheetDialo
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
-		boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		final boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_marker_history_bottom_sheet_dialog, container);
@@ -111,10 +111,10 @@ public class HistoryMarkerMenuBottomSheetDialogFragment extends BottomSheetDialo
 				if (!portrait) {
 					if (screenHeight - statusBarHeight - mainView.getHeight()
 							>= AndroidUtils.dpToPx(getActivity(), 8)) {
-						AndroidUtils.setBackground(getActivity(), mainView, false,
+						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
 								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 					} else {
-						AndroidUtils.setBackground(getActivity(), mainView, false,
+						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
 								R.drawable.bg_bottom_sheet_sides_landscape_light, R.drawable.bg_bottom_sheet_sides_landscape_dark);
 					}
 				}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java
index 6b7923a1cf..317b8188be 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java
@@ -39,7 +39,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		MapActivity mapActivity = (MapActivity) getActivity();
 		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
-		boolean nightMode = !getMyApplication().getSettings().isLightContent();
+		final boolean nightMode = !getMyApplication().getSettings().isLightContent();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_marker_options_bottom_sheet_dialog, container);
@@ -157,10 +157,10 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 				if (!portrait) {
 					if (screenHeight - statusBarHeight - mainView.getHeight()
 							>= AndroidUtils.dpToPx(getActivity(), 8)) {
-						AndroidUtils.setBackground(getActivity(), mainView, false,
+						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
 								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 					} else {
-						AndroidUtils.setBackground(getActivity(), mainView, false,
+						AndroidUtils.setBackground(getActivity(), mainView, nightMode,
 								R.drawable.bg_bottom_sheet_sides_landscape_light, R.drawable.bg_bottom_sheet_sides_landscape_dark);
 					}
 				}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/OrderByBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/OrderByBottomSheetDialogFragment.java
index 58b7a92e57..6ee9925660 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/OrderByBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/OrderByBottomSheetDialogFragment.java
@@ -39,7 +39,7 @@ public class OrderByBottomSheetDialogFragment extends BottomSheetDialogFragment
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
 		settings = getMyApplication().getSettings();
-		boolean night = !settings.isLightContent();
+		final boolean night = !settings.isLightContent();
 		final int themeRes = night ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_marker_order_by_bottom_sheet_dialog, container);
@@ -99,10 +99,10 @@ public class OrderByBottomSheetDialogFragment extends BottomSheetDialogFragment
 				if (!portrait) {
 					if (screenHeight - statusBarHeight - mainView.getHeight()
 							>= AndroidUtils.dpToPx(getActivity(), 8)) {
-						AndroidUtils.setBackground(getActivity(), mainView, false,
+						AndroidUtils.setBackground(getActivity(), mainView, night,
 								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 					} else {
-						AndroidUtils.setBackground(getActivity(), mainView, false,
+						AndroidUtils.setBackground(getActivity(), mainView, night,
 								R.drawable.bg_bottom_sheet_sides_landscape_light, R.drawable.bg_bottom_sheet_sides_landscape_dark);
 					}
 				}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java
index fe8c8259c2..a6c3759700 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java
@@ -117,10 +117,10 @@ public class PlanRouteOptionsBottomSheetDialogFragment extends BottomSheetDialog
 
 				if (!portrait) {
 					if (screenHeight - statusBarHeight - mainView.getHeight() >= AndroidUtils.dpToPx(getActivity(), 8)) {
-						AndroidUtils.setBackground(getActivity(), mainView, false,
+						AndroidUtils.setBackground(getActivity(), mainView, night,
 								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 					} else {
-						AndroidUtils.setBackground(getActivity(), mainView, false,
+						AndroidUtils.setBackground(getActivity(), mainView, night,
 								R.drawable.bg_bottom_sheet_sides_landscape_light, R.drawable.bg_bottom_sheet_sides_landscape_dark);
 					}
 				}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java
index b1aa3d0c3a..284454f23e 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java
@@ -4,7 +4,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.format.DateFormat;
-import android.util.Log;
 import android.view.ContextThemeWrapper;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -25,11 +24,7 @@ import net.osmand.plus.base.BottomSheetDialogFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
 
 import java.io.File;
-import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Locale;
-
-import studio.carbonylgroup.textfieldboxes.ExtendedEditText;
 
 import static net.osmand.plus.helpers.GpxImportHelper.GPX_SUFFIX;
 
@@ -49,7 +44,7 @@ public class SaveAsTrackBottomSheetDialogFragment extends BottomSheetDialogFragm
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		MapActivity mapActivity = (MapActivity) getActivity();
 		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
-		boolean nightMode = !getMyApplication().getSettings().isLightContent();
+		final boolean nightMode = !getMyApplication().getSettings().isLightContent();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_marker_save_as_track_bottom_sheet_dialog, container);
@@ -126,10 +121,10 @@ public class SaveAsTrackBottomSheetDialogFragment extends BottomSheetDialogFragm
 					if (!portrait) {
 						if (screenHeight - statusBarHeight - mainView.getHeight()
 								>= AndroidUtils.dpToPx(getActivity(), 8)) {
-							AndroidUtils.setBackground(getActivity(), mainView, false,
+							AndroidUtils.setBackground(getActivity(), mainView, nightMode,
 									R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 						} else {
-							AndroidUtils.setBackground(getActivity(), mainView, false,
+							AndroidUtils.setBackground(getActivity(), mainView, nightMode,
 									R.drawable.bg_bottom_sheet_sides_landscape_light, R.drawable.bg_bottom_sheet_sides_landscape_dark);
 						}
 					}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java
index 059dbc7557..21d63045e3 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java
@@ -160,10 +160,10 @@ public class ShowDirectionBottomSheetDialogFragment extends BottomSheetDialogFra
 				if (!portrait) {
 					if (screenHeight - statusBarHeight - mainView.getHeight()
 							>= AndroidUtils.dpToPx(getActivity(), 8)) {
-						AndroidUtils.setBackground(getActivity(), mainView, false,
+						AndroidUtils.setBackground(getActivity(), mainView, night,
 								R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 					} else {
-						AndroidUtils.setBackground(getActivity(), mainView, false,
+						AndroidUtils.setBackground(getActivity(), mainView, night,
 								R.drawable.bg_bottom_sheet_sides_landscape_light, R.drawable.bg_bottom_sheet_sides_landscape_dark);
 					}
 				}

From 74f37b6c5de360152f0fe5216cf0b1e827e82035 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Thu, 5 Oct 2017 19:04:48 +0300
Subject: [PATCH 03/10] Change UI for Plan Route

---
 .../res/layout-land/fragment_plan_route.xml   | 272 +++++++----------
 .../mapmarkers/MapMarkersDialogFragment.java  |   3 +-
 .../plus/mapmarkers/PlanRouteFragment.java    | 288 ++++++++----------
 3 files changed, 242 insertions(+), 321 deletions(-)

diff --git a/OsmAnd/res/layout-land/fragment_plan_route.xml b/OsmAnd/res/layout-land/fragment_plan_route.xml
index ff21237f2e..02306fc2f1 100644
--- a/OsmAnd/res/layout-land/fragment_plan_route.xml
+++ b/OsmAnd/res/layout-land/fragment_plan_route.xml
@@ -1,21 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
+    android:layout_width="@dimen/dashboard_land_width"
     android:layout_height="match_parent"
-    android:background="@color/color_transparent"
-    android:clickable="true">
+    android:background="@android:color/transparent"
+    android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/main_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:clickable="true"
-        android:orientation="vertical"
-        tools:background="@drawable/bg_bottom_menu_dark">
+        android:layout_width="@dimen/dashboard_land_width"
+        android:layout_height="match_parent"
+        android:background="?attr/left_menu_view_bg"
+        android:orientation="vertical">
+
+        <android.support.design.widget.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dashboard_map_toolbar"
+            tools:background="@color/actionbar_dark_color">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/plan_route_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:contentInsetLeft="54dp"
+                app:contentInsetStart="54dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent">
+
+                            <TextView
+                                android:id="@+id/markers_distance_text_view"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginEnd="@dimen/measurement_tool_text_margin_small"
+                                android:layout_marginLeft="@dimen/measurement_tool_text_margin"
+                                android:layout_marginRight="@dimen/measurement_tool_text_margin_small"
+                                android:layout_marginStart="@dimen/measurement_tool_text_margin"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:textAppearance="@style/TextAppearance.ListItemTitle"
+                                tools:text="1.39 km,"/>
+
+                            <TextView
+                                android:id="@+id/markers_time_text_view"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:textColor="?android:textColorSecondary"
+                                android:textSize="@dimen/default_list_text_size"
+                                tools:text="~ 45 min."/>
+                        </LinearLayout>
+
+                        <TextView
+                            android:id="@+id/markers_count_text_view"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="@dimen/measurement_tool_text_margin"
+                            android:layout_marginStart="@dimen/measurement_tool_text_margin"
+                            android:ellipsize="end"
+                            android:maxLines="1"
+                            android:textColor="?android:textColorSecondary"
+                            android:textSize="@dimen/default_sub_text_size"
+                            tools:text="3 markers"/>
+                    </LinearLayout>
+
+                    <net.osmand.plus.widgets.TextViewEx
+                        android:id="@+id/options_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:background="?attr/selectableItemBackground"
+                        android:ellipsize="end"
+                        android:gravity="center_vertical"
+                        android:maxLines="1"
+                        android:paddingLeft="16dp"
+                        android:paddingRight="16dp"
+                        android:text="@string/shared_string_options"
+                        android:textAllCaps="true"
+                        android:textColor="@color/color_white"
+                        android:textSize="@dimen/default_list_text_size"
+                        osmand:typeface="@string/font_roboto_regular"/>
+                </LinearLayout>
+
+            </android.support.v7.widget.Toolbar>
+
+        </android.support.design.widget.AppBarLayout>
 
         <ProgressBar
             android:id="@+id/snap_to_road_progress_bar"
@@ -26,161 +115,20 @@
             android:visibility="gone"
             tools:visibility="visible"/>
 
-        <LinearLayout
+        <FrameLayout
+            android:id="@+id/markers_list_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:background="@color/ctx_menu_info_view_bg_dark">
 
-            <LinearLayout
-                android:id="@+id/up_down_row"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/measurement_tool_controls_height"
-                android:layout_weight="0.5"
-                android:background="?attr/selectableItemBackground">
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/markers_recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
 
-                <ImageView
-                    android:id="@+id/up_down_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginEnd="@dimen/bottom_sheet_content_margin"
-                    android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
-                    android:layout_marginRight="@dimen/bottom_sheet_content_margin"
-                    android:layout_marginStart="@dimen/bottom_sheet_content_margin"
-                    android:background="@null"
-                    tools:src="@drawable/ic_action_arrow_down"/>
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent">
-
-                        <TextView
-                            android:id="@+id/markers_distance_text_view"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="@dimen/measurement_tool_text_margin_small"
-                            android:layout_marginLeft="@dimen/measurement_tool_text_margin"
-                            android:layout_marginRight="@dimen/measurement_tool_text_margin_small"
-                            android:layout_marginStart="@dimen/measurement_tool_text_margin"
-                            android:ellipsize="end"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.ListItemTitle"
-                            tools:text="1.39 km,"/>
-
-                        <TextView
-                            android:id="@+id/markers_time_text_view"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:ellipsize="end"
-                            android:maxLines="1"
-                            android:textColor="?android:textColorSecondary"
-                            android:textSize="@dimen/default_list_text_size"
-                            tools:text="~ 45 min."/>
-                    </LinearLayout>
-
-                    <TextView
-                        android:id="@+id/markers_count_text_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="@dimen/measurement_tool_text_margin"
-                        android:layout_marginStart="@dimen/measurement_tool_text_margin"
-                        android:ellipsize="end"
-                        android:maxLines="1"
-                        android:textColor="?android:textColorSecondary"
-                        android:textSize="@dimen/default_sub_text_size"
-                        tools:text="3 markers"/>
-                </LinearLayout>
-
-                <net.osmand.plus.widgets.TextViewEx
-                    android:id="@+id/select_all_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"
-                    android:ellipsize="end"
-                    android:gravity="center_vertical"
-                    android:maxLines="1"
-                    android:paddingEnd="@dimen/measurement_tool_text_button_padding_small"
-                    android:paddingLeft="@dimen/measurement_tool_text_button_padding"
-                    android:paddingRight="@dimen/measurement_tool_text_button_padding_small"
-                    android:paddingStart="@dimen/measurement_tool_text_button_padding"
-                    android:text="@string/shared_string_select_all"
-                    android:textColor="?attr/color_dialog_buttons"
-                    osmand:textAllCapsCompat="true"
-                    osmand:typeface="@string/font_roboto_medium"/>
-            </LinearLayout>
-
-            <View
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="?attr/dashboard_divider"/>
-
-            <LinearLayout
-                android:id="@+id/buttons_row"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/measurement_tool_controls_height"
-                android:layout_weight="0.5">
-
-                <LinearLayout
-                    android:id="@+id/sort_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"
-                    android:paddingLeft="@dimen/bottom_sheet_content_margin"
-                    android:paddingRight="@dimen/bottom_sheet_content_margin">
-
-                    <ImageView
-                        android:id="@+id/sort_icon"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:background="@null"
-                        tools:src="@drawable/ic_action_list_sort"/>
-
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_marginLeft="@dimen/measurement_tool_button_margin"
-                        android:layout_marginStart="@dimen/measurement_tool_button_margin"
-                        android:ellipsize="end"
-                        android:gravity="center_vertical"
-                        android:maxLines="1"
-                        android:text="@string/shared_string_sort"
-                        android:textColor="?attr/color_dialog_buttons"
-                        osmand:textAllCapsCompat="true"
-                        osmand:typeface="@string/font_roboto_medium"/>
-                </LinearLayout>
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"/>
-
-                <Button
-                    android:id="@+id/save_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end|center_vertical"
-                    android:layout_marginEnd="@dimen/measurement_tool_button_margin"
-                    android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                    android:background="@drawable/btn_round_blue"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:minHeight="@dimen/measurement_tool_button_height"
-                    android:text="@string/shared_string_save"
-                    android:textColor="@color/color_white"/>
-            </LinearLayout>
-
-        </LinearLayout>
+            <include layout="@layout/card_bottom_divider"/>
+        </FrameLayout>
 
     </LinearLayout>
 
-</FrameLayout>
+</LinearLayout>
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
index b1c17d407d..17287c5793 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
@@ -25,6 +25,7 @@ import net.osmand.plus.OsmandSettings.MapMarkersOrderByMode;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.TrackActivity;
+import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.mapmarkers.OptionsBottomSheetDialogFragment.MarkerOptionsFragmentListener;
 import net.osmand.plus.mapmarkers.OrderByBottomSheetDialogFragment.OrderByFragmentListener;
 import net.osmand.plus.mapmarkers.SaveAsTrackBottomSheetDialogFragment.MarkerSaveAsTrackFragmentListener;
@@ -209,7 +210,7 @@ public class MapMarkersDialogFragment extends android.support.v4.app.DialogFragm
 
 			@Override
 			public void buildRouteOnClick() {
-				PlanRouteFragment.showInstance(mapActivity.getSupportFragmentManager());
+				PlanRouteFragment.showInstance(mapActivity.getSupportFragmentManager(), AndroidUiHelper.isOrientationPortrait(mapActivity));
 				dismiss();
 			}
 
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
index 37f0df38af..1778f70e92 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
@@ -12,6 +12,7 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
 import android.support.v7.widget.helper.ItemTouchHelper;
 import android.util.Pair;
 import android.view.ContextThemeWrapper;
@@ -45,7 +46,6 @@ import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.mapmarkers.PlanRouteOptionsBottomSheetDialogFragment.PlanRouteOptionsFragmentListener;
 import net.osmand.plus.mapmarkers.adapters.MapMarkersItemTouchHelperCallback;
 import net.osmand.plus.mapmarkers.adapters.MapMarkersListAdapter;
-import net.osmand.plus.measurementtool.RecyclerViewFragment;
 import net.osmand.plus.measurementtool.SnapToRoadBottomSheetDialogFragment;
 import net.osmand.plus.measurementtool.SnapToRoadBottomSheetDialogFragment.SnapToRoadFragmentListener;
 import net.osmand.plus.routing.RouteCalculationParams;
@@ -65,8 +65,6 @@ import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import static net.osmand.plus.OsmandSettings.LANDSCAPE_MIDDLE_RIGHT_CONSTANT;
-
 public class PlanRouteFragment extends Fragment {
 
 	public static final String TAG = "PlanRouteFragment";
@@ -89,7 +87,6 @@ public class PlanRouteFragment extends Fragment {
 
 	private View mainView;
 	private RecyclerView markersRv;
-	private ImageView upDownIconIv;
 	private TextView distanceTv;
 	private TextView timeTv;
 	private TextView countTv;
@@ -118,11 +115,6 @@ public class PlanRouteFragment extends Fragment {
 		if (sortByFragment != null) {
 			((PlanRouteOptionsBottomSheetDialogFragment) sortByFragment).setListener(createOptionsFragmentListener());
 		}
-		// If rotate the screen from landscape to portrait when the list of markers is displayed then
-		// the RecyclerViewFragment will exist without view. This is necessary to remove it.
-		if (!portrait) {
-			hideMarkersListFragment();
-		}
 
 		toolbarHeight = mapActivity.getResources().getDimensionPixelSize(R.dimen.dashboard_map_toolbar);
 
@@ -136,7 +128,9 @@ public class PlanRouteFragment extends Fragment {
 		View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_plan_route, null);
 
 		mainView = view.findViewById(R.id.main_view);
-		AndroidUtils.setBackground(mapActivity, mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
+		if (portrait) {
+			AndroidUtils.setBackground(mapActivity, mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
+		}
 
 		distanceTv = (TextView) mainView.findViewById(R.id.markers_distance_text_view);
 		timeTv = (TextView) mainView.findViewById(R.id.markers_time_text_view);
@@ -145,73 +139,114 @@ public class PlanRouteFragment extends Fragment {
 		enterPlanRouteMode();
 
 		View markersListContainer = mainView.findViewById(R.id.markers_list_container);
-		if (portrait && markersListContainer != null) {
+		if (markersListContainer != null) {
 			markersListContainer.setBackgroundColor(backgroundColor);
 		}
 
-		upDownIconIv = (ImageView) mainView.findViewById(R.id.up_down_icon);
-		upDownIconIv.setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_up));
-
-		mainView.findViewById(R.id.up_down_row).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				if (!markersListOpened) {
-					showMarkersList();
-				} else {
-					hideMarkersList();
-				}
-			}
-		});
-
-		mainView.findViewById(R.id.select_all_button).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				int activeMarkersCount = markersHelper.getMapMarkers().size();
-				if (selectedCount == activeMarkersCount && markersHelper.isStartFromMyLocation()) {
-					markersHelper.deselectAllActiveMarkers();
-					markersHelper.setStartFromMyLocation(false);
-					selectedCount = 0;
-				} else {
-					markersHelper.selectAllActiveMarkers();
-					markersHelper.setStartFromMyLocation(true);
-					selectedCount = activeMarkersCount;
-				}
-				adapter.calculateStartAndFinishPos();
-				adapter.notifyDataSetChanged();
-				updateSelectButton();
-				recreateSnapTrkSegment();
-				mapActivity.refreshMap();
-			}
-		});
-
-		toolbarController = new PlanRouteToolbarController();
-		toolbarController.setBackBtnIconIds(R.drawable.ic_action_mode_back, R.drawable.ic_action_mode_back);
-		toolbarController.setTitle(getString(R.string.plan_route));
-		toolbarController.setOnBackButtonClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				if (quit(false)) {
-					MapMarkersDialogFragment.showInstance(mapActivity);
-				}
-			}
-		});
-		toolbarController.setSaveViewTextId(R.string.shared_string_options);
-		toolbarController.setOnSaveViewClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				PlanRouteOptionsBottomSheetDialogFragment fragment = new PlanRouteOptionsBottomSheetDialogFragment();
-				fragment.setListener(createOptionsFragmentListener());
-				fragment.show(mapActivity.getSupportFragmentManager(), PlanRouteOptionsBottomSheetDialogFragment.TAG);
-			}
-		});
-		mapActivity.showTopToolbar(toolbarController);
-
 		if (portrait) {
-			markersRv = mainView.findViewById(R.id.markers_recycler_view);
+			((ImageView) mainView.findViewById(R.id.up_down_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_up));
+
+			mainView.findViewById(R.id.up_down_row).setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					if (!markersListOpened) {
+						showMarkersList();
+					} else {
+						hideMarkersList();
+					}
+				}
+			});
+
+			mainView.findViewById(R.id.select_all_button).setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					int activeMarkersCount = markersHelper.getMapMarkers().size();
+					if (selectedCount == activeMarkersCount && markersHelper.isStartFromMyLocation()) {
+						markersHelper.deselectAllActiveMarkers();
+						markersHelper.setStartFromMyLocation(false);
+						selectedCount = 0;
+					} else {
+						markersHelper.selectAllActiveMarkers();
+						markersHelper.setStartFromMyLocation(true);
+						selectedCount = activeMarkersCount;
+					}
+					adapter.calculateStartAndFinishPos();
+					adapter.notifyDataSetChanged();
+					updateSelectButton();
+					recreateSnapTrkSegment();
+					mapActivity.refreshMap();
+				}
+			});
+
+			toolbarController = new PlanRouteToolbarController();
+			toolbarController.setBackBtnIconIds(R.drawable.ic_action_mode_back, R.drawable.ic_action_mode_back);
+			toolbarController.setTitle(getString(R.string.plan_route));
+			toolbarController.setOnBackButtonClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					if (quit(false)) {
+						MapMarkersDialogFragment.showInstance(mapActivity);
+					}
+				}
+			});
+			toolbarController.setSaveViewTextId(R.string.shared_string_options);
+			toolbarController.setOnSaveViewClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					optionsOnClick();
+				}
+			});
+			mapActivity.showTopToolbar(toolbarController);
+
+			final int screenH = AndroidUtils.getScreenHeight(mapActivity);
+			final int statusBarH = AndroidUtils.getStatusBarHeight(mapActivity);
+			final int navBarH = AndroidUtils.getNavBarHeight(mapActivity);
+			final int availableHeight = (screenH - statusBarH - navBarH) / 2;
+
+			mainView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+				@Override
+				public void onGlobalLayout() {
+					int upDownRowH = mainView.findViewById(R.id.up_down_row).getHeight();
+					int listContainerH = availableHeight - upDownRowH;
+					View listContainer = mainView.findViewById(R.id.markers_list_container);
+					listContainer.getLayoutParams().height = listContainerH;
+					listContainer.requestLayout();
+
+					showMarkersList();
+
+					ViewTreeObserver obs = mainView.getViewTreeObserver();
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+						obs.removeOnGlobalLayoutListener(this);
+					} else {
+						obs.removeGlobalOnLayoutListener(this);
+					}
+				}
+			});
 		} else {
-			markersRv = new RecyclerView(mapActivity);
+			Toolbar toolbar = (Toolbar) mainView.findViewById(R.id.plan_route_toolbar);
+			if (nightMode) {
+				toolbar.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.actionbar_dark_color));
+			}
+			toolbar.setNavigationIcon(iconsCache.getIcon(R.drawable.ic_arrow_back));
+			toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					if (quit(false)) {
+						MapMarkersDialogFragment.showInstance(mapActivity);
+					}
+				}
+			});
+
+			mainView.findViewById(R.id.options_button).setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					optionsOnClick();
+				}
+			});
 		}
 
+		markersRv = mainView.findViewById(R.id.markers_recycler_view);
+
 		adapter = new MapMarkersListAdapter(mapActivity);
 		adapter.setHasStableIds(true);
 		adapter.calculateStartAndFinishPos();
@@ -272,39 +307,6 @@ public class PlanRouteFragment extends Fragment {
 		markersRv.setClipToPadding(false);
 		markersRv.setLayoutManager(new LinearLayoutManager(getContext()));
 		markersRv.setAdapter(adapter);
-		markersRv.addOnScrollListener(new RecyclerView.OnScrollListener() {
-			@Override
-			public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-				super.onScrollStateChanged(recyclerView, newState);
-			}
-		});
-
-		final int screenH = AndroidUtils.getScreenHeight(mapActivity);
-		final int statusBarH = AndroidUtils.getStatusBarHeight(mapActivity);
-		final int navBarH = AndroidUtils.getNavBarHeight(mapActivity);
-		final int availableHeight = (screenH - statusBarH - navBarH) / 2;
-
-		mainView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-			@Override
-			public void onGlobalLayout() {
-				if (portrait) {
-					int upDownRowH = mainView.findViewById(R.id.up_down_row).getHeight();
-					int listContainerH = availableHeight - upDownRowH;
-					View listContainer = mainView.findViewById(R.id.markers_list_container);
-					listContainer.getLayoutParams().height = listContainerH;
-					listContainer.requestLayout();
-				}
-
-				showMarkersList();
-
-				ViewTreeObserver obs = mainView.getViewTreeObserver();
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-					obs.removeOnGlobalLayoutListener(this);
-				} else {
-					obs.removeGlobalOnLayoutListener(this);
-				}
-			}
-		});
 
 		if (progressBarVisible) {
 			showProgressBar();
@@ -313,6 +315,15 @@ public class PlanRouteFragment extends Fragment {
 		return view;
 	}
 
+	private void optionsOnClick() {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			PlanRouteOptionsBottomSheetDialogFragment fragment = new PlanRouteOptionsBottomSheetDialogFragment();
+			fragment.setListener(createOptionsFragmentListener());
+			fragment.show(mapActivity.getSupportFragmentManager(), PlanRouteOptionsBottomSheetDialogFragment.TAG);
+		}
+	}
+
 	@Override
 	public void onDestroyView() {
 		super.onDestroyView();
@@ -523,10 +534,12 @@ public class PlanRouteFragment extends Fragment {
 	}
 
 	private void updateSelectButton() {
-		if (selectedCount == markersHelper.getMapMarkers().size() && markersHelper.isStartFromMyLocation()) {
-			((TextView) mainView.findViewById(R.id.select_all_button)).setText(getString(R.string.shared_string_deselect_all));
-		} else {
-			((TextView) mainView.findViewById(R.id.select_all_button)).setText(getString(R.string.shared_string_select_all));
+		if (portrait) {
+			if (selectedCount == markersHelper.getMapMarkers().size() && markersHelper.isStartFromMyLocation()) {
+				((TextView) mainView.findViewById(R.id.select_all_button)).setText(getString(R.string.shared_string_deselect_all));
+			} else {
+				((TextView) mainView.findViewById(R.id.select_all_button)).setText(getString(R.string.shared_string_select_all));
+			}
 		}
 	}
 
@@ -542,70 +555,29 @@ public class PlanRouteFragment extends Fragment {
 		}
 	}
 
+	//todo create one method
 	private void showMarkersList() {
 		MapActivity mapActivity = getMapActivity();
 		MapMarkersLayer markersLayer = getMapMarkersLayer();
-		if (mapActivity != null && markersLayer != null) {
+		if (mapActivity != null && markersLayer != null && portrait) {
 			markersListOpened = true;
-			upDownIconIv.setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_down));
+			((ImageView) mainView.findViewById(R.id.up_down_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_down));
 			View listContainer = mainView.findViewById(R.id.markers_list_container);
-			if (portrait && listContainer != null) {
+			if (listContainer != null) {
 				listContainer.setVisibility(View.VISIBLE);
-			} else {
-				showMarkersListFragment();
 			}
-			OsmandMapTileView tileView = mapActivity.getMapView();
-			previousMapPosition = tileView.getMapPosition();
-			if (!portrait) {
-				tileView.setMapPosition(LANDSCAPE_MIDDLE_RIGHT_CONSTANT);
-			}
-			mapActivity.refreshMap();
 		}
 	}
 
 	private void hideMarkersList() {
 		MapActivity mapActivity = getMapActivity();
 		MapMarkersLayer markersLayer = getMapMarkersLayer();
-		if (mapActivity != null && markersLayer != null) {
+		if (mapActivity != null && markersLayer != null && portrait) {
 			markersListOpened = false;
-			upDownIconIv.setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_up));
+			((ImageView) mainView.findViewById(R.id.up_down_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_up));
 			View listContainer = mainView.findViewById(R.id.markers_list_container);
-			if (portrait && listContainer != null) {
+			if (listContainer != null) {
 				listContainer.setVisibility(View.GONE);
-			} else {
-				hideMarkersListFragment();
-			}
-			mapActivity.getMapView().setMapPosition(previousMapPosition);
-			mapActivity.refreshMap();
-		}
-	}
-
-	private void showMarkersListFragment() {
-		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
-			View upDownRow = mainView.findViewById(R.id.up_down_row);
-			int screenHeight = AndroidUtils.getScreenHeight(mapActivity) - AndroidUtils.getStatusBarHeight(mapActivity);
-			RecyclerViewFragment fragment = new RecyclerViewFragment();
-			fragment.setRecyclerView(markersRv);
-			fragment.setWidth(upDownRow.getWidth());
-			fragment.setHeight(screenHeight - upDownRow.getHeight());
-			mapActivity.getSupportFragmentManager().beginTransaction()
-					.add(R.id.fragmentContainer, fragment, RecyclerViewFragment.TAG)
-					.commitAllowingStateLoss();
-		}
-	}
-
-	private void hideMarkersListFragment() {
-		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
-			try {
-				FragmentManager manager = mapActivity.getSupportFragmentManager();
-				Fragment fragment = manager.findFragmentByTag(RecyclerViewFragment.TAG);
-				if (fragment != null) {
-					manager.beginTransaction().remove(fragment).commitNowAllowingStateLoss();
-				}
-			} catch (Exception e) {
-				// ignore
 			}
 		}
 	}
@@ -654,7 +626,7 @@ public class PlanRouteFragment extends Fragment {
 			if (portrait) {
 				tileBoxHeightPx = 3 * (tb.getPixHeight() - mainView.getHeight() - toolbarHeight) / 4;
 			} else {
-				tileBoxWidthPx = tb.getPixWidth() - mainView.findViewById(R.id.up_down_row).getWidth();
+				tileBoxWidthPx = tb.getPixWidth() - mapActivity.getResources().getDimensionPixelSize(R.dimen.dashboard_land_width);
 			}
 			mapView.fitRectToMap(left, right, top, bottom, tileBoxWidthPx, tileBoxHeightPx, toolbarHeight * 3 / 2);
 		}
@@ -677,12 +649,12 @@ public class PlanRouteFragment extends Fragment {
 		activity.getSupportFragmentManager().beginTransaction().remove(this).commitAllowingStateLoss();
 	}
 
-	public static boolean showInstance(FragmentManager fragmentManager) {
+	public static boolean showInstance(FragmentManager fragmentManager, boolean portrait) {
 		try {
 			PlanRouteFragment fragment = new PlanRouteFragment();
 			fragment.setRetainInstance(true);
 			fragmentManager.beginTransaction()
-					.add(R.id.bottomFragmentContainer, fragment, PlanRouteFragment.TAG)
+					.add(portrait ? R.id.bottomFragmentContainer : R.id.topFragmentContainer, fragment, PlanRouteFragment.TAG)
 					.commitAllowingStateLoss();
 			return true;
 		} catch (Exception e) {

From f8fb7279d6093d0e0c68a7a6cc293e3e393cad94 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Fri, 6 Oct 2017 11:24:53 +0300
Subject: [PATCH 04/10] Move method, add small changes

---
 OsmAnd/res/layout/fragment_plan_route.xml     |  4 +--
 .../plus/mapmarkers/PlanRouteFragment.java    | 25 ++++++++-----------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_plan_route.xml b/OsmAnd/res/layout/fragment_plan_route.xml
index ae5f8807fc..e880146c09 100644
--- a/OsmAnd/res/layout/fragment_plan_route.xml
+++ b/OsmAnd/res/layout/fragment_plan_route.xml
@@ -117,9 +117,7 @@
             android:id="@+id/markers_list_container"
             android:layout_width="match_parent"
             android:layout_height="@dimen/measurement_tool_points_list_container_height"
-            android:background="@color/ctx_menu_info_view_bg_dark"
-            android:visibility="gone"
-            tools:visibility="visible">
+            android:background="@color/ctx_menu_info_view_bg_dark">
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/markers_recycler_view"
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
index 1778f70e92..80beed8403 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
@@ -128,9 +128,6 @@ public class PlanRouteFragment extends Fragment {
 		View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_plan_route, null);
 
 		mainView = view.findViewById(R.id.main_view);
-		if (portrait) {
-			AndroidUtils.setBackground(mapActivity, mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
-		}
 
 		distanceTv = (TextView) mainView.findViewById(R.id.markers_distance_text_view);
 		timeTv = (TextView) mainView.findViewById(R.id.markers_time_text_view);
@@ -144,6 +141,8 @@ public class PlanRouteFragment extends Fragment {
 		}
 
 		if (portrait) {
+			AndroidUtils.setBackground(mapActivity, mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
+
 			((ImageView) mainView.findViewById(R.id.up_down_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_up));
 
 			mainView.findViewById(R.id.up_down_row).setOnClickListener(new View.OnClickListener() {
@@ -212,8 +211,6 @@ public class PlanRouteFragment extends Fragment {
 					listContainer.getLayoutParams().height = listContainerH;
 					listContainer.requestLayout();
 
-					showMarkersList();
-
 					ViewTreeObserver obs = mainView.getViewTreeObserver();
 					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
 						obs.removeOnGlobalLayoutListener(this);
@@ -315,15 +312,6 @@ public class PlanRouteFragment extends Fragment {
 		return view;
 	}
 
-	private void optionsOnClick() {
-		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
-			PlanRouteOptionsBottomSheetDialogFragment fragment = new PlanRouteOptionsBottomSheetDialogFragment();
-			fragment.setListener(createOptionsFragmentListener());
-			fragment.show(mapActivity.getSupportFragmentManager(), PlanRouteOptionsBottomSheetDialogFragment.TAG);
-		}
-	}
-
 	@Override
 	public void onDestroyView() {
 		super.onDestroyView();
@@ -509,6 +497,15 @@ public class PlanRouteFragment extends Fragment {
 		}
 	}
 
+	private void optionsOnClick() {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			PlanRouteOptionsBottomSheetDialogFragment fragment = new PlanRouteOptionsBottomSheetDialogFragment();
+			fragment.setListener(createOptionsFragmentListener());
+			fragment.show(mapActivity.getSupportFragmentManager(), PlanRouteOptionsBottomSheetDialogFragment.TAG);
+		}
+	}
+
 	private void updateText() {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {

From c910b7127fbd45856456d155facbcc57b5e29e02 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Fri, 6 Oct 2017 11:54:40 +0300
Subject: [PATCH 05/10] Change map center in plan route mode in landscape

---
 .../net/osmand/plus/mapmarkers/PlanRouteFragment.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
index 80beed8403..e13509f0f1 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
@@ -65,6 +65,8 @@ import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+import static net.osmand.plus.OsmandSettings.LANDSCAPE_MIDDLE_RIGHT_CONSTANT;
+
 public class PlanRouteFragment extends Fragment {
 
 	public static final String TAG = "PlanRouteFragment";
@@ -436,6 +438,12 @@ public class PlanRouteFragment extends Fragment {
 			}
 			setupAppModesBtn();
 
+			OsmandMapTileView tileView = mapActivity.getMapView();
+			previousMapPosition = tileView.getMapPosition();
+			if (!portrait) {
+				tileView.setMapPosition(LANDSCAPE_MIDDLE_RIGHT_CONSTANT);
+			}
+
 			selectedCount = mapActivity.getMyApplication().getMapMarkersHelper().getSelectedMarkersCount();
 			recreateSnapTrkSegment();
 			mapActivity.refreshMap();
@@ -491,6 +499,8 @@ public class PlanRouteFragment extends Fragment {
 			mapActivity.findViewById(R.id.snap_to_road_image_button).setVisibility(View.GONE);
 			mainView.findViewById(R.id.snap_to_road_progress_bar).setVisibility(View.GONE);
 
+			mapActivity.getMapView().setMapPosition(previousMapPosition);
+
 			cancelSnapToRoad();
 			markersLayer.setRoute(null);
 			mapActivity.refreshMap();

From 046737ee41497a05367cfab61326619f083c1096 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Fri, 6 Oct 2017 16:02:03 +0300
Subject: [PATCH 06/10] Create MarkersPlanRouteContext; recreate
 PlanRouteFragment after screen rotation

---
 .../src/net/osmand/plus/MapMarkersHelper.java |  19 +-
 .../osmand/plus/activities/MapActivity.java   |  24 +-
 .../mapmarkers/MarkersPlanRouteContext.java   | 263 +++++++++++++++
 .../plus/mapmarkers/PlanRouteFragment.java    | 319 ++++--------------
 4 files changed, 362 insertions(+), 263 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/mapmarkers/MarkersPlanRouteContext.java

diff --git a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
index c295947bec..1f8023a472 100644
--- a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
+++ b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
-import android.util.Pair;
 
 import net.osmand.IndexConstants;
 import net.osmand.data.FavouritePoint;
@@ -16,6 +15,7 @@ import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.mapmarkers.MapMarkersDbHelper;
+import net.osmand.plus.mapmarkers.MarkersPlanRouteContext;
 import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 
@@ -28,7 +28,6 @@ import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import static net.osmand.data.PointDescription.POINT_TYPE_MAP_MARKER;
 
@@ -44,8 +43,7 @@ public class MapMarkersHelper {
 	private MapMarkersDbHelper markersDbHelper;
 	private boolean startFromMyLocation;
 
-	private final Map<Pair<WptPt, WptPt>, List<WptPt>> snappedToRoadPoints = new ConcurrentHashMap<>();
-	private ApplicationMode snappedMode;
+	private MarkersPlanRouteContext planRouteContext;
 
 	public interface MapMarkerChangedListener {
 		void onMapMarkerChanged(MapMarker mapMarker);
@@ -230,22 +228,15 @@ public class MapMarkersHelper {
 		this.ctx = ctx;
 		settings = ctx.getSettings();
 		markersDbHelper = ctx.getMapMarkersDbHelper();
+		planRouteContext = new MarkersPlanRouteContext(ctx);
 		startFromMyLocation = settings.ROUTE_MAP_MARKERS_START_MY_LOC.get();
 		removeDisabledGroups();
 		loadMarkers();
 		createMapMarkersGroups();
 	}
 
-	public Map<Pair<WptPt, WptPt>, List<WptPt>> getSnappedToRoadPoints() {
-		return snappedToRoadPoints;
-	}
-
-	public ApplicationMode getSnappedMode() {
-		return snappedMode;
-	}
-
-	public void setSnappedMode(ApplicationMode snappedMode) {
-		this.snappedMode = snappedMode;
+	public MarkersPlanRouteContext getPlanRouteContext() {
+		return planRouteContext;
 	}
 
 	public boolean isStartFromMyLocation() {
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index a20d730996..a20e988e01 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -11,7 +11,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
-import android.graphics.Rect;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -59,7 +58,6 @@ import net.osmand.plus.AppInitializer;
 import net.osmand.plus.AppInitializer.AppInitializeListener;
 import net.osmand.plus.AppInitializer.InitEvents;
 import net.osmand.plus.ApplicationMode;
-import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.MapMarkersHelper.MapMarkerChangedListener;
@@ -315,6 +313,18 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		mIsDestroyed = false;
 	}
 
+	@Override
+	protected void onSaveInstanceState(Bundle outState) {
+		FragmentManager fm = getSupportFragmentManager();
+		Fragment planRouteFragment = fm.findFragmentByTag(PlanRouteFragment.TAG);
+		if (planRouteFragment != null) {
+			fm.beginTransaction()
+					.remove(planRouteFragment)
+					.commitNowAllowingStateLoss();
+			app.getMapMarkersHelper().getPlanRouteContext().setFragmentShowed(true);
+		}
+		super.onSaveInstanceState(outState);
+	}
 
 	private void checkAppInitialization() {
 		if (app.isApplicationInitializing()) {
@@ -447,7 +457,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 	private void changeKeyguardFlags() {
 		if (settings.WAKE_ON_VOICE_INT.get() > 0) {
 			getWindow().setFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED,
-							WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+					WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
 		} else {
 			getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
 		}
@@ -558,6 +568,10 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		super.onResume();
 		long tm = System.currentTimeMillis();
 
+		if (app.getMapMarkersHelper().getPlanRouteContext().isFragmentShowed()) {
+			PlanRouteFragment.showInstance(getSupportFragmentManager(), AndroidUiHelper.isOrientationPortrait(this));
+		}
+
 		if (app.isApplicationInitializing() || DashboardOnMap.staticVisible) {
 			if (!dashboardOnMap.isVisible()) {
 				if (settings.SHOW_DASHBOARD_ON_START.get()) {
@@ -1321,7 +1335,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		Intent intent = getIntent();
 		if (intent != null && intent.getData() != null) {
 			Uri data = intent.getData();
-			if (("http".equalsIgnoreCase(data.getScheme()) || "https".equalsIgnoreCase(data.getScheme()))&& data.getHost() != null && data.getHost().contains("osmand.net") &&
+			if (("http".equalsIgnoreCase(data.getScheme()) || "https".equalsIgnoreCase(data.getScheme())) && data.getHost() != null && data.getHost().contains("osmand.net") &&
 					data.getPath() != null && data.getPath().startsWith("/go")) {
 				String lat = data.getQueryParameter("lat");
 				String lon = data.getQueryParameter("lon");
@@ -1730,7 +1744,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 
 	public QuickSearchDialogFragment getQuickSearchDialogFragment() {
 		Fragment fragment = getSupportFragmentManager().findFragmentByTag(QuickSearchDialogFragment.TAG);
-		return fragment!= null && !fragment.isDetached() && !fragment.isRemoving() ? (QuickSearchDialogFragment) fragment : null;
+		return fragment != null && !fragment.isDetached() && !fragment.isRemoving() ? (QuickSearchDialogFragment) fragment : null;
 	}
 
 	public PlanRouteFragment getPlanRouteFragment() {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MarkersPlanRouteContext.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MarkersPlanRouteContext.java
new file mode 100644
index 0000000000..22149490e0
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MarkersPlanRouteContext.java
@@ -0,0 +1,263 @@
+package net.osmand.plus.mapmarkers;
+
+import android.util.Pair;
+
+import net.osmand.Location;
+import net.osmand.data.LatLon;
+import net.osmand.plus.ApplicationMode;
+import net.osmand.plus.GPXUtilities.TrkSegment;
+import net.osmand.plus.GPXUtilities.WptPt;
+import net.osmand.plus.MapMarkersHelper;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.routing.RouteCalculationParams;
+import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.router.RouteCalculationProgress;
+import net.osmand.util.MapUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+public class MarkersPlanRouteContext {
+
+	private static final int MAX_DIST_FOR_SNAP_TO_ROAD = 500 * 1000; // 500 km
+
+	private OsmandApplication app;
+
+	private final Map<Pair<WptPt, WptPt>, List<WptPt>> snappedToRoadPoints = new ConcurrentHashMap<>();
+	private final Queue<Pair<WptPt, WptPt>> snapToRoadPairsToCalculate = new ConcurrentLinkedQueue<>();
+	private final TrkSegment snapTrkSegment = new TrkSegment();
+
+	private ApplicationMode snappedMode;
+	private RouteCalculationProgress calculationProgress;
+	private int calculatedPairs;
+
+	private PlanRouteProgressListener listener;
+	private boolean progressBarVisible;
+	private boolean fragmentShowed;
+
+	Map<Pair<WptPt, WptPt>, List<WptPt>> getSnappedToRoadPoints() {
+		return snappedToRoadPoints;
+	}
+
+	TrkSegment getSnapTrkSegment() {
+		return snapTrkSegment;
+	}
+
+	ApplicationMode getSnappedMode() {
+		return snappedMode;
+	}
+
+	void setSnappedMode(ApplicationMode snappedMode) {
+		this.snappedMode = snappedMode;
+	}
+
+	public PlanRouteProgressListener getListener() {
+		return listener;
+	}
+
+	public void setListener(PlanRouteProgressListener listener) {
+		this.listener = listener;
+	}
+
+	boolean isProgressBarVisible() {
+		return progressBarVisible;
+	}
+
+	void setProgressBarVisible(boolean progressBarVisible) {
+		this.progressBarVisible = progressBarVisible;
+	}
+
+	public boolean isFragmentShowed() {
+		return fragmentShowed;
+	}
+
+	public void setFragmentShowed(boolean fragmentShowed) {
+		this.fragmentShowed = fragmentShowed;
+	}
+
+	public MarkersPlanRouteContext(OsmandApplication app) {
+		this.app = app;
+	}
+
+	void cancelSnapToRoad() {
+		listener.hideProgressBar();
+		snapToRoadPairsToCalculate.clear();
+		if (calculationProgress != null) {
+			calculationProgress.isCancelled = true;
+		}
+	}
+
+	private void scheduleRouteCalculateIfNotEmpty(List<WptPt> points) {
+		if (points.isEmpty()) {
+			return;
+		}
+		findPairsToCalculate(points);
+		RoutingHelper routingHelper = app.getRoutingHelper();
+		if (!snapToRoadPairsToCalculate.isEmpty() && !routingHelper.isRouteBeingCalculated()) {
+			routingHelper.startRouteCalculationThread(getParams(), true, true);
+			app.runInUIThread(new Runnable() {
+				@Override
+				public void run() {
+					listener.showProgressBar();
+				}
+			});
+		}
+	}
+
+	private void findPairsToCalculate(List<WptPt> points) {
+		snapToRoadPairsToCalculate.clear();
+		for (int i = 0; i < points.size() - 1; i++) {
+			Pair<WptPt, WptPt> pair = new Pair<>(points.get(i), points.get(i + 1));
+			if (snappedToRoadPoints.get(pair) == null) {
+				double dist = MapUtils.getDistance(pair.first.lat, pair.first.lon, pair.second.lat, pair.second.lon);
+				if (dist < MAX_DIST_FOR_SNAP_TO_ROAD) {
+					snapToRoadPairsToCalculate.add(pair);
+				}
+			}
+		}
+	}
+
+	void recreateSnapTrkSegment() {
+		recreateSnapTrkSegment(true);
+	}
+
+	private void recreateSnapTrkSegment(boolean adjustMap) {
+		snapTrkSegment.points.clear();
+		List<WptPt> points = getPointsToCalculate();
+		if (snappedMode == ApplicationMode.DEFAULT) {
+			snapTrkSegment.points.addAll(points);
+		} else if (points.size() > 1) {
+			for (int i = 0; i < points.size() - 1; i++) {
+				Pair<WptPt, WptPt> pair = new Pair<>(points.get(i), points.get(i + 1));
+				List<WptPt> pts = snappedToRoadPoints.get(pair);
+				if (pts != null) {
+					snapTrkSegment.points.addAll(pts);
+				} else {
+					scheduleRouteCalculateIfNotEmpty(points);
+					snapTrkSegment.points.addAll(Arrays.asList(pair.first, pair.second));
+				}
+			}
+		}
+		listener.showMarkersRouteOnMap(adjustMap);
+		app.runInUIThread(new Runnable() {
+			@Override
+			public void run() {
+				listener.updateText();
+			}
+		});
+	}
+
+	private List<WptPt> getPointsToCalculate() {
+		MapMarkersHelper markersHelper = app.getMapMarkersHelper();
+		List<WptPt> points = new LinkedList<>();
+		Location myLoc = app.getLocationProvider().getLastStaleKnownLocation();
+		if (markersHelper.isStartFromMyLocation() && myLoc != null) {
+			addWptPt(points, myLoc.getLatitude(), myLoc.getLongitude());
+		}
+		for (LatLon l : markersHelper.getSelectedMarkersLatLon()) {
+			addWptPt(points, l.getLatitude(), l.getLongitude());
+		}
+		return points;
+	}
+
+	private void addWptPt(List<WptPt> points, double lat, double lon) {
+		WptPt pt = new WptPt();
+		pt.lat = lat;
+		pt.lon = lon;
+		points.add(pt);
+	}
+
+	private RouteCalculationParams getParams() {
+		final Pair<WptPt, WptPt> currentPair = snapToRoadPairsToCalculate.poll();
+
+		Location start = new Location("");
+		start.setLatitude(currentPair.first.getLatitude());
+		start.setLongitude(currentPair.first.getLongitude());
+
+		LatLon end = new LatLon(currentPair.second.getLatitude(), currentPair.second.getLongitude());
+
+		final RouteCalculationParams params = new RouteCalculationParams();
+		params.inSnapToRoadMode = true;
+		params.start = start;
+		params.end = end;
+		RoutingHelper.applyApplicationSettings(params, app.getSettings(), snappedMode);
+		params.mode = snappedMode;
+		params.ctx = app;
+		params.calculationProgress = calculationProgress = new RouteCalculationProgress();
+		params.calculationProgressCallback = new RoutingHelper.RouteCalculationProgressCallback() {
+			@Override
+			public void updateProgress(int progress) {
+				int pairs = calculatedPairs + snapToRoadPairsToCalculate.size();
+				if (pairs != 0) {
+					int pairProgress = 100 / pairs;
+					progress = calculatedPairs * pairProgress + progress / pairs;
+				}
+				listener.updateProgress(progress);
+			}
+
+			@Override
+			public void requestPrivateAccessRouting() {
+
+			}
+
+			@Override
+			public void finish() {
+				calculatedPairs = 0;
+			}
+		};
+		params.resultListener = new RouteCalculationParams.RouteCalculationResultListener() {
+			@Override
+			public void onRouteCalculated(List<Location> locations) {
+				ArrayList<WptPt> pts = new ArrayList<>(locations.size());
+				for (Location loc : locations) {
+					WptPt pt = new WptPt();
+					pt.lat = loc.getLatitude();
+					pt.lon = loc.getLongitude();
+					pts.add(pt);
+				}
+				calculatedPairs++;
+				snappedToRoadPoints.put(currentPair, pts);
+				recreateSnapTrkSegment(false);
+				app.runInUIThread(new Runnable() {
+					@Override
+					public void run() {
+						listener.refresh();
+					}
+				});
+				if (!snapToRoadPairsToCalculate.isEmpty()) {
+					app.getRoutingHelper().startRouteCalculationThread(getParams(), true, true);
+				} else {
+					app.runInUIThread(new Runnable() {
+						@Override
+						public void run() {
+							listener.hideProgressBar();
+						}
+					});
+				}
+			}
+		};
+
+		return params;
+	}
+
+	interface PlanRouteProgressListener {
+
+		void showProgressBar();
+
+		void updateProgress(int progress);
+
+		void hideProgressBar();
+
+		void refresh();
+
+		void updateText();
+
+		void showMarkersRouteOnMap(boolean adjustMap);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
index e13509f0f1..8ebe72239f 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
@@ -14,7 +14,6 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.support.v7.widget.helper.ItemTouchHelper;
-import android.util.Pair;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -48,64 +47,79 @@ import net.osmand.plus.mapmarkers.adapters.MapMarkersItemTouchHelperCallback;
 import net.osmand.plus.mapmarkers.adapters.MapMarkersListAdapter;
 import net.osmand.plus.measurementtool.SnapToRoadBottomSheetDialogFragment;
 import net.osmand.plus.measurementtool.SnapToRoadBottomSheetDialogFragment.SnapToRoadFragmentListener;
-import net.osmand.plus.routing.RouteCalculationParams;
-import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.views.MapMarkersLayer;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
-import net.osmand.router.RouteCalculationProgress;
 import net.osmand.util.MapUtils;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
 
 import static net.osmand.plus.OsmandSettings.LANDSCAPE_MIDDLE_RIGHT_CONSTANT;
 
 public class PlanRouteFragment extends Fragment {
 
 	public static final String TAG = "PlanRouteFragment";
-	private static final int MAX_DIST_FOR_SNAP_TO_ROAD = 500 * 1000; // 500 km
 
 	private MapMarkersHelper markersHelper;
+	private MarkersPlanRouteContext planRouteContext;
+
 	private MapMarkersListAdapter adapter;
 	private IconsCache iconsCache;
 	private PlanRouteToolbarController toolbarController;
-	private ApplicationMode appMode;
+
 	private int previousMapPosition;
 	private int selectedCount = 0;
-
 	private int toolbarHeight;
 
 	private boolean nightMode;
 	private boolean portrait;
-	private boolean markersListOpened;
+	private boolean markersListOpened = true;
 	private boolean wasCollapseButtonVisible;
 
 	private View mainView;
 	private RecyclerView markersRv;
-	private TextView distanceTv;
-	private TextView timeTv;
-	private TextView countTv;
-
-	private final Queue<Pair<WptPt, WptPt>> snapToRoadPairsToCalculate = new ConcurrentLinkedQueue<>();
-	private Map<Pair<WptPt, WptPt>, List<WptPt>> snappedToRoadPoints;
-	private TrkSegment snapTrkSegment = new TrkSegment();
-	private RouteCalculationProgress calculationProgress;
-	private int calculatedPairs;
-	private boolean progressBarVisible;
 
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		final MapActivity mapActivity = getMapActivity();
 		markersHelper = mapActivity.getMyApplication().getMapMarkersHelper();
-		snappedToRoadPoints = markersHelper.getSnappedToRoadPoints();
+		planRouteContext = markersHelper.getPlanRouteContext();
+		planRouteContext.setListener(new MarkersPlanRouteContext.PlanRouteProgressListener() {
+			@Override
+			public void showProgressBar() {
+				PlanRouteFragment.this.showProgressBar();
+			}
+
+			@Override
+			public void updateProgress(int progress) {
+				((ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar)).setProgress(progress);
+			}
+
+			@Override
+			public void hideProgressBar() {
+				mainView.findViewById(R.id.snap_to_road_progress_bar).setVisibility(View.GONE);
+				planRouteContext.setProgressBarVisible(false);
+			}
+
+			@Override
+			public void refresh() {
+				adapter.notifyDataSetChanged();
+				mapActivity.refreshMap();
+			}
+
+			@Override
+			public void updateText() {
+				PlanRouteFragment.this.updateText();
+			}
+
+			@Override
+			public void showMarkersRouteOnMap(boolean adjustMap) {
+				PlanRouteFragment.this.showMarkersRouteOnMap(adjustMap);
+			}
+		});
 
 		// Handling screen rotation
 		FragmentManager fragmentManager = mapActivity.getSupportFragmentManager();
@@ -131,10 +145,6 @@ public class PlanRouteFragment extends Fragment {
 
 		mainView = view.findViewById(R.id.main_view);
 
-		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();
 
 		View markersListContainer = mainView.findViewById(R.id.markers_list_container);
@@ -145,7 +155,7 @@ public class PlanRouteFragment extends Fragment {
 		if (portrait) {
 			AndroidUtils.setBackground(mapActivity, mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
 
-			((ImageView) mainView.findViewById(R.id.up_down_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_up));
+			((ImageView) mainView.findViewById(R.id.up_down_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_down));
 
 			mainView.findViewById(R.id.up_down_row).setOnClickListener(new View.OnClickListener() {
 				@Override
@@ -174,7 +184,7 @@ public class PlanRouteFragment extends Fragment {
 					adapter.calculateStartAndFinishPos();
 					adapter.notifyDataSetChanged();
 					updateSelectButton();
-					recreateSnapTrkSegment();
+					planRouteContext.recreateSnapTrkSegment();
 					mapActivity.refreshMap();
 				}
 			});
@@ -249,7 +259,7 @@ public class PlanRouteFragment extends Fragment {
 		adapter = new MapMarkersListAdapter(mapActivity);
 		adapter.setHasStableIds(true);
 		adapter.calculateStartAndFinishPos();
-		adapter.setSnappedToRoadPoints(snappedToRoadPoints);
+		adapter.setSnappedToRoadPoints(planRouteContext.getSnappedToRoadPoints());
 		final ItemTouchHelper touchHelper = new ItemTouchHelper(new MapMarkersItemTouchHelperCallback(adapter));
 		touchHelper.attachToRecyclerView(markersRv);
 		adapter.setAdapterListener(new MapMarkersListAdapter.MapMarkersListAdapterListener() {
@@ -274,7 +284,7 @@ public class PlanRouteFragment extends Fragment {
 				adapter.calculateStartAndFinishPos();
 				adapter.notifyDataSetChanged();
 				updateSelectButton();
-				recreateSnapTrkSegment();
+				planRouteContext.recreateSnapTrkSegment();
 			}
 
 			@Override
@@ -297,7 +307,7 @@ public class PlanRouteFragment extends Fragment {
 						// to avoid crash because of:
 						// java.lang.IllegalStateException: Cannot call this method while RecyclerView is computing a layout or scrolling
 					}
-					recreateSnapTrkSegment();
+					planRouteContext.recreateSnapTrkSegment();
 				}
 			}
 		});
@@ -307,7 +317,7 @@ public class PlanRouteFragment extends Fragment {
 		markersRv.setLayoutManager(new LinearLayoutManager(getContext()));
 		markersRv.setAdapter(adapter);
 
-		if (progressBarVisible) {
+		if (planRouteContext.isProgressBarVisible()) {
 			showProgressBar();
 		}
 
@@ -352,11 +362,10 @@ public class PlanRouteFragment extends Fragment {
 
 			@Override
 			public void onApplicationModeItemClick(ApplicationMode mode) {
-				if (appMode != null && appMode != mode) {
-					appMode = mode;
-					snappedToRoadPoints.clear();
-					markersHelper.setSnappedMode(mode);
-					recreateSnapTrkSegment();
+				if (planRouteContext.getSnappedMode() != mode) {
+					planRouteContext.getSnappedToRoadPoints().clear();
+					planRouteContext.setSnappedMode(mode);
+					planRouteContext.recreateSnapTrkSegment();
 					setupAppModesBtn();
 				}
 			}
@@ -400,12 +409,20 @@ public class PlanRouteFragment extends Fragment {
 					markersHelper.reverseActiveMarkersOrder();
 					adapter.calculateStartAndFinishPos();
 					adapter.notifyDataSetChanged();
-					recreateSnapTrkSegment();
+					planRouteContext.recreateSnapTrkSegment();
 				}
 			}
 		};
 	}
 
+	private void showProgressBar() {
+		ProgressBar progressBar = (ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar);
+		progressBar.setVisibility(View.VISIBLE);
+		progressBar.setMinimumHeight(0);
+		progressBar.setProgress(0);
+		planRouteContext.setProgressBarVisible(true);
+	}
+
 	private void enterPlanRouteMode() {
 		final MapActivity mapActivity = getMapActivity();
 		MapMarkersLayer markersLayer = getMapMarkersLayer();
@@ -433,8 +450,8 @@ public class PlanRouteFragment extends Fragment {
 				wasCollapseButtonVisible = false;
 			}
 
-			if ((appMode = markersHelper.getSnappedMode()) == null) {
-				appMode = ApplicationMode.DEFAULT;
+			if (planRouteContext.getSnappedMode() == null) {
+				planRouteContext.setSnappedMode(ApplicationMode.DEFAULT);
 			}
 			setupAppModesBtn();
 
@@ -445,7 +462,7 @@ public class PlanRouteFragment extends Fragment {
 			}
 
 			selectedCount = mapActivity.getMyApplication().getMapMarkersHelper().getSelectedMarkersCount();
-			recreateSnapTrkSegment();
+			planRouteContext.recreateSnapTrkSegment();
 			mapActivity.refreshMap();
 			updateSelectButton();
 		}
@@ -453,10 +470,10 @@ public class PlanRouteFragment extends Fragment {
 
 	private void setupAppModesBtn() {
 		final MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null && appMode != null) {
+		if (mapActivity != null) {
 			final ImageButton appModesBtn = (ImageButton) mapActivity.findViewById(R.id.snap_to_road_image_button);
 			appModesBtn.setBackgroundResource(nightMode ? R.drawable.btn_circle_night : R.drawable.btn_circle);
-			appModesBtn.setImageDrawable(getActiveIcon(appMode.getSmallIconDark()));
+			appModesBtn.setImageDrawable(getActiveIcon(planRouteContext.getSnappedMode().getSmallIconDark()));
 			appModesBtn.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View view) {
@@ -501,7 +518,7 @@ public class PlanRouteFragment extends Fragment {
 
 			mapActivity.getMapView().setMapPosition(previousMapPosition);
 
-			cancelSnapToRoad();
+			planRouteContext.cancelSnapToRoad();
 			markersLayer.setRoute(null);
 			mapActivity.refreshMap();
 		}
@@ -519,6 +536,12 @@ public class PlanRouteFragment extends Fragment {
 	private void updateText() {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
+			TextView distanceTv = (TextView) mainView.findViewById(R.id.markers_distance_text_view);
+			TextView timeTv = (TextView) mainView.findViewById(R.id.markers_time_text_view);
+			TextView countTv = (TextView) mainView.findViewById(R.id.markers_count_text_view);
+
+			ApplicationMode appMode = planRouteContext.getSnappedMode();
+			TrkSegment snapTrkSegment = planRouteContext.getSnapTrkSegment();
 			boolean defaultMode = appMode == ApplicationMode.DEFAULT;
 
 			float dist = 0;
@@ -592,9 +615,9 @@ public class PlanRouteFragment extends Fragment {
 	private void showMarkersRouteOnMap(boolean adjustMap) {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
-			mapActivity.getMapLayers().getMapMarkersLayer().setRoute(snapTrkSegment);
+			mapActivity.getMapLayers().getMapMarkersLayer().setRoute(planRouteContext.getSnapTrkSegment());
 			if (adjustMap) {
-				showRouteOnMap(snapTrkSegment.points);
+				showRouteOnMap(planRouteContext.getSnapTrkSegment().points);
 			}
 		}
 	}
@@ -640,7 +663,7 @@ public class PlanRouteFragment extends Fragment {
 	}
 
 	public boolean quit(boolean hideMarkersListFirst) {
-		if (markersListOpened && hideMarkersListFirst) {
+		if (portrait && markersListOpened && hideMarkersListFirst) {
 			hideMarkersList();
 			return false;
 		} else {
@@ -650,9 +673,10 @@ public class PlanRouteFragment extends Fragment {
 	}
 
 	private void dismiss(MapActivity activity) {
-		if (markersListOpened) {
+		if (portrait && markersListOpened) {
 			hideMarkersList();
 		}
+		planRouteContext.setFragmentShowed(false);
 		activity.getSupportFragmentManager().beginTransaction().remove(this).commitAllowingStateLoss();
 	}
 
@@ -727,204 +751,11 @@ public class PlanRouteFragment extends Fragment {
 				mapActivity.getMyApplication().getMapMarkersHelper().addSelectedMarkersToTop(res);
 				adapter.calculateStartAndFinishPos();
 				adapter.notifyDataSetChanged();
-				recreateSnapTrkSegment();
+				planRouteContext.recreateSnapTrkSegment();
 			}
 		}.execute();
 	}
 
-	private void cancelSnapToRoad() {
-		hideProgressBar();
-		snapToRoadPairsToCalculate.clear();
-		if (calculationProgress != null) {
-			calculationProgress.isCancelled = true;
-		}
-	}
-
-	private void scheduleRouteCalculateIfNotEmpty(List<WptPt> points) {
-		MapActivity mapActivity = getMapActivity();
-		if (mapActivity == null || points.isEmpty()) {
-			return;
-		}
-		findPairsToCalculate(points);
-		OsmandApplication app = mapActivity.getMyApplication();
-		RoutingHelper routingHelper = app.getRoutingHelper();
-		if (!snapToRoadPairsToCalculate.isEmpty() && !routingHelper.isRouteBeingCalculated()) {
-			routingHelper.startRouteCalculationThread(getParams(app), true, true);
-			app.runInUIThread(new Runnable() {
-				@Override
-				public void run() {
-					showProgressBar();
-				}
-			});
-		}
-	}
-
-	private void findPairsToCalculate(List<WptPt> points) {
-		snapToRoadPairsToCalculate.clear();
-		for (int i = 0; i < points.size() - 1; i++) {
-			Pair<WptPt, WptPt> pair = new Pair<>(points.get(i), points.get(i + 1));
-			if (snappedToRoadPoints.get(pair) == null) {
-				double dist = MapUtils.getDistance(pair.first.lat, pair.first.lon, pair.second.lat, pair.second.lon);
-				if (dist < MAX_DIST_FOR_SNAP_TO_ROAD) {
-					snapToRoadPairsToCalculate.add(pair);
-				}
-			}
-		}
-	}
-
-	private void recreateSnapTrkSegment() {
-		recreateSnapTrkSegment(true);
-	}
-
-	private void recreateSnapTrkSegment(boolean adjustMap) {
-		snapTrkSegment.points.clear();
-		List<WptPt> points = getPointsToCalculate();
-		if (appMode == ApplicationMode.DEFAULT) {
-			snapTrkSegment.points.addAll(points);
-		} else if (points.size() > 1) {
-			for (int i = 0; i < points.size() - 1; i++) {
-				Pair<WptPt, WptPt> pair = new Pair<>(points.get(i), points.get(i + 1));
-				List<WptPt> pts = snappedToRoadPoints.get(pair);
-				if (pts != null) {
-					snapTrkSegment.points.addAll(pts);
-				} else {
-					scheduleRouteCalculateIfNotEmpty(points);
-					snapTrkSegment.points.addAll(Arrays.asList(pair.first, pair.second));
-				}
-			}
-		}
-		showMarkersRouteOnMap(adjustMap);
-		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
-			mapActivity.getMyApplication().runInUIThread(new Runnable() {
-				@Override
-				public void run() {
-					updateText();
-				}
-			});
-		}
-	}
-
-	private List<WptPt> getPointsToCalculate() {
-		List<WptPt> points = new LinkedList<>();
-		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
-			Location myLoc = mapActivity.getMyApplication().getLocationProvider().getLastStaleKnownLocation();
-			if (markersHelper.isStartFromMyLocation() && myLoc != null) {
-				addWptPt(points, myLoc.getLatitude(), myLoc.getLongitude());
-			}
-			for (LatLon l : markersHelper.getSelectedMarkersLatLon()) {
-				addWptPt(points, l.getLatitude(), l.getLongitude());
-			}
-		}
-		return points;
-	}
-
-	private void addWptPt(List<WptPt> points, double lat, double lon) {
-		WptPt pt = new WptPt();
-		pt.lat = lat;
-		pt.lon = lon;
-		points.add(pt);
-	}
-
-	private void showProgressBar() {
-		ProgressBar progressBar = (ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar);
-		progressBar.setVisibility(View.VISIBLE);
-		progressBar.setMinimumHeight(0);
-		progressBar.setProgress(0);
-		progressBarVisible = true;
-	}
-
-	private void updateProgress(int progress) {
-		((ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar)).setProgress(progress);
-	}
-
-	private void refresh() {
-		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
-			mapActivity.refreshMap();
-		}
-	}
-
-	private void hideProgressBar() {
-		mainView.findViewById(R.id.snap_to_road_progress_bar).setVisibility(View.GONE);
-		progressBarVisible = false;
-	}
-
-	private RouteCalculationParams getParams(final OsmandApplication app) {
-		final Pair<WptPt, WptPt> currentPair = snapToRoadPairsToCalculate.poll();
-
-		Location start = new Location("");
-		start.setLatitude(currentPair.first.getLatitude());
-		start.setLongitude(currentPair.first.getLongitude());
-
-		LatLon end = new LatLon(currentPair.second.getLatitude(), currentPair.second.getLongitude());
-
-		final RouteCalculationParams params = new RouteCalculationParams();
-		params.inSnapToRoadMode = true;
-		params.start = start;
-		params.end = end;
-		RoutingHelper.applyApplicationSettings(params, app.getSettings(), appMode);
-		params.mode = appMode;
-		params.ctx = app;
-		params.calculationProgress = calculationProgress = new RouteCalculationProgress();
-		params.calculationProgressCallback = new RoutingHelper.RouteCalculationProgressCallback() {
-			@Override
-			public void updateProgress(int progress) {
-				int pairs = calculatedPairs + snapToRoadPairsToCalculate.size();
-				if (pairs != 0) {
-					int pairProgress = 100 / pairs;
-					progress = calculatedPairs * pairProgress + progress / pairs;
-				}
-				PlanRouteFragment.this.updateProgress(progress);
-			}
-
-			@Override
-			public void requestPrivateAccessRouting() {
-
-			}
-
-			@Override
-			public void finish() {
-				calculatedPairs = 0;
-			}
-		};
-		params.resultListener = new RouteCalculationParams.RouteCalculationResultListener() {
-			@Override
-			public void onRouteCalculated(List<Location> locations) {
-				ArrayList<WptPt> pts = new ArrayList<>(locations.size());
-				for (Location loc : locations) {
-					WptPt pt = new WptPt();
-					pt.lat = loc.getLatitude();
-					pt.lon = loc.getLongitude();
-					pts.add(pt);
-				}
-				calculatedPairs++;
-				snappedToRoadPoints.put(currentPair, pts);
-				recreateSnapTrkSegment(false);
-				app.runInUIThread(new Runnable() {
-					@Override
-					public void run() {
-						adapter.notifyDataSetChanged();
-						refresh();
-					}
-				});
-				if (!snapToRoadPairsToCalculate.isEmpty()) {
-					app.getRoutingHelper().startRouteCalculationThread(getParams(app), true, true);
-				} else {
-					app.runInUIThread(new Runnable() {
-						@Override
-						public void run() {
-							hideProgressBar();
-						}
-					});
-				}
-			}
-		};
-
-		return params;
-	}
-
 	private class PlanRouteToolbarController extends TopToolbarController {
 
 		PlanRouteToolbarController() {

From 98538c6efeae50838b8c84a90292d4a470db551a Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Fri, 6 Oct 2017 16:39:36 +0300
Subject: [PATCH 07/10] Fix landscape UI

---
 .../res/layout-land/fragment_plan_route.xml   | 118 ++++++++----------
 .../layout/fragment_map_markers_dialog.xml    |  78 ++++++------
 .../plus/mapmarkers/PlanRouteFragment.java    |   5 +-
 3 files changed, 91 insertions(+), 110 deletions(-)

diff --git a/OsmAnd/res/layout-land/fragment_plan_route.xml b/OsmAnd/res/layout-land/fragment_plan_route.xml
index 02306fc2f1..a969d9738c 100644
--- a/OsmAnd/res/layout-land/fragment_plan_route.xml
+++ b/OsmAnd/res/layout-land/fragment_plan_route.xml
@@ -16,95 +16,85 @@
         android:background="?attr/left_menu_view_bg"
         android:orientation="vertical">
 
-        <android.support.design.widget.AppBarLayout
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/plan_route_toolbar"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dashboard_map_toolbar"
-            tools:background="@color/actionbar_dark_color">
+            android:background="?attr/bg_color"
+            app:contentInsetLeft="54dp"
+            app:contentInsetStart="54dp">
 
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/plan_route_toolbar"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:contentInsetLeft="54dp"
-                app:contentInsetStart="54dp">
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
                 <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
                     <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_weight="1"
-                        android:orientation="vertical">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent">
-
-                            <TextView
-                                android:id="@+id/markers_distance_text_view"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginEnd="@dimen/measurement_tool_text_margin_small"
-                                android:layout_marginLeft="@dimen/measurement_tool_text_margin"
-                                android:layout_marginRight="@dimen/measurement_tool_text_margin_small"
-                                android:layout_marginStart="@dimen/measurement_tool_text_margin"
-                                android:ellipsize="end"
-                                android:maxLines="1"
-                                android:textAppearance="@style/TextAppearance.ListItemTitle"
-                                tools:text="1.39 km,"/>
-
-                            <TextView
-                                android:id="@+id/markers_time_text_view"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:ellipsize="end"
-                                android:maxLines="1"
-                                android:textColor="?android:textColorSecondary"
-                                android:textSize="@dimen/default_list_text_size"
-                                tools:text="~ 45 min."/>
-                        </LinearLayout>
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
 
                         <TextView
-                            android:id="@+id/markers_count_text_view"
+                            android:id="@+id/markers_distance_text_view"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginEnd="@dimen/measurement_tool_text_margin_small"
+                            android:layout_marginRight="@dimen/measurement_tool_text_margin_small"
+                            android:ellipsize="end"
+                            android:maxLines="1"
+                            android:textAppearance="@style/TextAppearance.ListItemTitle"
+                            tools:text="1.39 km,"/>
+
+                        <TextView
+                            android:id="@+id/markers_time_text_view"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
-                            android:layout_marginLeft="@dimen/measurement_tool_text_margin"
-                            android:layout_marginStart="@dimen/measurement_tool_text_margin"
                             android:ellipsize="end"
                             android:maxLines="1"
                             android:textColor="?android:textColorSecondary"
-                            android:textSize="@dimen/default_sub_text_size"
-                            tools:text="3 markers"/>
+                            android:textSize="@dimen/default_list_text_size"
+                            tools:text="~ 45 min."/>
                     </LinearLayout>
 
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:id="@+id/options_button"
+                    <TextView
+                        android:id="@+id/markers_count_text_view"
                         android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:background="?attr/selectableItemBackground"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:ellipsize="end"
-                        android:gravity="center_vertical"
                         android:maxLines="1"
-                        android:paddingLeft="16dp"
-                        android:paddingRight="16dp"
-                        android:text="@string/shared_string_options"
-                        android:textAllCaps="true"
-                        android:textColor="@color/color_white"
-                        android:textSize="@dimen/default_list_text_size"
-                        osmand:typeface="@string/font_roboto_regular"/>
+                        android:textColor="?android:textColorSecondary"
+                        android:textSize="@dimen/default_sub_text_size"
+                        tools:text="3 markers"/>
                 </LinearLayout>
 
-            </android.support.v7.widget.Toolbar>
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/options_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="?attr/selectableItemBackground"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:maxLines="1"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:text="@string/shared_string_options"
+                    android:textAllCaps="true"
+                    android:textColor="?attr/color_dialog_buttons"
+                    android:textSize="@dimen/default_list_text_size"
+                    osmand:typeface="@string/font_roboto_medium"/>
+            </LinearLayout>
 
-        </android.support.design.widget.AppBarLayout>
+        </android.support.v7.widget.Toolbar>
 
         <ProgressBar
             android:id="@+id/snap_to_road_progress_bar"
diff --git a/OsmAnd/res/layout/fragment_map_markers_dialog.xml b/OsmAnd/res/layout/fragment_map_markers_dialog.xml
index f513542ed8..efdbeb931b 100644
--- a/OsmAnd/res/layout/fragment_map_markers_dialog.xml
+++ b/OsmAnd/res/layout/fragment_map_markers_dialog.xml
@@ -2,60 +2,54 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:osmand="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:osmand="http://schemas.android.com/tools"
     android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/map_markers_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dashboard_map_toolbar">
+        android:layout_height="@dimen/dashboard_map_toolbar"
+        app:contentInsetLeft="54dp"
+        app:contentInsetStart="54dp">
 
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/map_markers_toolbar"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:contentInsetLeft="54dp"
-            app:contentInsetStart="54dp">
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
+            <net.osmand.plus.widgets.TextViewEx
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:gravity="center_vertical">
+                android:layout_weight="1"
+                android:ellipsize="end"
+                android:gravity="center_vertical"
+                android:maxLines="1"
+                android:text="@string/map_markers"
+                android:textColor="@color/color_white"
+                android:textSize="@dimen/dialog_header_text_size"
+                osmand:typeface="@string/font_roboto_medium"/>
 
-                <net.osmand.plus.widgets.TextViewEx
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:gravity="center_vertical"
-                    android:text="@string/map_markers"
-                    android:textColor="@color/color_white"
-                    osmand:typeface="@string/font_roboto_medium"
-                    android:textSize="@dimen/dialog_header_text_size"/>
+            <net.osmand.plus.widgets.TextViewEx
+                android:id="@+id/options_button"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:background="?attr/selectableItemBackground"
+                android:ellipsize="end"
+                android:gravity="center_vertical"
+                android:maxLines="1"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:text="@string/shared_string_options"
+                android:textAllCaps="true"
+                android:textColor="@color/color_white"
+                android:textSize="@dimen/default_list_text_size"
+                osmand:typeface="@string/font_roboto_regular"/>
+        </LinearLayout>
 
-                <net.osmand.plus.widgets.TextViewEx
-                    android:id="@+id/options_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:gravity="center_vertical"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:paddingRight="16dp"
-                    android:paddingLeft="16dp"
-                    android:text="@string/shared_string_options"
-                    osmand:typeface="@string/font_roboto_regular"
-                    android:textAllCaps="true"
-                    android:textSize="@dimen/default_list_text_size"
-                    android:textColor="@color/color_white"
-                    android:background="?attr/selectableItemBackground"/>
-            </LinearLayout>
-
-        </android.support.v7.widget.Toolbar>
-
-    </android.support.design.widget.AppBarLayout>
+    </android.support.v7.widget.Toolbar>
 
     <FrameLayout
         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 8ebe72239f..cdb1f4d5e2 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
@@ -233,10 +233,7 @@ public class PlanRouteFragment extends Fragment {
 			});
 		} else {
 			Toolbar toolbar = (Toolbar) mainView.findViewById(R.id.plan_route_toolbar);
-			if (nightMode) {
-				toolbar.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.actionbar_dark_color));
-			}
-			toolbar.setNavigationIcon(iconsCache.getIcon(R.drawable.ic_arrow_back));
+			toolbar.setNavigationIcon(getContentIcon(R.drawable.ic_arrow_back));
 			toolbar.setNavigationOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View view) {

From 1a36f437432b88e6118f2dbca0181291084b897f Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Fri, 6 Oct 2017 17:05:49 +0300
Subject: [PATCH 08/10] Add margin for snap to road button; fix gravity of back
 button

---
 .../res/layout-land/fragment_plan_route.xml   |  1 +
 .../layout/fragment_map_markers_dialog.xml    | 75 ++++++++++---------
 .../plus/mapmarkers/PlanRouteFragment.java    |  6 ++
 3 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/OsmAnd/res/layout-land/fragment_plan_route.xml b/OsmAnd/res/layout-land/fragment_plan_route.xml
index a969d9738c..d85da7b8fc 100644
--- a/OsmAnd/res/layout-land/fragment_plan_route.xml
+++ b/OsmAnd/res/layout-land/fragment_plan_route.xml
@@ -21,6 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/dashboard_map_toolbar"
             android:background="?attr/bg_color"
+            android:minHeight="@dimen/dashboard_map_toolbar"
             app:contentInsetLeft="54dp"
             app:contentInsetStart="54dp">
 
diff --git a/OsmAnd/res/layout/fragment_map_markers_dialog.xml b/OsmAnd/res/layout/fragment_map_markers_dialog.xml
index efdbeb931b..fafc9dc53b 100644
--- a/OsmAnd/res/layout/fragment_map_markers_dialog.xml
+++ b/OsmAnd/res/layout/fragment_map_markers_dialog.xml
@@ -7,49 +7,56 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/map_markers_toolbar"
+    <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dashboard_map_toolbar"
-        app:contentInsetLeft="54dp"
-        app:contentInsetStart="54dp">
+        android:layout_height="@dimen/dashboard_map_toolbar">
 
-        <LinearLayout
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/map_markers_toolbar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:minHeight="@dimen/dashboard_map_toolbar"
+            app:contentInsetLeft="54dp"
+            app:contentInsetStart="54dp">
 
-            <net.osmand.plus.widgets.TextViewEx
-                android:layout_width="0dp"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:ellipsize="end"
                 android:gravity="center_vertical"
-                android:maxLines="1"
-                android:text="@string/map_markers"
-                android:textColor="@color/color_white"
-                android:textSize="@dimen/dialog_header_text_size"
-                osmand:typeface="@string/font_roboto_medium"/>
+                android:orientation="horizontal">
 
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/options_button"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:background="?attr/selectableItemBackground"
-                android:ellipsize="end"
-                android:gravity="center_vertical"
-                android:maxLines="1"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:text="@string/shared_string_options"
-                android:textAllCaps="true"
-                android:textColor="@color/color_white"
-                android:textSize="@dimen/default_list_text_size"
-                osmand:typeface="@string/font_roboto_regular"/>
-        </LinearLayout>
+                <net.osmand.plus.widgets.TextViewEx
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:maxLines="1"
+                    android:text="@string/map_markers"
+                    android:textColor="@color/color_white"
+                    android:textSize="@dimen/dialog_header_text_size"
+                    osmand:typeface="@string/font_roboto_medium"/>
 
-    </android.support.v7.widget.Toolbar>
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/options_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="?attr/selectableItemBackground"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:maxLines="1"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:text="@string/shared_string_options"
+                    android:textAllCaps="true"
+                    android:textColor="@color/color_white"
+                    android:textSize="@dimen/default_list_text_size"
+                    osmand:typeface="@string/font_roboto_regular"/>
+            </LinearLayout>
+
+        </android.support.v7.widget.Toolbar>
+
+    </android.support.design.widget.AppBarLayout>
 
     <FrameLayout
         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 cdb1f4d5e2..05d1c1a655 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
@@ -21,6 +21,7 @@ import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -480,6 +481,11 @@ public class PlanRouteFragment extends Fragment {
 					fragment.show(mapActivity.getSupportFragmentManager(), SnapToRoadBottomSheetDialogFragment.TAG);
 				}
 			});
+			if (!portrait) {
+				LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) appModesBtn.getLayoutParams();
+				params.leftMargin = mapActivity.getResources().getDimensionPixelSize(R.dimen.dashboard_land_width);
+				appModesBtn.setLayoutParams(params);
+			}
 			appModesBtn.setVisibility(View.VISIBLE);
 		}
 	}

From a03d93ff811decf6c0aad91ca20b3b980ebc68fc Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Fri, 6 Oct 2017 17:50:59 +0300
Subject: [PATCH 09/10] Add select all row in options menu in landscape

---
 ...plan_route_options_bottom_sheet_dialog.xml | 32 ++++++++++++
 .../plus/mapmarkers/PlanRouteFragment.java    | 51 ++++++++++++-------
 ...RouteOptionsBottomSheetDialogFragment.java | 24 +++++++++
 3 files changed, 89 insertions(+), 18 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_plan_route_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_plan_route_options_bottom_sheet_dialog.xml
index c0d074fafd..7b10fff56d 100644
--- a/OsmAnd/res/layout/fragment_plan_route_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_plan_route_options_bottom_sheet_dialog.xml
@@ -32,6 +32,38 @@
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 osmand:typeface="@string/font_roboto_medium"/>
 
+            <LinearLayout
+                android:id="@+id/select_row"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/bottom_sheet_list_item_height"
+                android:background="?attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:minHeight="@dimen/bottom_sheet_list_item_height"
+                android:paddingEnd="@dimen/bottom_sheet_content_padding"
+                android:paddingLeft="@dimen/bottom_sheet_content_padding"
+                android:paddingRight="@dimen/bottom_sheet_content_padding"
+                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <ImageView
+                    android:id="@+id/select_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
+                    android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
+                    tools:src="@drawable/ic_action_select_all"/>
+
+                <TextView
+                    android:id="@+id/select_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"
+                    tools:text="Select all"/>
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/navigate_row"
                 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 05d1c1a655..d0881ab4a8 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
@@ -128,9 +128,11 @@ public class PlanRouteFragment extends Fragment {
 		if (snapToRoadFragment != null) {
 			((SnapToRoadBottomSheetDialogFragment) snapToRoadFragment).setListener(createSnapToRoadFragmentListener());
 		}
-		Fragment sortByFragment = fragmentManager.findFragmentByTag(PlanRouteOptionsBottomSheetDialogFragment.TAG);
-		if (sortByFragment != null) {
-			((PlanRouteOptionsBottomSheetDialogFragment) sortByFragment).setListener(createOptionsFragmentListener());
+		Fragment optionsFragment = fragmentManager.findFragmentByTag(PlanRouteOptionsBottomSheetDialogFragment.TAG);
+		if (optionsFragment != null) {
+			PlanRouteOptionsBottomSheetDialogFragment fragment = (PlanRouteOptionsBottomSheetDialogFragment) optionsFragment;
+			fragment.setSelectAll(!(selectedCount == markersHelper.getMapMarkers().size() && markersHelper.isStartFromMyLocation()));
+			fragment.setListener(createOptionsFragmentListener());
 		}
 
 		toolbarHeight = mapActivity.getResources().getDimensionPixelSize(R.dimen.dashboard_map_toolbar);
@@ -172,21 +174,8 @@ public class PlanRouteFragment extends Fragment {
 			mainView.findViewById(R.id.select_all_button).setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View view) {
-					int activeMarkersCount = markersHelper.getMapMarkers().size();
-					if (selectedCount == activeMarkersCount && markersHelper.isStartFromMyLocation()) {
-						markersHelper.deselectAllActiveMarkers();
-						markersHelper.setStartFromMyLocation(false);
-						selectedCount = 0;
-					} else {
-						markersHelper.selectAllActiveMarkers();
-						markersHelper.setStartFromMyLocation(true);
-						selectedCount = activeMarkersCount;
-					}
-					adapter.calculateStartAndFinishPos();
-					adapter.notifyDataSetChanged();
+					selectAllOnClick();
 					updateSelectButton();
-					planRouteContext.recreateSnapTrkSegment();
-					mapActivity.refreshMap();
 				}
 			});
 
@@ -322,6 +311,26 @@ public class PlanRouteFragment extends Fragment {
 		return view;
 	}
 
+	private void selectAllOnClick() {
+		int activeMarkersCount = markersHelper.getMapMarkers().size();
+		if (selectedCount == activeMarkersCount && markersHelper.isStartFromMyLocation()) {
+			markersHelper.deselectAllActiveMarkers();
+			markersHelper.setStartFromMyLocation(false);
+			selectedCount = 0;
+		} else {
+			markersHelper.selectAllActiveMarkers();
+			markersHelper.setStartFromMyLocation(true);
+			selectedCount = activeMarkersCount;
+		}
+		adapter.calculateStartAndFinishPos();
+		adapter.notifyDataSetChanged();
+		planRouteContext.recreateSnapTrkSegment();
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			mapActivity.refreshMap();
+		}
+	}
+
 	@Override
 	public void onDestroyView() {
 		super.onDestroyView();
@@ -375,6 +384,11 @@ public class PlanRouteFragment extends Fragment {
 
 			private MapActivity mapActivity = getMapActivity();
 
+			@Override
+			public void selectOnClick() {
+				selectAllOnClick();
+			}
+
 			@Override
 			public void navigateOnClick() {
 				if (mapActivity != null) {
@@ -385,7 +399,7 @@ public class PlanRouteFragment extends Fragment {
 			@Override
 			public void makeRoundTripOnClick() {
 				if (mapActivity != null) {
-					Toast.makeText(mapActivity, "mare round trip", Toast.LENGTH_SHORT).show();
+					Toast.makeText(mapActivity, "make round trip", Toast.LENGTH_SHORT).show();
 				}
 			}
 
@@ -531,6 +545,7 @@ public class PlanRouteFragment extends Fragment {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
 			PlanRouteOptionsBottomSheetDialogFragment fragment = new PlanRouteOptionsBottomSheetDialogFragment();
+			fragment.setSelectAll(!(selectedCount == markersHelper.getMapMarkers().size() && markersHelper.isStartFromMyLocation()));
 			fragment.setListener(createOptionsFragmentListener());
 			fragment.show(mapActivity.getSupportFragmentManager(), PlanRouteOptionsBottomSheetDialogFragment.TAG);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java
index a6c3759700..48ef2ffb51 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java
@@ -28,11 +28,16 @@ public class PlanRouteOptionsBottomSheetDialogFragment extends BottomSheetDialog
 	private boolean portrait;
 	private boolean night;
 	private PlanRouteOptionsFragmentListener listener;
+	private boolean selectAll;
 
 	public void setListener(PlanRouteOptionsFragmentListener listener) {
 		this.listener = listener;
 	}
 
+	public void setSelectAll(boolean selectAll) {
+		this.selectAll = selectAll;
+	}
+
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -54,6 +59,23 @@ public class PlanRouteOptionsBottomSheetDialogFragment extends BottomSheetDialog
 		((ImageView) mainView.findViewById(R.id.door_to_door_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_sort_door_to_door));
 		((ImageView) mainView.findViewById(R.id.reverse_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_sort_reverse_order));
 
+		if (!portrait) {
+			((ImageView) mainView.findViewById(R.id.select_icon))
+					.setImageDrawable(getContentIcon(selectAll ? R.drawable.ic_action_select_all : R.drawable.ic_action_deselect_all));
+
+			((TextView) mainView.findViewById(R.id.select_title))
+					.setText(getString(selectAll ? R.string.shared_string_select_all : R.string.shared_string_deselect_all));
+
+			View selectRow = mainView.findViewById(R.id.select_row);
+			selectRow.setVisibility(View.VISIBLE);
+			selectRow.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					listener.selectOnClick();
+					dismiss();
+				}
+			});
+		}
 		mainView.findViewById(R.id.navigate_row).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
@@ -155,6 +177,8 @@ public class PlanRouteOptionsBottomSheetDialogFragment extends BottomSheetDialog
 
 	interface PlanRouteOptionsFragmentListener {
 
+		void selectOnClick();
+
 		void navigateOnClick();
 
 		void makeRoundTripOnClick();

From 9758cb8afc5a29a02e8358e234a14d22d731d3a8 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Fri, 6 Oct 2017 18:40:01 +0300
Subject: [PATCH 10/10] Change logic for show / hide markers list in portrait

---
 .../plus/mapmarkers/PlanRouteFragment.java    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
index d0881ab4a8..05152e0588 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
@@ -73,10 +73,11 @@ public class PlanRouteFragment extends Fragment {
 	private int previousMapPosition;
 	private int selectedCount = 0;
 	private int toolbarHeight;
+	private int closedListContainerHeight;
 
 	private boolean nightMode;
 	private boolean portrait;
-	private boolean markersListOpened = true;
+	private boolean markersListOpened;
 	private boolean wasCollapseButtonVisible;
 
 	private View mainView;
@@ -158,7 +159,7 @@ public class PlanRouteFragment extends Fragment {
 		if (portrait) {
 			AndroidUtils.setBackground(mapActivity, mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
 
-			((ImageView) mainView.findViewById(R.id.up_down_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_down));
+			((ImageView) mainView.findViewById(R.id.up_down_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_up));
 
 			mainView.findViewById(R.id.up_down_row).setOnClickListener(new View.OnClickListener() {
 				@Override
@@ -208,9 +209,9 @@ public class PlanRouteFragment extends Fragment {
 				@Override
 				public void onGlobalLayout() {
 					int upDownRowH = mainView.findViewById(R.id.up_down_row).getHeight();
-					int listContainerH = availableHeight - upDownRowH;
+					closedListContainerHeight = availableHeight - upDownRowH;
 					View listContainer = mainView.findViewById(R.id.markers_list_container);
-					listContainer.getLayoutParams().height = listContainerH;
+					listContainer.getLayoutParams().height = closedListContainerHeight;
 					listContainer.requestLayout();
 
 					ViewTreeObserver obs = mainView.getViewTreeObserver();
@@ -606,26 +607,26 @@ public class PlanRouteFragment extends Fragment {
 	//todo create one method
 	private void showMarkersList() {
 		MapActivity mapActivity = getMapActivity();
-		MapMarkersLayer markersLayer = getMapMarkersLayer();
-		if (mapActivity != null && markersLayer != null && portrait) {
+		if (mapActivity != null && portrait) {
 			markersListOpened = true;
+			mapActivity.findViewById(R.id.bottom_controls_container).setVisibility(View.GONE);
 			((ImageView) mainView.findViewById(R.id.up_down_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_down));
 			View listContainer = mainView.findViewById(R.id.markers_list_container);
 			if (listContainer != null) {
-				listContainer.setVisibility(View.VISIBLE);
+				listContainer.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
 			}
 		}
 	}
 
 	private void hideMarkersList() {
 		MapActivity mapActivity = getMapActivity();
-		MapMarkersLayer markersLayer = getMapMarkersLayer();
-		if (mapActivity != null && markersLayer != null && portrait) {
+		if (mapActivity != null && portrait) {
 			markersListOpened = false;
+			mapActivity.findViewById(R.id.bottom_controls_container).setVisibility(View.VISIBLE);
 			((ImageView) mainView.findViewById(R.id.up_down_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_up));
 			View listContainer = mainView.findViewById(R.id.markers_list_container);
 			if (listContainer != null) {
-				listContainer.setVisibility(View.GONE);
+				listContainer.getLayoutParams().height = closedListContainerHeight;
 			}
 		}
 	}