Fix #4833, #4834, #4835, #4838, #1050, #4519, #4522, #4837, #4836, #4855, #4856: Assorted alpha MR6 fixes

app/BUILD.bazel

@@ -200,7 +200,8 @@ VIEW_MODELS_WITH_RESOURCE_IMPORTS = [
     "src/main/java/org/oppia/android/app/help/thirdparty/LicenseListViewModel.kt",
     "src/main/java/org/oppia/android/app/help/thirdparty/LicenseTextViewModel.kt",
     "src/main/java/org/oppia/android/app/help/thirdparty/ThirdPartyDependencyListViewModel.kt",
-    "src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt",
+    "src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt",
+    "src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt",
     "src/main/java/org/oppia/android/app/home/HomeViewModel.kt",
     "src/main/java/org/oppia/android/app/home/WelcomeViewModel.kt",
     "src/main/java/org/oppia/android/app/home/promotedlist/ComingSoonTopicsViewModel.kt",
@@ -282,9 +283,9 @@ VIEW_MODELS = [
     "src/main/java/org/oppia/android/app/help/HelpItems.kt",
     "src/main/java/org/oppia/android/app/help/thirdparty/LicenseItemViewModel.kt",
     "src/main/java/org/oppia/android/app/help/thirdparty/ThirdPartyDependencyItemViewModel.kt",
+    "src/main/java/org/oppia/android/app/hintsandsolution/HintViewModel.kt",
     "src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionItemViewModel.kt",
     "src/main/java/org/oppia/android/app/hintsandsolution/ReturnToLessonViewModel.kt",
-    "src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt",
     "src/main/java/org/oppia/android/app/home/HomeItemViewModel.kt",
     "src/main/java/org/oppia/android/app/home/promotedlist/ComingSoonTopicListViewModel.kt",
     "src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedItemViewModel.kt",

app/src/main/AndroidManifest.xml

@@ -18,7 +18,7 @@
     <!-- NOTE TO DEVELOPER: You can enable debug logs for fast upload & better inspection in Firebase console using https://support.google.com/analytics/answer/7201382. -->
     <meta-data
       android:name="firebase_analytics_collection_deactivated"
-      android:value="true" />
+      android:value="false" />
     <meta-data
       android:name="firebase_crashlytics_collection_enabled"
       android:value="false" />

app/src/main/java/org/oppia/android/app/devoptions/DeveloperOptionsActivity.kt

@@ -47,8 +47,9 @@ class DeveloperOptionsActivity :
 
   override fun routeToMarkChaptersCompleted() {
     startActivity(
-      MarkChaptersCompletedActivity
-        .createMarkChaptersCompletedIntent(this, internalProfileId)
+      MarkChaptersCompletedActivity.createMarkChaptersCompletedIntent(
+        context = this, internalProfileId, showConfirmationNotice = false
+      )
     )
   }
 
@@ -86,10 +87,6 @@ class DeveloperOptionsActivity :
         decorateWithScreenName(DEVELOPER_OPTIONS_ACTIVITY)
       }
     }
