From b15ca14ff3de2899c8fd13b839751191b13fd3a1 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>
---
 .../src/main/res/layout/activity_settings.xml   | 17 +++++++++++------
 .../src/main/res/layout/mtoolbar_default.xml    | 13 +++++++++++++
 2 files changed, 24 insertions(+), 6 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..75031b6cf 100644
--- a/android/app/src/main/res/layout/activity_settings.xml
+++ b/android/app/src/main/res/layout/activity_settings.xml
@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
   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="match_parent"
-  android:orientation="vertical">
+  android:layout_height="match_parent">
 
   <include
-    layout="@layout/toolbar_default"/>
+    layout="@layout/mtoolbar_default"/>
+
+  <androidx.core.widget.NestedScrollView
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
   <FrameLayout
     android:id="@+id/fragment_container"
-    style="@style/MwmWidget.FrameLayout.Elevation"
     android:layout_width="match_parent"
     android:layout_height="match_parent"/>
+    </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
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..9e3aa5060
--- /dev/null
+++ b/android/app/src/main/res/layout/mtoolbar_default.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.AppBarLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize" />
+
+</com.google.android.material.appbar.AppBarLayout>