From 720795cfd6c717998f1e145559cfe0b17774fce6 Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Tue, 18 Dec 2018 15:29:28 +0100
Subject: [PATCH] small changes
---
app/src/main/java/adrienmalin/pingpoints/Player.kt | 5 +++--
app/src/main/java/adrienmalin/pingpoints/SttDialog.kt | 2 +-
app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/adrienmalin/pingpoints/Player.kt b/app/src/main/java/adrienmalin/pingpoints/Player.kt
index f42a641..94cc6a4 100644
--- a/app/src/main/java/adrienmalin/pingpoints/Player.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/Player.kt
@@ -1,6 +1,7 @@
package adrienmalin.pingpoints
data class Player (
- var name: String,
- var score: Int
+ val name: String,
+ var score: Int,
+ val soundex: String = soundex(name)
)
diff --git a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
index 2af53e2..5c6f60c 100644
--- a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
@@ -56,7 +56,7 @@ class SttDialog : DialogFragment() {
if (matcher.find()) {
val foundName = matcher.group(1)
for (player in players) {
- if (soundex(foundName) == soundex(player.name)) {
+ if (soundex(foundName) == player.soundex) {
dismiss()
updateScore(player)
updateUI()
diff --git a/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt b/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
index 6c8a0f6..42b3b2f 100644
--- a/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
@@ -45,7 +45,7 @@ class VictoryActivity : AppCompatActivity() {
intent.getIntExtra("player2Score", 0)
)
)
- previousMatch?.apply{ previousMatches = getString("previousMatches", "") }
+ previousMatch?.apply{ previousMatches = getString("previousMatches", "") ?: "" }
}
}
}
@@ -64,7 +64,7 @@ class VictoryActivity : AppCompatActivity() {
this@VictoryActivity,
R.layout.grid_item,
R.id.grid_item_text,
- previousMatches.split("\t|\n".toRegex())?.toMutableList()
+ previousMatches.split("\t|\n".toRegex()).toMutableList()
)
}