From 970869bb7860d41ad8908e1ba7061c51d9b27f52 Mon Sep 17 00:00:00 2001
From: mu7220 <80700814+mu7220@users.noreply.github.com>
Date: Thu, 28 Dec 2023 17:43:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=82=B9=E9=A1=B9=E7=9B=AE=E7=9A=84?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/android.yml       | 1 +
 .github/workflows/android_pr.yml    | 3 ++-
 .github/workflows/crowdin.yml       | 2 ++
 app/proguard-rules.pro              | 9 +++++----
 app/src/main/assets/tips/tips-zh_CN | 2 +-
 crowdin.yml                         | 4 +---
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 3010d78726..64445e0aae 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -9,6 +9,7 @@ on:
       - ".idea/"
       - "doc/*"
       - "*.md"
+      - "app/src/assets/**"
       - ".github/workflows/crowdin.yml"
       - "crowdin.yml"
   workflow_dispatch:
diff --git a/.github/workflows/android_pr.yml b/.github/workflows/android_pr.yml
index bed90a21bc..82631da273 100644
--- a/.github/workflows/android_pr.yml
+++ b/.github/workflows/android_pr.yml
@@ -9,6 +9,7 @@ on:
       - ".idea/"
       - "doc/*"
       - "*.md"
+      - "app/src/assets/**"
       - ".github/workflows/crowdin.yml"
       - "crowdin.yml"
   workflow_dispatch:
@@ -58,7 +59,7 @@ jobs:
           COMMIT_MESSAGE: |+
             **New PR to gitHub\!**
 
-            `${{ github.event_name }}`
+            `$(git log ${{ github.event.before }}..${{ github.event.after }} --pretty=format:'%h %s')`
 
             by ${{ github.triggering_actor }}
         run: |
diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml
index 8deaea78da..c591385d76 100644
--- a/.github/workflows/crowdin.yml
+++ b/.github/workflows/crowdin.yml
@@ -27,11 +27,13 @@ jobs:
          upload_sources: true
          upload_translations: true
          download_translations: true
+         skip_untranslated_files: true
 
          # Pull request settings
          create_pull_request: true
          localization_branch_name: crowdin_branch
          pull_request_labels: 'enhancement, documentation'
+         pull_request_title: '[Translation] Update translation from Crowdin'
 
          # Global settings
          config: 'crowdin.yml'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 36267f73dd..f52ae83dd8 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,14 +1,15 @@
 -keep class com.sevtinge.hyperceiler.XposedInit
 -keep class com.sevtinge.hyperceiler.module.app.SystemFrameworkForCorePatch
+-keep class com.sevtinge.hyperceiler.ui.LauncherActivity
 -keep class com.sevtinge.hyperceiler.utils.blur.*
+-keep class com.sevtinge.hyperceiler.utils.Helpers { boolean isModuleActive; }
+-keep class com.sevtinge.hyperceiler.utils.Helpers { int XposedVersion; }
 -keep class com.sevtinge.hyperceiler.utils.XposedUtils
--keep class com.sevtinge.hyperceiler.ui.LauncherActivity
--keep class com.sevtinge.hyperceiler.utils.Helpers{boolean isModuleActive;}
--keep class com.sevtinge.hyperceiler.utils.Helpers{int XposedVersion;}
 -keep class moralnorm.**{*;}
 -keep class org.luckypray.dexkit.*
--keep class * extends com.sevtinge.hyperceiler.module.base.BaseHook
 -keep class * extends com.sevtinge.hyperceiler.ui.fragment.base.*
+-keep class * extends com.sevtinge.hyperceiler.module.base.*
+
 -dontwarn android.app.ActivityTaskManager$RootTaskInfo
 -dontwarn miui.app.MiuiFreeFormManager$MiuiFreeFormStackInfo
 -dontwarn com.android.internal.view.menu.MenuBuilder
diff --git a/app/src/main/assets/tips/tips-zh_CN b/app/src/main/assets/tips/tips-zh_CN
index c4c51550d0..54b8802c92 100644
--- a/app/src/main/assets/tips/tips-zh_CN
+++ b/app/src/main/assets/tips/tips-zh_CN
@@ -5,7 +5,7 @@
 // 全角字符与半角字符间请保留一个半角空格，括号请尽量使用半角符号
 
 叮咚~ 来了一条消息！    哦，是 Tip 啊，那没事了 (
-您可以在 \"关于-支持\" 中捐赠以支持和维护我们的开发。
+您可以在 “关于-支持” 中捐赠以支持和维护我们的开发。
 想要联系开发者？Telegram@Sevtinge_PM_bot 或者 哔哩哔哩@绀漓丨Sevtinge。
 想要加入群聊一起划水？Telegram@hyperceiler 或者在 QQ 搜索 247909573 加入群聊。
 HyperCeiler = Hyper + Ceiler, Ceiler = Ceil + er.
diff --git a/crowdin.yml b/crowdin.yml
index 5569086134..f5ece42b64 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,14 +1,12 @@
 project_id_env: CROWDIN_PROJECT_ID
 api_token_env: CROWDIN_API_TOKEN
-pull_request_title: '[Translation] Update translation from Crowdin'
 preserve_hierarchy: true
 
 files:
   - source: /app/src/main/assets/tips/tips
     translation: /app/src/main/assets/tips/tips-%locale_with_underscore%
     type: hyper_ceiler_tips
-    skip_untranslated_strings: true
+
   - source: /app/src/main/res/values/strings.xml
     translation: /app/src/main/res/values-%two_letters_code%/%original_file_name%
     type: android
-    skip_untranslated_strings: true