From 76237fd9e01d998cd4d0b6f6eb0d4f57aed83853 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sat, 20 Dec 2025 17:25:23 +0100
Subject: [PATCH] [android] Use M3 top bar in the app

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 .../main/java/app/organicmaps/MwmActivity.java  |  1 -
 .../main/res/layout-land/fragment_osm_login.xml |  2 +-
 .../layout/activity_fragment_and_toolbar.xml    |  2 +-
 .../src/main/res/layout/activity_settings.xml   |  2 +-
 .../fragment_bookmark_category_settings.xml     |  8 ++++----
 .../res/layout/fragment_driving_options.xml     |  2 +-
 .../main/res/layout/fragment_edit_bookmark.xml  |  7 +++----
 .../src/main/res/layout/fragment_osm_login.xml  |  2 +-
 .../src/main/res/layout/mtoolbar_default.xml    |  8 ++++++++
 .../src/main/res/layout/position_chooser.xml    | 17 ++++-------------
 android/app/src/main/res/values/styles.xml      | 11 +++++++++++
 11 files changed, 35 insertions(+), 27 deletions(-)
 create mode 100644 android/app/src/main/res/layout/mtoolbar_default.xml

diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java
index 41d0c102c..243c8566a 100644
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -712,7 +712,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (!TextUtils.isEmpty(appName))
     {
       setTitle(appName);
-      ((MaterialTextView) mPointChooser.findViewById(R.id.title)).setText(appName);
     }
   }
 
diff --git a/android/app/src/main/res/layout-land/fragment_osm_login.xml b/android/app/src/main/res/layout-land/fragment_osm_login.xml
index fdededece..e336c0209 100644
--- a/android/app/src/main/res/layout-land/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout-land/fragment_osm_login.xml
@@ -8,7 +8,7 @@
   android:orientation="vertical">
   <include
     android:id="@+id/toolbar"
-    layout="@layout/toolbar_default" />
+    layout="@layout/mtoolbar_default" />
   <ScrollView
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/activity_fragment_and_toolbar.xml b/android/app/src/main/res/layout/activity_fragment_and_toolbar.xml
index afab22a37..cf2f5e8a5 100644
--- a/android/app/src/main/res/layout/activity_fragment_and_toolbar.xml
+++ b/android/app/src/main/res/layout/activity_fragment_and_toolbar.xml
@@ -5,7 +5,7 @@
               android:orientation="vertical">
 
   <include
-      layout="@layout/toolbar_default"/>
+      layout="@layout/mtoolbar_default"/>
 
   <FrameLayout
       android:id="@+id/fragment_container"
diff --git a/android/app/src/main/res/layout/activity_settings.xml b/android/app/src/main/res/layout/activity_settings.xml
index 28a6d2b24..c527b3401 100644
--- a/android/app/src/main/res/layout/activity_settings.xml
+++ b/android/app/src/main/res/layout/activity_settings.xml
@@ -7,7 +7,7 @@
   android:background="?appBackground">
 
   <include
-    layout="@layout/toolbar_default"/>
+    layout="@layout/mtoolbar_default"/>
 
   <FrameLayout
     android:id="@+id/fragment_container"
diff --git a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
index 043597d86..bb856f584 100644
--- a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
+++ b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
@@ -8,17 +8,17 @@
   android:layout_height="match_parent">
   <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
-    style="@style/MwmWidget.ToolbarStyle"
+    style="@style/MwmWidget.M3.ToolbarStyle"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:theme="@style/MwmWidget.ToolbarTheme">
+    android:layout_height="wrap_content">
     <com.google.android.material.imageview.ShapeableImageView
       android:id="@+id/save"
       android:layout_width="?actionBarSize"
       android:layout_height="?actionBarSize"
       android:scaleType="centerInside"
       android:layout_gravity="end|center_vertical"
