From 541b8045788f708b1314dbe0a22c254470e06224 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Mon, 5 Jun 2023 22:33:02 +0800
Subject: [PATCH] Add url show

---
 app/src/main/res/values-zh-rCN/strings.xml        |  1 +
 app/src/main/res/values-zh-rTW/strings.xml        |  1 +
 app/src/main/res/values/strings.xml               |  1 +
 .../android/tv/ui/activity/DetailActivity.java    | 10 ++++++++--
 app/src/mobile/res/layout/activity_detail.xml     | 15 +++++++++++++++
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8430d0605..564a00694 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -21,6 +21,7 @@
     <string name="detail_type">类型：<xliff:g name="name">%s</xliff:g></string>
     <string name="detail_director">导演：<xliff:g name="name">%s</xliff:g></string>
     <string name="detail_actor">演员：<xliff:g name="name">%s</xliff:g></string>
+    <string name="detail_url">地址：<xliff:g name="name">%s</xliff:g></string>
     <string name="detail_content">简介：<xliff:g name="name">%s</xliff:g></string>
     <string name="detail_desc">简介</string>
 
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b5cdd81ce..7345aeac5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -21,6 +21,7 @@
     <string name="detail_type">類型：<xliff:g name="name">%s</xliff:g></string>
     <string name="detail_director">導演：<xliff:g name="name">%s</xliff:g></string>
     <string name="detail_actor">演員：<xliff:g name="name">%s</xliff:g></string>
+    <string name="detail_url">網址：<xliff:g name="name">%s</xliff:g></string>
     <string name="detail_content">簡介：<xliff:g name="name">%s</xliff:g></string>
     <string name="detail_desc">簡介</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 26f0591c6..53e9933af 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,6 +21,7 @@
     <string name="detail_type">Type: <xliff:g name="name">%s</xliff:g></string>
     <string name="detail_director">Director: <xliff:g name="name">%s</xliff:g></string>
     <string name="detail_actor">Actor: <xliff:g name="name">%s</xliff:g></string>
+    <string name="detail_url">Url: <xliff:g name="name">%s</xliff:g></string>
     <string name="detail_content">Summary: <xliff:g name="name">%s</xliff:g></string>
     <string name="detail_desc">Summary</string>
 
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
index 9a8561cff..5f79c4967 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
@@ -9,6 +9,7 @@ import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.text.Html;
+import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.MotionEvent;
 import android.view.View;
@@ -226,6 +227,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
     @Override
     @SuppressLint("ClickableViewAccessibility")
     protected void initEvent() {
+        mBinding.url.setOnClickListener(view -> onUrl());
         mBinding.name.setOnClickListener(view -> onName());
         mBinding.more.setOnClickListener(view -> onMore());
         mBinding.actor.setOnClickListener(view -> onActor());
@@ -378,7 +380,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
     }
 
     private void setText(TextView view, int resId, String text) {
-        view.setVisibility(text.isEmpty() ? View.GONE : View.VISIBLE);
+        view.setVisibility(TextUtils.isEmpty(text) ? View.GONE : View.VISIBLE);
         view.setText(resId > 0 ? getString(resId, text) : text);
         view.setTag(text);
     }
@@ -441,6 +443,10 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
         if (scroll) mBinding.episode.scrollToPosition(mEpisodeAdapter.getPosition());
     }
 
+    private void onUrl() {
+        mBinding.url.setMaxLines(mBinding.url.getMaxLines() == 1 ? Integer.MAX_VALUE : 1);
+    }
+
     private void onName() {
         String name = mBinding.name.getText().toString();
         Notify.show(getString(R.string.detail_search, name));
@@ -1088,7 +1094,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
     }
 
     public void setUrl(String url) {
-        this.url = url;
+        setText(mBinding.url, R.string.detail_url, this.url = url);
     }
 
     private void notifyItemChanged(RecyclerView.Adapter<?> adapter) {
diff --git a/app/src/mobile/res/layout/activity_detail.xml b/app/src/mobile/res/layout/activity_detail.xml
index af8d074d4..874856aae 100644
--- a/app/src/mobile/res/layout/activity_detail.xml
+++ b/app/src/mobile/res/layout/activity_detail.xml
@@ -153,11 +153,26 @@
                         android:layout_marginTop="8dp"
                         android:layout_marginEnd="16dp"
                         android:ellipsize="end"
+                        android:lineSpacingExtra="4dp"
                         android:maxLines="1"
                         android:textColor="@color/white"
                         android:textSize="14sp"
                         tools:text="演員：FongMi" />
 
+                    <TextView
+                        android:id="@+id/url"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginEnd="16dp"
+                        android:ellipsize="end"
+                        android:lineSpacingExtra="4dp"
+                        android:maxLines="1"
+                        android:textColor="@color/white"
+                        android:textSize="14sp"
+                        tools:text="網址：FongMi" />
+
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"