Merge all the things part 3 (DO NOT MERGE)

app/build.gradle

@@ -66,11 +66,13 @@ dependencies {
       'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0-alpha03',
       'androidx.multidex:multidex:2.0.1',
       'androidx.recyclerview:recyclerview:1.0.0',
+      'com.chaos.view:pinview:1.4.3',
       'com.github.bumptech.glide:glide:4.9.0',
       'com.google.android.material:material:1.0.0-alpha1',
       'com.google.android.material:material:1.0.0',
       'com.google.dagger:dagger:2.24',
       'com.google.guava:guava:28.1-android',
+      'de.hdodenhof:circleimageview:3.0.1',
       "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',
@@ -113,6 +115,8 @@ dependencies {
   // TODO (#59): Remove this once Bazel is introduced
   api project(':data')
   implementation project(":model")
+  testImplementation project(":model")
+  androidTestImplementation project(":model")
   implementation project(":domain")
   implementation project(":utility")
 }

app/src/main/AndroidManifest.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.app">
-
   <!-- TODO(#56): Reenable landscape support. -->
-
   <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <application
     android:name=".application.OppiaApplication"
     android:allowBackup="true"
@@ -15,20 +14,31 @@
     android:theme="@style/OppiaTheme">
     <activity
       android:name=".home.continueplaying.ContinuePlayingActivity"
-      android:theme="@style/OppiaThemeWithoutActionBar"
-      android:screenOrientation="portrait" />
+      android:screenOrientation="portrait"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
+    <activity android:name=".testing.AudioFragmentTestActivity" />
     <activity
       android:name=".home.HomeActivity"
       android:screenOrientation="portrait" />
-    <activity android:name=".player.audio.testing.AudioFragmentTestActivity" />
     <activity
       android:name=".player.exploration.ExplorationActivity"
-      android:theme="@style/OppiaThemeWithoutActionBar"
       android:screenOrientation="portrait"
-      android:windowSoftInputMode="adjustResize"/>
+      android:theme="@style/OppiaThemeWithoutActionBar"
+      android:windowSoftInputMode="adjustResize" />
     <activity android:name=".player.state.testing.StateFragmentTestActivity" />
+    <activity
+      android:name=".profile.AddProfileActivity"
+      android:screenOrientation="portrait" />
+    <activity
+      android:name=".profile.AdminAuthActivity"
+      android:screenOrientation="portrait" />
+    <activity
+      android:name=".profile.PinPasswordActivity"
+      android:theme="@style/OppiaThemeWithoutActionBar"
+      android:screenOrientation="portrait" />
     <activity
       android:name=".profile.ProfileActivity"
+      android:theme="@style/OppiaThemeWithoutActionBar"
       android:screenOrientation="portrait" />
     <activity
       android:name=".settings.profile.ProfileRenameActivity"
@@ -38,8 +48,8 @@
       android:screenOrientation="portrait" />
     <activity
       android:name=".splash.SplashActivity"
-      android:theme="@style/SplashScreenTheme"
-      android:screenOrientation="portrait">
+      android:screenOrientation="portrait"
+      android:theme="@style/SplashScreenTheme">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
@@ -51,11 +61,10 @@
     </activity>
     <activity
       android:name=".story.StoryActivity"
-      android:theme="@style/OppiaThemeWithoutActionBar"
-      android:screenOrientation="portrait" />
+      android:screenOrientation="portrait"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity android:name=".story.testing.StoryFragmentTestActivity" />
     <activity android:name=".testing.BindableAdapterTestActivity" />
-    <activity android:name=".testing.ContentCardTestActivity" />
     <activity android:name=".testing.ContinuePlayingFragmentTestActivity" />
     <activity android:name=".testing.HtmlParserTestActivity" />
     <activity android:name=".testing.InputInteractionViewTestActivity" />
@@ -65,13 +74,15 @@
     <activity
       android:name=".testing.TopicTestActivityForStory"
       android:theme="@style/OppiaThemeWithoutActionBar" />
+    <activity android:name=".testing.ExplorationInjectionActivity" />
     <activity android:name=".testing.ConceptCardFragmentTestActivity" />
     <activity
       android:name=".topic.questionplayer.QuestionPlayerActivity"
-      android:screenOrientation="portrait" />
+      android:screenOrientation="portrait"
+      android:label="@string/question_player_title" />
     <activity
       android:name=".topic.TopicActivity"
-      android:theme="@style/OppiaThemeWithoutActionBar"
-      android:screenOrientation="portrait" />
+      android:screenOrientation="portrait"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
   </application>
 </manifest>

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

@@ -6,17 +6,20 @@ import dagger.Subcomponent
 import org.oppia.app.fragment.FragmentComponent
 import org.oppia.app.home.HomeActivity
 import org.oppia.app.home.continueplaying.ContinuePlayingActivity
-import org.oppia.app.player.audio.testing.AudioFragmentTestActivity
+import org.oppia.app.testing.AudioFragmentTestActivity
 import org.oppia.app.player.exploration.ExplorationActivity
 import org.oppia.app.player.state.testing.StateFragmentTestActivity
+import org.oppia.app.profile.AddProfileActivity
+import org.oppia.app.profile.AdminAuthActivity
+import org.oppia.app.profile.PinPasswordActivity
 import org.oppia.app.profile.ProfileActivity
 import org.oppia.app.settings.profile.ProfileRenameActivity
 import org.oppia.app.settings.profile.ProfileResetPinActivity
 import org.oppia.app.story.StoryActivity
 import org.oppia.app.story.testing.StoryFragmentTestActivity
 import org.oppia.app.testing.BindableAdapterTestActivity
-import org.oppia.app.testing.ContentCardTestActivity
 import org.oppia.app.testing.ContinuePlayingFragmentTestActivity
+import org.oppia.app.testing.ExplorationInjectionActivity
 import org.oppia.app.testing.HtmlParserTestActivity
 import org.oppia.app.testing.TopicTestActivity
 import org.oppia.app.testing.TopicTestActivityForStory
@@ -39,23 +42,26 @@ interface ActivityComponent {
 
   fun getFragmentComponentBuilderProvider(): Provider<FragmentComponent.Builder>
 
+  fun inject(addProfileActivity: AddProfileActivity)
+  fun inject(adminAuthActivity: AdminAuthActivity)
   fun inject(audioFragmentTestActivity: AudioFragmentTestActivity)
   fun inject(bindableAdapterTestActivity: BindableAdapterTestActivity)
   fun inject(conceptCardFragmentTestActivity: ConceptCardFragmentTestActivity)
-  fun inject(contentCardTestActivity: ContentCardTestActivity)
   fun inject(continuePlayingActivity: ContinuePlayingActivity)
   fun inject(continuePlayingFragmentTestActivity: ContinuePlayingFragmentTestActivity)
   fun inject(explorationActivity: ExplorationActivity)
   fun inject(homeActivity: HomeActivity)
   fun inject(htmlParserTestActivity: HtmlParserTestActivity)
+  fun inject(pinPasswordActivity: PinPasswordActivity)
   fun inject(profileActivity: ProfileActivity)
   fun inject(questionPlayerActivity: QuestionPlayerActivity)
-  fun inject(stateFragmentTestActivity: StateFragmentTestActivity)
   fun inject(profileRenameActivity: ProfileRenameActivity)
   fun inject(profileResetPinActivity: ProfileResetPinActivity)
   fun inject(storyActivity: StoryActivity)
+  fun inject(stateFragmentTestActivity: StateFragmentTestActivity)
   fun inject(topicActivity: TopicActivity)
   fun inject(topicTestActivity: TopicTestActivity)
   fun inject(topicTestActivityForStory: TopicTestActivityForStory)
   fun inject(storyFragmentTestActivity: StoryFragmentTestActivity)
+  fun inject(explorationInjectionActivity: ExplorationInjectionActivity)
 }

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

@@ -13,6 +13,7 @@ import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputMo
 import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule
 import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.domain.question.QuestionModule
 import org.oppia.util.caching.CachingModule
 import org.oppia.util.gcsresource.GcsResourceModule
 import org.oppia.util.logging.LoggerModule
@@ -30,7 +31,7 @@ import javax.inject.Singleton
   ContinueModule::class, FractionInputModule::class, ItemSelectionInputModule::class, MultipleChoiceInputModule::class,
   NumberWithUnitsRuleModule::class, NumericInputRuleModule::class, TextInputRuleModule::class,
   InteractionsModule::class, GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class,
-  HtmlParserEntityTypeModule::class, CachingModule::class
+  HtmlParserEntityTypeModule::class, CachingModule::class, QuestionModule::class
 ])
 interface ApplicationComponent {
   @Component.Builder

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

@@ -27,16 +27,20 @@ class NumericInputInteractionView @JvmOverloads constructor(
   defStyle: Int = android.R.attr.editTextStyle
 ) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
   private val stateKeyboardButtonListener: StateKeyboardButtonListener
+  private val hintText: String
 
   init {
     onFocusChangeListener = this
+    hintText = (hint ?: "").toString()
     stateKeyboardButtonListener = context as StateKeyboardButtonListener
   }
 
   override fun onFocusChange(v: View, hasFocus: Boolean) = if (hasFocus) {
+    hint = ""
     typeface = Typeface.DEFAULT
     showSoftKeyboard(v, context)
   } else {
+    hint = hintText
     if (text.isEmpty()) setTypeface(typeface, Typeface.ITALIC)
     hideSoftKeyboard(v, context)
   }

app/src/main/java/org/oppia/app/databinding/DrawableBindingAdapters.kt

@@ -2,7 +2,9 @@ package org.oppia.app.databinding
 
 import android.graphics.drawable.GradientDrawable
 import android.view.View
+import android.widget.Button
 import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
 import androidx.databinding.BindingAdapter
 import org.oppia.app.R
 
@@ -27,3 +29,8 @@ fun setRectangleBackgroundDrawable(view: View, @ColorInt colorRgb: Int) {
   // The input color needs to have alpha channel prepended to it.
   (view.background as GradientDrawable).setColor((0xff000000 or colorRgb.toLong()).toInt())
 }
+
+@BindingAdapter("android:button")
+fun setBackgroundResource(button: Button, @DrawableRes resource: Int) {
+  button.setBackgroundResource(resource)
+}

app/src/main/java/org/oppia/app/databinding/EditTextBindingAdapters.kt

@@ -0,0 +1,13 @@
+package org.oppia.app.databinding
+
+import android.text.TextWatcher
+import android.widget.EditText
+import androidx.databinding.BindingAdapter
+
+/** This bindingAdapter tells the compiler how to set a TextWatcher on an EditText.  */
+
+@BindingAdapter("app:textChangedListener")
+fun bindTextWatcher(editText: EditText, textWatcher: TextWatcher) {
+  editText.addTextChangedListener(textWatcher)
+}
+

app/src/main/java/org/oppia/app/databinding/ImageViewBindingAdapters.kt

@@ -71,3 +71,11 @@ fun setImageDrawable(imageView: ImageView, thumbnailGraphic: SkillThumbnailGraph
     }
   )
 }
