Merge pull request #220 from okcaptain/dev

Focus

app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

@@ -612,8 +612,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);

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));
     }