From a940f350c9e5aaa4f0b2db5f8f7872b96649395b Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Sun, 6 Dec 2020 16:51:03 -0800
Subject: [PATCH 01/18] Fix part of #2132

---
 app/src/main/res/layout/story_chapter_view.xml | 4 ++--
 app/src/main/res/values/dimens.xml             | 2 +-
 app/src/main/res/values/strings.xml            | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/story_chapter_view.xml b/app/src/main/res/layout/story_chapter_view.xml
index b626c0f0a60..ee9ddfac416 100644
--- a/app/src/main/res/layout/story_chapter_view.xml
+++ b/app/src/main/res/layout/story_chapter_view.xml
@@ -42,6 +42,7 @@
 
         <org.oppia.android.app.customview.LessonThumbnailImageView
           android:id="@+id/chapter_thumbnail"
+          android:alpha="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? 1.0f : 0.3f}"
           android:layout_width="match_parent"
           android:layout_height="0dp"
           android:scaleType="centerInside"
@@ -91,8 +92,7 @@
             android:layout_marginBottom="4dp"
             android:ellipsize="end"
             android:fontFamily="sans-serif"
-            android:maxLines="4"
-            android:text="@{htmlContent}"
+            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : String.format(@string/chapter_prerequisite, viewModel.index)}"
             android:textColor="@color/oppiaPrimaryText"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 1b11bf7bf64..a49f7838442 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -299,7 +299,7 @@
 
   <dimen name="story_chapter_card_playable_state_elevation">4dp</dimen>
   <dimen name="ongoing_topic_card_elevation">4dp</dimen>
-  <dimen name="story_chapter_card_not_playable_state_elevation">0dp</dimen>
+  <dimen name="story_chapter_card_not_playable_state_elevation">2dp</dimen>
   <dimen name="profile_chooser_padding_bottom_profile_already_added">224dp</dimen>
 
   <dimen name="continue_item_exploration_split_view_margin_top">72dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 737c64804c2..521da841c18 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -63,6 +63,7 @@
   <string name="topic_play_chapter_index">%s.</string>
   <string name="chapter_name">Chapter %s: %s</string>
   <string name="chapter_completed">Chapter %s: %s is completed.</string>
+  <string name="chapter_prerequisite">Complete Chapter %s to unlock this chapter.</string>
   <string name="text_input_default_content_description">Enter text.</string>
   <string name="fractions_default_hint_text">Enter a fraction in the form x/x, or a mixed number in the form x x/x.</string>
   <string name="fractions_default_hint_text_no_integer">Enter a fraction in the form x/x.</string>

From ba223f06acc216dbbd17a6c5f7ed8e3f26e16521 Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Mon, 7 Dec 2020 23:18:48 -0800
Subject: [PATCH 02/18] Fix part of #2132

---
 .idea/codeStyles/Project.xml                   | 18 +++++++++++++++++-
 .../oppia/android/app/story/StoryViewModel.kt  |  1 +
 .../StoryChapterSummaryViewModel.kt            |  1 +
 app/src/main/res/layout/story_chapter_view.xml |  9 ++++++---
 app/src/main/res/values/strings.xml            |  2 +-
 5 files changed, 26 insertions(+), 5 deletions(-)

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/story/StoryViewModel.kt b/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt
index ceaa700bf09..a74b5577d28 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt
@@ -109,6 +109,7 @@ class StoryViewModel @Inject constructor(
           topicId,
           storyId,
           chapter,
+          if (index > 0) chapterList.get(index - 1).name else "",
           entityType
         )
       }
diff --git a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
index 02b97e4e71b..143269820ce 100644
--- a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
@@ -22,6 +22,7 @@ class StoryChapterSummaryViewModel(
   val topicId: String,
   val storyId: String,
   val chapterSummary: ChapterSummary,
+  val previousChapterTitle: String,
   val entityType: String
 ) : StoryItemViewModel() {
   val explorationId: String = chapterSummary.explorationId
diff --git a/app/src/main/res/layout/story_chapter_view.xml b/app/src/main/res/layout/story_chapter_view.xml
index ee9ddfac416..5eca9948a3c 100644
--- a/app/src/main/res/layout/story_chapter_view.xml
+++ b/app/src/main/res/layout/story_chapter_view.xml
@@ -12,6 +12,10 @@
       name="htmlContent"
       type="CharSequence" />
 
+    <variable
+      name="vvv"
+      type="CharSequence" />
+
     <variable
       name="viewModel"
       type="org.oppia.android.app.story.storyitemviewmodel.StoryChapterSummaryViewModel" />
@@ -42,9 +46,9 @@
 
         <org.oppia.android.app.customview.LessonThumbnailImageView
           android:id="@+id/chapter_thumbnail"
-          android:alpha="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? 1.0f : 0.3f}"
           android:layout_width="match_parent"
           android:layout_height="0dp"
+          android:alpha="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? 1.0f : 0.3f}"
           android:scaleType="centerInside"
           app:entityId="@{viewModel.storyId}"
           app:entityType="@{viewModel.entityType}"
@@ -90,9 +94,8 @@
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
-            android:ellipsize="end"
             android:fontFamily="sans-serif"
-            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : String.format(@string/chapter_prerequisite, viewModel.index)}"
+            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : String.format(@string/chapter_prerequisite, viewModel.index, viewModel.previousChapterTitle)}"
             android:textColor="@color/oppiaPrimaryText"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 521da841c18..e581e5fad93 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -63,7 +63,7 @@
   <string name="topic_play_chapter_index">%s.</string>
   <string name="chapter_name">Chapter %s: %s</string>
   <string name="chapter_completed">Chapter %s: %s is completed.</string>
-  <string name="chapter_prerequisite">Complete Chapter %s to unlock this chapter.</string>
+  <string name="chapter_prerequisite">Complete Chapter <b>%s: %s</b> to unlock this chapter.</string>
   <string name="text_input_default_content_description">Enter text.</string>
   <string name="fractions_default_hint_text">Enter a fraction in the form x/x, or a mixed number in the form x x/x.</string>
   <string name="fractions_default_hint_text_no_integer">Enter a fraction in the form x/x.</string>

From e564d556dc6d4904fdca7a607cbc5f313b307693 Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Mon, 7 Dec 2020 23:19:45 -0800
Subject: [PATCH 03/18] Fix part of #2132

---
 app/src/main/res/layout/story_chapter_view.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/src/main/res/layout/story_chapter_view.xml b/app/src/main/res/layout/story_chapter_view.xml
index 5eca9948a3c..133ccf23bcb 100644
--- a/app/src/main/res/layout/story_chapter_view.xml
+++ b/app/src/main/res/layout/story_chapter_view.xml
@@ -12,10 +12,6 @@
       name="htmlContent"
       type="CharSequence" />
 
-    <variable
-      name="vvv"
-      type="CharSequence" />
-
     <variable
       name="viewModel"
       type="org.oppia.android.app.story.storyitemviewmodel.StoryChapterSummaryViewModel" />

From 332f42de6c16b1ccaed83bf83fda0b437e5f26bb Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Mon, 7 Dec 2020 23:29:02 -0800
Subject: [PATCH 04/18] Fix part of #2132

