All episodes and new episodes no longer have a drawer item

12 files changed, 9 insertions, 24 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index 50b11a15b..befe142cc 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -7,7 +7,6 @@ import android.content.res.TypedArray;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.preference.PreferenceManager;
-import androidx.appcompat.app.AlertDialog;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,33 +15,28 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-
+import androidx.appcompat.app.AlertDialog;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.widget.IconTextView;
-
-import org.apache.commons.lang3.ArrayUtils;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.fragment.AddFeedFragment;
-import de.danoeh.antennapod.fragment.AllEpisodesFragment;
 import de.danoeh.antennapod.fragment.DownloadsFragment;
 import de.danoeh.antennapod.fragment.EpisodesFragment;
-import de.danoeh.antennapod.fragment.NewEpisodesFragment;
 import de.danoeh.antennapod.fragment.PlaybackHistoryFragment;
 import de.danoeh.antennapod.fragment.QueueFragment;
 import de.danoeh.antennapod.fragment.SubscriptionFragment;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.apache.commons.lang3.ArrayUtils;
 
 /**
  * BaseAdapter for the navigation drawer
@@ -112,7 +106,7 @@ public class NavListAdapter extends BaseAdapter
 
     private Drawable getDrawable(String tag) {
         Activity context = activity.get();
-        if(context == null) {
+        if (context == null) {
             return null;
         }
         int icon;
@@ -120,15 +114,9 @@ public class NavListAdapter extends BaseAdapter
             case QueueFragment.TAG:
                 icon = R.attr.stat_playlist;
                 break;
-            case NewEpisodesFragment.TAG:
-                icon = R.attr.ic_new;
-                break;
             case EpisodesFragment.TAG:
                 icon = R.attr.feed;
                 break;
-            case AllEpisodesFragment.TAG:
-                icon = R.attr.feed;
-                break;
             case DownloadsFragment.TAG:
                 icon = R.attr.av_download;
                 break;
diff --git a/app/src/main/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml
index 1332b5263..d63252b58 100644
--- a/app/src/main/res/layout/nav_listitem.xml
+++ b/app/src/main/res/layout/nav_listitem.xml
@@ -24,7 +24,7 @@
         android:layout_marginStart="@dimen/listitem_icon_leftpadding"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
-        tools:src="@drawable/ic_new_releases_white_24dp"
+        tools:src="@drawable/ic_file_download_grey600_24dp"
         tools:background="@android:color/holo_green_dark"/>
 
 
diff --git a/core/src/main/res/drawable-hdpi/ic_new_releases_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_new_releases_grey600_24dp.png
deleted file mode 100644
index 2aa5de2ad..000000000
--- a/core/src/main/res/drawable-hdpi/ic_new_releases_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png
deleted file mode 100644
index 8f109572b..000000000
--- a/core/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_new_releases_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_new_releases_grey600_24dp.png
deleted file mode 100644
index 4b3ffdbdc..000000000
--- a/core/src/main/res/drawable-mdpi/ic_new_releases_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png
deleted file mode 100644
index c5bb20f49..000000000
--- a/core/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_new_releases_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_new_releases_grey600_24dp.png
deleted file mode 100644
index a2bb4d1b8..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_new_releases_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png
deleted file mode 100644
index e78b002f2..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_new_releases_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_new_releases_grey600_24dp.png
deleted file mode 100644
index 79507d800..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_new_releases_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png
deleted file mode 100644
index a4dbba8ae..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 392365314..aa93398f5 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -29,7 +29,6 @@
     <attr name="ic_folder" format="reference"/>
     <attr name="type_video" format="reference"/>
     <attr name="dragview_background" format="reference"/>
-    <attr name="ic_new" format="reference"/>
     <attr name="ic_history" format="reference"/>
     <attr name="ic_settings_playback" format="reference"/>
     <attr name="ic_settings" format="reference"/>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 6eb72a8be..9f72c9f6f 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -43,7 +43,6 @@
         <item name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
         <item name="nav_drawer_background">@color/white</item>
         <item name="drawer_activated_color">@color/highlight_light</item>
-        <item name="ic_new">@drawable/ic_new_releases_grey600_24dp</item>
         <item name="ic_history">@drawable/ic_history_grey600_24dp</item>
         <item name="ic_folder">@drawable/ic_folder_grey600_24dp</item>
         <item name="ic_settings_playback">@drawable/ic_av_play_dark_24dp</item>
@@ -119,7 +118,6 @@
         <item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
         <item name="nav_drawer_background">@color/nav_drawer_background_dark</item>
         <item name="drawer_activated_color">@color/nav_drawer_highlighted_dark</item>
-        <item name="ic_new">@drawable/ic_new_releases_white_24dp</item>
         <item name="ic_history">@drawable/ic_history_white_24dp</item>
         <item name="ic_folder">@drawable/ic_folder_white_24dp</item>
         <item name="ic_settings_playback">@drawable/ic_av_play_white_24dp</item>