From ef149251ff7c46cd334408c910afbc2aaaae6b6b Mon Sep 17 00:00:00 2001 From: adrienmalin <41926238+adrienmalin@users.noreply.github.com> Date: Fri, 7 Dec 2018 12:33:10 +0100 Subject: [PATCH] Fix warnings --- .../main/java/adrienmalin/pingpoints/Html.kt | 1 + .../adrienmalin/pingpoints/MatchActivity.kt | 14 +++---- .../pingpoints/StarterNameActivity.kt | 8 ++-- .../java/adrienmalin/pingpoints/SttDialog.kt | 38 ++++++++++--------- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/adrienmalin/pingpoints/Html.kt b/app/src/main/java/adrienmalin/pingpoints/Html.kt index a2d5be2..b3f69ea 100644 --- a/app/src/main/java/adrienmalin/pingpoints/Html.kt +++ b/app/src/main/java/adrienmalin/pingpoints/Html.kt @@ -5,6 +5,7 @@ import android.text.Html import android.text.Spanned +@Suppress("DEPRECATION") fun fromHtml(source: String): Spanned = when { Build.VERSION.SDK_INT >= Build.VERSION_CODES.N -> Html.fromHtml(source, Html.FROM_HTML_MODE_COMPACT) else -> Html.fromHtml(source) diff --git a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt index 5e2f5e3..36cc87b 100644 --- a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt +++ b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt @@ -110,18 +110,17 @@ class MatchActivity : AppCompatActivity() { ) 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) { 0 -> R.drawable.ic_service_0 else -> 0 } ) - - for ((button, player) in buttons.zip(players)) { - button.text = fromHtml(getString(R.string.button_text, player.name, player.score)) - } - - imageViews[1]?.setImageResource( + imageViews[1].setImageResource( when(serviceSide) { 0 -> 0 else -> R.drawable.ic_service_1 @@ -205,6 +204,7 @@ class MatchActivity : AppCompatActivity() { ).show() } + @Suppress("DEPRECATION") fun say(text: String, queueMode: Int = TextToSpeech.QUEUE_FLUSH) { tts?.speak( text, diff --git a/app/src/main/java/adrienmalin/pingpoints/StarterNameActivity.kt b/app/src/main/java/adrienmalin/pingpoints/StarterNameActivity.kt index 8a69e63..ab2b646 100644 --- a/app/src/main/java/adrienmalin/pingpoints/StarterNameActivity.kt +++ b/app/src/main/java/adrienmalin/pingpoints/StarterNameActivity.kt @@ -45,18 +45,18 @@ class StarterNameActivity : AppCompatActivity() { // Restore previous data previousMatch = getPreferences(Context.MODE_PRIVATE).apply { - previousPlayers = getStringSet("previousPlayers", emptySet()) + getStringSet("previousPlayers", emptySet())?.let { previousPlayers = it.toSet() } val adapter = ArrayAdapter( this@StarterNameActivity, android.R.layout.simple_list_item_1, previousPlayers.toList()) - player1NameInput?.run { + player1NameInput?.apply { setText( getString("previousPlayer2", getString(R.string.player_1_default_name)), TextView.BufferType.EDITABLE) setAdapter(adapter) } - player2NameInput?.run{ + player2NameInput?.apply{ setText( getString("previousPlayer1", getString(R.string.player_2_default_name)), TextView.BufferType.EDITABLE) @@ -75,7 +75,6 @@ class StarterNameActivity : AppCompatActivity() { startActivityForResult(this, CHECK_TTS) } } - false } enableSttSwitch?.setOnCheckedChangeListener { _, isChecked -> @@ -98,7 +97,6 @@ class StarterNameActivity : AppCompatActivity() { showText(R.string.STT_unavailable) } } - false } } diff --git a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt index a8c7ef5..8e20653 100644 --- a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt +++ b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt @@ -35,30 +35,32 @@ class SttDialog : DialogFragment() { } override fun onPartialResults(data: Bundle) { - if (!data.isEmpty) - partialResultsTextView?.text = data.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)[0] + data.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)?.let { results -> + if (results.isNotEmpty()) + partialResultsTextView?.text = results[0] + } } override fun onResults(data: Bundle) { - val results: ArrayList = data.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION) var understood = false - - matchActivity?.apply { - matchModel?.apply { - for (result in results) { - for (player in players) { - if (player.pattern?.matcher(result)?.find() == true) { - understood = true - dismiss() - updateScore(player) - updateUI() - break + data.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)?.let { results -> + matchActivity?.apply { + matchModel?.apply { + for (result in results) { + for (player in players) { + if (player.pattern?.matcher(result)?.find() == true) { + understood = true + dismiss() + updateScore(player) + updateUI() + break + } } + if (understood) break + } + if (!understood) { + onError(0) } - if (understood) break - } - if (!understood) { - onError(0) } } }