adrien/PingPoints
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

small changes

Browse Source
This commit is contained in:
adrienmalin
2018-12-17 17:23:17 +01:00
parent 0dcef96194
commit 6a51441c0f
8 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
View File

@ -30,7 +30,7 @@ class MatchActivity : AppCompatActivity() {
inner class SttAfterTts : UtteranceProgressListener() {
override fun onDone(id: String) {
SttDialog().show( supportFragmentManager, "SttDialog")
SttDialog().show(supportFragmentManager, "SttDialog")
}
override fun onStart(id: String) {}
@ -69,7 +69,10 @@ class MatchActivity : AppCompatActivity() {
sttEnabled = getBooleanExtra("enableSTT", false)
saveState()
if (ttsEnabled) tts = TextToSpeech(this@MatchActivity, WaitForTtsInit())
if (ttsEnabled) {
tts = TextToSpeech(this@MatchActivity, WaitForTtsInit())
if (sttEnabled) tts?.setOnUtteranceProgressListener(SttAfterTts())
}
if (!sttEnabled) showPopUp(getString(R.string.button_hint))
}
}
@ -127,10 +130,7 @@ class MatchActivity : AppCompatActivity() {
if (matchPoint) scoreSpeech += getString(R.string.match_point)
say(scoreSpeech)
}
if (sttEnabled) {
if (ttsEnabled) tts?.setOnUtteranceProgressListener(SttAfterTts())
else SttDialog().show(supportFragmentManager, "SttDialog")
}
if (sttEnabled and !ttsEnabled) SttDialog().show(supportFragmentManager, "SttDialog")
}
}
}

4
app/src/main/java/adrienmalin/pingpoints/Player.kt
View File

@ -1,9 +1,7 @@
package adrienmalin.pingpoints
import java.util.regex.Pattern
data class Player (
var name: String,
var score: Int,
var pattern: Pattern? = null
var soundex:String? = null
)

3
app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
View File

@ -99,10 +99,11 @@ class SttDialog : DialogFragment() {
players[1].name
)
sttIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply {
putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_WEB_SEARCH)
putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, 10)
putExtra(RecognizerIntent.EXTRA_PARTIAL_RESULTS, true)
putExtra(RecognizerIntent.EXTRA_PREFER_OFFLINE, true)
putExtra(RecognizerIntent.EXTRA_SPEECH_INPUT_COMPLETE_SILENCE_LENGTH_MILLIS, 30000)
}
stt = SpeechRecognizer.createSpeechRecognizer(activity).apply {
setRecognitionListener(SttListener())

0
app/src/main/java/adrienmalin/pingpoints/Html.kt → app/src/main/java/adrienmalin/pingpoints/html.kt
View File