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

improvements

Browse Source
This commit is contained in:
adrienmalin
2018-12-05 20:17:41 +01:00
parent 8d0cadaf88
commit 8bfb519bb3
9 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,23 +156,19 @@ class MatchActivity : AppCompatActivity() {
hashMapOf(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID to "Victory")
)
} else {
var scoreSpeech: String = getString(
R.string.update_score_speech,
players[serviceSide].score,
players[relaunchSide].score,
players[serviceSide].name
)
if (matchPoint)
scoreSpeech += getString(R.string.match_point)
tts?.speak(
getString(
R.string.update_score_speech,
players[serviceSide].score,
players[relaunchSide].score,
players[serviceSide].name
),
scoreSpeech,
TextToSpeech.QUEUE_FLUSH,
hashMapOf(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID to "MessageId")
)
if (matchPoint) {
tts?.speak(
getString(R.string.match_point),
TextToSpeech.QUEUE_ADD,
hashMapOf(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID to "MessageId")
)
}
}
}
}

13
app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
View File

@ -10,6 +10,8 @@ import android.view.View
import android.widget.ArrayAdapter
import android.widget.GridView
import android.widget.TextView
import kotlin.math.max
import kotlin.math.min
class VictoryActivity : AppCompatActivity() {
@ -46,12 +48,13 @@ class VictoryActivity : AppCompatActivity() {
putString(
"previousMatches",
getString(
R.string.result,
R.string.results,
players[0].name,
players[0].score,
players[1].score,
players[1].name
) + previousMatches
players[1].name,
previousMatches
)
)
commit()
}
@ -101,8 +104,8 @@ class VictoryActivity : AppCompatActivity() {
players[0].name,
players[1].name,
winnerName,
players[0].score,
players[1].score
max(players[0].score, players[1].score),
min(players[0].score, players[1].score)
)
)
type = "text/plain"