Fix #153/#154 : MultipleChoice/ItemSelection Interaction

app/src/main/java/org/oppia/app/player/state/InteractionAdapter.kt

@@ -0,0 +1,160 @@
+package org.oppia.app.player.state
+
+import android.text.Spannable
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+import androidx.databinding.library.baseAdapters.BR
+import androidx.recyclerview.widget.RecyclerView
+import kotlinx.android.synthetic.main.item_selection_interaction_items.view.*
+import kotlinx.android.synthetic.main.multiple_choice_interaction_items.view.*
+import org.oppia.app.R
+import org.oppia.app.databinding.ItemSelectionInteractionItemsBinding
+import org.oppia.app.databinding.MultipleChoiceInteractionItemsBinding
+import org.oppia.app.model.InteractionObject
+import org.oppia.app.model.StringList
+import org.oppia.app.player.state.itemviewmodel.CustomizationArgsInteractionViewModel
+import org.oppia.app.player.state.itemviewmodel.SelectionContentViewModel
+import org.oppia.app.player.state.listener.InteractionAnswerRetriever
+import org.oppia.util.parser.HtmlParser
+
+private const val VIEW_TYPE_MULTIPLE_CHOICE = 1
+private const val VIEW_TYPE_ITEM_SELECTION = 2
+private const val INTERACTION_ADAPTER_TAG = "Interaction Adapter"
+
+/** Adapter to bind the interactions to the [RecyclerView]. It handles MultipleChoiceInput and ItemSelectionInput interaction views. */
+class InteractionAdapter(
+  private val htmlParserFactory: HtmlParser.Factory,
+  private val entityType: String,
+  private val explorationId: String,
+  private val itemList: MutableList<SelectionContentViewModel>,
+  private val customizationArgs: CustomizationArgsInteractionViewModel
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>(), InteractionAnswerRetriever {
+
+  private var itemSelectedPosition = -1
+  private var selectedAnswerIndex = -1
+  private var selectedHtmlStringList = mutableListOf<String>()
+
+  override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    return when (viewType) {
+      VIEW_TYPE_MULTIPLE_CHOICE -> {
+        val inflater = LayoutInflater.from(parent.context)
+        val binding =
+          DataBindingUtil.inflate<MultipleChoiceInteractionItemsBinding>(
+            inflater,
+            R.layout.multiple_choice_interaction_items,
+            parent,
+            /* attachToParent= */ false
+          )
+        MultipleChoiceViewHolder(binding)
+      }
+      VIEW_TYPE_ITEM_SELECTION -> {
+        val inflater = LayoutInflater.from(parent.context)
+        val binding =
+          DataBindingUtil.inflate<ItemSelectionInteractionItemsBinding>(
+            inflater,
+            R.layout.item_selection_interaction_items,
+            parent,
+            /* attachToParent= */ false
+          )
+        ItemSelectionViewHolder(binding)
+      }
+      else -> throw IllegalArgumentException("Invalid view type")
+    }
+  }
+
+  override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+    when (holder.itemViewType) {
+      VIEW_TYPE_MULTIPLE_CHOICE -> (holder as MultipleChoiceViewHolder).bind(
+        itemList[position].htmlContent,
+        position,
+        itemSelectedPosition
+      )
+      VIEW_TYPE_ITEM_SELECTION -> (holder as ItemSelectionViewHolder).bind(
+        itemList[position]
+      )
+    }
+  }
+
+  // Determines the appropriate ViewType according to the interaction type.
+  override fun getItemViewType(position: Int): Int {
+    return if (customizationArgs.interactionId == "ItemSelectionInput") {
+      if (customizationArgs.maxAllowableSelectionCount > 1) {
+        VIEW_TYPE_ITEM_SELECTION
+      } else {
+        VIEW_TYPE_MULTIPLE_CHOICE
+      }
+    } else {
+      VIEW_TYPE_MULTIPLE_CHOICE
+    }
+  }
+
+  override fun getItemCount(): Int {
+    return itemList.size
+  }
+
+  private inner class ItemSelectionViewHolder(val binding: ViewDataBinding) : RecyclerView.ViewHolder(binding.root) {
+    internal fun bind(selectionContentViewModel: SelectionContentViewModel) {
+      binding.setVariable(BR.htmlContent, selectionContentViewModel.htmlContent)
+      binding.executePendingBindings()
+      val htmlResult: Spannable = htmlParserFactory.create(entityType, explorationId).parseOppiaHtml(
+        selectionContentViewModel.htmlContent,
+        binding.root.item_selection_contents_text_view
+      )
+      binding.root.item_selection_contents_text_view.text = htmlResult
+      binding.root.item_selection_checkbox.isChecked = selectionContentViewModel.isAnswerSelected
+      binding.root.checkbox_container.setOnClickListener {
+        if (binding.root.item_selection_checkbox.isChecked) {
+          itemList[adapterPosition].isAnswerSelected = false
+          selectedHtmlStringList.remove(binding.root.item_selection_contents_text_view.text.toString())
+        } else {
+          if (selectedHtmlStringList.size != customizationArgs.maxAllowableSelectionCount) {
+            itemList[adapterPosition].isAnswerSelected = true
+            selectedHtmlStringList.add(binding.root.item_selection_contents_text_view.text.toString())
+          } else {
+            Log.d(
+              INTERACTION_ADAPTER_TAG,
+              "You cannot select more than " + customizationArgs.maxAllowableSelectionCount + " options"
+            )
+          }
+        }
+        notifyDataSetChanged()
+      }
+    }
+  }
+
+  private inner class MultipleChoiceViewHolder(val binding: ViewDataBinding) : RecyclerView.ViewHolder(binding.root) {
+    internal fun bind(rawString: String, position: Int, selectedPosition: Int) {
+      binding.setVariable(BR.htmlContent, rawString)
+      binding.executePendingBindings()
+      val htmlResult: Spannable = htmlParserFactory.create(entityType, explorationId).parseOppiaHtml(
+        rawString,
+        binding.root.multiple_choice_content_text_view
+      )
+      binding.root.multiple_choice_content_text_view.text = htmlResult
+      binding.root.multiple_choice_radio_button.isChecked = selectedPosition == position
+      binding.root.radio_container.setOnClickListener {
+        itemSelectedPosition = adapterPosition
+        selectedAnswerIndex = adapterPosition
+        notifyDataSetChanged()
+      }
+    }
+  }
+
+  override fun getPendingAnswer(): InteractionObject {
+    val interactionObjectBuilder = InteractionObject.newBuilder()
+    if (customizationArgs.interactionId == "ItemSelectionInput") {
+      if (selectedHtmlStringList.size >= 0) {
+        interactionObjectBuilder.setOfHtmlString = StringList.newBuilder().addAllHtml(selectedHtmlStringList).build()
+      } else {
+        if (selectedAnswerIndex >= 0) {
+          interactionObjectBuilder.nonNegativeInt = selectedAnswerIndex
+        }
+
+      }
+    }
+    return interactionObjectBuilder.build()
+  }
+}

