From 17e61335db73dd36473693dfe941587039302180 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Sat, 19 May 2018 12:44:35 -0700
Subject: #2652 (part of): Expose keep in-progress at front as a preference (in
 Playback > Queue section)

---
 core/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'core/src/main/res/values')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 6541524fb..cf6bc620d 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -456,6 +456,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_queueKeepInProgressAtFront_title">Keep In-progress Episode at Front</string>
+    <string name="pref_queueKeepInProgressAtFront_sum">If the episode at front is in-progress, i.e., you have listened to part of it, keep it at the front of the queue.</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>
-- 
cgit v1.2.3


From 52521ecddb7d7e66e5e132def7341d451c1dbee2 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Mon, 28 Oct 2019 12:40:56 -0700
Subject: #2652 the UI of a new setting enqueue location - replaced existing
 enqueue at front - the option after current episode will replace Keep
 In-Progress in Queue that was in the PR (30f104f4).

---
 core/src/main/res/values/arrays.xml  | 13 +++++++++++++
 core/src/main/res/values/strings.xml |  9 +++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'core/src/main/res/values')

diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
index 2dd985d6a..3a6a45e6d 100644
--- a/core/src/main/res/values/arrays.xml
+++ b/core/src/main/res/values/arrays.xml
@@ -93,6 +93,19 @@
         <item>@string/episode_cleanup_never</item>
     </string-array>
 
+    <string-array name="enqueue_location_options">
+        <item>@string/enqueue_location_back</item>
+        <item>@string/enqueue_location_front</item>
+        <item>@string/enqueue_location_after_current</item>
+    </string-array>
+
+    <string-array name="enqueue_location_values">
+        <!-- MUST be the same as UserPreferences.EnqueueLocation enum -->
+        <item>BACK</item>
+        <item>FRONT</item>
+        <item>AFTER_CURRENTLY_PLAYING</item>
+    </string-array>
+
     <string-array name="episode_cleanup_values">
         <item>-1</item>
         <item>0</item>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index cf6bc620d..19fc3a81c 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -454,10 +454,11 @@
     <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_queueKeepInProgressAtFront_title">Keep In-progress Episode at Front</string>
-    <string name="pref_queueKeepInProgressAtFront_sum">If the episode at front is in-progress, i.e., you have listened to part of it, keep it at the front of the queue.</string>
+    <string name="pref_enqueue_location_title">Enqueue Location</string>
+    <string name="pref_enqueue_location_sum">Add episodes to: %1$s.</string>
+    <string name="enqueue_location_back">back of the queue</string>
+    <string name="enqueue_location_front">front of the queue</string>
+    <string name="enqueue_location_after_current">after current episode</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>
-- 
cgit v1.2.3


From bddd2bfa2e02577112203044b3653d028cd55cd5 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Mon, 28 Oct 2019 14:26:10 -0700
Subject: enqueue location: use the new 3-value settings

---
 core/src/main/res/values/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'core/src/main/res/values')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 19fc3a81c..b8187a404 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -455,10 +455,10 @@
     <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_enqueue_location_title">Enqueue Location</string>
-    <string name="pref_enqueue_location_sum">Add episodes to: %1$s.</string>
-    <string name="enqueue_location_back">back of the queue</string>
-    <string name="enqueue_location_front">front of the queue</string>
-    <string name="enqueue_location_after_current">after current episode</string>
+    <string name="pref_enqueue_location_sum">Add episodes to: %1$s</string>
+    <string name="enqueue_location_back">Back</string>
+    <string name="enqueue_location_front">Front</string>
+    <string name="enqueue_location_after_current">After current episode</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>
-- 
cgit v1.2.3