From 449730f39af9c28f57ce32e8a5da6360b00a7783 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 settings

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 android/app/src/main/res/layout/activity_settings.xml  | 2 +-
 android/app/src/main/res/layout/fragment_osm_login.xml | 2 +-
 android/app/src/main/res/layout/mtoolbar_default.xml   | 8 ++++++++
 android/app/src/main/res/values/styles.xml             | 7 +++++++
 4 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 android/app/src/main/res/layout/mtoolbar_default.xml

diff --git a/android/app/src/main/res/layout/activity_settings.xml b/android/app/src/main/res/layout/activity_settings.xml
index 4df7f04a2..00a4cee60 100644
--- a/android/app/src/main/res/layout/activity_settings.xml
+++ b/android/app/src/main/res/layout/activity_settings.xml
@@ -6,7 +6,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/fragment_osm_login.xml b/android/app/src/main/res/layout/fragment_osm_login.xml
index 69cc6c800..b3359f536 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/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 4810df6cf..0695bc803 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -396,4 +396,11 @@
         <item name="cornerSizeTopLeft">50%</item>
         <item name="cornerSizeTopRight">50%</item>
     </style>
+
+    <style name="MwmWidget.M3.ToolbarStyle" parent="Widget.Material3.Toolbar">
+        <item name="android:background">?android:attr/colorBackground</item>
+        <item name="android:displayOptions">homeAsUp|showTitle</item>
+        <item name="contentInsetStart">0dp</item>
+        <item name="buttonGravity">center_vertical</item>
+    </style>
 </resources>