app/src/main/java/org/oppia/app/player/state/StateAdapter.kt

@@ -7,25 +7,29 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
-import androidx.recyclerview.widget.RecyclerView
-import org.oppia.app.R
 import androidx.databinding.library.baseAdapters.BR
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.content_item.view.*
 import kotlinx.android.synthetic.main.interaction_read_only_item.view.*
 import kotlinx.android.synthetic.main.numeric_input_interaction_item.view.*
+import kotlinx.android.synthetic.main.selection_interaction_item.view.*
 import kotlinx.android.synthetic.main.state_button_item.view.*
 import kotlinx.android.synthetic.main.text_input_interaction_item.view.*
+import org.oppia.app.R
 import org.oppia.app.databinding.ContentItemBinding
 import org.oppia.app.databinding.InteractionReadOnlyItemBinding
 import org.oppia.app.databinding.NumericInputInteractionItemBinding
+import org.oppia.app.databinding.SelectionInteractionItemBinding
 import org.oppia.app.databinding.StateButtonItemBinding
 import org.oppia.app.databinding.TextInputInteractionItemBinding
 import org.oppia.app.model.InteractionObject
 import org.oppia.app.player.state.customview.NumericInputInteractionView
 import org.oppia.app.player.state.customview.TextInputInteractionView
 import org.oppia.app.player.state.itemviewmodel.ContentViewModel
+import org.oppia.app.player.state.itemviewmodel.CustomizationArgsInteractionViewModel
 import org.oppia.app.player.state.itemviewmodel.InteractionReadOnlyViewModel
 import org.oppia.app.player.state.itemviewmodel.NumericInputInteractionViewModel
+import org.oppia.app.player.state.itemviewmodel.SelectionContentViewModel
 import org.oppia.app.player.state.itemviewmodel.StateButtonViewModel
 import org.oppia.app.player.state.itemviewmodel.TextInputInteractionViewModel
 import org.oppia.app.player.state.listener.InputInteractionTextListener