---
 app/src/main/res/layout-land/story_chapter_view.xml    | 2 +-
 app/src/main/res/layout-sw600dp/story_chapter_view.xml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout-land/story_chapter_view.xml b/app/src/main/res/layout-land/story_chapter_view.xml
index 5feb475f804..33daf46d315 100644
--- a/app/src/main/res/layout-land/story_chapter_view.xml
+++ b/app/src/main/res/layout-land/story_chapter_view.xml
@@ -79,7 +79,7 @@
             android:ellipsize="end"
             android:fontFamily="sans-serif"
             android:maxLines="3"
-            android:text="@{htmlContent}"
+            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : String.format(@string/chapter_prerequisite, viewModel.index, viewModel.previousChapterTitle)}"
             android:textColor="@color/oppiaPrimaryText"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/story_chapter_view.xml b/app/src/main/res/layout-sw600dp/story_chapter_view.xml
index b626c0f0a60..35b375b7f37 100644
--- a/app/src/main/res/layout-sw600dp/story_chapter_view.xml
+++ b/app/src/main/res/layout-sw600dp/story_chapter_view.xml
@@ -44,6 +44,7 @@
           android:id="@+id/chapter_thumbnail"
           android:layout_width="match_parent"
           android:layout_height="0dp"
+          android:alpha="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? 1.0f : 0.3f}"
           android:scaleType="centerInside"
           app:entityId="@{viewModel.storyId}"
           app:entityType="@{viewModel.entityType}"
@@ -92,7 +93,7 @@
             android:ellipsize="end"
             android:fontFamily="sans-serif"
             android:maxLines="4"
-            android:text="@{htmlContent}"
+            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : String.format(@string/chapter_prerequisite, viewModel.index, viewModel.previousChapterTitle)}"
             android:textColor="@color/oppiaPrimaryText"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"

From 7c381a764c8fa1575a1108908ae8f21783e9409e Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Mon, 7 Dec 2020 23:30:16 -0800
Subject: [PATCH 05/18] Fix part of #2132

---
 app/src/main/res/layout-land/story_chapter_view.xml    | 2 --
 app/src/main/res/layout-sw600dp/story_chapter_view.xml | 2 --
 2 files changed, 4 deletions(-)

diff --git a/app/src/main/res/layout-land/story_chapter_view.xml b/app/src/main/res/layout-land/story_chapter_view.xml
index 33daf46d315..4e873a8615f 100644
--- a/app/src/main/res/layout-land/story_chapter_view.xml
+++ b/app/src/main/res/layout-land/story_chapter_view.xml
@@ -76,9 +76,7 @@
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
-            android:ellipsize="end"
             android:fontFamily="sans-serif"
-            android:maxLines="3"
             android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : String.format(@string/chapter_prerequisite, viewModel.index, viewModel.previousChapterTitle)}"
             android:textColor="@color/oppiaPrimaryText"
             android:textSize="16sp"
diff --git a/app/src/main/res/layout-sw600dp/story_chapter_view.xml b/app/src/main/res/layout-sw600dp/story_chapter_view.xml
index 35b375b7f37..133ccf23bcb 100644
--- a/app/src/main/res/layout-sw600dp/story_chapter_view.xml
+++ b/app/src/main/res/layout-sw600dp/story_chapter_view.xml
@@ -90,9 +90,7 @@
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
-            android:ellipsize="end"
             android:fontFamily="sans-serif"
-            android:maxLines="4"
             android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : String.format(@string/chapter_prerequisite, viewModel.index, viewModel.previousChapterTitle)}"
             android:textColor="@color/oppiaPrimaryText"
             android:textSize="16sp"

From f5a66308dc21f1e16ac12a431b02faae8a22aa76 Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Tue, 8 Dec 2020 09:05:33 -0800
Subject: [PATCH 06/18] Fix part of #2132

---
 .idea/codeStyles/Project.xml | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 90d529e969d..a28de83b82b 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,22 +5,7 @@
       <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 +162,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
\ No newline at end of file
+</component>

From e5ce031683641117f29b156f78984fcb86394fb6 Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Tue, 8 Dec 2020 09:07:20 -0800
Subject: [PATCH 07/18] Fix part of #2132

---
 .idea/codeStyles/Project.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index a28de83b82b..66d46e74f0c 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,7 +5,6 @@
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
-
       <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" />

From 981cf409f8387955dec4965539f34fa790866411 Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Thu, 10 Dec 2020 14:54:59 -0800
Subject: [PATCH 08/18] Pass a ChapterSummary object as a prerequisite to
 unlock this chapter. Remove blurring thumbnails of inactive cards - this
 change will be done separately.

---
 .../java/org/oppia/android/app/story/StoryViewModel.kt   | 1 -
 .../storyitemviewmodel/StoryChapterSummaryViewModel.kt   | 2 +-
 app/src/main/res/layout-land/story_chapter_view.xml      | 2 +-
 app/src/main/res/layout-sw600dp/story_chapter_view.xml   | 3 +--
 app/src/main/res/layout/story_chapter_view.xml           | 3 +--
 app/src/main/res/values/strings.xml                      | 2 +-
 .../org/oppia/android/domain/topic/TopicController.kt    | 9 +++------
 model/src/main/proto/topic.proto                         | 3 +++
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt b/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt
index a74b5577d28..ceaa700bf09 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt
@@ -109,7 +109,6 @@ class StoryViewModel @Inject constructor(
           topicId,
           storyId,
           chapter,
-          if (index > 0) chapterList.get(index - 1).name else "",
           entityType
         )
       }
diff --git a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
index 143269820ce..a2b0fdf45de 100644
--- a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
@@ -22,13 +22,13 @@ class StoryChapterSummaryViewModel(
   val topicId: String,
   val storyId: String,
   val chapterSummary: ChapterSummary,
-  val previousChapterTitle: String,
   val entityType: String
 ) : StoryItemViewModel() {
   val explorationId: String = chapterSummary.explorationId
   val name: String = chapterSummary.name
   val summary: String = chapterSummary.summary
   val chapterThumbnail: LessonThumbnail = chapterSummary.chapterThumbnail
+  val prerequisiteChapter: ChapterSummary = chapterSummary.prerequisiteChapter
 
   fun onExplorationClicked() {
     explorationDataController.stopPlayingExploration()
diff --git a/app/src/main/res/layout-land/story_chapter_view.xml b/app/src/main/res/layout-land/story_chapter_view.xml
index 4e873a8615f..61f547f7c82 100644
--- a/app/src/main/res/layout-land/story_chapter_view.xml
+++ b/app/src/main/res/layout-land/story_chapter_view.xml
@@ -77,7 +77,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
             android:fontFamily="sans-serif"
-            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : String.format(@string/chapter_prerequisite, viewModel.index, viewModel.previousChapterTitle)}"
+            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : @string/chapter_prerequisite_title_label(viewModel.index, viewModel.prerequisiteChapter.name)}"
             android:textColor="@color/oppiaPrimaryText"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/story_chapter_view.xml b/app/src/main/res/layout-sw600dp/story_chapter_view.xml
index 133ccf23bcb..664241204f5 100644
--- a/app/src/main/res/layout-sw600dp/story_chapter_view.xml
+++ b/app/src/main/res/layout-sw600dp/story_chapter_view.xml
@@ -44,7 +44,6 @@
           android:id="@+id/chapter_thumbnail"
           android:layout_width="match_parent"
           android:layout_height="0dp"
