From 8617a3f47356ae8c26ba89b2cf9310c6e4f1f973 Mon Sep 17 00:00:00 2001
From: Arnaud Vergnet <arnaud.vergnet@mailo.com>
Date: Sun, 3 Jul 2022 00:02:25 +0200
Subject: [PATCH] [android] simplify layers button

Signed-off-by: Arnaud Vergnet <arnaud.vergnet@mailo.com>
---
 android/res/drawable/bg_toggle_map_layer_btn.xml     |  6 ------
 .../res/drawable/bg_toggle_map_layer_btn_dark.xml    |  6 ------
 .../res/drawable/bg_toggle_map_layer_btn_default.xml | 11 -----------
 .../bg_toggle_map_layer_btn_default_dark.xml         | 11 -----------
 .../res/drawable/bg_toggle_map_layer_btn_pressed.xml | 12 ------------
 .../bg_toggle_map_layer_btn_pressed_dark.xml         | 11 -----------
 .../drawable/bg_toggle_map_layer_btn_selected.xml    | 11 -----------
 .../bg_toggle_map_layer_btn_selected_dark.xml        | 12 ------------
 android/res/drawable/ic_layers.xml                   |  5 +++++
 android/res/drawable/ic_layers_clear.xml             |  5 +++++
 android/res/layout-land/map_navigation_buttons.xml   |  5 +++--
 android/res/layout/map_navigation_buttons.xml        |  5 +++--
 android/res/values/styles.xml                        |  4 ----
 android/res/values/themes-attrs.xml                  |  1 -
 android/res/values/themes-base.xml                   |  2 --
 android/src/com/mapswithme/maps/MwmActivity.java     |  2 +-
 .../maps/maplayer/LayerBottomSheetItem.java          |  4 ++--
 17 files changed, 19 insertions(+), 94 deletions(-)
 delete mode 100644 android/res/drawable/bg_toggle_map_layer_btn.xml
 delete mode 100644 android/res/drawable/bg_toggle_map_layer_btn_dark.xml
 delete mode 100644 android/res/drawable/bg_toggle_map_layer_btn_default.xml
 delete mode 100644 android/res/drawable/bg_toggle_map_layer_btn_default_dark.xml
 delete mode 100644 android/res/drawable/bg_toggle_map_layer_btn_pressed.xml
 delete mode 100644 android/res/drawable/bg_toggle_map_layer_btn_pressed_dark.xml
 delete mode 100644 android/res/drawable/bg_toggle_map_layer_btn_selected.xml
 delete mode 100644 android/res/drawable/bg_toggle_map_layer_btn_selected_dark.xml
 create mode 100644 android/res/drawable/ic_layers.xml
 create mode 100644 android/res/drawable/ic_layers_clear.xml

