From 3281ba77deb7f8b0a31711ee3e81f1eb57c1ea3e Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Tue, 18 Feb 2020 13:18:32 +0100 Subject: [PATCH] All episodes and new episodes no longer have a drawer item --- .../antennapod/adapter/NavListAdapter.java | 28 +++++------------- app/src/main/res/layout/nav_listitem.xml | 2 +- .../ic_new_releases_grey600_24dp.png | Bin 399 -> 0 bytes .../ic_new_releases_white_24dp.png | Bin 381 -> 0 bytes .../ic_new_releases_grey600_24dp.png | Bin 288 -> 0 bytes .../ic_new_releases_white_24dp.png | Bin 277 -> 0 bytes .../ic_new_releases_grey600_24dp.png | Bin 496 -> 0 bytes .../ic_new_releases_white_24dp.png | Bin 464 -> 0 bytes .../ic_new_releases_grey600_24dp.png | Bin 718 -> 0 bytes .../ic_new_releases_white_24dp.png | Bin 679 -> 0 bytes core/src/main/res/values/attrs.xml | 1 - core/src/main/res/values/styles.xml | 2 -- 12 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 core/src/main/res/drawable-hdpi/ic_new_releases_grey600_24dp.png delete mode 100644 core/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png delete mode 100644 core/src/main/res/drawable-mdpi/ic_new_releases_grey600_24dp.png delete mode 100644 core/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png delete mode 100644 core/src/main/res/drawable-xhdpi/ic_new_releases_grey600_24dp.png delete mode 100644 core/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png delete mode 100644 core/src/main/res/drawable-xxhdpi/ic_new_releases_grey600_24dp.png delete mode 100644 core/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png 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 2aa5de2ad74c997d324cde8e5c10db54ec119d3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 399 zcmV;A0dW3_P)&fKZCLe0Nys7F)KSm&(LJ#`ntMzkYM9{8kBh32 zZ&3Dq!Al}2rJe0>ineH@m{6XoCGLzOnhfHs5{W)4(K|$m9osH;M9Hg*qT7fP+x}Y{ zqU4&YmsYez3+nD3)E4!qG+9PXOFpj&VB1Kvh0ke?BP)oJNLc3Uk>)iMh_Of*=k<|j z{8xx}gRd+jMhPh_@#S;9kidSXQfOgY*)S11i-PwyO&99oYy#H0p zh{vy5*xVS>*7V}2?(V0AQcT--7ym}`2;jlbZb!wxW`i8#mid-ld#bTfW`~GU-tOPO trG$Be7Ov zq|?kOCf{FYf@tSV07sw|f;gkvQvaYn*wQh zILG~k;G;Q=jw+qc`-@_tt^7cp(l7eL7gH3F m&m^BbkZffW$Rsx`)ZhTu>bQ@+o7)=z000040_w 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 a2bb4d1b89ad2c9cbc81de33fcf54da1a4bc7bc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 496 zcmVzNz) zznmA&*ZN9)umavuKL7GM4CORpnUf5mwoPrAR?OoF&k+xK#$o2tl8_lV zk0|7n891y0>@x$KRe*J7U>TAvvHN8Q7Mg(xD!^zn&{qZMVFsG201eDQ7ZsqrslFbs zRDkChf7O)Z0ips3_b8KEAK?@(sl*Pa$l|fE~PVXlP^^2pHa*7TkfO+wEcyDcE0~z`@Z2UR{<88fh~wa*86>I z*>48U`F-#T(v(^3=dq{aN9xx^5VpC`$yGSP mKuXfCFJTbJspt&+Uq1kmqrZ(+ul)A_00000WbcEP)D z(wAICA(#FfrL_EFI{*(@L@9kkX%_PUfKBp;=7hXqGj*xU7TyrjSl*G%Ws*5hmb_vT zsTeD7D8)-s@topH7ggxX5mI%CK2%n6=97@VA+cFY4;<$b~j0f#!;jYCJXxJcxU%DaK7O3BYxV zC=vyn2D1R1Bwrz9vKveTu#?PCU>TSPU}@liV3%kI844kvQ&>74^D0o38(6tU;rP$w zLoD2|peQnjD%lvBDW!3$FHjAHVJ38Z4QydsN>By*Nbc}G)1UbB%p)L|2^0RZ?w z1Np-i0PZr6lKO^{EZ`mh>*W_^I7rXfqel+CI1q|@_TNXPSYo2w01YYt0000wc7G>(W<5ihhDNaI22 z@HmC}jur)JzK}mGP9~nC#X*`UWC)FujGJg#kgeB3{JteV`_b|sTlW$_C}<&C92B$* zqBtl%`yv&zhj=PzNXoTH16>VuXhQ~`pykVB(yP!ze!hrvK8HK5p$s0P9Cu2p@Iw>) z#W?;nH2J*mBL?cB%)%uR&N*co?uxwZZ z25KMG#xaA$K>ecWNKbC)xyB6Cntgn-9P^T`G*;#zA01id^1-<`*O^NTvO05Vp(f)v zfsa!VPxdp63M5gk3KN_HpBN8dsho%mLYAb8PafdkjlvSaS15a&Fa=Q#* z_%80tHp)_lt)X(qDJw&YU?bx%LHu+qP{hJlhJ_{EjbKZy(y_FXnv1wlgD1l9)$sa*6_S zkxNYA9D(eil0<{b>?4p_!|lG7FE1A67*VBanDH5 zO;N>lBS9BM4a1FH)O}TQ+7MzaD2OH!Ju2Y~#)80`G7>e4@Dq#%!8Zy>K2C9L8AOISwos%*Tw6-lFcwrrRL~)=y^a}-DgEQ=E4@vavQAXch68*-x7Tc^ ziKrt#omk=U7w3N5WIip)Cbl9KwV1#u{IQ1*2N_O9Jj79$ggr)xqmhi)*y;&x;&?Q} zR&_)VPGXA#q6>xb$67w*5q+3NL;>ue9A()aY3>BkiIlu2v~Qt*Bp@4;`ATRn@esXe zi^W5_Mcf?jbmlG=O+-H~5X3$zOEf6YP69YCCXkohqJZq=kR(Zr`vthX&e - 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 @@ @drawable/ic_drag_vertical_grey600_48dp @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 @@ -119,7 +118,6 @@ @drawable/ic_drag_vertical_white_48dp @color/nav_drawer_background_dark @color/nav_drawer_highlighted_dark - @drawable/ic_new_releases_white_24dp @drawable/ic_history_white_24dp @drawable/ic_folder_white_24dp @drawable/ic_av_play_white_24dp