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 Binary files a/core/src/main/res/drawable-hdpi/ic_new_releases_grey600_24dp.png and /dev/null differ 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 Binary files a/core/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png and /dev/null differ 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 Binary files a/core/src/main/res/drawable-mdpi/ic_new_releases_grey600_24dp.png and /dev/null differ 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 Binary files a/core/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png and /dev/null differ 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 Binary files a/core/src/main/res/drawable-xhdpi/ic_new_releases_grey600_24dp.png and /dev/null differ 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 Binary files a/core/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png and /dev/null differ 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 Binary files a/core/src/main/res/drawable-xxhdpi/ic_new_releases_grey600_24dp.png and /dev/null differ 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 Binary files a/core/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png and /dev/null differ diff --git a/core/src/main/res/drawable/overlay_drawable.xml b/core/src/main/res/drawable/overlay_drawable.xml deleted file mode 100644 index 185ffefc1..000000000 --- a/core/src/main/res/drawable/overlay_drawable.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/src/main/res/drawable/overlay_drawable_dark.xml b/core/src/main/res/drawable/overlay_drawable_dark.xml deleted file mode 100644 index fb78f5633..000000000 --- a/core/src/main/res/drawable/overlay_drawable_dark.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/src/main/res/drawable/overlay_drawable_dark_trueblack.xml b/core/src/main/res/drawable/overlay_drawable_dark_trueblack.xml deleted file mode 100644 index 5f58e8421..000000000 --- a/core/src/main/res/drawable/overlay_drawable_dark_trueblack.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml index 44c79567c..aa93398f5 100644 --- a/core/src/main/res/values/attrs.xml +++ b/core/src/main/res/values/attrs.xml @@ -28,10 +28,7 @@ - - - @@ -61,18 +58,8 @@ - - - - - - - - - - diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index f6c31f652..9f72c9f6f 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -40,14 +40,9 @@ @drawable/ic_share_grey600_24dp @drawable/ic_list_grey600_24dp @drawable/ic_videocam_grey600_24dp - @color/white - @color/overlay_light - @drawable/overlay_drawable @drawable/ic_drag_vertical_grey600_48dp - @color/white @color/white @color/highlight_light - @drawable/ic_new_releases_grey600_24dp @drawable/ic_history_grey600_24dp @drawable/ic_folder_grey600_24dp @drawable/ic_av_play_dark_24dp @@ -77,11 +72,6 @@ @color/highlight_light @style/PreferenceThemeOverlay.v14.Material - - #e5e5e5 - #ffffff - #d2d2d2 - #000000