From e81e96a702c6d6d2c8b01d5641a51d3da536dbd7 Mon Sep 17 00:00:00 2001
From: Croden1999 <851577088@qq.com>
Date: Sun, 28 May 2023 18:54:37 +0800
Subject: [PATCH] Minor strings improve - Add display Title ID on home screen -
 Add Traditional Chinese and update Simplified Chinese translation

---
 .../npsbrowser/adapters/AppAdapter.kt         |  2 +-
 app/src/main/res/values-zh-rCN/strings.xml    | 50 ++++++++++++-------
 app/src/main/res/values-zh-rTW/strings.xml    | 34 +++++++++++++
 app/src/main/res/values/arrays.xml            |  9 ----
 app/src/main/res/values/strings.xml           | 49 +++++++++++-------
 app/src/main/res/xml/root_preferences.xml     |  6 +--
 6 files changed, 102 insertions(+), 48 deletions(-)
 create mode 100644 app/src/main/res/values-zh-rTW/strings.xml

diff --git a/app/src/main/java/com/illusionware/npsbrowser/adapters/AppAdapter.kt b/app/src/main/java/com/illusionware/npsbrowser/adapters/AppAdapter.kt
index fe45bf1..c0f61cb 100644
--- a/app/src/main/java/com/illusionware/npsbrowser/adapters/AppAdapter.kt
+++ b/app/src/main/java/com/illusionware/npsbrowser/adapters/AppAdapter.kt
@@ -33,7 +33,7 @@ class AppAdapter(val context: Context) : SortedListAdapter<AppData>(context, App
         var appLastDate: TextView = itemView.findViewById(R.id.appLastDate)
 
         override fun performBind(item: AppData) {
-            appTitle.text = item.title
+            appTitle.text = item.titleID + " | " + item.title
             appTitle.isSelected = true
             appRegion.text =  item.region
             appMinFW.text =  item.minFW
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 5213769..f44e280 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,20 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">NPS Browser</string>
-    <string name="title_activity_settings">设置</string>
-    <string name="search">搜索</string>
-    <string name="download">下载</string>
-    <string name="copy_zrif">复制 zRIF</string>
-    <string name="content_id">内容ID</string>
-    <string name="size">大小</string>
-    <string name="minfw">最低固件</string>
-    <string name="single_app_icon">应用图标</string>
-    <string name="no_license">注意：这个内容没有提供授权</string>
-    <string name="cart_only">这个游戏只有实体卡</string>
-    <string name="no_download_link">注意：这个内容没有提供下载链接</string>
-    <string name="download_error">下载过程中发生错误，请重试</string>
-    <string name="pkg_url_copied">PKG 地址已复制到剪贴板</string>
-    <string name="zrif_copied">zRIF 已复制到剪贴板</string>
-    <string name="downloading">下载中...</string>
-    <string name="content_id_copied">内容ID 已复制到剪贴板</string>
-</resources>
\ No newline at end of file
+	<string name="app_name">NPS Browser</string>
+	<string name="title_activity_settings">设置</string>
+	<string name="search">搜索</string>
+	<string name="download">下载</string>
+	<string name="copy_zrif">复制zRIF</string>
+	<string name="content_id">内容ID</string>
+	<string name="size">大小</string>
+	<string name="minfw">最低固件版本</string>
+	<string name="single_app_icon">应用图标</string>
+	<string name="no_license">注意：这个内容没有提供授权</string>
+	<string name="cart_only">这个游戏只有实体卡</string>
+	<string name="no_download_link">注意：这个内容没有提供下载链接</string>
+	<string name="download_error">下载过程中发生错误，请重试</string>
+	<string name="pkg_url_copied">PKG地址已复制到剪贴板</string>
+	<string name="zrif_copied">zRIF已复制到剪贴板</string>
+	<string name="downloading">下载中...</string>
+	<string name="content_id_copied">内容ID已复制到剪贴板</string>
+	<string name="appearance">外观</string>
+	<string name="theme">主题</string>
+	<string name="layout">布局</string>
+
+	<string-array name="app_theme">
+		<item>明亮</item>
+		<item>黑暗</item>
+		<item>使用系统默认</item>
+	</string-array>
+
+	<string-array name="layout_type">
+		<item>列表</item>
+		<item>网格</item>
+	</string-array>
+</resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..ee20e8b
--- /dev/null
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="app_name">NPS Browser</string>
+	<string name="title_activity_settings">設置</string>
+	<string name="search">搜尋</string>
+	<string name="download">下載</string>
+	<string name="copy_zrif">複製zRIF</string>
+	<string name="content_id">內容ID</string>
+	<string name="size">檔案大小</string>
+	<string name="minfw">最低韌體版本</string>
+	<string name="single_app_icon">應用程式圖標</string>
+	<string name="no_license">注意：這個內容沒有提供授權</string>
+	<string name="cart_only">這個遊戲只有實體卡</string>
+	<string name="no_download_link">注意：這個內容沒有提供下載鏈接</string>
+	<string name="download_error">下載過程中發生錯誤，請重試</string>
+	<string name="pkg_url_copied">PKG地址已複製到剪貼板</string>
+	<string name="zrif_copied">zRIF已複製到剪貼板</string>
+	<string name="downloading">正在下載...</string>
+	<string name="content_id_copied">內容ID已複製到剪貼板</string>
+	<string name="appearance">外觀</string>
+	<string name="theme">主題</string>
+	<string name="layout">佈局</string>
+
+	<string-array name="app_theme">
+		<item>明亮</item>
+		<item>黑暗</item>
+		<item>使用系統默認</item>
+	</string-array>
+
+	<string-array name="layout_type">
+		<item>列表</item>
+		<item>網格</item>
+	</string-array>
+</resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 57c31f4..8a93165 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="app_theme">
-        <item>Light</item>
-        <item>Dark</item>
-        <item>Use System Default</item>
-    </string-array>
     <string-array name="app_theme_val">
         <item>0</item>
         <item>1</item>
         <item>2</item>
     </string-array>
-    <string-array name="layout_type">
-        <item>List</item>
-        <item>Grid</item>
-    </string-array>
     <string-array name="layout_type_val">
         <item>0</item>
         <item>1</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2e04d98..89696d9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,19 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">NPS Browser</string>
-    <string name="title_activity_settings">Settings</string>
-    <string name="search">Search</string>
-    <string name="download">Download</string>
-    <string name="copy_zrif">Copy zRIF</string>
-    <string name="content_id">Content ID</string>
-    <string name="size">Size</string>
-    <string name="minfw">MinFW</string>
-    <string name="single_app_icon">Single app icon</string>
-    <string name="no_license">Warning: No license was provided for this content.</string>
-    <string name="cart_only">CART ONLY GAME</string>
-    <string name="no_download_link">Warning: No download link was provided for this content.</string>
-    <string name="downloading">Downloading...</string>
-    <string name="download_error">An error occurred while downloading. please try again</string>
-    <string name="pkg_url_copied">PKG URL Copied to Clipboard</string>
-    <string name="zrif_copied">zRIF Copied to Clipboard</string>
-    <string name="content_id_copied">Content ID Copied to Clipboard</string>
+	<string name="app_name">NPS Browser</string>
+	<string name="title_activity_settings">Settings</string>
+	<string name="search">Search</string>
+	<string name="download">Download</string>
+	<string name="copy_zrif">Copy zRIF</string>
+	<string name="content_id">Content ID</string>
+	<string name="size">Size</string>
+	<string name="minfw">Minimum Firmware Version</string>
+	<string name="single_app_icon">Single app icon</string>
+	<string name="no_license">Warning: No license was provided for this content.</string>
+	<string name="cart_only">CART ONLY GAME</string>
+	<string name="no_download_link">Warning: No download link was provided for this content.</string>
+	<string name="downloading">Downloading...</string>
+	<string name="download_error">An error occurred while downloading. please try again</string>
+	<string name="pkg_url_copied">PKG URL Copied to Clipboard</string>
+	<string name="zrif_copied">zRIF Copied to Clipboard</string>
+	<string name="content_id_copied">Content ID Copied to Clipboard</string>
+	<string name="appearance">Appearance</string>
+	<string name="theme">Theme</string>
+	<string name="layout">Layout</string>
+
+	<string-array name="app_theme">
+		<item>Light</item>
+		<item>Dark</item>
+		<item>Use System Default</item>
+	</string-array>
+
+	<string-array name="layout_type">
+		<item>List</item>
+		<item>Grid</item>
+	</string-array>
 </resources>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index f15d597..7a21dd1 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -1,19 +1,19 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory android:title="Appearance">
+    <PreferenceCategory android:title="@string/appearance">
 
         <com.illusionware.npsbrowser.ThemePreference
             android:defaultValue="2"
             android:entries="@array/app_theme"
             android:entryValues="@array/app_theme_val"
             android:key="app_theme"
-            android:title="Theme" />
+            android:title="@string/theme" />
         <ListPreference
             android:defaultValue="0"
             android:entries="@array/layout_type"
             android:entryValues="@array/layout_type_val"
             android:key="layout_type"
-            android:title="Layout"
+            android:title="@string/layout"
             app:useSimpleSummaryProvider="true"/>
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file