From 0cad5dafa247840be2bbd5543bde00f27d599743 Mon Sep 17 00:00:00 2001
From: Daniel Kao <daniel.kao@gmail.com>
Date: Sat, 23 Apr 2022 16:38:18 +0800
Subject: [PATCH] feat: add navigation back button on Setting screen

---
 app/src/main/AndroidManifest.xml                               | 1 +
 .../java/de/baumann/browser/activity/SettingsActivity.java     | 2 ++
 .../main/java/de/baumann/browser/fragment/SettingsFragment.kt  | 3 +--
 .../java/de/baumann/browser/fragment/UiSettingsFragment.kt     | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1956faf95..083154324 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -131,6 +131,7 @@
         <!-- Settings -->
         <activity
             android:name="de.baumann.browser.activity.SettingsActivity"
+            android:parentActivityName="de.baumann.browser.activity.BrowserActivity"
             android:label="@string/setting_label" />
         <activity
             android:name="de.baumann.browser.activity.Whitelist_AdBlock"
diff --git a/app/src/main/java/de/baumann/browser/activity/SettingsActivity.java b/app/src/main/java/de/baumann/browser/activity/SettingsActivity.java
index c38f80dde..8dbde25d1 100755
--- a/app/src/main/java/de/baumann/browser/activity/SettingsActivity.java
+++ b/app/src/main/java/de/baumann/browser/activity/SettingsActivity.java
@@ -22,6 +22,8 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_settings);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
+        getSupportActionBar().setHomeButtonEnabled(true);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         getSupportFragmentManager()
                 .beginTransaction()
diff --git a/app/src/main/java/de/baumann/browser/fragment/SettingsFragment.kt b/app/src/main/java/de/baumann/browser/fragment/SettingsFragment.kt
index d7a6e4756..4c68e2d4e 100755
--- a/app/src/main/java/de/baumann/browser/fragment/SettingsFragment.kt
+++ b/app/src/main/java/de/baumann/browser/fragment/SettingsFragment.kt
@@ -73,11 +73,10 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
     }
 
     private fun setupPreference(prefName: String, fragment: PreferenceFragmentCompat, tag: String) {
-        findPreference<Preference>(prefName)?.setOnPreferenceClickListener { _ ->
+        findPreference<Preference>(prefName)?.setOnPreferenceClickListener { pref ->
             parentFragmentManager
                     .beginTransaction()
                     .replace(R.id.content_frame, fragment, "data")
-                    .addToBackStack(null)
                     .commit()
             false
         }
diff --git a/app/src/main/java/de/baumann/browser/fragment/UiSettingsFragment.kt b/app/src/main/java/de/baumann/browser/fragment/UiSettingsFragment.kt
index b4e76982f..b23c3aa87 100755
--- a/app/src/main/java/de/baumann/browser/fragment/UiSettingsFragment.kt
+++ b/app/src/main/java/de/baumann/browser/fragment/UiSettingsFragment.kt
@@ -16,6 +16,7 @@ class UiSettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeL
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.preference_ui, rootKey)
+        setHasOptionsMenu(true)
 
         val supportDarkMode = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
         findPreference<ListPreference>("sp_dark_mode")?.isVisible = supportDarkMode