From 720c12645bd2aa6eab1d329ba1460e381cadfe64 Mon Sep 17 00:00:00 2001
From: Nazar-Kutz <vitamikuna@gmail.com>
Date: Tue, 9 Jun 2020 10:20:39 +0300
Subject: [PATCH 1/2] Quick Action UI fixes

---
 .../bottom_sheet_item_primary_descr.xml       | 18 +++++++
 .../res/layout/preference_toolbar_switch.xml  | 10 ++--
 .../layout/quick_action_add_dialog_item.xml   |  6 ++-
 OsmAnd/res/layout/quick_action_list.xml       | 10 ++--
 OsmAnd/res/layout/quick_action_list_item.xml  | 22 +++++---
 OsmAnd/res/values/attrs.xml                   |  2 +
 OsmAnd/res/values/colors.xml                  |  3 ++
 OsmAnd/res/values/styles.xml                  |  2 +
 .../quickaction/ConfirmationBottomSheet.java  |  2 +-
 .../quickaction/QuickActionListFragment.java  | 52 +++++++++----------
 10 files changed, 80 insertions(+), 47 deletions(-)
 create mode 100644 OsmAnd/res/layout/bottom_sheet_item_primary_descr.xml

diff --git a/OsmAnd/res/layout/bottom_sheet_item_primary_descr.xml b/OsmAnd/res/layout/bottom_sheet_item_primary_descr.xml
new file mode 100644
index 0000000000..ad7d7a425c
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_item_primary_descr.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<net.osmand.plus.widgets.TextViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/description"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:letterSpacing="@dimen/description_letter_spacing"
+    android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
+    android:minHeight="@dimen/bottom_sheet_list_item_height"
+    android:paddingLeft="@dimen/content_padding"
+    android:paddingRight="@dimen/content_padding"
+    android:paddingEnd="@dimen/content_padding"
+    android:paddingStart="@dimen/content_padding"
+    android:paddingBottom="@dimen/gpx_small_text_margin"
+    android:textAppearance="@style/TextAppearance.ListItemTitle"
+    app:typeface="@string/font_roboto_regular"
+    tools:text="@string/auto_zoom_map_descr" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/preference_toolbar_switch.xml b/OsmAnd/res/layout/preference_toolbar_switch.xml
index c6296d76e2..17fdd398fa 100644
--- a/OsmAnd/res/layout/preference_toolbar_switch.xml
+++ b/OsmAnd/res/layout/preference_toolbar_switch.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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:id="@+id/toolbar_switch_container"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="?attr/list_background_color"
-	android:orientation="vertical">
+	android:background="?attr/list_background_color">
 
 	<LinearLayout
 		android:id="@+id/selectable_item"
@@ -47,4 +46,7 @@
 
 	</LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+	<include layout="@layout/card_bottom_divider"
+		android:id="@+id/top_shadow_inner" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/quick_action_add_dialog_item.xml b/OsmAnd/res/layout/quick_action_add_dialog_item.xml
index c4222cdfc3..46c13ca86a 100644
--- a/OsmAnd/res/layout/quick_action_add_dialog_item.xml
+++ b/OsmAnd/res/layout/quick_action_add_dialog_item.xml
@@ -19,16 +19,18 @@
         android:layout_height="@dimen/standard_icon_size"
         android:layout_gravity="center_vertical"
         android:layout_marginRight="@dimen/content_padding"
+		android:layout_marginEnd="@dimen/content_padding"
         android:scaleType="centerInside"
         android:tint="?attr/default_icon_color"
-        osmand:srcCompat="@drawable/ic_action_flag"
-	    android:layout_marginEnd="@dimen/content_padding" />
+        osmand:srcCompat="@drawable/ic_action_flag" />
 
     <net.osmand.plus.widgets.TextViewEx
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginStart="@dimen/content_padding"
         android:textColor="?android:textColorPrimary"
         android:textSize="@dimen/default_list_text_size"
 		osmand:typeface="@string/font_roboto_regular"
