From 6db032aa71bf7c9930b7619c77b35206d5303f53 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Thu, 11 Jan 2018 17:05:57 +0200
Subject: [PATCH] Add shadows to additional options menu

---
 .../res/drawable/bg_additional_menu_dark.xml  | 11 ++++
 .../res/drawable/bg_additional_menu_light.xml | 11 ++++
 .../bg_additional_menu_sides_dark.xml         | 11 ++++
 .../bg_additional_menu_sides_light.xml        | 11 ++++
 .../bg_additional_menu_topsides_dark.xml      | 11 ++++
 .../bg_additional_menu_topsides_light.xml     | 11 ++++
 ...ntext_menu_actions_bottom_sheet_dialog.xml |  1 +
 ...ionalActionsBottomSheetDialogFragment.java | 56 +++++++++++++++----
 8 files changed, 111 insertions(+), 12 deletions(-)
 create mode 100644 OsmAnd/res/drawable/bg_additional_menu_dark.xml
 create mode 100644 OsmAnd/res/drawable/bg_additional_menu_light.xml
 create mode 100644 OsmAnd/res/drawable/bg_additional_menu_sides_dark.xml
 create mode 100644 OsmAnd/res/drawable/bg_additional_menu_sides_light.xml
 create mode 100644 OsmAnd/res/drawable/bg_additional_menu_topsides_dark.xml
 create mode 100644 OsmAnd/res/drawable/bg_additional_menu_topsides_light.xml

diff --git a/OsmAnd/res/drawable/bg_additional_menu_dark.xml b/OsmAnd/res/drawable/bg_additional_menu_dark.xml
new file mode 100644
index 0000000000..66bd980889
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_additional_menu_dark.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <nine-patch android:src="@drawable/bg_contextmenu_shadow_top_light"/>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/ctx_menu_bg_dark"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/bg_additional_menu_light.xml b/OsmAnd/res/drawable/bg_additional_menu_light.xml
new file mode 100644
index 0000000000..3dbefb481c
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_additional_menu_light.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <nine-patch android:src="@drawable/bg_contextmenu_shadow_top_light"/>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/route_info_bottom_view_bg_light"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/bg_additional_menu_sides_dark.xml b/OsmAnd/res/drawable/bg_additional_menu_sides_dark.xml
new file mode 100644
index 0000000000..c711c6f92c
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_additional_menu_sides_dark.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <nine-patch android:src="@drawable/bg_shadow_bottomsheet_sides"/>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/ctx_menu_bg_dark"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/bg_additional_menu_sides_light.xml b/OsmAnd/res/drawable/bg_additional_menu_sides_light.xml
new file mode 100644
index 0000000000..328d6a9d0a
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_additional_menu_sides_light.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <nine-patch android:src="@drawable/bg_shadow_bottomsheet_sides"/>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/route_info_bottom_view_bg_light"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/bg_additional_menu_topsides_dark.xml b/OsmAnd/res/drawable/bg_additional_menu_topsides_dark.xml
new file mode 100644
index 0000000000..82ce02c79b
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_additional_menu_topsides_dark.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <nine-patch android:src="@drawable/bg_shadow_bottomsheet_topsides"/>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/ctx_menu_bg_dark"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/bg_additional_menu_topsides_light.xml b/OsmAnd/res/drawable/bg_additional_menu_topsides_light.xml
new file mode 100644
index 0000000000..a3402d8835
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_additional_menu_topsides_light.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <nine-patch android:src="@drawable/bg_shadow_bottomsheet_topsides"/>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/route_info_bottom_view_bg_light"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
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 d4f1f35d9c..8010bc503b 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
@@ -33,6 +33,7 @@
     </android.support.design.widget.CoordinatorLayout>
 
     <LinearLayout
+        android:id="@+id/cancel_row_background"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/AdditionalActionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/AdditionalActionsBottomSheetDialogFragment.java
index 2ae057f831..b0600adf67 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/AdditionalActionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/AdditionalActionsBottomSheetDialogFragment.java
@@ -31,9 +31,14 @@ public class AdditionalActionsBottomSheetDialogFragment extends net.osmand.plus.
 
 	private boolean nightMode;
 	private boolean portrait;
+
 	private ContextMenuAdapter adapter;
 	private ContextMenuItemClickListener listener;
 
