From 4afe549a8d52fb6f496a3c5075008d95f3d073f7 Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Tue, 9 May 2023 11:51:11 +0800
Subject: [PATCH] Modify refactor the locales config code

---
 app/build.gradle                             |  2 --
 app/src/main/AndroidManifest.xml             |  3 ++-
 app/src/main/res/xml/locales_config.xml      | 12 ++++++------
 demo-app/build.gradle                        |  2 --
 demo-app/src/main/AndroidManifest.xml        |  6 ++++--
 demo-app/src/main/res/xml/locales_config.xml | 12 ++++++------
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index de172a2..bf75ef1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,8 +37,6 @@ android {
 
         /** 添加 App Center Secret 到 BuildConfig */
         buildConfigField('String', 'APP_CENTER_SECRET', "\"${getAppCenterSecret()}\"")
-
-        resourceConfigurations += ["en", "ja", "zh_CN", "zh_HK", "zh_MO", "zh_TW"]
     }
 
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 46969b4..ba816e3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,10 +15,11 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:localeConfig="@xml/locales_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AppErrorsTracking"
-        android:localeConfig="@xml/locales_config">
+        tools:targetApi="tiramisu">
 
         <meta-data
             android:name="xposedmodule"
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
index c6df34e..a0d06ba 100644
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale-config xmlns:android="http://schemas.android.com/apk/res/android">
-    <locale android:name="en"/> <!-- English -->
-    <locale android:name="ja"/> <!-- Japanese -->
-    <locale android:name="zh-Hans-CN"/> <!-- Chinese (Simplified) -->
-    <locale android:name="zh-Hant-HK"/> <!-- Chinese (Hong Kong) -->
-    <locale android:name="zh-Hant-MO"/> <!-- Chinese (Macau) -->
-    <locale android:name="zh-Hant-TW"/> <!-- Chinese (Taiwan) -->
+    <locale android:name="en" />
+    <locale android:name="ja" />
+    <locale android:name="zh-Hans-CN" />
+    <locale android:name="zh-Hant-HK" />
+    <locale android:name="zh-Hant-MO" />
+    <locale android:name="zh-Hant-TW" />
 </locale-config>
\ No newline at end of file
diff --git a/demo-app/build.gradle b/demo-app/build.gradle
index a0ea409..9ca13dc 100644
--- a/demo-app/build.gradle
+++ b/demo-app/build.gradle
@@ -35,8 +35,6 @@ android {
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         consumerProguardFiles 'consumer-rules.pro'
-
-        resourceConfigurations += ["en", "ja", "zh_CN", "zh_HK", "zh_MO", "zh_TW"]
     }
 
     buildTypes {
diff --git a/demo-app/src/main/AndroidManifest.xml b/demo-app/src/main/AndroidManifest.xml
index 7f94c65..6df3b16 100644
--- a/demo-app/src/main/AndroidManifest.xml
+++ b/demo-app/src/main/AndroidManifest.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:name=".application.DemoApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:localeConfig="@xml/locales_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AppErrorsDemo"
-        android:localeConfig="@xml/locales_config">
+        tools:targetApi="tiramisu">
 
         <activity
             android:name=".ui.activity.MainActivity"
diff --git a/demo-app/src/main/res/xml/locales_config.xml b/demo-app/src/main/res/xml/locales_config.xml
index c6df34e..a0d06ba 100644
--- a/demo-app/src/main/res/xml/locales_config.xml
+++ b/demo-app/src/main/res/xml/locales_config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale-config xmlns:android="http://schemas.android.com/apk/res/android">
-    <locale android:name="en"/> <!-- English -->
-    <locale android:name="ja"/> <!-- Japanese -->
-    <locale android:name="zh-Hans-CN"/> <!-- Chinese (Simplified) -->
-    <locale android:name="zh-Hant-HK"/> <!-- Chinese (Hong Kong) -->
-    <locale android:name="zh-Hant-MO"/> <!-- Chinese (Macau) -->
-    <locale android:name="zh-Hant-TW"/> <!-- Chinese (Taiwan) -->
+    <locale android:name="en" />
+    <locale android:name="ja" />
+    <locale android:name="zh-Hans-CN" />
+    <locale android:name="zh-Hant-HK" />
+    <locale android:name="zh-Hant-MO" />
+    <locale android:name="zh-Hant-TW" />
 </locale-config>
\ No newline at end of file