diff options
author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-08-02 13:11:59 -0400 |
---|---|---|
committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-08-02 13:11:59 -0400 |
commit | ab68619aaceb545533bf8efd7faec500935270f5 (patch) | |
tree | 30b244a3a66be349581e3bac3e1da4c5a7039a73 /core/src/main/res/values | |
parent | 83bf67a771593ddd8150c97b505c98a641596942 (diff) | |
parent | 5f0ddbc15d68d82e85c41156d2873231ac32b986 (diff) | |
download | AntennaPod-ab68619aaceb545533bf8efd7faec500935270f5.zip |
Merge pull request #1043 from mfietz/glide
Glide
Diffstat (limited to 'core/src/main/res/values')
-rw-r--r-- | core/src/main/res/values/arrays.xml | 16 | ||||
-rw-r--r-- | core/src/main/res/values/colors.xml | 1 | ||||
-rw-r--r-- | core/src/main/res/values/strings.xml | 20 | ||||
-rw-r--r-- | core/src/main/res/values/styles.xml | 4 |
4 files changed, 35 insertions, 6 deletions
diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml index 59b522cf5..8f1268993 100644 --- a/core/src/main/res/values/arrays.xml +++ b/core/src/main/res/values/arrays.xml @@ -168,4 +168,20 @@ <item>not_downloaded</item> </string-array> + <string-array name="image_cache_size_options"> + <item>20 MiB</item> + <item>50 MiB</item> + <item>100 MiB</item> + <item>250 MiB</item> + <item>500 MiB</item> + </string-array> + + <string-array name="image_cache_size_values"> + <item>20</item> + <item>50</item> + <item>100</item> + <item>250</item> + <item>500</item> + </string-array> + </resources> diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml index e558a5c4e..bc0521dcd 100644 --- a/core/src/main/res/values/colors.xml +++ b/core/src/main/res/values/colors.xml @@ -3,6 +3,7 @@ <color name="white">#FFFFFF</color> <color name="gray">#808080</color> + <color name="light_gray">#bfbfbf</color> <color name="black">#000000</color> <color name="bright_blue">#33B5E5</color> <color name="ics_gray">#858585</color> diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index a692dbc73..23c58d16f 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -335,12 +335,12 @@ <string name="pref_persistNotify_sum">Keep notification and lockscreen controls when playback is paused.</string> <string name="pref_showDownloadReport_title">Show Download Report</string> <string name="pref_showDownloadReport_sum">If downloads fail, generate a report that shows the details of the failure.</string> - <string name="pref_expand_notify_unsupport_toast">Android versions before 4.1 do not support expanded notifications.</string> <string name="pref_queueAddToFront_sum">Add new episodes to the front of the queue.</string> <string name="pref_queueAddToFront_title">Enqueue at Front</string> <string name="pref_smart_mark_as_played_disabled">Disabled</string> - + <string name="pref_image_cache_size_title">Image Cache Size</string> + <string name="pref_image_cache_size_sum">Size of the disk cache for images.</string> <!-- Auto-Flattr dialog --> <string name="auto_flattr_enable">Enable automatic flattring</string> @@ -384,9 +384,18 @@ <string name="sleep_timer_label">Sleep timer</string> <string name="time_left_label">Time left:\u0020</string> <string name="time_dialog_invalid_input">Invalid input, time has to be an integer</string> - <string name="time_unit_seconds">seconds</string> - <string name="time_unit_minutes">minutes</string> - <string name="time_unit_hours">hours</string> + <plurals name="time_unit_seconds"> + <item quantity="one">1 second</item> + <item quantity="other">%d seconds</item> + </plurals> + <plurals name="time_unit_minutes"> + <item quantity="one">1 minute</item> + <item quantity="other">%d minutes</item> + </plurals> + <plurals name="time_unit_hours"> + <item quantity="one">1 hour</item> + <item quantity="other">%d hours</item> + </plurals> <!-- gpodder.net --> <string name="gpodnet_taglist_header">CATEGORIES</string> @@ -435,6 +444,7 @@ <string name="pref_pausePlaybackForFocusLoss_title">Pause for Interruptions</string> <string name="pref_resumeAfterCall_sum">Resume playback after a phone call completes</string> <string name="pref_resumeAfterCall_title">Resume after Call</string> + <string name="pref_restart_required">AnntennaPod has to be restarted for this change to take effect.</string> <!-- Online feed view --> <string name="subscribe_label">Subscribe</string> diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index 8619869c8..85c908f64 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -263,7 +263,9 @@ <style name="BigBlurryBackground"> <item name="android:scaleType">centerCrop</item> - <item name="android:tint">@color/image_readability_tint</item> + <!-- <item name="android:tint">@color/image_readability_tint</item> --> + <!-- Reactivate when Glide's tinting has been fixed for Android 5.x + Remove color filter from ItemlistFragment --> </style> |