From a1f81d4144bacc01ed7f65efc3daaa063c8f32d6 Mon Sep 17 00:00:00 2001
From: Petar Kukolj <petarkukolj3@yahoo.com>
Date: Thu, 29 Nov 2018 21:23:36 +0100
Subject: Add delete option to episode's context menu

This PR makes following changes:

 - Adds delete option to episode's context menus in queue and feed list

 - Adds a storage preference that allows episodes to be automatically removed from queue when they are deleted (by clicking delete in context menu,
or pressing trash can icon on `Completed` tab of `Downloads` page)

 - Adds a test for the aforementioned preference
---
 app/src/main/res/menu/feeditemlist_context.xml | 4 ++++
 app/src/main/res/menu/queue_context.xml        | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'app/src/main/res/menu')

diff --git a/app/src/main/res/menu/feeditemlist_context.xml b/app/src/main/res/menu/feeditemlist_context.xml
index d3ec88bc7..8bfb8f329 100644
--- a/app/src/main/res/menu/feeditemlist_context.xml
+++ b/app/src/main/res/menu/feeditemlist_context.xml
@@ -47,6 +47,10 @@
         android:id="@+id/deactivate_auto_download"
         android:menuCategory="container"
         android:title="@string/deactivate_auto_download" />
+    <item
+        android:id="@+id/remove_item"
+        android:menuCategory="container"
+        android:title="@string/delete_label" />
 
     <item
         android:id="@+id/visit_website_item"
diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml
index e93d808c1..4d6bc67c5 100644
--- a/app/src/main/res/menu/queue_context.xml
+++ b/app/src/main/res/menu/queue_context.xml
@@ -48,6 +48,10 @@
         android:id="@+id/deactivate_auto_download"
         android:menuCategory="container"
         android:title="@string/deactivate_auto_download" />
+    <item
+        android:id="@+id/remove_item"
+        android:menuCategory="container"
+        android:title="@string/delete_label" />
 
     <item
         android:id="@+id/visit_website_item"
-- 
cgit v1.2.3


From 9c43438cbe5f1635453b748197aa7ce58e50d3fb Mon Sep 17 00:00:00 2001
From: Petar Kukolj <petarkukolj3@yahoo.com>
Date: Sun, 2 Dec 2018 00:13:30 +0100
Subject: Make "Delete Removes From Queue" work consistently for all cases

---
 app/src/main/res/menu/feeditemlist_context.xml | 8 ++++----
 app/src/main/res/menu/queue_context.xml        | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'app/src/main/res/menu')

diff --git a/app/src/main/res/menu/feeditemlist_context.xml b/app/src/main/res/menu/feeditemlist_context.xml
index 8bfb8f329..1f4f09faa 100644
--- a/app/src/main/res/menu/feeditemlist_context.xml
+++ b/app/src/main/res/menu/feeditemlist_context.xml
@@ -24,6 +24,10 @@
         android:id="@+id/remove_from_queue_item"
         android:menuCategory="container"
         android:title="@string/remove_from_queue_label" />
+    <item
+        android:id="@+id/remove_item"
+        android:menuCategory="container"
+        android:title="@string/delete_label" />
 
     <item
         android:id="@+id/add_to_favorites_item"
@@ -47,10 +51,6 @@
         android:id="@+id/deactivate_auto_download"
         android:menuCategory="container"
         android:title="@string/deactivate_auto_download" />
-    <item
-        android:id="@+id/remove_item"
-        android:menuCategory="container"
-        android:title="@string/delete_label" />
 
     <item
         android:id="@+id/visit_website_item"
diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml
index 4d6bc67c5..c88620665 100644
--- a/app/src/main/res/menu/queue_context.xml
+++ b/app/src/main/res/menu/queue_context.xml
@@ -26,6 +26,10 @@
         android:id="@+id/remove_from_queue_item"
         android:menuCategory="container"
         android:title="@string/remove_from_queue_label" />
+    <item
+        android:id="@+id/remove_item"
+        android:menuCategory="container"
+        android:title="@string/delete_label" />
 
     <item
         android:id="@+id/add_to_favorites_item"
@@ -48,10 +52,6 @@
         android:id="@+id/deactivate_auto_download"
         android:menuCategory="container"
         android:title="@string/deactivate_auto_download" />
-    <item
-        android:id="@+id/remove_item"
-        android:menuCategory="container"
-        android:title="@string/delete_label" />
 
     <item
         android:id="@+id/visit_website_item"
-- 
cgit v1.2.3