diff options
4 files changed, 49 insertions, 24 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java index 5fd38d663..da82d4f8c 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java @@ -103,6 +103,9 @@ public class MainPreferencesFragment extends PreferenceFragmentCompat { .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_network)); config.index(R.xml.preferences_storage) .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_storage)); + config.index(R.xml.preferences_import_export) + .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_storage)) + .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_import_export)); config.index(R.xml.preferences_autodownload) .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_network)) .addBreadcrumb(R.string.automation) diff --git a/app/src/main/res/xml/preferences_import_export.xml b/app/src/main/res/xml/preferences_import_export.xml index 72ca82fd5..6489ca493 100644 --- a/app/src/main/res/xml/preferences_import_export.xml +++ b/app/src/main/res/xml/preferences_import_export.xml @@ -2,17 +2,30 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:search="http://schemas.android.com/apk/com.bytehamster.lib.preferencesearch"> - <Preference - android:key="prefOpmlExport" - android:title="@string/opml_export_label"/> - <Preference - android:key="prefOpmlImport" - android:title="@string/opml_import_label"/> - <Preference - android:key="prefHtmlExport" - android:title="@string/html_export_label"/> - <Preference - android:key="importExport" - search:keywords="@string/import_export_search_keywords" - android:title="@string/import_export"/> + + <PreferenceCategory android:title="@string/opml"> + <Preference + android:key="prefOpmlExport" + android:title="@string/opml_export_label" + android:summary="@string/opml_export_summary"/> + <Preference + android:key="prefOpmlImport" + android:title="@string/opml_import_label" + android:summary="@string/opml_import_summary"/> + </PreferenceCategory> + + <PreferenceCategory android:title="@string/html"> + <Preference + android:key="prefHtmlExport" + android:title="@string/html_export_label" + android:summary="@string/html_export_summary"/> + </PreferenceCategory> + + <PreferenceCategory android:title="@string/database"> + <Preference + android:key="importExport" + search:keywords="@string/import_export_search_keywords" + android:title="@string/import_export" + android:summary="@string/database_export_summary"/> + </PreferenceCategory> </PreferenceScreen> diff --git a/app/src/main/res/xml/preferences_storage.xml b/app/src/main/res/xml/preferences_storage.xml index fbadf865b..18e2abb31 100644 --- a/app/src/main/res/xml/preferences_storage.xml +++ b/app/src/main/res/xml/preferences_storage.xml @@ -33,5 +33,7 @@ android:title="@string/pref_delete_removes_from_queue_title"/> <Preference android:title="@string/import_export_pref" - android:key="prefImportExport"/> + android:summary="@string/import_export_summary" + android:key="prefImportExport" + search:ignore="true"/> </PreferenceScreen> diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 88fa07049..26ed87537 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -544,7 +544,16 @@ <string name="found_in_title_label">Found in title</string> <string name="no_results_for_query">No results were found for \"%1$s\"</string> - <!-- OPML import and export --> + <!-- import and export --> + <string name="import_export_summary">Move subscriptions and queue to another device</string> + <string name="database">Database</string> + <string name="opml">OPML</string> + <string name="html">HTML</string> + <string name="html_export_summary">Show your subscriptions to a friend</string> + <string name="opml_export_summary">Transfer your subscriptions to another podcast app</string> + <string name="opml_import_summary">Import your subscriptions from another podcast app</string> + <string name="database_export_summary">Transfer subscriptions, listened episodes and queue to AntennaPod on another device</string> + <string name="database_import_summary">Import AntennaPod database from another device</string> <string name="opml_import_option">Option %1$d</string> <string name="opml_import_explanation_1">Choose a specific file path from the local filesystem.</string> <string name="opml_import_explanation_3">Many applications like Google Mail, Dropbox, Google Drive and most file managers can <i>open</i> OPML files <i>with</i> AntennaPod.</string> @@ -562,6 +571,13 @@ <string name="export_success_title">Export successful</string> <string name="export_success_sum">The exported file was written to:\n\n%1$s</string> <string name="opml_import_ask_read_permission">Access to external storage is required to read the OPML file</string> + <string name="import_export">Database import/export</string> + <string name="import_export_warning">This experimental function can be used to transfer your subscriptions and played episodes to another device.\n\nExported databases can only be imported when using the same version of AntennaPod. Otherwise, this function will lead to unexpected behavior.\n\nAfter importing, episodes might be displayed as downloaded even though they are not. Just press the play button of the episodes to make AntennaPod detect this.</string> + <string name="label_import">Import</string> + <string name="label_export">Export</string> + <string name="import_select_file">Select file to import</string> + <string name="export_ok">Export successful.</string> + <string name="import_ok">Import successful.\n\nPlease press OK to restart AntennaPod</string> <!-- Sleep timer --> <string name="set_sleeptimer_label">Set sleep timer</string> @@ -755,15 +771,6 @@ <!-- Subscriptions fragment --> <string name="subscription_num_columns">Number of columns</string> - <!-- Database import/export --> - <string name="import_export">Database import/export</string> - <string name="import_export_warning">This experimental function can be used to transfer your subscriptions and played episodes to another device.\n\nExported databases can only be imported when using the same version of AntennaPod. Otherwise, this function will lead to unexpected behavior.\n\nAfter importing, episodes might be displayed as downloaded even though they are not. Just press the play button of the episodes to make AntennaPod detect this.</string> - <string name="label_import">Import</string> - <string name="label_export">Export</string> - <string name="import_select_file">Select file to import</string> - <string name="export_ok">Export successful.</string> - <string name="import_ok">Import successful.\n\nPlease press OK to restart AntennaPod</string> - <!-- Casting --> <string name="cast_media_route_menu_title">Play on…</string> <string name="cast_disconnect_label">Disconnect the cast session</string> |