diff options
Diffstat (limited to 'core')
35 files changed, 35 insertions, 3 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java index bad48e4cc..a93012d59 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java @@ -86,7 +86,7 @@ public class UserPreferences { public static final String PREF_ENABLE_AUTODL = "prefEnableAutoDl"; public static final String PREF_ENABLE_AUTODL_ON_BATTERY = "prefEnableAutoDownloadOnBattery"; public static final String PREF_ENABLE_AUTODL_WIFI_FILTER = "prefEnableAutoDownloadWifiFilter"; - private static final String PREF_ENABLE_AUTODL_ON_MOBILE = "prefEnableAutoDownloadOnMobile"; + public static final String PREF_ENABLE_AUTODL_ON_MOBILE = "prefEnableAutoDownloadOnMobile"; private static final String PREF_AUTODL_SELECTED_NETWORKS = "prefAutodownloadSelectedNetworks"; private static final String PREF_PROXY_TYPE = "prefProxyType"; private static final String PREF_PROXY_HOST = "prefProxyHost"; diff --git a/core/src/main/res/drawable-hdpi/ic_poll_box_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_poll_box_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..2ee172a51 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_poll_box_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_poll_box_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_poll_box_white_24dp.png Binary files differnew file mode 100644 index 000000000..3fe2256c7 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_poll_box_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_sd_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_sd_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..2c7c210d3 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_sd_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_sd_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_sd_white_24dp.png Binary files differnew file mode 100644 index 000000000..77fd16301 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_sd_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_swap_vertical_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_swap_vertical_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..cd3508d72 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_swap_vertical_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_swap_vertical_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_swap_vertical_white_24dp.png Binary files differnew file mode 100644 index 000000000..b26af6aac --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_swap_vertical_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_poll_box_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_poll_box_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..6fefa8b8c --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_poll_box_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_poll_box_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_poll_box_white_24dp.png Binary files differnew file mode 100644 index 000000000..cf45cde6d --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_poll_box_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_sd_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_sd_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..81c5f77d9 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_sd_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_sd_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_sd_white_24dp.png Binary files differnew file mode 100644 index 000000000..a012f237c --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_sd_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_swap_vertical_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_swap_vertical_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..c2aeb3b5d --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_swap_vertical_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_swap_vertical_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_swap_vertical_white_24dp.png Binary files differnew file mode 100644 index 000000000..ea4faabdf --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_swap_vertical_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_poll_box_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_poll_box_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..e09b052b9 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_poll_box_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_poll_box_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_poll_box_white_24dp.png Binary files differnew file mode 100644 index 000000000..9ed41f906 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_poll_box_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_sd_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sd_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..c2bc3fa9f --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_sd_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_sd_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sd_white_24dp.png Binary files differnew file mode 100644 index 000000000..76e620405 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_sd_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_swap_vertical_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_swap_vertical_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..c6139c821 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_swap_vertical_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_swap_vertical_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_swap_vertical_white_24dp.png Binary files differnew file mode 100644 index 000000000..c4bee7069 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_swap_vertical_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_poll_box_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_poll_box_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..3d24d9670 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_poll_box_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_poll_box_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_poll_box_white_24dp.png Binary files differnew file mode 100644 index 000000000..3d9f54b6c --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_poll_box_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_sd_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sd_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..7e8fa947e --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_sd_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_sd_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sd_white_24dp.png Binary files differnew file mode 100644 index 000000000..66c74428e --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_sd_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_swap_vertical_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_swap_vertical_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..2d71e15fc --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_swap_vertical_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_swap_vertical_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_swap_vertical_white_24dp.png Binary files differnew file mode 100644 index 000000000..24df5b942 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_swap_vertical_white_24dp.png diff --git a/core/src/main/res/drawable-xxxhdpi/ic_poll_box_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_poll_box_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..c97eba579 --- /dev/null +++ b/core/src/main/res/drawable-xxxhdpi/ic_poll_box_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxxhdpi/ic_poll_box_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_poll_box_white_24dp.png Binary files differnew file mode 100644 index 000000000..54e169d54 --- /dev/null +++ b/core/src/main/res/drawable-xxxhdpi/ic_poll_box_white_24dp.png diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sd_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sd_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..744b2c8f4 --- /dev/null +++ b/core/src/main/res/drawable-xxxhdpi/ic_sd_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sd_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sd_white_24dp.png Binary files differnew file mode 100644 index 000000000..1bee910ed --- /dev/null +++ b/core/src/main/res/drawable-xxxhdpi/ic_sd_white_24dp.png diff --git a/core/src/main/res/drawable-xxxhdpi/ic_swap_vertical_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_swap_vertical_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..631ef6d0a --- /dev/null +++ b/core/src/main/res/drawable-xxxhdpi/ic_swap_vertical_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxxhdpi/ic_swap_vertical_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_swap_vertical_white_24dp.png Binary files differnew file mode 100644 index 000000000..5bf24ac32 --- /dev/null +++ b/core/src/main/res/drawable-xxxhdpi/ic_swap_vertical_white_24dp.png diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml index 5f25796b0..b005d4dc3 100644 --- a/core/src/main/res/values/attrs.xml +++ b/core/src/main/res/values/attrs.xml @@ -12,6 +12,8 @@ <attr name="av_rewind" format="reference"/> <attr name="content_discard" format="reference"/> <attr name="content_new" format="reference"/> + <attr name="storage" format="reference"/> + <attr name="statistics" format="reference"/> <attr name="feed" format="reference"/> <attr name="location_web_site" format="reference"/> <attr name="navigation_accept" format="reference"/> @@ -52,6 +54,8 @@ <attr name="ic_sd_storage" format="reference"/> <attr name="ic_create_new_folder" format="reference"/> <attr name="ic_cast_disconnect" format="reference"/> + <attr name="ic_swap" format="reference"/> + <attr name="master_switch_background" format="color"/> <!-- Used in itemdescription --> <attr name="non_transparent_background" format="reference"/> diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml index 969500928..c9a5b3d6a 100644 --- a/core/src/main/res/values/colors.xml +++ b/core/src/main/res/values/colors.xml @@ -33,4 +33,7 @@ <color name="antennapod_blue">#147BAF</color> + <color name="master_switch_background_light">#DDDDDD</color> + <color name="master_switch_background_dark">#191919</color> + </resources> diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index d199a8764..2ebc2ad77 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -24,6 +24,7 @@ <string name="cancel_download_label">Cancel\nDownload</string> <string name="playback_history_label">Playback History</string> <string name="gpodnet_main_label">gpodder.net</string> + <string name="gpodnet_summary">Synchronize with other devices</string> <string name="gpodnet_auth_label">gpodder.net Login</string> <string name="free_space_label">%1$s free</string> <string name="episode_cache_full_title">Episode cache full</string> @@ -310,8 +311,17 @@ <string name="other_pref">Other</string> <string name="about_pref">About</string> <string name="queue_label">Queue</string> - <string name="services_label">Services</string> + <string name="integrations_label">Integrations</string> <string name="flattr_label">Flattr</string> + <string name="flattr_summary">Micropayment service</string> + <string name="automation">Automation</string> + <string name="download_pref_details">Details</string> + <string name="import_export_pref">Import/Export</string> + <string name="appearance">Appearance</string> + <string name="external_elements">External elements</string> + <string name="interruptions">Interruptions</string> + <string name="buttons">Buttons</string> + <string name="media_player">Media player</string> <string name="pref_episode_cleanup_title">Episode Cleanup</string> <string name="pref_episode_cleanup_summary">Episodes that aren\'t in the queue and aren\'t favorites should be eligible for removal if Auto Download needs space for new episodes</string> <string name="pref_pauseOnDisconnect_sum">Pause playback when headphones or bluetooth are disconnected</string> diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index b74b55334..decfa3b2b 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -12,6 +12,9 @@ <item name="buttonStyle">@style/Widget.AntennaPod.Button</item> <item name="alertDialogTheme">@style/AntennaPod.Dialog.Light</item> <item type="attr" name="action_bar_icon_color">@color/grey600</item> + <item type="attr" name="storage">@drawable/ic_sd_grey600_24dp</item> + <item type="attr" name="ic_swap">@drawable/ic_swap_vertical_grey600_24dp</item> + <item type="attr" name="statistics">@drawable/ic_poll_box_grey600_24dp</item> <item type="attr" name="action_about">@drawable/ic_info_grey600_24dp</item> <item type="attr" name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_grey600_24dp</item> <item type="attr" name="action_search">@drawable/ic_search_grey600_24dp</item> @@ -63,6 +66,7 @@ <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item> <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item> <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item> + <item type="attr" name="master_switch_background">@color/master_switch_background_light</item> </style> <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark"> @@ -76,7 +80,9 @@ <item name="progressBarTheme">@style/ProgressBarDark</item> <item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item> <item type="attr" name="action_bar_icon_color">@color/white</item> - <item type="attr" name="action_about">@drawable/ic_info_white_24dp</item> + <item type="attr" name="storage">@drawable/ic_sd_white_24dp</item> + <item type="attr" name="ic_swap">@drawable/ic_swap_vertical_white_24dp</item> + <item type="attr" name="statistics">@drawable/ic_poll_box_white_24dp</item> <item type="attr" name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_white_24dp</item> <item type="attr" name="action_search">@drawable/ic_search_white_24dp</item> <item type="attr" name="action_stream">@drawable/ic_settings_input_antenna_white_24dp</item> @@ -127,6 +133,7 @@ <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item> <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item> <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item> + <item type="attr" name="master_switch_background">@color/master_switch_background_dark</item> </style> <style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.Base.AntennaPod.Light.NoTitle"> @@ -141,6 +148,9 @@ <item name="colorAccent">@color/holo_blue_light</item> <item name="buttonStyle">@style/Widget.AntennaPod.Button</item> <item name="alertDialogTheme">@style/AntennaPod.Dialog.Light</item> + <item type="attr" name="storage">@drawable/ic_sd_grey600_24dp</item> + <item type="attr" name="ic_swap">@drawable/ic_swap_vertical_grey600_24dp</item> + <item type="attr" name="statistics">@drawable/ic_poll_box_grey600_24dp</item> <item type="attr" name="action_about">@drawable/ic_info_grey600_24dp</item> <item type="attr" name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_grey600_24dp</item> <item type="attr" name="action_search">@drawable/ic_search_grey600_24dp</item> @@ -192,6 +202,7 @@ <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item> <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item> <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item> + <item type="attr" name="master_switch_background">@color/master_switch_background_light</item> </style> <style name="Theme.AntennaPod.Dark.NoTitle" parent="Theme.Base.AntennaPod.Dark.NoTitle"> @@ -206,6 +217,9 @@ <item name="colorControlNormal">@color/white</item> <item name="buttonStyle">@style/Widget.AntennaPod.Button</item> <item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item> + <item type="attr" name="storage">@drawable/ic_sd_white_24dp</item> + <item type="attr" name="ic_swap">@drawable/ic_swap_vertical_white_24dp</item> + <item type="attr" name="statistics">@drawable/ic_poll_box_white_24dp</item> <item type="attr" name="action_about">@drawable/ic_info_white_24dp</item> <item type="attr" name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_white_24dp</item> <item type="attr" name="action_search">@drawable/ic_search_white_24dp</item> @@ -257,6 +271,7 @@ <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item> <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item> <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item> + <item type="attr" name="master_switch_background">@color/master_switch_background_dark</item> </style> <style name="Theme.AntennaPod.Dark.Splash" parent="Theme.AppCompat.NoActionBar"> |
