From fea3082867bcb9b73d3265b9165770c15b66868d Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 28 Jul 2023 14:32:01 +0800
Subject: [PATCH] Optimize vod display style

---
 .../java/com/fongmi/android/tv/ui/fragment/VodFragment.java   | 2 +-
 app/src/main/java/com/fongmi/android/tv/bean/Vod.java         | 4 ++++
 .../java/com/fongmi/android/tv/ui/fragment/TypeFragment.java  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
index dc668af06..1506058c3 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
@@ -151,7 +151,7 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback
 
     private void addVideo(List<Vod> items) {
         if (items.isEmpty()) return;
-        boolean folder = isFolder() || mPages.size() > 0 && items.get(0).isFile();
+        boolean folder = mPages.isEmpty() ? isFolder() : items.get(0).isList();
         if (folder) mAdapter.addAll(mAdapter.size(), items);
         else addGrid(items);
     }
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java
index 912f85d53..714fd696d 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java
@@ -197,6 +197,10 @@ public class Vod {
         return getVodTag().equals("file");
     }
 
+    public boolean isList() {
+        return isFolder() || isFile();
+    }
+
     public String getVodName(String name) {
         if (getVodName().isEmpty()) setVodName(name);
         return getVodName();
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java
index eeb0f1509..db9864d16 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java
@@ -142,7 +142,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac
 
     private void addVideo(List<Vod> items) {
         if (items.isEmpty()) return;
-        boolean folder = isFolder() || mPages.size() > 0 && items.get(0).isFile();
+        boolean folder = mPages.isEmpty() ? isFolder() : items.get(0).isList();
         int viewType = folder ? ViewType.FOLDER : ViewType.GRID;
         if (viewType != mAdapter.getViewType()) setViewType(folder);
         mAdapter.addAll(items);