From 6423f91798ae9edd7bc7689071d05d9c87f748c9 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Thu, 23 Jan 2020 09:13:42 +0800
Subject: [PATCH] up

---
 ...WebDavConfigFragment.kt => BackupConfigFragment.kt} | 10 ++++++----
 .../java/io/legado/app/ui/config/ConfigActivity.kt     |  4 ++--
 ...{pref_config_web_dav.xml => pref_config_backup.xml} |  5 +++++
 3 files changed, 13 insertions(+), 6 deletions(-)
 rename app/src/main/java/io/legado/app/ui/config/{WebDavConfigFragment.kt => BackupConfigFragment.kt} (97%)
 rename app/src/main/res/xml/{pref_config_web_dav.xml => pref_config_backup.xml} (89%)

diff --git a/app/src/main/java/io/legado/app/ui/config/WebDavConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt
similarity index 97%
rename from app/src/main/java/io/legado/app/ui/config/WebDavConfigFragment.kt
rename to app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt
index 446c93f68..d403324fe 100644
--- a/app/src/main/java/io/legado/app/ui/config/WebDavConfigFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt
@@ -31,7 +31,7 @@ import kotlinx.coroutines.Dispatchers.IO
 import org.jetbrains.anko.toast
 import kotlin.coroutines.CoroutineContext
 
-class WebDavConfigFragment : PreferenceFragmentCompat(),
+class BackupConfigFragment : PreferenceFragmentCompat(),
     Preference.OnPreferenceChangeListener,
     CoroutineScope {
     private lateinit var job: Job
@@ -46,14 +46,14 @@ class WebDavConfigFragment : PreferenceFragmentCompat(),
         job = Job()
         fun bindPreferenceSummaryToValue(preference: Preference?) {
             preference?.apply {
-                onPreferenceChangeListener = this@WebDavConfigFragment
+                onPreferenceChangeListener = this@BackupConfigFragment
                 onPreferenceChange(
                     this,
                     context.getPrefString(key)
                 )
             }
         }
-        addPreferencesFromResource(R.xml.pref_config_web_dav)
+        addPreferencesFromResource(R.xml.pref_config_backup)
         findPreference<EditTextPreference>("web_dav_url")?.let {
             it.setOnBindEditTextListener { editText ->
                 ATH.setTint(editText, requireContext().accentColor)
@@ -74,6 +74,7 @@ class WebDavConfigFragment : PreferenceFragmentCompat(),
             }
             bindPreferenceSummaryToValue(it)
         }
+        bindPreferenceSummaryToValue(findPreference(PreferKey.backupPath))
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -115,6 +116,7 @@ class WebDavConfigFragment : PreferenceFragmentCompat(),
 
     override fun onPreferenceTreeClick(preference: Preference?): Boolean {
         when (preference?.key) {
+            PreferKey.backupPath -> selectBackupFolder()
             "web_dav_backup" -> backup()
             "web_dav_restore" -> restore()
             "import_old" -> importOldData()
@@ -206,7 +208,7 @@ class WebDavConfigFragment : PreferenceFragmentCompat(),
                 alert(title = "导入") {
                     message = "是否导入旧版本数据"
                     yesButton {
-                        PermissionsCompat.Builder(this@WebDavConfigFragment)
+                        PermissionsCompat.Builder(this@BackupConfigFragment)
                             .addPermissions(*Permissions.Group.STORAGE)
                             .rationale(R.string.tip_perm_request_storage)
                             .onGranted {
diff --git a/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt b/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt
index 838b5c31d..a79e3f6a9 100644
--- a/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt
@@ -36,9 +36,9 @@ class ConfigActivity : VMBaseActivity<ConfigViewModel>(R.layout.activity_config)
             }
             ConfigViewModel.TYPE_WEB_DAV_CONFIG -> {
                 title_bar.title = getString(R.string.backup_restore)
-                val fTag = "webDavFragment"
+                val fTag = "backupFragment"
                 var configFragment = supportFragmentManager.findFragmentByTag(fTag)
-                if (configFragment == null) configFragment = WebDavConfigFragment()
+                if (configFragment == null) configFragment = BackupConfigFragment()
                 supportFragmentManager.beginTransaction()
                     .replace(R.id.configFrameLayout, configFragment, fTag)
                     .commit()
diff --git a/app/src/main/res/xml/pref_config_web_dav.xml b/app/src/main/res/xml/pref_config_backup.xml
similarity index 89%
rename from app/src/main/res/xml/pref_config_web_dav.xml
rename to app/src/main/res/xml/pref_config_backup.xml
index 0b4a84e09..d70d7145d 100644
--- a/app/src/main/res/xml/pref_config_web_dav.xml
+++ b/app/src/main/res/xml/pref_config_backup.xml
@@ -28,6 +28,11 @@
 
     <io.legado.app.lib.theme.prefs.ATEPreferenceCategory app:iconSpaceReserved="false">
 
+        <androidx.preference.Preference
+            android:key="backupUri"
+            android:title="备份路径"
+            app:iconSpaceReserved="false" />
+
         <androidx.preference.Preference
             android:key="web_dav_backup"
             android:title="备份"