From 31219ded290d9b93d9c0327c98f2419e95b80c49 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Tue, 26 Aug 2025 20:15:35 +0700
Subject: [PATCH] Revert "[android] Display overlay layer state with icon"

This reverts commit d44f0ae7da47e60bf56261c7ae070e6bc5a245c4.
---
 .../app/organicmaps/maplayer/LayersButton.java    |  2 +-
 .../src/main/res/color/accent_color_selector.xml  |  2 +-
 .../res/color/accent_color_selector_night.xml     |  2 +-
 android/app/src/main/res/drawable/ic_layers.xml   | 15 +++++----------
 .../src/main/res/drawable/ic_layers_default.xml   |  5 -----
 android/app/src/main/res/values/attrs.xml         |  2 +-
 6 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 android/app/src/main/res/drawable/ic_layers_default.xml

diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java b/android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java
index a3f31c88c..2530b3c84 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java
@@ -29,7 +29,7 @@ public class LayersButton extends FloatingActionButton
   {
     final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
     if (mAreLayersActive)
-      mergeDrawableStates(drawableState, new int[] {R.attr.state_layers_enabled});
+      mergeDrawableStates(drawableState, new int[] {R.attr.layers_enabled});
     return drawableState;
   }
 
diff --git a/android/app/src/main/res/color/accent_color_selector.xml b/android/app/src/main/res/color/accent_color_selector.xml
index d151c84fe..9ae6d9e14 100644
--- a/android/app/src/main/res/color/accent_color_selector.xml
+++ b/android/app/src/main/res/color/accent_color_selector.xml
@@ -9,7 +9,7 @@
       android:state_checked="true"/>
 
   <item android:color="@color/base_accent"
-      app:state_layers_enabled="true"/>
+      app:layers_enabled="true"/>
 
   <item android:color="@color/icon_tint"/>
 </selector>
diff --git a/android/app/src/main/res/color/accent_color_selector_night.xml b/android/app/src/main/res/color/accent_color_selector_night.xml
index 54c03571d..5ac5acec9 100644
--- a/android/app/src/main/res/color/accent_color_selector_night.xml
+++ b/android/app/src/main/res/color/accent_color_selector_night.xml
@@ -9,7 +9,7 @@
         android:state_checked="true"/>
 
   <item android:color="@color/base_accent_night"
-        app:state_layers_enabled="true"/>
+        app:layers_enabled="true"/>
 
   <item android:color="@color/white_secondary"/>
 </selector>
diff --git a/android/app/src/main/res/drawable/ic_layers.xml b/android/app/src/main/res/drawable/ic_layers.xml
index e23c8e3d3..90dd2540f 100644
--- a/android/app/src/main/res/drawable/ic_layers.xml
+++ b/android/app/src/main/res/drawable/ic_layers.xml
@@ -1,10 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        app:state_layers_enabled="true"
-        android:drawable="@drawable/ic_layers_clear"/>
-    <item
-        app:state_layers_enabled="false"
-        android:drawable="@drawable/ic_layers_default"/>
-</selector>
\ No newline at end of file
+<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/app/src/main/res/drawable/ic_layers_default.xml b/android/app/src/main/res/drawable/ic_layers_default.xml
deleted file mode 100644
index 90dd2540f..000000000
--- a/android/app/src/main/res/drawable/ic_layers_default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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/app/src/main/res/values/attrs.xml b/android/app/src/main/res/values/attrs.xml
index e13d5392e..b69c40559 100644
--- a/android/app/src/main/res/values/attrs.xml
+++ b/android/app/src/main/res/values/attrs.xml
@@ -28,7 +28,7 @@
   </declare-styleable>
 
   <declare-styleable name="layersButton">
-    <attr name="state_layers_enabled" format="boolean"/>
+    <attr name="layers_enabled" format="boolean"/>
   </declare-styleable>
 
   <declare-styleable name="PlacePageView">