hardcoresushi/DroidFS
2
2
Fork 3
Code Issues 12 Pull Requests 1 Releases 24 Activity

Settings fragments navigation fix

Browse Source
This commit is contained in:
Hardcore Sushi 2020-08-29 21:20:15 +02:00
parent 06efdb61c3
commit 9c31576b97
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/sushi/hardcore/droidfs/SettingsActivity.kt
View File

@ -1,9 +1,8 @@
package sushi.hardcore.droidfs package sushi.hardcore.droidfs
import android.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
import android.view.MenuItem
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.preference.Preference import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceFragmentCompat
import com.jaredrummler.android.colorpicker.ColorPreferenceCompat import com.jaredrummler.android.colorpicker.ColorPreferenceCompat
@ -11,7 +10,6 @@ import kotlinx.android.synthetic.main.toolbar.*
import sushi.hardcore.droidfs.widgets.SimpleActionPreference import sushi.hardcore.droidfs.widgets.SimpleActionPreference
import sushi.hardcore.droidfs.widgets.ThemeColor import sushi.hardcore.droidfs.widgets.ThemeColor
class SettingsActivity : BaseActivity(), PreferenceFragmentCompat.OnPreferenceStartFragmentCallback { class SettingsActivity : BaseActivity(), PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
@ -20,11 +18,10 @@ class SettingsActivity : BaseActivity(), PreferenceFragmentCompat.OnPreferenceSt
setSupportActionBar(toolbar) setSupportActionBar(toolbar)
supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayHomeAsUpEnabled(true)
val screen = intent.extras?.getString("screen") ?: "main" val screen = intent.extras?.getString("screen") ?: "main"
val fragment: Fragment val fragment = if (screen == "UnsafeFeaturesSettingsFragment") {
fragment = if (screen == "UnsafeFeaturesSettingsFragment") {
UnsafeFeaturesSettingsFragment() UnsafeFeaturesSettingsFragment()
} else { } else {
SettingsFragment() MainSettingsFragment()
} }
supportFragmentManager supportFragmentManager
.beginTransaction() .beginTransaction()
@ -32,7 +29,17 @@ class SettingsActivity : BaseActivity(), PreferenceFragmentCompat.OnPreferenceSt
.commit() .commit()
} }
class SettingsFragment : PreferenceFragmentCompat() { override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when (item.itemId){
android.R.id.home -> {
onBackPressed() //return to the previous fragment rather than the activity
true
}
else -> super.onOptionsItemSelected(item)
}
}
class MainSettingsFragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.root_preferences, rootKey) setPreferencesFromResource(R.xml.root_preferences, rootKey)
ThemeColor.tintPreferenceIcons(preferenceScreen, ThemeColor.getThemeColor(requireContext())) ThemeColor.tintPreferenceIcons(preferenceScreen, ThemeColor.getThemeColor(requireContext()))