-          android:alpha="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? 1.0f : 0.3f}"
           android:scaleType="centerInside"
           app:entityId="@{viewModel.storyId}"
           app:entityType="@{viewModel.entityType}"
@@ -91,7 +90,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
             android:fontFamily="sans-serif"
-            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : String.format(@string/chapter_prerequisite, viewModel.index, viewModel.previousChapterTitle)}"
+            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : @string/chapter_prerequisite_title_label(viewModel.index, viewModel.prerequisiteChapter.name)}"
             android:textColor="@color/oppiaPrimaryText"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/story_chapter_view.xml b/app/src/main/res/layout/story_chapter_view.xml
index 133ccf23bcb..664241204f5 100644
--- a/app/src/main/res/layout/story_chapter_view.xml
+++ b/app/src/main/res/layout/story_chapter_view.xml
@@ -44,7 +44,6 @@
           android:id="@+id/chapter_thumbnail"
           android:layout_width="match_parent"
           android:layout_height="0dp"
-          android:alpha="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? 1.0f : 0.3f}"
           android:scaleType="centerInside"
           app:entityId="@{viewModel.storyId}"
           app:entityType="@{viewModel.entityType}"
@@ -91,7 +90,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
             android:fontFamily="sans-serif"
-            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : String.format(@string/chapter_prerequisite, viewModel.index, viewModel.previousChapterTitle)}"
+            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : @string/chapter_prerequisite_title_label(viewModel.index, viewModel.prerequisiteChapter.name)}"
             android:textColor="@color/oppiaPrimaryText"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e581e5fad93..812ef57f772 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -63,7 +63,7 @@
   <string name="topic_play_chapter_index">%s.</string>
   <string name="chapter_name">Chapter %s: %s</string>
   <string name="chapter_completed">Chapter %s: %s is completed.</string>
-  <string name="chapter_prerequisite">Complete Chapter <b>%s: %s</b> to unlock this chapter.</string>
+  <string name="chapter_prerequisite_title_label">Complete <b>Chapter %s: %s</b> to unlock this chapter.</string>
   <string name="text_input_default_content_description">Enter text.</string>
   <string name="fractions_default_hint_text">Enter a fraction in the form x/x, or a mixed number in the form x x/x.</string>
   <string name="fractions_default_hint_text_no_integer">Enter a fraction in the form x/x.</string>
diff --git a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
index 96f3e27b930..7c416939e18 100755
--- a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
@@ -333,24 +333,21 @@ class TopicController @Inject constructor(
     if (storyProgress.chapterProgressMap.isNotEmpty()) {
       val storyBuilder = storySummary.toBuilder()
       storySummary.chapterList.forEachIndexed { chapterIndex, chapterSummary ->
+        val chapterBuilder = chapterSummary.toBuilder()
         if (storyProgress.chapterProgressMap.containsKey(chapterSummary.explorationId)) {
-          val chapterBuilder = chapterSummary.toBuilder()
           chapterBuilder.chapterPlayState =
             storyProgress.chapterProgressMap[chapterSummary.explorationId]!!.chapterPlayState
-          storyBuilder.setChapter(chapterIndex, chapterBuilder)
         } else {
           if (storyBuilder.getChapter(chapterIndex - 1).chapterPlayState ==
             ChapterPlayState.COMPLETED
           ) {
-            val chapterBuilder = chapterSummary.toBuilder()
             chapterBuilder.chapterPlayState = ChapterPlayState.NOT_STARTED
-            storyBuilder.setChapter(chapterIndex, chapterBuilder)
           } else {
-            val chapterBuilder = chapterSummary.toBuilder()
             chapterBuilder.chapterPlayState = ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES
-            storyBuilder.setChapter(chapterIndex, chapterBuilder)
+            chapterBuilder.prerequisiteChapter = storyBuilder.getChapter(chapterIndex - 1)
           }
         }
+        storyBuilder.setChapter(chapterIndex, chapterBuilder)
       }
       return storyBuilder.build()
     } else {
diff --git a/model/src/main/proto/topic.proto b/model/src/main/proto/topic.proto
index 8e68f41dad5..d55131acced 100755
--- a/model/src/main/proto/topic.proto
+++ b/model/src/main/proto/topic.proto
@@ -88,6 +88,9 @@ message ChapterSummary {
 
   // The thumbnail corresponding to this chapter.
   LessonThumbnail chapter_thumbnail = 5;
+
+  // Prerequisite chapter to unlock this chapter.
+  ChapterSummary prerequisite_chapter = 6;
 }
 
 // A summary of a skill that can be trained or reviewed by the player.

From a922b8646a08fb593b57a9d12678d3e2934d279f Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Sat, 12 Dec 2020 23:04:51 -0800
Subject: [PATCH 09/18] Added tests.

---
 .../storyitemviewmodel/StoryChapterSummaryViewModel.kt   | 2 +-
 app/src/main/res/layout-land/story_chapter_view.xml      | 2 +-
 app/src/main/res/layout-sw600dp/story_chapter_view.xml   | 2 +-
 app/src/main/res/layout/story_chapter_view.xml           | 2 +-
 app/src/main/res/values/strings.xml                      | 2 +-
 .../org/oppia/android/domain/topic/TopicController.kt    | 7 +++----
 .../oppia/android/domain/topic/TopicControllerTest.kt    | 9 +++++++++
 model/src/main/proto/topic.proto                         | 4 ++--
 8 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
index a2b0fdf45de..01102414a78 100644
--- a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
@@ -28,7 +28,7 @@ class StoryChapterSummaryViewModel(
   val name: String = chapterSummary.name
   val summary: String = chapterSummary.summary
   val chapterThumbnail: LessonThumbnail = chapterSummary.chapterThumbnail
-  val prerequisiteChapter: ChapterSummary = chapterSummary.prerequisiteChapter
+  val missingPrerequisiteChapter: ChapterSummary = chapterSummary.missingPrerequisiteChapter
 
   fun onExplorationClicked() {
     explorationDataController.stopPlayingExploration()
diff --git a/app/src/main/res/layout-land/story_chapter_view.xml b/app/src/main/res/layout-land/story_chapter_view.xml
index 61f547f7c82..cdc69ad5890 100644
--- a/app/src/main/res/layout-land/story_chapter_view.xml
+++ b/app/src/main/res/layout-land/story_chapter_view.xml
@@ -77,7 +77,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
             android:fontFamily="sans-serif"
-            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : @string/chapter_prerequisite_title_label(viewModel.index, viewModel.prerequisiteChapter.name)}"
+            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : @string/chapter_prerequisite_title_label(viewModel.index, viewModel.missingPrerequisiteChapter.name)}"
             android:textColor="@color/oppiaPrimaryText"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/story_chapter_view.xml b/app/src/main/res/layout-sw600dp/story_chapter_view.xml
index 664241204f5..b9a745500f0 100644
--- a/app/src/main/res/layout-sw600dp/story_chapter_view.xml
+++ b/app/src/main/res/layout-sw600dp/story_chapter_view.xml
@@ -90,7 +90,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
             android:fontFamily="sans-serif"
-            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : @string/chapter_prerequisite_title_label(viewModel.index, viewModel.prerequisiteChapter.name)}"
+            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : @string/chapter_prerequisite_title_label(viewModel.index, viewModel.missingPrerequisiteChapter.name)}"
             android:textColor="@color/oppiaPrimaryText"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/story_chapter_view.xml b/app/src/main/res/layout/story_chapter_view.xml
