Fix #150, #151, #155: TextInputInteractionView, NumericInputInteractionView, FractionInputInteractionView

app/build.gradle

@@ -37,7 +37,9 @@ android {
     execution 'ANDROIDX_TEST_ORCHESTRATOR'
     unitTests {
       includeAndroidResources = true
+
     }
+    unitTests.returnDefaultValues = true
   }
 
   // https://proandroiddev.com/isolated-fragments-unit-tests-that-run-both-instrumented-and-on-the-jvm-with-the-same-source-code-283db2e9be5d

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

@@ -0,0 +1,42 @@
+package org.oppia.app.customview.inputInteractionView
+
+import android.content.Context
+import android.text.InputFilter
+import android.text.method.DigitsKeyListener
+import android.widget.EditText
+import org.oppia.app.R
+
+/** The customclass for [FractionInputInteractionView]. */
+class FractionInputInteractionView : EditText {
+
+  private var mContext: Context
+  private var placeholder: String
+  private var rows: Int
+
+  constructor(context: Context, placeholder: String, rows: Int) : super(context) {
+    this.mContext = context
+    this.placeholder = placeholder
+    this.rows = rows
+    init()
+  }
+
+  //update default attributes of TextInputInteractionView here
+  fun init() {
+    setBackgroundResource(R.drawable.edit_text_background)
+    val paddingPixel = 10
+    val density = resources.displayMetrics.density
+    val paddingDp = (paddingPixel * density).toInt()
+    setPadding(paddingDp, paddingDp, paddingDp, paddingDp)
+    setHint(placeholder)
+    setKeyListener(DigitsKeyListener.getInstance("0123456789/"))
+    setEditTextMaxLength(200)
+  }
+
+  fun setEditTextMaxLength(length: Int) {
+    val filterArray = arrayOfNulls<InputFilter>(1)
+    filterArray[0] = InputFilter.LengthFilter(length)
+    setFilters(filterArray)
+  }
+
+}
+

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

@@ -0,0 +1,44 @@
+package org.oppia.app.customview.inputInteractionView
+
+import android.content.Context
+import android.text.InputFilter
+import android.text.InputType
+import android.text.method.DigitsKeyListener
+import android.widget.EditText
+
+import org.oppia.app.R
+
+/** The customclass for [NumberInputInteractionView]. */
+class NumberInputInteractionView : EditText {
+
+  private var mContext: Context
+  private var placeholder: String
+  private var rows: Int
+
+  constructor(context: Context, placeholder: String, rows: Int) : super(context) {
+    this.mContext = context
+    this.placeholder = placeholder
+    this.rows = rows
+    init()
+  }
+
+  //update default attributes of NumberInputInteractionView here
+  fun init() {
+    setBackgroundResource(R.drawable.edit_text_background)
+    val paddingPixel = 10
+    val density = resources.displayMetrics.density
+    val paddingDp = (paddingPixel * density).toInt()
+    setPadding(paddingDp, paddingDp, paddingDp, paddingDp)
+    setHint(placeholder)
+    setKeyListener(DigitsKeyListener.getInstance("0123456789."))
+    setEditTextMaxLength(200)
+  }
+
+  fun setEditTextMaxLength(length: Int) {
+    val filterArray = arrayOfNulls<InputFilter>(1)
+    filterArray[0] = InputFilter.LengthFilter(length)
+    setFilters(filterArray)
+  }
+
+}
+

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

@@ -0,0 +1,43 @@
+package org.oppia.app.customview.inputInteractionView
+
+import android.content.Context
+import android.text.InputFilter
+import android.text.InputType
+import android.text.method.DigitsKeyListener
+import android.widget.EditText
+
+import org.oppia.app.R
+/** The customclass for [TextInputInteractionView]. */
+class TextInputInteractionView : EditText {
+
+  private var mContext: Context
+  private var placeholder: String
+  private var rows: Int
+
+  constructor(context: Context, placeholder: String, rows: Int) : super(context) {
+    this.mContext = context
+    this.placeholder = placeholder
+    this.rows = rows
+    init()
+  }
+
+  //update default attributes of TextInputInteractionView here
+  fun init() {
+    setBackgroundResource(R.drawable.edit_text_background)
+    val paddingPixel = 10
+    val density = resources.displayMetrics.density
+    val paddingDp = (paddingPixel * density).toInt()
+    setPadding(paddingDp, paddingDp, paddingDp, paddingDp)
+    setHint(placeholder)
+    setEditTextMaxLength(200)
+    }
+
+  fun setEditTextMaxLength(length: Int) {
+    val filterArray = arrayOfNulls<InputFilter>(1)
+    filterArray[0] = InputFilter.LengthFilter(length)
+    setFilters(filterArray)
+  }
+
+
+}
+

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

