Display all existing tag descriptions (fixes #11)

marc136 · Oct 12, 2020 · f2b3b5c · f2b3b5c
1 parent bf48ebb
commit f2b3b5c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/app/src/main/java/de/mw136/tonuino/ui/ReadActivity.kt b/app/src/main/java/de/mw136/tonuino/ui/ReadActivity.kt
@@ -45,9 +45,11 @@ class ReadActivity : NfcIntentActivity() {
         setText(R.id.mode, data.mode.value)
         findViewById<TextView>(R.id.mode_description).apply {
             val mode = data.mode.value?.toInt() ?: 0
-            text = if (mode in 1..6) {
-                resources.getStringArray(R.array.edit_mode)[mode - 1] + ": " +
-                        resources.getStringArray(R.array.edit_mode_description)[mode - 1]
+            val title = resources.getStringArray(R.array.edit_mode)[mode - 1] ?: ""
+            val description =
+                resources.getStringArray(R.array.edit_mode_description)[mode - 1] ?: ""
+            text = if (title.isNotEmpty() && description.isNotEmpty()) {
+                "$title: $description"
             } else {
                 Log.w(
                     "$TAG:displayTonuinoInfo",