index 664241204f5..b9a745500f0 100644
--- a/app/src/main/res/layout/story_chapter_view.xml
+++ b/app/src/main/res/layout/story_chapter_view.xml
@@ -90,7 +90,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
             android:fontFamily="sans-serif"
-            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : @string/chapter_prerequisite_title_label(viewModel.index, viewModel.prerequisiteChapter.name)}"
+            android:text="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? htmlContent : @string/chapter_prerequisite_title_label(viewModel.index, viewModel.missingPrerequisiteChapter.name)}"
             android:textColor="@color/oppiaPrimaryText"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 812ef57f772..465ff3ed0f4 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -63,7 +63,7 @@
   <string name="topic_play_chapter_index">%s.</string>
   <string name="chapter_name">Chapter %s: %s</string>
   <string name="chapter_completed">Chapter %s: %s is completed.</string>
-  <string name="chapter_prerequisite_title_label">Complete <b>Chapter %s: %s</b> to unlock this chapter.</string>
+  <string name="chapter_prerequisite_title_label">Complete Chapter %s: %s to unlock this chapter.</string>
   <string name="text_input_default_content_description">Enter text.</string>
   <string name="fractions_default_hint_text">Enter a fraction in the form x/x, or a mixed number in the form x x/x.</string>
   <string name="fractions_default_hint_text_no_integer">Enter a fraction in the form x/x.</string>
