Fix #151: Lowfi numeric input interaction view part 2

app/src/main/AndroidManifest.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.oppia.app">
-  <uses-permission android:name="android.permission.INTERNET"/>
+  package="org.oppia.app">
+
+  <uses-permission android:name="android.permission.INTERNET" />
   <application
     android:name=".application.OppiaApplication"
     android:allowBackup="true"
@@ -10,27 +11,26 @@
     android:roundIcon="@mipmap/ic_launcher_round"
     android:supportsRtl="true"
     android:theme="@style/OppiaTheme">
-    <activity android:name="org.oppia.app.topic.conceptcard.testing.ConceptCardFragmentTestActivity"/>
-    <activity android:name="org.oppia.app.player.state.testing.StateFragmentTestActivity"/>
-    <activity android:name=".player.exploration.ExplorationActivity"/>
-    <activity android:name=".topic.questionplayer.QuestionPlayerActivity"/>
-    <activity android:name=".topic.TopicActivity"/>
-    <activity android:name=".player.audio.testing.AudioFragmentTestActivity"/>
-    <activity android:name="org.oppia.app.player.state.testing.StateFragmentTestActivity"/>
-    <activity android:name="org.oppia.app.home.HomeActivity">
+    <activity android:name="org.oppia.app.topic.conceptcard.testing.ConceptCardFragmentTestActivity" />
+    <activity android:name="org.oppia.app.player.state.testing.StateFragmentTestActivity" />
+    <activity android:name=".player.exploration.ExplorationActivity" />
+    <activity android:name=".topic.questionplayer.QuestionPlayerActivity" />
+    <activity android:name=".topic.TopicActivity" />
+    <activity android:name=".player.audio.testing.AudioFragmentTestActivity" />
+    <activity android:name="org.oppia.app.home.HomeActivity" />
+    <activity android:name=".activity.InputInteractionViewTestActivity">
       <intent-filter>
-        <action android:name="android.intent.action.MAIN"/>
-        <category android:name="android.intent.category.LAUNCHER"/>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
       <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.DEFAULT"/>
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </activity>
     <activity
       android:name=".splash.SplashActivity"
-      android:theme="@style/SplashScreenTheme">
-    </activity>
-    <activity android:name=".testing.BindableAdapterTestActivity"/>
+      android:theme="@style/SplashScreenTheme"></activity>
+    <activity android:name=".testing.BindableAdapterTestActivity" />
   </application>
 </manifest>

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

@@ -0,0 +1,34 @@
+package org.oppia.app.activity
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import org.oppia.app.R
+import org.oppia.app.customview.inputInteractionView.NumericInputInteractionView
+
+private const val KEY_DIGIT_ID = "DIGIT_ID"
+
+/** This is a dummy activity to test [NumericInputInteractionView]. */
+class InputInteractionViewTestActivity : AppCompatActivity() {
+  private lateinit var digit: String
+  private lateinit var contentComponent: NumericInputInteractionView
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_numeric_input_interaction_view_test)
+    contentComponent = findViewById(R.id.test_number_input_interaction_view) as NumericInputInteractionView
+    if (savedInstanceState != null) {
+      digit = savedInstanceState.getString(KEY_DIGIT_ID)
+    } else {
+      digit = ""
+    }
+    contentComponent.setText(digit)
+  }
+
+  override fun onSaveInstanceState(outState: Bundle) {
+    super.onSaveInstanceState(outState)
+    outState.putString(KEY_DIGIT_ID, getNumberTextInputText())
+  }
+
+  fun getNumberTextInputText(): String {
+    return contentComponent.getPendingAnswer().normalizedString
+  }
+}

app/src/main/java/org/oppia/app/customview/inputInteractionView/InteractionAnswerRetriever.kt

@@ -0,0 +1,8 @@
+package org.oppia.app.customview.inputInteractionView
+
+import org.oppia.app.model.InteractionObject
+
+/** This interface helps to get PendingAnswer of [NumericInputInteractionView]. */
+interface InteractionAnswerRetriever {
+  fun getPendingAnswer(): InteractionObject
+}

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

@@ -0,0 +1,53 @@
+package org.oppia.app.customview.inputInteractionView
+
+import android.content.Context
+import android.text.InputFilter
+import android.text.method.DigitsKeyListener
+import android.util.AttributeSet
+import android.widget.EditText
+import org.oppia.app.R
+import org.oppia.app.model.InteractionObject
+
+/** The custom EditText class for numeric input interaction view. */
+class NumericInputInteractionView @JvmOverloads constructor(
+  context: Context,
+  attrs: AttributeSet? = null,
+  defStyle: Int = android.R.attr.editTextStyle
+  , private var placeholder: String = "Write the digit here."
+) : EditText(context, attrs, defStyle), InteractionAnswerRetriever {
+  init {
+    attributes()
+  }
+
+  constructor(context: Context?, placeholder: String) : this(context!!) {
+    this.placeholder = placeholder
+    attributes()
+  }
+
+  /** This function contains default attributes of [NumericInputInteractionView]. */
+  private fun attributes() {
+    setBackgroundResource(R.drawable.edit_text_background)
+    val paddingPixel = context.resources.getDimension(R.dimen.padding_8)
+    val density = resources.displayMetrics.density
+    val paddingDp = (paddingPixel * density).toInt()
+    setPadding(paddingDp, paddingDp, paddingDp, paddingDp)
+    hint = placeholder
+    keyListener = DigitsKeyListener.getInstance("0123456789.")
+    this.setEditTextMaxLength(length = 200)
+    setLongClickable(false)
+  }
+
+  private fun setEditTextMaxLength(length: Int) {
+    val filterArray = arrayOfNulls<InputFilter>(1)
+    filterArray[0] = InputFilter.LengthFilter(length)
+    filters = filterArray
+  }
+
+  override fun getPendingAnswer(): InteractionObject {
+    if (text.isEmpty()) {
+      return InteractionObject.newBuilder().build()
+    } else {
+      return InteractionObject.newBuilder().setReal(text.toString().toDouble()).build()
+    }
+  }
+}

