Improved BarcodeWidgetAnswer

Author: grzesiek2010

collect_app/src/main/java/org/odk/collect/android/widgets/BarcodeWidget.kt

@@ -42,14 +42,14 @@ class BarcodeWidget(
         } else {
             binding.barcodeButton.setOnClickListener { onButtonClick() }
         }
-        binding.answerView.setHidden(hasAppearance(prompt, Appearances.HIDDEN_ANSWER))
-        binding.answerView.setTextSize(answerFontSize.toFloat())
 
         val answer = prompt.answerText
         if (!answer.isNullOrEmpty()) {
             binding.barcodeButton.text = getContext().getString(R.string.replace_barcode)
         }
-        binding.answerView.setAnswer(prompt.answerText)
+        binding.answerView.setup(prompt.answerValue, answerFontSize.toFloat())
+        val isAnswerHidden = hasAppearance(prompt, Appearances.HIDDEN_ANSWER)
+        binding.answerView.visibility = if (isAnswerHidden || binding.answerView.getAnswer().isBlank()) GONE else VISIBLE
 
         return binding.root
     }

collect_app/src/main/java/org/odk/collect/android/widgets/BarcodeWidgetAnswer.kt

@@ -5,6 +5,7 @@ import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.widget.FrameLayout
+import org.javarosa.core.model.data.IAnswerData
 import org.odk.collect.android.databinding.BarcodeWidgetAnswerBinding
 
 class BarcodeWidgetAnswer @JvmOverloads constructor(
@@ -13,19 +14,14 @@ class BarcodeWidgetAnswer @JvmOverloads constructor(
     defStyle: Int = 0
 ) : FrameLayout(context, attrs, defStyle) {
     private val binding = BarcodeWidgetAnswerBinding.inflate(LayoutInflater.from(context), this, true)
-    private var hidden = false
 
-    fun setAnswer(answer: String?) {
-        binding.answer.text = stripInvalidCharacters(answer)
-        binding.root.visibility = if (hidden || binding.answer.text.isNullOrBlank()) GONE else VISIBLE
-    }
-
-    fun setTextSize(textSize: Float) {
+    fun setup(answer: IAnswerData?, textSize: Float) {
         binding.answer.setTextSize(TypedValue.COMPLEX_UNIT_DIP, textSize)
+        setAnswer(answer?.displayText)
     }
 
-    fun setHidden(hidden: Boolean) {
-        this.hidden = hidden
+    fun setAnswer(answer: String?) {
+        binding.answer.text = stripInvalidCharacters(answer)
     }
 
     fun getAnswer(): String {

collect_app/src/main/res/layout/barcode_widget_answer.xml

@@ -2,7 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/barcode_widget_answer"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 

collect_app/src/test/java/org/odk/collect/android/widgets/BarcodeWidgetTest.kt

@@ -207,7 +207,7 @@ class BarcodeWidgetTest {
 
         // Check initial value is not shown
         assertThat(
-            widget.binding.answerView.findViewById<View>(R.id.barcode_widget_answer).visibility,
+            widget.binding.answerView.visibility,
             equalTo(View.GONE)
         )
         assertThat(
@@ -219,7 +219,7 @@ class BarcodeWidgetTest {
         // Check updates aren't shown
         widget.setData("updated contents")
         assertThat(
-            widget.binding.answerView.findViewById<View>(R.id.barcode_widget_answer).visibility,
+            widget.binding.answerView.visibility,
             equalTo(View.GONE)
         )
         assertThat(