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,17 @@
+package org.oppia.app.activity
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import org.oppia.app.R
+import org.oppia.app.customview.interaction.NumericInputInteractionView
+
+/**
+ * This is a dummy activity to test input interaction views.
+ * It contains [NumericInputInteractionView] .
+ */
+class InputInteractionViewTestActivity : AppCompatActivity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_numeric_input_interaction_view_test)
+  }
+}

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

@@ -0,0 +1,8 @@
+package org.oppia.app.customview.interaction
+
+import org.oppia.app.model.InteractionObject
+
+/** This interface helps to get answer from input interaction views as [InteractionObject]. */
+interface InteractionAnswerRetriever {
+  fun getPendingAnswer(): InteractionObject
+}

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

@@ -0,0 +1,29 @@
+package org.oppia.app.customview.interaction
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.EditText
+import org.oppia.app.model.InteractionObject
+
+// TODO(#249): These are the attributes which should be defined in XML, that are required for this interaction view to work correctly
+//  digits="0123456789."
+//  hint="Write the digit here."
+//  inputType="numberDecimal"
+//  background="@drawable/edit_text_background"
+//  maxLength="200".
+
+/** The custom EditText class for numeric input interaction view. */
+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.setReal(text.toString().toDouble())
+    }
+    return interactionObjectBuilder.build()
+  }
+}

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical"
+  android:gravity="center"
+  tools:context=".activity.InputInteractionViewTestActivity">
+
+  <org.oppia.app.customview.interaction.NumericInputInteractionView
+    android:id="@+id/test_number_input_interaction_view"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:background="@drawable/edit_text_background"
+    android:digits="0123456789."
+    android:focusable="true"
+    android:hint="Write the digit here."
+    android:inputType="numberDecimal"
+    android:longClickable="false"
+    android:maxLength="200"
+    android:padding="8dp"
+    android:singleLine="true" />
+</LinearLayout>

app/src/main/res/values/dimens.xml

@@ -7,5 +7,4 @@
   <dimen name="audio_fragment_margin">32dp</dimen>
   <dimen name="cellular_data_dialog_padding">24dp</dimen>
   <dimen name="state_previous_next_button_radius">4dp</dimen>
-  <dimen name="padding_8">8dp</dimen>
 </resources>

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

@@ -0,0 +1,92 @@
+package org.oppia.app.activity
+
+import android.app.Activity
+import android.content.Intent
+import android.content.pm.ActivityInfo
+import android.content.res.Configuration
+import android.os.SystemClock
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.ActivityTestRule
+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.action.ViewActions.typeText
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.matcher.ViewMatchers
+import com.google.common.truth.Truth.assertThat
+import org.junit.After
+import org.junit.Before
+import org.oppia.app.customview.interaction.NumericInputInteractionView
+
+/** Tests for [InputInteractionViewTestActivity]. */
+@RunWith(AndroidJUnit4::class)
+class InputInteractionViewTestActivityTest {
+  @get:Rule
+  var activityTestRule: ActivityTestRule<InputInteractionViewTestActivity> = ActivityTestRule(
+    InputInteractionViewTestActivity::class.java, /* initialTouchMode= */ true, /* launchActivity= */ false
+  )
+  private lateinit var activityScenario: ActivityScenario<InputInteractionViewTestActivity>
+
+  @Before
+  fun setUp() {
+    activityScenario = ActivityScenario.launch(InputInteractionViewTestActivity::class.java)
+    Intents.init()
+  }
+
+  @Test
+  fun testNumericInputInteractionView_withNoInputText_hasCorrectPendingAnswerType() {
+    activityScenario.onActivity { activity ->
+      val textAnswerRetriever =
+        activity.findViewById(R.id.test_number_input_interaction_view) as NumericInputInteractionView
+      assertThat(textAnswerRetriever.getPendingAnswer()).isInstanceOf(InteractionObject::class.java)
+      assertThat(textAnswerRetriever.getPendingAnswer().real).isWithin(1e-5).of(0.0)
+    }
+  }
+
+  @Test
+  fun testNumericInputInteractionView_withInputtedText_hasCorrectPendingAnswer() {
+    onView(withId(R.id.test_number_input_interaction_view)).perform(typeText("9"))
+    activityScenario.onActivity { activity ->
+      val textAnswerRetriever =
+        activity.findViewById(R.id.test_number_input_interaction_view) as NumericInputInteractionView
+      assertThat(textAnswerRetriever.getPendingAnswer()).isInstanceOf(InteractionObject::class.java)
+      assertThat(textAnswerRetriever.getPendingAnswer().objectTypeCase).isEqualTo(InteractionObject.ObjectTypeCase.REAL)
+      assertThat(textAnswerRetriever.getPendingAnswer().real).isEqualTo(9.0)
+    }
+  }
+
+  @Test
+  fun testNumericInputInteractionView_withInputtedText_hasCorrectPendingAnswerWithDecimalValues() {
+    onView(withId(R.id.test_number_input_interaction_view)).perform(typeText("9.5"))
+    activityScenario.onActivity { activity ->
+      val textAnswerRetriever =
+        activity.findViewById(R.id.test_number_input_interaction_view) as NumericInputInteractionView
+      assertThat(textAnswerRetriever.getPendingAnswer().objectTypeCase).isEqualTo(InteractionObject.ObjectTypeCase.REAL)
+      assertThat(textAnswerRetriever.getPendingAnswer().real).isEqualTo(9.5)
+    }
+  }
+
+  @Test
+  fun testTextInputInteractionView_withInputtedText_onConfigurationChange_hasCorrectPendingAnswer() {
+    onView(withId(R.id.test_number_input_interaction_view)).perform(typeText("9"))
+    activityScenario.onActivity { activity ->
+      activity.requestedOrientation = Configuration.ORIENTATION_LANDSCAPE
+    }
+    onView(withId(R.id.test_number_input_interaction_view)).check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+      .check(
+        ViewAssertions.matches(ViewMatchers.withText("9"))
+      )
+    activityScenario.recreate()
+    onView(withId(R.id.test_number_input_interaction_view)).check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+      .check(
+        ViewAssertions.matches(ViewMatchers.withText("9"))
+      )
+  }
+}