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

Fix warnings

Browse Source
This commit is contained in:
adrienmalin
2018-12-07 12:33:10 +01:00
parent d3d90b176c
commit ef149251ff
4 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/adrienmalin/pingpoints/Html.kt
View File

@ -5,6 +5,7 @@ import android.text.Html
import android.text.Spanned import android.text.Spanned
@Suppress("DEPRECATION")
fun fromHtml(source: String): Spanned = when { fun fromHtml(source: String): Spanned = when {
Build.VERSION.SDK_INT >= Build.VERSION_CODES.N -> Html.fromHtml(source, Html.FROM_HTML_MODE_COMPACT) Build.VERSION.SDK_INT >= Build.VERSION_CODES.N -> Html.fromHtml(source, Html.FROM_HTML_MODE_COMPACT)
else -> Html.fromHtml(source) else -> Html.fromHtml(source)

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

@ -110,18 +110,17 @@ class MatchActivity : AppCompatActivity() {
) )
textService?.text = getString(R.string.service, players[serviceSide].name) textService?.text = getString(R.string.service, players[serviceSide].name)
imageViews[0]?.setImageResource( for ((button, player) in buttons.zip(players)) {
button.text = fromHtml(getString(R.string.button_text, player.name, player.score))
}
imageViews[0].setImageResource(
when(serviceSide) { when(serviceSide) {
0 -> R.drawable.ic_service_0 0 -> R.drawable.ic_service_0
else -> 0 else -> 0
} }
) )
imageViews[1].setImageResource(
for ((button, player) in buttons.zip(players)) {
button.text = fromHtml(getString(R.string.button_text, player.name, player.score))
}
imageViews[1]?.setImageResource(
when(serviceSide) { when(serviceSide) {
0 -> 0 0 -> 0
else -> R.drawable.ic_service_1 else -> R.drawable.ic_service_1
@ -205,6 +204,7 @@ class MatchActivity : AppCompatActivity() {
).show() ).show()
} }
@Suppress("DEPRECATION")
fun say(text: String, queueMode: Int = TextToSpeech.QUEUE_FLUSH) { fun say(text: String, queueMode: Int = TextToSpeech.QUEUE_FLUSH) {
tts?.speak( tts?.speak(
text, text,

8
app/src/main/java/adrienmalin/pingpoints/StarterNameActivity.kt
View File

@ -45,18 +45,18 @@ class StarterNameActivity : AppCompatActivity() {
// Restore previous data // Restore previous data
previousMatch = getPreferences(Context.MODE_PRIVATE).apply { previousMatch = getPreferences(Context.MODE_PRIVATE).apply {
previousPlayers = getStringSet("previousPlayers", emptySet()) getStringSet("previousPlayers", emptySet())?.let { previousPlayers = it.toSet() }
val adapter = ArrayAdapter<String>( val adapter = ArrayAdapter<String>(
this@StarterNameActivity, this@StarterNameActivity,
android.R.layout.simple_list_item_1, android.R.layout.simple_list_item_1,
previousPlayers.toList()) previousPlayers.toList())
player1NameInput?.run { player1NameInput?.apply {
setText( setText(
getString("previousPlayer2", getString(R.string.player_1_default_name)), getString("previousPlayer2", getString(R.string.player_1_default_name)),
TextView.BufferType.EDITABLE) TextView.BufferType.EDITABLE)
setAdapter(adapter) setAdapter(adapter)
} }
player2NameInput?.run{ player2NameInput?.apply{
setText( setText(
getString("previousPlayer1", getString(R.string.player_2_default_name)), getString("previousPlayer1", getString(R.string.player_2_default_name)),
TextView.BufferType.EDITABLE) TextView.BufferType.EDITABLE)
@ -75,7 +75,6 @@ class StarterNameActivity : AppCompatActivity() {
startActivityForResult(this, CHECK_TTS) startActivityForResult(this, CHECK_TTS)
} }
} }
false
} }
enableSttSwitch?.setOnCheckedChangeListener { _, isChecked -> enableSttSwitch?.setOnCheckedChangeListener { _, isChecked ->
@ -98,7 +97,6 @@ class StarterNameActivity : AppCompatActivity() {
showText(R.string.STT_unavailable) showText(R.string.STT_unavailable)
} }
} }
false
} }
} }

38
app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
View File

@ -35,30 +35,32 @@ class SttDialog : DialogFragment() {
} }
override fun onPartialResults(data: Bundle) { override fun onPartialResults(data: Bundle) {
if (!data.isEmpty) data.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)?.let { results ->
partialResultsTextView?.text = data.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)[0] if (results.isNotEmpty())
partialResultsTextView?.text = results[0]
}
} }
override fun onResults(data: Bundle) { override fun onResults(data: Bundle) {
val results: ArrayList<String> = data.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)
var understood = false var understood = false
data.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)?.let { results ->
matchActivity?.apply { matchActivity?.apply {
matchModel?.apply { matchModel?.apply {
for (result in results) { for (result in results) {
for (player in players) { for (player in players) {
if (player.pattern?.matcher(result)?.find() == true) { if (player.pattern?.matcher(result)?.find() == true) {
understood = true understood = true
dismiss() dismiss()
updateScore(player) updateScore(player)
updateUI() updateUI()
break break
}
} }
if (understood) break
}
if (!understood) {
onError(0)
} }
if (understood) break
}
if (!understood) {
onError(0)
} }
} }
} }