@@ -4,8 +4,8 @@ import androidx.fragment.app.Fragment
 import dagger.BindsInstance
 import dagger.Subcomponent
 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.exploration.ExplorationFragment
 import org.oppia.app.player.audio.AudioFragment
 import org.oppia.app.topic.conceptcard.ConceptCardFragment
 
@@ -19,8 +19,8 @@ interface FragmentComponent {
     fun build(): FragmentComponent
   }
 
-  fun inject(audioFragment: AudioFragment)
   fun inject(explorationFragment: ExplorationFragment)
+  fun inject(audioFragment: AudioFragment)
   fun inject(homeFragment: HomeFragment)
   fun inject(stateFragment: StateFragment)
   fun inject(conceptCardFragment: ConceptCardFragment)

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

@@ -3,6 +3,7 @@ package org.oppia.app.home
 import androidx.appcompat.app.AppCompatActivity
 import org.oppia.app.R
 import org.oppia.app.activity.ActivityScope
+import org.oppia.app.player.state.StateFragment
 import javax.inject.Inject
 
 /** The controller for [HomeActivity]. */
@@ -12,7 +13,7 @@ class HomeActivityController @Inject constructor(private val activity: AppCompat
     activity.setContentView(R.layout.home_activity)
     activity.supportFragmentManager.beginTransaction().add(
       R.id.home_fragment_placeholder,
-      HomeFragment()
+      StateFragment()
     ).commitNow()
   }
 }

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

@@ -1,10 +1,12 @@
 package org.oppia.app.home
 
 import android.content.Context
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.RequiresApi
 import org.oppia.app.fragment.InjectableFragment
 import javax.inject.Inject
 
@@ -17,7 +19,9 @@ class HomeFragment : InjectableFragment() {
     fragmentComponent.inject(this)
   }
 
+  @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
     return homeFragmentController.handleCreateView(inflater, container)
   }
+
 }

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

@@ -1,5 +1,6 @@
 package org.oppia.app.home
 
+import android.content.res.Resources
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -9,6 +10,10 @@ import org.oppia.app.fragment.FragmentScope
 import org.oppia.app.viewmodel.ViewModelProvider
 import org.oppia.domain.UserAppHistoryController
 import javax.inject.Inject
+import android.widget.LinearLayout
+import androidx.lifecycle.LifecycleOwner
+import org.oppia.app.R
+import org.oppia.app.customview.inputInteractionView.TextInputInteractionView
 
 /** The controller for [HomeFragment]. */
 @FragmentScope
