diff options
author | ByteHamster <ByteHamster@users.noreply.github.com> | 2023-04-15 17:33:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-15 17:33:21 +0200 |
commit | 8396a346707677ce22373a96e905bb1763d5cfb9 (patch) | |
tree | 58e714b91ce072bbba6f361eb694eea2d68d97c6 /app/src/main/res | |
parent | 84e1ff248f6e6c437dd5ecaf8217a7ee6b5c1af5 (diff) | |
download | AntennaPod-8396a346707677ce22373a96e905bb1763d5cfb9.zip |
Replace Network+Storage preferences with Downloads (#6434)
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/xml/preferences.xml | 14 | ||||
-rw-r--r-- | app/src/main/res/xml/preferences_downloads.xml | 70 | ||||
-rw-r--r-- | app/src/main/res/xml/preferences_network.xml | 47 | ||||
-rw-r--r-- | app/src/main/res/xml/preferences_storage.xml | 32 |
4 files changed, 77 insertions, 86 deletions
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 9967d7fd1..24d50cc45 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -22,10 +22,10 @@ android:icon="@drawable/ic_play_24dp" /> <Preference - android:key="prefScreenNetwork" - android:title="@string/network_pref" - android:summary="@string/network_pref_sum" - android:icon="@drawable/ic_network" /> + android:key="prefScreenDownloads" + android:title="@string/downloads_pref" + android:summary="@string/downloads_pref_sum" + android:icon="@drawable/ic_download_black" /> <Preference android:key="prefScreenSynchronization" @@ -34,9 +34,9 @@ android:icon="@drawable/ic_cloud" /> <Preference - android:key="prefScreenStorage" - android:title="@string/storage_pref" - android:summary="@string/storage_sum" + android:key="prefScreenImportExport" + android:title="@string/import_export_pref" + android:summary="@string/import_export_summary" android:icon="@drawable/ic_storage" /> <Preference diff --git a/app/src/main/res/xml/preferences_downloads.xml b/app/src/main/res/xml/preferences_downloads.xml new file mode 100644 index 000000000..865748d20 --- /dev/null +++ b/app/src/main/res/xml/preferences_downloads.xml @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="utf-8"?> +<PreferenceScreen + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:numberpicker="http://schemas.android.com/apk/de.danoeh.antennapod" + xmlns:search="http://schemas.android.com/apk/com.bytehamster.lib.preferencesearch"> + + <Preference + android:title="@string/choose_data_directory" + android:key="prefChooseDataDir"/> + + <PreferenceCategory android:title="@string/automation"> + <de.danoeh.antennapod.preferences.MaterialListPreference + android:entryValues="@array/feed_refresh_interval_values" + android:entries="@array/feed_refresh_interval_entries" + android:key="prefAutoUpdateIntervall" + android:title="@string/feed_refresh_title" + android:summary="@string/feed_refresh_sum" + android:defaultValue="12"/> + <de.danoeh.antennapod.preferences.MaterialListPreference + android:entryValues="@array/globalNewEpisodesActionValues" + android:entries="@array/globalNewEpisodesActionItems" + android:key="prefNewEpisodesAction" + android:title="@string/pref_new_episodes_action_title" + android:summary="@string/pref_new_episodes_action_sum" + android:defaultValue="1"/> + <Preference + android:summary="@string/pref_automatic_download_sum" + android:key="prefAutoDownloadSettings" + android:title="@string/pref_automatic_download_title" + search:ignore="true" /> + <SwitchPreferenceCompat + android:defaultValue="false" + android:enabled="true" + android:key="prefAutoDelete" + android:summary="@string/pref_auto_delete_sum" + android:title="@string/pref_auto_delete_title"/> + <SwitchPreferenceCompat + android:defaultValue="true" + android:enabled="true" + android:key="prefFavoriteKeepsEpisode" + android:summary="@string/pref_favorite_keeps_episodes_sum" + android:title="@string/pref_favorite_keeps_episodes_title"/> + <SwitchPreferenceCompat + 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> + + <PreferenceCategory android:title="@string/download_pref_details"> + <MultiSelectListPreference + android:defaultValue="@array/mobile_update_default_value" + android:entries="@array/mobile_update_entries" + android:entryValues="@array/mobile_update_values" + android:key="prefMobileUpdateTypes" + android:summary="@string/pref_mobileUpdate_sum" + android:title="@string/pref_mobileUpdate_title"/> + <de.danoeh.antennapod.preferences.NumberPickerPreference + android:defaultValue="4" + numberpicker:minValue="1" + numberpicker:maxValue="50" + android:key="prefParallelDownloads" + android:title="@string/pref_parallel_downloads_title"/> + <Preference + android:key="prefProxy" + android:summary="@string/pref_proxy_sum" + android:title="@string/pref_proxy_title"/> + </PreferenceCategory> +</PreferenceScreen> diff --git a/app/src/main/res/xml/preferences_network.xml b/app/src/main/res/xml/preferences_network.xml deleted file mode 100644 index f9cd15e68..000000000 --- a/app/src/main/res/xml/preferences_network.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:numberpicker="http://schemas.android.com/apk/de.danoeh.antennapod" - xmlns:search="http://schemas.android.com/apk/com.bytehamster.lib.preferencesearch"> - <PreferenceCategory android:title="@string/automation"> - <de.danoeh.antennapod.preferences.MaterialListPreference - android:entryValues="@array/feed_refresh_interval_values" - android:entries="@array/feed_refresh_interval_entries" - android:key="prefAutoUpdateIntervall" - android:title="@string/feed_refresh_title" - android:summary="@string/feed_refresh_sum" - android:defaultValue="12"/> - <Preference - android:summary="@string/pref_automatic_download_sum" - android:key="prefAutoDownloadSettings" - android:title="@string/pref_automatic_download_title" - search:ignore="true" /> - <de.danoeh.antennapod.preferences.MaterialListPreference - android:entryValues="@array/globalNewEpisodesActionValues" - android:entries="@array/globalNewEpisodesActionItems" - android:key="prefNewEpisodesAction" - android:title="@string/pref_new_episodes_action_title" - android:summary="@string/pref_new_episodes_action_sum" - android:defaultValue="1"/> - </PreferenceCategory> - - <PreferenceCategory android:title="@string/download_pref_details"> - <MultiSelectListPreference - android:defaultValue="@array/mobile_update_default_value" - android:entries="@array/mobile_update_entries" - android:entryValues="@array/mobile_update_values" - android:key="prefMobileUpdateTypes" - android:summary="@string/pref_mobileUpdate_sum" - android:title="@string/pref_mobileUpdate_title"/> - <de.danoeh.antennapod.preferences.NumberPickerPreference - android:defaultValue="4" - numberpicker:minValue="1" - numberpicker:maxValue="50" - android:key="prefParallelDownloads" - android:title="@string/pref_parallel_downloads_title"/> - <Preference - android:key="prefProxy" - android:summary="@string/pref_proxy_sum" - android:title="@string/pref_proxy_title"/> - </PreferenceCategory> -</PreferenceScreen> diff --git a/app/src/main/res/xml/preferences_storage.xml b/app/src/main/res/xml/preferences_storage.xml deleted file mode 100644 index 89e8c4cf5..000000000 --- a/app/src/main/res/xml/preferences_storage.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:search="http://schemas.android.com/apk/com.bytehamster.lib.preferencesearch"> - - <Preference - android:title="@string/choose_data_directory" - android:key="prefChooseDataDir"/> - <SwitchPreferenceCompat - android:defaultValue="false" - android:enabled="true" - android:key="prefAutoDelete" - android:summary="@string/pref_auto_delete_sum" - android:title="@string/pref_auto_delete_title"/> - <SwitchPreferenceCompat - android:defaultValue="true" - android:enabled="true" - android:key="prefFavoriteKeepsEpisode" - android:summary="@string/pref_favorite_keeps_episodes_sum" - android:title="@string/pref_favorite_keeps_episodes_title"/> - <SwitchPreferenceCompat - 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"/> - <Preference - android:title="@string/import_export_pref" - android:summary="@string/import_export_summary" - android:key="prefImportExport" - search:ignore="true"/> -</PreferenceScreen> |