From b703536bfecd9fd0984cd70e9efea26fd655e22f Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Wed, 9 Sep 2020 12:13:46 +0300
Subject: [PATCH] Fix route between points scroll

---
 ...ute_between_points_bottom_sheet_dialog.xml | 104 +++++++++---------
 ...etweenPointsBottomSheetDialogFragment.java |   7 ++
 2 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_route_between_points_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_route_between_points_bottom_sheet_dialog.xml
index 99b4cf41ff..cb7cca0488 100644
--- a/OsmAnd/res/layout/fragment_route_between_points_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_route_between_points_bottom_sheet_dialog.xml
@@ -1,70 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content"
+	android:background="?attr/bg_color"
+	android:orientation="vertical">
 
 	<LinearLayout
+		android:id="@+id/navigation_types_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="?attr/bg_color"
-		android:orientation="vertical">
+		android:orientation="vertical"
+		android:paddingBottom="@dimen/bottom_sheet_content_padding_small">
 
-		<LinearLayout
-			android:id="@+id/navigation_types_container"
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/choose_navigation_title"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			android:paddingBottom="@dimen/bottom_sheet_content_padding_small">
+			android:gravity="center_vertical"
+			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:paddingBottom="@dimen/measurement_tool_menu_title_padding_bottom"
+			android:text="@string/route_between_points"
+			android:textAppearance="@style/TextAppearance.ListItemTitle"
+			osmand:typeface="@string/font_roboto_medium" />
 
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/choose_navigation_title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center_vertical"
-				android:paddingTop="@dimen/measurement_tool_menu_title_padding_top"
-				android:paddingBottom="@dimen/measurement_tool_menu_title_padding_bottom"
-				android:paddingEnd="@dimen/content_padding"
-				android:paddingLeft="@dimen/content_padding"
-				android:paddingRight="@dimen/content_padding"
-				android:paddingStart="@dimen/content_padding"
-				android:text="@string/route_between_points"
-				android:textAppearance="@style/TextAppearance.ListItemTitle"
-				osmand:typeface="@string/font_roboto_medium" />
+		<net.osmand.plus.widgets.TextViewEx
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:paddingBottom="@dimen/content_padding"
+			android:text="@string/rourte_between_points_desc"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_regular" />
 
-			<net.osmand.plus.widgets.TextViewEx
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:paddingEnd="@dimen/content_padding"
-				android:paddingLeft="@dimen/content_padding"
-				android:paddingRight="@dimen/content_padding"
-				android:paddingStart="@dimen/content_padding"
-				android:paddingBottom="@dimen/content_padding"
-				android:text="@string/rourte_between_points_desc"
-				android:textColor="?android:textColorPrimary"
-				android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
-				osmand:typeface="@string/font_roboto_regular"
-				android:textSize="@dimen/default_desc_text_size" />
-
-			<include layout="@layout/custom_radio_buttons" />
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/button_description"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:paddingEnd="@dimen/content_padding"
-				android:paddingLeft="@dimen/content_padding"
-				android:paddingRight="@dimen/content_padding"
-				android:paddingStart="@dimen/content_padding"
-				android:paddingTop="@dimen/measurement_tool_content_padding_medium"
-				android:paddingBottom="@dimen/measurement_tool_content_padding_medium"
-				android:text="@string/rourte_between_points_next_segment_button_desc"
-				android:textColor="?android:textColorPrimary"
-				android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
-				osmand:typeface="@string/font_roboto_regular"
-				android:textSize="@dimen/default_desc_text_size" />
-		</LinearLayout>
+		<include layout="@layout/custom_radio_buttons" />
 
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/button_description"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingTop="@dimen/measurement_tool_content_padding_medium"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:paddingBottom="@dimen/measurement_tool_content_padding_medium"
+			android:text="@string/rourte_between_points_next_segment_button_desc"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_regular" />
 	</LinearLayout>
 
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/RouteBetweenPointsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/RouteBetweenPointsBottomSheetDialogFragment.java
index f57cbd4e04..d611bf83be 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/RouteBetweenPointsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/RouteBetweenPointsBottomSheetDialogFragment.java
@@ -13,6 +13,7 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
+import net.osmand.AndroidUtils;
 import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
@@ -29,6 +30,7 @@ import java.util.List;
 import static net.osmand.plus.UiUtilities.CustomRadioButtonType.LEFT;
 import static net.osmand.plus.UiUtilities.CustomRadioButtonType.RIGHT;
 import static net.osmand.plus.measurementtool.MeasurementEditingContext.DEFAULT_APP_MODE;
+import static net.osmand.plus.measurementtool.SelectFileBottomSheet.BOTTOM_SHEET_HEIGHT_DP;
 
 public class RouteBetweenPointsBottomSheetDialogFragment extends MenuBottomSheetDialogFragment {
 
@@ -225,6 +227,11 @@ public class RouteBetweenPointsBottomSheetDialogFragment extends MenuBottomSheet
 		items.add(new BaseBottomSheetItem.Builder().setCustomView(mainView).create());
 	}
 
+	@Override
+	protected int getCustomHeight() {
+		return AndroidUtils.dpToPx(getContext(), BOTTOM_SHEET_HEIGHT_DP);
+	}
+
 	@Override
 	protected int getDismissButtonTextId() {
 		return R.string.shared_string_close;