react-native-kookit 0.4.0 → 0.4.2

package/android/src/main/java/expo/modules/kookit/ReactNativeKookitModule.kt

@@ -847,11 +847,35 @@ class ReactNativeKookitModule : Module() {
             latch.await()
           }
           
-          // Set language
-          val locale = parseLocale(language)
-          val result = textToSpeech?.setLanguage(locale)
-          if (result == TextToSpeech.LANG_MISSING_DATA || result == TextToSpeech.LANG_NOT_SUPPORTED) {
-            throw Exception("Language not supported: $language")
+          // Set language with fallback for devices (e.g. OPPO ColorOS) that
+          // reject certain locale variants like "zh-CN" but accept "zh".
+          fun trySetLanguage(tts: TextToSpeech, loc: Locale): Int =
+            tts.setLanguage(loc)
+
+          val primaryLocale = parseLocale(language)
+          val fallbackLocales: List<Locale> = buildList {
+            add(primaryLocale)
+            // BCP-47 tag (handles script variants such as zh-Hans-CN)
+            add(Locale.forLanguageTag(language))
+            // language-only, e.g. Locale("zh") for "zh-CN"
+            if (primaryLocale.country.isNotEmpty()) add(Locale(primaryLocale.language))
+            // device default as last resort
+            add(Locale.getDefault())
+          }
+
+          var langSetResult = TextToSpeech.LANG_NOT_SUPPORTED
+          for (loc in fallbackLocales) {
+            val r = textToSpeech?.let { trySetLanguage(it, loc) }
+              ?: TextToSpeech.LANG_NOT_SUPPORTED
+            if (r != TextToSpeech.LANG_MISSING_DATA && r != TextToSpeech.LANG_NOT_SUPPORTED) {
+              langSetResult = r
+              break
+            }
+          }
+          if (langSetResult == TextToSpeech.LANG_MISSING_DATA || langSetResult == TextToSpeech.LANG_NOT_SUPPORTED) {
+            // Last resort: proceed anyway; some OEM TTS engines ignore setLanguage
+            // but still synthesize correctly when a voice is set via voiceId.
+            android.util.Log.w("ReactNativeKookit", "Language not supported by TTS engine: $language, proceeding anyway")
           }
           
           // Set voice if specified
@@ -1059,9 +1083,15 @@ class ReactNativeKookitModule : Module() {
   }
 
   /**
-   * Parse locale string (e.g., "en-US", "zh-CN") to Locale object
+   * Parse locale string (e.g., "en-US", "zh-CN") to Locale object.
+   * Uses Locale.forLanguageTag first (proper BCP-47 support), then falls back
+   * to the manual split approach for older-style identifiers.
    */
   private fun parseLocale(localeString: String): Locale {
+    // Locale.forLanguageTag handles "zh-CN", "zh-Hans-CN", etc. correctly.
+    val tag = Locale.forLanguageTag(localeString)
+    if (tag.language.isNotEmpty()) return tag
+    // Fallback for underscore-separated identifiers (e.g. "zh_CN")
     val parts = localeString.split("-", "_")
     return when (parts.size) {
       1 -> Locale(parts[0])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-kookit",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "React Native module for intercepting volume button presses on iOS and Android, with FTP client functionality",
   "main": "build/index.js",
   "types": "build/index.d.ts",