From 35fdf3e3b0d9ffc4e75fd13746436e678fbeb17a Mon Sep 17 00:00:00 2001 From: tom5079 Date: Thu, 21 Apr 2022 16:49:13 +0900 Subject: [PATCH] Update PreferenceFragments to comply with updated library --- .../pupil/ui/fragment/ManageStorageFragment.kt | 4 +--- .../xyz/quaver/pupil/ui/fragment/SettingsFragment.kt | 12 ++++-------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt b/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt index 55d8bb62..5a2ffb8b 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt @@ -61,12 +61,10 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc initPreferences() } - override fun onPreferenceClick(preference: Preference?): Boolean { + override fun onPreferenceClick(preference: Preference): Boolean { val context = context ?: return false with(preference) { - this ?: return false - when (key) { "delete_cache" -> { val dir = File(context.cacheDir, "imageCache") diff --git a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt index a2066834..97706f8b 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt @@ -80,10 +80,8 @@ class SettingsFragment : } } - override fun onPreferenceClick(preference: Preference?): Boolean { + override fun onPreferenceClick(preference: Preference): Boolean { with (preference) { - this ?: return false - when (key) { "app_version" -> { checkUpdate(activity as SettingsActivity, true) @@ -122,10 +120,8 @@ class SettingsFragment : return true } - override fun onPreferenceChange(preference: Preference?, newValue: Any?): Boolean { + override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean { with (preference) { - this ?: return false - when (key) { "tag_translation" -> { updateTranslations() @@ -163,7 +159,7 @@ class SettingsFragment : when (key) { "proxy" -> { - summary = context?.let { getProxyInfo().type.name } + summary = context.let { getProxyInfo().type.name } } "download_folder" -> { summary = FileX(context, Preferences.get("download_folder")).canonicalPath @@ -300,7 +296,7 @@ class SettingsFragment : } "oss" -> { setOnPreferenceClickListener { - context?.startActivity(Intent(context, OssLicensesMenuActivity::class.java)) + context.startActivity(Intent(context, OssLicensesMenuActivity::class.java)) true } }