From 622eb262075dc75034df42ed5cb38ff2447225e1 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sat, 2 Mar 2024 00:14:30 +0100
Subject: [PATCH] Settings: show title of section in toolbar.

---
 .../opentracks/settings/MainSettingsFragment.java           | 6 ++++++
 .../de/dennisguse/opentracks/settings/SettingsActivity.java | 5 +++--
 src/main/res/layout/settings.xml                            | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java
index f2fd0bfbf..46d5865b9 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java
@@ -51,6 +51,12 @@ public class MainSettingsFragment extends PreferenceFragmentCompat {
         });
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.menu_settings);
+    }
+
     @Override
     public void onDisplayPreferenceDialog(@NonNull Preference preference) {
         DialogFragment dialogFragment = null;
diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
index 4d2ddbdd5..03b210d56 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
@@ -18,10 +18,10 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity
 
     public static final String EXTRAS_EXPORT_ERROR_MESSAGE = "Export error message";
 
-    private String exportErrorMessage = null;
-
     public static final String FRAGMENT_KEY = "fragmentKey";
 
+    private String exportErrorMessage = null;
+
     private PreferenceFragmentCompat fragment = null;
 
     private SettingsBinding viewBinding;
@@ -43,6 +43,7 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity
         }
 
         setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
+        setSupportActionBar(viewBinding.topAppBar);
 
         getSupportFragmentManager().beginTransaction().replace(R.id.settings_fragment, fragment).commit();
     }
diff --git a/src/main/res/layout/settings.xml b/src/main/res/layout/settings.xml
index e813676a4..d890936b7 100644
--- a/src/main/res/layout/settings.xml
+++ b/src/main/res/layout/settings.xml
@@ -10,6 +10,7 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/top_app_bar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:navigationIcon="@drawable/ic_settings_24dp"