ASR uses input language #2

ufal · Apr 10, 2022 · d27dabd · d27dabd
1 parent ff81801
commit d27dabd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/app/src/main/java/cz/cuni/mff/ufal/translator/ui/VoiceContract.kt b/app/src/main/java/cz/cuni/mff/ufal/translator/ui/VoiceContract.kt
@@ -5,18 +5,18 @@ import android.content.Context
 import android.content.Intent
 import android.speech.RecognizerIntent
 import androidx.activity.result.contract.ActivityResultContract
+import cz.cuni.mff.ufal.translator.ui.translations.models.Language
 
 /**
  * @author Tomas Krabac
  */
-class VoiceContract : ActivityResultContract<Unit, String?>() {
+class VoiceContract(val language: Language) : ActivityResultContract<Unit, String?>() {
 
     override fun createIntent(context: Context, input: Unit): Intent {
-        return Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
-            .putExtra(
-                RecognizerIntent.EXTRA_LANGUAGE_MODEL,
-                RecognizerIntent.LANGUAGE_MODEL_FREE_FORM
-            )
+        return Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply {
+            putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+            putExtra(RecognizerIntent.EXTRA_LANGUAGE, language.locale.language)
+        }
     }
 
     override fun parseResult(resultCode: Int, intent: Intent?): String? {

diff --git a/app/src/main/java/cz/cuni/mff/ufal/translator/ui/translations/screens/widgets/ActionsRow.kt b/app/src/main/java/cz/cuni/mff/ufal/translator/ui/translations/screens/widgets/ActionsRow.kt
@@ -30,8 +30,9 @@ fun ActionsRow(
 ) {
     val isSpeechRecognizerAvailable = viewModel.isSpeechRecognizerAvailable
     val isTextToSpeechAvailable by viewModel.isTextToSpeechAvailable.collectAsState()
+    val inputLanguage by viewModel.inputLanguage.collectAsState()
 
-    val voiceLauncher = rememberLauncherForActivityResult(VoiceContract()) { text ->
+    val voiceLauncher = rememberLauncherForActivityResult(VoiceContract(inputLanguage)) { text ->
         if (text != null) {
             viewModel.setInputText(InputTextData(text, TextSource.Voice))
         }