From 57f95dc536c33661f1ffe9e4824bc79da07f0fab Mon Sep 17 00:00:00 2001 From: kunfei Date: Tue, 10 May 2022 20:22:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{BasePreferenceFragment.kt => PreferenceFragment.kt} | 3 +-- .../io/legado/app/ui/book/read/config/MoreConfigDialog.kt | 4 ++-- .../legado/app/ui/book/read/config/ReadAloudConfigDialog.kt | 4 ++-- .../java/io/legado/app/ui/config/BackupConfigFragment.kt | 4 ++-- .../java/io/legado/app/ui/config/CoverConfigFragment.kt | 4 ++-- .../java/io/legado/app/ui/config/OtherConfigFragment.kt | 4 ++-- .../java/io/legado/app/ui/config/ThemeConfigFragment.kt | 4 ++-- .../java/io/legado/app/ui/config/WelcomeConfigFragment.kt | 4 ++-- app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt | 6 +++--- 9 files changed, 18 insertions(+), 19 deletions(-) rename app/src/main/java/io/legado/app/base/{BasePreferenceFragment.kt => PreferenceFragment.kt} (96%) diff --git a/app/src/main/java/io/legado/app/base/BasePreferenceFragment.kt b/app/src/main/java/io/legado/app/base/PreferenceFragment.kt similarity index 96% rename from app/src/main/java/io/legado/app/base/BasePreferenceFragment.kt rename to app/src/main/java/io/legado/app/base/PreferenceFragment.kt index f444985e3..f2f6e7dda 100644 --- a/app/src/main/java/io/legado/app/base/BasePreferenceFragment.kt +++ b/app/src/main/java/io/legado/app/base/PreferenceFragment.kt @@ -7,7 +7,7 @@ import io.legado.app.ui.widget.prefs.EditTextPreferenceDialog import io.legado.app.ui.widget.prefs.ListPreferenceDialog import io.legado.app.ui.widget.prefs.MultiSelectListPreferenceDialog -abstract class BasePreferenceFragment : PreferenceFragmentCompat() { +abstract class PreferenceFragment : PreferenceFragmentCompat() { private val dialogFragmentTag = "androidx.preference.PreferenceFragment.DIALOG" @@ -59,5 +59,4 @@ abstract class BasePreferenceFragment : PreferenceFragmentCompat() { f.show(parentFragmentManager, dialogFragmentTag) } - } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt index adf6afd12..e2f36191e 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt @@ -9,7 +9,7 @@ import android.widget.LinearLayout import androidx.fragment.app.DialogFragment import androidx.preference.Preference import io.legado.app.R -import io.legado.app.base.BasePreferenceFragment +import io.legado.app.base.PreferenceFragment import io.legado.app.constant.EventBus import io.legado.app.constant.PreferKey import io.legado.app.help.config.ReadBookConfig @@ -67,7 +67,7 @@ class MoreConfigDialog : DialogFragment() { (activity as ReadBookActivity).bottomDialog-- } - class ReadPreferenceFragment : BasePreferenceFragment(), + class ReadPreferenceFragment : PreferenceFragment(), SharedPreferences.OnSharedPreferenceChangeListener { @SuppressLint("RestrictedApi") diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt index b64446039..175ef3211 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt @@ -10,7 +10,7 @@ import androidx.fragment.app.DialogFragment import androidx.preference.ListPreference import androidx.preference.Preference import io.legado.app.R -import io.legado.app.base.BasePreferenceFragment +import io.legado.app.base.PreferenceFragment import io.legado.app.constant.EventBus import io.legado.app.constant.PreferKey import io.legado.app.data.appDb @@ -54,7 +54,7 @@ class ReadAloudConfigDialog : DialogFragment() { .commit() } - class ReadAloudPreferenceFragment : BasePreferenceFragment(), + class ReadAloudPreferenceFragment : PreferenceFragment(), SpeakEngineDialog.CallBack, SharedPreferences.OnSharedPreferenceChangeListener { diff --git a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt index 425651827..7bcf49f43 100644 --- a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt @@ -15,7 +15,7 @@ import androidx.preference.EditTextPreference import androidx.preference.ListPreference import androidx.preference.Preference import io.legado.app.R -import io.legado.app.base.BasePreferenceFragment +import io.legado.app.base.PreferenceFragment import io.legado.app.constant.AppLog import io.legado.app.constant.PreferKey import io.legado.app.help.config.AppConfig @@ -34,7 +34,7 @@ import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.launch import splitties.init.appCtx -class BackupConfigFragment : BasePreferenceFragment(), +class BackupConfigFragment : PreferenceFragment(), SharedPreferences.OnSharedPreferenceChangeListener { private val viewModel by activityViewModels() diff --git a/app/src/main/java/io/legado/app/ui/config/CoverConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/CoverConfigFragment.kt index eca0334dd..695abc806 100644 --- a/app/src/main/java/io/legado/app/ui/config/CoverConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/CoverConfigFragment.kt @@ -7,7 +7,7 @@ import android.os.Bundle import android.view.View import androidx.preference.Preference import io.legado.app.R -import io.legado.app.base.BasePreferenceFragment +import io.legado.app.base.PreferenceFragment import io.legado.app.constant.PreferKey import io.legado.app.lib.dialogs.selector import io.legado.app.lib.theme.primaryColor @@ -16,7 +16,7 @@ import io.legado.app.ui.widget.prefs.SwitchPreference import io.legado.app.utils.* import java.io.FileOutputStream -class CoverConfigFragment : BasePreferenceFragment(), +class CoverConfigFragment : PreferenceFragment(), SharedPreferences.OnSharedPreferenceChangeListener { private val requestCodeCover = 111 diff --git a/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt index 4e7192418..ceb444be0 100644 --- a/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt @@ -10,7 +10,7 @@ import androidx.fragment.app.activityViewModels import androidx.preference.ListPreference import androidx.preference.Preference import io.legado.app.R -import io.legado.app.base.BasePreferenceFragment +import io.legado.app.base.PreferenceFragment import io.legado.app.constant.EventBus import io.legado.app.constant.PreferKey import io.legado.app.databinding.DialogEditTextBinding @@ -26,7 +26,7 @@ import io.legado.app.utils.* import splitties.init.appCtx -class OtherConfigFragment : BasePreferenceFragment(), +class OtherConfigFragment : PreferenceFragment(), SharedPreferences.OnSharedPreferenceChangeListener { private val viewModel by activityViewModels() diff --git a/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt index d143ac8e1..717ec7094 100644 --- a/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt @@ -13,7 +13,7 @@ import android.widget.SeekBar import androidx.preference.Preference import io.legado.app.R import io.legado.app.base.AppContextWrapper -import io.legado.app.base.BasePreferenceFragment +import io.legado.app.base.PreferenceFragment import io.legado.app.constant.AppConst import io.legado.app.constant.EventBus import io.legado.app.constant.PreferKey @@ -33,7 +33,7 @@ import java.io.FileOutputStream @Suppress("SameParameterValue") -class ThemeConfigFragment : BasePreferenceFragment(), +class ThemeConfigFragment : PreferenceFragment(), SharedPreferences.OnSharedPreferenceChangeListener { private val requestCodeBgLight = 121 diff --git a/app/src/main/java/io/legado/app/ui/config/WelcomeConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/WelcomeConfigFragment.kt index 60d205b4c..67ea4f5a5 100644 --- a/app/src/main/java/io/legado/app/ui/config/WelcomeConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/WelcomeConfigFragment.kt @@ -7,7 +7,7 @@ import android.os.Bundle import android.view.View import androidx.preference.Preference import io.legado.app.R -import io.legado.app.base.BasePreferenceFragment +import io.legado.app.base.PreferenceFragment import io.legado.app.constant.PreferKey import io.legado.app.lib.dialogs.selector import io.legado.app.lib.theme.primaryColor @@ -15,7 +15,7 @@ import io.legado.app.model.BookCover import io.legado.app.utils.* import java.io.FileOutputStream -class WelcomeConfigFragment : BasePreferenceFragment(), +class WelcomeConfigFragment : PreferenceFragment(), SharedPreferences.OnSharedPreferenceChangeListener { private val requestWelcomeImage = 221 diff --git a/app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt b/app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt index 92c31c288..94d5f98ba 100644 --- a/app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt @@ -8,7 +8,7 @@ import android.view.View import androidx.preference.Preference import io.legado.app.R import io.legado.app.base.BaseFragment -import io.legado.app.base.BasePreferenceFragment +import io.legado.app.base.PreferenceFragment import io.legado.app.constant.EventBus import io.legado.app.constant.PreferKey import io.legado.app.databinding.FragmentMyConfigBinding @@ -40,7 +40,7 @@ class MyFragment : BaseFragment(R.layout.fragment_my_config) { setSupportToolbar(binding.titleBar.toolbar) val fragmentTag = "prefFragment" var preferenceFragment = childFragmentManager.findFragmentByTag(fragmentTag) - if (preferenceFragment == null) preferenceFragment = PreferenceFragment() + if (preferenceFragment == null) preferenceFragment = MyPreferenceFragment() childFragmentManager.beginTransaction() .replace(R.id.pre_fragment, preferenceFragment, fragmentTag).commit() } @@ -61,7 +61,7 @@ class MyFragment : BaseFragment(R.layout.fragment_my_config) { /** * 配置 */ - class PreferenceFragment : BasePreferenceFragment(), + class MyPreferenceFragment : PreferenceFragment(), SharedPreferences.OnSharedPreferenceChangeListener { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {