From dd36b97e29c3b0b9d12d510ec3efa192ffde71c4 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 21 Feb 2023 17:44:59 +0800
Subject: [PATCH] [mobile] correct text

---
 .../fongmi/android/tv/ui/activity/DetailActivity.java |  4 ++--
 .../com/fongmi/android/tv/ui/adapter/TypeAdapter.java |  4 +++-
 app/src/mobile/res/layout/activity_detail.xml         |  8 ++++----
 app/src/mobile/res/values-zh-rCN/strings.xml          | 11 +++++++----
 app/src/mobile/res/values-zh-rTW/strings.xml          | 11 +++++++----
 app/src/mobile/res/values/strings.xml                 | 11 +++++++----
 6 files changed, 30 insertions(+), 19 deletions(-)

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 c7ff6f20a..0f5b40ac3 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
@@ -394,8 +394,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
     }
 
     private void onMore() {
-        boolean more = getString(R.string.vod_content_expand).equals(mBinding.more.getText().toString());
-        mBinding.more.setText(more ? R.string.vod_content_collapse : R.string.vod_content_expand);
+        boolean more = getString(R.string.detail_content_expand).equals(mBinding.more.getText().toString());
+        mBinding.more.setText(more ? R.string.detail_content_collapse : R.string.detail_content_expand);
         mBinding.content.setMaxLines(more ? Integer.MAX_VALUE : 4);
     }
 
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/TypeAdapter.java b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/TypeAdapter.java
index 71f402bcd..126a8fbdb 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/TypeAdapter.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/TypeAdapter.java
@@ -6,8 +6,10 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.fongmi.android.tv.R;
 import com.fongmi.android.tv.bean.Class;
 import com.fongmi.android.tv.databinding.AdapterTypeBinding;
+import com.fongmi.android.tv.utils.ResUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,7 +41,7 @@ public class TypeAdapter extends RecyclerView.Adapter<TypeAdapter.ViewHolder> {
 
     private Class home() {
         Class type = new Class();
-        type.setTypeName("首頁");
+        type.setTypeName(ResUtil.getString(R.string.home));
         type.setTypeId("home");
         type.setActivated(true);
         return type;
diff --git a/app/src/mobile/res/layout/activity_detail.xml b/app/src/mobile/res/layout/activity_detail.xml
index 76cb4e8d7..ecb0ebaed 100644
--- a/app/src/mobile/res/layout/activity_detail.xml
+++ b/app/src/mobile/res/layout/activity_detail.xml
@@ -183,7 +183,7 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="16dp"
-                    android:text="線路"
+                    android:text="@string/detail_flag"
                     android:textColor="@color/white"
                     android:textSize="16sp"
                     android:textStyle="bold" />
@@ -204,7 +204,7 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="16dp"
-                    android:text="選集"
+                    android:text="@string/detail_episode"
                     android:textColor="@color/white"
                     android:textSize="16sp"
                     android:textStyle="bold" />
@@ -225,7 +225,7 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="16dp"
-                    android:text="簡介"
+                    android:text="@string/detail_content"
                     android:textColor="@color/white"
                     android:textSize="16sp"
                     android:textStyle="bold" />
@@ -251,7 +251,7 @@
                     android:layout_gravity="end"
                     android:layout_marginTop="8dp"
                     android:layout_marginEnd="16dp"
-                    android:text="@string/vod_content_expand"
+                    android:text="@string/detail_content_expand"
                     android:textColor="@color/white"
                     android:textSize="12sp"
                     android:textStyle="bold"
diff --git a/app/src/mobile/res/values-zh-rCN/strings.xml b/app/src/mobile/res/values-zh-rCN/strings.xml
index 2705ceda4..39d5d9941 100644
--- a/app/src/mobile/res/values-zh-rCN/strings.xml
+++ b/app/src/mobile/res/values-zh-rCN/strings.xml
@@ -1,16 +1,19 @@
 <resources>
 
     <!-- Nav -->
-    <string name="nav_home">首页</string>
     <string name="nav_vod">点播</string>
     <string name="nav_setting">设定</string>
 
     <!-- Home -->
+    <string name="home">首页</string>
     <string name="home_history">最近观看</string>
     <string name="home_recommend">更新推荐</string>
 
-    <!-- VOD -->
-    <string name="vod_content_expand">展开</string>
-    <string name="vod_content_collapse">收起</string>
+    <!-- Detail -->
+    <string name="detail_flag">线路</string>
+    <string name="detail_episode">选集</string>
+    <string name="detail_content">简介</string>
+    <string name="detail_content_expand">展开</string>
+    <string name="detail_content_collapse">收起</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/mobile/res/values-zh-rTW/strings.xml b/app/src/mobile/res/values-zh-rTW/strings.xml
index a4462a918..5b8f837da 100644
--- a/app/src/mobile/res/values-zh-rTW/strings.xml
+++ b/app/src/mobile/res/values-zh-rTW/strings.xml
@@ -1,16 +1,19 @@
 <resources>
 
     <!-- Nav -->
-    <string name="nav_home">首頁</string>
     <string name="nav_vod">點播</string>
     <string name="nav_setting">設定</string>
 
     <!-- Home -->
+    <string name="home">首頁</string>
     <string name="home_history">最近觀看</string>
     <string name="home_recommend">更新推薦</string>
 
-    <!-- VOD -->
-    <string name="vod_content_expand">展開</string>
-    <string name="vod_content_collapse">收起</string>
+    <!-- Detail -->
+    <string name="detail_flag">線路</string>
+    <string name="detail_episode">選集</string>
+    <string name="detail_content">簡介</string>
+    <string name="detail_content_expand">展開</string>
+    <string name="detail_content_collapse">收起</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/mobile/res/values/strings.xml b/app/src/mobile/res/values/strings.xml
index 45183f37c..f35642d16 100644
--- a/app/src/mobile/res/values/strings.xml
+++ b/app/src/mobile/res/values/strings.xml
@@ -1,16 +1,19 @@
 <resources>
 
     <!-- Nav -->
-    <string name="nav_home">Home</string>
     <string name="nav_vod">Vod</string>
     <string name="nav_setting">Setting</string>
 
     <!-- Home -->
+    <string name="home">Home</string>
     <string name="home_history">History</string>
     <string name="home_recommend">Recommend</string>
 
-    <!-- VOD -->
-    <string name="vod_content_expand">Expand</string>
-    <string name="vod_content_collapse">Collapse</string>
+    <!-- Detail -->
+    <string name="detail_flag">Flag</string>
+    <string name="detail_episode">Episode</string>
+    <string name="detail_content">Summary</string>
+    <string name="detail_content_expand">Expand</string>
+    <string name="detail_content_collapse">Collapse</string>
 
 </resources>
\ No newline at end of file