diff --git a/OsmAnd/res/layout/quick_action_list.xml b/OsmAnd/res/layout/quick_action_list.xml
index 02c9e637ac..7b042aa261 100644
--- a/OsmAnd/res/layout/quick_action_list.xml
+++ b/OsmAnd/res/layout/quick_action_list.xml
@@ -46,7 +46,7 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/bg_color"
+            android:background="?attr/bottom_bar_background_color"
             android:minHeight="@dimen/bottom_sheet_list_item_height"
             android:orientation="horizontal">
 
@@ -74,15 +74,15 @@
                 android:id="@+id/delete"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/content_padding_half"
-                android:layout_gravity="center_vertical|end">
+                android:layout_gravity="center_vertical|end"
+                android:layout_margin="@dimen/content_padding_half">
 
                 <FrameLayout
                     android:id="@+id/button_container"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:padding="@dimen/content_padding_half"
-                    android:background="?attr/selectableItemBackground">
+                    android:background="?attr/selectableItemBackground"
+                    android:padding="@dimen/content_padding_half">
 
                     <net.osmand.plus.widgets.TextViewEx
                         android:id="@+id/button_text"
diff --git a/OsmAnd/res/layout/quick_action_list_item.xml b/OsmAnd/res/layout/quick_action_list_item.xml
index 93de384f32..dd1446a4d3 100644
--- a/OsmAnd/res/layout/quick_action_list_item.xml
+++ b/OsmAnd/res/layout/quick_action_list_item.xml
@@ -17,23 +17,30 @@
         android:orientation="horizontal">
 
         <FrameLayout
+            android:id="@+id/action_button"
             android:layout_width="@dimen/acceptable_touch_radius"
             android:layout_height="@dimen/acceptable_touch_radius"
-            android:layout_gravity="center">
+            android:layout_marginLeft="@dimen/dashCardMargin"
+            android:layout_marginRight="@dimen/dashCardMargin"
+            android:layout_gravity="center"
+            android:padding="@dimen/content_padding_small">
 
             <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/action_icon"
-                style="@style/Widget.AppCompat.ActionButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
+                style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
+                android:clickable="false"
+                android:focusable="false"
+                android:duplicateParentState="true"
                 tools:src="@drawable/ic_action_remove"
                 tools:tint="@color/icon_color_default_light" />
 
             <androidx.appcompat.widget.AppCompatCheckBox
                 android:id="@+id/checkbox"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 tools:tint="@color/icon_color_default_light" />
 
@@ -103,17 +110,18 @@
 
                 <FrameLayout
                     android:id="@+id/move_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/acceptable_touch_radius"
+                    android:layout_height="@dimen/acceptable_touch_radius"
+                    android:layout_marginLeft="@dimen/dashCardMargin"
+                    android:layout_marginRight="@dimen/dashCardMargin"
                     android:layout_gravity="center"
-                    android:layout_marginEnd="@dimen/content_padding_half"
-                    android:layout_marginRight="@dimen/content_padding_half"
                     android:padding="@dimen/content_padding_small">
 
                     <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/move_icon"
                         android:layout_width="@dimen/standard_icon_size"
                         android:layout_height="@dimen/standard_icon_size"
+                        android:layout_gravity="center"
                         android:tint="?attr/secondary_icon_color"
                         osmand:srcCompat="@drawable/ic_action_item_move" />
 
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index 8bc2b87c03..6659534355 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -106,6 +106,8 @@
         <attr name="purchase_dialog_shadow_btn_bg" format="reference"/>
 		<attr name="purchase_dialog_outline_btn_bg" format="reference"/>
 
+        <attr name="bottom_bar_background_color" format="color" />
+
         <attr name="bottom_nav_shadow" format="reference"/>
 
         <attr name="purchase_dialog_active_card_bg" format="reference"/>
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 6430694639..87f89be049 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -417,6 +417,9 @@
 	<color name="text_field_box_dark">#3F474B</color>
 	<color name="text_field_box_light">#eeeeee</color>
 
+	<color name="bottom_bar_background_color_dark">#252727</color>
+	<color name="bottom_bar_background_color_light">#FFFFFF</color>
+
 	<color name="preference_category_title">#7E33FF</color>
 	<color name="preference_top_switch_off">#808080</color>
 
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index db178fcfb2..c190045cab 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -121,6 +121,7 @@
 
     <!-- Osmand themes styles -->
     <style name="OsmandLightTheme" parent="Theme.AppCompat.Light">