@@ -37,6 +41,7 @@ const val VIEW_TYPE_INTERACTION_READ_ONLY = 2
 const val VIEW_TYPE_NUMERIC_INPUT_INTERACTION = 3
 const val VIEW_TYPE_TEXT_INPUT_INTERACTION = 4
 const val VIEW_TYPE_STATE_BUTTON = 5
+const val VIEW_TYPE_SELECTION_INTERACTION = 6
 
 class StateAdapter(
   private val itemList: MutableList<Any>,
@@ -49,7 +54,7 @@ class StateAdapter(
 
   private var inputInteractionView: Any = StateButtonViewModel
 
-  lateinit var stateButtonViewModel: StateButtonViewModel
+  private lateinit var stateButtonViewModel: StateButtonViewModel
 
   override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
     return when (viewType) {
@@ -108,7 +113,18 @@ class StateAdapter(
           )
         StateButtonViewHolder(binding, interactionListener)
       }
-      else -> throw IllegalArgumentException("Invalid view type") as Throwable
+      VIEW_TYPE_SELECTION_INTERACTION -> {
+        val inflater = LayoutInflater.from(parent.context)
+        val binding =
+          DataBindingUtil.inflate<SelectionInteractionItemBinding>(
+            inflater,
+            R.layout.selection_interaction_item,
+            parent,
+            /* attachToParent= */false
+          )
+        SelectionInteractionViewHolder(binding)
+      }
+      else -> throw IllegalArgumentException("Invalid view type")
     }
   }
 
@@ -129,6 +145,9 @@ class StateAdapter(
       VIEW_TYPE_STATE_BUTTON -> {
         (holder as StateButtonViewHolder).bind((itemList[position] as StateButtonViewModel))
       }
+      VIEW_TYPE_SELECTION_INTERACTION -> {
+        (holder as SelectionInteractionViewHolder).bind((itemList[position] as CustomizationArgsInteractionViewModel))
+      }
     }
   }
 
@@ -138,6 +157,7 @@ class StateAdapter(
       is NumericInputInteractionViewModel -> VIEW_TYPE_NUMERIC_INPUT_INTERACTION
       is TextInputInteractionViewModel -> VIEW_TYPE_TEXT_INPUT_INTERACTION
       is InteractionReadOnlyViewModel -> VIEW_TYPE_INTERACTION_READ_ONLY
+      is CustomizationArgsInteractionViewModel -> VIEW_TYPE_SELECTION_INTERACTION
       is StateButtonViewModel -> {
         stateButtonViewModel = itemList[position] as StateButtonViewModel
         VIEW_TYPE_STATE_BUTTON
@@ -231,6 +251,27 @@ class StateAdapter(
     }
   }
 
+  inner class SelectionInteractionViewHolder(
+    val binding: ViewDataBinding
+  ) : RecyclerView.ViewHolder(binding.root) {
+    internal fun bind(customizationArgs: CustomizationArgsInteractionViewModel) {
+      val items: Array<String>?
+      val choiceContentList: MutableList<SelectionContentViewModel> = ArrayList()
+      binding.executePendingBindings()
+      val gaeCustomArgsInString = customizationArgs.choiceItems.toString().replace("[", "").replace("]", "")
+      items = gaeCustomArgsInString.split(",").toTypedArray()
+      for (values in items) {
+        val selectionContentViewModel = SelectionContentViewModel()
+        selectionContentViewModel.htmlContent = values
+        selectionContentViewModel.isAnswerSelected = false
+        choiceContentList.add(selectionContentViewModel)
+      }
+      val interactionAdapter =
+        InteractionAdapter(htmlParserFactory, entityType, explorationId, choiceContentList, customizationArgs)
+      binding.root.selection_interaction_recyclerview.adapter = interactionAdapter
+    }
+  }
+
   override fun doesTextExists(textExists: Boolean) {
     if (textExists) {
       stateButtonViewModel.isInteractionButtonActive.set(true)

app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt

@@ -25,6 +25,7 @@ import org.oppia.app.player.audio.CellularDataDialogFragment
 import org.oppia.app.player.exploration.EXPLORATION_ACTIVITY_TOPIC_ID_ARGUMENT_KEY
 import org.oppia.app.player.exploration.ExplorationActivity
 import org.oppia.app.player.state.itemviewmodel.ContentViewModel
+import org.oppia.app.player.state.itemviewmodel.CustomizationArgsInteractionViewModel
 import org.oppia.app.player.state.itemviewmodel.InteractionReadOnlyViewModel
 import org.oppia.app.player.state.itemviewmodel.NumericInputInteractionViewModel
 import org.oppia.app.player.state.itemviewmodel.StateButtonViewModel
@@ -41,6 +42,7 @@ import javax.inject.Inject
 
 private const val TAG_CELLULAR_DATA_DIALOG = "CELLULAR_DATA_DIALOG"
 private const val TAG_AUDIO_FRAGMENT = "AUDIO_FRAGMENT"
+private const val TAG_STATE_FRAGMENT = "STATE_FRAGMENT"
 
 const val CONTINUE = "Continue"
 const val END_EXPLORATION = "EndExploration"
@@ -97,7 +99,7 @@ class StateFragmentPresenter @Inject constructor(
           useCellularData = prefs.useCellularData
         }
       })
-    explorationId = fragment.arguments!!.getString(EXPLORATION_ACTIVITY_TOPIC_ID_ARGUMENT_KEY)
+    explorationId = fragment.arguments!!.getString(EXPLORATION_ACTIVITY_TOPIC_ID_ARGUMENT_KEY)!!
 
     stateAdapter = StateAdapter(itemList, this as InteractionListener, htmlParserFactory, entityType, explorationId)
 
@@ -424,8 +426,42 @@ class StateFragmentPresenter @Inject constructor(
         TEXT_INPUT -> {
           addTextInputItem()
         }
+        MULTIPLE_CHOICE_INPUT -> {
+          addMultipleChoiceInputItem()
+        }
+        ITEM_SELECT_INPUT -> {
+          addMultipleChoiceInputItem()
+        }
+      }
+    }
+  }
+
+  private fun addMultipleChoiceInputItem() {
+    val customizationArgsMap: Map<String, InteractionObject> =
+      currentEphemeralState.get()!!.state.interaction.customizationArgsMap
+    val multipleChoiceInputInteractionViewModel = CustomizationArgsInteractionViewModel()
+    val allKeys: Set<String> = customizationArgsMap.keys
+
+    for (key in allKeys) {
+      logger.d(TAG_STATE_FRAGMENT, key)
+    }
+    when {
+      customizationArgsMap.contains("choices") -> {
+        when {
+          customizationArgsMap.contains("maxAllowableSelectionCount") -> {
+            multipleChoiceInputInteractionViewModel.maxAllowableSelectionCount =
+              currentEphemeralState.get()!!.state.interaction.customizationArgsMap["maxAllowableSelectionCount"]!!.signedInt
+            multipleChoiceInputInteractionViewModel.minAllowableSelectionCount =
+              currentEphemeralState.get()!!.state.interaction.customizationArgsMap["minAllowableSelectionCount"]!!.signedInt
+          }
+        }
+        multipleChoiceInputInteractionViewModel.interactionId = currentEphemeralState.get()!!.state.interaction.id
+        multipleChoiceInputInteractionViewModel.choiceItems =
+          currentEphemeralState.get()!!.state.interaction.customizationArgsMap["choices"]!!.setOfHtmlString.htmlList
       }
     }
+    itemList.add(multipleChoiceInputInteractionViewModel)
+    stateAdapter.notifyDataSetChanged()
   }
 
   private fun addNumericInputItem() {

app/src/main/java/org/oppia/app/player/state/itemviewmodel/CustomizationArgsInteractionViewModel.kt

@@ -0,0 +1,15 @@
+package org.oppia.app.player.state.itemviewmodel
+
+import androidx.lifecycle.ViewModel
+import org.oppia.app.fragment.FragmentScope
+import javax.inject.Inject
+
+/** [ObservableViewModel] for multiple or item-selection input choice list. */
+@FragmentScope
+class CustomizationArgsInteractionViewModel @Inject constructor() : ViewModel() {
+
+  var choiceItems: MutableList<String>? = null
+  var interactionId: String = ""
+  var maxAllowableSelectionCount: Int = 0
+  var minAllowableSelectionCount: Int = 0
+}

app/src/main/java/org/oppia/app/player/state/itemviewmodel/SelectionContentViewModel.kt

@@ -0,0 +1,12 @@
+package org.oppia.app.player.state.itemviewmodel
+
+import androidx.lifecycle.ViewModel
+import org.oppia.app.fragment.FragmentScope
+import javax.inject.Inject
+
+/** [ObservableViewModel] for MultipleChoiceInput values or ItemSelectionInput values. */
+@FragmentScope
+class SelectionContentViewModel @Inject constructor() : ViewModel() {
+  var htmlContent: String =""
+  var isAnswerSelected = false
+}