From de4ff892330610ef2d178e3b55e03771c96180eb Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Wed, 5 Dec 2018 22:47:14 +0100
Subject: [PATCH] some changes

---
 app/src/main/AndroidManifest.xml              |  2 ++
 .../adrienmalin/pingpoints/MatchActivity.kt   | 20 ++++++++++++-------
 app/src/main/res/values-fr/strings.xml        |  4 ++--
 app/src/main/res/values/strings.xml           |  4 ++--
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 136d971..36112d8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="adrienmalin.pingpoints">
+
+    <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
 
     <application
diff --git a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
index 83146f1..a720c42 100644
--- a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
@@ -195,6 +195,9 @@ class MatchActivity : AppCompatActivity() {
                                     players[1].name
                                 )
                             )
+                            putExtra(
+                                RecognizerIntent.EXTRA_MAX_RESULTS, 10
+                            )
                         },
                         REQ_CODE_SPEECH_INPUT
                     )
@@ -217,14 +220,17 @@ class MatchActivity : AppCompatActivity() {
                 matchModel?.apply {
                     if (resultCode == RESULT_OK && data != null) {
                         var understood: Boolean = false
-                        val result: String = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)[0]
-                        for (player in players) {
-                            if (player.pattern?.matcher(result)?.find() == true) {
-                                understood = true
-                                updateScore(player)
-                                updateUI()
-                                break
+                        val results: ArrayList<String> = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
+                        for (result in results) {
+                            for (player in players) {
+                                if (player.pattern?.matcher(result)?.find() == true) {
+                                    understood = true
+                                    updateScore(player)
+                                    updateUI()
+                                    break
+                                }
                             }
+                            if (understood) break
                         }
                         if (!understood) {
                             if (ttsEnabled) {
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index eec3ba7..491f0e6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -32,8 +32,8 @@
     <string name="share_subject">Match Ping Points : %s contre %s</string>
     <string name="share_message">"%s contre %s:\n%s a gagné par %d à %d\nPing Points est disponible sur Google Play\n "</string>
     <string name="match_point">Balle de match</string>
-    <string name="STT_hint">Dîtes : \"%s\" ou \"%s\"</string>
-    <string name="pattern">(?i:%s)</string>
+    <string name="STT_hint">Dîtes : \"Point pour %s\"\nou \"Point pour %s\"</string>
+    <string name="pattern">(?i:Point pour %s)</string>
     <string name="not_understood">Pouvez-vous répéter ?</string>
     <string name="STT_disabled">Reconnaissance vocale désactivée.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8deb299..7ae9d35 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,8 +37,8 @@
     <string name="share_subject">Ping Points Match: %s vs. %s</string>
     <string name="share_message">%s vs. %s:\n%s won by %d to %d\nGet Ping Points on Google Play</string>
     <string name="match_point">Match point</string>
-    <string name="STT_hint">Say: \"%s\" or \"%s\"</string>
-    <string name="pattern">(?i:%s)</string>
+    <string name="STT_hint">Say: \"Point for %s\"\nor \"Point for %s\"</string>
+    <string name="pattern">(?i:Point for %s)</string>
     <string name="not_understood">Can you repeat, please?</string>
     <string name="score" translatable="false">%d - %d</string>
     <string name="STT_disabled">Voice recognition disabled.</string>