From 0a8ab17c727fb090a3311c310266d0ad62668234 Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Sat, 7 Oct 2023 08:46:49 +0530
Subject: [PATCH 01/12] Adds audio loading ui

---
 app/src/main/res/layout/audio_fragment.xml | 14 ++++++++++++++
 app/src/main/res/values/dimens.xml         |  8 ++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/audio_fragment.xml b/app/src/main/res/layout/audio_fragment.xml
index d849e51c03c..d79367930d1 100755
--- a/app/src/main/res/layout/audio_fragment.xml
+++ b/app/src/main/res/layout/audio_fragment.xml
@@ -36,6 +36,19 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent">
 
+      <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:visibility="@{viewModel.playStatusLiveData == UiAudioPlayStatus.LOADING ? View.VISIBLE : View.GONE}"
+        app:indicatorColor="@color/component_color_shared_icon_white_color"
+        app:indicatorSize="@dimen/audio_fragment_progress_indicator_size"
+        app:trackThickness="@dimen/audio_fragment_progress_indicator_track_thickness"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/play_pause_audio_icon"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
       <ImageView
         android:id="@+id/play_pause_audio_icon"
         android:layout_width="52dp"
@@ -44,6 +57,7 @@
         android:clickable="@{viewModel.playStatusLiveData != UiAudioPlayStatus.LOADING}"
         android:contentDescription="@{viewModel.playStatusLiveData == UiAudioPlayStatus.PLAYING ? @string/audio_pause_description : @string/audio_play_description}"
         android:onClick="@{(v) -> viewModel.togglePlayPause(viewModel.playStatusLiveData)}"
+        android:visibility="@{viewModel.playStatusLiveData != UiAudioPlayStatus.LOADING ? View.VISIBLE : View.INVISIBLE}"
         android:padding="12dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4361dce5674..65e5ca43e22 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,8 +8,6 @@
   <dimen name="answer_tick_margin">12dp</dimen>
   <integer name="fade_in_duration_ms">1000</integer>
   <integer name="fade_out_duration_ms">1000</integer>
-  <dimen name="audio_fragment_corner_radius">8dp</dimen>
-  <dimen name="audio_fragment_margin">28dp</dimen>
   <dimen name="cellular_data_dialog_padding">24dp</dimen>
   <dimen name="state_previous_next_button_radius">4dp</dimen>
   <dimen name="train_checkbox_padding">18dp</dimen>
@@ -769,4 +767,10 @@
   <dimen name="resume_lesson_chapter_flexbox_margin_end">28dp</dimen>
   <dimen name="resume_lesson_chapter_flexbox_margin_top">32dp</dimen>
   <dimen name="resume_lesson_start_over_button_margin">8dp</dimen>
+
+  <!--  AudioFragment-->
+  <dimen name="audio_fragment_corner_radius">8dp</dimen>
+  <dimen name="audio_fragment_margin">28dp</dimen>
+  <dimen name="audio_fragment_progress_indicator_size">20dp</dimen>
+  <dimen name="audio_fragment_progress_indicator_track_thickness">3dp</dimen>
 </resources>

From 367562f62b25ef5561a8e30c2ad5c4ce64977e7f Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Tue, 10 Oct 2023 13:56:55 +0530
Subject: [PATCH 02/12] Updates test

---
 app/src/main/res/layout/audio_fragment.xml                      | 1 +
 .../android/app/player/exploration/ExplorationActivityTest.kt   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/audio_fragment.xml b/app/src/main/res/layout/audio_fragment.xml
index d79367930d1..92c8b5dfe1c 100755
--- a/app/src/main/res/layout/audio_fragment.xml
+++ b/app/src/main/res/layout/audio_fragment.xml
@@ -37,6 +37,7 @@
       app:layout_constraintTop_toTopOf="parent">
 
       <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/audio_loading_bar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:indeterminate="true"
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index 27c75850e7d..8a5c894b67e 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -1071,7 +1071,7 @@ class ExplorationActivityTest {
       onView(withId(R.id.action_audio_player)).perform(click())
 
       testCoroutineDispatchers.runCurrent()
-      onView(withId(R.id.play_pause_audio_icon)).check(matches(isDisplayed()))
+      onView(withId(R.id.audio_loading_bar)).check(matches(isDisplayed()))
       onView(withText(context.getString(R.string.cellular_data_alert_dialog_title)))
         .check(doesNotExist())
     }

From 73307131729a18c7e4e62f6d6a269af672b5670d Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Sun, 15 Oct 2023 16:57:37 +0530
Subject: [PATCH 03/12] Fixes progress bar id & color

