Fix #153/#154 : MultipleChoice/ItemSelection Interaction

app/src/main/java/org/oppia/app/home/HomeFragmentPresenter.kt

@@ -18,6 +18,7 @@ import org.oppia.util.logging.Logger
 import javax.inject.Inject
 
 private const val EXPLORATION_ID = TEST_EXPLORATION_ID_5
+private const val EXPLORATION_ID_1 = TEST_EXPLORATION_ID_6
 
 /** The controller for [HomeFragment]. */
 @FragmentScope
@@ -52,6 +53,7 @@ class HomeFragmentPresenter @Inject constructor(
   }
 
   fun playExplorationButton(v: View) {
+    explorationDataController.stopPlayingExploration()
     explorationDataController.startPlayingExploration(
       EXPLORATION_ID
     ).observe(fragment, Observer<AsyncResult<Any?>> { result ->
@@ -65,4 +67,19 @@ class HomeFragmentPresenter @Inject constructor(
       }
     })
   }
+  fun playExplorationButton_1(v: View) {
+    explorationDataController.stopPlayingExploration()
+    explorationDataController.startPlayingExploration(
+      EXPLORATION_ID_1
+    ).observe(fragment, Observer<AsyncResult<Any?>> { result ->
+      when {
+        result.isPending() -> logger.d("HomeFragment", "Loading exploration")
+        result.isFailure() -> logger.e("HomeFragment", "Failed to load exploration", result.getErrorOrNull()!!)
+        else -> {
+          logger.d("HomeFragment", "Successfully loaded exploration")
+          routeToExplorationListener.routeToExploration(EXPLORATION_ID_1)
+        }
+      }
+    })
+  }
 }

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

@@ -0,0 +1,167 @@
+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.item_selection_contents_text_view
+import kotlinx.android.synthetic.main.item_selection_interaction_items.view.checkbox_container
+import kotlinx.android.synthetic.main.item_selection_interaction_items.view.item_selection_checkbox
+import kotlinx.android.synthetic.main.multiple_choice_interaction_items.view.multiple_choice_content_text_view
+import kotlinx.android.synthetic.main.multiple_choice_interaction_items.view.multiple_choice_radio_button
+import kotlinx.android.synthetic.main.multiple_choice_interaction_items.view.radio_container
+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_RADIO_BUTTONS = 1
+private const val VIEW_TYPE_CHECKBOXES = 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_RADIO_BUTTONS -> {
+        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_CHECKBOXES -> {
+        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_RADIO_BUTTONS -> (holder as MultipleChoiceViewHolder).bind(
+        itemList[position].htmlContent,
+        position,
+        itemSelectedPosition
+      )
+      VIEW_TYPE_CHECKBOXES -> (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_CHECKBOXES
+      } else {
+        VIEW_TYPE_RADIO_BUTTONS
+      }
+    } else {
+      VIEW_TYPE_RADIO_BUTTONS
+    }
+  }
+
+  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,14 +7,18 @@ import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.RecyclerView
 import androidx.databinding.library.baseAdapters.BR
-import kotlinx.android.synthetic.main.content_item.view.*
+import kotlinx.android.synthetic.main.content_item.view.content_text_view
+import kotlinx.android.synthetic.main.selection_interaction_item.view.selection_interaction_recyclerview
 import kotlinx.android.synthetic.main.state_button_item.view.*
 import org.oppia.app.R
 import org.oppia.app.databinding.ContentItemBinding
+import org.oppia.app.databinding.SelectionInteractionItemBinding
 import org.oppia.app.player.state.itemviewmodel.StateButtonViewModel
 import org.oppia.app.player.state.listener.ButtonInteractionListener
 import org.oppia.app.databinding.StateButtonItemBinding
 import org.oppia.app.player.state.itemviewmodel.ContentViewModel
+import org.oppia.app.player.state.itemviewmodel.CustomizationArgsInteractionViewModel
+import org.oppia.app.player.state.itemviewmodel.SelectionContentViewModel
 import org.oppia.util.parser.HtmlParser
 
 @Suppress("unused")
@@ -26,6 +30,7 @@ private const val VIEW_TYPE_NUMERIC_INPUT_INTERACTION = 3
 @Suppress("unused")
 private const val VIEW_TYPE_TEXT_INPUT_INTERACTION = 4
 private const val VIEW_TYPE_STATE_BUTTON = 5
