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

Disable usfExpose when disabling usfBackground

Browse Source
This commit is contained in:
Matéo Duparc 2024-07-24 17:31:36 +02:00
parent e9b67bd9c4
commit 6c0e20c68e
Signed by: hardcoresushi
GPG Key ID: AFE384344A45E13A
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,25 +177,32 @@ class SettingsActivity : BaseActivity() {
val switchExpose = findPreference<SwitchPreference>("usf_expose")!!
val switchSafWrite = findPreference<SwitchPreference>("usf_saf_write")!!
fun updateView(usfOpen: Boolean? = null, usfBackground: Boolean? = null, usfExpose: Boolean? = null) {
val usfBackground = usfBackground ?: switchBackground.isChecked
switchKeepOpen.isEnabled = usfBackground
switchExpose.isEnabled = usfBackground
switchSafWrite.isEnabled = usfOpen ?: switchExternalOpen.isChecked || (usfBackground && usfExpose ?: switchExpose.isChecked)
fun onUsfBackgroundChanged(usfBackground: Boolean) {
fun updateSwitchPreference(switch: SwitchPreference) = with (switch) {
isChecked = isChecked && usfBackground
isEnabled = usfBackground
onPreferenceChangeListener?.onPreferenceChange(switch, isChecked)
}
updateSwitchPreference(switchKeepOpen)
updateSwitchPreference(switchExpose)
}
onUsfBackgroundChanged(switchBackground.isChecked)
fun updateSafWrite(usfOpen: Boolean? = null, usfExpose: Boolean? = null) {
switchSafWrite.isEnabled = usfOpen ?: switchExternalOpen.isChecked || usfExpose ?: switchExpose.isChecked
}
updateSafWrite()
updateView()
switchBackground.setOnPreferenceChangeListener { _, checked ->
updateView(usfBackground = checked as Boolean)
switchKeepOpen.isChecked = switchKeepOpen.isChecked && checked
onUsfBackgroundChanged(checked as Boolean)
true
}
switchExternalOpen.setOnPreferenceChangeListener { _, checked ->
updateView(usfOpen = checked as Boolean)
updateSafWrite(usfOpen = checked as Boolean)
true
}
switchExpose.setOnPreferenceChangeListener { _, checked ->
updateView(usfExpose = checked as Boolean)
updateSafWrite(usfExpose = checked as Boolean)
VolumeProvider.notifyRootsChanged(requireContext())
true
}

3
app/src/main/java/sushi/hardcore/droidfs/add_volume/SelectPathFragment.kt
View File

@ -258,9 +258,8 @@ class SelectPathFragment: Fragment() {
.setPositiveButton(R.string.ok, null)
.show()
} else {
binding.editVolumeName.setText(path)
inputViewModel.showEditText = true
updateUi(path)
binding.editVolumeName.setText(path)
}
}