Fix warnings

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)

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
                 }
             )
-
+            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) {
                     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,

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<String>(
                 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
         }
     }
 

app/src/main/java/adrienmalin/pingpoints/SttDialog.kt

@@ -35,30 +35,32 @@ class SttDialog : DialogFragment() {
         }
 
         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) {
-            val results: ArrayList<String> = data.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)
             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)
                     }
                 }
             }