From 34792d599a1c0bb7e2091d44a06dc05fd6aeae8d Mon Sep 17 00:00:00 2001 From: jhengazuki Date: Sat, 6 Dec 2025 12:24:16 +0800 Subject: [PATCH] Clean code --- .../com/fongmi/android/tv/ui/activity/CollectActivity.java | 2 +- .../java/com/fongmi/android/tv/ui/custom/CustomTitleView.java | 2 +- .../fongmi/android/tv/ui/custom/CustomVerticalGridView.java | 2 +- .../main/java/com/fongmi/android/tv/api/config/VodConfig.java | 4 ++-- .../java/com/fongmi/android/tv/player/extractor/Thunder.java | 2 +- .../com/fongmi/android/tv/ui/fragment/CollectFragment.java | 2 +- app/src/mobile/java/com/fongmi/android/tv/utils/ScanTask.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java index ae1c16b04..b14425471 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java @@ -124,7 +124,7 @@ public class CollectActivity extends BaseActivity { } private void setSites() { - mSites = VodConfig.get().getSites().stream().filter(Site::isSearchable).collect(Collectors.toList()); + mSites = VodConfig.get().getSites().stream().filter(Site::isSearchable).toList(); } private void setPager() { diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomTitleView.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomTitleView.java index b335169dd..223843fe1 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomTitleView.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomTitleView.java @@ -86,7 +86,7 @@ public class CustomTitleView extends AppCompatTextView { } private List getSites() { - return VodConfig.get().getSites().stream().filter(site -> !site.isHide()).collect(Collectors.toList()); + return VodConfig.get().getSites().stream().filter(site -> !site.isHide()).toList(); } public interface Listener extends SiteCallback { diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomVerticalGridView.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomVerticalGridView.java index ad9f6650f..f92027f4c 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomVerticalGridView.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomVerticalGridView.java @@ -52,7 +52,7 @@ public class CustomVerticalGridView extends VerticalGridView { } public void setHeader(FragmentActivity activity, int... layoutIds) { - if (activity != null) views = Arrays.stream(layoutIds).mapToObj(id -> (View) activity.findViewById(id)).filter(Objects::nonNull).collect(Collectors.toList()); + if (activity != null) views = Arrays.stream(layoutIds).mapToObj(id -> (View) activity.findViewById(id)).filter(Objects::nonNull).toList(); } public void setMoveTop(boolean moveTop) { diff --git a/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java b/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java index 30b4d92eb..4c321712f 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java @@ -240,12 +240,12 @@ public class VodConfig { } public List getParses(int type) { - return getParses().stream().filter(item -> item.getType() == type).collect(Collectors.toList()); + return getParses().stream().filter(item -> item.getType() == type).toList(); } public List getParses(int type, String flag) { List items = getParses(type); - List filter = items.stream().filter(item -> item.getExt().getFlag().contains(flag)).collect(Collectors.toList()); + List filter = items.stream().filter(item -> item.getExt().getFlag().contains(flag)).toList(); return filter.isEmpty() ? items : filter; } diff --git a/app/src/main/java/com/fongmi/android/tv/player/extractor/Thunder.java b/app/src/main/java/com/fongmi/android/tv/player/extractor/Thunder.java index eccfc60dc..f791cf8ee 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/extractor/Thunder.java +++ b/app/src/main/java/com/fongmi/android/tv/player/extractor/Thunder.java @@ -104,7 +104,7 @@ public class Thunder implements Source.Extractor { if (torrent && url.startsWith("http")) Download.create(url, taskId.getSaveFile()).get(); if (!torrent) waitDone(taskId); try { - return XLTaskHelper.get().getTorrentInfo(taskId.getSaveFile()).getMedias().stream().map(this::create).collect(Collectors.toList()); + return XLTaskHelper.get().getTorrentInfo(taskId.getSaveFile()).getMedias().stream().map(this::create).toList(); } finally { XLTaskHelper.get().stopTask(taskId); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java index 21225069e..73bda381b 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java @@ -107,7 +107,7 @@ public class CollectFragment extends BaseFragment implements MenuProvider, Colle } private void setSites() { - mSites = VodConfig.get().getSites().stream().filter(Site::isSearchable).collect(Collectors.toList()); + mSites = VodConfig.get().getSites().stream().filter(Site::isSearchable).toList(); } private void setWidth() { diff --git a/app/src/mobile/java/com/fongmi/android/tv/utils/ScanTask.java b/app/src/mobile/java/com/fongmi/android/tv/utils/ScanTask.java index 75fc72f0c..2e89976d1 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/utils/ScanTask.java +++ b/app/src/mobile/java/com/fongmi/android/tv/utils/ScanTask.java @@ -48,7 +48,7 @@ public class ScanTask { private List getUrl() { String local = Server.get().getAddress(); String base = local.substring(0, local.lastIndexOf(".") + 1); - return IntStream.range(1, 256).mapToObj(i -> base + i + ":9978").collect(Collectors.toList()); + return IntStream.range(1, 256).mapToObj(i -> base + i + ":9978").toList(); } private void findDevice(String url) {