From e309f9173ded71be10c0f7301417fdb71d62bc2f Mon Sep 17 00:00:00 2001
From: alex <asytnyk0@gmail.com>
Date: Fri, 5 Jan 2018 16:03:19 +0200
Subject: [PATCH] Set peek height for 2/3 of the screen height; close the menu
 after touch outside; calibrate the behavior

---
 ...ntext_menu_actions_bottom_sheet_dialog.xml |  2 +-
 ...ionalActionsBottomSheetDialogFragment.java | 20 ++++++++++++++++---
 .../tools/ExtendedBottomSheetBehavior.java    | 10 ++--------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_context_menu_actions_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_context_menu_actions_bottom_sheet_dialog.xml
index 1d61901d03..ed3110ecc5 100644
--- a/OsmAnd/res/layout/fragment_context_menu_actions_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_context_menu_actions_bottom_sheet_dialog.xml
@@ -7,6 +7,7 @@
     android:orientation="vertical">
 
     <android.support.design.widget.CoordinatorLayout
+        android:id="@+id/scroll_view_container"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1">
@@ -17,7 +18,6 @@
             android:layout_height="wrap_content"
             android:background="?attr/bg_color"
             app:behavior_hideable="true"
-            app:behavior_peekHeight="300dp"
             app:layout_behavior="net.osmand.plus.widgets.tools.ExtendedBottomSheetBehavior">
 
             <LinearLayout
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/AdditionalActionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/AdditionalActionsBottomSheetDialogFragment.java
index ea7a0dac8e..fea48c70e5 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/AdditionalActionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/AdditionalActionsBottomSheetDialogFragment.java
@@ -1,5 +1,6 @@
 package net.osmand.plus.mapcontextmenu;
 
+import android.app.Activity;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.DrawableRes;
@@ -16,6 +17,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import net.osmand.AndroidUtils;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.R;
@@ -50,12 +52,15 @@ public class AdditionalActionsBottomSheetDialogFragment extends net.osmand.plus.
 //				portrait ? R.drawable.bg_bottom_menu_light : R.drawable.bg_bottom_sheet_topsides_landscape_light,
 //				portrait ? R.drawable.bg_bottom_menu_dark : R.drawable.bg_bottom_sheet_topsides_landscape_dark);
 
-		mainView.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {
+		View.OnClickListener dismissOnClickListener = new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				dismiss();
 			}
-		});
+		};
+
+		mainView.findViewById(R.id.cancel_row).setOnClickListener(dismissOnClickListener);
+		mainView.findViewById(R.id.scroll_view_container).setOnClickListener(dismissOnClickListener);
 
 		TextView headerTitle = (TextView) mainView.findViewById(R.id.header_title);
 		if (nightMode) {
@@ -90,7 +95,9 @@ public class AdditionalActionsBottomSheetDialogFragment extends net.osmand.plus.
 			itemsLinearLayout.addView(row);
 		}
 
-		ExtendedBottomSheetBehavior.from(mainView.findViewById(R.id.bottom_sheet_scroll_view)).setBottomSheetCallback(new BottomSheetCallback() {
+		ExtendedBottomSheetBehavior behavior = ExtendedBottomSheetBehavior.from(mainView.findViewById(R.id.bottom_sheet_scroll_view));
+		behavior.setPeekHeight(getPeekHeight());
+		behavior.setBottomSheetCallback(new BottomSheetCallback() {
 			@Override
 			public void onStateChanged(@NonNull View bottomSheet, int newState) {
 				if (newState == ExtendedBottomSheetBehavior.STATE_HIDDEN) {
@@ -123,6 +130,13 @@ public class AdditionalActionsBottomSheetDialogFragment extends net.osmand.plus.
 		return getMyApplication().getIconsCache().getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.on_map_icon_color);
 	}
 
+	private int getPeekHeight() {
+		Activity ctx = getActivity();
+		int screenH = AndroidUtils.getScreenHeight(ctx);
+		int availableH = screenH - AndroidUtils.getNavBarHeight(ctx) - AndroidUtils.getStatusBarHeight(ctx);
+		return (availableH * 2 / 3) - getResources().getDimensionPixelSize(R.dimen.bottom_sheet_cancel_button_height);
+	}
+
 	public interface ContextMenuItemClickListener {
 		void onItemClick(int position);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/widgets/tools/ExtendedBottomSheetBehavior.java b/OsmAnd/src/net/osmand/plus/widgets/tools/ExtendedBottomSheetBehavior.java
index ee01299b40..f0e1f5b92b 100644
--- a/OsmAnd/src/net/osmand/plus/widgets/tools/ExtendedBottomSheetBehavior.java
+++ b/OsmAnd/src/net/osmand/plus/widgets/tools/ExtendedBottomSheetBehavior.java
@@ -411,14 +411,8 @@ public class ExtendedBottomSheetBehavior<V extends View> extends CoordinatorLayo
 			top = mParentHeight;
 			targetState = STATE_HIDDEN;
 		} else if (mLastNestedScrollDy == 0) {
-			int currentTop = child.getTop();
-			if (Math.abs(currentTop - mMinOffset) < Math.abs(currentTop - mMaxOffset)) {
-				top = mMinOffset;
-				targetState = STATE_EXPANDED;
-			} else {
-				top = mMaxOffset;
-				targetState = STATE_COLLAPSED;
-			}
+			top = child.getTop();
+			targetState = STATE_MANUALLY_MOVED;
 		} else {
 			if (Math.abs(getYVelocity()) > MIN_VELOCITY_FOR_SLIDE) {
 				top = mMaxOffset;