diff options
| -rw-r--r-- | app/build.gradle | 2 | ||||
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java | 35 | ||||
| -rw-r--r-- | app/src/main/res/xml/preferences_storage.xml | 13 | ||||
| -rw-r--r-- | core/src/main/res/values/strings.xml | 1 |
4 files changed, 23 insertions, 28 deletions
diff --git a/app/build.gradle b/app/build.gradle index 466d36e56..41aacc13c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -177,7 +177,7 @@ dependencies { implementation "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion" implementation 'com.github.mfietz:fyydlin:v0.4.1' - implementation 'com.github.ByteHamster:SearchPreference:v1.0.8' + implementation 'com.github.ByteHamster:SearchPreference:v1.2.5' implementation "org.awaitility:awaitility:$awaitilityVersion" androidTestImplementation "com.jayway.android.robotium:robotium-solo:$robotiumSoloVersion" diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java index ed6c1698a..a157a2cfa 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -581,31 +581,24 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc config.setFragmentContainerViewId(R.id.content); config.setBreadcrumbsEnabled(true); - config.index() - .addBreadcrumb(getTitleOfPage(R.xml.preferences_user_interface)) - .addFile(R.xml.preferences_user_interface); - config.index() - .addBreadcrumb(getTitleOfPage(R.xml.preferences_playback)) - .addFile(R.xml.preferences_playback); - config.index() - .addBreadcrumb(getTitleOfPage(R.xml.preferences_network)) - .addFile(R.xml.preferences_network); - config.index() - .addBreadcrumb(getTitleOfPage(R.xml.preferences_storage)) - .addFile(R.xml.preferences_storage); - config.index() + config.index(R.xml.preferences_user_interface) + .addBreadcrumb(getTitleOfPage(R.xml.preferences_user_interface)); + config.index(R.xml.preferences_playback) + .addBreadcrumb(getTitleOfPage(R.xml.preferences_playback)); + config.index(R.xml.preferences_network) + .addBreadcrumb(getTitleOfPage(R.xml.preferences_network)); + config.index(R.xml.preferences_storage) + .addBreadcrumb(getTitleOfPage(R.xml.preferences_storage)); + config.index(R.xml.preferences_autodownload) .addBreadcrumb(getTitleOfPage(R.xml.preferences_network)) .addBreadcrumb(R.string.automation) - .addBreadcrumb(getTitleOfPage(R.xml.preferences_autodownload)) - .addFile(R.xml.preferences_autodownload); - config.index() + .addBreadcrumb(getTitleOfPage(R.xml.preferences_autodownload)); + config.index(R.xml.preferences_gpodder) .addBreadcrumb(getTitleOfPage(R.xml.preferences_integrations)) - .addBreadcrumb(getTitleOfPage(R.xml.preferences_gpodder)) - .addFile(R.xml.preferences_gpodder); - config.index() + .addBreadcrumb(getTitleOfPage(R.xml.preferences_gpodder)); + config.index(R.xml.preferences_flattr) .addBreadcrumb(getTitleOfPage(R.xml.preferences_integrations)) - .addBreadcrumb(getTitleOfPage(R.xml.preferences_flattr)) - .addFile(R.xml.preferences_flattr); + .addBreadcrumb(getTitleOfPage(R.xml.preferences_flattr)); } public PreferenceFragmentCompat openScreen(int preferences, AppCompatActivity activity) { diff --git a/app/src/main/res/xml/preferences_storage.xml b/app/src/main/res/xml/preferences_storage.xml index 989bb68d7..9f394ad12 100644 --- a/app/src/main/res/xml/preferences_storage.xml +++ b/app/src/main/res/xml/preferences_storage.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> + xmlns:search="http://schemas.android.com/apk/com.bytehamster.lib.preferencesearch"> <Preference android:title="@string/choose_data_directory" @@ -26,11 +26,11 @@ android:summary="@string/pref_favorite_keeps_episodes_sum" android:title="@string/pref_favorite_keeps_episodes_title"/> <SwitchPreference - android:defaultValue="false" - android:enabled="true" - android:key="prefDeleteRemovesFromQueue" - android:summary="@string/pref_delete_removes_from_queue_sum" - android:title="@string/pref_delete_removes_from_queue_title"/> + android:defaultValue="false" + android:enabled="true" + android:key="prefDeleteRemovesFromQueue" + android:summary="@string/pref_delete_removes_from_queue_sum" + android:title="@string/pref_delete_removes_from_queue_title"/> <PreferenceCategory android:title="@string/import_export_pref"> <Preference @@ -44,6 +44,7 @@ android:title="@string/html_export_label"/> <Preference android:key="importExport" + search:keywords="@string/import_export_search_keywords" android:title="@string/import_export"/> </PreferenceCategory> </PreferenceScreen> diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index dd6053b5d..374cd7360 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -331,6 +331,7 @@ <string name="automation">Automation</string> <string name="download_pref_details">Details</string> <string name="import_export_pref">Import/Export</string> + <string name="import_export_search_keywords">backup, restore</string> <string name="appearance">Appearance</string> <string name="external_elements">External elements</string> <string name="interruptions">Interruptions</string> |