diff --git a/android/res/drawable/bg_toggle_map_layer_btn.xml b/android/res/drawable/bg_toggle_map_layer_btn.xml
deleted file mode 100644
index 4e5902d83e..0000000000
--- a/android/res/drawable/bg_toggle_map_layer_btn.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/bg_toggle_map_layer_btn_pressed" android:state_pressed="true"/>
-  <item android:drawable="@drawable/bg_toggle_map_layer_btn_selected" android:state_selected="true"/>
-  <item android:drawable="@drawable/bg_toggle_map_layer_btn_default"/>
-</selector>
diff --git a/android/res/drawable/bg_toggle_map_layer_btn_dark.xml b/android/res/drawable/bg_toggle_map_layer_btn_dark.xml
deleted file mode 100644
index 28f87e62b8..0000000000
--- a/android/res/drawable/bg_toggle_map_layer_btn_dark.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/bg_toggle_map_layer_btn_pressed_dark" android:state_pressed="true"/>
-  <item android:drawable="@drawable/bg_toggle_map_layer_btn_selected_dark" android:state_selected="true"/>
-  <item android:drawable="@drawable/bg_toggle_map_layer_btn_default_dark"/>
-</selector>
diff --git a/android/res/drawable/bg_toggle_map_layer_btn_default.xml b/android/res/drawable/bg_toggle_map_layer_btn_default.xml
deleted file mode 100644
index 47077bcee5..0000000000
--- a/android/res/drawable/bg_toggle_map_layer_btn_default.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/bg_circle"/>
-  <item
-    android:drawable="@drawable/ic_layers_light_on"
-    android:left="@dimen/margin_base_plus_quarter"
-    android:right="@dimen/margin_base_plus_quarter"
-    android:top="@dimen/margin_base_plus_quarter"
-    android:bottom="@dimen/margin_base_plus_quarter"/>
-</layer-list>
diff --git a/android/res/drawable/bg_toggle_map_layer_btn_default_dark.xml b/android/res/drawable/bg_toggle_map_layer_btn_default_dark.xml
deleted file mode 100644
index 710471fb42..0000000000
--- a/android/res/drawable/bg_toggle_map_layer_btn_default_dark.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/bg_circle_night"/>
-  <item
-    android:drawable="@drawable/ic_layers_dark_on"
-    android:left="@dimen/margin_base_plus_quarter"
-    android:right="@dimen/margin_base_plus_quarter"
-    android:top="@dimen/margin_base_plus_quarter"
-    android:bottom="@dimen/margin_base_plus_quarter"/>
-</layer-list>
diff --git a/android/res/drawable/bg_toggle_map_layer_btn_pressed.xml b/android/res/drawable/bg_toggle_map_layer_btn_pressed.xml
deleted file mode 100644
index 0daccd2693..0000000000
--- a/android/res/drawable/bg_toggle_map_layer_btn_pressed.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/bg_circle_pressed"/>
-  <item
-    android:drawable="@drawable/ic_layers_light_on"
-    android:left="@dimen/margin_base_plus_quarter"
-    android:right="@dimen/margin_base_plus_quarter"
-    android:top="@dimen/margin_base_plus_quarter"
-    android:bottom="@dimen/margin_base_plus_quarter"/>
-</layer-list>
-
diff --git a/android/res/drawable/bg_toggle_map_layer_btn_pressed_dark.xml b/android/res/drawable/bg_toggle_map_layer_btn_pressed_dark.xml
deleted file mode 100644
index 4bb4fa9b1c..0000000000
--- a/android/res/drawable/bg_toggle_map_layer_btn_pressed_dark.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/bg_circle_pressed_night"/>
-  <item
-    android:drawable="@drawable/ic_layers_dark_on"
-    android:left="@dimen/margin_base_plus_quarter"
-    android:right="@dimen/margin_base_plus_quarter"
-    android:top="@dimen/margin_base_plus_quarter"
-    android:bottom="@dimen/margin_base_plus_quarter"/>
-</layer-list>
diff --git a/android/res/drawable/bg_toggle_map_layer_btn_selected.xml b/android/res/drawable/bg_toggle_map_layer_btn_selected.xml
deleted file mode 100644
index c54873625d..0000000000
--- a/android/res/drawable/bg_toggle_map_layer_btn_selected.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/bg_circle"/>
-  <item
-    android:drawable="@drawable/ic_layers_off"
-    android:left="@dimen/margin_base_plus_quarter"
-    android:right="@dimen/margin_base_plus_quarter"
-    android:top="@dimen/margin_base_plus_quarter"
-    android:bottom="@dimen/margin_base_plus_quarter"/>
-</layer-list>
diff --git a/android/res/drawable/bg_toggle_map_layer_btn_selected_dark.xml b/android/res/drawable/bg_toggle_map_layer_btn_selected_dark.xml
deleted file mode 100644
index 1a00348b7a..0000000000
--- a/android/res/drawable/bg_toggle_map_layer_btn_selected_dark.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item
-    android:drawable="@drawable/bg_circle_night"/>
-  <item
-    android:drawable="@drawable/ic_layers_off_night"
-    android:left="@dimen/margin_base_plus_quarter"
-    android:right="@dimen/margin_base_plus_quarter"
-    android:top="@dimen/margin_base_plus_quarter"
-    android:bottom="@dimen/margin_base_plus_quarter"/>
-</layer-list>
diff --git a/android/res/drawable/ic_layers.xml b/android/res/drawable/ic_layers.xml
new file mode 100644
index 0000000000..90dd2540fa
--- /dev/null
+++ b/android/res/drawable/ic_layers.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>
+</vector>
diff --git a/android/res/drawable/ic_layers_clear.xml b/android/res/drawable/ic_layers_clear.xml
new file mode 100644
index 0000000000..4f2190296c
--- /dev/null
+++ b/android/res/drawable/ic_layers_clear.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19.81,14.99l1.19,-0.92 -1.43,-1.43 -1.19,0.92 1.43,1.43zM19.36,10.27L21,9l-9,-7 -2.91,2.27 7.87,7.88 2.4,-1.88zM3.27,1L2,2.27l4.22,4.22L3,9l1.63,1.27L12,16l2.1,-1.63 1.43,1.43L12,18.54l-7.37,-5.73L3,14.07l9,7 4.95,-3.85L20.73,21 22,19.73 3.27,1z"/>
+</vector>
diff --git a/android/res/layout-land/map_navigation_buttons.xml b/android/res/layout-land/map_navigation_buttons.xml
index f0d5ccdc10..5212ff8ed9 100644
--- a/android/res/layout-land/map_navigation_buttons.xml
+++ b/android/res/layout-land/map_navigation_buttons.xml
@@ -11,10 +11,11 @@
 
   <ImageButton
     android:id="@+id/layers_button"
