From 7addaed6916ec84e315216f20f298560720ab71d Mon Sep 17 00:00:00 2001
From: Rajat Talesra <talesra@google.com>
Date: Fri, 9 Apr 2021 05:59:47 +0530
Subject: [PATCH 1/7] Approach for RecentlyPlayed label

---
 .idea/codeStyles/Project.xml                  | 18 +++++-
 app/src/main/AndroidManifest.xml              |  1 +
 .../oppia/android/app/home/HomeActivity.kt    |  4 +-
 .../recentlyplayed/RecentlyPlayedActivity.kt  | 15 ++++-
 .../RecentlyPlayedActivityPresenter.kt        | 19 +++++-
 .../RecentlyPlayedFragmentPresenter.kt        |  6 --
 .../recentlyplayed/RecentlyPlayedTitleEnum.kt | 16 +++++
 .../ProfileProgressActivity.kt                |  4 +-
 .../layout-land/recently_played_fragment.xml  | 58 ------------------
 .../recently_played_fragment.xml              | 57 ------------------
 .../recently_played_fragment.xml              | 57 ------------------
 .../res/layout/recently_played_activity.xml   | 60 +++++++++++++++++--
 .../res/layout/recently_played_fragment.xml   | 25 +-------
 app/src/main/res/values/strings.xml           |  2 +-
 14 files changed, 126 insertions(+), 216 deletions(-)
 create mode 100644 app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedTitleEnum.kt
 delete mode 100644 app/src/main/res/layout-land/recently_played_fragment.xml
 delete mode 100644 app/src/main/res/layout-sw600dp-land/recently_played_fragment.xml
 delete mode 100644 app/src/main/res/layout-sw600dp-port/recently_played_fragment.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 66d46e74f0c..90d529e969d 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,6 +5,22 @@
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
@@ -161,4 +177,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c76342ce3da..bf11fc9d6b8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -55,6 +55,7 @@
       android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity
       android:name=".app.home.recentlyplayed.RecentlyPlayedActivity"
+      android:label="@string/recently_played_activity_title"
       android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity
       android:name=".app.mydownloads.MyDownloadsActivity"
diff --git a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
index fe423af43b0..9214aea745d 100644
--- a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
@@ -9,6 +9,7 @@ import org.oppia.android.app.drawer.ExitProfileDialogFragment
 import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID
 import org.oppia.android.app.drawer.TAG_SWITCH_PROFILE_DIALOG
 import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity
+import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedTitleEnum
 import org.oppia.android.app.model.ExitProfileDialogArguments
 import org.oppia.android.app.model.HighlightItem
 import org.oppia.android.app.topic.TopicActivity
@@ -80,7 +81,8 @@ class HomeActivity :
     startActivity(
       RecentlyPlayedActivity.createRecentlyPlayedActivityIntent(
         this,
-        internalProfileId
+        internalProfileId,
+        RecentlyPlayedTitleEnum.STORIES_FOR_YOU
       )
     )
   }
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
index fcb09bc3876..68b4fc77a3c 100644
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
@@ -21,7 +21,10 @@ class RecentlyPlayedActivity : InjectableAppCompatActivity(), RouteToExploration
       RECENTLY_PLAYED_ACTIVITY_INTERNAL_PROFILE_ID_KEY,
       -1
     )