app/src/main/res/layout/activity_numeric_input_interaction_view_test.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  tools:context=".activity.InputInteractionViewTestActivity">
+
+  <org.oppia.app.customview.inputInteractionView.NumericInputInteractionView
+    android:id="@+id/test_number_input_interaction_view"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="@dimen/padding_8"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintRight_toRightOf="parent"
+    app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/sharedTest/java/org/oppia/app/activity/InputInteractionViewTestActivityTest.kt

@@ -0,0 +1,83 @@
+package org.oppia.app.activity
+
+import android.app.Activity
+import android.content.Intent
+import android.content.pm.ActivityInfo
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.ActivityTestRule
+import org.junit.Assert.*
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.oppia.app.R
+import org.oppia.app.model.InteractionObject
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import org.hamcrest.CoreMatchers.`is`
+import org.hamcrest.Matchers.instanceOf
+import org.oppia.app.customview.inputInteractionView.NumericInputInteractionView
+
+/** Tests for [InputInteractionViewTestActivity]. */
+@RunWith(AndroidJUnit4::class)
+class InputInteractionViewTestActivityTest {
+  private lateinit var launchedActivity: Activity
+  @get:Rule
+  var activityTestRule: ActivityTestRule<InputInteractionViewTestActivity> = ActivityTestRule(
+    InputInteractionViewTestActivity::class.java, /* initialTouchMode= */ true, /* launchActivity= */ false
+  )
+
+  @Test
+  fun testNumericInputInteractionView_withNoInputText_hasCorrectPendingAnswerType() {
+    val activityScenario = ActivityScenario.launch(InputInteractionViewTestActivity::class.java)
+    activityScenario.onActivity { activity ->
+      val textAnswerRetriever =
+        activity.findViewById(R.id.test_number_input_interaction_view) as NumericInputInteractionView
+      assertThat(textAnswerRetriever.getPendingAnswer(), instanceOf(InteractionObject::class.java))
+    }
+  }
+
+  @Test
+  fun testNumericInputInteractionView_withInputtedText_hasCorrectPendingAnswer() {
+    val activityScenario = ActivityScenario.launch(InputInteractionViewTestActivity::class.java)
+    onView(withId(R.id.test_number_input_interaction_view)).perform(ViewActions.clearText(), ViewActions.typeText("9"))
+    activityScenario.onActivity { activity ->
+      val textAnswerRetriever =
+        activity.findViewById(R.id.test_number_input_interaction_view) as NumericInputInteractionView
+      assertEquals(textAnswerRetriever.getPendingAnswer().objectTypeCase, InteractionObject.ObjectTypeCase.REAL)
+      assertThat(textAnswerRetriever.getPendingAnswer().real, `is`("9".toDouble()))
+    }
+  }
+
+  @Test
+  fun testNumericInputInteractionView_withInputtedText_hasCorrectPendingAnswerWithDecimalValues() {
+    val activityScenario = ActivityScenario.launch(InputInteractionViewTestActivity::class.java)
+    onView(withId(R.id.test_number_input_interaction_view)).perform(
+      ViewActions.clearText(),
+      ViewActions.typeText("9.5")
+    )
+    activityScenario.onActivity { activity ->
+      val textAnswerRetriever =
+        activity.findViewById(R.id.test_number_input_interaction_view) as NumericInputInteractionView
+      assertEquals(textAnswerRetriever.getPendingAnswer().objectTypeCase, InteractionObject.ObjectTypeCase.REAL)
+      assertThat(textAnswerRetriever.getPendingAnswer().real, `is`(9.5))
+    }
+  }
+
+  @Test
+  fun testNumericInputInteractionView_withInputtedText_onConfigurationChange_hasCorrectPendingAnswer() {
+    Intents.init()
+    val intent = Intent(Intent.ACTION_PICK)
+    launchedActivity = activityTestRule.launchActivity(intent)
+    onView(withId(R.id.test_number_input_interaction_view)).perform(ViewActions.clearText(), ViewActions.typeText("9"))
+    activityTestRule.activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+    activityTestRule.activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+    onView(withId(R.id.test_number_input_interaction_view)).check(matches(isDisplayed())).check(matches(withText("9")))
+    Intents.release()
+  }
+}