+const val VIEW_TYPE_SELECTION_INTERACTION = 6
 
 /** Adapter to inflate different items/views inside [RecyclerView]. The itemList consists of various ViewModels. */
 class StateAdapter(
@@ -64,6 +69,17 @@ class StateAdapter(
           )
         ContentViewHolder(binding)
       }
+      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")
     }
   }
@@ -76,12 +92,16 @@ class StateAdapter(
       VIEW_TYPE_CONTENT -> {
         (holder as ContentViewHolder).bind((itemList[position] as ContentViewModel).htmlContent)
       }
+      VIEW_TYPE_SELECTION_INTERACTION -> {
+        (holder as SelectionInteractionViewHolder).bind((itemList[position] as CustomizationArgsInteractionViewModel))
+      }
     }
   }
 
   override fun getItemViewType(position: Int): Int {
     return when (itemList[position]) {
       is ContentViewModel -> VIEW_TYPE_CONTENT
+      is CustomizationArgsInteractionViewModel -> VIEW_TYPE_SELECTION_INTERACTION
       is StateButtonViewModel -> {
         stateButtonViewModel = itemList[position] as StateButtonViewModel
         VIEW_TYPE_STATE_BUTTON
@@ -124,4 +144,26 @@ class StateAdapter(
       binding.executePendingBindings()
     }
   }
+
+  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
+    }
+  }
+
 }

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

@@ -22,6 +22,7 @@ import org.oppia.app.player.audio.AudioFragment
 import org.oppia.app.player.audio.CellularDataDialogFragment
 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.StateButtonViewModel
 import org.oppia.app.player.state.listener.ButtonInteractionListener
 import org.oppia.app.viewmodel.ViewModelProvider
@@ -37,6 +38,7 @@ import javax.inject.Inject
 const val STATE_FRAGMENT_EXPLORATION_ID_ARGUMENT_KEY = "STATE_FRAGMENT_EXPLORATION_ID_ARGUMENT_KEY"
 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"
 
 private const val CONTINUE = "Continue"
 private const val END_EXPLORATION = "EndExploration"
@@ -176,6 +178,7 @@ class StateFragmentPresenter @Inject constructor(
       itemList.clear()
       currentEphemeralState = result
       checkAndAddContentItem()
+      checkAndAddInteraction()
       updateDummyStateName()
 
       val interactionId = result.state.interaction.id
@@ -352,6 +355,46 @@ class StateFragmentPresenter @Inject constructor(
     itemList.add(contentViewModel)
     stateAdapter.notifyDataSetChanged()
   }
+  private fun checkAndAddInteraction() {
+    if (currentEphemeralState.stateTypeCase.number == EphemeralState.PENDING_STATE_FIELD_NUMBER) {
+      when (currentEphemeralState.state.interaction.id) {
+        MULTIPLE_CHOICE_INPUT -> {
+          addMultipleChoiceInputItem()
+        }
+        ITEM_SELECT_INPUT -> {
+          addMultipleChoiceInputItem()
+        }
+      }
+    }
+  }
+
+  private fun addMultipleChoiceInputItem() {
+    val customizationArgsMap: Map<String, InteractionObject> =
+      currentEphemeralState.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.state.interaction.customizationArgsMap["maxAllowableSelectionCount"]!!.signedInt
+            multipleChoiceInputInteractionViewModel.minAllowableSelectionCount =
+              currentEphemeralState.state.interaction.customizationArgsMap["minAllowableSelectionCount"]!!.signedInt
+          }
+        }
+        multipleChoiceInputInteractionViewModel.interactionId = currentEphemeralState.state.interaction.id
+        multipleChoiceInputInteractionViewModel.choiceItems =
+          currentEphemeralState.state.interaction.customizationArgsMap["choices"]!!.setOfHtmlString.htmlList
+      }
+    }
+    itemList.add(multipleChoiceInputInteractionViewModel)
+    stateAdapter.notifyDataSetChanged()
+  }
 
   private fun updateNavigationButtonVisibility(
     interactionId: String,

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
+
+/** [ViewModel] for multiple or item-selection input choice list. */
+@FragmentScope
+class CustomizationArgsInteractionViewModel : 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
+
+/** [ViewModel] for MultipleChoiceInput values or ItemSelectionInput values. */
+@FragmentScope
+class SelectionContentViewModel : ViewModel() {
+  var htmlContent: String =""
+  var isAnswerSelected = false
+}