@capacitor-community/text-to-speech 2.0.1 → 2.1.0-dev.d5032fb.1680890069

package/android/src/main/java/com/getcapacitor/community/tts/TextToSpeech.java

@@ -1,162 +1,186 @@
-package com.getcapacitor.community.tts;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.Build;
-import android.os.Bundle;
-import android.speech.tts.UtteranceProgressListener;
-import android.speech.tts.Voice;
-import android.util.Log;
-import com.getcapacitor.JSArray;
-import com.getcapacitor.JSObject;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Set;
-
-public class TextToSpeech implements android.speech.tts.TextToSpeech.OnInitListener {
-
-    public static final String LOG_TAG = "TextToSpeech";
-
-    private Context context;
-    private android.speech.tts.TextToSpeech tts = null;
-    private int initializationStatus;
-    private JSObject[] supportedVoices = null;
-
-    TextToSpeech(Context context) {
-        this.context = context;
-        try {
-            tts = new android.speech.tts.TextToSpeech(context, this);
-        } catch (Exception ex) {
-            Log.d(LOG_TAG, ex.getLocalizedMessage());
-        }
-    }
-
-    @Override
-    public void onInit(int status) {
-        this.initializationStatus = status;
-    }
-
-    public void speak(
-        String text,
-        String lang,
-        float rate,
-        float pitch,
-        float volume,
-        String callbackId,
-        SpeakResultCallback resultCallback
-    ) {
-        tts.stop();
-        tts.setOnUtteranceProgressListener(
-            new UtteranceProgressListener() {
-                @Override
-                public void onStart(String utteranceId) {}
-
-                @Override
-                public void onDone(String utteranceId) {
-                    resultCallback.onDone();
-                }
-
-                @Override
-                public void onError(String utteranceId) {
-                    resultCallback.onError();
-                }
-            }
-        );
-
-        Locale locale = Locale.forLanguageTag(lang);
-
-        if (Build.VERSION.SDK_INT >= 21) {
-            Bundle ttsParams = new Bundle();
-            ttsParams.putSerializable(android.speech.tts.TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, callbackId);
-            ttsParams.putSerializable(android.speech.tts.TextToSpeech.Engine.KEY_PARAM_VOLUME, volume);
-
-            tts.setLanguage(locale);
-            tts.setSpeechRate(rate);
-            tts.setPitch(pitch);
-            tts.speak(text, android.speech.tts.TextToSpeech.QUEUE_FLUSH, ttsParams, callbackId);
-        } else {
-            HashMap<String, String> ttsParams = new HashMap<>();
-            ttsParams.put(android.speech.tts.TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, callbackId);
-            ttsParams.put(android.speech.tts.TextToSpeech.Engine.KEY_PARAM_VOLUME, Float.toString(volume));
-
-            tts.setLanguage(locale);
-            tts.setSpeechRate(rate);
-            tts.setPitch(pitch);
-            tts.speak(text, android.speech.tts.TextToSpeech.QUEUE_FLUSH, ttsParams);
-        }
-    }
-
-    public void stop() {
-        tts.stop();
-    }
-
-    public JSArray getSupportedLanguages() {
-        ArrayList<String> languages = new ArrayList<>();
-        Set<Locale> supportedLocales = tts.getAvailableLanguages();
-        for (Locale supportedLocale : supportedLocales) {
-            String tag = supportedLocale.toLanguageTag();
-            languages.add(tag);
-        }
-        JSArray result = JSArray.from(languages.toArray());
-        return result;
-    }
-
-    public JSArray getSupportedVoices() {
-        ArrayList<JSObject> voices = new ArrayList<>();
-        Set<Voice> supportedVoices = tts.getVoices();
-        for (Voice supportedVoice : supportedVoices) {
-            JSObject obj = this.convertVoiceToJSObject(supportedVoice);
-            voices.add(obj);
-        }
-        JSArray result = JSArray.from(voices.toArray());
-        return result;
-    }
-
-    public void openInstall() {
-        PackageManager packageManager = context.getPackageManager();
-        Intent installIntent = new Intent();
-        installIntent.setAction(android.speech.tts.TextToSpeech.Engine.ACTION_CHECK_TTS_DATA);
-
-        ResolveInfo resolveInfo = packageManager.resolveActivity(installIntent, PackageManager.MATCH_DEFAULT_ONLY);
-
-        if (resolveInfo != null) {
-            installIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(installIntent);
-        }
-    }
-
-    public boolean isAvailable() {
-        if (tts != null && initializationStatus == android.speech.tts.TextToSpeech.SUCCESS) {
-            return true;
-        }
-        return false;
-    }
-
-    public boolean isLanguageSupported(String lang) {
-        Locale locale = Locale.forLanguageTag(lang);
-        int result = tts.isLanguageAvailable(locale);
-        return result == tts.LANG_AVAILABLE || result == tts.LANG_COUNTRY_AVAILABLE || result == tts.LANG_COUNTRY_VAR_AVAILABLE;
-    }
-
-    public void onDestroy() {
-        if (tts == null) {
-            return;
-        }
-        tts.stop();
-        tts.shutdown();
-    }
-
-    private JSObject convertVoiceToJSObject(Voice voice) {
-        Locale locale = voice.getLocale();
-        JSObject obj = new JSObject();
-        obj.put("voiceURI", voice.getName());
-        obj.put("name", locale.getDisplayLanguage() + " " + locale.getDisplayCountry());
-        obj.put("lang", locale.toLanguageTag());
-        obj.put("localService", !voice.isNetworkConnectionRequired());
-        obj.put("default", false);
-        return obj;
-    }
-}
+package com.getcapacitor.community.tts;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Build;
+import android.os.Bundle;
+import android.speech.tts.UtteranceProgressListener;
+import android.speech.tts.Voice;
+import android.util.Log;
+import com.getcapacitor.JSArray;
+import com.getcapacitor.JSObject;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Set;
+
+public class TextToSpeech implements android.speech.tts.TextToSpeech.OnInitListener {
+
+    public static final String LOG_TAG = "TextToSpeech";
+
+    private Context context;
+    private android.speech.tts.TextToSpeech tts = null;
+    private int initializationStatus;
+    private JSObject[] supportedVoices = null;
+
+    TextToSpeech(Context context) {
+        this.context = context;
+        try {
+            tts = new android.speech.tts.TextToSpeech(context, this);
+        } catch (Exception ex) {
+            Log.d(LOG_TAG, ex.getLocalizedMessage());
+        }
+    }
+
+    @Override
+    public void onInit(int status) {
+        this.initializationStatus = status;
+    }
+
+    public void speak(
+        String text,
+        String lang,
+        float rate,
+        float pitch,
+        float volume,
+        int voice,
+        String callbackId,
+        SpeakResultCallback resultCallback
+    ) {
+        tts.stop();
+        tts.setOnUtteranceProgressListener(
+            new UtteranceProgressListener() {
+                @Override
+                public void onStart(String utteranceId) {}
+
+                @Override
+                public void onDone(String utteranceId) {
+                    resultCallback.onDone();
+                }
+
+                @Override
+                public void onError(String utteranceId) {
+                    resultCallback.onError();
+                }
+            }
+        );
+
+        Locale locale = Locale.forLanguageTag(lang);
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            Bundle ttsParams = new Bundle();
+            ttsParams.putSerializable(android.speech.tts.TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, callbackId);
+            ttsParams.putSerializable(android.speech.tts.TextToSpeech.Engine.KEY_PARAM_VOLUME, volume);
+
+            tts.setLanguage(locale);
+            tts.setSpeechRate(rate);
+            tts.setPitch(pitch);
+
+            if (voice >= 0) {
+                ArrayList<Voice> supportedVoices = getSupportedVoicesOrdered();
+                if (voice < supportedVoices.size()) {
+                    Voice newVoice = supportedVoices.get(voice);
+                    int resultCode = tts.setVoice(newVoice);
+                }
+            }
+
+            tts.speak(text, android.speech.tts.TextToSpeech.QUEUE_FLUSH, ttsParams, callbackId);
+        } else {
+            HashMap<String, String> ttsParams = new HashMap<>();
+            ttsParams.put(android.speech.tts.TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, callbackId);
+            ttsParams.put(android.speech.tts.TextToSpeech.Engine.KEY_PARAM_VOLUME, Float.toString(volume));
+
+            tts.setLanguage(locale);
+            tts.setSpeechRate(rate);
+            tts.setPitch(pitch);
+            tts.speak(text, android.speech.tts.TextToSpeech.QUEUE_FLUSH, ttsParams);
+        }
+    }
+
+    public void stop() {
+        tts.stop();
+    }
+
+    public JSArray getSupportedLanguages() {
+        ArrayList<String> languages = new ArrayList<>();
+        Set<Locale> supportedLocales = tts.getAvailableLanguages();
+        for (Locale supportedLocale : supportedLocales) {
+            String tag = supportedLocale.toLanguageTag();
+            languages.add(tag);
+        }
+        JSArray result = JSArray.from(languages.toArray());
+        return result;
+    }
+
+    public ArrayList<Voice> getSupportedVoicesOrdered() {
+        Set<Voice> supportedVoices = tts.getVoices();
+        ArrayList<Voice> orderedVoices = new ArrayList<Voice>();
+        for (Voice supportedVoice : supportedVoices) {
+            orderedVoices.add(supportedVoice);
+        }
+
+        Comparator<Voice> voiceComparator = Comparator.comparing(v -> v.hashCode());
+        orderedVoices.sort(voiceComparator);
+
+        return orderedVoices;
+    }
+
+    public JSArray getSupportedVoices() {
+        ArrayList<JSObject> voices = new ArrayList<>();
+        ArrayList<Voice> supportedVoices = getSupportedVoicesOrdered();
+        for (Voice supportedVoice : supportedVoices) {
+            JSObject obj = this.convertVoiceToJSObject(supportedVoice);
+            voices.add(obj);
+        }
+        JSArray result = JSArray.from(voices.toArray());
+        return result;
+    }
+
+    public void openInstall() {
+        PackageManager packageManager = context.getPackageManager();
+        Intent installIntent = new Intent();
+        installIntent.setAction(android.speech.tts.TextToSpeech.Engine.ACTION_CHECK_TTS_DATA);
+
+        ResolveInfo resolveInfo = packageManager.resolveActivity(installIntent, PackageManager.MATCH_DEFAULT_ONLY);
+
+        if (resolveInfo != null) {
+            installIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(installIntent);
+        }
+    }
+
+    public boolean isAvailable() {
+        if (tts != null && initializationStatus == android.speech.tts.TextToSpeech.SUCCESS) {
+            return true;
+        }
+        return false;
+    }
+
+    public boolean isLanguageSupported(String lang) {
+        Locale locale = Locale.forLanguageTag(lang);
+        int result = tts.isLanguageAvailable(locale);
+        return result == tts.LANG_AVAILABLE || result == tts.LANG_COUNTRY_AVAILABLE || result == tts.LANG_COUNTRY_VAR_AVAILABLE;
+    }
+
+    public void onDestroy() {
+        if (tts == null) {
+            return;
+        }
+        tts.stop();
+        tts.shutdown();
+    }
+
+    private JSObject convertVoiceToJSObject(Voice voice) {
+        Locale locale = voice.getLocale();
+        JSObject obj = new JSObject();
+        obj.put("voiceURI", voice.getName());
+        obj.put("name", locale.getDisplayLanguage() + " " + locale.getDisplayCountry());
+        obj.put("lang", locale.toLanguageTag());
+        obj.put("localService", !voice.isNetworkConnectionRequired());
+        obj.put("default", false);
+        return obj;
+    }
+}

