From bd19cce8020e5ae05bfa8439758063396ac3e904 Mon Sep 17 00:00:00 2001
From: Lambada10 <62511588+Lambada10@users.noreply.github.com>
Date: Sat, 23 Nov 2024 12:59:37 +0100
Subject: [PATCH] Switch to AGP generated locale config

---
 .idea/misc.xml                          |  2 +-
 app/build.gradle.kts                    |  7 +++----
 app/src/main/AndroidManifest.xml        |  1 -
 app/src/main/res/resources.properties   |  1 +
 app/src/main/res/xml/locales_config.xml | 14 --------------
 5 files changed, 5 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/res/resources.properties
 delete mode 100644 app/src/main/res/xml/locales_config.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0ad17cb..74dd639 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8dd8b8e..a3a98a2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -18,14 +18,13 @@ android {
         versionCode = 421
         versionName = "4.2.1"
 
-        resourceConfigurations += arrayOf(
-            "ar", "de", "es", "en", "fa", "fil", "in", "ja", "pl", "pt", "pt-rBR", "ro", "tr", "vi", "zh-rCN", "zh-rTW"
-        )
-
         vectorDrawables {
             useSupportLibrary = true
         }
     }
+    androidResources {
+        generateLocaleConfig = true
+    }
     signingConfigs {
         create("release") {
             if (System.getenv("RELEASE_STORE_FILE") != null) {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2478318..7371b6e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,7 +26,6 @@
         android:fullBackupContent="@xml/backup_rules"
         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.SongSync"
diff --git a/app/src/main/res/resources.properties b/app/src/main/res/resources.properties
new file mode 100644
index 0000000..5d84260
--- /dev/null
+++ b/app/src/main/res/resources.properties
@@ -0,0 +1 @@
+unqualifiedResLocale = en-US
\ No newline at end of file
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
deleted file mode 100644
index 5342c92..0000000
--- a/app/src/main/res/xml/locales_config.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
-    <locale android:name="ar" />
-    <locale android:name="de" />
-    <locale android:name="en" />
-    <locale android:name="es" />
-    <locale android:name="in" />
-    <locale android:name="ja" />
-    <locale android:name="pt" />
-    <locale android:name="pt-rBR" />
-    <locale android:name="ro" />
-    <locale android:name="vi" />
-    <locale android:name="zh-rCN" />
-</locale-config>
\ No newline at end of file