From daf2a7d8e75840e1e5fd5695ed14c31dab02ef20 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sat, 16 Aug 2025 18:14:30 +0200
Subject: [PATCH] [android] Fix color issues for AppCompat components

Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
---
 .../java/app/organicmaps/search/SearchAdapter.java   |  2 +-
 android/app/src/main/res/values-night-v27/themes.xml |  1 +
 android/app/src/main/res/values-night/themes.xml     |  7 +++++++
 android/app/src/main/res/values-v27/themes.xml       |  1 +
 android/app/src/main/res/values/styles-editor.xml    |  2 +-
 android/app/src/main/res/values/styles.xml           | 12 ++++++------
 android/app/src/main/res/values/themes.xml           |  8 ++++++++
 7 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
index acf8095be..34b13b89f 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
@@ -65,7 +65,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
     @AttrRes
     int getTintAttr()
     {
-      return com.google.android.material.R.attr.colorSecondary;
+      return androidx.appcompat.R.attr.colorAccent;
     }
 
     abstract TextView getTitleView();
diff --git a/android/app/src/main/res/values-night-v27/themes.xml b/android/app/src/main/res/values-night-v27/themes.xml
index 87388ede0..e2b160af1 100644
--- a/android/app/src/main/res/values-night-v27/themes.xml
+++ b/android/app/src/main/res/values-night-v27/themes.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="MwmTheme.Night.MainActivity">
+        <item name="android:colorPrimaryDark">@android:color/black</item>
         <item name="colorPrimaryVariant">@android:color/black</item>
         <item name="android:windowBackground">@null</item>
         <item name="android:windowTranslucentNavigation">false</item>
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
index 888d0138e..dd4c09bb6 100644
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -13,6 +13,7 @@
         <item name="android:textColorPrimaryInverse">@color/text_dark</item>
         <item name="android:textColorSecondary">@color/text_light_subtitle</item>
         <item name="android:windowBackground">?windowBackgroundForced</item>
+        <item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
         <item name="colorPrimaryVariant">@color/bg_primary_dark_night</item>
         <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
         <item name="android:fontFamily">@string/robotoRegular</item>
@@ -30,6 +31,7 @@
         <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
         <item name="colorPrimary">@color/bg_primary_night</item>
         <item name="colorControlNormal">?secondary</item>
+        <item name="colorAccent">@color/base_accent_night</item>
         <item name="colorSecondary">@color/base_accent_night</item>
         <item name="colorAccentTransparent">@color/base_accent_transparent</item>
         <item name="colorBtnHighlight">@color/white_24</item>
@@ -132,6 +134,7 @@
 
     <!-- Theme is overridden in v27 folder to handle cutouts -->
     <style name="MwmTheme.Night.MainActivity">
+        <item name="android:colorPrimaryDark">@android:color/black</item>
         <item name="colorPrimaryVariant">@android:color/black</item>
         <item name="android:windowBackground">@null</item>
         <item name="android:windowTranslucentNavigation">false</item>
@@ -147,6 +150,7 @@
     </style>
 
     <style name="MwmTheme.Night.AlertDialog" parent="Theme.MaterialComponents.Dialog.Alert">
+        <item name="colorAccent">?buttonDialogTextColor</item>
         <item name="colorSecondary">?buttonDialogTextColor</item>
         <item name="colorPrimary">?buttonDialogTextColor</item>
         <item name="android:background">?cardBackground</item>
@@ -162,6 +166,8 @@
     </style>
 
     <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
+        <item name="android:colorPrimaryDark">?statusBar</item>
+        <item name="colorAccent">@color/base_accent_night</item>
         <item name="colorPrimary">@color/bg_primary_night</item>
         <item name="colorPrimaryVariant">?statusBar</item>
         <item name="colorSecondary">@color/base_accent_night</item>
@@ -182,6 +188,7 @@
     </style>
 
     <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.MaterialComponents.Dialog.Alert">
+        <item name="colorAccent">@color/base_accent_night</item>
         <item name="colorSecondary">@color/base_accent_night</item>
         <item name="colorPrimary">?buttonDialogTextColor</item>
         <item name="android:fontFamily">@string/robotoMedium</item>
diff --git a/android/app/src/main/res/values-v27/themes.xml b/android/app/src/main/res/values-v27/themes.xml
index 2965eda39..1f4882c4d 100644
--- a/android/app/src/main/res/values-v27/themes.xml
+++ b/android/app/src/main/res/values-v27/themes.xml
@@ -2,6 +2,7 @@
 <!-- Cutouts API is available for API >= 27 -->
 <resources>
   <style name="MwmTheme.MainActivity">
+    <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="colorPrimaryVariant">@android:color/black</item>
     <item name="android:windowBackground">@null</item>
     <item name="android:windowTranslucentNavigation">false</item>