-      app:srcCompat="@drawable/ic_done"/>
+      app:srcCompat="@drawable/ic_done"
+      app:tint="?iconTint"/>
   </com.google.android.material.appbar.MaterialToolbar>
   <androidx.core.widget.NestedScrollView
     android:scrollbars="none"
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 d135a7f9f..9ea6958dc 100644
--- a/android/app/src/main/res/layout/fragment_driving_options.xml
+++ b/android/app/src/main/res/layout/fragment_driving_options.xml
@@ -6,7 +6,7 @@
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <include layout="@layout/toolbar_default"/>
+  <include layout="@layout/mtoolbar_default"/>
   <LinearLayout
     android:layout_marginTop="@dimen/margin_half_double_plus"
     android:orientation="horizontal"
diff --git a/android/app/src/main/res/layout/fragment_edit_bookmark.xml b/android/app/src/main/res/layout/fragment_edit_bookmark.xml
index cc0789539..9f5eb4d76 100644
--- a/android/app/src/main/res/layout/fragment_edit_bookmark.xml
+++ b/android/app/src/main/res/layout/fragment_edit_bookmark.xml
@@ -7,13 +7,12 @@
   android:background="?appBackground">
   <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
-    style="@style/MwmWidget.ToolbarStyle"
+    style="@style/MwmWidget.M3.ToolbarStyle"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:theme="@style/MwmWidget.ToolbarTheme">
+    android:layout_height="wrap_content">
 
       <com.google.android.material.imageview.ShapeableImageView
-        app:tint="@color/image_view"
+        app:tint="?iconTint"
         android:id="@+id/save"
         app:srcCompat="@drawable/ic_done"
         android:layout_width="?actionBarSize"
diff --git a/android/app/src/main/res/layout/fragment_osm_login.xml b/android/app/src/main/res/layout/fragment_osm_login.xml
index 8da778e30..03a017de8 100644
--- a/android/app/src/main/res/layout/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout/fragment_osm_login.xml
@@ -8,7 +8,7 @@
   android:orientation="vertical">
   <include
     android:id="@+id/toolbar"
-    layout="@layout/toolbar_default" />
+    layout="@layout/mtoolbar_default" />
   <ScrollView
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/mtoolbar_default.xml b/android/app/src/main/res/layout/mtoolbar_default.xml
new file mode 100644
index 000000000..9ba60a26a
--- /dev/null
+++ b/android/app/src/main/res/layout/mtoolbar_default.xml
@@ -0,0 +1,8 @@
+<?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.M3.ToolbarStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?attr/actionBarSize" />
diff --git a/android/app/src/main/res/layout/position_chooser.xml b/android/app/src/main/res/layout/position_chooser.xml
index 44fe7d07e..74a42ac36 100644
--- a/android/app/src/main/res/layout/position_chooser.xml
+++ b/android/app/src/main/res/layout/position_chooser.xml
@@ -8,24 +8,15 @@
 
   <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar_point_chooser"
-    style="@style/MwmWidget.ToolbarStyle"
+    style="@style/MwmWidget.M3.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="end|center_vertical"
-    android:theme="@style/MwmWidget.ToolbarTheme"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
-
-      <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/margin_half"
-        android:text="@string/editor_add_select_location"
-        android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"/>
-    </com.google.android.material.appbar.MaterialToolbar>
-
+    app:layout_constraintTop_toTopOf="parent"
+    app:title="@string/editor_add_select_location"
+    app:titleMargin="@dimen/margin_half"/>
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index a414bb5a3..5054d8b1b 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -368,4 +368,15 @@
         <item name="cornerSizeTopLeft">50%</item>
         <item name="cornerSizeTopRight">50%</item>
     </style>
+
+    <style name="MwmWidget.M3.ToolbarStyle" parent="Widget.Material3.Toolbar">
+        <item name="android:background">?appBackground</item>
+        <item name="android:displayOptions">homeAsUp|showTitle</item>
+        <item name="contentInsetStart">0dp</item>
+        <item name="buttonGravity">center_vertical</item>
+    </style>
+
+    <style name="MwmTheme.M3.ToolbarTheme" parent="ThemeOverlay.Material3.Dark.ActionBar">
+        <item name="android:gravity">center_vertical</item>
+    </style>
 </resources>