rendering_xhtml maually parsing img tag

catalog/src/main/java/com/google/android/fhir/catalog/LayoutListViewModel.kt

@@ -38,7 +38,7 @@ class LayoutListViewModel(application: Application, private val state: SavedStat
     DEFAULT(
       R.drawable.ic_defaultlayout,
       R.string.layout_name_default_text,
-      "layout_default.json",
+      "questionnaire_sdc_profile_example_image_options.json",
       WorkflowType.DEFAULT
     ),
     PAGINATED(

datacapture/src/main/java/com/google/android/fhir/datacapture/MoreAnswerOptions.kt

@@ -16,6 +16,12 @@
 
 package com.google.android.fhir.datacapture
 
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.util.Base64
+import com.google.android.fhir.datacapture.common.datatype.asStringValue
 import com.google.android.fhir.getLocalizedText
 import org.hl7.fhir.r4.model.BooleanType
 import org.hl7.fhir.r4.model.Coding
@@ -52,6 +58,44 @@ internal val Questionnaire.QuestionnaireItemAnswerOptionComponent.displayString:
       else -> throw IllegalArgumentException("$value is not supported.")
     }
   }
+internal const val EXTENSION_RENDERING_XHTML =
+  "http://hl7.org/fhir/StructureDefinition/rendering-xhtml"
+
+internal const val EXTENSION_REFERENCES_CONTAINED =
+  "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-referencesContained"
+
+/**
+ * Text value for answer option [Questionnaire.QuestionnaireItemAnswerOptionComponent] if answer
+ * option is [IntegerType], [StringType], [Coding], or [Reference] type.
+ */
+internal val Questionnaire.QuestionnaireItemAnswerOptionComponent.displayDrawable: Drawable?
+  get() {
+    return when (value) {
+      is Coding -> {
+        var drawable: Drawable? = null
+        val value = valueCoding.displayElement.extension.singleOrNull {
+          it.url == EXTENSION_RENDERING_XHTML
+        }?.value
+        value?.asStringValue()?.let {
+          if (it.startsWith("<img src='data:")) {
+            val imageString = it.substringAfter(",").substringBeforeLast("'")
+            val imageBytes = Base64.decode(imageString, Base64.DEFAULT);
+            val bitmap = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
+          drawable = BitmapDrawable(bitmap)
+          } else if (it.startsWith("<img src='#")) {
+           val reference = value.extension.singleOrNull {
+              it.url == EXTENSION_REFERENCES_CONTAINED
+            }?.value as Reference
+
+            val imgIdFromContainedList = reference.reference.substringAfter("#")
+           // drawable =
+          }
+        }
+        drawable
+      }
+      else -> null
+    }
+  }
 
 /** Indicates that if this answerOption is selected, no other possible answers may be selected. */
 internal val Questionnaire.QuestionnaireItemAnswerOptionComponent.optionExclusive: Boolean

datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaires.kt

@@ -16,9 +16,15 @@
 
 package com.google.android.fhir.datacapture
 
+import android.graphics.BitmapFactory
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.util.Base64
+import org.hl7.fhir.r4.model.Binary
 import org.hl7.fhir.r4.model.CanonicalType
 import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Questionnaire