+        <item name="bottom_bar_background_color">@color/bottom_bar_background_color_light</item>
         <item name="android:textDirection">locale</item>
         <item name="android:statusBarColor">@color/status_bar_color_light</item>
         <item name="mapBackground">@color/map_background_color_light</item>
@@ -411,6 +412,7 @@
     </style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
+        <item name="bottom_bar_background_color">@color/bottom_bar_background_color_dark</item>
         <item name="android:textDirection">locale</item>
         <item name="android:statusBarColor">@color/status_bar_color_dark</item>
         <item name="mapBackground">@color/map_background_color_dark</item>
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/ConfirmationBottomSheet.java b/OsmAnd/src/net/osmand/plus/quickaction/ConfirmationBottomSheet.java
index 87af1a0442..58d1ad8913 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/ConfirmationBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/ConfirmationBottomSheet.java
@@ -54,7 +54,7 @@ public class ConfirmationBottomSheet extends MenuBottomSheetDialogFragment {
 		items.add(new TitleItem(title));
 		items.add(new BottomSheetItemWithDescription.Builder()
 				.setDescription(message)
-				.setLayoutId(R.layout.bottom_sheet_item_preference_descr)
+				.setLayoutId(R.layout.bottom_sheet_item_primary_descr)
 				.create());
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java
index f049a5d7c6..8bb543ef16 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java
@@ -175,12 +175,13 @@ public class QuickActionListFragment extends BaseOsmAndFragment
 
         rv.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
-            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
                 if (screenType == SCREEN_TYPE_REORDER) {
-                    if (dy > 0 && fab.getVisibility() == View.VISIBLE)
+                    if (newState == RecyclerView.SCROLL_STATE_DRAGGING) {
                         fab.hide();
-                    else if (dy < 0 && fab.getVisibility() != View.VISIBLE)
+                    } else if (newState == RecyclerView.SCROLL_STATE_IDLE) {
                         fab.show();
+                    }
                 }
             }
         });
@@ -505,11 +506,11 @@ public class QuickActionListFragment extends BaseOsmAndFragment
                 final QuickAction action = (QuickAction) item.value;
 
                 if (screenType == SCREEN_TYPE_REORDER) {
-                    h.handleView.setVisibility(View.VISIBLE);
-                    h.deleteBtn.setVisibility(View.VISIBLE);
+                    h.moveButton.setVisibility(View.VISIBLE);
+                    h.deleteIcon.setVisibility(View.VISIBLE);
                     h.checkbox.setVisibility(View.GONE);
 
-                    h.handleView.setOnTouchListener(new View.OnTouchListener() {
+                    h.moveButton.setOnTouchListener(new View.OnTouchListener() {
                         @Override
                         public boolean onTouch(View v, MotionEvent event) {
                             if (MotionEventCompat.getActionMasked(event) ==
@@ -530,6 +531,8 @@ public class QuickActionListFragment extends BaseOsmAndFragment
                         }
                     });
 
+                    h.deleteBtn.setClickable(true);
+                    h.deleteBtn.setFocusable(true);
                     h.itemContainer.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
@@ -543,12 +546,14 @@ public class QuickActionListFragment extends BaseOsmAndFragment
                     });
 
                 } else if (screenType == SCREEN_TYPE_DELETE) {
-                    h.handleView.setVisibility(View.GONE);
-                    h.deleteBtn.setVisibility(View.GONE);
+                    h.moveButton.setVisibility(View.GONE);
+                    h.deleteIcon.setVisibility(View.GONE);
                     h.checkbox.setVisibility(View.VISIBLE);
 
                     h.checkbox.setClickable(false);
 
+                    h.deleteBtn.setClickable(false);
+                    h.deleteBtn.setFocusable(false);
                     h.itemContainer.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
@@ -655,22 +660,9 @@ public class QuickActionListFragment extends BaseOsmAndFragment
                 }
                 saveQuickActions();
                 updateListItems();
-                showFABIfNotScrollable();
             }
         }
 