package/android/src/main/java/com/getcapacitor/community/tts/TextToSpeechPlugin.java

@@ -1,130 +1,131 @@
-package com.getcapacitor.community.tts;
-
-import com.getcapacitor.JSArray;
-import com.getcapacitor.JSObject;
-import com.getcapacitor.Plugin;
-import com.getcapacitor.PluginCall;
-import com.getcapacitor.PluginMethod;
-import com.getcapacitor.annotation.CapacitorPlugin;
-
-@CapacitorPlugin(name = "TextToSpeech")
-public class TextToSpeechPlugin extends Plugin {
-
-    public static final String LOG_TAG = "TextToSpeechPlugin";
-
-    public static final String ERROR_UTTERANCE = "Failed to read text.";
-    public static final String ERROR_UNSUPPORTED_LANGUAGE = "This language is not supported.";
-
-    private TextToSpeech implementation;
-
-    @Override
-    public void load() {
-        implementation = new TextToSpeech(getContext());
-    }
-
-    @PluginMethod
-    public void speak(PluginCall call) {
-        boolean isAvailable = implementation.isAvailable();
-        if (!isAvailable) {
-            call.unavailable("Not yet initialized or not available on this device.");
-            return;
-        }
-
-        String text = call.getString("text", "");
-        String lang = call.getString("lang", "en-US");
-        float rate = call.getFloat("rate", 1.0f);
-        float pitch = call.getFloat("pitch", 1.0f);
-        float volume = call.getFloat("volume", 1.0f);
-
-        boolean isLanguageSupported = implementation.isLanguageSupported(lang);
-        if (!isLanguageSupported) {
-            call.reject(ERROR_UNSUPPORTED_LANGUAGE);
-            return;
-        }
-
-        SpeakResultCallback resultCallback = new SpeakResultCallback() {
-            @Override
-            public void onDone() {
-                call.resolve();
-            }
-
-            @Override
-            public void onError() {
-                call.reject(ERROR_UTTERANCE);
-            }
-        };
-
-        try {
-            implementation.speak(text, lang, rate, pitch, volume, call.getCallbackId(), resultCallback);
-        } catch (Exception ex) {
-            call.reject(ex.getLocalizedMessage());
-        }
-    }
-
-    @PluginMethod
-    public void stop(PluginCall call) {
-        boolean isAvailable = implementation.isAvailable();
-        if (!isAvailable) {
-            call.unavailable("Not yet initialized or not available on this device.");
-            return;
-        }
-        try {
-            implementation.stop();
-            call.resolve();
-        } catch (Exception ex) {
-            call.reject(ex.getLocalizedMessage());
-        }
-    }
-
-    @PluginMethod
-    public void getSupportedLanguages(PluginCall call) {
-        try {
-            JSArray languages = implementation.getSupportedLanguages();
-            JSObject ret = new JSObject();
-            ret.put("languages", languages);
-            call.resolve(ret);
-        } catch (Exception ex) {
-            call.reject(ex.getLocalizedMessage());
-        }
-    }
-
-    @PluginMethod
-    public void getSupportedVoices(PluginCall call) {
-        try {
-            JSArray voices = implementation.getSupportedVoices();
-            JSObject ret = new JSObject();
-            ret.put("voices", voices);
-            call.resolve(ret);
-        } catch (Exception ex) {
-            call.reject(ex.getLocalizedMessage());
-        }
-    }
-
-    @PluginMethod
-    public void isLanguageSupported(PluginCall call) {
-        String lang = call.getString("lang", "");
-        try {
-            boolean isLanguageSupported = implementation.isLanguageSupported(lang);
-            JSObject ret = new JSObject();
-            ret.put("supported", isLanguageSupported);
-            call.resolve(ret);
-        } catch (Exception ex) {
-            call.reject(ex.getLocalizedMessage());
-        }
-    }
-
-    @PluginMethod
-    public void openInstall(PluginCall call) {
-        try {
-            implementation.openInstall();
-            call.resolve();
-        } catch (Exception ex) {
-            call.reject(ex.getLocalizedMessage());
-        }
-    }
-
-    @Override
-    protected void handleOnDestroy() {
-        implementation.onDestroy();
-    }
-}
+package com.getcapacitor.community.tts;
+
+import com.getcapacitor.JSArray;
+import com.getcapacitor.JSObject;
+import com.getcapacitor.Plugin;
+import com.getcapacitor.PluginCall;
+import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.CapacitorPlugin;
+
+@CapacitorPlugin(name = "TextToSpeech")
+public class TextToSpeechPlugin extends Plugin {
+
+    public static final String LOG_TAG = "TextToSpeechPlugin";
+
+    public static final String ERROR_UTTERANCE = "Failed to read text.";
+    public static final String ERROR_UNSUPPORTED_LANGUAGE = "This language is not supported.";
+
+    private TextToSpeech implementation;
+
+    @Override
+    public void load() {
+        implementation = new TextToSpeech(getContext());
+    }
+
+    @PluginMethod
+    public void speak(PluginCall call) {
+        boolean isAvailable = implementation.isAvailable();
+        if (!isAvailable) {
+            call.unavailable("Not yet initialized or not available on this device.");
+            return;
+        }
+
+        String text = call.getString("text", "");
+        String lang = call.getString("lang", "en-US");
+        float rate = call.getFloat("rate", 1.0f);
+        float pitch = call.getFloat("pitch", 1.0f);
+        float volume = call.getFloat("volume", 1.0f);
+        int voice = call.getInt("voice", -1);
+
+        boolean isLanguageSupported = implementation.isLanguageSupported(lang);
+        if (!isLanguageSupported) {
+            call.reject(ERROR_UNSUPPORTED_LANGUAGE);
+            return;
+        }
+
+        SpeakResultCallback resultCallback = new SpeakResultCallback() {
+            @Override
+            public void onDone() {
+                call.resolve();
+            }
+
+            @Override
+            public void onError() {
+                call.reject(ERROR_UTTERANCE);
+            }
+        };
+
+        try {
+            implementation.speak(text, lang, rate, pitch, volume, voice, call.getCallbackId(), resultCallback);
+        } catch (Exception ex) {
+            call.reject(ex.getLocalizedMessage());
+        }
+    }
+
+    @PluginMethod
+    public void stop(PluginCall call) {
+        boolean isAvailable = implementation.isAvailable();
+        if (!isAvailable) {
+            call.unavailable("Not yet initialized or not available on this device.");
+            return;
+        }
+        try {
+            implementation.stop();
+            call.resolve();
+        } catch (Exception ex) {
+            call.reject(ex.getLocalizedMessage());
+        }
+    }
+
+    @PluginMethod
+    public void getSupportedLanguages(PluginCall call) {
+        try {
+            JSArray languages = implementation.getSupportedLanguages();
+            JSObject ret = new JSObject();
+            ret.put("languages", languages);
+            call.resolve(ret);
+        } catch (Exception ex) {
+            call.reject(ex.getLocalizedMessage());
+        }
+    }
+
+    @PluginMethod
+    public void getSupportedVoices(PluginCall call) {
+        try {
+            JSArray voices = implementation.getSupportedVoices();
+            JSObject ret = new JSObject();
+            ret.put("voices", voices);
+            call.resolve(ret);
+        } catch (Exception ex) {
+            call.reject(ex.getLocalizedMessage());
+        }
+    }
+
+    @PluginMethod
+    public void isLanguageSupported(PluginCall call) {
+        String lang = call.getString("lang", "");
+        try {
+            boolean isLanguageSupported = implementation.isLanguageSupported(lang);
+            JSObject ret = new JSObject();
+            ret.put("supported", isLanguageSupported);
+            call.resolve(ret);
+        } catch (Exception ex) {
+            call.reject(ex.getLocalizedMessage());
+        }
+    }
+
+    @PluginMethod
+    public void openInstall(PluginCall call) {
+        try {
+            implementation.openInstall();
+            call.resolve();
+        } catch (Exception ex) {
+            call.reject(ex.getLocalizedMessage());
+        }
+    }
+
+    @Override
+    protected void handleOnDestroy() {
+        implementation.onDestroy();
+    }
+}