---
 app/src/main/res/layout/audio_fragment.xml                    | 4 ++--
 app/src/main/res/values/component_colors.xml                  | 1 +
 .../android/app/player/exploration/ExplorationActivityTest.kt | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/audio_fragment.xml b/app/src/main/res/layout/audio_fragment.xml
index 92c8b5dfe1c..20ca0081c0e 100755
--- a/app/src/main/res/layout/audio_fragment.xml
+++ b/app/src/main/res/layout/audio_fragment.xml
@@ -37,12 +37,12 @@
       app:layout_constraintTop_toTopOf="parent">
 
       <com.google.android.material.progressindicator.CircularProgressIndicator
-        android:id="@+id/audio_loading_bar"
+        android:id="@+id/audio_fragment_voiceover_progressbar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:indeterminate="true"
         android:visibility="@{viewModel.playStatusLiveData == UiAudioPlayStatus.LOADING ? View.VISIBLE : View.GONE}"
-        app:indicatorColor="@color/component_color_shared_icon_white_color"
+        app:indicatorColor="@color/component_color_audio_fragment_voiceover_progressbar_color"
         app:indicatorSize="@dimen/audio_fragment_progress_indicator_size"
         app:trackThickness="@dimen/audio_fragment_progress_indicator_track_thickness"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
index 2ea45c834a7..e97caf1cc95 100644
--- a/app/src/main/res/values/component_colors.xml
+++ b/app/src/main/res/values/component_colors.xml
@@ -244,6 +244,7 @@
   <color name="component_color_concept_card_fragment_toolbar_color">@color/color_palette_concept_card_toolbar_color</color>
   <!-- Audio Fragment -->
   <color name="component_color_audio_fragment_background_color">@color/color_palette_audio_fragment_background_color</color>
+  <color name="component_color_audio_fragment_voiceover_progressbar_color">@color/color_palette_icon_background_secondary_color</color>
   <color name="component_color_audio_fragment_seekbar_progress_color">@color/color_palette_icon_background_secondary_color</color>
   <color name="component_color_audio_fragment_seekbar_color">@color/color_palette_seekbar_progress_background_color</color>
   <color name="component_color_audio_fragment_seekbar_thumb_shadow_color">@color/color_palette_seekbar_thumb_shadow_color</color>
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index 8a5c894b67e..f45d952271d 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -1071,7 +1071,7 @@ class ExplorationActivityTest {
       onView(withId(R.id.action_audio_player)).perform(click())
 
       testCoroutineDispatchers.runCurrent()
-      onView(withId(R.id.audio_loading_bar)).check(matches(isDisplayed()))
+      onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed()))
       onView(withText(context.getString(R.string.cellular_data_alert_dialog_title)))
         .check(doesNotExist())
     }

From a533a53561b1193860f5cdc3da3fc2ce84c255f7 Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Tue, 17 Oct 2023 17:11:25 +0530
Subject: [PATCH 04/12] Adds test for loading audio UI

---
 .../exploration/ExplorationActivityTest.kt    | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index f45d952271d..165f250bde4 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -1071,7 +1071,7 @@ class ExplorationActivityTest {
       onView(withId(R.id.action_audio_player)).perform(click())
 
       testCoroutineDispatchers.runCurrent()
-      onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed()))
+      onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed()))
       onView(withText(context.getString(R.string.cellular_data_alert_dialog_title)))
         .check(doesNotExist())
     }
@@ -1295,6 +1295,43 @@ class ExplorationActivityTest {
     explorationDataController.stopPlayingExploration(isCompletion = false)
   }
 
