diff --git a/app/build.gradle b/app/build.gradle index e6cb2e325..8f48c3a98 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -107,7 +107,6 @@ dependencies { implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.3' implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0' implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.10' - implementation 'com.takisoft.preferencex:preferencex:1.1.0' implementation 'dev.rikka.rikkax.core:core-ktx:1.4.1' implementation 'dev.rikka.rikkax.insets:insets:1.3.0' implementation 'dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0' diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AboutFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AboutFragment.java index 02c6052e4..f3b7929dc 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AboutFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AboutFragment.java @@ -30,7 +30,7 @@ public class AboutFragment extends BasePreferenceFragment { private static final String KEY_CHECK_FOR_UPDATES = "check_for_updates"; @Override - public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) { + public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) { addPreferencesFromResource(R.xml.about_settings); Preference author = findPreference(KEY_AUTHOR); author.setSummary(Html.fromHtml(getString(R.string.settings_about_author_summary).replace('$', '@'))); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.java index d7b4b281e..1b46b68de 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.java @@ -223,7 +223,7 @@ public class AdvancedFragment extends BasePreferenceFragment { }); @Override - public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) { + public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) { addPreferencesFromResource(R.xml.advanced_settings); Preference dumpLogcat = findPreference(KEY_DUMP_LOGCAT); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java index 5d988d1dd..f26c3bcff 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java @@ -23,9 +23,9 @@ import android.os.Bundle; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.preference.Preference; +import androidx.preference.PreferenceFragmentCompat; import com.hippo.ehviewer.ui.SettingsActivity; -import com.takisoft.preferencex.PreferenceFragmentCompat; public class BasePreferenceFragment extends PreferenceFragmentCompat @@ -52,7 +52,7 @@ public class BasePreferenceFragment extends PreferenceFragmentCompat } @Override - public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) { + public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) { } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.java index ae0c10097..79d18f5cf 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.java @@ -59,7 +59,7 @@ public class DownloadFragment extends BasePreferenceFragment { }); @Override - public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) { + public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) { addPreferencesFromResource(R.xml.download_settings); Preference mediaScan = findPreference(Settings.KEY_MEDIA_SCAN); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.java index 40a8857e8..d88c5ee85 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.java @@ -31,7 +31,7 @@ import com.hippo.ehviewer.client.EhTagDatabase; public class EhFragment extends BasePreferenceFragment { @Override - public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) { + public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) { addPreferencesFromResource(R.xml.eh_settings); Preference theme = findPreference(Settings.KEY_THEME); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/PrivacyFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/PrivacyFragment.kt index 08a947d13..ec1136c15 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/PrivacyFragment.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/PrivacyFragment.kt @@ -28,7 +28,7 @@ import com.hippo.ehviewer.ui.scene.SecurityScene.Companion.isAuthenticationSuppo * Created by Mo10 on 2018/2/10. */ class PrivacyFragment : BasePreferenceFragment() { - override fun onCreatePreferencesFix(savedInstanceState: Bundle?, rootKey: String?) { + override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { addPreferencesFromResource(R.xml.privacy_settings) } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/ReadFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/ReadFragment.java index 5cb9c9113..f0d2a01ff 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/ReadFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/ReadFragment.java @@ -25,7 +25,7 @@ import com.hippo.ehviewer.R; public class ReadFragment extends BasePreferenceFragment { @Override - public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) { + public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) { addPreferencesFromResource(R.xml.read_settings); } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/SettingsFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/SettingsFragment.java index 20c217b80..3dc6dd419 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/SettingsFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/SettingsFragment.java @@ -26,7 +26,7 @@ import com.hippo.ehviewer.R; public class SettingsFragment extends BasePreferenceFragment { @Override - public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) { + public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) { addPreferencesFromResource(R.xml.settings_headers); }