Adjust preference order

yujincheng08 · May 26, 2023 · fea9f42 · fea9f42
1 parent 5ac2c69
commit fea9f42
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 38 deletions.
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -18,7 +18,7 @@
     <string name="teenagers_mode_dialog_title">關閉青少年模式跳出視窗</string>
     <string name="teenagers_mode_dialog_summary">仍可從側滑選單進入青少年模式</string>
     <string name="allow_download_title">允許下載版權番劇</string>
-    <string name="allow_download_summary">使版權番劇可以快取（同時修復概念版不能投影的問題）</string>
+    <string name="allow_download_summary">使版權番劇可以快取</string>
     <string name="cdn_category">加速CDN設定</string>
     <string name="hidden_title">啟用隱藏功能</string>
     <string name="hidden_summary">打開後可以使用隱藏功能</string>
@@ -188,7 +188,8 @@
     <string name="block_word_search_summary">封鎖影片評論藍色關鍵字點擊觸發跳轉搜尋功能</string>
     <string name="disable_try_watch_vip_quality_title">禁用免費試看大會員解析度</string>
     <string name="disable_try_watch_vip_quality_desc">鼠鼠我呀，真的不想每30天點一次不再試看呢</string>
-    <string name="allow_mini_play_title">允許解鎖的番劇小窗播放</string>
+    <string name="allow_mini_play_title">允許版權限制番劇小窗播放</string>
+    <string name="allow_mini_play_summary">港澳台番劇的字幕並不能在小窗顯示</string>
     <string name="force_browser_title">在外部瀏覽器打開連結</string>
     <string name="force_browser_summary">而不是使用內建瀏覽器</string>
     <string name="disable_story_full_title">關閉看一看按鈕</string>
@@ -263,4 +264,6 @@
     <string name="apply_to_relate_title">同時套用於影片下方推薦</string>
     <string name="search_hint" tools:ignore="TypographyEllipsis">搜尋...</string>
     <string name="block_video_comment_title">屏蔽影片評論區</string>
+    <string name="support">捐贈</string>
+    <string name="support_summary">捐贈以支持模組開發</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -18,7 +18,7 @@
     <string name="teenagers_mode_dialog_title">关闭青少年模式弹窗</string>
     <string name="teenagers_mode_dialog_summary">仍可从侧滑菜单进入青少年模式</string>
     <string name="allow_download_title">允许下载版权番剧</string>
-    <string name="allow_download_summary">使版权番剧可以缓存（同时修复概念版不能投屏的问题）</string>
+    <string name="allow_download_summary">使版权番剧可以缓存</string>
     <string name="cdn_category">加速CDN设置</string>
     <string name="hidden_title">启用隐藏功能</string>
     <string name="hidden_summary">打开后可以使用隐藏功能</string>
@@ -188,7 +188,8 @@
     <string name="block_word_search_summary">屏蔽视频评论蓝色关键词点击触发跳转搜索功能</string>
     <string name="disable_try_watch_vip_quality_title">禁用免费试看大会员清晰度</string>
     <string name="disable_try_watch_vip_quality_desc">鼠鼠我呀，真的不想每30天点一次不再试看呢</string>
-    <string name="allow_mini_play_title">允许解锁的番剧小窗播放</string>
+    <string name="allow_mini_play_title">允许版权限制番剧小窗播放</string>
+    <string name="allow_mini_play_summary">港澳台番剧的字幕并不能在小窗显示</string>
     <string name="force_browser_title">在外部浏览器打开链接</string>
     <string name="force_browser_summary">而不是使用内置浏览器</string>
     <string name="disable_story_full_title">关闭看一看按钮</string>
@@ -263,4 +264,6 @@
     <string name="apply_to_relate_title">同时应用于视频下方推荐</string>
     <string name="search_hint" tools:ignore="TypographyEllipsis">搜索...</string>
     <string name="block_video_comment_title">屏蔽视频评论区</string>
+    <string name="support">捐赠</string>
+    <string name="support_summary">捐赠以支持模块开发</string>
 </resources>
diff --git a/app/src/main/res/values/strings_raw.xml b/app/src/main/res/values/strings_raw.xml
@@ -1,10 +1,11 @@
 <!-- Here place some not translatable string resources -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="author_list">iAcn/djytw/yujincheng08</string>
