Use toSpanned

google · Oct 7, 2024 · 0d17139 · 0d17139
1 parent 424ab83
commit 0d17139
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreTypes.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreTypes.kt
@@ -17,6 +17,7 @@
 package com.google.android.fhir.datacapture.extensions
 
 import android.content.Context
+import android.text.Spanned
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.views.factories.localDate
 import com.google.android.fhir.datacapture.views.factories.localTime
@@ -57,6 +58,8 @@ fun Type.asStringValue(): String {
 fun Type.displayString(context: Context): String =
   getDisplayString(this, context) ?: context.getString(R.string.not_answered)
 
+fun Type.displayStringSpanned(context: Context): Spanned = displayString(context).toSpanned()
+
 /** Returns value as string depending on the [Type] of element. */
 fun Type.getValueAsString(context: Context): String =
   getValueString(this) ?: context.getString(R.string.not_answered)

diff --git a/...ava/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactory.kt b/...ava/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactory.kt
@@ -27,7 +27,7 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.extensions.ChoiceOrientationTypes
 import com.google.android.fhir.datacapture.extensions.choiceOrientation
-import com.google.android.fhir.datacapture.extensions.displayString
+import com.google.android.fhir.datacapture.extensions.displayStringSpanned
 import com.google.android.fhir.datacapture.extensions.itemAnswerOptionImage
 import com.google.android.fhir.datacapture.extensions.optionExclusive
 import com.google.android.fhir.datacapture.extensions.tryUnwrapContext
@@ -104,7 +104,7 @@ internal object CheckBoxGroupViewHolderFactory :
         val checkbox =
           checkboxLayout.findViewById<CheckBox>(R.id.check_box).apply {
             id = viewId
-            text = answerOption.value.displayString(header.context)
+            text = answerOption.value.displayStringSpanned(header.context)
             setCompoundDrawablesRelative(
               answerOption.itemAnswerOptionImage(checkboxGroup.context),
               null,

diff --git a/...ain/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt b/...ain/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
@@ -18,6 +18,7 @@ package com.google.android.fhir.datacapture.views.factories
 
 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.text.Spanned
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -33,6 +34,7 @@ import com.google.android.fhir.datacapture.extensions.getValidationErrorMessage
 import com.google.android.fhir.datacapture.extensions.identifierString
 import com.google.android.fhir.datacapture.extensions.itemAnswerOptionImage
 import com.google.android.fhir.datacapture.extensions.localizedFlyoverSpanned
+import com.google.android.fhir.datacapture.extensions.toSpanned
 import com.google.android.fhir.datacapture.extensions.tryUnwrapContext
 import com.google.android.fhir.datacapture.validation.ValidationResult
 import com.google.android.fhir.datacapture.views.HeaderView
@@ -92,8 +94,8 @@ internal object DropDownViewHolderFactory :
         answerOptionList
           .firstOrNull { it.answerId == selectedAnswerIdentifier }
           ?.let {
-            autoCompleteTextView.setText(it.answerOptionString)
-            autoCompleteTextView.setSelection(it.answerOptionString.length)
+            autoCompleteTextView.setText(it.answerOptionStringSpanned())
+            autoCompleteTextView.setSelection(it.answerOptionStringSpanned().length)
             autoCompleteTextView.setCompoundDrawablesRelative(
               it.answerOptionImage,
               null,
@@ -105,7 +107,7 @@ internal object DropDownViewHolderFactory :
         autoCompleteTextView.onItemClickListener =
           AdapterView.OnItemClickListener { _, _, position, _ ->
             val selectedItem = adapter.getItem(position)
-            autoCompleteTextView.setText(selectedItem?.answerOptionString, false)
+            autoCompleteTextView.setText(selectedItem?.answerOptionStringSpanned(), false)
             autoCompleteTextView.setCompoundDrawablesRelative(
               adapter.getItem(position)?.answerOptionImage,
               null,
@@ -165,7 +167,7 @@ internal class AnswerOptionDropDownArrayAdapter(
       val answerOption: DropDownAnswerOption? = getItem(position)
       val answerOptionTextView =
         listItemView?.findViewById<View>(R.id.answer_option_textview) as TextView
-      answerOptionTextView.text = answerOption?.answerOptionString
+      answerOptionTextView.text = answerOption?.answerOptionStringSpanned()
       answerOptionTextView.setCompoundDrawablesRelative(
         answerOption?.answerOptionImage,
         null,
@@ -187,4 +189,6 @@ internal data class DropDownAnswerOption(
   override fun toString(): String {
     return this.answerOptionString
   }
+
+  fun answerOptionStringSpanned(): Spanned = answerOptionString.toSpanned()
 }
diff --git a/...n/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactory.kt b/...n/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactory.kt
@@ -28,7 +28,7 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.extensions.ChoiceOrientationTypes
 import com.google.android.fhir.datacapture.extensions.choiceOrientation
-import com.google.android.fhir.datacapture.extensions.displayString
+import com.google.android.fhir.datacapture.extensions.displayStringSpanned
 import com.google.android.fhir.datacapture.extensions.itemAnswerOptionImage
 import com.google.android.fhir.datacapture.extensions.tryUnwrapContext
 import com.google.android.fhir.datacapture.validation.Invalid
@@ -113,7 +113,7 @@ internal object RadioGroupViewHolderFactory :
         val radioButton =
           radioButtonItem.findViewById<RadioButton>(R.id.radio_button).apply {
             id = viewId
-            text = answerOption.value.displayString(header.context)
+            text = answerOption.value.displayStringSpanned(header.context)
             setCompoundDrawablesRelative(
               answerOption.itemAnswerOptionImage(radioGroup.context),
               null,