From d08a9c423ef7122dfbcd55d5f7bcedccc2aea21c Mon Sep 17 00:00:00 2001
From: ByteHamster <ByteHamster@users.noreply.github.com>
Date: Thu, 29 Apr 2021 21:40:41 +0200
Subject: Merge download log+running lists (#5134)

---
 .../view/viewholder/DownloadItemViewHolder.java    | 40 ---------------------
 .../view/viewholder/DownloadLogItemViewHolder.java | 41 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 40 deletions(-)
 delete mode 100644 app/src/main/java/de/danoeh/antennapod/view/viewholder/DownloadItemViewHolder.java
 create mode 100644 app/src/main/java/de/danoeh/antennapod/view/viewholder/DownloadLogItemViewHolder.java

(limited to 'app/src/main/java/de/danoeh/antennapod/view')

diff --git a/app/src/main/java/de/danoeh/antennapod/view/viewholder/DownloadItemViewHolder.java b/app/src/main/java/de/danoeh/antennapod/view/viewholder/DownloadItemViewHolder.java
deleted file mode 100644
index 0e446fb84..000000000
--- a/app/src/main/java/de/danoeh/antennapod/view/viewholder/DownloadItemViewHolder.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package de.danoeh.antennapod.view.viewholder;
-
-import android.content.Context;
-import android.os.Build;
-import android.text.Layout;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.recyclerview.widget.RecyclerView;
-import com.joanzapata.iconify.widget.IconTextView;
-import de.danoeh.antennapod.R;
-
-public class DownloadItemViewHolder extends RecyclerView.ViewHolder {
-    public final View secondaryActionButton;
-    public final ImageView secondaryActionIcon;
-    public final IconTextView icon;
-    public final TextView title;
-    public final TextView type;
-    public final TextView date;
-    public final TextView reason;
-    public final TextView tapForDetails;
-
-    public DownloadItemViewHolder(Context context, ViewGroup parent) {
-        super(LayoutInflater.from(context).inflate(R.layout.downloadlog_item, parent, false));
-        date = itemView.findViewById(R.id.txtvDate);
-        type = itemView.findViewById(R.id.txtvType);
-        icon = itemView.findViewById(R.id.txtvIcon);
-        reason = itemView.findViewById(R.id.txtvReason);
-        tapForDetails = itemView.findViewById(R.id.txtvTapForDetails);
-        secondaryActionButton = itemView.findViewById(R.id.secondaryActionButton);
-        secondaryActionIcon = itemView.findViewById(R.id.secondaryActionIcon);
-        title = itemView.findViewById(R.id.txtvTitle);
-        if (Build.VERSION.SDK_INT >= 23) {
-            title.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);
-        }
-        itemView.setTag(this);
-    }
-}
diff --git a/app/src/main/java/de/danoeh/antennapod/view/viewholder/DownloadLogItemViewHolder.java b/app/src/main/java/de/danoeh/antennapod/view/viewholder/DownloadLogItemViewHolder.java
new file mode 100644
index 000000000..578e1b149
--- /dev/null
+++ b/app/src/main/java/de/danoeh/antennapod/view/viewholder/DownloadLogItemViewHolder.java
@@ -0,0 +1,41 @@
+package de.danoeh.antennapod.view.viewholder;
+
+import android.content.Context;
+import android.os.Build;
+import android.text.Layout;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
+import com.joanzapata.iconify.widget.IconTextView;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.ui.common.CircularProgressBar;
+
+public class DownloadLogItemViewHolder extends RecyclerView.ViewHolder {
+    public final View secondaryActionButton;
+    public final ImageView secondaryActionIcon;
+    public final CircularProgressBar secondaryActionProgress;
+    public final IconTextView icon;
+    public final TextView title;
+    public final TextView status;
+    public final TextView reason;
+    public final TextView tapForDetails;
+
+    public DownloadLogItemViewHolder(Context context, ViewGroup parent) {
+        super(LayoutInflater.from(context).inflate(R.layout.downloadlog_item, parent, false));
+        status = itemView.findViewById(R.id.status);
+        icon = itemView.findViewById(R.id.txtvIcon);
+        reason = itemView.findViewById(R.id.txtvReason);
+        tapForDetails = itemView.findViewById(R.id.txtvTapForDetails);
+        secondaryActionButton = itemView.findViewById(R.id.secondaryActionButton);
+        secondaryActionProgress = itemView.findViewById(R.id.secondaryActionProgress);
+        secondaryActionIcon = itemView.findViewById(R.id.secondaryActionIcon);
+        title = itemView.findViewById(R.id.txtvTitle);
+        if (Build.VERSION.SDK_INT >= 23) {
+            title.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);
+        }
+        itemView.setTag(this);
+    }
+}
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0