+    <string name="author_list">yujincheng08/iAcn/djytw/</string>
     <string name="version_url">https://api.github.com/repos/yujincheng08/BiliRoaming/releases/latest</string>
     <string name="update_url">https://github.com/yujincheng08/BiliRoaming/releases/latest</string>
     <string name="server_url">https://github.com/yujincheng08/BiliRoaming/wiki/%E5%85%AC%E5%85%B1%E8%A7%A3%E6%9E%90%E6%9C%8D%E5%8A%A1%E5%99%A8</string>
     <string name="github_url">https://github.com/yujincheng08/BiliRoaming</string>
+    <string name="afdian_url">https://afdian.net/a/yujincheng08</string>
     <string name="tg_url">https://t.me/biliroaming</string>
     <string name="help_url">https://github.com/yujincheng08/BiliRoaming/wiki</string>
     <string name="group_url">mqqguild://guild/share?inviteCode=NVoD5&amp;from=246610</string>

diff --git a/app/src/main/res/xml/prefs_setting.xml b/app/src/main/res/xml/prefs_setting.xml
@@ -7,6 +7,12 @@
             android:summary="@string/main_func_summary"
             android:title="@string/main_func_title" />
 
+        <Preference
+            android:dependency="main_func"
+            android:key="custom_server"
+            android:summary="@string/custom_server_summary"
+            android:title="@string/custom_server_title" />
+
         <SwitchPreference
             android:dependency="main_func"
             android:key="allow_download"
@@ -19,15 +25,10 @@
             android:summary="@string/fix_download_summary"
             android:title="@string/fix_download_title" />
 
-        <Preference
-            android:dependency="main_func"
-            android:key="custom_server"
-            android:summary="@string/custom_server_summary"
-            android:title="@string/custom_server_title" />
-
         <SwitchPreference
             android:dependency="main_func"
             android:key="allow_mini_play"
+            android:summary="@string/allow_mini_play_summary"
             android:title="@string/allow_mini_play_title" />
     </PreferenceCategory>
 
@@ -44,6 +45,16 @@
             android:key="test_upos"
             android:summary="@string/test_upos_summary"
             android:title="@string/test_upos_title" />
+
+        <SwitchPreference
+            android:key="block_pcdn"
+            android:summary="@string/block_pcdn_summary"
+            android:title="@string/block_pcdn_title" />
+
+        <SwitchPreference
+            android:key="block_pcdn_live"
+            android:summary="@string/block_pcdn_live_summary"
+            android:title="@string/block_pcdn_live_title" />
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/beautify_category">
@@ -240,23 +251,6 @@
             android:key="pref_import"
             android:title="@string/pref_import_title" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/setting_category">
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="show_info"
-            android:summary="@string/show_info_summary"
-            android:title="@string/show_info_title" />
-
-        <SwitchPreference
-            android:key="save_log"
-            android:title="@string/save_log_title" />
-
-        <Preference
-            android:key="share_log"
-            android:summary="@string/share_log_summary"
-            android:title="@string/share_log_title" />
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:key="hidden_group"
         android:title="@string/hidden_group">
@@ -455,22 +449,29 @@
             android:key="remove_vip_section"
             android:summary="@string/remove_vip_section_summary"
             android:title="@string/remove_vip_section_title" />
-        <SwitchPreference
-            android:dependency="hidden"
-            android:key="block_pcdn"
-            android:summary="@string/block_pcdn_summary"
-            android:title="@string/block_pcdn_title" />
-        <SwitchPreference
-            android:dependency="hidden"
-            android:key="block_pcdn_live"
-            android:summary="@string/block_pcdn_live_summary"
-            android:title="@string/block_pcdn_live_title" />
         <SwitchPreference
             android:dependency="hidden"
             android:key="block_video_comment"
             android:title="@string/block_video_comment_title" />
     </PreferenceCategory>
 
+    <PreferenceCategory android:title="@string/setting_category">
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="show_info"
+            android:summary="@string/show_info_summary"
+            android:title="@string/show_info_title" />
+
+        <SwitchPreference
+            android:key="save_log"
+            android:title="@string/save_log_title" />
+
+        <Preference
+            android:key="share_log"
+            android:summary="@string/share_log_summary"
+            android:title="@string/share_log_title" />
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:key="about"
         android:title="@string/about">
@@ -488,6 +489,15 @@
                 android:data="@string/github_url" />
         </Preference>
 
+        <Preference
+            android:key="support"
+            android:summary="@string/support_summary"
+            android:title="@string/support">
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="@string/afdian_url" />
+        </Preference>
+
         <Preference
             android:key="help"
             android:summary="@string/help_summary"