Merge pull request #206 from gavine99/speechtotext_s1

Basic speech to text for compose (and qkreply)
This commit is contained in:
octoshrimpy
2025-01-12 13:35:01 -05:00
committed by GitHub
4 changed files with 72 additions and 0 deletions
@@ -30,9 +30,11 @@ import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.provider.ContactsContract import android.provider.ContactsContract
import android.provider.MediaStore import android.provider.MediaStore
import android.speech.RecognizerIntent
import android.text.format.DateFormat import android.text.format.DateFormat
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
@@ -62,6 +64,7 @@ import dev.octoshrimpy.quik.model.Recipient
import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.autoDisposable import com.uber.autodispose.autoDisposable
import dagger.android.AndroidInjection import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.common.widget.QkEditText
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject import io.reactivex.subjects.Subject
@@ -121,6 +124,26 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
private var cameraDestination: Uri? = null private var cameraDestination: Uri? = null
private val speechResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
if (result.resultCode != Activity.RESULT_OK)
return@registerForActivityResult
// check returned results are good
val match = result.data?.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
if ((match === null) || (match.size < 1) || (match[0].isNullOrEmpty()))
return@registerForActivityResult
// get the edit text view
val message = findViewById<QkEditText>(R.id.message)
if (message === null)
return@registerForActivityResult
// populate message box with data returned by STT, set cursor to end, and focus
message.append(match[0])
message.setSelection(message.text.length)
message.requestFocus()
}
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this) AndroidInjection.inject(this)
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@@ -155,6 +178,17 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
.autoDisposable(scope()) .autoDisposable(scope())
.subscribe() .subscribe()
findViewById<QkEditText>(R.id.message)?.setOnLongClickListener {
val speechRecognizerIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
speechRecognizerIntent.putExtra(
RecognizerIntent.EXTRA_LANGUAGE_MODEL,
RecognizerIntent.LANGUAGE_MODEL_FREE_FORM
)
// include if want a custom message that the STT can (optionally) display speechRecognizerIntent.putExtra(RecognizerIntent.EXTRA_PROMPT, "Dictate your message")
speechResultLauncher.launch(speechRecognizerIntent)
true
}
window.callback = ComposeWindowCallback(window.callback, this) window.callback = ComposeWindowCallback(window.callback, this)
} }
@@ -18,13 +18,17 @@
*/ */
package dev.octoshrimpy.quik.feature.qkreply package dev.octoshrimpy.quik.feature.qkreply
import android.app.Activity
import android.content.Intent
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.speech.RecognizerIntent
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.view.ViewGroup import android.view.ViewGroup
import android.view.Window import android.view.Window
import android.view.WindowManager import android.view.WindowManager
import androidx.activity.result.contract.ActivityResultContracts
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProviders
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
@@ -38,6 +42,7 @@ import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint
import dev.octoshrimpy.quik.common.util.extensions.setVisible import dev.octoshrimpy.quik.common.util.extensions.setVisible
import dev.octoshrimpy.quik.feature.compose.MessagesAdapter import dev.octoshrimpy.quik.feature.compose.MessagesAdapter
import dagger.android.AndroidInjection import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.common.widget.QkEditText
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.qkreply_activity.* import kotlinx.android.synthetic.main.qkreply_activity.*
@@ -55,6 +60,26 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView {
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[QkReplyViewModel::class.java] } private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[QkReplyViewModel::class.java] }
private val speechResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
if (result.resultCode != Activity.RESULT_OK)
return@registerForActivityResult
// check returned results are good
val match = result.data?.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
if ((match === null) || (match.size < 1) || (match[0].isNullOrEmpty()))
return@registerForActivityResult
// get the edit text view
val message = findViewById<QkEditText>(R.id.message)
if (message === null)
return@registerForActivityResult
// populate message box with data returned by STT, set cursor to end, and focus
message.setText(match[0])
message.setSelection(message.text.length)
message.requestFocus()
}
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this) AndroidInjection.inject(this)
supportRequestWindowFeature(Window.FEATURE_NO_TITLE) supportRequestWindowFeature(Window.FEATURE_NO_TITLE)
@@ -74,6 +99,17 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView {
messages.adapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() { messages.adapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
override fun onChanged() = messages.scrollToPosition(adapter.itemCount - 1) override fun onChanged() = messages.scrollToPosition(adapter.itemCount - 1)
}) })
findViewById<QkEditText>(R.id.message)?.setOnLongClickListener {
val speechRecognizerIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
speechRecognizerIntent.putExtra(
RecognizerIntent.EXTRA_LANGUAGE_MODEL,
RecognizerIntent.LANGUAGE_MODEL_FREE_FORM
)
// include if want a custom message that the STT can (optionally) display speechRecognizerIntent.putExtra(RecognizerIntent.EXTRA_PROMPT, "Dictate your message")
speechResultLauncher.launch(speechRecognizerIntent)
true
}
} }
override fun render(state: QkReplyState) { override fun render(state: QkReplyState) {
@@ -242,6 +242,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:hint="@string/compose_hint" android:hint="@string/compose_hint"
android:inputType="textLongMessage|textCapSentences|textMultiLine" android:inputType="textLongMessage|textCapSentences|textMultiLine"
android:longClickable="true"
android:maxLines="6" android:maxLines="6"
android:minHeight="44dp" android:minHeight="44dp"
android:paddingStart="16dp" android:paddingStart="16dp"
@@ -87,6 +87,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:hint="@string/compose_hint" android:hint="@string/compose_hint"
android:inputType="textLongMessage|textCapSentences|textMultiLine" android:inputType="textLongMessage|textCapSentences|textMultiLine"
android:longClickable="true"
android:maxLines="6" android:maxLines="6"
android:minHeight="44dp" android:minHeight="44dp"
android:paddingStart="16dp" android:paddingStart="16dp"