diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index d5dd16614..232576ed5 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -290,14 +290,22 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis setText(mBinding.actor, R.string.detail_actor, Html.fromHtml(item.getVodActor()).toString()); setText(mBinding.content, R.string.detail_content, Html.fromHtml(item.getVodContent()).toString()); setText(mBinding.director, R.string.detail_director, Html.fromHtml(item.getVodDirector()).toString()); - mBinding.content.setMaxLines(isVisible(mBinding.remark) ? 2 : 3); mFlagAdapter.setItems(item.getVodFlags(), null); + mBinding.content.setMaxLines(getMaxLines()); mBinding.video.requestFocus(); if (hasFlag()) checkHistory(); getPart(item.getVodName()); checkKeep(); } + private int getMaxLines() { + int lines = 1; + if (isGone(mBinding.actor)) ++lines; + if (isGone(mBinding.remark)) ++lines; + if (isGone(mBinding.director)) ++lines; + return lines; + } + private void setText(TextView view, int resId, String text) { if (text.isEmpty()) view.setVisibility(View.GONE); else if (resId > 0) view.setText(ResUtil.getString(resId, text)); diff --git a/app/src/leanback/res/layout/activity_detail.xml b/app/src/leanback/res/layout/activity_detail.xml index 068154ac2..5bc2656d3 100644 --- a/app/src/leanback/res/layout/activity_detail.xml +++ b/app/src/leanback/res/layout/activity_detail.xml @@ -9,8 +9,8 @@