diff --git a/android/app/src/main/res/values/styles-editor.xml b/android/app/src/main/res/values/styles-editor.xml
index b6f80eb52..e88d81250 100644
--- a/android/app/src/main/res/values/styles-editor.xml
+++ b/android/app/src/main/res/values/styles-editor.xml
@@ -38,7 +38,7 @@
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:checked">true</item>
-    <item name="buttonTint">?colorSecondary</item>
+    <item name="buttonTint">?colorAccent</item>
   </style>
 
   <style name="MwmWidget.Editor.DayText">
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index cdba5938c..ae6bc4e1d 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -144,17 +144,20 @@
 
   <style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
+    <item name="colorAccent">@android:color/white</item>
     <item name="colorSecondary">@android:color/white</item>
     <item name="iconTint">@color/white_primary</item>
   </style>
 
   <style name="MwmWidget.ToolbarTheme.Light" parent="MwmWidget.ToolbarTheme">
     <item name="android:gravity">center_vertical</item>
+    <item name="colorAccent">@android:color/white</item>
     <item name="colorSecondary">@color/bg_window_night</item>
   </style>
 
   <style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
+    <item name="colorAccent">@android:color/white</item>
     <item name="colorSecondary">@android:color/white</item>
     <item name="android:windowActionBarOverlay">true</item>
     <item name="windowActionBarOverlay">true</item>
@@ -164,6 +167,7 @@
     name="MwmWidget.ToolbarTheme.DownButton"
     parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <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>
   </style>
@@ -352,12 +356,8 @@
     <item name="android:minWidth">30dp</item>
     <item name="android:paddingTop">7dp</item>
     <item name="android:paddingBottom">7dp</item>
-    <item name="android:paddingStart" >
-      12dp
-    </item>
-    <item name="android:paddingEnd" >
-      12dp
-    </item>
+    <item name="android:paddingStart">12dp</item>
+    <item name="android:paddingEnd">12dp</item>
     <item name="android:paddingLeft">12dp</item>
     <item name="android:paddingRight">12dp</item>
     <item name="iconPadding">4dp</item>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 2649b6a62..83a8b8a97 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -13,6 +13,7 @@
     <item name="android:textColorPrimaryInverse">@color/text_light</item>
     <item name="android:textColorSecondary">@color/text_dark_subtitle</item>
     <item name="android:windowBackground">?windowBackgroundForced</item>
+    <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
     <item name="colorPrimaryVariant">@color/bg_primary_dark</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
@@ -28,6 +29,7 @@
     <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item>
     <item name="colorPrimary">@color/bg_primary</item>
     <item name="colorControlNormal">?secondary</item>
+    <item name="colorAccent">@color/base_accent</item>
     <item name="colorSecondary">@color/base_accent</item>
     <item name="colorAccentTransparent">@color/base_accent_transparent</item>
     <item name="colorBtnHighlight">@color/white_38</item>
@@ -146,6 +148,7 @@
 
   <!-- Theme is overridden in v27 folder to handle cutouts -->
   <style name="MwmTheme.MainActivity">
+    <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="colorPrimaryVariant">@android:color/black</item>
     <item name="android:windowBackground">@null</item>
     <item name="android:windowTranslucentNavigation">false</item>
@@ -165,6 +168,7 @@
   </style>
 
   <style name="MwmTheme.AlertDialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
+    <item name="colorAccent">?buttonDialogTextColor</item>
     <item name="colorSecondary">?buttonDialogTextColor</item>
     <item name="colorPrimary">?buttonDialogTextColor</item>
     <item name="android:background">?cardBackground</item>
@@ -183,6 +187,8 @@
   </style>
 
   <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.Light">
+    <item name="android:colorPrimaryDark">?statusBar</item>
+    <item name="colorAccent">@color/base_accent</item>
     <item name="colorPrimary">@color/bg_primary</item>
     <item name="colorPrimaryVariant">?statusBar</item>
     <item name="colorSecondary">@color/base_accent</item>
@@ -203,6 +209,7 @@
   </style>
 
   <style name="MwmTheme.DialogFragment.Fullscreen.Translucent">
+    <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="colorPrimaryVariant">@android:color/black</item>
     <item name="android:windowBackground">@color/bg_dialog_translucent</item>
     <item name="android:windowIsTranslucent">true</item>
@@ -210,6 +217,7 @@
   </style>
 
   <style name="MwmMain.DialogFragment.TimePicker" parent="Theme.MaterialComponents.Light.Dialog.Alert">
+    <item name="colorAccent">@color/base_accent</item>
     <item name="colorSecondary">@color/base_accent</item>
     <item name="colorPrimary">?buttonDialogTextColor</item>
     <item name="android:fontFamily">@string/robotoMedium</item>