-    style="@style/MwmWidget.MapButton.Layers"
+    style="@style/MwmWidget.MapButton"
     android:layout_alignParentStart="true"
     android:layout_alignParentTop="true"
-    android:background="?toggleMapLayerBtnBg"
+    android:background="?nav_background"
+    android:src="@drawable/ic_layers"
     android:visibility="invisible"
     tools:visibility="visible" />
 
diff --git a/android/res/layout/map_navigation_buttons.xml b/android/res/layout/map_navigation_buttons.xml
index fe7d29d1cc..ce4c2dd626 100644
--- a/android/res/layout/map_navigation_buttons.xml
+++ b/android/res/layout/map_navigation_buttons.xml
@@ -10,10 +10,11 @@
 
   <ImageButton
     android:id="@+id/layers_button"
-    style="@style/MwmWidget.MapButton.Layers"
+    style="@style/MwmWidget.MapButton"
     android:layout_alignParentStart="true"
     android:layout_alignParentTop="true"
-    android:background="?toggleMapLayerBtnBg"
+    android:background="?nav_background"
+    android:src="@drawable/ic_layers"
     android:visibility="invisible"
     tools:visibility="visible" />
 
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index c569623186..225a6be7ac 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -17,10 +17,6 @@
     <item name="android:tint">?iconTint</item>
   </style>
 
-  <style name="MwmWidget.MapButton.Layers">
-    <item name="android:tint">@null</item>
-  </style>
-
   <style name="MwmWidget.Button">
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml
index 7b13d7ff95..6e74e41394 100644
--- a/android/res/values/themes-attrs.xml
+++ b/android/res/values/themes-attrs.xml
@@ -70,7 +70,6 @@
     <attr name="filterPropertyBackground" format="reference" />
     <attr name="adChoicesIcon" format="reference" />
     <attr name="saleIcon" format="reference" />
-    <attr name="toggleMapLayerBtnBg" format="reference" />
     <attr name="tipsBgColor" format="color" />
     <attr name="tipsPrimaryTextColor" format="color" />
     <attr name="tipsSecondaryTextColor" format="color" />
diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml
index 774c4ce64b..b9f4cdb316 100644
--- a/android/res/values/themes-base.xml
+++ b/android/res/values/themes-base.xml
@@ -120,7 +120,6 @@
     <item name="trafficMenuDisabled">@drawable/ic_layers_traffic_inactive</item>
     <item name="subwayMenuDisabled">@drawable/ic_layers_subway_inactive</item>
     <item name="isoLinesMenuDisabled">@drawable/ic_layers_isoline_inactive</item>
-    <item name="toggleMapLayerBtnBg">@drawable/bg_toggle_map_layer_btn</item>
     <item name="accentColorSelector">@color/accent_color_selector</item>
     <item name="tipsBgColor">@color/tips_and_triks_bg_night</item>
     <item name="tipsPrimaryTextColor">@color/tips_and_triks_primary_text</item>
@@ -295,7 +294,6 @@
     <item name="saleIcon">@drawable/ic_deal_dark</item>
     <item name="nav_bg_subway">@drawable/bg_subway_night</item>
     <item name="nav_bg_isolines">@drawable/bg_iso_lines_night</item>
-    <item name="toggleMapLayerBtnBg">@drawable/bg_toggle_map_layer_btn_dark</item>
     <item name="accentColorSelector">@color/accent_color_selector_night</item>
     <item name="tipsBgColor">@color/tips_and_triks_bg</item>
     <item name="tipsPrimaryTextColor">@color/tips_and_triks_primary_text_night</item>
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 885309f19b..26a17f22f6 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -926,7 +926,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (!PermissionsUtils.isLocationGranted(this))
     {
       Utils.showSnackbar(getActivity(), findViewById(R.id.coordinator), findViewById(R.id.menu_frame),
-          R.string.location_is_disabled_long_text);
+                         R.string.location_is_disabled_long_text);
       return;
     }
 
diff --git a/android/src/com/mapswithme/maps/maplayer/LayerBottomSheetItem.java b/android/src/com/mapswithme/maps/maplayer/LayerBottomSheetItem.java
index d55bb47855..312f9b9293 100644
--- a/android/src/com/mapswithme/maps/maplayer/LayerBottomSheetItem.java
+++ b/android/src/com/mapswithme/maps/maplayer/LayerBottomSheetItem.java
@@ -39,8 +39,8 @@ public class LayerBottomSheetItem
 
   public static LayerBottomSheetItem create(@NonNull Context mContext, Mode mode, @NonNull OnItemClickListener<LayerBottomSheetItem> layerItemClickListener)
   {
-    int disabledResource = R.attr.toggleMapLayerBtnBg;
-    int enabledResource = R.attr.toggleMapLayerBtnBg;
+    int disabledResource = 0;
+    int enabledResource = 0;
     int buttonTextResource = R.string.layers_title;
     switch (mode)
     {