-
-    fun getIntentKey(): String {
-      return NAVIGATION_PROFILE_ID_ARGUMENT_KEY
-    }
   }
 
   override fun forceCrash() {

app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt

@@ -21,13 +21,13 @@ class MarkChaptersCompletedActivity : InjectableAppCompatActivity() {
   @Inject
   lateinit var resourceHandler: AppLanguageResourceHandler
 
-  private var internalProfileId = -1
-
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
-    internalProfileId = intent.getIntExtra(PROFILE_ID_EXTRA_KEY, -1)
-    markChaptersCompletedActivityPresenter.handleOnCreate(internalProfileId)
+    val internalProfileId = intent.getIntExtra(PROFILE_ID_EXTRA_KEY, /* defaultValue= */ -1)
+    val showConfirmationNotice =
+      intent.getBooleanExtra(SHOW_CONFIRMATION_NOTICE_EXTRA_KEY, /* defaultValue= */ false)
+    markChaptersCompletedActivityPresenter.handleOnCreate(internalProfileId, showConfirmationNotice)
     title = resourceHandler.getStringInLocale(R.string.mark_chapters_completed_activity_title)
   }
 
@@ -39,11 +39,18 @@ class MarkChaptersCompletedActivity : InjectableAppCompatActivity() {
   }
 
   companion object {
-    const val PROFILE_ID_EXTRA_KEY = "MarkChaptersCompletedActivity.profile_id"
-
-    fun createMarkChaptersCompletedIntent(context: Context, internalProfileId: Int): Intent {
+    private const val PROFILE_ID_EXTRA_KEY = "MarkChaptersCompletedActivity.profile_id"
+    private const val SHOW_CONFIRMATION_NOTICE_EXTRA_KEY =
+      "MarkChaptersCompletedActivity.show_confirmation_notice"
+
+    fun createMarkChaptersCompletedIntent(
+      context: Context,
+      internalProfileId: Int,
+      showConfirmationNotice: Boolean
+    ): Intent {
       return Intent(context, MarkChaptersCompletedActivity::class.java).apply {
         putExtra(PROFILE_ID_EXTRA_KEY, internalProfileId)
+        putExtra(SHOW_CONFIRMATION_NOTICE_EXTRA_KEY, showConfirmationNotice)
         decorateWithScreenName(MARK_CHAPTERS_COMPLETED_ACTIVITY)
       }
     }

app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivityPresenter.kt

@@ -11,14 +11,14 @@ class MarkChaptersCompletedActivityPresenter @Inject constructor(
   private val activity: AppCompatActivity
 ) {
 
-  fun handleOnCreate(internalProfileId: Int) {
+  fun handleOnCreate(internalProfileId: Int, showConfirmationNotice: Boolean) {
     activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
     activity.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_arrow_back_white_24dp)
     activity.setContentView(R.layout.mark_chapters_completed_activity)
 
     if (getMarkChaptersCompletedFragment() == null) {
-      val markChaptersCompletedFragment = MarkChaptersCompletedFragment
-        .newInstance(internalProfileId)
+      val markChaptersCompletedFragment =
+        MarkChaptersCompletedFragment.newInstance(internalProfileId, showConfirmationNotice)
       activity.supportFragmentManager.beginTransaction().add(
         R.id.mark_chapters_completed_container,
         markChaptersCompletedFragment

app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragment.kt

@@ -15,17 +15,23 @@ class MarkChaptersCompletedFragment : InjectableFragment() {
   lateinit var markChaptersCompletedFragmentPresenter: MarkChaptersCompletedFragmentPresenter
 
   companion object {
-    internal const val PROFILE_ID_ARGUMENT_KEY =
-      "MarkChaptersCompletedFragment.profile_id"
-
+    private const val PROFILE_ID_ARGUMENT_KEY = "MarkChaptersCompletedFragment.profile_id"
+    private const val SHOW_CONFIRMATION_NOTICE_ARGUMENT_KEY =
+      "MarkChaptersCompletedFragment.show_confirmation_notice"
     private const val EXPLORATION_ID_LIST_ARGUMENT_KEY =
       "MarkChaptersCompletedFragment.exploration_id_list"
+    private const val EXPLORATION_TITLE_LIST_ARGUMENT_KEY =
+      "MarkChaptersCompletedFragment.exploration_title_list"
 
     /** Returns a new [MarkChaptersCompletedFragment]. */
-    fun newInstance(internalProfileId: Int): MarkChaptersCompletedFragment {
+    fun newInstance(
+      internalProfileId: Int,
+      showConfirmationNotice: Boolean
+    ): MarkChaptersCompletedFragment {
       val markChaptersCompletedFragment = MarkChaptersCompletedFragment()
       val args = Bundle()
       args.putInt(PROFILE_ID_ARGUMENT_KEY, internalProfileId)
+      args.putBoolean(SHOW_CONFIRMATION_NOTICE_ARGUMENT_KEY, showConfirmationNotice)
       markChaptersCompletedFragment.arguments = args
       return markChaptersCompletedFragment
     }
@@ -43,26 +49,28 @@ class MarkChaptersCompletedFragment : InjectableFragment() {
   ): View? {
     val args =
       checkNotNull(arguments) { "Expected arguments to be passed to MarkChaptersCompletedFragment" }
-    val internalProfileId = args
-      .getInt(PROFILE_ID_ARGUMENT_KEY, -1)
-    var selectedExplorationIdList = ArrayList<String>()
-    if (savedInstanceState != null) {
-      selectedExplorationIdList =
-        savedInstanceState.getStringArrayList(EXPLORATION_ID_LIST_ARGUMENT_KEY)!!
-    }
+    val internalProfileId = args.getInt(PROFILE_ID_ARGUMENT_KEY, /* defaultValue= */ -1)
+    val showConfirmationNotice =
+      args.getBoolean(SHOW_CONFIRMATION_NOTICE_ARGUMENT_KEY, /* defaultValue= */ false)
     return markChaptersCompletedFragmentPresenter.handleCreateView(
       inflater,
       container,
       internalProfileId,
-      selectedExplorationIdList
+      showConfirmationNotice,
+      savedInstanceState?.getStringArrayList(EXPLORATION_ID_LIST_ARGUMENT_KEY) ?: listOf(),
+      savedInstanceState?.getStringArrayList(EXPLORATION_TITLE_LIST_ARGUMENT_KEY) ?: listOf()
     )
   }
 
   override fun onSaveInstanceState(outState: Bundle) {
     super.onSaveInstanceState(outState)
     outState.putStringArrayList(
       EXPLORATION_ID_LIST_ARGUMENT_KEY,
-      markChaptersCompletedFragmentPresenter.selectedExplorationIdList
+      markChaptersCompletedFragmentPresenter.serializableSelectedExplorationIds
+    )
+    outState.putStringArrayList(
+      EXPLORATION_TITLE_LIST_ARGUMENT_KEY,
+      markChaptersCompletedFragmentPresenter.serializableSelectedExplorationTitles
     )
   }
 }