diff --git a/app/build.gradle b/app/build.gradle index 24ec19f..9d51d31 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "adrienmalin.pingpoints" minSdkVersion 15 targetSdkVersion 28 - versionCode 6 - versionName "2.1" + versionCode 5 + versionName "2.0" vectorDrawables.useSupportLibrary true } buildTypes { diff --git a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt index 6ba3980..6ecdf45 100644 --- a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt +++ b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt @@ -59,8 +59,8 @@ class MatchActivity : AppCompatActivity() { val player1Name = getStringExtra("player1Name") val player2Name = getStringExtra("player2Name") players = listOf( - Player(player1Name, 0), - Player(player2Name, 0) + Player(player1Name, 0, Pattern.compile(getString(R.string.pattern, player1Name))), + Player(player2Name, 0, Pattern.compile(getString(R.string.pattern, player2Name))) ) serviceSide = getIntExtra("starterId", 0) relaunchSide = when(serviceSide) { diff --git a/app/src/main/java/adrienmalin/pingpoints/Player.kt b/app/src/main/java/adrienmalin/pingpoints/Player.kt index 24e4995..2544731 100644 --- a/app/src/main/java/adrienmalin/pingpoints/Player.kt +++ b/app/src/main/java/adrienmalin/pingpoints/Player.kt @@ -1,6 +1,9 @@ package adrienmalin.pingpoints +import java.util.regex.Pattern + data class Player ( var name: String, - var score: Int + var score: Int, + var pattern: Pattern? = null ) \ No newline at end of file diff --git a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt index f69d0a5..6a0ac68 100644 --- a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt +++ b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt @@ -57,7 +57,7 @@ class SttDialog : DialogFragment() { matchModel?.apply { for (result in results) { for (player in players) { - if (getString(R.string.pattern, player.name).equals(result, ignoreCase=true)) { + if (player.pattern?.matcher(result)?.find() == true) { dismiss() updateScore(player) updateUI() @@ -97,8 +97,8 @@ class SttDialog : DialogFragment() { matchModel?.apply { view.findViewById(R.id.sttHintTextView).text = getString( R.string.STT_hint, - getString(R.string.pattern, players[0].name), - getString(R.string.pattern, players[1].name) + players[0].name, + players[1].name ) sttIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply { putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1939e08..491f0e6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -32,8 +32,8 @@ Match Ping Points : %s contre %s "%s contre %s:\n%s a gagné par %d à %d\nPing Points est disponible sur Google Play\n " Balle de match - Dîtes : \"%s\"\nou \"%s\" - Point pour %s + Dîtes : \"Point pour %s\"\nou \"Point pour %s\" + (?i:Point pour %s) Pouvez-vous répéter ? Reconnaissance vocale désactivée. \ 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 5891868..7c239b4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -38,7 +38,7 @@ %s vs. %s:\n%s won by %d to %d\nGet Ping Points on Google Play Match point Say: \"Point for %s\"\nor \"Point for %s\" - Point for %s + (?i:Point for %s) Can you repeat, please? %d - %d Voice recognition disabled.