diff options
| author | Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de> | 2015-03-28 10:59:07 +0100 |
|---|---|---|
| committer | Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de> | 2015-04-05 22:11:19 +0200 |
| commit | 67cc7c98857b3fa0897ab96b2b87f52d99e4de2f (patch) | |
| tree | 6bcccf0a230c161bed1bba47d6f785b4c249f847 /core/src/main/res/values | |
| parent | a8d434a803d8b5dc7d4bc51c50a0a6a2627c456c (diff) | |
| download | AntennaPod-67cc7c98857b3fa0897ab96b2b87f52d99e4de2f.zip | |
Sync episode actions with gpodder, smart mark as played
* Create episode actions when episodes are downloaded, played, deleted and marked as read
* Sync (download and upload) episode actions
* MediaPlayerActivity deletes almost completely played episode on close
* Improved parsing of datetime strings
* Smart mark as played can be disabled or set in the preferences
Diffstat (limited to 'core/src/main/res/values')
| -rw-r--r-- | core/src/main/res/values/arrays.xml | 9 | ||||
| -rw-r--r-- | core/src/main/res/values/strings.xml | 10 |
2 files changed, 16 insertions, 3 deletions
diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml index 9b9079021..48ab40d61 100644 --- a/core/src/main/res/values/arrays.xml +++ b/core/src/main/res/values/arrays.xml @@ -1,6 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <resources> + <string-array name="smart_mark_as_played_values"> + <item>off</item> + <item>15</item> + <item>30</item> + <item>45</item> + <item>60</item> + </string-array> + + <string-array name="seek_delta_values"> <item>5</item> <item>10</item> diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 186651224..bdb3ad606 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -98,9 +98,9 @@ <string name="stream_label">Stream</string> <string name="remove_label">Remove</string> <string name="remove_episode_lable">Remove episode</string> - <string name="mark_read_label">Mark as read</string> - <string name="mark_unread_label">Mark as unread</string> - <string name="marked_as_read_label">Marked as read</string> + <string name="mark_read_label">Mark as played</string> + <string name="mark_unread_label">Mark as unplayed</string> + <string name="marked_as_read_label">Marked as played</string> <string name="add_to_queue_label">Add to Queue</string> <string name="remove_from_queue_label">Remove from Queue</string> <string name="visit_website_label">Visit Website</string> @@ -220,6 +220,8 @@ <string name="pref_followQueue_sum">Jump to next queue item when playback completes</string> <string name="pref_auto_delete_sum">Delete episode when playback completes</string> <string name="pref_auto_delete_title">Auto Delete</string> + <string name="pref_smart_mark_as_played_sum">Mark episodes as played even if less than a certain amount of seconds of playing time is still left</string> + <string name="pref_smart_mark_as_played_title">Smart mark as played</string> <string name="playback_pref">Playback</string> <string name="network_pref">Network</string> <string name="pref_autoUpdateIntervall_title">Update interval</string> @@ -277,6 +279,8 @@ <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> + <!-- Auto-Flattr dialog --> <string name="auto_flattr_enable">Enable automatic flattring</string> |