From d5f640c6d0c2541eda837dfcaad22daea63b4f3a Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Fri, 21 Nov 2025 18:05:18 +0100
Subject: [PATCH] [android] Remove duplicate drawables

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 .../main/java/app/organicmaps/car/util/UiHelpers.java    | 2 +-
 .../app/organicmaps/widget/menu/MyPositionButton.java    | 2 +-
 android/app/src/main/res/drawable/ic_down.xml            | 9 ---------
 android/app/src/main/res/drawable/ic_not_follow.xml      | 5 -----
 android/app/src/main/res/layout/routing_plan.xml         | 2 +-
 .../app/src/main/res/layout/toolbar_search_controls.xml  | 2 +-
 android/app/src/main/res/values/styles.xml               | 2 +-
 7 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 android/app/src/main/res/drawable/ic_down.xml
 delete mode 100644 android/app/src/main/res/drawable/ic_not_follow.xml

diff --git a/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java b/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
index 214e0cac0..2f6943eb3 100644
--- a/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
@@ -177,7 +177,7 @@ public final class UiHelpers
     {
     case LocationState.PENDING_POSITION, LocationState.NOT_FOLLOW_NO_POSITION ->
       drawableRes = R.drawable.ic_location_off;
-    case LocationState.NOT_FOLLOW -> drawableRes = R.drawable.ic_not_follow;
+    case LocationState.NOT_FOLLOW -> drawableRes = R.drawable.ic_location_crosshair;
     case LocationState.FOLLOW ->
     {
       drawableRes = R.drawable.ic_follow;
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
index 56ace762f..1c0ea41f6 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
@@ -67,7 +67,7 @@ public class MyPositionButton
       {
         case LocationState.PENDING_POSITION -> R.drawable.ic_menu_location_pending;
         case LocationState.NOT_FOLLOW_NO_POSITION -> R.drawable.ic_location_off;
-        case LocationState.NOT_FOLLOW -> R.drawable.ic_not_follow;
+        case LocationState.NOT_FOLLOW -> R.drawable.ic_location_crosshair;
         case LocationState.FOLLOW -> R.drawable.ic_follow;
         case LocationState.FOLLOW_AND_ROTATE -> R.drawable.ic_follow_and_rotate;
         default -> throw new IllegalArgumentException("Invalid button mode: " + mode);
diff --git a/android/app/src/main/res/drawable/ic_down.xml b/android/app/src/main/res/drawable/ic_down.xml
deleted file mode 100644
index e5da39e7c..000000000
--- a/android/app/src/main/res/drawable/ic_down.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="@color/light_gray"
-      android:pathData="M480,598Q472,598 465,595.5Q458,593 452,587L268,403Q257,392 257,375Q257,358 268,347Q279,336 296,336Q313,336 324,347L480,503L636,347Q647,336 664,336Q681,336 692,347Q703,358 703,375Q703,392 692,403L508,587Q502,593 495,595.5Q488,598 480,598Z"/>
-</vector>
diff --git a/android/app/src/main/res/drawable/ic_not_follow.xml b/android/app/src/main/res/drawable/ic_not_follow.xml
deleted file mode 100644
index 859760018..000000000
--- a/android/app/src/main/res/drawable/ic_not_follow.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="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
-</vector>
diff --git a/android/app/src/main/res/layout/routing_plan.xml b/android/app/src/main/res/layout/routing_plan.xml
index 4ceee4668..2aa5a813d 100644
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -31,7 +31,7 @@
             android:background="?attr/selectableItemBackgroundBorderless"
             app:srcCompat="?homeAsUpIndicator"
             android:scaleType="center"
-            tools:src="@drawable/ic_down" />
+            tools:src="@drawable/ic_expand_more" />
 
         <RadioGroup
             android:id="@+id/route_type"
diff --git a/android/app/src/main/res/layout/toolbar_search_controls.xml b/android/app/src/main/res/layout/toolbar_search_controls.xml
index f78848b6e..590dbde1a 100644
--- a/android/app/src/main/res/layout/toolbar_search_controls.xml
+++ b/android/app/src/main/res/layout/toolbar_search_controls.xml
@@ -17,7 +17,7 @@
     android:background="?attr/selectableItemBackgroundBorderless"
     app:srcCompat="?homeAsUpIndicator"
     android:scaleType="center"
-    tools:src="@drawable/ic_down"
+    tools:src="@drawable/ic_expand_more"
     android:contentDescription="@string/back"/>
 
   <com.google.android.material.textfield.TextInputEditText
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index b4faab183..0a7371f3f 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -182,7 +182,7 @@
     <item name="android:gravity">center_vertical</item>
     <item name="colorAccent">@android:color/white</item>
     <item name="colorSecondary">@android:color/white</item>
-    <item name="android:homeAsUpIndicator">@drawable/ic_down</item>
+    <item name="android:homeAsUpIndicator">@drawable/ic_expand_more</item>
   </style>
 
   <style name="MwmWidget.ListView" parent="android:Widget.Material.ListView">