-    recentlyPlayedActivityPresenter.handleOnCreate(internalProfileId)
+    val recentlyPlayedTitleEnum =
+      intent.getSerializableExtra(RECENTLY_PLAYED_ACTIVITY_TITLE_ENUM_KEY)
+        as RecentlyPlayedTitleEnum
+    recentlyPlayedActivityPresenter.handleOnCreate(internalProfileId, recentlyPlayedTitleEnum)
   }
 
   companion object {
@@ -29,10 +32,18 @@ class RecentlyPlayedActivity : InjectableAppCompatActivity(), RouteToExploration
     const val RECENTLY_PLAYED_ACTIVITY_INTERNAL_PROFILE_ID_KEY =
       "RecentlyPlayedActivity.internal_profile_id"
 
+    internal const val RECENTLY_PLAYED_ACTIVITY_TITLE_ENUM_KEY =
+      "RecentlyPlayedActivity.title_enum_key"
+
     /** Returns a new [Intent] to route to [RecentlyPlayedActivity]. */
-    fun createRecentlyPlayedActivityIntent(context: Context, internalProfileId: Int): Intent {
+    fun createRecentlyPlayedActivityIntent(
+      context: Context,
+      internalProfileId: Int,
+      recentlyPlayedTitleEnum: RecentlyPlayedTitleEnum
+    ): Intent {
       val intent = Intent(context, RecentlyPlayedActivity::class.java)
       intent.putExtra(RECENTLY_PLAYED_ACTIVITY_INTERNAL_PROFILE_ID_KEY, internalProfileId)
+      intent.putExtra(RECENTLY_PLAYED_ACTIVITY_TITLE_ENUM_KEY, recentlyPlayedTitleEnum)
       return intent
     }
   }
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt
index 1826587f235..52c79bcb33e 100644
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt
@@ -1,15 +1,30 @@
 package org.oppia.android.app.home.recentlyplayed
 
 import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
+import org.oppia.android.databinding.RecentlyPlayedActivityBinding
 import javax.inject.Inject
 
 /** The presenter for [RecentlyPlayedActivity]. */
 @ActivityScope
 class RecentlyPlayedActivityPresenter @Inject constructor(private val activity: AppCompatActivity) {
-  fun handleOnCreate(internalProfileId: Int) {
-    activity.setContentView(R.layout.recently_played_activity)
+  fun handleOnCreate(internalProfileId: Int, recentlyPlayedTitleEnum: RecentlyPlayedTitleEnum) {
+    activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
+    activity.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_arrow_back_white_24dp)
+    activity.title = recentlyPlayedTitleEnum.getTitleFromStringRes(activity)
+    val binding =
+      DataBindingUtil.setContentView<RecentlyPlayedActivityBinding>(
+        activity,
+        R.layout.recently_played_activity
+      )
+
+    binding.recentlyPlayedToolbar.setNavigationOnClickListener {
+      (activity as RecentlyPlayedActivity).finish()
+    }
+
+    binding.recentlyPlayedToolbar.title = recentlyPlayedTitleEnum.getTitleFromStringRes(activity)
     if (getRecentlyPlayedFragment() == null) {
       activity.supportFragmentManager.beginTransaction().add(
         R.id.recently_played_fragment_placeholder,
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt
index 7a5e7e91173..b94d48e473f 100755
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt
@@ -48,9 +48,6 @@ class RecentlyPlayedFragmentPresenter @Inject constructor(
     internalProfileId: Int
   ): View? {
     binding = RecentlyPlayedFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
-    binding.recentlyPlayedToolbar.setNavigationOnClickListener {
-      (activity as RecentlyPlayedActivity).finish()
-    }
 
     this.internalProfileId = internalProfileId
 
@@ -77,17 +74,14 @@ class RecentlyPlayedFragmentPresenter @Inject constructor(
       fragment,
       {
         if (it.promotedStoryList.recentlyPlayedStoryList.isNotEmpty()) {
-          binding.recentlyPlayedToolbar.title = activity.getString(R.string.recently_played_stories)
           addRecentlyPlayedStoryListSection(it.promotedStoryList.recentlyPlayedStoryList)
         }
 
         if (it.promotedStoryList.olderPlayedStoryList.isNotEmpty()) {
-          binding.recentlyPlayedToolbar.title = activity.getString(R.string.recently_played_stories)
           addOlderStoryListSection(it.promotedStoryList.olderPlayedStoryList)
         }
 
         if (it.promotedStoryList.suggestedStoryList.isNotEmpty()) {
-          binding.recentlyPlayedToolbar.title = activity.getString(R.string.stories_for_you)
           addRecommendedStoryListSection(it.promotedStoryList.suggestedStoryList)
         }
 
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedTitleEnum.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedTitleEnum.kt
new file mode 100644
index 00000000000..34a24a0b7e0
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedTitleEnum.kt
@@ -0,0 +1,16 @@
+package org.oppia.android.app.home.recentlyplayed
+
+import android.content.Context
+import androidx.annotation.StringRes
+import org.oppia.android.R
+
+/** Represents different titles for RecentlyPlayedActivity used by screen readers. */
+enum class RecentlyPlayedTitleEnum(@StringRes private var title: Int) {
+  RECENTLY_PLAYED_STORIES(R.string.recently_played_stories),
+  STORIES_FOR_YOU(R.string.stories_for_you);
+
+  /** Returns the string corresponding to this error's string resources, or null if there is none. */
+  fun getTitleFromStringRes(context: Context): String? {
+    return title.let(context::getString)
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt
index b1c248cbd8a..210b3a28049 100644
--- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt
@@ -7,6 +7,7 @@ import org.oppia.android.app.activity.InjectableAppCompatActivity
 import org.oppia.android.app.completedstorylist.CompletedStoryListActivity
 import org.oppia.android.app.home.RouteToRecentlyPlayedListener
 import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity
+import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedTitleEnum
 import org.oppia.android.app.ongoingtopiclist.OngoingTopicListActivity
 import javax.inject.Inject
 
@@ -33,7 +34,8 @@ class ProfileProgressActivity :
     startActivity(
       RecentlyPlayedActivity.createRecentlyPlayedActivityIntent(
         this,
-        internalProfileId
+        internalProfileId,
+        RecentlyPlayedTitleEnum.RECENTLY_PLAYED_STORIES
       )
     )
   }
diff --git a/app/src/main/res/layout-land/recently_played_fragment.xml b/app/src/main/res/layout-land/recently_played_fragment.xml
deleted file mode 100644
index 13789131425..00000000000
--- a/app/src/main/res/layout-land/recently_played_fragment.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white">
-
-    <com.google.android.material.appbar.AppBarLayout
-      android:id="@+id/reading_list_app_bar_layout"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
-
-      <androidx.appcompat.widget.Toolbar
-        android:id="@+id/recently_played_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:fontFamily="sans-serif"
-        android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/navigate_up"
-        app:navigationIcon="?attr/homeAsUpIndicator"
-        app:title="@string/recently_played_activity"
-        app:titleTextAppearance="@style/ToolbarTextAppearance"
-        app:titleTextColor="@color/white" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <FrameLayout
-      android:layout_width="0dp"
-      android:layout_height="0dp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/reading_list_app_bar_layout">
-
-      <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/ongoing_story_recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:overScrollMode="never"
-        android:paddingTop="8dp"
-        android:paddingBottom="108dp"
-        android:scrollbars="none" />
-
-      <View
-        android:id="@+id/recently_played__shadow_view"
-        android:layout_width="match_parent"
-        android:layout_height="6dp"
-        android:background="@drawable/toolbar_drop_shadow" />
-    </FrameLayout>
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp-land/recently_played_fragment.xml b/app/src/main/res/layout-sw600dp-land/recently_played_fragment.xml
deleted file mode 100644
index e07f798ae5e..00000000000
--- a/app/src/main/res/layout-sw600dp-land/recently_played_fragment.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white">
-
-    <com.google.android.material.appbar.AppBarLayout
-      android:id="@+id/reading_list_app_bar_layout"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
-
-      <androidx.appcompat.widget.Toolbar
-        android:id="@+id/recently_played_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:fontFamily="sans-serif"
-        android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/navigate_up"
-        app:navigationIcon="?attr/homeAsUpIndicator"
-        app:title="@string/recently_played_activity"
-        app:titleTextAppearance="@style/ToolbarTextAppearance"
-        app:titleTextColor="@color/white" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <FrameLayout
-      android:layout_width="0dp"
-      android:layout_height="0dp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/reading_list_app_bar_layout">
-
-      <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/ongoing_story_recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:overScrollMode="never"
-        android:paddingBottom="112dp"
-        android:scrollbars="none" />
-
-      <View
-        android:id="@+id/recently_played__shadow_view"
-        android:layout_width="match_parent"
-        android:layout_height="6dp"
-        android:background="@drawable/toolbar_drop_shadow" />
-    </FrameLayout>
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp-port/recently_played_fragment.xml b/app/src/main/res/layout-sw600dp-port/recently_played_fragment.xml
deleted file mode 100644
index e07f798ae5e..00000000000
--- a/app/src/main/res/layout-sw600dp-port/recently_played_fragment.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white">
-
-    <com.google.android.material.appbar.AppBarLayout
-      android:id="@+id/reading_list_app_bar_layout"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
-
-      <androidx.appcompat.widget.Toolbar
-        android:id="@+id/recently_played_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:fontFamily="sans-serif"
-        android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/navigate_up"
-        app:navigationIcon="?attr/homeAsUpIndicator"
-        app:title="@string/recently_played_activity"
-        app:titleTextAppearance="@style/ToolbarTextAppearance"
-        app:titleTextColor="@color/white" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <FrameLayout
-      android:layout_width="0dp"
-      android:layout_height="0dp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/reading_list_app_bar_layout">
-
-      <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/ongoing_story_recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:overScrollMode="never"
-        android:paddingBottom="112dp"
-        android:scrollbars="none" />
-
-      <View
-        android:id="@+id/recently_played__shadow_view"
-        android:layout_width="match_parent"
-        android:layout_height="6dp"
-        android:background="@drawable/toolbar_drop_shadow" />
-    </FrameLayout>
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout/recently_played_activity.xml b/app/src/main/res/layout/recently_played_activity.xml
index e130b320332..b61284cbdd8 100644
--- a/app/src/main/res/layout/recently_played_activity.xml
+++ b/app/src/main/res/layout/recently_played_activity.xml
@@ -1,7 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:id="@+id/recently_played_fragment_placeholder"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  tools:context=".app.home.recentlyplayed.RecentlyPlayedActivity" />
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white">
+
+    <com.google.android.material.appbar.AppBarLayout
+      android:id="@+id/recently_played_app_bar_layout"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent">
+
+      <androidx.appcompat.widget.Toolbar
+        android:id="@+id/recently_played_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        android:fontFamily="sans-serif"
+        android:minHeight="?attr/actionBarSize"
+        app:navigationContentDescription="@string/navigate_up"
+        app:navigationIcon="?attr/homeAsUpIndicator"
+        app:title="@string/recently_played_activity_title"
+        app:titleTextAppearance="@style/ToolbarTextAppearance"
+        app:titleTextColor="@color/white" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+      android:layout_width="0dp"
+      android:layout_height="0dp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/recently_played_app_bar_layout">
+
+      <FrameLayout
+        android:id="@+id/recently_played_fragment_placeholder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+      <View
+        android:layout_width="match_parent"
+        android:layout_height="6dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/recently_played_app_bar_layout" />
+    </FrameLayout>
+  </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/app/src/main/res/layout/recently_played_fragment.xml b/app/src/main/res/layout/recently_played_fragment.xml
index 8f768e273f7..cb3c5b099bb 100644
--- a/app/src/main/res/layout/recently_played_fragment.xml
+++ b/app/src/main/res/layout/recently_played_fragment.xml
@@ -7,36 +7,13 @@
     android:layout_height="match_parent"
     android:background="@color/white">
 
-    <com.google.android.material.appbar.AppBarLayout
-      android:id="@+id/reading_list_app_bar_layout"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
-
-      <androidx.appcompat.widget.Toolbar
-        android:id="@+id/recently_played_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:fontFamily="sans-serif"
-        android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/navigate_up"
-        app:navigationIcon="?attr/homeAsUpIndicator"
-        app:title="@string/recently_played_activity"
-        app:titleTextAppearance="@style/ToolbarTextAppearance"
-        app:titleTextColor="@color/white" />
-    </com.google.android.material.appbar.AppBarLayout>
-
     <FrameLayout
       android:layout_width="0dp"
       android:layout_height="0dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/reading_list_app_bar_layout">
+      app:layout_constraintTop_toTopOf="parent">
 
       <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/ongoing_story_recycler_view"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a2fea953cdc..25463ba39d2 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -84,7 +84,7 @@
   <string name="all_topics">All Topics</string>
   <string name="stories_you_can_play">Stories You Can Play</string>
   <string name="navigate_up">Navigate up</string>
-  <string name="recently_played_activity">Recently-Played Stories</string>
+  <string name="recently_played_activity_title">Recently-Played Stories</string>
   <string name="topic_downloaded">Topic Downloaded</string>
   <string name="downloaded">Downloaded</string>
   <string name="question_player_title">Practice Mode</string>

From ff88c014efd665059d4e99e521d085bdfce7890c Mon Sep 17 00:00:00 2001
From: Rajat Talesra <talesra@google.com>
Date: Fri, 9 Apr 2021 06:24:19 +0530
Subject: [PATCH 2/7] Nit fix

---
 .idea/codeStyles/Project.xml | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 90d529e969d..66d46e74f0c 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,22 +5,6 @@
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
@@ -177,4 +161,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
\ No newline at end of file
+</component>

From 8e75c7f6a24db92bfa183a3c00a1c205da17bce4 Mon Sep 17 00:00:00 2001
From: Rajat Talesra <talesra@google.com>
Date: Mon, 12 Apr 2021 08:46:23 +0530
Subject: [PATCH 3/7] Nit fix

---
 .../app/home/recentlyplayed/RecentlyPlayedTitleEnum.kt      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedTitleEnum.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedTitleEnum.kt
index 34a24a0b7e0..488aecbad8b 100644
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedTitleEnum.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedTitleEnum.kt
@@ -6,11 +6,9 @@ import org.oppia.android.R
 
 /** Represents different titles for RecentlyPlayedActivity used by screen readers. */
 enum class RecentlyPlayedTitleEnum(@StringRes private var title: Int) {
-  RECENTLY_PLAYED_STORIES(R.string.recently_played_stories),
+  RECENTLY_PLAYED_STORIES(R.string.recently_played_activity_title),
   STORIES_FOR_YOU(R.string.stories_for_you);
 
   /** Returns the string corresponding to this error's string resources, or null if there is none. */
-  fun getTitleFromStringRes(context: Context): String? {
-    return title.let(context::getString)
-  }
+  fun getTitleFromStringRes(context: Context) = title.let(context::getString)
 }

From 77be534717e6a2f0d2c2859e664d0d001275406f Mon Sep 17 00:00:00 2001
From: Rajat Talesra <talesra@google.com>
Date: Mon, 12 Apr 2021 12:01:58 +0530
Subject: [PATCH 4/7] Draft impl of proto based intents

---
 .idea/codeStyles/Project.xml                  | 18 +++++++-
 .../android/app/activity/ActivityRouter.kt    | 27 +++++++++++
 .../oppia/android/app/home/HomeActivity.kt    | 43 ++++++++++++++----
 .../app/home/RouteToRecentlyPlayedListener.kt |  2 +-
 .../PromotedStoryListViewModel.kt             |  2 +-
 .../recentlyplayed/RecentlyPlayedActivity.kt  | 27 +++++------
 .../RecentlyPlayedActivityPresenter.kt        | 26 +++++++++--
 .../ProfileProgressActivity.kt                | 45 +++++++++++++++----
 .../ProfileProgressHeaderViewModel.kt         |  7 ++-
 .../android/app/shim/IntentFactoryShim.kt     |  6 ---
 .../android/app/shim/IntentFactoryShimImpl.kt | 17 -------
 .../app/testing/HomeFragmentTestActivity.kt   |  2 +-
 .../res/layout/recently_played_activity.xml   |  6 +--
 model/src/main/proto/route.proto              | 27 +++++++++++
 model/src/main/proto/topic.proto              |  2 +-
 15 files changed, 184 insertions(+), 73 deletions(-)
 create mode 100644 app/src/main/java/org/oppia/android/app/activity/ActivityRouter.kt
 create mode 100644 model/src/main/proto/route.proto

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 66d46e74f0c..90d529e969d 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,6 +5,22 @@
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
@@ -161,4 +177,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>
\ No newline at end of file
diff --git a/app/src/main/java/org/oppia/android/app/activity/ActivityRouter.kt b/app/src/main/java/org/oppia/android/app/activity/ActivityRouter.kt
new file mode 100644
index 00000000000..2697d1b628a
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/activity/ActivityRouter.kt
@@ -0,0 +1,27 @@
+package org.oppia.android.app.activity
+
+import androidx.appcompat.app.AppCompatActivity
+import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity
+import org.oppia.app.model.DestinationScreen
+import org.oppia.app.model.DestinationScreen.DestinationScreenCase.RECENTLY_PLAYED_ACTIVITY_INTENT_EXTRAS
+import org.oppia.app.model.RecentlyPlayedActivityIntentExtras
+import javax.inject.Inject
+
+class ActivityRouter @Inject constructor(private val activity: AppCompatActivity) {
+  fun routeToScreen(destinationScreen: DestinationScreen) {
+    if (destinationScreen.destinationScreenCase == RECENTLY_PLAYED_ACTIVITY_INTENT_EXTRAS) {
+      openRecentlyPlayedActivity(destinationScreen.recentlyPlayedActivityIntentExtras)
+    }
+  }
+
+  private fun openRecentlyPlayedActivity(
+    recentlyPlayedActivityIntentExtras: RecentlyPlayedActivityIntentExtras
+  ) {
+    activity.startActivity(
+      RecentlyPlayedActivity.createRecentlyPlayedActivityIntent(
+        activity,
+        recentlyPlayedActivityIntentExtras
+      )
+    )
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
index 9214aea745d..b1db445b60f 100644
--- a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
@@ -4,15 +4,18 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import org.oppia.android.R
+import org.oppia.android.app.activity.ActivityRouter
 import org.oppia.android.app.activity.InjectableAppCompatActivity
 import org.oppia.android.app.drawer.ExitProfileDialogFragment
 import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID
 import org.oppia.android.app.drawer.TAG_SWITCH_PROFILE_DIALOG
-import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity
-import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedTitleEnum
 import org.oppia.android.app.model.ExitProfileDialogArguments
 import org.oppia.android.app.model.HighlightItem
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.topic.TopicActivity
+import org.oppia.app.model.DestinationScreen
+import org.oppia.app.model.RecentlyPlayedActivityIntentExtras
+import org.oppia.app.model.RecentlyPlayedActivityTitle
 import javax.inject.Inject
 
 /** The central activity for all users entering the app. */
@@ -25,6 +28,9 @@ class HomeActivity :
   lateinit var homeActivityPresenter: HomeActivityPresenter
   private var internalProfileId: Int = -1
 
+  @Inject
+  lateinit var activityRouter: ActivityRouter
+
   companion object {
     fun createHomeActivity(context: Context, profileId: Int?): Intent {
       val intent = Intent(context, HomeActivity::class.java)
@@ -77,13 +83,32 @@ class HomeActivity :
     )
   }
 
-  override fun routeToRecentlyPlayed() {
-    startActivity(
-      RecentlyPlayedActivity.createRecentlyPlayedActivityIntent(
-        this,
-        internalProfileId,
-        RecentlyPlayedTitleEnum.STORIES_FOR_YOU
-      )
+  override fun routeToRecentlyPlayed(title: String) {
+    val recentlyPlayedActivityIntentExtras =
+      RecentlyPlayedActivityIntentExtras
+        .newBuilder()
+        .setProfileId(
+          ProfileId.newBuilder().setInternalId(internalProfileId).build()
+        )
+        .setActivityTitle(
+          when (title) {
+            getString(R.string.stories_for_you) -> {
+              RecentlyPlayedActivityTitle.STORIES_FOR_YOU
+            }
+            getString(R.string.recently_played_activity_title) -> {
+              RecentlyPlayedActivityTitle.RECENTLY_PLAYED_STORIES
+            }
+            else -> {
+              RecentlyPlayedActivityTitle.RECENTLY_PLAYED_STORIES
+            }
+          }
+        ).build()
+
+    activityRouter.routeToScreen(
+      DestinationScreen
+        .newBuilder()
+        .setRecentlyPlayedActivityIntentExtras(recentlyPlayedActivityIntentExtras)
+        .build()
     )
   }
 }
diff --git a/app/src/main/java/org/oppia/android/app/home/RouteToRecentlyPlayedListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToRecentlyPlayedListener.kt
index 127ecdb5198..d1e877da274 100755
--- a/app/src/main/java/org/oppia/android/app/home/RouteToRecentlyPlayedListener.kt
+++ b/app/src/main/java/org/oppia/android/app/home/RouteToRecentlyPlayedListener.kt
@@ -2,5 +2,5 @@ package org.oppia.android.app.home
 
 /** Listener for when an activity should route to [RecentlyPlayedActivity]. */
 interface RouteToRecentlyPlayedListener {
-  fun routeToRecentlyPlayed()
+  fun routeToRecentlyPlayed(title: String)
 }
diff --git a/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModel.kt b/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModel.kt
index 52bc7e33842..89290156065 100644
--- a/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModel.kt
@@ -70,7 +70,7 @@ class PromotedStoryListViewModel(
   }
 
   fun clickOnViewAll() {
-    routeToRecentlyPlayedListener.routeToRecentlyPlayed()
+    routeToRecentlyPlayedListener.routeToRecentlyPlayed(getHeader())
   }
 
   // Overriding equals is needed so that DataProvider combine functions used in the HomeViewModel
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
index 68b4fc77a3c..311394e4827 100644
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import org.oppia.android.app.activity.InjectableAppCompatActivity
 import org.oppia.android.app.home.RouteToExplorationListener
 import org.oppia.android.app.player.exploration.ExplorationActivity
+import org.oppia.app.model.RecentlyPlayedActivityIntentExtras
 import javax.inject.Inject
 
 /** Activity for recent stories. */
@@ -17,33 +18,27 @@ class RecentlyPlayedActivity : InjectableAppCompatActivity(), RouteToExploration
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     activityComponent.inject(this)
-    val internalProfileId = intent.getIntExtra(
-      RECENTLY_PLAYED_ACTIVITY_INTERNAL_PROFILE_ID_KEY,
-      -1
+    val recentlyPlayedActivityIntentExtras = RecentlyPlayedActivityIntentExtras.parseFrom(
+      intent.getByteArrayExtra(RECENTLY_PLAYED_ACTIVITY_INTENT_EXTRAS)
     )
-    val recentlyPlayedTitleEnum =
-      intent.getSerializableExtra(RECENTLY_PLAYED_ACTIVITY_TITLE_ENUM_KEY)
-        as RecentlyPlayedTitleEnum
-    recentlyPlayedActivityPresenter.handleOnCreate(internalProfileId, recentlyPlayedTitleEnum)
+
+    recentlyPlayedActivityPresenter.handleOnCreate(recentlyPlayedActivityIntentExtras)
   }
 
   companion object {
     // TODO(#1655): Re-restrict access to fields in tests post-Gradle.
-    const val RECENTLY_PLAYED_ACTIVITY_INTERNAL_PROFILE_ID_KEY =
-      "RecentlyPlayedActivity.internal_profile_id"
-
-    internal const val RECENTLY_PLAYED_ACTIVITY_TITLE_ENUM_KEY =
-      "RecentlyPlayedActivity.title_enum_key"
+    const val RECENTLY_PLAYED_ACTIVITY_INTENT_EXTRAS = "RecentlyPlayedActivity.intent_extras"
 
     /** Returns a new [Intent] to route to [RecentlyPlayedActivity]. */
     fun createRecentlyPlayedActivityIntent(
       context: Context,
-      internalProfileId: Int,
-      recentlyPlayedTitleEnum: RecentlyPlayedTitleEnum
+      recentlyPlayedActivityIntentExtras: RecentlyPlayedActivityIntentExtras
     ): Intent {
       val intent = Intent(context, RecentlyPlayedActivity::class.java)
-      intent.putExtra(RECENTLY_PLAYED_ACTIVITY_INTERNAL_PROFILE_ID_KEY, internalProfileId)
-      intent.putExtra(RECENTLY_PLAYED_ACTIVITY_TITLE_ENUM_KEY, recentlyPlayedTitleEnum)
+      intent.putExtra(
+        RECENTLY_PLAYED_ACTIVITY_INTENT_EXTRAS,
+        recentlyPlayedActivityIntentExtras.toByteArray()
+      )
       return intent
     }
   }
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt
index 52c79bcb33e..d4da0fe4184 100644
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt
@@ -5,15 +5,17 @@ import androidx.databinding.DataBindingUtil
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
 import org.oppia.android.databinding.RecentlyPlayedActivityBinding
+import org.oppia.app.model.RecentlyPlayedActivityIntentExtras
+import org.oppia.app.model.RecentlyPlayedActivityTitle
 import javax.inject.Inject
 
 /** The presenter for [RecentlyPlayedActivity]. */
 @ActivityScope
 class RecentlyPlayedActivityPresenter @Inject constructor(private val activity: AppCompatActivity) {
-  fun handleOnCreate(internalProfileId: Int, recentlyPlayedTitleEnum: RecentlyPlayedTitleEnum) {
+  fun handleOnCreate(recentlyPlayedActivityIntentExtras: RecentlyPlayedActivityIntentExtras) {
     activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
     activity.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_arrow_back_white_24dp)
-    activity.title = recentlyPlayedTitleEnum.getTitleFromStringRes(activity)
+    activity.title = getTitle(recentlyPlayedActivityIntentExtras)
     val binding =
       DataBindingUtil.setContentView<RecentlyPlayedActivityBinding>(
         activity,
@@ -24,11 +26,11 @@ class RecentlyPlayedActivityPresenter @Inject constructor(private val activity:
       (activity as RecentlyPlayedActivity).finish()
     }
 
-    binding.recentlyPlayedToolbar.title = recentlyPlayedTitleEnum.getTitleFromStringRes(activity)
+    binding.recentlyPlayedToolbar.title = getTitle(recentlyPlayedActivityIntentExtras)
     if (getRecentlyPlayedFragment() == null) {
       activity.supportFragmentManager.beginTransaction().add(
         R.id.recently_played_fragment_placeholder,
-        RecentlyPlayedFragment.newInstance(internalProfileId),
+        RecentlyPlayedFragment.newInstance(recentlyPlayedActivityIntentExtras.profileId.internalId),
         RecentlyPlayedFragment.TAG_RECENTLY_PLAYED_FRAGMENT
       ).commitNow()
     }
@@ -39,4 +41,20 @@ class RecentlyPlayedActivityPresenter @Inject constructor(private val activity:
       R.id.recently_played_fragment_placeholder
     ) as RecentlyPlayedFragment?
   }
+
+  private fun getTitle(
+    recentlyPlayedActivityIntentExtras: RecentlyPlayedActivityIntentExtras
+  ): String {
+    return when (recentlyPlayedActivityIntentExtras.activityTitle) {
+      RecentlyPlayedActivityTitle.RECENTLY_PLAYED_STORIES -> {
+        activity.getString(R.string.recently_played_activity_title)
+      }
+      RecentlyPlayedActivityTitle.STORIES_FOR_YOU -> {
+        activity.getString(R.string.stories_for_you)
+      }
+      else -> {
+        activity.getString(R.string.recently_played_activity_title)
+      }
+    }
+  }
 }
diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt
index 210b3a28049..7bbe02f9bda 100644
--- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt
@@ -3,12 +3,16 @@ package org.oppia.android.app.profileprogress
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import org.oppia.android.R
+import org.oppia.android.app.activity.ActivityRouter
 import org.oppia.android.app.activity.InjectableAppCompatActivity
 import org.oppia.android.app.completedstorylist.CompletedStoryListActivity
 import org.oppia.android.app.home.RouteToRecentlyPlayedListener
-import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity
-import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedTitleEnum
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.ongoingtopiclist.OngoingTopicListActivity
+import org.oppia.app.model.DestinationScreen
+import org.oppia.app.model.RecentlyPlayedActivityIntentExtras
+import org.oppia.app.model.RecentlyPlayedActivityTitle
 import javax.inject.Inject
 
 /** Activity to display profile progress. */
@@ -21,6 +25,10 @@ class ProfileProgressActivity :
 
   @Inject
   lateinit var profileProgressActivityPresenter: ProfileProgressActivityPresenter
+
+  @Inject
+  lateinit var activityRouter: ActivityRouter
+
   private var internalProfileId = -1
 
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -30,13 +38,32 @@ class ProfileProgressActivity :
     profileProgressActivityPresenter.handleOnCreate(internalProfileId)
   }
 
-  override fun routeToRecentlyPlayed() {
-    startActivity(
-      RecentlyPlayedActivity.createRecentlyPlayedActivityIntent(
-        this,
-        internalProfileId,
-        RecentlyPlayedTitleEnum.RECENTLY_PLAYED_STORIES
-      )
+  override fun routeToRecentlyPlayed(title: String) {
+    val recentlyPlayedActivityIntentExtras =
+      RecentlyPlayedActivityIntentExtras
+        .newBuilder()
+        .setProfileId(
+          ProfileId.newBuilder().setInternalId(internalProfileId).build()
+        )
+        .setActivityTitle(
+          when (title) {
+            getString(R.string.stories_for_you) -> {
+              RecentlyPlayedActivityTitle.STORIES_FOR_YOU
+            }
+            getString(R.string.recently_played_activity_title) -> {
+              RecentlyPlayedActivityTitle.RECENTLY_PLAYED_STORIES
+            }
+            else -> {
+              RecentlyPlayedActivityTitle.RECENTLY_PLAYED_STORIES
+            }
+          }
+        ).build()
+
+    activityRouter.routeToScreen(
+      DestinationScreen
+        .newBuilder()
+        .setRecentlyPlayedActivityIntentExtras(recentlyPlayedActivityIntentExtras)
+        .build()
     )
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressHeaderViewModel.kt
index 37966be68f3..7054e4c400c 100644
--- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressHeaderViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressHeaderViewModel.kt
@@ -4,11 +4,12 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.ObservableField
 import androidx.fragment.app.Fragment
+import org.oppia.android.R
 import org.oppia.android.app.home.RouteToRecentlyPlayedListener
 import org.oppia.android.app.model.Profile
 
 /** Header [ViewModel] for the recycler view in [ProfileProgressFragment]. */
-class ProfileProgressHeaderViewModel(activity: AppCompatActivity, fragment: Fragment) :
+class ProfileProgressHeaderViewModel(private val activity: AppCompatActivity, fragment: Fragment) :
   ProfileProgressItemViewModel() {
   private val routeToCompletedStoryListListener = activity as RouteToCompletedStoryListListener
   private val routeToOngoingTopicListListener = activity as RouteToOngoingTopicListListener
@@ -42,7 +43,9 @@ class ProfileProgressHeaderViewModel(activity: AppCompatActivity, fragment: Frag
   }
 
   fun clickOnViewAll() {
-    routeToRecentlyPlayedActivity.routeToRecentlyPlayed()
+    routeToRecentlyPlayedActivity.routeToRecentlyPlayed(
+      activity.getString(R.string.recently_played_activity_title)
+    )
   }
 
   fun clickOnProfilePicture() {
diff --git a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt
index ff7a38f9e01..d07d62dd2bd 100644
--- a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt
+++ b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt
@@ -37,10 +37,4 @@ interface IntentFactoryShim {
     internalProfileId: Int,
     topicId: String
   ): Intent
-
-  /**
-   * Creates a [RecentlyPlayedActivity] intent for [PromotedStoryListViewModel] and passes
-   * necessary string data.
-   * */
-  fun createRecentlyPlayedActivityIntent(context: Context, internalProfileId: Int): Intent
 }
diff --git a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt
index 2f9d758efdb..c7e35daf294 100644
--- a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt
+++ b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.Intent
 import androidx.fragment.app.FragmentActivity
 import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID
-import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity
 import org.oppia.android.app.profile.ProfileChooserActivity
 import org.oppia.android.app.topic.TopicActivity
 import javax.inject.Inject
@@ -58,20 +57,4 @@ class IntentFactoryShimImpl @Inject constructor() : IntentFactoryShim {
     intent.putExtra(TOPIC_ACTIVITY_TOPIC_ID_ARGUMENT_KEY, topicId)
     return intent
   }
-
-  /**
-   * Creates a [RecentlyPlayedActivity] intent for [PromotedStoryListViewModel] and passes
-   * necessary string data.
-   * */
-  override fun createRecentlyPlayedActivityIntent(
-    context: Context,
-    internalProfileId: Int
-  ): Intent {
-    val intent = Intent(context, RecentlyPlayedActivity::class.java)
-    intent.putExtra(
-      RecentlyPlayedActivity.RECENTLY_PLAYED_ACTIVITY_INTERNAL_PROFILE_ID_KEY,
-      internalProfileId
-    )
-    return intent
-  }
 }
diff --git a/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt
index 8776b9ff57d..8e2e0a8a141 100644
--- a/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt
@@ -33,5 +33,5 @@ class HomeFragmentTestActivity :
   // Override functions are needed to fulfill listener definitions.
   override fun routeToTopic(internalProfileId: Int, topicId: String) {}
   override fun routeToTopicPlayStory(internalProfileId: Int, topicId: String, storyId: String) {}
-  override fun routeToRecentlyPlayed() {}
+  override fun routeToRecentlyPlayed(title: String) {}
 }
diff --git a/app/src/main/res/layout/recently_played_activity.xml b/app/src/main/res/layout/recently_played_activity.xml
index b61284cbdd8..8663c121253 100644
--- a/app/src/main/res/layout/recently_played_activity.xml
+++ b/app/src/main/res/layout/recently_played_activity.xml
@@ -45,11 +45,7 @@
 
       <View
         android:layout_width="match_parent"
-        android:layout_height="6dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/recently_played_app_bar_layout" />
+        android:layout_height="6dp" />
     </FrameLayout>
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/model/src/main/proto/route.proto b/model/src/main/proto/route.proto
new file mode 100644
index 00000000000..efc823cd3f3
--- /dev/null
+++ b/model/src/main/proto/route.proto
@@ -0,0 +1,27 @@
+syntax = "proto3";
+
+package model;
+
+import "profile.proto";
+
+option java_package = "org.oppia.app.model";
+option java_multiple_files = true;
+
+message DestinationScreen {
+  oneof destination_screen {
+    RecentlyPlayedActivityIntentExtras recently_played_activity_intent_extras = 1;
+  }
+}
+
+message RecentlyPlayedActivityIntentExtras{
+  ProfileId profileId = 1;
+  RecentlyPlayedActivityTitle activity_title = 2;
+}
+
+enum RecentlyPlayedActivityTitle {
+  UNSPECIFIED = 0;
+
+  RECENTLY_PLAYED_STORIES = 1;
+
+  STORIES_FOR_YOU = 2;
+}
diff --git a/model/src/main/proto/topic.proto b/model/src/main/proto/topic.proto
index 9106276857f..6e9bbd4ba2f 100755
--- a/model/src/main/proto/topic.proto
+++ b/model/src/main/proto/topic.proto
@@ -250,7 +250,7 @@ enum ChapterPlayState {
 
 // Top level proto used to store topic progress per-profile.
 message TopicProgressDatabase {
-  // Map from topic ID to TopicProgress.
+  // Map from profile ID to TopicProgress.
   map<string, TopicProgress> topic_progress = 1;
 }
 

From 804c7db35301448926ca653f8415d054b490ed85 Mon Sep 17 00:00:00 2001
From: Rajat Talesra <talesra@google.com>
Date: Mon, 12 Apr 2021 12:11:43 +0530
Subject: [PATCH 5/7] Nit fix and documentation

---
 .idea/codeStyles/Project.xml                   | 18 +-----------------
 .../android/app/activity/ActivityRouter.kt     |  3 +++
 .../recentlyplayed/RecentlyPlayedTitleEnum.kt  | 14 --------------
 model/src/main/proto/route.proto               |  8 ++++++++
 4 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedTitleEnum.kt

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 90d529e969d..66d46e74f0c 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,22 +5,6 @@
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
@@ -177,4 +161,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
\ No newline at end of file
+</component>
diff --git a/app/src/main/java/org/oppia/android/app/activity/ActivityRouter.kt b/app/src/main/java/org/oppia/android/app/activity/ActivityRouter.kt
index 2697d1b628a..abae9d84af0 100644
--- a/app/src/main/java/org/oppia/android/app/activity/ActivityRouter.kt
+++ b/app/src/main/java/org/oppia/android/app/activity/ActivityRouter.kt
@@ -7,7 +7,10 @@ import org.oppia.app.model.DestinationScreen.DestinationScreenCase.RECENTLY_PLAY
 import org.oppia.app.model.RecentlyPlayedActivityIntentExtras
 import javax.inject.Inject
 
+/** Central utility to manage routing to different activities. */
 class ActivityRouter @Inject constructor(private val activity: AppCompatActivity) {
+
+  /** Checks the value of [DestinationScreen] and routes to different activities accordingly. */
   fun routeToScreen(destinationScreen: DestinationScreen) {
     if (destinationScreen.destinationScreenCase == RECENTLY_PLAYED_ACTIVITY_INTENT_EXTRAS) {
       openRecentlyPlayedActivity(destinationScreen.recentlyPlayedActivityIntentExtras)
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedTitleEnum.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedTitleEnum.kt
deleted file mode 100644
index 488aecbad8b..00000000000
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedTitleEnum.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.oppia.android.app.home.recentlyplayed
-
-import android.content.Context
-import androidx.annotation.StringRes
-import org.oppia.android.R
-
-/** Represents different titles for RecentlyPlayedActivity used by screen readers. */
-enum class RecentlyPlayedTitleEnum(@StringRes private var title: Int) {
-  RECENTLY_PLAYED_STORIES(R.string.recently_played_activity_title),
-  STORIES_FOR_YOU(R.string.stories_for_you);
-
-  /** Returns the string corresponding to this error's string resources, or null if there is none. */
-  fun getTitleFromStringRes(context: Context) = title.let(context::getString)
-}
diff --git a/model/src/main/proto/route.proto b/model/src/main/proto/route.proto
index efc823cd3f3..6a6e7d922c2 100644
--- a/model/src/main/proto/route.proto
+++ b/model/src/main/proto/route.proto
@@ -7,21 +7,29 @@ import "profile.proto";
 option java_package = "org.oppia.app.model";
 option java_multiple_files = true;
 
+// Corresponds to intent extras of destination activity.
 message DestinationScreen {
   oneof destination_screen {
     RecentlyPlayedActivityIntentExtras recently_played_activity_intent_extras = 1;
   }
 }
 
+// Intent extras for RecentlyPlayedActivity.
 message RecentlyPlayedActivityIntentExtras{
+  // The ID of current profile.
   ProfileId profileId = 1;
+  // The title which should be displayed for the activity.
   RecentlyPlayedActivityTitle activity_title = 2;
 }
 
+// Corresponds to activity title of RecentlyPlayedActivity.
 enum RecentlyPlayedActivityTitle {
+  // Activity title is not specified.
   UNSPECIFIED = 0;
 
+  // Corresponds to activity title as "Recently played stories".
   RECENTLY_PLAYED_STORIES = 1;
 
+  // Corresponds to activity title as "Stories for you".
   STORIES_FOR_YOU = 2;
 }

From 205bfe3344100b4357e1a6b31685075981df41d2 Mon Sep 17 00:00:00 2001
From: Rajat Talesra <talesra@google.com>
Date: Mon, 12 Apr 2021 12:35:08 +0530
Subject: [PATCH 6/7] Proto fix

---
 .../org/oppia/android/app/activity/ActivityRouter.kt     | 9 +++++----
 .../main/java/org/oppia/android/app/home/HomeActivity.kt | 6 +++---
 .../app/home/recentlyplayed/RecentlyPlayedActivity.kt    | 2 +-
 .../recentlyplayed/RecentlyPlayedActivityPresenter.kt    | 4 ++--
 .../app/profileprogress/ProfileProgressActivity.kt       | 6 +++---
 model/src/main/proto/route.proto                         | 2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/activity/ActivityRouter.kt b/app/src/main/java/org/oppia/android/app/activity/ActivityRouter.kt
index abae9d84af0..407362c38f5 100644
--- a/app/src/main/java/org/oppia/android/app/activity/ActivityRouter.kt
+++ b/app/src/main/java/org/oppia/android/app/activity/ActivityRouter.kt
@@ -2,9 +2,8 @@ package org.oppia.android.app.activity
 
 import androidx.appcompat.app.AppCompatActivity
 import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity
-import org.oppia.app.model.DestinationScreen
-import org.oppia.app.model.DestinationScreen.DestinationScreenCase.RECENTLY_PLAYED_ACTIVITY_INTENT_EXTRAS
-import org.oppia.app.model.RecentlyPlayedActivityIntentExtras
+import org.oppia.android.app.model.DestinationScreen
+import org.oppia.android.app.model.RecentlyPlayedActivityIntentExtras
 import javax.inject.Inject
 
 /** Central utility to manage routing to different activities. */
@@ -12,7 +11,9 @@ class ActivityRouter @Inject constructor(private val activity: AppCompatActivity
 
   /** Checks the value of [DestinationScreen] and routes to different activities accordingly. */
   fun routeToScreen(destinationScreen: DestinationScreen) {
-    if (destinationScreen.destinationScreenCase == RECENTLY_PLAYED_ACTIVITY_INTENT_EXTRAS) {
+    if (destinationScreen.destinationScreenCase ==
+      DestinationScreen.DestinationScreenCase.RECENTLY_PLAYED_ACTIVITY_INTENT_EXTRAS
+    ) {
       openRecentlyPlayedActivity(destinationScreen.recentlyPlayedActivityIntentExtras)
     }
   }
diff --git a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
index b1db445b60f..6770ddee9e5 100644
--- a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
@@ -9,13 +9,13 @@ import org.oppia.android.app.activity.InjectableAppCompatActivity
 import org.oppia.android.app.drawer.ExitProfileDialogFragment
 import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID
 import org.oppia.android.app.drawer.TAG_SWITCH_PROFILE_DIALOG
+import org.oppia.android.app.model.DestinationScreen
 import org.oppia.android.app.model.ExitProfileDialogArguments
 import org.oppia.android.app.model.HighlightItem
 import org.oppia.android.app.model.ProfileId
+import org.oppia.android.app.model.RecentlyPlayedActivityIntentExtras
+import org.oppia.android.app.model.RecentlyPlayedActivityTitle
 import org.oppia.android.app.topic.TopicActivity
-import org.oppia.app.model.DestinationScreen
-import org.oppia.app.model.RecentlyPlayedActivityIntentExtras
-import org.oppia.app.model.RecentlyPlayedActivityTitle
 import javax.inject.Inject
 
 /** The central activity for all users entering the app. */
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
index 311394e4827..f5deec6c601 100644
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
@@ -5,8 +5,8 @@ import android.content.Intent
 import android.os.Bundle
 import org.oppia.android.app.activity.InjectableAppCompatActivity
 import org.oppia.android.app.home.RouteToExplorationListener
+import org.oppia.android.app.model.RecentlyPlayedActivityIntentExtras
 import org.oppia.android.app.player.exploration.ExplorationActivity
-import org.oppia.app.model.RecentlyPlayedActivityIntentExtras
 import javax.inject.Inject
 
 /** Activity for recent stories. */
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt
index d4da0fe4184..6acce45a2a0 100644
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt
@@ -4,9 +4,9 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
+import org.oppia.android.app.model.RecentlyPlayedActivityIntentExtras
+import org.oppia.android.app.model.RecentlyPlayedActivityTitle
 import org.oppia.android.databinding.RecentlyPlayedActivityBinding
-import org.oppia.app.model.RecentlyPlayedActivityIntentExtras
-import org.oppia.app.model.RecentlyPlayedActivityTitle
 import javax.inject.Inject
 
 /** The presenter for [RecentlyPlayedActivity]. */
diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt
index 7bbe02f9bda..95d9ec66cbb 100644
--- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt
@@ -8,11 +8,11 @@ import org.oppia.android.app.activity.ActivityRouter
 import org.oppia.android.app.activity.InjectableAppCompatActivity
 import org.oppia.android.app.completedstorylist.CompletedStoryListActivity
 import org.oppia.android.app.home.RouteToRecentlyPlayedListener
+import org.oppia.android.app.model.DestinationScreen
 import org.oppia.android.app.model.ProfileId
+import org.oppia.android.app.model.RecentlyPlayedActivityIntentExtras
+import org.oppia.android.app.model.RecentlyPlayedActivityTitle
 import org.oppia.android.app.ongoingtopiclist.OngoingTopicListActivity
-import org.oppia.app.model.DestinationScreen
-import org.oppia.app.model.RecentlyPlayedActivityIntentExtras
-import org.oppia.app.model.RecentlyPlayedActivityTitle
 import javax.inject.Inject
 
 /** Activity to display profile progress. */
diff --git a/model/src/main/proto/route.proto b/model/src/main/proto/route.proto
index 6a6e7d922c2..04b33cb3c22 100644
--- a/model/src/main/proto/route.proto
+++ b/model/src/main/proto/route.proto
@@ -4,7 +4,7 @@ package model;
 
 import "profile.proto";
 
-option java_package = "org.oppia.app.model";
+option java_package = "org.oppia.android.app.model";
 option java_multiple_files = true;
 
 // Corresponds to intent extras of destination activity.

From 9dfb3e435f2f90514e9b64df75a793abb398f28d Mon Sep 17 00:00:00 2001
From: Rajat Talesra <talesra@google.com>
Date: Mon, 12 Apr 2021 14:00:50 +0530
Subject: [PATCH 7/7] Nit fix

---
 model/src/main/proto/route.proto | 1 +
 1 file changed, 1 insertion(+)

diff --git a/model/src/main/proto/route.proto b/model/src/main/proto/route.proto
index 04b33cb3c22..1a33854fdb1 100644
--- a/model/src/main/proto/route.proto
+++ b/model/src/main/proto/route.proto
@@ -18,6 +18,7 @@ message DestinationScreen {
 message RecentlyPlayedActivityIntentExtras{
   // The ID of current profile.
   ProfileId profileId = 1;
+  
   // The title which should be displayed for the activity.
   RecentlyPlayedActivityTitle activity_title = 2;
 }