diff --git a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
index 7c416939e18..ff54cfff7b1 100755
--- a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
@@ -338,13 +338,12 @@ class TopicController @Inject constructor(
           chapterBuilder.chapterPlayState =
             storyProgress.chapterProgressMap[chapterSummary.explorationId]!!.chapterPlayState
         } else {
-          if (storyBuilder.getChapter(chapterIndex - 1).chapterPlayState ==
-            ChapterPlayState.COMPLETED
-          ) {
+          val prerequisiteChapter = storyBuilder.getChapter(chapterIndex - 1)
+          if (prerequisiteChapter.chapterPlayState == ChapterPlayState.COMPLETED) {
             chapterBuilder.chapterPlayState = ChapterPlayState.NOT_STARTED
           } else {
             chapterBuilder.chapterPlayState = ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES
-            chapterBuilder.prerequisiteChapter = storyBuilder.getChapter(chapterIndex - 1)
+            chapterBuilder.missingPrerequisiteChapter = prerequisiteChapter
           }
         }
         storyBuilder.setChapter(chapterIndex, chapterBuilder)
diff --git a/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt
index ff319aa5406..cea5f9aea30 100755
--- a/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt
@@ -422,10 +422,15 @@ class TopicControllerTest {
     val story = storySummaryResultCaptor.value!!.getOrThrow()
     assertThat(story.getChapter(0).chapterPlayState)
       .isEqualTo(ChapterPlayState.NOT_STARTED)
+    assertThat(story.getChapter(0).missingPrerequisiteChapter).isNull()
     assertThat(story.getChapter(1).chapterPlayState)
       .isEqualTo(ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES)
+    assertThat(story.getChapter(1).missingPrerequisiteChapter)
+      .isEqualTo(story.getChapter(0))
     assertThat(story.getChapter(2).chapterPlayState)
       .isEqualTo(ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES)
+    assertThat(story.getChapter(2).missingPrerequisiteChapter)
+      .isEqualTo(story.getChapter(1))
   }
 
   @Test
@@ -884,6 +889,8 @@ class TopicControllerTest {
       .isEqualTo(ChapterPlayState.NOT_STARTED)
     assertThat(topic.storyList[0].chapterList[1].chapterPlayState)
       .isEqualTo(ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES)
+    assertThat(topic.storyList[0].chapterList[1].missingPrerequisiteChapter)
+      .isEqualTo(topic.storyList[0].chapterList[0])
   }
 
   @Test
@@ -927,6 +934,8 @@ class TopicControllerTest {
       .isEqualTo(ChapterPlayState.NOT_STARTED)
     assertThat(storySummary.chapterList[1].chapterPlayState)
       .isEqualTo(ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES)
+    assertThat(storySummary.chapterList[1].missingPrerequisiteChapter)
+      .isEqualTo(storySummary.chapterList[0])
   }
 
   @Test
diff --git a/model/src/main/proto/topic.proto b/model/src/main/proto/topic.proto
index d55131acced..ca389501cf3 100755
--- a/model/src/main/proto/topic.proto
+++ b/model/src/main/proto/topic.proto
@@ -89,8 +89,8 @@ message ChapterSummary {
   // The thumbnail corresponding to this chapter.
   LessonThumbnail chapter_thumbnail = 5;
 
-  // Prerequisite chapter to unlock this chapter.
-  ChapterSummary prerequisite_chapter = 6;
+  // Prerequisite chapter to unlock this chapter. It is only defined when the play state of this chapter is NOT_PLAYABLE_MISSING_PREREQUISITES.
+  ChapterSummary missing_prerequisite_chapter = 6;
 }
 
 // A summary of a skill that can be trained or reviewed by the player.

From 10748d22f16533bb1416bb175e21a133b6e99f22 Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Sun, 13 Dec 2020 00:07:38 -0800
Subject: [PATCH 10/18] Added tests.

---
 .../android/domain/topic/TopicControllerTest.kt | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt
index cea5f9aea30..973f69d47b9 100755
--- a/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt
@@ -422,15 +422,14 @@ class TopicControllerTest {
     val story = storySummaryResultCaptor.value!!.getOrThrow()
     assertThat(story.getChapter(0).chapterPlayState)
       .isEqualTo(ChapterPlayState.NOT_STARTED)
-    assertThat(story.getChapter(0).missingPrerequisiteChapter).isNull()
     assertThat(story.getChapter(1).chapterPlayState)
       .isEqualTo(ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES)
-    assertThat(story.getChapter(1).missingPrerequisiteChapter)
-      .isEqualTo(story.getChapter(0))
+    assertThat(story.getChapter(1).missingPrerequisiteChapter.name)
+      .isEqualTo(story.getChapter(0).name)
     assertThat(story.getChapter(2).chapterPlayState)
       .isEqualTo(ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES)
-    assertThat(story.getChapter(2).missingPrerequisiteChapter)
-      .isEqualTo(story.getChapter(1))
+    assertThat(story.getChapter(2).missingPrerequisiteChapter.name)
+      .isEqualTo(story.getChapter(1).name)
   }
 
   @Test
@@ -889,8 +888,8 @@ class TopicControllerTest {
       .isEqualTo(ChapterPlayState.NOT_STARTED)
     assertThat(topic.storyList[0].chapterList[1].chapterPlayState)
       .isEqualTo(ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES)
-    assertThat(topic.storyList[0].chapterList[1].missingPrerequisiteChapter)
-      .isEqualTo(topic.storyList[0].chapterList[0])
+    assertThat(topic.storyList[0].chapterList[1].missingPrerequisiteChapter.name)
+      .isEqualTo(topic.storyList[0].chapterList[0].name)
   }
 
   @Test
@@ -934,8 +933,8 @@ class TopicControllerTest {
       .isEqualTo(ChapterPlayState.NOT_STARTED)
     assertThat(storySummary.chapterList[1].chapterPlayState)
       .isEqualTo(ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES)
-    assertThat(storySummary.chapterList[1].missingPrerequisiteChapter)
-      .isEqualTo(storySummary.chapterList[0])
+    assertThat(storySummary.chapterList[1].missingPrerequisiteChapter.name)
+      .isEqualTo(storySummary.chapterList[0].name)
   }
 
   @Test

From b6146eeddc221570f83ec41109bc6cdf7eeefd9d Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Sun, 13 Dec 2020 09:59:59 -0800
Subject: [PATCH 11/18] Set missingPrerequisiteChapter in
 setFirstChapterAsNotStarted function.

---
 .../java/org/oppia/android/domain/topic/TopicController.kt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
index ff54cfff7b1..d32cdfdb74d 100755
--- a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
@@ -382,10 +382,11 @@ class TopicController @Inject constructor(
       val storyBuilder = storySummary.toBuilder()
       storySummary.chapterList.forEachIndexed { index, chapterSummary ->
         val chapterBuilder = chapterSummary.toBuilder()
-        chapterBuilder.chapterPlayState = if (index != 0) {
-          ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES
+        if (index != 0) {
+          chapterBuilder.chapterPlayState = ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES
+          chapterBuilder.missingPrerequisiteChapter = storySummary.chapterList.get(index - 1)
         } else {
-          ChapterPlayState.NOT_STARTED
+          chapterBuilder.chapterPlayState = ChapterPlayState.NOT_STARTED
         }
         storyBuilder.setChapter(index, chapterBuilder)
       }

From 5fbfd27bc33221f46c657d65b141a4990d9c9afe Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Mon, 14 Dec 2020 20:14:11 -0800
Subject: [PATCH 12/18] Add a UI-facing test.

---
 .../android/app/story/StoryFragmentTest.kt    | 47 +++++++++++++++++--
 model/src/main/proto/topic.proto              |  3 +-
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
index 30b85129ac8..ab0e10c190d 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
@@ -117,10 +117,6 @@ class StoryFragmentTest {
     profileTestHelper.initializeProfiles()
     FirebaseApp.initializeApp(context)
     profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
-    storyProgressTestHelper.markPartialStoryProgressForFractions(
-      profileId,
-      timestampOlderThanAWeek = false
-    )
     testCoroutineDispatchers.runCurrent()
   }
 
@@ -159,6 +155,10 @@ class StoryFragmentTest {
   @Test
   fun testStoryFragment_correctStoryCountLoadedInHeader() {
     launch<StoryActivity>(createStoryActivityIntent()).use {
+      storyProgressTestHelper.markPartialStoryProgressForFractions(
+        profileId,
+        timestampOlderThanAWeek = false
+      )
       testCoroutineDispatchers.runCurrent()
       val headerString: String =
         getResources().getQuantityString(R.plurals.story_total_chapters, 2, 1, 2)
@@ -242,6 +242,41 @@ class StoryFragmentTest {
     }
   }
 
+  @Test
+  fun testStoryFragment_changeConfiguration_chapterMissingPrerequisiteIsShownCorrectly() {
+    launch<StoryActivity>(createStoryActivityIntent()).use {
+      testCoroutineDispatchers.runCurrent()
+      onView(isRoot()).perform(orientationLandscape())
+      onView(allOf(withId(R.id.story_chapter_list))).perform(
+        scrollToPosition<RecyclerView.ViewHolder>(
+          2
+        )
+      )
+      onView(atPositionOnView(R.id.story_chapter_list, 2, R.id.chapter_summary)).check(
+        matches(
+          withText("Complete Chapter 1: What is a Fraction? to unlock this chapter.")
+        )
+      )
+    }
+  }
+
+  @Test
+  fun testStoryFragment_chapterMissingPrerequisiteIsShownCorrectly() {
+    launch<StoryActivity>(createStoryActivityIntent()).use {
+      testCoroutineDispatchers.runCurrent()
+      onView(allOf(withId(R.id.story_chapter_list))).perform(
+        scrollToPosition<RecyclerView.ViewHolder>(
+          2
+        )
+      )
+      onView(atPositionOnView(R.id.story_chapter_list, 2, R.id.chapter_summary)).check(
+        matches(
+          withText("Complete Chapter 1: What is a Fraction? to unlock this chapter.")
+        )
+      )
+    }
+  }
+
   @Test
   fun testStoryFragment_changeConfiguration_explorationStartCorrectly() {
     launch<StoryActivity>(createStoryActivityIntent()).use {
@@ -263,6 +298,10 @@ class StoryFragmentTest {
   @Test
   fun testStoryFragment_changeConfiguration_correctStoryCountInHeader() {
     launch<StoryActivity>(createStoryActivityIntent()).use {
+      storyProgressTestHelper.markPartialStoryProgressForFractions(
+        profileId,
+        timestampOlderThanAWeek = false
+      )
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       val headerString: String =
diff --git a/model/src/main/proto/topic.proto b/model/src/main/proto/topic.proto
index ca389501cf3..3772b14218c 100755
--- a/model/src/main/proto/topic.proto
+++ b/model/src/main/proto/topic.proto
@@ -89,7 +89,8 @@ message ChapterSummary {
   // The thumbnail corresponding to this chapter.
   LessonThumbnail chapter_thumbnail = 5;
 
-  // Prerequisite chapter to unlock this chapter. It is only defined when the play state of this chapter is NOT_PLAYABLE_MISSING_PREREQUISITES.
+  // Prerequisite chapter to unlock this chapter. It is only defined when the play state of this
+  // chapter is NOT_PLAYABLE_MISSING_PREREQUISITES.
   ChapterSummary missing_prerequisite_chapter = 6;
 }
 

From 8ebc0b940b25aaa3d0abf84ecae6b9a9996d10e8 Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Tue, 15 Dec 2020 16:33:08 -0800
Subject: [PATCH 13/18] Add more test coverage for a completed chapter.

---
 .../domain/topic/TopicControllerTest.kt       | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt
index 973f69d47b9..3094d5cdd86 100755
--- a/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt
@@ -413,7 +413,7 @@ class TopicControllerTest {
   }
 
   @Test
-  fun testRetrieveStory_validSecondStory_returnsStoryWithProgress() {
+  fun testRetrieveStory_validSecondStory_returnsStoryWithoutProgress() {
     topicController.getStory(profileId1, TEST_TOPIC_ID_0, TEST_STORY_ID_1).toLiveData()
       .observeForever(mockStorySummaryObserver)
     testCoroutineDispatchers.runCurrent()
@@ -432,6 +432,25 @@ class TopicControllerTest {
       .isEqualTo(story.getChapter(1).name)
   }
 
+  @Test
+  fun testRetrieveStory_validSecondStory_returnsStoryWithProgress() {
+    topicController.getStory(profileId1, TEST_TOPIC_ID_0, TEST_STORY_ID_1).toLiveData()
+      .observeForever(mockStorySummaryObserver)
+    markSecondStory1Chapter1AsCompleted()
+    testCoroutineDispatchers.runCurrent()
+
+    verifyGetStorySucceeded()
+    val story = storySummaryResultCaptor.value!!.getOrThrow()
+    assertThat(story.getChapter(0).chapterPlayState)
+      .isEqualTo(ChapterPlayState.COMPLETED)
+    assertThat(story.getChapter(1).chapterPlayState)
+      .isEqualTo(ChapterPlayState.NOT_STARTED)
+    assertThat(story.getChapter(2).chapterPlayState)
+      .isEqualTo(ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES)
+    assertThat(story.getChapter(2).missingPrerequisiteChapter.name)
+      .isEqualTo(story.getChapter(1).name)
+  }
+
   @Test
   fun testRetrieveStory_invalidStory_returnsFailure() {
     topicController.getStory(profileId1, INVALID_TOPIC_ID_1, INVALID_STORY_ID_1).toLiveData()
@@ -1170,6 +1189,16 @@ class TopicControllerTest {
     ).toLiveData().observeForever(mockRecordProgressObserver)
   }
 
+  private fun markSecondStory1Chapter1AsCompleted() {
+    storyProgressController.recordCompletedChapter(
+      profileId1,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_1,
+      TEST_EXPLORATION_ID_1,
+      currentTimestamp
+    ).toLiveData().observeForever(mockRecordProgressObserver)
+  }
+
   private fun markRatiosStory0Chapter0AsCompleted() {
     storyProgressController.recordCompletedChapter(
       profileId1,

From 51e84b05fa6a8ed3d25456bdfaddfcd8b55fa487 Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Tue, 15 Dec 2020 17:49:13 -0800
Subject: [PATCH 14/18] Move landscape test below the portrait one.

---
 .../java/org/oppia/android/app/story/StoryFragmentTest.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
index ab0e10c190d..142e37ae7f1 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
@@ -243,10 +243,9 @@ class StoryFragmentTest {
   }
 
   @Test
-  fun testStoryFragment_changeConfiguration_chapterMissingPrerequisiteIsShownCorrectly() {
+  fun testStoryFragment_chapterMissingPrerequisiteIsShownCorrectly() {
     launch<StoryActivity>(createStoryActivityIntent()).use {
       testCoroutineDispatchers.runCurrent()
-      onView(isRoot()).perform(orientationLandscape())
       onView(allOf(withId(R.id.story_chapter_list))).perform(
         scrollToPosition<RecyclerView.ViewHolder>(
           2
@@ -261,9 +260,10 @@ class StoryFragmentTest {
   }
 
   @Test
-  fun testStoryFragment_chapterMissingPrerequisiteIsShownCorrectly() {
+  fun testStoryFragment_changeConfiguration_chapterMissingPrerequisiteIsShownCorrectly() {
     launch<StoryActivity>(createStoryActivityIntent()).use {
       testCoroutineDispatchers.runCurrent()
+      onView(isRoot()).perform(orientationLandscape())
       onView(allOf(withId(R.id.story_chapter_list))).perform(
         scrollToPosition<RecyclerView.ViewHolder>(
           2

From 87ad1de494183a3a009cfdd684d79dbac3d0e949 Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Tue, 15 Dec 2020 23:14:48 -0800
Subject: [PATCH 15/18] Added long summary test + reformatting.

---
 .../android/app/story/StoryFragmentTest.kt    | 123 ++++++++++++++++--
 domain/src/main/assets/test_story_id_1.json   |   2 +-
 2 files changed, 111 insertions(+), 14 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
index 142e37ae7f1..1c4b2374394 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
@@ -63,6 +63,8 @@ import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfiguration
 import org.oppia.android.domain.question.QuestionModule
 import org.oppia.android.domain.topic.FRACTIONS_STORY_ID_0
 import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID
+import org.oppia.android.domain.topic.TEST_STORY_ID_1
+import org.oppia.android.domain.topic.TEST_TOPIC_ID_1
 import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule
 import org.oppia.android.domain.topic.StoryProgressTestHelper
 import org.oppia.android.testing.TestAccessibilityModule
@@ -135,6 +137,22 @@ class StoryFragmentTest {
     )
   }
 
+  private fun createTestStoryActivityIntent(): Intent {
+    return StoryActivity.createStoryActivityIntent(
+      ApplicationProvider.getApplicationContext(),
+      internalProfileId,
+      TEST_TOPIC_ID_1,
+      TEST_STORY_ID_1
+    )
+  }
+
+  private fun setStoryPartialProgressForFractions() {
+    storyProgressTestHelper.markPartialStoryProgressForFractions(
+      profileId,
+      timestampOlderThanAWeek = false
+    )
+  }
+
   @Test
   fun testStoryFragment_clickOnToolbarNavigationButton_closeActivity() {
     activityTestRule.launchActivity(createStoryActivityIntent())
@@ -154,11 +172,8 @@ class StoryFragmentTest {
 
   @Test
   fun testStoryFragment_correctStoryCountLoadedInHeader() {
+    setStoryPartialProgressForFractions()
     launch<StoryActivity>(createStoryActivityIntent()).use {
-      storyProgressTestHelper.markPartialStoryProgressForFractions(
-        profileId,
-        timestampOlderThanAWeek = false
-      )
       testCoroutineDispatchers.runCurrent()
       val headerString: String =
         getResources().getQuantityString(R.plurals.story_total_chapters, 2, 1, 2)
@@ -199,7 +214,13 @@ class StoryFragmentTest {
           1
         )
       )
-      onView(atPositionOnView(R.id.story_chapter_list, 1, R.id.chapter_title)).check(
+      onView(
+        atPositionOnView(
+          R.id.story_chapter_list,
+          1,
+          R.id.chapter_title
+        )
+      ).check(
         matches(
           withText("Chapter 1: What is a Fraction?")
         )
@@ -216,7 +237,13 @@ class StoryFragmentTest {
           1
         )
       )
-      onView(atPositionOnView(R.id.story_chapter_list, 1, R.id.chapter_summary)).check(
+      onView(
+        atPositionOnView(
+          R.id.story_chapter_list,
+          1,
+          R.id.chapter_summary
+        )
+      ).check(
         matches(
           withText("This is outline/summary for What is a Fraction?")
         )
@@ -234,7 +261,13 @@ class StoryFragmentTest {
           1
         )
       )
-      onView(atPositionOnView(R.id.story_chapter_list, 1, R.id.chapter_summary)).check(
+      onView(
+        atPositionOnView(
+          R.id.story_chapter_list,
+          1,
+          R.id.chapter_summary
+        )
+      ).check(
         matches(
           withText("This is outline/summary for What is a Fraction?")
         )
@@ -242,6 +275,61 @@ class StoryFragmentTest {
     }
   }
 
+  @Test
+  fun testStoryFragment_chapterLongSummaryIsShownCorrectly() {
+    launch<StoryActivity>(createTestStoryActivityIntent()).use {
+      testCoroutineDispatchers.runCurrent()
+      onView(allOf(withId(R.id.story_chapter_list))).perform(
+        scrollToPosition<RecyclerView.ViewHolder>(
+          1
+        )
+      )
+      onView(
+        atPositionOnView(
+          R.id.story_chapter_list,
+          1,
+          R.id.chapter_summary
+        )
+      ).check(
+        matches(
+          withText(
+            "This is outline/summary for Second Exploration. It is very long but " +
+              "it has to be fully visible. You wil be learning about oppia app in Second Story. " +
+              "Learn about oppia app via testing in second exploration."
+          )
+        )
+      )
+    }
+  }
+
+  @Test
+  fun testStoryFragment_changeConfiguration_chapterLongSummaryIsShownCorrectly() {
+    launch<StoryActivity>(createTestStoryActivityIntent()).use {
+      testCoroutineDispatchers.runCurrent()
+      onView(isRoot()).perform(orientationLandscape())
+      onView(allOf(withId(R.id.story_chapter_list))).perform(
+        scrollToPosition<RecyclerView.ViewHolder>(
+          1
+        )
+      )
+      onView(
+        atPositionOnView(
+          R.id.story_chapter_list,
+          1,
+          R.id.chapter_summary
+        )
+      ).check(
+        matches(
+          withText(
+            "This is outline/summary for Second Exploration. It is very long but " +
+              "it has to be fully visible. You wil be learning about oppia app in Second Story. " +
+              "Learn about oppia app via testing in second exploration."
+          )
+        )
+      )
+    }
+  }
+
   @Test
   fun testStoryFragment_chapterMissingPrerequisiteIsShownCorrectly() {
     launch<StoryActivity>(createStoryActivityIntent()).use {
@@ -251,7 +339,13 @@ class StoryFragmentTest {
           2
         )
       )
-      onView(atPositionOnView(R.id.story_chapter_list, 2, R.id.chapter_summary)).check(
+      onView(
+        atPositionOnView(
+          R.id.story_chapter_list,
+          2,
+          R.id.chapter_summary
+        )
+      ).check(
         matches(
           withText("Complete Chapter 1: What is a Fraction? to unlock this chapter.")
         )
@@ -269,7 +363,13 @@ class StoryFragmentTest {
           2
         )
       )
-      onView(atPositionOnView(R.id.story_chapter_list, 2, R.id.chapter_summary)).check(
+      onView(
+        atPositionOnView(
+          R.id.story_chapter_list,
+          2,
+          R.id.chapter_summary
+        )
+      ).check(
         matches(
           withText("Complete Chapter 1: What is a Fraction? to unlock this chapter.")
         )
@@ -297,11 +397,8 @@ class StoryFragmentTest {
 
   @Test
   fun testStoryFragment_changeConfiguration_correctStoryCountInHeader() {
+    setStoryPartialProgressForFractions()
     launch<StoryActivity>(createStoryActivityIntent()).use {
-      storyProgressTestHelper.markPartialStoryProgressForFractions(
-        profileId,
-        timestampOlderThanAWeek = false
-      )
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       val headerString: String =
diff --git a/domain/src/main/assets/test_story_id_1.json b/domain/src/main/assets/test_story_id_1.json
index 932959cbf15..e7d46e4615f 100644
--- a/domain/src/main/assets/test_story_id_1.json
+++ b/domain/src/main/assets/test_story_id_1.json
@@ -19,7 +19,7 @@
         "objective": "Learn about oppia app via testing in second exploration.",
         "id": "test_exp_id_1"
       },
-      "outline": "",
+      "outline": "This is  outline/summary for Second Exploration. It is very long but it has to be fully visible. You wil be learning about oppia app in Second Story. Learn about oppia app via testing in second exploration.",
       "title": "Second Exploration",
       "acquired_skill_ids": []
     },

From 91f3c26f060ea03530163d0f8e424c8341586039 Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Wed, 16 Dec 2020 08:25:47 -0800
Subject: [PATCH 16/18] Formatting.

---
 .../android/app/story/StoryFragmentTest.kt    | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
index 1c4b2374394..8e519fefc71 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
@@ -24,6 +24,8 @@ import androidx.test.rule.ActivityTestRule
 import com.google.common.truth.Truth.assertThat
 import com.google.firebase.FirebaseApp
 import dagger.Component
+import javax.inject.Inject
+import javax.inject.Singleton
 import org.hamcrest.CoreMatchers.allOf
 import org.junit.After
 import org.junit.Before
@@ -81,8 +83,6 @@ import org.oppia.android.util.parser.HtmlParserEntityTypeModule
 import org.oppia.android.util.parser.ImageParsingModule
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
-import javax.inject.Inject
-import javax.inject.Singleton
 
 /** Tests for [StoryFragment]. */
 @RunWith(AndroidJUnit4::class)
@@ -128,31 +128,6 @@ class StoryFragmentTest {
     Intents.release()
   }
 
-  private fun createStoryActivityIntent(): Intent {
-    return StoryActivity.createStoryActivityIntent(
-      ApplicationProvider.getApplicationContext(),
-      internalProfileId,
-      FRACTIONS_TOPIC_ID,
-      FRACTIONS_STORY_ID_0
-    )
-  }
-
-  private fun createTestStoryActivityIntent(): Intent {
-    return StoryActivity.createStoryActivityIntent(
-      ApplicationProvider.getApplicationContext(),
-      internalProfileId,
-      TEST_TOPIC_ID_1,
-      TEST_STORY_ID_1
-    )
-  }
-
-  private fun setStoryPartialProgressForFractions() {
-    storyProgressTestHelper.markPartialStoryProgressForFractions(
-      profileId,
-      timestampOlderThanAWeek = false
-    )
-  }
-
   @Test
   fun testStoryFragment_clickOnToolbarNavigationButton_closeActivity() {
     activityTestRule.launchActivity(createStoryActivityIntent())
@@ -427,6 +402,31 @@ class StoryFragmentTest {
     }
   }
 
+  private fun createStoryActivityIntent(): Intent {
+    return StoryActivity.createStoryActivityIntent(
+      ApplicationProvider.getApplicationContext(),
+      internalProfileId,
+      FRACTIONS_TOPIC_ID,
+      FRACTIONS_STORY_ID_0
+    )
+  }
+
+  private fun createTestStoryActivityIntent(): Intent {
+    return StoryActivity.createStoryActivityIntent(
+      ApplicationProvider.getApplicationContext(),
+      internalProfileId,
+      TEST_TOPIC_ID_1,
+      TEST_STORY_ID_1
+    )
+  }
+
+  private fun setStoryPartialProgressForFractions() {
+    storyProgressTestHelper.markPartialStoryProgressForFractions(
+      profileId,
+      timestampOlderThanAWeek = false
+    )
+  }
+
   private fun setUpTestApplicationComponent() {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }

From fc4f9c2466386eb66617e83cd2606e68cb49f11f Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Wed, 16 Dec 2020 09:47:01 -0800
Subject: [PATCH 17/18] Lint

---
 .../java/org/oppia/android/app/story/StoryFragmentTest.kt | 8 ++++----
 .../org/oppia/android/domain/topic/TopicController.kt     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
index 8e519fefc71..8ade4a5b3bc 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
@@ -24,8 +24,6 @@ import androidx.test.rule.ActivityTestRule
 import com.google.common.truth.Truth.assertThat
 import com.google.firebase.FirebaseApp
 import dagger.Component
-import javax.inject.Inject
-import javax.inject.Singleton
 import org.hamcrest.CoreMatchers.allOf
 import org.junit.After
 import org.junit.Before
@@ -65,10 +63,10 @@ import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfiguration
 import org.oppia.android.domain.question.QuestionModule
 import org.oppia.android.domain.topic.FRACTIONS_STORY_ID_0
 import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID
-import org.oppia.android.domain.topic.TEST_STORY_ID_1
-import org.oppia.android.domain.topic.TEST_TOPIC_ID_1
 import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule
 import org.oppia.android.domain.topic.StoryProgressTestHelper
+import org.oppia.android.domain.topic.TEST_STORY_ID_1
+import org.oppia.android.domain.topic.TEST_TOPIC_ID_1
 import org.oppia.android.testing.TestAccessibilityModule
 import org.oppia.android.testing.TestCoroutineDispatchers
 import org.oppia.android.testing.TestDispatcherModule
@@ -83,6 +81,8 @@ import org.oppia.android.util.parser.HtmlParserEntityTypeModule
 import org.oppia.android.util.parser.ImageParsingModule
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
+import javax.inject.Inject
+import javax.inject.Singleton
 
 /** Tests for [StoryFragment]. */
 @RunWith(AndroidJUnit4::class)
diff --git a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
index d32cdfdb74d..c8c1d7414a0 100755
--- a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
@@ -384,7 +384,7 @@ class TopicController @Inject constructor(
         val chapterBuilder = chapterSummary.toBuilder()
         if (index != 0) {
           chapterBuilder.chapterPlayState = ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES
-          chapterBuilder.missingPrerequisiteChapter = storySummary.chapterList.get(index - 1)
+          chapterBuilder.missingPrerequisiteChapter = storySummary.chapterList[index - 1]
         } else {
           chapterBuilder.chapterPlayState = ChapterPlayState.NOT_STARTED
         }

From 98647168ea5415e1cd9e69388e67924011b22162 Mon Sep 17 00:00:00 2001
From: Viktoriia Schwartz <viktoriia@google.com>
Date: Wed, 16 Dec 2020 19:26:13 -0800
Subject: [PATCH 18/18] Renaming

---
 .../android/app/story/StoryFragmentTest.kt    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
index 8ade4a5b3bc..73eb4f08c09 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
@@ -130,7 +130,7 @@ class StoryFragmentTest {
 
   @Test
   fun testStoryFragment_clickOnToolbarNavigationButton_closeActivity() {
-    activityTestRule.launchActivity(createStoryActivityIntent())
+    activityTestRule.launchActivity(createFractionsStoryActivityIntent())
     testCoroutineDispatchers.runCurrent()
     onView(withContentDescription(R.string.go_to_previous_page)).perform(click())
     assertThat(activityTestRule.activity.isFinishing).isTrue()
@@ -138,7 +138,7 @@ class StoryFragmentTest {
 
   @Test
   fun testStoryFragment_toolbarTitle_isDisplayedSuccessfully() {
-    launch<StoryActivity>(createStoryActivityIntent()).use {
+    launch<StoryActivity>(createFractionsStoryActivityIntent()).use {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.story_toolbar_title))
         .check(matches(withText("Matthew Goes to the Bakery")))
@@ -148,7 +148,7 @@ class StoryFragmentTest {
   @Test
   fun testStoryFragment_correctStoryCountLoadedInHeader() {
     setStoryPartialProgressForFractions()
-    launch<StoryActivity>(createStoryActivityIntent()).use {
+    launch<StoryActivity>(createFractionsStoryActivityIntent()).use {
       testCoroutineDispatchers.runCurrent()
       val headerString: String =
         getResources().getQuantityString(R.plurals.story_total_chapters, 2, 1, 2)
@@ -173,7 +173,7 @@ class StoryFragmentTest {
 
   @Test
   fun testStoryFragment_correctNumberOfStoriesLoadedInRecyclerView() {
-    launch<StoryActivity>(createStoryActivityIntent()).use {
+    launch<StoryActivity>(createFractionsStoryActivityIntent()).use {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.story_chapter_list)).check(hasItemCount(3))
     }
@@ -181,7 +181,7 @@ class StoryFragmentTest {
 
   @Test
   fun testStoryFragment_changeConfiguration_textViewIsShownCorrectly() {
-    launch<StoryActivity>(createStoryActivityIntent()).use {
+    launch<StoryActivity>(createFractionsStoryActivityIntent()).use {
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       onView(allOf(withId(R.id.story_chapter_list))).perform(
@@ -205,7 +205,7 @@ class StoryFragmentTest {
 
   @Test
   fun testStoryFragment_chapterSummaryIsShownCorrectly() {
-    launch<StoryActivity>(createStoryActivityIntent()).use {
+    launch<StoryActivity>(createFractionsStoryActivityIntent()).use {
       testCoroutineDispatchers.runCurrent()
       onView(allOf(withId(R.id.story_chapter_list))).perform(
         scrollToPosition<RecyclerView.ViewHolder>(
@@ -228,7 +228,7 @@ class StoryFragmentTest {
 
   @Test
   fun testStoryFragment_changeConfiguration_chapterSummaryIsShownCorrectly() {
-    launch<StoryActivity>(createStoryActivityIntent()).use {
+    launch<StoryActivity>(createFractionsStoryActivityIntent()).use {
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       onView(allOf(withId(R.id.story_chapter_list))).perform(
@@ -307,7 +307,7 @@ class StoryFragmentTest {
 
   @Test
   fun testStoryFragment_chapterMissingPrerequisiteIsShownCorrectly() {
-    launch<StoryActivity>(createStoryActivityIntent()).use {
+    launch<StoryActivity>(createFractionsStoryActivityIntent()).use {
       testCoroutineDispatchers.runCurrent()
       onView(allOf(withId(R.id.story_chapter_list))).perform(
         scrollToPosition<RecyclerView.ViewHolder>(
@@ -330,7 +330,7 @@ class StoryFragmentTest {
 
   @Test
   fun testStoryFragment_changeConfiguration_chapterMissingPrerequisiteIsShownCorrectly() {
-    launch<StoryActivity>(createStoryActivityIntent()).use {
+    launch<StoryActivity>(createFractionsStoryActivityIntent()).use {
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       onView(allOf(withId(R.id.story_chapter_list))).perform(
@@ -354,7 +354,7 @@ class StoryFragmentTest {
 
   @Test
   fun testStoryFragment_changeConfiguration_explorationStartCorrectly() {
-    launch<StoryActivity>(createStoryActivityIntent()).use {
+    launch<StoryActivity>(createFractionsStoryActivityIntent()).use {
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       onView(allOf(withId(R.id.story_chapter_list))).perform(
@@ -373,7 +373,7 @@ class StoryFragmentTest {
   @Test
   fun testStoryFragment_changeConfiguration_correctStoryCountInHeader() {
     setStoryPartialProgressForFractions()
-    launch<StoryActivity>(createStoryActivityIntent()).use {
+    launch<StoryActivity>(createFractionsStoryActivityIntent()).use {
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       val headerString: String =
@@ -402,7 +402,7 @@ class StoryFragmentTest {
     }
   }
 
-  private fun createStoryActivityIntent(): Intent {
+  private fun createFractionsStoryActivityIntent(): Intent {
     return StoryActivity.createStoryActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,