diff options
Diffstat (limited to 'app/src/main')
10 files changed, 26 insertions, 27 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java index 8d3a70542..8e232a17f 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java @@ -27,20 +27,18 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<EpisodeItemV private final WeakReference<MainActivity> mainActivityRef; private final ItemAccess itemAccess; - private final boolean showOnlyNewEpisodes; private FeedItem selectedItem; - public AllEpisodesRecycleAdapter(MainActivity mainActivity, ItemAccess itemAccess, boolean showOnlyNewEpisodes) { + public AllEpisodesRecycleAdapter(MainActivity mainActivity, ItemAccess itemAccess) { super(); this.mainActivityRef = new WeakReference<>(mainActivity); this.itemAccess = itemAccess; - this.showOnlyNewEpisodes = showOnlyNewEpisodes; } @NonNull @Override - public EpisodeItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public EpisodeItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { EpisodeItemViewHolder viewHolder = new EpisodeItemViewHolder(mainActivityRef.get(), parent); viewHolder.dragHandle.setVisibility(View.GONE); return viewHolder; @@ -63,6 +61,7 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<EpisodeItemV } }); holder.itemView.setOnCreateContextMenuListener(this); + holder.hideSeparatorIfNecessary(); } @Nullable diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java index ec1425a35..c9cf07621 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java @@ -54,6 +54,7 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter { FeedItem item1 = (FeedItem) v.getTag(); itemAccess.onFeedItemSecondaryAction(item1); }); + holder.hideSeparatorIfNecessary(); return holder.itemView; } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java index c1413b6db..f2fbe0770 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java @@ -63,6 +63,7 @@ public class FeedItemlistAdapter extends BaseAdapter { if (item.getMedia() != null && item.getMedia().isCurrentlyPlaying()) { currentlyPlayingItem = position; } + holder.hideSeparatorIfNecessary(); return holder.itemView; } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java index 88dac34ca..d629df4fa 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java @@ -84,6 +84,8 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<EpisodeItemViewHo } }); holder.itemView.setOnCreateContextMenuListener(this); + holder.isInQueue.setVisibility(View.GONE); + holder.hideSeparatorIfNecessary(); } @Nullable diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java index e4276b3b9..edcc566f2 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java @@ -39,11 +39,6 @@ public class AllEpisodesFragment extends EpisodesListFragment { } @Override - protected boolean showOnlyNewEpisodes() { - return false; - } - - @Override protected String getPrefName() { return PREF_NAME; } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java index 385e69b63..03ba2af58 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java @@ -93,10 +93,6 @@ public abstract class EpisodesListFragment extends Fragment { private LinearLayoutManager layoutManager; protected TextView txtvInformation; - boolean showOnlyNewEpisodes() { - return false; - } - String getPrefName() { return DEFAULT_PREF_NAME; } @@ -364,7 +360,7 @@ public abstract class EpisodesListFragment extends Fragment { */ private void createRecycleAdapter(RecyclerView recyclerView, EmptyViewHandler emptyViewHandler) { MainActivity mainActivity = (MainActivity) getActivity(); - listAdapter = new AllEpisodesRecycleAdapter(mainActivity, itemAccess, showOnlyNewEpisodes()); + listAdapter = new AllEpisodesRecycleAdapter(mainActivity, itemAccess); listAdapter.setHasStableIds(true); recyclerView.setAdapter(listAdapter); emptyViewHandler.updateAdapter(listAdapter); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java index d29b5ed20..70150a915 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java @@ -32,11 +32,6 @@ public class FavoriteEpisodesFragment extends EpisodesListFragment { private static final String PREF_NAME = "PrefFavoriteEpisodesFragment"; @Override - protected boolean showOnlyNewEpisodes() { - return true; - } - - @Override protected String getPrefName() { return PREF_NAME; } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java index 1320fa8e8..21e2800e6 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java @@ -28,11 +28,6 @@ public class NewEpisodesFragment extends EpisodesListFragment { private static final String PREF_NAME = "PrefNewEpisodesFragment"; @Override - protected boolean showOnlyNewEpisodes() { - return true; - } - - @Override protected String getPrefName() { return PREF_NAME; } diff --git a/app/src/main/java/de/danoeh/antennapod/view/EpisodeItemViewHolder.java b/app/src/main/java/de/danoeh/antennapod/view/EpisodeItemViewHolder.java index 94ea80931..6fb3c9d86 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/EpisodeItemViewHolder.java +++ b/app/src/main/java/de/danoeh/antennapod/view/EpisodeItemViewHolder.java @@ -49,13 +49,14 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder private final TextView position; private final TextView duration; private final TextView size; - private final TextView isNew; - private final ImageView isInQueue; + public final TextView isNew; + public final ImageView isInQueue; private final ImageView isVideo; - private final ImageView isFavorite; + public final ImageView isFavorite; private final ProgressBar progressBar; public final ImageButton butSecondary; private final MainActivity activity; + private final TextView separatorIcons; private FeedItem item; @@ -80,6 +81,7 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder isNew = itemView.findViewById(R.id.statusUnread); isFavorite = itemView.findViewById(R.id.isFavorite); size = itemView.findViewById(R.id.size); + separatorIcons = itemView.findViewById(R.id.separatorIcons); itemView.setTag(this); } @@ -189,4 +191,16 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder position.setText(Converter.getDurationStringLong(event.getPosition())); duration.setText(Converter.getDurationStringLong(event.getDuration())); } + + /** + * Hides the separator dot between icons and text if there are no icons. + */ + public void hideSeparatorIfNecessary() { + boolean hasIcons = isNew.getVisibility() == View.VISIBLE + || isInQueue.getVisibility() == View.VISIBLE + || isVideo.getVisibility() == View.VISIBLE + || isFavorite.getVisibility() == View.VISIBLE + || isNew.getVisibility() == View.VISIBLE; + separatorIcons.setVisibility(hasIcons ? View.VISIBLE : View.GONE); + } } diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml index 3d9043caa..09dbc8908 100644 --- a/app/src/main/res/layout/feeditemlist_item.xml +++ b/app/src/main/res/layout/feeditemlist_item.xml @@ -103,6 +103,7 @@ android:id="@+id/ivInPlaylist"/> <TextView + android:id="@+id/separatorIcons" style="@style/AntennaPod.TextView.ListItemSecondaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" |