From b434feed0b3fbe7f1452a25164249da1844699a3 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Mon, 12 Feb 2024 14:06:21 -0600
Subject: [PATCH] Allow for more language support at an OS level (#998)

---
 app/build.gradle.kts                    | 51 +++----------------------
 app/src/main/AndroidManifest.xml        |  2 +-
 app/src/main/res/resources.properties   |  1 +
 app/src/main/res/xml/locales_config.xml | 43 ---------------------
 4 files changed, 7 insertions(+), 90 deletions(-)
 create mode 100644 app/src/main/res/resources.properties
 delete mode 100644 app/src/main/res/xml/locales_config.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 20aa89aed..25093d8be 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -28,52 +28,6 @@ android {
         versionCode = 1
         versionName = "1.0.0"
 
-        // This is so the build system only includes language resources in the APK for these
-        // languages, preventing translated strings from being included from other libraries that
-        // might support languages this app does not.
-        resourceConfigurations += arrayOf(
-            "af",
-            "be",
-            "bg",
-            "ca",
-            "cs",
-            "da",
-            "de",
-            "el",
-            "en",
-            "en-rGB",
-            "es",
-            "et",
-            "fa",
-            "fi",
-            "fr",
-            "hi",
-            "hr",
-            "hu",
-            "in",
-            "it",
-            "iw",
-            "ja",
-            "ko",
-            "lv",
-            "ml",
-            "nb",
-            "nl",
-            "pl",
-            "pt-rBR",
-            "pt-rPT",
-            "ro",
-            "ru",
-            "sk",
-            "sv",
-            "th",
-            "tr",
-            "uk",
-            "vi",
-            "zh-rCN",
-            "zh-rTW"
-        )
-
         ksp {
             // The location in which the generated Room Database Schemas will be stored in the repo.
             arg("room.schemaLocation", "$projectDir/schemas")
@@ -82,6 +36,11 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    androidResources {
+        @Suppress("UnstableApiUsage")
+        generateLocaleConfig = true
+    }
+
     signingConfigs {
         getByName("debug") {
             keyAlias = "androiddebugkey"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 38fcc9ef5..05f781cc0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,6 @@
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:localeConfig="@xml/locales_config"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
@@ -104,6 +103,7 @@
             </intent-filter>
         </service>
 
+        <!-- This is required to support in-app language picker in Android 12 (API 32) and below -->
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
             android:enabled="false"
diff --git a/app/src/main/res/resources.properties b/app/src/main/res/resources.properties
new file mode 100644
index 000000000..467b3efec
--- /dev/null
+++ b/app/src/main/res/resources.properties
@@ -0,0 +1 @@
+unqualifiedResLocale=en-US
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 0a3c32a9a..000000000
--- a/app/src/main/res/xml/locales_config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
-    <locale android:name="af"/> <!-- Afrikaans -->
-    <locale android:name="be"/> <!-- Belarusian -->
-    <locale android:name="bg"/> <!-- Bulgarian -->
-    <locale android:name="ca"/> <!-- Catalan -->
-    <locale android:name="cs"/> <!-- Czech -->
-    <locale android:name="da"/> <!-- Danish -->
-    <locale android:name="de"/> <!-- German -->
-    <locale android:name="el"/> <!-- Greek -->
-    <locale android:name="en"/> <!-- English (US) -->
-    <locale android:name="en-GB"/> <!-- English (Great Britain) -->
-    <locale android:name="es"/> <!-- Spanish -->
-    <locale android:name="et"/> <!-- Estonian -->
-    <locale android:name="fa"/> <!-- Persian -->
-    <locale android:name="fi"/> <!-- Finnish -->
-    <locale android:name="fr"/> <!-- French -->
-    <locale android:name="hi"/> <!-- Hindi -->
-    <locale android:name="hr"/> <!-- Croatian -->
-    <locale android:name="hu"/> <!-- Hungarian -->
-    <locale android:name="in"/> <!-- Indonesian -->
-    <locale android:name="it"/> <!-- Italian -->
-    <locale android:name="iw"/> <!-- Hebrew -->
-    <locale android:name="ja"/> <!-- Japanese -->
-    <locale android:name="ko"/> <!-- Korean -->
-    <locale android:name="lv"/> <!-- Latvian -->
-    <locale android:name="ml"/> <!-- Malayalam -->
-    <locale android:name="nb"/> <!-- Norwegian -->
-    <locale android:name="nl"/> <!-- Dutch -->
-    <locale android:name="pl"/> <!-- Polish -->
-    <locale android:name="pt-BR"/> <!-- Portuguese (Brazilian) -->
-    <locale android:name="pt-PT"/> <!-- Portuguese (Portugal) -->
-    <locale android:name="ro"/> <!-- Romanian -->
-    <locale android:name="ru"/> <!-- Russian -->
-    <locale android:name="sk"/> <!-- Slovak -->
-    <locale android:name="sv"/> <!-- Swedish -->
-    <locale android:name="th"/> <!-- Thai -->
-    <locale android:name="tr"/> <!-- Turkish -->
-    <locale android:name="uk"/> <!-- Ukrainian -->
-    <locale android:name="vi"/> <!-- Vietnamese -->
-    <locale android:name="zh-CN"/> <!-- Chinese (Simplified) -->
-    <locale android:name="zh-TW"/> <!-- Chinese (Traditional) -->
-</locale-config>