From 4b9940003e49ca729250429bfa133f1a71a6d076 Mon Sep 17 00:00:00 2001 From: okjack Date: Tue, 16 Jan 2024 17:17:24 +0800 Subject: [PATCH 1/2] numColumns --- .../com/fongmi/android/tv/ui/activity/VideoActivity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index a10129a5d..9c43e78e4 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -594,8 +594,9 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List int episodeNameLength = items.isEmpty() ? 0 : items.get(0).getName().length(); int numColumns = 10; if (episodeNameLength > 40) numColumns = 2; - else if (episodeNameLength > 20) numColumns = 4; - else if (episodeNameLength > 5) numColumns = 6; + else if (episodeNameLength > 20) numColumns = 3; + else if (episodeNameLength > 10) numColumns = 4; + else if (episodeNameLength > 6) numColumns = 6; else if (episodeNameLength > 2) numColumns = 8; if (size < numColumns) numColumns = size; int rowNum = (int)Math.ceil((double) size/ (double) numColumns); From 90922450ebf11c6f5278e10c7bc71fae74ea2625 Mon Sep 17 00:00:00 2001 From: okjack Date: Tue, 16 Jan 2024 19:53:18 +0800 Subject: [PATCH 2/2] Focus --- .../com/fongmi/android/tv/ui/presenter/EpisodePresenter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/EpisodePresenter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/EpisodePresenter.java index 14e97a400..763fc35f0 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/EpisodePresenter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/EpisodePresenter.java @@ -54,8 +54,8 @@ public class EpisodePresenter extends Presenter { holder.binding.text.setMaxEms(Product.getEms()); holder.binding.text.setActivated(item.isActivated()); holder.binding.text.setText(item.getDesc().concat(item.getName())); - holder.binding.text.setNextFocusUpId(item.getIndex() < numColumns ? nextFocusUp : 0); - holder.binding.text.setNextFocusDownId(item.getIndex() >= (numRows - 1) * numColumns ? nextFocusDown : 0); + holder.binding.text.setNextFocusUpId(numColumns > 0 ? (item.getIndex() < numColumns ? nextFocusUp : 0) : nextFocusUp); + holder.binding.text.setNextFocusDownId(numColumns > 0 ? (item.getIndex() >= (numRows - 1) * numColumns ? nextFocusDown : 0) : nextFocusDown); setOnClickListener(holder, view -> mListener.onItemClick(item)); }