From 3f4721bbd9ee73b34ac9d50093fdf0c74ce06041 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Sun, 29 Dec 2024 17:51:33 +0000
Subject: [PATCH] set routing buttons colour with xml, not programatically

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .../organicmaps/widget/RoutingToolbarButton.java    |  6 ++----
 .../main/res/color/routing_toolbar_icon_tint.xml    |  2 +-
 .../res/color/routing_toolbar_icon_tint_night.xml   | 11 -----------
 .../res/drawable/routing_toolbar_button_active.xml  |  2 +-
 .../res/drawable/routing_toolbar_button_night.xml   | 13 -------------
 .../res/drawable/routing_toolbar_button_normal.xml  |  2 +-
 .../routing_toolbar_button_normal_night.xml         |  7 -------
 .../app/src/main/res/values-night/themes-base.xml   |  3 +++
 android/app/src/main/res/values/themes-attrs.xml    |  3 +++
 android/app/src/main/res/values/themes-base.xml     |  4 ++++
 10 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 100644 android/app/src/main/res/color/routing_toolbar_icon_tint_night.xml
 delete mode 100644 android/app/src/main/res/drawable/routing_toolbar_button_night.xml
 delete mode 100644 android/app/src/main/res/drawable/routing_toolbar_button_normal_night.xml

diff --git a/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java b/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java
index cfad34db1f..00ba4381f6 100644
--- a/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java
+++ b/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java
@@ -37,10 +37,8 @@ public class RoutingToolbarButton extends AppCompatRadioButton
 
   private void initView()
   {
-    setBackgroundResource(ThemeUtils.isNightTheme(getContext()) ? R.drawable.routing_toolbar_button_night
-                                                                : R.drawable.routing_toolbar_button);
-    setButtonTintList(ThemeUtils.isNightTheme(getContext()) ? R.color.routing_toolbar_icon_tint_night
-                                                            : R.color.routing_toolbar_icon_tint);
+    setBackgroundResource(R.drawable.routing_toolbar_button);
+    setButtonTintList(R.color.routing_toolbar_icon_tint);
   }
 
   public void progress()
diff --git a/android/app/src/main/res/color/routing_toolbar_icon_tint.xml b/android/app/src/main/res/color/routing_toolbar_icon_tint.xml
index c324c3fdc0..0eb6cc00f4 100644
--- a/android/app/src/main/res/color/routing_toolbar_icon_tint.xml
+++ b/android/app/src/main/res/color/routing_toolbar_icon_tint.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <item
     android:state_activated="true"
-    android:color="@color/routing_button_activated_tint"/>
+    android:color="?routingToolbarButtonIconActive"/>
   <item
     android:state_pressed="true"
     android:color="@color/routing_button_pressed_tint"/>
diff --git a/android/app/src/main/res/color/routing_toolbar_icon_tint_night.xml b/android/app/src/main/res/color/routing_toolbar_icon_tint_night.xml
deleted file mode 100644
index 883a8200a2..0000000000
--- a/android/app/src/main/res/color/routing_toolbar_icon_tint_night.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item
-    android:state_activated="true"
-    android:color="@color/routing_button_activated_tint_night"/>
-  <item
-    android:state_pressed="true"
-    android:color="@color/routing_button_pressed_tint"/>
-  <item
-    android:color="@color/routing_button_tint"/>
-</selector>
diff --git a/android/app/src/main/res/drawable/routing_toolbar_button_active.xml b/android/app/src/main/res/drawable/routing_toolbar_button_active.xml
index 1d422d4e2f..93f5580705 100644
--- a/android/app/src/main/res/drawable/routing_toolbar_button_active.xml
+++ b/android/app/src/main/res/drawable/routing_toolbar_button_active.xml
@@ -3,5 +3,5 @@
        android:shape="oval"
        android:height="40dp"
        android:width="40dp">
-  <solid android:color="@color/white_primary"/>
+  <solid android:color="?routingToolbarButtonActive"/>
 </shape>