+	private View mainView;
+	private View scrollView;
+	private View cancelRowBgView;
+
 	public void setAdapter(ContextMenuAdapter adapter, ContextMenuItemClickListener listener) {
 		this.adapter = adapter;
 		this.listener = listener;
@@ -47,19 +52,14 @@ public class AdditionalActionsBottomSheetDialogFragment extends net.osmand.plus.
 		portrait = AndroidUiHelper.isOrientationPortrait(activity);
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
-		View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_context_menu_actions_bottom_sheet_dialog, null);
-		View scrollView = mainView.findViewById(R.id.bottom_sheet_scroll_view);
+		mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_context_menu_actions_bottom_sheet_dialog, null);
+		scrollView = mainView.findViewById(R.id.bottom_sheet_scroll_view);
+		cancelRowBgView = mainView.findViewById(R.id.cancel_row_background);
 
-//		AndroidUtils.setBackground(getActivity(), mainView, nightMode,
-//				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);
-
-		AndroidUtils.setBackground(activity, scrollView, nightMode,
-				R.color.route_info_bottom_view_bg_light, R.color.route_info_bg_dark);
-		AndroidUtils.setBackground(activity, mainView.findViewById(R.id.cancel_row), nightMode,
-				R.color.route_info_bottom_view_bg_light, R.color.route_info_bg_dark);
-		AndroidUtils.setBackground(activity, mainView.findViewById(R.id.divider), nightMode,
-				R.color.route_info_divider_light, R.color.route_info_bottom_view_bg_dark);
+		updateBackground(false);
+		cancelRowBgView.setBackgroundResource(getCancelRowBgResId());
+		mainView.findViewById(R.id.divider).setBackgroundResource(nightMode
+				? R.color.route_info_bottom_view_bg_dark : R.color.route_info_divider_light);
 
 		View.OnClickListener dismissOnClickListener = new View.OnClickListener() {
 			@Override
@@ -116,6 +116,8 @@ public class AdditionalActionsBottomSheetDialogFragment extends net.osmand.plus.
 			public void onStateChanged(@NonNull View bottomSheet, int newState) {
 				if (newState == ExtendedBottomSheetBehavior.STATE_HIDDEN) {
 					dismiss();
+				} else {
+					updateBackground(newState == ExtendedBottomSheetBehavior.STATE_EXPANDED);
 				}
 			}
 
@@ -144,6 +146,36 @@ public class AdditionalActionsBottomSheetDialogFragment extends net.osmand.plus.
 		return getMyApplication().getIconsCache().getIcon(id, nightMode ? R.color.grid_menu_icon_dark : R.color.on_map_icon_color);
 	}
 
+	private int getCancelRowBgResId() {
+		if (portrait) {
+			return nightMode ? R.color.ctx_menu_bg_dark : R.color.route_info_bottom_view_bg_light;
+		}
+		return nightMode ? R.drawable.bg_additional_menu_sides_dark : R.drawable.bg_additional_menu_sides_light;
+	}
+
+	private boolean expandedToFullScreen() {
+		Activity ctx = getActivity();
+		int availableH = AndroidUtils.getScreenHeight(ctx) - AndroidUtils.getStatusBarHeight(ctx);
+		if (portrait) {
+			availableH -= AndroidUtils.getNavBarHeight(ctx);
+		}
+		return availableH - scrollView.getHeight() - cancelRowBgView.getHeight() <= 0;
+	}
+
+	private void updateBackground(boolean expanded) {
+		int bgResId;
+		if (portrait) {
+			bgResId = expanded && expandedToFullScreen()
+					? (nightMode ? R.color.ctx_menu_bg_dark : R.color.route_info_bottom_view_bg_light)
+					: (nightMode ? R.drawable.bg_additional_menu_dark : R.drawable.bg_additional_menu_light);
+		} else {
+			bgResId = expanded && expandedToFullScreen()
+					? (nightMode ? R.drawable.bg_additional_menu_sides_dark : R.drawable.bg_additional_menu_sides_light)
+					: (nightMode ? R.drawable.bg_additional_menu_topsides_dark : R.drawable.bg_additional_menu_topsides_light);
+		}
+		scrollView.setBackgroundResource(bgResId);
+	}
+
 	private int getMenuItemContainerId(int itemsAdded) {
 		if (itemsAdded == 0) {
 			return R.id.first_item_container;