Fix #259 and part of #163: Finish state fragment UI structure

app/build.gradle

@@ -62,15 +62,19 @@ dependencies {
       'androidx.appcompat:appcompat:1.0.2',
       'androidx.constraintlayout:constraintlayout:1.1.3',
       'androidx.core:core-ktx:1.0.2',
+      "androidx.fragment:fragment:$fragment_version",
       'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0-alpha03',
       'androidx.multidex:multidex:2.0.1',
       'androidx.recyclerview:recyclerview:1.0.0',
       'com.github.bumptech.glide:glide:4.9.0',
+      'com.google.android.material:material:1.0.0',
       'com.google.dagger:dagger:2.24',
       'com.google.guava:guava:28.1-android',
       "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version",
       'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1',
       'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1',
+      'org.mockito:mockito-core:2.7.22',
+      'com.github.bumptech.glide:glide:4.9.0',
   )
   testImplementation(
       'androidx.test:core:1.2.0',
@@ -81,6 +85,7 @@ dependencies {
       'com.google.truth:truth:0.43',
       'org.robolectric:robolectric:4.3',
       'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2',
+      'org.mockito:mockito-core:2.7.22',
   )
   androidTestImplementation(
       'androidx.test:core:1.2.0',
@@ -90,7 +95,8 @@ dependencies {
       'androidx.test.ext:junit:1.1.1',
       'androidx.test:runner:1.2.0',
       'com.google.truth:truth:0.43',
-      'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2'
+      'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2',
+      'org.mockito:mockito-android:2.7.22',
   )
   androidTestUtil(
       'androidx.test:orchestrator:1.2.0',

app/src/main/AndroidManifest.xml

@@ -14,7 +14,9 @@
     <activity android:name=".home.ContinuePlayingActivity" />
     <activity android:name=".home.HomeActivity" />
     <activity android:name=".player.audio.testing.AudioFragmentTestActivity" />
-    <activity android:name=".player.exploration.ExplorationActivity" />
+    <activity
+      android:name=".player.exploration.ExplorationActivity"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity android:name=".player.state.testing.StateFragmentTestActivity" />
     <activity android:name=".profile.ProfileActivity" />
     <activity

app/src/main/java/org/oppia/app/activity/ActivityComponent.kt

@@ -15,6 +15,7 @@ import org.oppia.app.story.StoryActivity
 import org.oppia.app.testing.BindableAdapterTestActivity
 import org.oppia.app.testing.ContentCardTestActivity
 import org.oppia.app.testing.HtmlParserTestActivity
+import org.oppia.app.testing.UrlImageParserTestActivity
 import org.oppia.app.topic.TopicActivity
 import org.oppia.app.topic.questionplayer.QuestionPlayerActivity
 import javax.inject.Provider
@@ -38,7 +39,8 @@ interface ActivityComponent {
   fun inject(continuePlayingActivity: ContinuePlayingActivity)
   fun inject(explorationActivity: ExplorationActivity)
   fun inject(homeActivity: HomeActivity)
-  fun inject(htmlParserTestActivity: HtmlParserTestActivity)
+  fun inject(htmlParserTestActivty: HtmlParserTestActivity)
+  fun inject(urlImageParserTestActivity: UrlImageParserTestActivity)
   fun inject(profileActivity: ProfileActivity)
   fun inject(questionPlayerActivity: QuestionPlayerActivity)
   fun inject(stateFragmentTestActivity: StateFragmentTestActivity)

app/src/main/java/org/oppia/app/application/ApplicationComponent.kt

@@ -27,8 +27,8 @@ import javax.inject.Singleton
 @Component(modules = [
   ApplicationModule::class, DispatcherModule::class, NetworkModule::class, LoggerModule::class,
   ContinueModule::class, FractionInputModule::class, ItemSelectionInputModule::class, MultipleChoiceInputModule::class,
-  NumberWithUnitsRuleModule::class, NumericInputRuleModule::class, TextInputRuleModule::class, InteractionsModule::class,
-  GcsResourceModule::class, ImageParsingModule::class, GlideImageLoaderModule::class,
+  NumberWithUnitsRuleModule::class, NumericInputRuleModule::class, TextInputRuleModule::class,
+  InteractionsModule::class, GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class,
   HtmlParserEntityTypeModule::class
 ])
 interface ApplicationComponent {

app/src/main/java/org/oppia/app/customview/interaction/FractionInputInteractionView.kt

@@ -3,8 +3,6 @@ package org.oppia.app.customview.interaction
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.EditText
-import org.oppia.app.model.InteractionObject
-import org.oppia.app.parser.StringToFractionParser
 
 // TODO(#249): These are the attributes which should be defined in XML, that are required for this interaction view to work correctly
 //  digits="0123456789/-"
@@ -18,13 +16,4 @@ class FractionInputInteractionView @JvmOverloads constructor(
   context: Context,
   attrs: AttributeSet? = null,
   defStyle: Int = android.R.attr.editTextStyle
-) : EditText(context, attrs, defStyle), InteractionAnswerRetriever {
-
-  override fun getPendingAnswer(): InteractionObject {
-    val interactionObjectBuilder = InteractionObject.newBuilder()
-    if (!text.isNullOrEmpty()) {
-      interactionObjectBuilder.fraction = StringToFractionParser().getFractionFromString(text = text.toString())
-    }
-    return interactionObjectBuilder.build()
-  }
-}
+) : EditText(context, attrs, defStyle)

app/src/main/java/org/oppia/app/customview/interaction/NumericInputInteractionView.kt

@@ -17,13 +17,4 @@ class NumericInputInteractionView @JvmOverloads constructor(
   context: Context,
   attrs: AttributeSet? = null,
   defStyle: Int = android.R.attr.editTextStyle
-) : EditText(context, attrs, defStyle), InteractionAnswerRetriever {
-
-  override fun getPendingAnswer(): InteractionObject {
-    val interactionObjectBuilder = InteractionObject.newBuilder()
-    if (!text.isNullOrEmpty()) {
-      interactionObjectBuilder.real = text.toString().toDouble()
-    }
-    return interactionObjectBuilder.build()
-  }
-}
+) : EditText(context, attrs, defStyle)

app/src/main/java/org/oppia/app/customview/interaction/TextInputInteractionView.kt

@@ -16,13 +16,4 @@ class TextInputInteractionView @JvmOverloads constructor(
   context: Context,
   attrs: AttributeSet? = null,
   defStyle: Int = android.R.attr.editTextStyle
-) : EditText(context, attrs, defStyle), InteractionAnswerRetriever {
-
-  override fun getPendingAnswer(): InteractionObject {
-    val interactionObjectBuilder = InteractionObject.newBuilder()
-    if (!text.isNullOrEmpty()) {
-      interactionObjectBuilder.normalizedString = text.toString()
-    }
-    return interactionObjectBuilder.build()
-  }
-}
+) : EditText(context, attrs, defStyle)

app/src/main/java/org/oppia/app/fragment/FragmentComponent.kt

@@ -8,6 +8,7 @@ import org.oppia.app.home.HomeFragment
 import org.oppia.app.player.exploration.ExplorationFragment
 import org.oppia.app.player.state.StateFragment
 import org.oppia.app.player.audio.AudioFragment
+import org.oppia.app.player.state.itemviewmodel.InteractionViewModelModule
 import org.oppia.app.profile.AddProfileFragment
 import org.oppia.app.profile.AdminAuthFragment
 import org.oppia.app.profile.ProfileChooserFragment
@@ -20,9 +21,11 @@ import org.oppia.app.topic.play.TopicPlayFragment
 import org.oppia.app.topic.questionplayer.QuestionPlayerFragment
 import org.oppia.app.topic.review.TopicReviewFragment
 import org.oppia.app.topic.train.TopicTrainFragment
+import org.oppia.app.view.ViewComponent
+import javax.inject.Provider
 
 /** Root subcomponent for all fragments. */
-@Subcomponent
+@Subcomponent(modules = [FragmentModule::class, InteractionViewModelModule::class])
 @FragmentScope
 interface FragmentComponent {
   @Subcomponent.Builder
@@ -33,6 +36,8 @@ interface FragmentComponent {
     fun build(): FragmentComponent
   }
 
+  fun getViewComponentBuilderProvider(): Provider<ViewComponent.Builder>
+
   fun inject(addProfileFragment: AddProfileFragment)
   fun inject(adminAuthFragment: AdminAuthFragment)
   fun inject(audioFragment: AudioFragment)

app/src/main/java/org/oppia/app/fragment/FragmentModule.kt

@@ -0,0 +1,7 @@
+package org.oppia.app.fragment
+
+import dagger.Module
+import org.oppia.app.view.ViewComponent
+
+/** Root fragment module. */
+@Module(subcomponents = [ViewComponent::class]) class FragmentModule

app/src/main/java/org/oppia/app/fragment/InjectableDialogFragment.kt

@@ -16,7 +16,7 @@ abstract class InjectableDialogFragment: DialogFragment() {
    */
   lateinit var fragmentComponent: FragmentComponent
 
-  override fun onAttach(context: Context?) {
+  override fun onAttach(context: Context) {
     super.onAttach(context)
     fragmentComponent = (requireActivity() as InjectableAppCompatActivity).createFragmentComponent(this)
   }

app/src/main/java/org/oppia/app/fragment/InjectableFragment.kt

@@ -1,8 +1,13 @@
 package org.oppia.app.fragment
 
 import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import org.oppia.app.activity.InjectableAppCompatActivity
+import org.oppia.app.view.ViewComponent
 
 /**
  * A fragment that facilitates field injection to children. This fragment can only be used with
@@ -16,8 +21,16 @@ abstract class InjectableFragment: Fragment() {
    */
   lateinit var fragmentComponent: FragmentComponent
 
-  override fun onAttach(context: Context?) {
+  override fun onAttach(context: Context) {
     super.onAttach(context)
     fragmentComponent = (requireActivity() as InjectableAppCompatActivity).createFragmentComponent(this)
   }
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    return super.onCreateView(inflater, container, savedInstanceState)
+  }
+
+  fun createViewComponent(view: View): ViewComponent {
+    return fragmentComponent.getViewComponentBuilderProvider().get().setView(view).build()
+  }
 }

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

@@ -12,7 +12,7 @@ import javax.inject.Inject
 class ContinuePlayingFragment : InjectableFragment() {
   @Inject lateinit var continuePlayingFragmentPresenter: ContinuePlayingFragmentPresenter
 
-  override fun onAttach(context: Context?) {
+  override fun onAttach(context: Context) {
     super.onAttach(context)
     fragmentComponent.inject(this)
   }

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

@@ -14,7 +14,7 @@ import javax.inject.Inject
 class HomeFragment : InjectableFragment(), TopicSummaryClickListener {
   @Inject lateinit var homeFragmentPresenter: HomeFragmentPresenter
 
-  override fun onAttach(context: Context?) {
+  override fun onAttach(context: Context) {
     super.onAttach(context)
     fragmentComponent.inject(this)
   }

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

@@ -21,13 +21,13 @@ import org.oppia.app.model.UserAppHistory
 import org.oppia.app.viewmodel.ViewModelProvider
 import org.oppia.domain.UserAppHistoryController
 import org.oppia.domain.exploration.ExplorationDataController
-import org.oppia.domain.exploration.TEST_EXPLORATION_ID_5
+import org.oppia.domain.exploration.TEST_EXPLORATION_ID_30
 import org.oppia.domain.topic.TopicListController
 import org.oppia.util.data.AsyncResult
 import org.oppia.util.logging.Logger
 import javax.inject.Inject
 
-private const val EXPLORATION_ID = TEST_EXPLORATION_ID_5
+private const val EXPLORATION_ID = TEST_EXPLORATION_ID_30
 
 /** The presenter for [HomeFragment]. */
 @FragmentScope
@@ -87,6 +87,7 @@ class HomeFragmentPresenter @Inject constructor(
   }
 
   fun playExplorationButton(v: View) {
+    explorationDataController.stopPlayingExploration()
     explorationDataController.startPlayingExploration(
       EXPLORATION_ID
     ).observe(fragment, Observer<AsyncResult<Any?>> { result ->

app/src/main/java/org/oppia/app/parser/StringToFractionParser.kt

@@ -1,34 +1,57 @@
 package org.oppia.app.parser
 
 import org.oppia.app.model.Fraction
+import org.oppia.domain.util.normalizeWhitespace
+import java.lang.IllegalArgumentException
 
 /** This class contains method that helps to parse string to fraction. */
 class StringToFractionParser {
+  private val wholeNumberOnlyRegex = """^-? ?(\d+)$""".toRegex()
+  private val fractionOnlyRegex = """^-? ?(\d+) ?/ ?(\d)+$""".toRegex()
+  private val mixedNumberRegex = """^-? ?(\d)+ ?(\d+) ?/ ?(\d)+$""".toRegex()
+
   fun getFractionFromString(text: String): Fraction {
-    var inputText: String = text
-    var isNegative = false
-    var numerator = "0"
-    var denominator = "0"
-    var wholeNumber = "0"
-    val fractionObjectBuilder = Fraction.newBuilder()
-    if (inputText.startsWith("-"))
-      isNegative = true
-    inputText = inputText.replace("-", "").trim()
-    wholeNumber = if (inputText.contains("/") && inputText.contains(" ")) {
-      inputText.substringBefore(" ")
-    } else if (inputText.contains("/")) {
-      wholeNumber
-    } else {
-      inputText
-    }
-    inputText =
-      if (inputText.contains(" ")) inputText.substringAfter(" ").replace(" ", "") else inputText.replace(" ", "")
-    if (inputText.contains("/")) {
-      numerator = inputText.substringBefore("/")
-      denominator = inputText.substringAfter("/")
-    }
-    fractionObjectBuilder.setIsNegative(isNegative).setNumerator(numerator.toInt())
-      .setDenominator(denominator.toInt()).wholeNumber = wholeNumber.toInt()
-    return fractionObjectBuilder.build()
+    // Normalize whitespace to ensure that answer follows a simpler subset of possible patterns.
+    val inputText: String = text.normalizeWhitespace()
+    return parseMixedNumber(inputText)
+      ?: parseFraction(inputText)
+      ?: parseWholeNumber(inputText)
+      ?: throw IllegalArgumentException("Incorrectly formatted fraction: $text")
+  }
+
+  private fun parseMixedNumber(inputText: String): Fraction? {
+    val mixedNumberMatch = mixedNumberRegex.matchEntire(inputText) ?: return null
+    val (_, wholeNumberText, numeratorText, denominatorText) = mixedNumberMatch.groupValues
+    return Fraction.newBuilder()
+      .setIsNegative(isInputNegative(inputText))
+      .setWholeNumber(wholeNumberText.toInt())
+      .setNumerator(numeratorText.toInt())
+      .setDenominator(denominatorText.toInt())
+      .build()
+  }
+
+  private fun parseFraction(inputText: String): Fraction? {
+    val fractionOnlyMatch = fractionOnlyRegex.matchEntire(inputText) ?: return null
+    val (_, numeratorText, denominatorText) = fractionOnlyMatch.groupValues
+    // Fraction-only numbers imply no whole number.
+    return Fraction.newBuilder()
+      .setIsNegative(isInputNegative(inputText))
+      .setNumerator(numeratorText.toInt())
+      .setDenominator(denominatorText.toInt())
+      .build()
+  }
+
+  private fun parseWholeNumber(inputText: String): Fraction? {
+    val wholeNumberMatch = wholeNumberOnlyRegex.matchEntire(inputText) ?: return null
+    val (_, wholeNumberText) = wholeNumberMatch.groupValues
+    // Whole number fractions imply '0/1' fractional parts.
+    return Fraction.newBuilder()
+      .setIsNegative(isInputNegative(inputText))
+      .setWholeNumber(wholeNumberText.toInt())
+      .setNumerator(0)
+      .setDenominator(1)
+      .build()
   }
+
+  private fun isInputNegative(inputText: String): Boolean = inputText.startsWith("-")
 }

app/src/main/java/org/oppia/app/player/audio/AudioFragment.kt

@@ -34,7 +34,7 @@ class AudioFragment : InjectableFragment(), LanguageInterface {
   @Inject
   lateinit var audioFragmentPresenter: AudioFragmentPresenter
 
-  override fun onAttach(context: Context?) {
+  override fun onAttach(context: Context) {
     super.onAttach(context)
     fragmentComponent.inject(this)
   }

app/src/main/java/org/oppia/app/player/exploration/ExplorationActivityPresenter.kt

@@ -1,6 +1,7 @@
 package org.oppia.app.player.exploration
 
 import android.os.Bundle
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import org.oppia.app.R
 import org.oppia.app.activity.ActivityScope
@@ -11,6 +12,9 @@ import javax.inject.Inject
 class ExplorationActivityPresenter @Inject constructor(private val activity: AppCompatActivity) {
   fun handleOnCreate(explorationId: String) {
     activity.setContentView(R.layout.exploration_activity)
+
+    activity.setSupportActionBar(activity.findViewById(R.id.exploration_toolbar))
+
     if (getExplorationFragment() == null) {
       val explorationFragment = ExplorationFragment()
       val args = Bundle()
@@ -21,9 +25,15 @@ class ExplorationActivityPresenter @Inject constructor(private val activity: App
         explorationFragment
       ).commitNow()
     }
+
+    activity.findViewById<View>(R.id.enable_audio_playback_button).setOnClickListener {
+      getExplorationFragment()?.handlePlayAudio()
+    }
   }
 
   private fun getExplorationFragment(): ExplorationFragment? {
-    return activity.supportFragmentManager.findFragmentById(R.id.exploration_fragment_placeholder) as ExplorationFragment?
+    return activity.supportFragmentManager.findFragmentById(
+      R.id.exploration_fragment_placeholder
+    ) as ExplorationFragment?
   }
 }