+  @Test
+  fun testExplorationActivity_loadingAudio_progressbarIsDisplayed() {
+    markAllSpotlightsSeen()
+    setUpAudio()
+    launch<ExplorationActivity>(
+      createExplorationActivityIntent(
+        internalProfileId,
+        RATIOS_TOPIC_ID,
+        RATIOS_STORY_ID_0,
+        RATIOS_EXPLORATION_ID_0,
+        shouldSavePartialProgress = false
+      )
+    ).use {
+      explorationDataController.startPlayingNewExploration(
+        internalProfileId,
+        RATIOS_TOPIC_ID,
+        RATIOS_STORY_ID_0,
+        RATIOS_EXPLORATION_ID_0
+      )
+      networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL)
+      testCoroutineDispatchers.runCurrent()
+      onView(withId(R.id.action_audio_player)).perform(click())
+
+      testCoroutineDispatchers.runCurrent()
+      onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed()))
+      onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed()))
+
+      waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp))
+      onView(withId(R.id.play_pause_audio_icon)).check(
+        matches(
+          withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)
+        )
+      )
+    }
+    explorationDataController.stopPlayingExploration(isCompletion = false)
+  }
+
   // TODO(#89): Check this test case too. It works in pair with below test cases.
   @Test
   fun testExpActivity_showUnsavedExpDialog_cancel_dismissesDialog() {

From d9c3f7722d89e316bc7f892f2d9e0cd065ded6e6 Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Tue, 17 Oct 2023 21:12:25 +0530
Subject: [PATCH 05/12] Fixes test

---
 .../exploration/ExplorationActivityTest.kt    | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index 165f250bde4..b880820318e 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -1078,9 +1078,7 @@ class ExplorationActivityTest {
     explorationDataController.stopPlayingExploration(isCompletion = false)
   }
 
-  // TODO(#89): The ExplorationActivity takes time to finish. This test case is failing currently.
   @Test
-  @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.")
   fun testAudioWifi_ratioExp_audioIcon_audioFragHasDefaultLangAndAutoPlays() {
     getApplicationDependencies(
       internalProfileId,
@@ -1088,7 +1086,6 @@ class ExplorationActivityTest {
       RATIOS_STORY_ID_0,
       RATIOS_EXPLORATION_ID_0
     )
-    networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL)
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
@@ -1099,20 +1096,18 @@ class ExplorationActivityTest {
       )
     ).use {
       waitForTheView(withText("What is a Ratio?"))
+      networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL)
+      testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())
-      onView(
-        allOf(
-          withId(R.id.play_pause_audio_icon),
-          withEffectiveVisibility(Visibility.VISIBLE)
-        )
-      )
-      onView(allOf(withId(R.id.audio_language_icon), withEffectiveVisibility(Visibility.VISIBLE)))
+
+      testCoroutineDispatchers.runCurrent()
+      onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed()))
+      onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed()))
+
       waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp))
       onView(withId(R.id.play_pause_audio_icon)).check(
         matches(
-          withDrawable(
-            R.drawable.ic_pause_circle_filled_white_24dp
-          )
+          withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)
         )
       )
     }

From 0d2dcbf6540e96fda62f04a69199544ba9eb7b29 Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Tue, 17 Oct 2023 22:29:07 +0530
Subject: [PATCH 06/12] Fixes test

---
 .../exploration/ExplorationActivityTest.kt       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index b880820318e..29be53d5d17 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -1080,12 +1080,8 @@ class ExplorationActivityTest {
 
   @Test
   fun testAudioWifi_ratioExp_audioIcon_audioFragHasDefaultLangAndAutoPlays() {
-    getApplicationDependencies(
-      internalProfileId,
-      RATIOS_TOPIC_ID,
-      RATIOS_STORY_ID_0,
-      RATIOS_EXPLORATION_ID_0
-    )
+    markAllSpotlightsSeen()
+    setUpAudio()
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
@@ -1095,7 +1091,13 @@ class ExplorationActivityTest {
         shouldSavePartialProgress = false
       )
     ).use {
-      waitForTheView(withText("What is a Ratio?"))
+      explorationDataController.startPlayingNewExploration(
+        internalProfileId,
+        RATIOS_TOPIC_ID,
+        RATIOS_STORY_ID_0,
+        RATIOS_EXPLORATION_ID_0
+      )
+      // waitForTheView(withText("What is a Ratio?"))
       networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL)
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())

From 87ba463c39f851ab84765b67805d549108b2ff28 Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Wed, 18 Oct 2023 08:51:39 +0530
Subject: [PATCH 07/12] Fixes test

---
 .../android/app/player/exploration/ExplorationActivityTest.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index 29be53d5d17..ad40356ec4b 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -1097,7 +1097,7 @@ class ExplorationActivityTest {
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
       )
-      // waitForTheView(withText("What is a Ratio?"))
+      waitForTheView(withText("What is a Ratio?"))
       networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL)
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())

From c7ccf25163204ecc5bbdf5431408bba2db865a2a Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Wed, 18 Oct 2023 09:02:01 +0530
Subject: [PATCH 08/12] Fixes test

---
 .../android/app/player/exploration/ExplorationActivityTest.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index ad40356ec4b..8e26e7dc759 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -1097,7 +1097,8 @@ class ExplorationActivityTest {
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
       )
-      waitForTheView(withText("What is a Ratio?"))
+      // waitForTheView(withText("What is a Ratio?"))
+      onView(withId(R.id.exploration_toolbar_title))
       networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL)
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())