+import org.hl7.fhir.r4.model.ResourceType
 
 /**
  * The StructureMap url in the
@@ -56,6 +62,17 @@ private const val TARGET_STRUCTURE_MAP: String =
 val Questionnaire.isPaginated: Boolean
   get() = item.any { item -> item.displayItemControl == DisplayItemControlType.PAGE }
 
+internal fun Questionnaire.getContainedImage(id: String): Drawable?
+ {
+  val resource = this.contained.filter { it.id == id && it.resourceType == ResourceType.Binary }.first() as Binary
+   if( resource.contentType == "image/png") {
+     //val imageBytes = Base64.decode(resource.data, Base64.DEFAULT)//check if required
+     val bitmap = BitmapFactory.decodeByteArray(resource.data, 0, resource.data.size)
+     return BitmapDrawable( bitmap)
+   }
+   return null
+}
+
 /**
  * See
  * [Extension: Entry mode](http://build.fhir.org/ig/HL7/sdc/StructureDefinition-sdc-questionnaire-entryMode.html)

datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt

@@ -17,6 +17,7 @@
 package com.google.android.fhir.datacapture
 
 import android.app.Application
+import android.graphics.drawable.Drawable
 import android.net.Uri
 import androidx.annotation.VisibleForTesting
 import androidx.lifecycle.AndroidViewModel
@@ -454,6 +455,10 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
     return options
   }
 
+  internal suspend fun resolveContainedBinary(containedId :String):Drawable?{
+    return questionnaire.getContainedImage(containedId)
+  }
+
   // TODO persist previous answers incase options are changing and new list does not have selected
   // answer and FHIRPath in x-fhir-query
   // https://build.fhir.org/ig/HL7/sdc/expressions.html#x-fhir-query-enhancements
@@ -619,7 +624,8 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
           validationResult = validationResult,
           answersChangedCallback = answersChangedCallback,
           resolveAnswerValueSet = { resolveAnswerValueSet(it) },
-          resolveAnswerExpression = { resolveAnswerExpression(it) }
+          resolveAnswerExpression = { resolveAnswerExpression(it) },
+          resolveContainedBinary = { resolveContainedBinary(it) }
         )
       )
       val nestedResponses: List<List<QuestionnaireResponse.QuestionnaireResponseItemComponent>> =

datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemRadioGroupViewHolderFactory.kt

@@ -26,6 +26,7 @@ import androidx.core.view.children
 import com.google.android.fhir.datacapture.ChoiceOrientationTypes
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.choiceOrientation
+import com.google.android.fhir.datacapture.displayDrawable
 import com.google.android.fhir.datacapture.displayString
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
@@ -104,6 +105,14 @@ internal object QuestionnaireItemRadioGroupViewHolderFactory :
           radioButtonItem.findViewById<RadioButton>(R.id.radio_button).apply {
             id = viewId
             text = answerOption.displayString
+           // val drawable = answerOption.displayDrawable
+            setCompoundDrawablesWithIntrinsicBounds(
+              questionnaireItemViewItem.displayDrawable(answerOption),
+             // answerOption.displayDrawable,
+              null,
+              null,
+              null
+            )
             layoutParams =
               ViewGroup.LayoutParams(
                 when (choiceOrientation) {

datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewItem.kt

@@ -17,17 +17,27 @@
 package com.google.android.fhir.datacapture.views
 
 import android.content.Context
+import android.graphics.BitmapFactory
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.util.Base64
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.fhir.datacapture.EXTENSION_REFERENCES_CONTAINED
+import com.google.android.fhir.datacapture.EXTENSION_RENDERING_XHTML
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.answerExpression
+import com.google.android.fhir.datacapture.common.datatype.asStringValue
+import com.google.android.fhir.datacapture.displayDrawable
 import com.google.android.fhir.datacapture.displayString
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
+import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
+import org.hl7.fhir.r4.model.Reference
 
 /**
  * Data item for [QuestionnaireItemViewHolder] in [RecyclerView].
@@ -75,7 +85,9 @@ data class QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemAnswerOptionComponent> =
     {
       emptyList()
-    }
+    },
+  private val resolveContainedBinary:
+    suspend (String) -> Drawable?
 ) {
 
   /**
@@ -182,6 +194,75 @@ data class QuestionnaireItemViewItem(
         }
       }
 
+  internal fun displayDrawable(answerOption: Questionnaire.QuestionnaireItemAnswerOptionComponent): Drawable?=
+    runBlocking(Dispatchers.IO) {
+      when(answerOption.value){
+        is Coding -> {
+          val codingValue = answerOption.valueCoding.displayElement.extension.singleOrNull{
+            it.url == EXTENSION_RENDERING_XHTML
+          }?.value
+          codingValue?.asStringValue()?.let {
+            if (it.startsWith("<img src='data:")) {
+               val imageString = it.substringAfter(",").substringBeforeLast("'")
+              val imageBytes = Base64.decode(imageString, Base64.DEFAULT);
+              val bitmap = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
+              return@runBlocking BitmapDrawable(null, bitmap)
+            }else if (it.startsWith("<img src='#")){
+              val reference = codingValue.extension.singleOrNull {
+                it.url == EXTENSION_REFERENCES_CONTAINED
+              }?.value as Reference
+
+              //val imgIdFromContainedList = reference.reference.substringAfter("#")
+              return@runBlocking resolveContainedBinary(reference.reference.toString())
+            }
+          }
+        }
+        else -> //val imgIdFromContainedList = reference.reference.substringAfter("#")
+        {
+          return@runBlocking null
+        }
+      }
+      /*
+       when (value) {
+      is Coding -> {
+        var drawable: Drawable? = null
+        val value = valueCoding.displayElement.extension.singleOrNull {
+          it.url == EXTENSION_RENDERING_XHTML
+        }?.value
+        value?.asStringValue()?.let {
+          if (it.startsWith("<img src='data:")) {
+            val imageString = it.substringAfter(",").substringBeforeLast("'")
+            val imageBytes = Base64.decode(imageString, Base64.DEFAULT);
+            val bitmap = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
+          drawable = BitmapDrawable(null, bitmap)
+          } else if (it.startsWith("<img src='#")) {
+           val reference = value.extension.singleOrNull {
+              it.url == EXTENSION_REFERENCES_CONTAINED
+            }?.value as Reference
+
+            val imgIdFromContainedList = reference.reference.substringAfter("#")
+           // drawable =
+          }
+        }
+        drawable
+      }
+      else -> null
+    }
+
+      */
+
+      /* when {
+         questionnaireItem.answerOption.isNotEmpty() -> questionnaireItem.answerOption
+         !questionnaireItem.answerValueSet.isNullOrEmpty() ->
+           resolveAnswerValueSet(questionnaireItem.answerValueSet)
+         questionnaireItem.answerExpression != null -> resolveAnswerExpression(questionnaireItem)
+         else -> null
+       }*/
+      return@runBlocking null
+    }
+
+
+
   /**
    * Returns whether this [QuestionnaireItemViewItem] and the `other` [QuestionnaireItemViewItem]
    * have the same [Questionnaire.QuestionnaireItemComponent] and

datacapture/src/main/res/layout/questionnaire_item_radio_button.xml

@@ -5,5 +5,7 @@
     android:id="@+id/radio_button"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:drawableLeft="@drawable/ic_help_48px"
     android:layout_marginHorizontal="@dimen/item_margin_horizontal"
+    android:drawablePadding="@dimen/item_margin_horizontal"
 />