diff --git a/android/app/src/main/res/drawable/routing_toolbar_button_night.xml b/android/app/src/main/res/drawable/routing_toolbar_button_night.xml
deleted file mode 100644
index 0be952a4b4..0000000000
--- a/android/app/src/main/res/drawable/routing_toolbar_button_night.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="?attr/colorControlHighlight">
-  <item>
-    <selector>
-      <item
-        android:state_activated="true"
-        android:drawable="@drawable/routing_toolbar_button_active"/>
-      <item
-        android:drawable="@drawable/routing_toolbar_button_normal_night"/>
-    </selector>
-  </item>
-</ripple>
diff --git a/android/app/src/main/res/drawable/routing_toolbar_button_normal.xml b/android/app/src/main/res/drawable/routing_toolbar_button_normal.xml
index ebfa6cbb6a..35a47fc6a0 100644
--- a/android/app/src/main/res/drawable/routing_toolbar_button_normal.xml
+++ b/android/app/src/main/res/drawable/routing_toolbar_button_normal.xml
@@ -3,5 +3,5 @@
        android:shape="oval"
        android:height="40dp"
        android:width="40dp">
-  <solid android:color="@color/bg_primary_dark"/>
+  <solid android:color="?routingToolbarButton"/>
 </shape>
diff --git a/android/app/src/main/res/drawable/routing_toolbar_button_normal_night.xml b/android/app/src/main/res/drawable/routing_toolbar_button_normal_night.xml
deleted file mode 100644
index 47906aacb4..0000000000
--- a/android/app/src/main/res/drawable/routing_toolbar_button_normal_night.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="oval"
-       android:height="40dp"
-       android:width="40dp">
-  <solid android:color="@color/bg_primary_dark_night"/>
-</shape>
diff --git a/android/app/src/main/res/values-night/themes-base.xml b/android/app/src/main/res/values-night/themes-base.xml
index 968b7f479e..11d4d6eb76 100644
--- a/android/app/src/main/res/values-night/themes-base.xml
+++ b/android/app/src/main/res/values-night/themes-base.xml
@@ -81,6 +81,9 @@
     <item name="navigationTheme">@style/MwmTheme.Navigation</item>
 
     <item name="routingButtonHint">@color/routing_button_tint</item>
+    <item name="routingToolbarButtonIconActive">@color/routing_button_activated_tint_night</item>
+    <item name="routingToolbarButtonActive">@color/routing_button_tint</item>
+    <item name="routingToolbarButton">@color/bg_primary_dark_night</item>
 
     <item name="android:listDivider">@drawable/list_divider_night</item>
 
diff --git a/android/app/src/main/res/values/themes-attrs.xml b/android/app/src/main/res/values/themes-attrs.xml
index 4c13463cda..d8ee76d584 100644
--- a/android/app/src/main/res/values/themes-attrs.xml
+++ b/android/app/src/main/res/values/themes-attrs.xml
@@ -43,6 +43,9 @@
     <attr name="downloaderTheme" format="reference" />
     <attr name="navigationTheme" format="reference" />
     <attr name="routingButtonHint" format="color" />
+    <attr name="routingToolbarButtonIconActive" format="color" />
+    <attr name="routingToolbarButtonActive" format="color" />
+    <attr name="routingToolbarButton" format="color" />
     <attr name="drivingOptionsViewBg" format="color" />
     <attr name="transitPedestrianBackground" format="color" />
     <attr name="transitRulerBackground" format="color" />
diff --git a/android/app/src/main/res/values/themes-base.xml b/android/app/src/main/res/values/themes-base.xml
index 8f0945efca..6ae504024b 100644
--- a/android/app/src/main/res/values/themes-base.xml
+++ b/android/app/src/main/res/values/themes-base.xml
@@ -79,6 +79,10 @@
     <item name="navigationTheme">@style/MwmTheme.Navigation</item>
 
     <item name="routingButtonHint">@color/routing_button_tint</item>
+    <item name="routingToolbarButtonIconActive">@color/routing_button_activated_tint</item>
+    <item name="routingToolbarButtonActive">@color/routing_button_tint</item>
+    <item name="routingToolbarButton">@color/bg_primary_dark</item>
+
 
     <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>