From 4500a71767e076c6dad9cd7232df90a4d7cc7a28 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Fri, 10 Nov 2023 23:11:29 +0530
Subject: [PATCH 09/12] Revert "Fixes test"

This reverts commit c7ccf25163204ecc5bbdf5431408bba2db865a2a.
---
 .../android/app/player/exploration/ExplorationActivityTest.kt  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index 8e26e7dc759..ad40356ec4b 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -1097,8 +1097,7 @@ class ExplorationActivityTest {
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
       )
-      // waitForTheView(withText("What is a Ratio?"))
-      onView(withId(R.id.exploration_toolbar_title))
+      waitForTheView(withText("What is a Ratio?"))
       networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL)
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())

From 6e02d489cb13ab912901c83d3e824b8905d6126d Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Fri, 10 Nov 2023 23:11:29 +0530
Subject: [PATCH 10/12] Revert "Fixes test"

This reverts commit 87ba463c39f851ab84765b67805d549108b2ff28.
---
 .../android/app/player/exploration/ExplorationActivityTest.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index ad40356ec4b..29be53d5d17 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -1097,7 +1097,7 @@ class ExplorationActivityTest {
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
       )
-      waitForTheView(withText("What is a Ratio?"))
+      // waitForTheView(withText("What is a Ratio?"))
       networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL)
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())

From 376a3e726b72a350b8ecc2549a3fcf93660ac210 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Fri, 10 Nov 2023 23:11:30 +0530
Subject: [PATCH 11/12] Revert "Fixes test"

This reverts commit 0d2dcbf6540e96fda62f04a69199544ba9eb7b29.
---
 .../exploration/ExplorationActivityTest.kt       | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index 29be53d5d17..b880820318e 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -1080,8 +1080,12 @@ class ExplorationActivityTest {
 
   @Test
   fun testAudioWifi_ratioExp_audioIcon_audioFragHasDefaultLangAndAutoPlays() {
-    markAllSpotlightsSeen()
-    setUpAudio()
+    getApplicationDependencies(
+      internalProfileId,
+      RATIOS_TOPIC_ID,
+      RATIOS_STORY_ID_0,
+      RATIOS_EXPLORATION_ID_0
+    )
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
@@ -1091,13 +1095,7 @@ class ExplorationActivityTest {
         shouldSavePartialProgress = false
       )
     ).use {
-      explorationDataController.startPlayingNewExploration(
-        internalProfileId,
-        RATIOS_TOPIC_ID,
-        RATIOS_STORY_ID_0,
-        RATIOS_EXPLORATION_ID_0
-      )
-      // waitForTheView(withText("What is a Ratio?"))
+      waitForTheView(withText("What is a Ratio?"))
       networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL)
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())

From 2a2ab7a7eed8c68fd7b328e9dc9f97bb3465227f Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Fri, 10 Nov 2023 23:11:30 +0530
Subject: [PATCH 12/12] Revert "Fixes test"

This reverts commit d9c3f7722d89e316bc7f892f2d9e0cd065ded6e6.
---
 .../exploration/ExplorationActivityTest.kt    | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index b880820318e..165f250bde4 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -1078,7 +1078,9 @@ class ExplorationActivityTest {
     explorationDataController.stopPlayingExploration(isCompletion = false)
   }
 
+  // TODO(#89): The ExplorationActivity takes time to finish. This test case is failing currently.
   @Test
+  @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.")
   fun testAudioWifi_ratioExp_audioIcon_audioFragHasDefaultLangAndAutoPlays() {
     getApplicationDependencies(
       internalProfileId,
@@ -1086,6 +1088,7 @@ class ExplorationActivityTest {
       RATIOS_STORY_ID_0,
       RATIOS_EXPLORATION_ID_0
     )
+    networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL)
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
@@ -1096,18 +1099,20 @@ class ExplorationActivityTest {
       )
     ).use {
       waitForTheView(withText("What is a Ratio?"))
-      networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL)
-      testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())
-
-      testCoroutineDispatchers.runCurrent()
-      onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed()))
-      onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed()))
-
+      onView(
+        allOf(
+          withId(R.id.play_pause_audio_icon),
+          withEffectiveVisibility(Visibility.VISIBLE)
+        )
+      )
+      onView(allOf(withId(R.id.audio_language_icon), withEffectiveVisibility(Visibility.VISIBLE)))
       waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp))
       onView(withId(R.id.play_pause_audio_icon)).check(
         matches(
-          withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)
+          withDrawable(
+            R.drawable.ic_pause_circle_filled_white_24dp
+          )
         )
       )
     }