+
+@BindingAdapter("profile:src")
+fun setProfileImage(imageView: ImageView, imageUrl: String) {
+  Glide.with(imageView.context)
+    .load(imageUrl)
+    .placeholder(R.drawable.ic_default_avatar)
+    .into(imageView)
+}

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

@@ -8,12 +8,12 @@ import org.oppia.app.home.continueplaying.ContinuePlayingFragment
 import org.oppia.app.player.audio.AudioFragment
 import org.oppia.app.player.exploration.ExplorationFragment
 import org.oppia.app.player.state.StateFragment
+import org.oppia.app.profile.AdminSettingsDialogFragment
 import org.oppia.app.settings.profile.ProfileEditFragment
 import org.oppia.app.settings.profile.ProfileListFragment
 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
+import org.oppia.app.profile.ResetPinDialogFragment
 import org.oppia.app.story.StoryFragment
 import org.oppia.app.testing.BindableAdapterTestFragment
 import org.oppia.app.topic.TopicFragment
@@ -40,23 +40,23 @@ interface FragmentComponent {
 
   fun getViewComponentBuilderProvider(): Provider<ViewComponent.Builder>
 
+  fun inject(adminSettingsDialogFragment: AdminSettingsDialogFragment)
   fun inject(audioFragment: AudioFragment)
   fun inject(bindableAdapterTestFragment: BindableAdapterTestFragment)
   fun inject(conceptCardFragment: ConceptCardFragment)
   fun inject(continuePlayingFragment: ContinuePlayingFragment)
   fun inject(explorationFragment: ExplorationFragment)
   fun inject(homeFragment: HomeFragment)
+  fun inject(profileChooserFragment: ProfileChooserFragment)
+  fun inject(profileEditFragment: ProfileEditFragment)
+  fun inject(profileListFragment: ProfileListFragment)
   fun inject(questionPlayerFragment: QuestionPlayerFragment)
+  fun inject(resetPinDialogFragment: ResetPinDialogFragment)
   fun inject(stateFragment: StateFragment)
   fun inject(storyFragment: StoryFragment)
   fun inject(topicFragment: TopicFragment)
   fun inject(topicOverviewFragment: TopicOverviewFragment)
   fun inject(topicPlayFragment: TopicPlayFragment)
   fun inject(topicReviewFragment: TopicReviewFragment)
   fun inject(topicTrainFragment: TopicTrainFragment)
-  fun inject(profileListFragment: ProfileListFragment)
-  fun inject(profileEditFragment: ProfileEditFragment)
-  fun inject(profileChooserFragment: ProfileChooserFragment)
-  fun inject(adminAuthFragment: AdminAuthFragment)
-  fun inject(addProfileFragment: AddProfileFragment)
 }