From d09e4595a6f42efe89ed814a3a203ad5cc3290ba Mon Sep 17 00:00:00 2001
From: watson1982 <112817572+watson1982@users.noreply.github.com>
Date: Mon, 21 Aug 2023 18:30:54 +0800
Subject: [PATCH] HistoryAdapter

---
 .../tvbox/osc/ui/adapter/CollectAdapter.java  | 22 +++++++++++++------
 .../tvbox/osc/ui/adapter/HistoryAdapter.java  | 10 +++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/ui/adapter/CollectAdapter.java b/app/src/main/java/com/github/tvbox/osc/ui/adapter/CollectAdapter.java
index fdd7fbff..e46190bc 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/adapter/CollectAdapter.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/adapter/CollectAdapter.java
@@ -2,6 +2,7 @@ package com.github.tvbox.osc.ui.adapter;
 
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -9,9 +10,11 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.github.tvbox.osc.R;
 import com.github.tvbox.osc.api.ApiConfig;
+import com.github.tvbox.osc.bean.SourceBean;
 import com.github.tvbox.osc.cache.VodCollect;
 import com.github.tvbox.osc.picasso.RoundTransformation;
 import com.github.tvbox.osc.util.DefaultConfig;
+import com.github.tvbox.osc.util.HawkConfig;
 import com.github.tvbox.osc.util.MD5;
 import com.squareup.picasso.Picasso;
 
@@ -26,17 +29,22 @@ public class CollectAdapter extends BaseQuickAdapter<VodCollect, BaseViewHolder>
 
     @Override
     protected void convert(BaseViewHolder helper, VodCollect item) {
+    	// takagen99: Add Delete Mode
+        FrameLayout tvDel = helper.getView(R.id.delFrameLayout);
+        if (HawkConfig.hotVodDelete) {
+            tvDel.setVisibility(View.VISIBLE);
+        } else {
+            tvDel.setVisibility(View.GONE);
+        }
+        
         helper.setVisible(R.id.tvLang, false);
         helper.setVisible(R.id.tvArea, false);
         helper.setVisible(R.id.tvNote, false);
-        TextView tvYear = helper.getView(R.id.tvYear);
-        if (ApiConfig.get().getSource(item.sourceKey)!=null) {
-            tvYear.setText(ApiConfig.get().getSource(item.sourceKey).getName());
-            tvYear.setVisibility(View.VISIBLE);
-        } else {
-            tvYear.setVisibility(View.GONE);
-        }
         helper.setText(R.id.tvName, item.name);
+        TextView tvYear = helper.getView(R.id.tvYear);
+        SourceBean source = ApiConfig.get().getSource(item.sourceKey);
+        tvYear.setText(source!=null?source.getName():"");
+        
         ImageView ivThumb = helper.getView(R.id.ivThumb);
         //由于部分电视机使用glide报错
         if (!TextUtils.isEmpty(item.pic)) {
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java b/app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java
index b9c95b87..d7022829 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java
@@ -2,6 +2,7 @@ package com.github.tvbox.osc.ui.adapter;
 
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -12,6 +13,7 @@ import com.github.tvbox.osc.api.ApiConfig;
 import com.github.tvbox.osc.bean.VodInfo;
 import com.github.tvbox.osc.picasso.RoundTransformation;
 import com.github.tvbox.osc.util.DefaultConfig;
+import com.github.tvbox.osc.util.HawkConfig;
 import com.github.tvbox.osc.util.MD5;
 import com.squareup.picasso.Picasso;
 
@@ -31,6 +33,14 @@ public class HistoryAdapter extends BaseQuickAdapter<VodInfo, BaseViewHolder> {
 
     @Override
     protected void convert(BaseViewHolder helper, VodInfo item) {
+    	// takagen99: Add Delete Mode
+        FrameLayout tvDel = helper.getView(R.id.delFrameLayout);
+        if (HawkConfig.hotVodDelete) {
+            tvDel.setVisibility(View.VISIBLE);
+        } else {
+            tvDel.setVisibility(View.GONE);
+        }
+    
         TextView tvYear = helper.getView(R.id.tvYear);
         /*if (item.year <= 0) {
             tvYear.setVisibility(View.GONE);