From 2d83b39c27a32f51776dac14b032a72e0c3fbef8 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Fri, 16 Aug 2013 14:39:54 -0400
Subject: added move to top to individual items in the episode queue.  Move to
 bottom coming soon.

---
 res/menu/feeditem.xml  | 6 +++++-
 res/values/strings.xml | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/menu/feeditem.xml b/res/menu/feeditem.xml
index 09b7fa6b0..2d952d3c3 100644
--- a/res/menu/feeditem.xml
+++ b/res/menu/feeditem.xml
@@ -67,6 +67,10 @@
         android:showAsAction="collapseActionView"
         android:title="@string/support_label">
     </item>
-    
+    <item
+        android:id="@+id/move_to_top_item"
+        android:showAsAction="collapseActionView"
+        android:title="@string/move_to_top_label">
+    </item>
 
 </menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b3f9975cb..5fb778825 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -250,5 +250,6 @@
     <string name="folder_not_empty_dialog_title">Folder is not empty</string>
     <string name="folder_not_empty_dialog_msg">The folder you have selected is not empty. Media downloads and other files will be placed directly in this folder. Continue anyway?</string>
     <string name="set_to_default_folder">Choose default folder</string>
+    <string name="move_to_top_label">Move to top</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From b886c38308a4e7ff9ab733e52b3703962d789fbf Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Fri, 16 Aug 2013 15:19:56 -0400
Subject: * updated code to reuse existing function for moving items in the
 queue * added 'move to bottom'

---
 res/menu/feeditem.xml  | 5 +++++
 res/values/strings.xml | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/menu/feeditem.xml b/res/menu/feeditem.xml
index 2d952d3c3..644b71081 100644
--- a/res/menu/feeditem.xml
+++ b/res/menu/feeditem.xml
@@ -72,5 +72,10 @@
         android:showAsAction="collapseActionView"
         android:title="@string/move_to_top_label">
     </item>
+    <item
+        android:id="@+id/move_to_bottom_item"
+        android:showAsAction="collapseActionView"
+        android:title="@string/move_to_bottom_label">
+    </item>
 
 </menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5fb778825..7b45a7201 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -127,6 +127,8 @@
     <string name="organize_queue_label">Organize queue</string>
     <string name="undo">Undo</string>
     <string name="removed_from_queue">Item removed</string>
+    <string name="move_to_top_label">Move to top</string>
+    <string name="move_to_bottom_label">Move to bottom</string>
 
     <!-- Flattr -->
     <string name="flattr_auth_label">Flattr sign-in</string>
@@ -250,6 +252,5 @@
     <string name="folder_not_empty_dialog_title">Folder is not empty</string>
     <string name="folder_not_empty_dialog_msg">The folder you have selected is not empty. Media downloads and other files will be placed directly in this folder. Continue anyway?</string>
     <string name="set_to_default_folder">Choose default folder</string>
-    <string name="move_to_top_label">Move to top</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From e1fc800d088a4b150deb3aff072cda7af8da8ca7 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Mon, 9 Sep 2013 21:29:53 -0400
Subject: Moved move to top/bottom menu options to EpisodesFragement from
 FeedItemMenuHandler so that we can ensure the user was actually in the
 'Queue' dropdown when they opened the menu.  Also, move to top now only shows
 up if the item isn't already at the top, similarly, for move to bottom, it
 only shows up if the item isn't already at the bottom.

---
 res/menu/feeditem.xml | 10 ----------
 res/values/ids.xml    |  2 ++
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'res')

diff --git a/res/menu/feeditem.xml b/res/menu/feeditem.xml
index 644b71081..505de1d4a 100644
--- a/res/menu/feeditem.xml
+++ b/res/menu/feeditem.xml
@@ -67,15 +67,5 @@
         android:showAsAction="collapseActionView"
         android:title="@string/support_label">
     </item>
-    <item
-        android:id="@+id/move_to_top_item"
-        android:showAsAction="collapseActionView"
-        android:title="@string/move_to_top_label">
-    </item>
-    <item
-        android:id="@+id/move_to_bottom_item"
-        android:showAsAction="collapseActionView"
-        android:title="@string/move_to_bottom_label">
-    </item>
 
 </menu>
\ No newline at end of file
diff --git a/res/values/ids.xml b/res/values/ids.xml
index 5356cd119..c1d80d375 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -15,6 +15,8 @@
     <item name="organize_queue_item" type="id"/>
     <item name="drag_handle" type="id"/>
     <item name="skip_episode_item" type="id"/>
+    <item name="move_to_top_item" type="id"/>
+    <item name="move_to_bottom_item" type="id"/>
     <item name="image_disk_cache_key" type="id"/>
     <item name="imageloader_key" type="id"/>
     <item name="notification_gpodnet_sync_error" type="id"/>
-- 
cgit v1.2.3