From d44f0ae7da47e60bf56261c7ae070e6bc5a245c4 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Sun, 17 Aug 2025 22:47:48 +0100
Subject: [PATCH] [android] Display overlay layer state with icon Fixes #1402

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .../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, 19 insertions(+), 9 deletions(-)
 create 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 2530b3c84..a3f31c88c 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.layers_enabled});
+      mergeDrawableStates(drawableState, new int[] {R.attr.state_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 9ae6d9e14..d151c84fe 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:layers_enabled="true"/>
+      app:state_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 5ac5acec9..54c03571d 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:layers_enabled="true"/>
+        app:state_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 90dd2540f..e23c8e3d3 100644
--- a/android/app/src/main/res/drawable/ic_layers.xml
+++ b/android/app/src/main/res/drawable/ic_layers.xml
@@ -1,5 +1,10 @@
-<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>
+<?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
diff --git a/android/app/src/main/res/drawable/ic_layers_default.xml b/android/app/src/main/res/drawable/ic_layers_default.xml
new file mode 100644
index 000000000..90dd2540f
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_layers_default.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/app/src/main/res/values/attrs.xml b/android/app/src/main/res/values/attrs.xml
index 1de353baa..5ed44bb51 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="layers_enabled" format="boolean"/>
+    <attr name="state_layers_enabled" format="boolean"/>
   </declare-styleable>
 
   <declare-styleable name="PlacePageView">