Cleaned up layout

3 files changed, 20 insertions, 11 deletions

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 322b5a489..c1413b6db 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
@@ -51,7 +51,7 @@ public class FeedItemlistAdapter extends BaseAdapter {
     public View getView(final int position, View convertView, ViewGroup parent) {
         EpisodeItemViewHolder holder;
         if (convertView == null) {
-            holder = new EpisodeItemViewHolder(activity);
+            holder = new EpisodeItemViewHolder(activity, parent);
         } else {
             holder = (EpisodeItemViewHolder) convertView.getTag();
         }
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 3aeee1c9f..88dac34ca 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -55,7 +55,7 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<EpisodeItemViewHo
     @NonNull
     @Override
     public EpisodeItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        EpisodeItemViewHolder viewHolder = new EpisodeItemViewHolder(mainActivity.get());
+        EpisodeItemViewHolder viewHolder = new EpisodeItemViewHolder(mainActivity.get(), parent);
         viewHolder.dragHandle.setOnTouchListener((v1, event) -> {
             if (MotionEventCompat.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
                 Log.d(TAG, "startDrag()");
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 1281a53b7..20218c445 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/EpisodeItemViewHolder.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/EpisodeItemViewHolder.java
@@ -5,12 +5,15 @@ import android.os.Build;
 import android.text.Layout;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import androidx.core.view.LayoutInflaterCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.joanzapata.iconify.Iconify;
 import de.danoeh.antennapod.R;
@@ -37,7 +40,7 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder
         implements QueueRecyclerAdapter.ItemTouchHelperViewHolder {
     private static final String TAG = "EpisodeItemViewHolder";
 
-    private final FrameLayout container;
+    private final View container;
     public final ImageView dragHandle;
     private final TextView placeholder;
     private final ImageView cover;
@@ -49,14 +52,15 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder
     private final TextView isNew;
     private final ImageView isInQueue;
     private final ImageView isVideo;
+    private final ImageView isFavorite;
     private final ProgressBar progressBar;
     private final ImageButton butSecondary;
     private final MainActivity activity;
 
     private FeedItem item;
 
-    public EpisodeItemViewHolder(MainActivity activity) {
-        super(View.inflate(activity, R.layout.feeditemlist_item, null));
+    public EpisodeItemViewHolder(MainActivity activity, ViewGroup parent) {
+        super(LayoutInflater.from(activity).inflate(R.layout.feeditemlist_item, parent, false));
         this.activity = activity;
         container = itemView.findViewById(R.id.container);
         dragHandle = itemView.findViewById(R.id.drag_handle);
@@ -67,13 +71,14 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder
             title.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);
         }
         pubDate = itemView.findViewById(R.id.txtvPubDate);
-        position = itemView.findViewById(R.id.txtvProgressLeft);
-        duration = itemView.findViewById(R.id.txtvProgressRight);
+        position = itemView.findViewById(R.id.txtvPosition);
+        duration = itemView.findViewById(R.id.txtvDuration);
         butSecondary = itemView.findViewById(R.id.butSecondaryAction);
         progressBar = itemView.findViewById(R.id.progressBar);
         isInQueue = itemView.findViewById(R.id.ivInPlaylist);
         isVideo = itemView.findViewById(R.id.ivIsVideo);
         isNew = itemView.findViewById(R.id.statusUnread);
+        isFavorite = itemView.findViewById(R.id.isFavorite);
         size = itemView.findViewById(R.id.size);
         itemView.setTag(this);
     }
@@ -94,8 +99,9 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder
         title.setText(item.getTitle());
         title.setText(item.getTitle());
         pubDate.setText(DateUtils.formatAbbrev(activity, item.getPubDate()));
-        isNew.setVisibility(item.isNew() ? View.VISIBLE : View.INVISIBLE);
-        isInQueue.setVisibility(item.isTagged(FeedItem.TAG_QUEUE) ? View.VISIBLE : View.INVISIBLE);
+        isNew.setVisibility(item.isNew() ? View.VISIBLE : View.GONE);
+        isFavorite.setVisibility(item.isTagged(FeedItem.TAG_FAVORITE) ? View.VISIBLE : View.GONE);
+        isInQueue.setVisibility(item.isTagged(FeedItem.TAG_QUEUE) ? View.VISIBLE : View.GONE);
         itemView.setAlpha(item.isPlayed() /*&& makePlayedItemsTransparent*/ ? 0.5f : 1.0f);
 
         if (item.getMedia() != null) {
@@ -116,7 +122,7 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder
     }
 
     private void bind(FeedMedia media) {
-        isVideo.setVisibility(media.getMediaType() == MediaType.VIDEO ? View.VISIBLE : View.INVISIBLE);
+        isVideo.setVisibility(media.getMediaType() == MediaType.VIDEO ? View.VISIBLE : View.GONE);
         duration.setText(Converter.getDurationStringLong(media.getDuration()));
 
         if (media.isCurrentlyPlaying()) {
@@ -126,7 +132,8 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder
         }
 
         final DownloadRequest downloadRequest = DownloadRequester.getInstance().getRequestFor(media);
-        progressBar.setVisibility(View.INVISIBLE);
+        progressBar.setVisibility(View.GONE);
+        position.setVisibility(View.GONE);
         if (downloadRequest != null) {
             position.setText(Converter.byteToString(downloadRequest.getSoFar()));
             if (downloadRequest.getSize() > 0) {
@@ -136,11 +143,13 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder
             }
             progressBar.setProgress(downloadRequest.getProgressPercent());
             progressBar.setVisibility(View.VISIBLE);
+            position.setVisibility(View.VISIBLE);
         } else if (item.getState() == FeedItem.State.PLAYING || item.getState() == FeedItem.State.IN_PROGRESS) {
             if (media.getDuration() > 0) {
                 int progress = (int) (100.0 * media.getPosition() / media.getDuration());
                 progressBar.setProgress(progress);
                 progressBar.setVisibility(View.VISIBLE);
+                position.setVisibility(View.VISIBLE);
                 position.setText(Converter.getDurationStringLong(media.getPosition()));
                 duration.setText(Converter.getDurationStringLong(media.getDuration()));
             }