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

Code cleanup

Browse Source
This commit is contained in:
adrienmalin 2018-12-07 12:08:48 +01:00
parent 861196e118
commit 3ddff42431
2 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,10 +47,42 @@ class MatchActivity : AppCompatActivity() {
AppCompatDelegate.setCompatVectorFromResourcesEnabled(true) AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
setContentView(R.layout.activity_match) setContentView(R.layout.activity_match)
// Set HTML text for icons credits // Init ViewModel
findViewById<TextView>(R.id.iconsCredit).run { matchModel = ViewModelProviders.of(this).get(MatchModel::class.java).apply {
setText(fromHtml(getString(R.string.iconCredits))) if (!matchStarted) {
movementMethod = LinkMovementMethod.getInstance() intent.apply {
matchStarted = true
val player1Name = getStringExtra("player1Name")
val player2Name = getStringExtra("player2Name")
players = listOf(
Player(
getStringExtra("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) {
0 -> 1
else -> 0
}
ttsEnabled = getBooleanExtra("enableTTS", false)
sttEnabled = getBooleanExtra("enableSTT", false)
saveState()
}
if (ttsEnabled) {
tts = TextToSpeech(this@MatchActivity, WaitForTtsInit())
if (sttEnabled)
tts?.setOnUtteranceProgressListener(SttAfterTts())
}
if (!sttEnabled){
showText(getString(R.string.button_hint))
}
}
} }
// Find views // Find views
@ -64,32 +96,12 @@ class MatchActivity : AppCompatActivity() {
findViewById(R.id.imgService0), findViewById(R.id.imgService0),
findViewById(R.id.imgService1) findViewById(R.id.imgService1)
) )
// Set HTML text for icons credits
findViewById<TextView>(R.id.iconsCredit).run {
setText(fromHtml(getString(R.string.iconCredits)))
movementMethod = LinkMovementMethod.getInstance()
}
// Init ViewModel
matchModel = ViewModelProviders.of(this).get(MatchModel::class.java)
matchModel?.apply {
if (!matchStarted) {
intent.apply {
startMatch(
getStringExtra("player1Name"),
getStringExtra("player2Name"),
getIntExtra("starterId", 0),
getBooleanExtra("enableTTS", false),
getBooleanExtra("enableSTT", false)
)
for (player in players)
player.pattern = Pattern.compile(getString(R.string.pattern, player.name))
}
if (ttsEnabled) {
tts = TextToSpeech(this@MatchActivity, WaitForTtsInit())
if (sttEnabled)
tts?.setOnUtteranceProgressListener(SttAfterTts())
}
if (!sttEnabled){
showText(getString(R.string.button_hint))
}
}
}
updateUI() updateUI()
} }

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

@ -15,19 +15,6 @@ class MatchModel : ViewModel() {
var pointId: Int = -1 var pointId: Int = -1
var history: MutableList<Point> = ArrayList() var history: MutableList<Point> = ArrayList()
fun startMatch(player1Name: String, player2Name:String, starterId: Int, enableTTS: Boolean, enableSTT: Boolean) {
matchStarted = true
players = listOf(Player(player1Name, 0), Player(player2Name, 0))
serviceSide = starterId
relaunchSide = when(serviceSide) {
0 -> 1
else -> 0
}
ttsEnabled = enableTTS
sttEnabled = enableSTT
saveState()
}
fun updateScore(scorer: Player) { fun updateScore(scorer: Player) {
scorer.score++ scorer.score++
if ((players.sumBy { it.score } % 2 == 0) or (players.all { it.score >= 10 })) { if ((players.sumBy { it.score } % 2 == 0) or (players.all { it.score >= 10 })) {