From a5795a3420a9c0927850a2796faf545ba1ef7dc1 Mon Sep 17 00:00:00 2001
From: Tony Tam <engineer.tonytam@pm.me>
Date: Tue, 7 Apr 2020 00:13:15 -0700
Subject: [PATCH] easy to read sorting options (#4004)

---
 app/src/main/res/menu/queue.xml      | 20 ++++++++++----------
 core/src/main/res/values/strings.xml |  9 +++++++--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml
index f9aae20f7..43702e07f 100644
--- a/app/src/main/res/menu/queue.xml
+++ b/app/src/main/res/menu/queue.xml
@@ -35,10 +35,10 @@
                 <menu>
                     <item
                         android:id="@+id/queue_sort_date_asc"
-                        android:title="@string/sort_old_to_new"/>
+                        android:title="@string/sort_old_new"/>
                     <item
                         android:id="@+id/queue_sort_date_desc"
-                        android:title="@string/sort_new_to_old"/>
+                        android:title="@string/sort_new_old"/>
                 </menu>
             </item>
 
@@ -49,10 +49,10 @@
                 <menu>
                     <item
                         android:id="@+id/queue_sort_duration_asc"
-                        android:title="@string/ascending"/>
+                        android:title="@string/sort_short_long"/>
                     <item
                         android:id="@+id/queue_sort_duration_desc"
-                        android:title="@string/descending"/>
+                        android:title="@string/sort_long_short"/>
                 </menu>
             </item>
 
@@ -63,10 +63,10 @@
                 <menu>
                     <item
                         android:id="@+id/queue_sort_episode_title_asc"
-                        android:title="@string/ascending"/>
+                        android:title="@string/sort_a_z"/>
                     <item
                         android:id="@+id/queue_sort_episode_title_desc"
-                        android:title="@string/descending"/>
+                        android:title="@string/sort_z_a"/>
                 </menu>
             </item>
 
@@ -77,10 +77,10 @@
                 <menu>
                     <item
                         android:id="@+id/queue_sort_feed_title_asc"
-                        android:title="@string/ascending"/>
+                        android:title="@string/sort_a_z"/>
                     <item
                         android:id="@+id/queue_sort_feed_title_desc"
-                        android:title="@string/descending"/>
+                        android:title="@string/sort_z_a"/>
                 </menu>
             </item>
 
@@ -96,10 +96,10 @@
                 <menu>
                     <item
                         android:id="@+id/queue_sort_smart_shuffle_asc"
-                        android:title="@string/sort_old_to_new"/>
+                        android:title="@string/sort_old_new"/>
                     <item
                         android:id="@+id/queue_sort_smart_shuffle_desc"
-                        android:title="@string/sort_new_to_old"/>
+                        android:title="@string/sort_new_old"/>
                 </menu>
             </item>
 
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 8abd70588..3740bda03 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -305,8 +305,6 @@
     <string name="ascending">Ascending</string>
     <string name="descending">Descending</string>
     <string name="clear_queue_confirmation_msg">Please confirm that you want to clear the queue of ALL of the episodes in it</string>
-    <string name="sort_old_to_new">Old to new</string>
-    <string name="sort_new_to_old">New to old</string>
     <string name="time_left_label">Time left:\u0020</string>
 
     <!--  Variable Speed -->
@@ -731,6 +729,13 @@
     <string name="sort_duration_short_long">Duration (Short \u2192 Long)</string>
     <string name="sort_duration_long_short">Duration (Long \u2192 Short)</string>
 
+    <string name="sort_a_z">A \u2192 Z</string>
+    <string name="sort_z_a">Z \u2192 A</string>
+    <string name="sort_new_old">New \u2192 Old</string>
+    <string name="sort_old_new">Old \u2192 New</string>
+    <string name="sort_short_long">Short \u2192 Long</string>
+    <string name="sort_long_short">Long \u2192 Short</string>
+
     <!-- Rating dialog -->
     <string name="rating_title">Like AntennaPod?</string>
     <string name="rating_message">We would appreciate it if you take the time to rate AntennaPod.</string>