@@ -17,20 +22,47 @@ class HomeFragmentController @Inject constructor(
   private val viewModelProvider: ViewModelProvider<UserAppHistoryViewModel>,
   private val userAppHistoryController: UserAppHistoryController
 ) {
+  private var llRoot: LinearLayout? = null
+
   fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View? {
     val binding = HomeFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
     // NB: Both the view model and lifecycle owner must be set in order to correctly bind LiveData elements to
     // data-bound view models.
     binding.let {
       it.viewModel = getUserAppHistoryViewModel()
-      it.lifecycleOwner = fragment
+      it.lifecycleOwner = fragment as LifecycleOwner?
     }
-
     userAppHistoryController.markUserOpenedApp()
-
+    llRoot = binding.root.findViewById(R.id.llRoot)
+    addContentCard("edit_text_background_border",1)
+    addContentCard("edit_text_background_border_",2)
     return binding.root
   }
 
+  private fun addContentCard(placeholder: String, rows: Int) {
+    val contentComponent = TextInputInteractionView(
+      fragment.context!!,
+      placeholder,
+      rows
+    )
+    val params = LinearLayout.LayoutParams(
+      LinearLayout.LayoutParams.MATCH_PARENT,
+      LinearLayout.LayoutParams.WRAP_CONTENT
+    )
+
+    params.setMargins( dpToPx(8), dpToPx(8),  dpToPx(8), dpToPx(8))
+
+
+    llRoot!!.addView(contentComponent, params)
+
+
+
+  }
+
+  fun dpToPx(dp: Int): Int {
+    return (dp * Resources.getSystem().getDisplayMetrics().density).toInt()
+  }
+
   private fun getUserAppHistoryViewModel(): UserAppHistoryViewModel {
     return viewModelProvider.getForFragment(fragment, UserAppHistoryViewModel::class.java)
   }

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

@@ -17,7 +17,7 @@ class StateFragment : InjectableFragment(), CellularDataInterface {
   @Inject
   lateinit var stateFragmentPresenter: StateFragmentPresenter
   // Control this boolean value from controllers in domain module.
-  private var showCellularDataDialog = true
+  private var showCellularDataDialog = false
 
   init {
     // TODO(#116): Code to control the value of showCellularDataDialog using AudioController.

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

@@ -1,9 +1,15 @@
 package org.oppia.app.player.state
 
+import android.content.res.Resources
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.LinearLayout
 import androidx.fragment.app.Fragment
+import org.oppia.app.R
+import org.oppia.app.customview.inputInteractionView.FractionInputInteractionView
+import org.oppia.app.customview.inputInteractionView.NumberInputInteractionView
+import org.oppia.app.customview.inputInteractionView.TextInputInteractionView
 import org.oppia.app.databinding.StateFragmentBinding
 import org.oppia.app.fragment.FragmentScope
 import org.oppia.app.viewmodel.ViewModelProvider
@@ -15,15 +21,73 @@ class StateFragmentPresenter @Inject constructor(
   private val fragment: Fragment,
   private val viewModelProvider: ViewModelProvider<StateViewModel>
 ) {
+  private var llRoot: LinearLayout? = null
+
   fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View? {
     val binding = StateFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
     binding.let {
       it.stateFragment = fragment as StateFragment
       it.viewModel = getStateViewModel()
     }
+    llRoot = binding.root.findViewById(R.id.llRoot)
+    addTextInputContentCard("text", 1)
+    addNumberInputContentCard("number 1", 2)
+    addFractionInputContentCard("fraction 1/1", 3)
     return binding.root
   }
 
+  //for adding textinputinteraction view
+  fun addTextInputContentCard(placeholder: String, type: Int) {
+    var contentComponent = TextInputInteractionView(
+      fragment.context!!,
+      placeholder,
+      1
+    )
+    val params = LinearLayout.LayoutParams(
+      LinearLayout.LayoutParams.MATCH_PARENT,
+      LinearLayout.LayoutParams.WRAP_CONTENT
+    )
+    params.setMargins(dpToPx(8), dpToPx(8), dpToPx(8), dpToPx(8))
+    llRoot!!.addView(contentComponent, params)
+
+  }
+
+  //for adding numberinputinteraction view
+  fun addNumberInputContentCard(placeholder: String, type: Int) {
+    var contentComponent = NumberInputInteractionView(
+      fragment.context!!,
+      placeholder,
+      1
+    )
+    val params = LinearLayout.LayoutParams(
+      LinearLayout.LayoutParams.MATCH_PARENT,
+      LinearLayout.LayoutParams.WRAP_CONTENT
+    )
+    params.setMargins(dpToPx(8), dpToPx(8), dpToPx(8), dpToPx(8))
+    llRoot!!.addView(contentComponent, params)
+
+  }
+
+  //for adding numberinputinteraction view
+  fun addFractionInputContentCard(placeholder: String, type: Int) {
+    var contentComponent = FractionInputInteractionView(
+      fragment.context!!,
+      placeholder,
+      1
+    )
+    val params = LinearLayout.LayoutParams(
+      LinearLayout.LayoutParams.MATCH_PARENT,
+      LinearLayout.LayoutParams.WRAP_CONTENT
+    )
+    params.setMargins(dpToPx(8), dpToPx(8), dpToPx(8), dpToPx(8))
+    llRoot!!.addView(contentComponent, params)
+
+  }
+
+  fun dpToPx(dp: Int): Int {
+    return (dp * Resources.getSystem().getDisplayMetrics().density).toInt()
+  }
+
   private fun getStateViewModel(): StateViewModel {
     return viewModelProvider.getForFragment(fragment, StateViewModel::class.java)
   }

app/src/main/res/drawable/edit_text_background.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/edit_text_background_shadow" android:state_focused="true" />
+  <item android:drawable="@drawable/edit_text_background_shadow" android:state_pressed="true" />
+  <item android:drawable="@drawable/edit_text_background_border" />
+  //means normal
+</selector>

app/src/main/res/drawable/edit_text_background_border.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="rectangle">
+  <corners android:radius="3dp" />
+  <solid android:color="@color/white" />
+  <stroke
+    android:width="1dip"
+    android:color="@color/grey" />
+</shape>