feat: add navigation back button on Setting screen

plateaukao · Apr 23, 2022 · 0cad5da · 0cad5da
1 parent 58c3e1b
commit 0cad5da
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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