-        private void showFABIfNotScrollable() {
-            LinearLayoutManager layoutManager = (LinearLayoutManager) rv.getLayoutManager();
-            int lastVisibleItemPosition = layoutManager.findLastVisibleItemPosition();
-            if (screenType == SCREEN_TYPE_REORDER &&
-                    (lastVisibleItemPosition == items.size() - 1
-                            || lastVisibleItemPosition == items.size()) &&
-                    layoutManager.findFirstVisibleItemPosition() == 0 &&
-                    fab.getVisibility() != View.VISIBLE ||
-                    items.size() == 0)
-                fab.show();
-        }
-
         public List<QuickAction> getQuickActions() {
             List<QuickAction> result = new ArrayList<>();
             for (ListItem item : items) {
@@ -717,8 +709,10 @@ public class QuickActionListFragment extends BaseOsmAndFragment
             public ImageView icon;
             public View itemDivider;
             public View longDivider;
-            public ImageView handleView;
-            public ImageView deleteBtn;
+            public View moveButton;
+            public ImageView moveIcon;
+            public View deleteBtn;
+            public ImageView deleteIcon;
             public CompoundButton checkbox;
             public View itemContainer;
 
@@ -730,14 +724,16 @@ public class QuickActionListFragment extends BaseOsmAndFragment
                 icon = (ImageView) itemView.findViewById(R.id.imageView);
                 itemDivider = itemView.findViewById(R.id.item_divider);
                 longDivider = itemView.findViewById(R.id.long_divider);
-                deleteBtn = (ImageView) itemView.findViewById(R.id.action_icon);
-                handleView = (ImageView) itemView.findViewById(R.id.move_icon);
+                deleteBtn = itemView.findViewById(R.id.action_button);
+                deleteIcon = (ImageView) itemView.findViewById(R.id.action_icon);
+                moveButton = itemView.findViewById(R.id.move_button);
+                moveIcon = (ImageView) itemView.findViewById(R.id.move_icon);
                 checkbox = (CompoundButton) itemView.findViewById(R.id.checkbox);
                 itemContainer = itemView.findViewById(R.id.searchListItemLayout);
 
-                deleteBtn.setImageDrawable(app.getUIUtilities()
-                        .getIcon(R.drawable.ic_action_remove, R.color.color_osm_edit_delete));
-                handleView.setImageDrawable(app.getUIUtilities()
+                deleteIcon.setImageDrawable(app.getUIUtilities()
+                        .getIcon(R.drawable.ic_action_delete_item, R.color.color_osm_edit_delete));
+                moveIcon.setImageDrawable(app.getUIUtilities()
                         .getThemedIcon(R.drawable.ic_action_item_move));
                 UiUtilities.setupCompoundButton(checkbox, nightMode,
                         UiUtilities.CompoundButtonType.GLOBAL);

From 88e50a1428f56d5b5d86dcb5a1517b08fff92885 Mon Sep 17 00:00:00 2001
From: Nazar-Kutz <vitamikuna@gmail.com>
Date: Thu, 11 Jun 2020 10:48:01 +0300
Subject: [PATCH 2/2] small fixes

---
 OsmAnd/res/layout/quick_action_add_dialog_item.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/quick_action_add_dialog_item.xml b/OsmAnd/res/layout/quick_action_add_dialog_item.xml
index 46c13ca86a..abe5e995cc 100644
--- a/OsmAnd/res/layout/quick_action_add_dialog_item.xml
+++ b/OsmAnd/res/layout/quick_action_add_dialog_item.xml
@@ -19,7 +19,7 @@
         android:layout_height="@dimen/standard_icon_size"
         android:layout_gravity="center_vertical"
         android:layout_marginRight="@dimen/content_padding"
-		android:layout_marginEnd="@dimen/content_padding"
+        android:layout_marginEnd="@dimen/content_padding"
         android:scaleType="centerInside"
         android:tint="?attr/default_icon_color"
         osmand:srcCompat="@drawable/ic_action_flag" />
@@ -29,8 +29,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-		android:layout_marginLeft="@dimen/content_padding"
-		android:layout_marginStart="@dimen/content_padding"
+        android:layout_marginLeft="@dimen/content_padding"
+        android:layout_marginStart="@dimen/content_padding"
         android:textColor="?android:textColorPrimary"
         android:textSize="@dimen/default_list_text_size"
 		osmand:typeface="@string/font_roboto_regular"