From 3f774ece85124d7c8429a8fd48d2ea4e9ce1ca28 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 | 37 +++++++++++++++----
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/android/app/src/main/res/layout/activity_settings.xml b/android/app/src/main/res/layout/activity_settings.xml
index 4df7f04a2..09c46191c 100644
--- a/android/app/src/main/res/layout/activity_settings.xml
+++ b/android/app/src/main/res/layout/activity_settings.xml
@@ -1,17 +1,38 @@
 <?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"/>
+  <com.google.android.material.appbar.AppBarLayout
+      android:id="@+id/appbarlayout"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:fitsSystemWindows="true"
+      android:background="?cardBackground">
+
+      <com.google.android.material.appbar.CollapsingToolbarLayout
+          android:id="@+id/collapsingtoolbarlayout"
+          android:layout_width="match_parent"
+          android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
+          app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+          app:expandedTitleGravity="bottom"
+          android:background="?cardBackground">
+
+          <com.google.android.material.appbar.MaterialToolbar
+              android:id="@+id/toolbar"
+              android:layout_width="match_parent"
+              android:layout_height="?attr/actionBarSize"
+              android:elevation="0dp"
+              app:layout_collapseMode="pin" />
+      </com.google.android.material.appbar.CollapsingToolbarLayout>
+  </com.google.android.material.appbar.AppBarLayout>
 
   <FrameLayout
     android:id="@+id/fragment_container"
-    style="@style/MwmWidget.FrameLayout.Elevation"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-</LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>