From 4026f14becf0024090ff3f53e9276b4d3a359692 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sun, 28 Dec 2025 19:26:27 +0100
Subject: [PATCH] [android] Simplify toolbar styles and themes

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 .../java/app/organicmaps/util/UiUtils.java    |  2 +-
 .../res/layout/fragment_driving_options.xml   |  9 +-----
 .../app/src/main/res/layout/routing_plan.xml  |  3 +-
 .../src/main/res/layout/toolbar_extended.xml  |  4 ++-
 .../res/layout/toolbar_search_controls.xml    |  1 -
 .../main/res/layout/toolbar_transparent.xml   |  8 ------
 android/app/src/main/res/values/styles.xml    | 28 -------------------
 7 files changed, 6 insertions(+), 49 deletions(-)
 delete mode 100644 android/app/src/main/res/layout/toolbar_transparent.xml

diff --git a/android/app/src/main/java/app/organicmaps/util/UiUtils.java b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
index 762973c37..8a445170b 100644
--- a/android/app/src/main/java/app/organicmaps/util/UiUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
@@ -196,7 +196,7 @@ public final class UiUtils
   public static void showHomeUpButton(MaterialToolbar toolbar)
   {
     toolbar.setNavigationIcon(
-        ThemeUtils.getResource(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
+        UiUtils.getStyledResourceId(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
   }
 
   // this method returns the total height of the display (in pixels) including notch and other touchable areas
diff --git a/android/app/src/main/res/layout/fragment_driving_options.xml b/android/app/src/main/res/layout/fragment_driving_options.xml
index 7ec17f737..9f3aa9dbc 100644
--- a/android/app/src/main/res/layout/fragment_driving_options.xml
+++ b/android/app/src/main/res/layout/fragment_driving_options.xml
@@ -6,14 +6,7 @@
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <com.google.android.material.appbar.MaterialToolbar
-    android:id="@+id/toolbar"
-    style="@style/MwmWidget.ToolbarStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="end|center_vertical"
-    android:theme="@style/MwmWidget.ToolbarTheme">
-  </com.google.android.material.appbar.MaterialToolbar>
+  <include layout="@layout/toolbar_default"/>
   <LinearLayout
     android:layout_marginTop="@dimen/margin_half_double_plus"
     android:orientation="horizontal"
diff --git a/android/app/src/main/res/layout/routing_plan.xml b/android/app/src/main/res/layout/routing_plan.xml
index 4607b20c5..8e39e9e07 100644
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -30,8 +30,7 @@
             android:layout_alignParentStart="true"
             android:background="?selectableItemBackgroundBorderless"
             app:srcCompat="?homeAsUpIndicator"
-            android:scaleType="center"
-            tools:src="@drawable/ic_expand_more" />
+            android:scaleType="center" />
 
         <RadioGroup
             android:id="@+id/route_type"
diff --git a/android/app/src/main/res/layout/toolbar_extended.xml b/android/app/src/main/res/layout/toolbar_extended.xml
index c4459eba4..1c8a51f59 100644
--- a/android/app/src/main/res/layout/toolbar_extended.xml
+++ b/android/app/src/main/res/layout/toolbar_extended.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:orientation="vertical">
@@ -9,7 +10,8 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:theme="@style/MwmWidget.ToolbarTheme.DownButton"/>
+    android:theme="@style/MwmWidget.ToolbarTheme"
+    app:navigationIcon="@drawable/ic_expand_more"/>
 
   <View
     android:layout_width="match_parent"
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 61eb0a68e..b1ceaea0f 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,6 @@
     android:background="?selectableItemBackgroundBorderless"
     app:srcCompat="?homeAsUpIndicator"
     android:scaleType="center"
-    tools:src="@drawable/ic_expand_more"
     android:contentDescription="@string/back"/>
 
   <com.google.android.material.textfield.TextInputEditText
diff --git a/android/app/src/main/res/layout/toolbar_transparent.xml b/android/app/src/main/res/layout/toolbar_transparent.xml
deleted file mode 100644
index ee631f376..000000000
--- a/android/app/src/main/res/layout/toolbar_transparent.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/toolbar"
-  style="@style/MwmWidget.ToolbarStyle"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:theme="@style/MwmWidget.ToolbarTheme.Transparent"/>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 4810df6cf..a414bb5a3 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -148,11 +148,6 @@
     <item name="buttonGravity">center_vertical</item>
   </style>
 
-  <style name="MwmWidget.ToolbarStyle.Light">
-    <item name="android:titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title.Light</item>
-    <item name="titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title.Light</item>
-  </style>
-
   <style name="MwmWidget.ToolbarStyle.NoElevation">
     <item name="android:elevation">0dp</item>
   </style>
@@ -164,29 +159,6 @@
     <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">#FF32363A</item>
-  </style>
-
-  <style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.Material3.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>
-  </style>
-
-  <style
-    name="MwmWidget.ToolbarTheme.DownButton"
-    parent="ThemeOverlay.Material3.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_expand_more</item>
-  </style>
-
   <style name="MwmWidget.ListView" parent="android:Widget.Material.ListView">
     <item name="android:fadingEdge">none</item>
     <item name="android:divider">@color/divider</item>