Fix #161: Exploration player contentcard supports rich-text part [Blocked: #205]

app/src/main/AndroidManifest.xml

@@ -32,5 +32,6 @@
       android:theme="@style/SplashScreenTheme">
     </activity>
     <activity android:name=".testing.BindableAdapterTestActivity"/>
+    <activity android:name=".testing.HtmlParserTestActivity"/>
   </application>
 </manifest>

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

@@ -1,6 +1,7 @@
 package org.oppia.app.player.state
 
 import android.text.Editable
+import android.text.Spannable
 import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -29,14 +30,21 @@ import org.oppia.app.player.state.itemviewmodel.StateButtonViewModel
 import org.oppia.app.player.state.itemviewmodel.TextInputInteractionViewModel
 import org.oppia.app.player.state.listener.InputInteractionTextListener
 import org.oppia.app.player.state.listener.InteractionListener
+import org.oppia.util.parser.HtmlParser
 
 const val VIEW_TYPE_CONTENT = 1
 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
 
-class StateAdapter(private val itemList: MutableList<Any>, private val interactionListener: InteractionListener) :
+class StateAdapter(
+  private val itemList: MutableList<Any>,
+  private val interactionListener: InteractionListener,
+  private val htmlParserFactory: HtmlParser.Factory,
+  private val entityType: String,
+  private val explorationId: String
+) :
   RecyclerView.Adapter<RecyclerView.ViewHolder>(), InputInteractionTextListener {
 
   private var inputInteractionView: Any = StateButtonViewModel
@@ -143,10 +151,14 @@ class StateAdapter(private val itemList: MutableList<Any>, private val interacti
   }
 
   inner class ContentViewHolder(val binding: ViewDataBinding) : RecyclerView.ViewHolder(binding.root) {
-    internal fun bind(rawString: String?) {
+    internal fun bind(rawString: String) {
       binding.setVariable(BR.htmlContent, rawString)
       binding.executePendingBindings()
-      binding.root.content_text_view.text = rawString
+      val htmlResult: Spannable = htmlParserFactory.create(entityType, explorationId).parseOppiaHtml(
+        rawString,
+        binding.root.content_text_view
+      )
+      binding.root.content_text_view.text = htmlResult
     }
   }
 

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

@@ -1,13 +1,11 @@
 package org.oppia.app.player.state
 
-import android.app.Activity
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat.getSystemService
 import androidx.databinding.ObservableField
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.LiveData
@@ -38,6 +36,7 @@ import org.oppia.domain.exploration.ExplorationDataController
 import org.oppia.domain.exploration.ExplorationProgressController
 import org.oppia.util.data.AsyncResult
 import org.oppia.util.logging.Logger
+import org.oppia.util.parser.HtmlParser
 import javax.inject.Inject
 
 private const val TAG_CELLULAR_DATA_DIALOG = "CELLULAR_DATA_DIALOG"
@@ -67,7 +66,8 @@ class StateFragmentPresenter @Inject constructor(
   private val stateButtonViewModelProvider: ViewModelProvider<StateButtonViewModel>,
   private val explorationDataController: ExplorationDataController,
   private val explorationProgressController: ExplorationProgressController,
-  private val logger: Logger
+  private val logger: Logger,
+  private val htmlParserFactory: HtmlParser.Factory
 ) : InteractionListener {
 
   private val oldStateNameList: ArrayList<String> = ArrayList()
@@ -81,7 +81,8 @@ class StateFragmentPresenter @Inject constructor(
 
   private var showCellularDataDialog = true
   private var useCellularData = false
-  private var explorationId: String? = null
+  private lateinit var explorationId: String
+  private val entityType: String = "exploration"
 
   private lateinit var stateAdapter: StateAdapter
 
@@ -96,8 +97,9 @@ class StateFragmentPresenter @Inject constructor(
           useCellularData = prefs.useCellularData
         }
       })
+    explorationId = fragment.arguments!!.getString(EXPLORATION_ACTIVITY_TOPIC_ID_ARGUMENT_KEY)
 
-    stateAdapter = StateAdapter(itemList, this as InteractionListener)
+    stateAdapter = StateAdapter(itemList, this as InteractionListener, htmlParserFactory, entityType, explorationId)
 
     binding = StateFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
     binding.stateRecyclerView.apply {
@@ -107,7 +109,6 @@ class StateFragmentPresenter @Inject constructor(
       it.stateFragment = fragment as StateFragment
       it.viewModel = getStateViewModel()
     }
-    explorationId = fragment.arguments!!.getString(EXPLORATION_ACTIVITY_TOPIC_ID_ARGUMENT_KEY)
 
     subscribeToCurrentState()
 

app/src/sharedTest/java/org/oppia/app/player/state/StateFragmentContentCardTest.kt

@@ -0,0 +1,38 @@
+package org.oppia.app.player.state
+
+import android.app.Activity
+import android.content.Intent
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.ActivityTestRule
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.oppia.app.R
+import org.oppia.app.home.HomeActivity
+import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPosition
+
+/** Tests for [VIEW_TYPE_CONTENT]. */
+@RunWith(AndroidJUnit4::class)
+class StateFragmentContentCardTest {
+
+  @Test
+  fun testContentCard_loadExplorationTest5_handleCustomOppiaTags_parsedHtmlDisplaysCorrectly() {
+    ActivityScenario.launch(HomeActivity::class.java).use {
+      onView(withId(R.id.play_exploration_button)).perform(click())
+      val htmlResult =  "Hi, welcome to Oppia! is a tool that helps you create interactive learning activities that can be continually improved over time.\n\n" +
+            "Incidentally, do you know where the name 'Oppia' comes from?\n\n"
+      onView(atPosition(R.id.state_recycler_view, 0)).check(matches(hasDescendant(withText(htmlResult))))
+    }
+  }
+}

app/src/sharedTest/java/org/oppia/app/recyclerview/RecyclerViewMatcher.kt

@@ -0,0 +1,63 @@
+package org.oppia.app.recyclerview
+
+import android.content.res.Resources
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import org.hamcrest.Description
+import org.hamcrest.Matcher
+import org.hamcrest.TypeSafeMatcher
+
+// Reference Link: https://github.com/dannyroa/espresso-samples/blob/master/RecyclerView/app/src/androidTest/java/com/dannyroa/espresso_samples/recyclerview/RecyclerViewMatcher.java
+class RecyclerViewMatcher {
+  companion object {
+    /**
+     * This function returns a Matcher for an item inside RecyclerView from a specified position.
+     */
+    fun atPosition(recyclerViewId: Int, position: Int): Matcher<View> {
+      return atPositionOnView(recyclerViewId, position, -1)
+    }
+
+    /**
+     * This function returns a Matcher for a specific view within the item inside RecyclerView from a specified position.
+     */
+    fun atPositionOnView(recyclerViewId: Int, position: Int, targetViewId: Int): Matcher<View> {
+      return object : TypeSafeMatcher<View>() {
+        var resources: Resources? = null
+        var childView: View? = null
+
+        override fun describeTo(description: Description) {
+          var idDescription = Integer.toString(recyclerViewId)
+          if (this.resources != null) {
+            idDescription = try {
+              this.resources!!.getResourceName(recyclerViewId)
+            } catch (var4: Resources.NotFoundException) {
+              String.format(
+                "%s (resource name not found)",
+                recyclerViewId
+              )
+            }
+          }
+          description.appendText("with id: $idDescription")
+        }
+
+        public override fun matchesSafely(view: View): Boolean {
+          this.resources = view.resources
+          if (childView == null) {
+            val recyclerView = view.rootView.findViewById<View>(recyclerViewId) as RecyclerView
+            if (recyclerView.id == recyclerViewId) {
+              childView = recyclerView.findViewHolderForAdapterPosition(position)!!.itemView
+            } else {
+              return false
+            }
+          }
+          return if (targetViewId == -1) {
+            view === childView
+          } else {
+            val targetView = childView!!.findViewById<View>(targetViewId)
+            view === targetView
+          }
+        }
+      }
+    }
+  }
+}