From 1fa8ea1f0b0a0dcf59071cb0a012855c632de9a2 Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Sat, 15 Dec 2018 16:19:46 +0100
Subject: [PATCH] Change catchphrase to "point %s"

---
 app/build.gradle                                      | 4 ++--
 app/src/main/java/adrienmalin/pingpoints/SttDialog.kt | 2 ++
 app/src/main/res/values-fr/strings.xml                | 6 +++---
 app/src/main/res/values/strings.xml                   | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9d51d31..24ec19f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "adrienmalin.pingpoints"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 5
-        versionName "2.0"
+        versionCode 6
+        versionName "2.1"
         vectorDrawables.useSupportLibrary true
     }
     buildTypes {
diff --git a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
index 6a0ac68..faf2c14 100644
--- a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
@@ -11,6 +11,7 @@ import android.speech.RecognitionListener
 import android.speech.RecognizerIntent
 import android.speech.SpeechRecognizer
 import android.support.v4.app.DialogFragment
+import android.util.Log
 import android.view.LayoutInflater
 import android.widget.ImageView
 import android.widget.TextView
@@ -109,6 +110,7 @@ class SttDialog : DialogFragment() {
                     stt = SpeechRecognizer.createSpeechRecognizer(activity).apply {
                         setRecognitionListener(SttListener())
                         try {
+                            stopListening()
                             startListening(sttIntent)
                         } catch (e: ActivityNotFoundException) {
                             sttEnabled = false
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 491f0e6..4ad8821 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -30,10 +30,10 @@
     <string name="share">Partager</string>
     <string name="victory_speech">%s gagne par %d à %d.</string>
     <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="share_message">"%s contre %s:\n%s a gagné par %d à %d\nPing Points est disponible sur Google Play"</string>
     <string name="match_point">Balle de match</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="STT_hint">Dîtes : \"point %s\"\nou \"point %s\"</string>
+    <string name="pattern">(?i:(point|.) %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 7c239b4..ef2a9f3 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: \"Point for %s\"\nor \"Point for %s\"</string>
-    <string name="pattern">(?i:Point for %s)</string>
+    <string name="STT_hint">Say: \"point %s\"\nor \"point %s\"</string>
+    <string name="pattern">(?i:(point|.) %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>