summaryrefslogtreecommitdiff
path: root/app/src/main/res/xml
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res/xml')
-rw-r--r--app/src/main/res/xml/feed_settings.xml30
-rw-r--r--app/src/main/res/xml/preferences_autodownload.xml6
-rw-r--r--app/src/main/res/xml/preferences_flattr.xml21
-rw-r--r--app/src/main/res/xml/preferences_integrations.xml8
-rw-r--r--app/src/main/res/xml/preferences_network.xml9
-rw-r--r--app/src/main/res/xml/preferences_playback.xml9
-rw-r--r--app/src/main/res/xml/preferences_storage.xml9
7 files changed, 52 insertions, 40 deletions
diff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml
new file mode 100644
index 000000000..5fd6b2038
--- /dev/null
+++ b/app/src/main/res/xml/feed_settings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <SwitchPreference
+ android:key="keepUpdated"
+ android:title="@string/keep_updated"
+ android:summary="@string/keep_updated_summary"/>
+
+ <Preference
+ android:key="authentication"
+ android:title="@string/authentication_label"
+ android:summary="@string/authentication_descr"/>
+
+ <ListPreference
+ android:entries="@array/spnAutoDeleteItems"
+ android:entryValues="@array/spnAutoDeleteValues"
+ android:title="@string/auto_delete_label"
+ android:key="autoDelete"/>
+
+ <PreferenceCategory android:title="@string/auto_download_settings_label">
+ <SwitchPreference
+ android:key="autoDownload"
+ android:title="@string/auto_download_label"/>
+ <Preference
+ android:key="episodeFilter"
+ android:title="@string/episode_filters_label"
+ android:summary="@string/episode_filters_description"/>
+ </PreferenceCategory>
+</PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_autodownload.xml b/app/src/main/res/xml/preferences_autodownload.xml
index b5e3182f0..a4967c839 100644
--- a/app/src/main/res/xml/preferences_autodownload.xml
+++ b/app/src/main/res/xml/preferences_autodownload.xml
@@ -14,6 +14,7 @@
android:entries="@array/episode_cache_size_entries"
android:key="prefEpisodeCacheSize"
android:title="@string/pref_episode_cache_title"
+ android:summary="@string/pref_episode_cache_summary"
android:entryValues="@array/episode_cache_size_values"
app:useStockLayout="true"/>
<ListPreference
@@ -30,11 +31,6 @@
android:summary="@string/pref_automatic_download_on_battery_sum"
android:defaultValue="true"/>
<SwitchPreference
- android:key="prefEnableAutoDownloadOnMobile"
- android:title="@string/pref_autodl_allow_on_mobile_title"
- android:summary="@string/pref_autodl_allow_on_mobile_sum"
- android:defaultValue="false"/>
- <SwitchPreference
android:key="prefEnableAutoDownloadWifiFilter"
android:title="@string/pref_autodl_wifi_filter_title"
android:summary="@string/pref_autodl_wifi_filter_sum"/>
diff --git a/app/src/main/res/xml/preferences_flattr.xml b/app/src/main/res/xml/preferences_flattr.xml
deleted file mode 100644
index 6b4c38a0b..000000000
--- a/app/src/main/res/xml/preferences_flattr.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android">
-
- <PreferenceScreen
- android:key="pref_flattr_authenticate"
- android:summary="@string/pref_flattr_auth_sum"
- android:title="@string/pref_flattr_auth_title">
- <intent android:action=".activities.FlattrAuthActivity"/>
- </PreferenceScreen>
-
- <Preference
- android:key="prefAutoFlattrPrefs"
- android:summary="@string/pref_auto_flattr_sum"
- android:title="@string/pref_auto_flattr_title"/>
- <Preference
- android:key="prefRevokeAccess"
- android:summary="@string/pref_revokeAccess_sum"
- android:title="@string/pref_revokeAccess_title"/>
-
-</PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_integrations.xml b/app/src/main/res/xml/preferences_integrations.xml
index c0fd299ec..716f6c476 100644
--- a/app/src/main/res/xml/preferences_integrations.xml
+++ b/app/src/main/res/xml/preferences_integrations.xml
@@ -1,12 +1,6 @@
<?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">
-
- <Preference
- android:key="prefFlattrSettings"
- android:title="@string/flattr_label"
- android:summary="@string/flattr_summary" />
+ xmlns:android="http://schemas.android.com/apk/res/android">
<Preference
android:key="prefGpodderSettings"
diff --git a/app/src/main/res/xml/preferences_network.xml b/app/src/main/res/xml/preferences_network.xml
index c37a99465..9d1ce28c6 100644
--- a/app/src/main/res/xml/preferences_network.xml
+++ b/app/src/main/res/xml/preferences_network.xml
@@ -16,10 +16,11 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/download_pref_details">
- <SwitchPreference
- android:defaultValue="false"
- android:enabled="true"
- android:key="prefMobileUpdate"
+ <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
diff --git a/app/src/main/res/xml/preferences_playback.xml b/app/src/main/res/xml/preferences_playback.xml
index 9182df600..d609d3daa 100644
--- a/app/src/main/res/xml/preferences_playback.xml
+++ b/app/src/main/res/xml/preferences_playback.xml
@@ -46,7 +46,7 @@
app:useStockLayout="true"/>
</PreferenceCategory>
- <PreferenceCategory android:title="@string/buttons">
+ <PreferenceCategory android:title="@string/playback_control">
<SwitchPreference
android:defaultValue="false"
android:enabled="true"
@@ -71,6 +71,11 @@
android:key="prefPlaybackSpeedLauncher"
android:summary="@string/pref_playback_speed_sum"
android:title="@string/pref_playback_speed_title"/>
+ <SwitchPreference
+ android:defaultValue="false"
+ android:key="prefPlaybackTimeRespectsSpeed"
+ android:summary="@string/pref_playback_time_respects_speed_sum"
+ android:title="@string/pref_playback_time_respects_speed_title"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/queue_label">
@@ -110,7 +115,7 @@
<PreferenceCategory android:title="@string/media_player">
<ListPreference
- android:defaultValue="sonic"
+ android:defaultValue="exoplayer"
android:entries="@array/media_player_options"
android:key="prefMediaPlayer"
android:title="@string/media_player"
diff --git a/app/src/main/res/xml/preferences_storage.xml b/app/src/main/res/xml/preferences_storage.xml
index fe48cc99c..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"
@@ -25,6 +25,12 @@
android:key="prefFavoriteKeepsEpisode"
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"/>
<PreferenceCategory android:title="@string/import_export_pref">
<Preference
@@ -38,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>