From 46624757684ae521cd753db07804f04d11772753 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 1 Dec 2022 10:31:33 +0800
Subject: [PATCH] Add remark for detail

---
 .../tv/ui/activity/DetailActivity.java        |  5 ++-
 .../leanback/res/layout/activity_detail.xml   | 33 ++++++++++++-------
 2 files changed, 26 insertions(+), 12 deletions(-)

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 f4bf3d9d2..d5dd16614 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
@@ -282,6 +282,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
         mBinding.progressLayout.showContent();
         mBinding.video.setTag(item.getVodPic());
         mBinding.name.setText(item.getVodName());
+        setText(mBinding.remark, 0, item.getVodRemarks());
         setText(mBinding.year, R.string.detail_year, item.getVodYear());
         setText(mBinding.area, R.string.detail_area, item.getVodArea());
         setText(mBinding.type, R.string.detail_type, item.getTypeName());
@@ -289,6 +290,7 @@ 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.video.requestFocus();
         if (hasFlag()) checkHistory();
@@ -298,7 +300,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
 
     private void setText(TextView view, int resId, String text) {
         if (text.isEmpty()) view.setVisibility(View.GONE);
-        else view.setText(ResUtil.getString(resId, text));
+        else if (resId > 0) view.setText(ResUtil.getString(resId, text));
+        else view.setText(text);
         view.setTag(text);
     }
 
diff --git a/app/src/leanback/res/layout/activity_detail.xml b/app/src/leanback/res/layout/activity_detail.xml
index 435c026d6..068154ac2 100644
--- a/app/src/leanback/res/layout/activity_detail.xml
+++ b/app/src/leanback/res/layout/activity_detail.xml
@@ -9,8 +9,8 @@
 
     <FrameLayout
         android:id="@+id/video"
-        android:layout_width="400dp"
-        android:layout_height="225dp"
+        android:layout_width="420dp"
+        android:layout_height="236.25dp"
         android:layout_marginStart="24dp"
         android:layout_marginTop="24dp"
         android:background="@color/black"
@@ -70,12 +70,26 @@
         android:textStyle="bold"
         tools:text="慶餘年第二季" />
 
-    <LinearLayout
-        android:id="@+id/row1"
+    <TextView
+        android:id="@+id/remark"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/name"
         android:layout_alignStart="@+id/name"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="24dp"
+        android:singleLine="true"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        tools:text="更新到第二季" />
+
+    <LinearLayout
+        android:id="@+id/row1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/remark"
+        android:layout_alignStart="@+id/remark"
+        android:layout_marginTop="6dp"
         android:layout_marginEnd="24dp"
         android:orientation="horizontal">
 
@@ -83,7 +97,6 @@
             android:id="@+id/site"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:layout_marginEnd="12dp"
             android:singleLine="true"
             android:textColor="@color/white"
@@ -94,7 +107,6 @@
             android:id="@+id/year"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:layout_marginEnd="12dp"
             android:singleLine="true"
             android:textColor="@color/white"
@@ -105,7 +117,6 @@
             android:id="@+id/area"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:layout_marginEnd="12dp"
             android:singleLine="true"
             android:textColor="@color/white"
@@ -116,7 +127,6 @@
             android:id="@+id/type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:singleLine="true"
             android:textColor="@color/white"
             android:textSize="16sp"
@@ -130,7 +140,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/row1"
         android:layout_alignStart="@+id/name"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="6dp"
         android:layout_marginEnd="24dp"
         android:singleLine="true"
         android:textColor="@color/white"
@@ -143,7 +153,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/director"
         android:layout_alignStart="@+id/name"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="6dp"
         android:layout_marginEnd="24dp"
         android:singleLine="true"
         android:textColor="@color/white"
@@ -156,8 +166,9 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/actor"
         android:layout_alignStart="@+id/name"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="6dp"
         android:layout_marginEnd="24dp"
+        android:lineSpacingExtra="2dp"
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="@color/white"