8 files changed, 59 insertions, 5 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
index 8517b73a2..9e60f4a4d 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
@@ -535,6 +535,14 @@ public class DBWriter {
         }
     }
 
+    public static Future<?> toggleFavoriteItem(final FeedItem item) {
+        if (item.isTagged(FeedItem.TAG_FAVORITE)) {
+            return removeFavoriteItem(item);
+        } else {
+            return addFavoriteItem(item);
+        }
+    }
+
     public static Future<?> addFavoriteItem(final FeedItem item) {
         return dbExec.submit(() -> {
             final PodDBAdapter adapter = PodDBAdapter.getInstance().open();
diff --git a/core/src/main/res/drawable/ic_mark_played.xml b/core/src/main/res/drawable/ic_mark_played.xml
new file mode 100644
index 000000000..dc0a2bb58
--- /dev/null
+++ b/core/src/main/res/drawable/ic_mark_played.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="?attr/action_icon_color"
+      android:pathData="m19.89 12.43-1.9 1.15c-4.13-1.8-8.31 1.81-8 5.15l-4.3 2.74 0.01-18.05zm-5.45 8.68-2.75-3 1.16-1.16 1.59 1.58 3.59-3.58 1.16 1.41-4.75 4.75"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_mark_unplayed.xml b/core/src/main/res/drawable/ic_mark_unplayed.xml
new file mode 100644
index 000000000..60b07e97f
--- /dev/null
+++ b/core/src/main/res/drawable/ic_mark_unplayed.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="?attr/action_icon_color"
+      android:pathData="m19.89 12.43-1.9 1.15c-4.13-1.8-8.31 1.81-8 5.15l-4.3 2.74 0.01-18.05m7.46 11.99-0.69 0.69 1.82 1.82-1.82 1.82 0.69 0.69 1.82-1.82 1.81 1.82 0.69-0.69-1.82-1.82 1.82-1.82-0.69-0.69-1.81 1.82z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_playlist_remove.xml b/core/src/main/res/drawable/ic_playlist_remove.xml
new file mode 100644
index 000000000..940744924
--- /dev/null
+++ b/core/src/main/res/drawable/ic_playlist_remove.xml
@@ -0,0 +1,8 @@
+<!-- drawable/playlist_remove.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?attr/action_icon_color" android:pathData="M2,6V8H14V6H2M2,10V12H11V10H2M14.17,10.76L12.76,12.17L15.59,15L12.76,17.83L14.17,19.24L17,16.41L19.83,19.24L21.24,17.83L18.41,15L21.24,12.17L19.83,10.76L17,13.59L14.17,10.76M2,14V16H11V14H2Z" />
+</vector>
+\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_remove.xml b/core/src/main/res/drawable/ic_remove.xml
deleted file mode 100644
index da2ea9f1a..000000000
--- a/core/src/main/res/drawable/ic_remove.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/action_icon_color" android:pathData="M19,13H5v-2h14v2z"/>
-</vector>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index baab3be7a..596b1cca2 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -12,4 +12,9 @@
     <attr name="filter_dialog_clear" format="color"/>
     <attr name="filter_dialog_button_background" format="reference"/>
     <attr name="seek_background" format="color" />
+    <attr name="icon_red" format="color" />
+    <attr name="icon_yellow" format="color" />
+    <attr name="icon_green" format="color" />
+    <attr name="icon_purple" format="color" />
+    <attr name="icon_gray" format="color" />
 </resources>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 442f95832..578af2900 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -35,6 +35,14 @@
     <!-- Google Assistant -->
     <string name="app_action_not_found">\"%1$s\" not found</string>
 
+    <!-- SwipeActions -->
+    <string name="swipeactions_label">Swipe Actions</string>
+    <string name="swipeactions_summary">Choose what happens when swiping an episode in a list</string>
+    <string name="swipe_right">Swipe Right</string>
+    <string name="swipe_left">Swipe Left</string>
+    <string name="enable_swipeactions">Enable Swipe Actions for this Screen</string>
+    <string name="change_setting">Change</string>
+
     <!-- Statistics fragment -->
     <string name="total_time_listened_to_podcasts">Total time of episodes played:</string>
     <string name="statistics_details_dialog">%1$d out of %2$d episodes started.\n\nPlayed %3$s out of %4$s.</string>
@@ -195,6 +203,8 @@
     <string name="remove_new_flag_label">Remove \"new\" flag</string>
     <string name="removed_new_flag_label">Removed \"new\" flag</string>
     <string name="mark_read_label">Mark as played</string>
+    <string name="marked_as_played_label">Marked as played</string>
+    <string name="marked_as_unplayed_label">Marked as unplayed</string>
     <string name="mark_read_no_media_label">Mark as read</string>
     <string name="play_this_to_seek_position">To jump to positions, you need to play the episode</string>
     <plurals name="marked_read_batch_label">
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 2f287155f..33ff270b8 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -27,6 +27,11 @@
         <item name="scrollbar_thumb">@drawable/scrollbar_thumb_light</item>
         <item name="filter_dialog_clear">@color/filter_dialog_clear_light</item>
         <item name="filter_dialog_button_background">@drawable/filter_dialog_background_light</item>
+        <item name="icon_red">#CF1800</item>
+        <item name="icon_yellow">#F59F00</item>
+        <item name="icon_green">#008537</item>
+        <item name="icon_purple">#5F1984</item>
+        <item name="icon_gray">#25365A</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
@@ -56,6 +61,11 @@
         <item name="scrollbar_thumb">@drawable/scrollbar_thumb_dark</item>
         <item name="filter_dialog_clear">@color/filter_dialog_clear_dark</item>
         <item name="filter_dialog_button_background">@drawable/filter_dialog_background_dark</item>
+        <item name="icon_red">#CF1800</item>
+        <item name="icon_yellow">#F59F00</item>
+        <item name="icon_green">#008537</item>
+        <item name="icon_purple">#AA55D8</item>
+        <item name="icon_gray">#CDD9E4</item>
     </style>
 
     <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">