Plan route fixes first part

OsmAnd/res/layout/bottom_sheet_plan_route_select_file.xml

@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
+	android:layout_height="wrap_content"
-	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
 		android:orientation="vertical">
 
 		<net.osmand.plus.widgets.TextViewEx
@@ -12,9 +17,9 @@
 			android:layout_height="wrap_content"
 			android:paddingStart="@dimen/content_padding"
 			android:paddingLeft="@dimen/content_padding"
+			android:paddingTop="@dimen/measurement_tool_menu_title_padding_top"
 			android:paddingEnd="@dimen/content_padding"
 			android:paddingRight="@dimen/content_padding"
-		android:paddingTop="@dimen/measurement_tool_menu_title_padding_top"
 			android:paddingBottom="@dimen/measurement_tool_menu_title_padding_bottom"
 			android:text="@string/plan_route_open_existing_track"
 			android:textAppearance="@style/TextAppearance.ListItemTitle"
@@ -38,23 +43,24 @@
 			android:id="@+id/folder_list"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-		android:paddingLeft="@dimen/content_padding"
-		android:paddingRight="@dimen/content_padding"
-		android:paddingStart="@dimen/content_padding"
-		android:paddingEnd="@dimen/content_padding"
 			android:clipToPadding="false"
 			android:orientation="horizontal"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
 			tools:itemCount="3"
-		tools:orientation="horizontal"
 			tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-		tools:listitem="@layout/point_editor_icon_category_item" />
+			tools:listitem="@layout/point_editor_icon_category_item"
+			tools:orientation="horizontal" />
 
 		<androidx.recyclerview.widget.RecyclerView
 			android:id="@+id/gpx_track_list"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			tools:itemCount="1"
-		tools:listitem="@layout/gpx_track_select_item">
+			tools:listitem="@layout/gpx_track_select_item" />
 
-	</androidx.recyclerview.widget.RecyclerView>
 	</LinearLayout>
+
+</androidx.core.widget.NestedScrollView>

OsmAnd/res/layout/bottom_sheet_plan_route_start.xml

@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
 		android:orientation="vertical">
 
 		<LinearLayout
@@ -12,17 +17,17 @@
 			android:orientation="horizontal"
 			android:paddingStart="@dimen/content_padding"
 			android:paddingLeft="@dimen/content_padding"
+			android:paddingTop="@dimen/bottom_sheet_title_padding_top"
 			android:paddingEnd="@dimen/content_padding"
 			android:paddingRight="@dimen/content_padding"
-		android:paddingTop="@dimen/bottom_sheet_title_padding_top"
 			android:paddingBottom="@dimen/bottom_sheet_title_padding_bottom">
 
 			<net.osmand.plus.widgets.TextViewEx
 				android:id="@+id/last_edited"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-			android:text="@string/plan_route_last_edited"
 				android:letterSpacing="@dimen/description_letter_spacing"
+				android:text="@string/plan_route_last_edited"
 				android:textColor="?attr/active_color_basic"
 				android:textSize="@dimen/default_desc_text_size"
 				osmand:typeface="@string/font_roboto_medium" />
@@ -35,7 +40,8 @@
 			android:layout_height="0dp"
 			android:layout_weight="1"
 			tools:itemCount="1"
-		tools:listitem="@layout/gpx_track_select_item">
+			tools:listitem="@layout/gpx_track_select_item" />
 
-	</androidx.recyclerview.widget.RecyclerView>
 	</LinearLayout>
+
+</androidx.core.widget.NestedScrollView>

OsmAnd/src/net/osmand/plus/measurementtool/RouteBetweenPointsBottomSheetDialogFragment.java

@@ -34,7 +34,8 @@ import org.apache.commons.logging.Log;
 import java.util.ArrayList;
 import java.util.List;
 
-import static net.osmand.plus.UiUtilities.CustomRadioButtonType.*;
+import static net.osmand.plus.UiUtilities.CustomRadioButtonType.LEFT;
+import static net.osmand.plus.UiUtilities.CustomRadioButtonType.RIGHT;
 import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationMode.NEXT_SEGMENT;
 import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationMode.WHOLE_TRACK;
 import static net.osmand.plus.measurementtool.MeasurementEditingContext.DEFAULT_APP_MODE;
@@ -120,9 +121,11 @@ public class RouteBetweenPointsBottomSheetDialogFragment extends BottomSheetDial
 
 		for (int i = 0; i < modes.size(); i++) {
 			ApplicationMode mode = modes.get(i);
+			if (!"public_transport".equals(mode.getRoutingProfile())) {
 				icon = app.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode));
 				addProfileView(navigationType, onClickListener, i, icon, mode.toHumanString(), mode.equals(appMode));
 			}
+		}
 
 		segmentBtn.setOnClickListener(new View.OnClickListener() {
 			@Override