Fix #4362, #1491: When reading text size is extra large, resume lesson page and revision tabs content is seen in normal size

app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt

@@ -9,8 +9,10 @@ import org.oppia.android.app.home.RouteToExplorationListener
 import org.oppia.android.app.model.ExplorationActivityParams
 import org.oppia.android.app.model.ExplorationCheckpoint
 import org.oppia.android.app.model.ProfileId
+import org.oppia.android.app.model.ReadingTextSize
 import org.oppia.android.app.model.ResumeLessonActivityParams
 import org.oppia.android.app.model.ScreenName.RESUME_LESSON_ACTIVITY
+import org.oppia.android.app.player.exploration.DefaultFontSizeStateListener
 import org.oppia.android.app.player.exploration.ExplorationActivity
 import org.oppia.android.util.extensions.getProtoExtra
 import org.oppia.android.util.extensions.putProtoExtra
@@ -20,6 +22,7 @@ import javax.inject.Inject
 /** Activity that allows the user to resume a saved exploration. */
 class ResumeLessonActivity :
   InjectableAutoLocalizedAppCompatActivity(),
+  DefaultFontSizeStateListener,
   RouteToExplorationListener {
   @Inject
   lateinit var resumeLessonActivityPresenter: ResumeLessonActivityPresenter
@@ -91,6 +94,7 @@ class ResumeLessonActivity :
     parentScreen: ExplorationActivityParams.ParentScreen,
     isCheckpointingEnabled: Boolean
   ) {
+    resumeLessonActivityPresenter.setReadingTextSizeNormal()
     startActivity(
       ExplorationActivity.createExplorationActivityIntent(
         this,
@@ -105,4 +109,13 @@ class ResumeLessonActivity :
     )
     finish()
   }
+
+  override fun onDefaultFontSizeLoaded(readingTextSize: ReadingTextSize) {
+    resumeLessonActivityPresenter.loadResumeLessonFragment(readingTextSize)
+  }
+
+  override fun onBackPressed() {
+    resumeLessonActivityPresenter.setReadingTextSizeNormal()
+    finish()
+  }
 }

app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt

@@ -2,19 +2,40 @@ package org.oppia.android.app.resumelesson
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Transformations
 import org.oppia.android.R
 import org.oppia.android.app.model.ExplorationActivityParams
 import org.oppia.android.app.model.ExplorationCheckpoint
+import org.oppia.android.app.model.Profile
 import org.oppia.android.app.model.ProfileId
+import org.oppia.android.app.model.ReadingTextSize
+import org.oppia.android.app.player.exploration.DefaultFontSizeStateListener
+import org.oppia.android.app.utility.FontScaleConfigurationUtil
 import org.oppia.android.databinding.ResumeLessonActivityBinding
+import org.oppia.android.domain.oppialogger.OppiaLogger
+import org.oppia.android.domain.profile.ProfileManagementController
+import org.oppia.android.util.data.AsyncResult
+import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import javax.inject.Inject
 
 private const val RESUME_LESSON_TAG = "ResumeLesson"
 
 /** The presenter for [ResumeLessonActivity]. */
 class ResumeLessonActivityPresenter @Inject constructor(
-  private val activity: AppCompatActivity
+  private val activity: AppCompatActivity,
+  private val profileManagementController: ProfileManagementController,
+  private val fontScaleConfigurationUtil: FontScaleConfigurationUtil,
+  private val oppiaLogger: OppiaLogger
 ) {
+  private lateinit var profileId: ProfileId
+  private lateinit var classroomId: String
+  private lateinit var topicId: String
+  private lateinit var storyId: String
+  private lateinit var explorationId: String
+  private lateinit var parentScreen: ExplorationActivityParams.ParentScreen
+  private lateinit var explorationCheckpoint: ExplorationCheckpoint
 
   /** Handles onCreate() method of the [ResumeLessonActivity]. */
   fun handleOnCreate(
@@ -30,30 +51,84 @@ class ResumeLessonActivityPresenter @Inject constructor(
       activity,
       R.layout.resume_lesson_activity
     )
+    this.profileId = profileId
+    this.classroomId = classroomId
+    this.topicId = topicId
+    this.storyId = storyId
+    this.explorationId = explorationId
+    this.explorationCheckpoint = explorationCheckpoint
+    this.parentScreen = parentScreen
     val resumeLessonToolbar = binding.resumeLessonActivityToolbar
     activity.setSupportActionBar(resumeLessonToolbar)
 
+    retrieveReadingTextSize().observe(
+      activity as ResumeLessonActivity,
+      { result ->
+        (activity as DefaultFontSizeStateListener).onDefaultFontSizeLoaded(result)
+      }
+    )
+
     resumeLessonToolbar.setNavigationOnClickListener {
+      fontScaleConfigurationUtil.adjustFontScale(
+        context = activity,
+        ReadingTextSize.MEDIUM_TEXT_SIZE
+      )
       @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       activity.onBackPressed()
     }
+  }
 
-    if (getResumeLessonFragment() == null) {
-      val resumeLessonFragment = ResumeLessonFragment.newInstance(
-        profileId,
-        classroomId,
-        topicId,
-        storyId,
-        explorationId,
-        parentScreen,
-        explorationCheckpoint
-      )
-      activity.supportFragmentManager.beginTransaction().add(
-        R.id.resume_lesson_fragment_placeholder,
-        resumeLessonFragment,
-        RESUME_LESSON_TAG
-      ).commitNow()
-    }
+  /** Loads [ResumeLessonFragment]. */
+  fun loadResumeLessonFragment(readingTextSize: ReadingTextSize) {
+    if (getResumeLessonFragment() != null)
+      activity.supportFragmentManager.beginTransaction()
+        .remove(getResumeLessonFragment() as Fragment).commitNow()
+
+    val resumeLessonFragment = ResumeLessonFragment.newInstance(
+      profileId,
+      classroomId,
+      topicId,
+      storyId,
+      explorationId,
+      parentScreen,
+      explorationCheckpoint,
+      readingTextSize
+    )
+    activity.supportFragmentManager.beginTransaction().add(
+      R.id.resume_lesson_fragment_placeholder,
+      resumeLessonFragment,
+      RESUME_LESSON_TAG
+    ).commitNow()
+  }
+
+  private fun retrieveReadingTextSize(): LiveData<ReadingTextSize> {
+    return Transformations.map(
+      profileManagementController.getProfile(profileId).toLiveData(),
+      ::processReadingTextSizeResult
+    )
+  }
+
+  private fun processReadingTextSizeResult(
+    profileResult: AsyncResult<Profile>
+  ): ReadingTextSize {
+    return when (profileResult) {
+      is AsyncResult.Failure -> {
+        oppiaLogger.e(
+          "ResumeLessonActivity",
+          "Failed to retrieve profile",
+          profileResult.error
+        )
+        Profile.getDefaultInstance()
+      }
+      is AsyncResult.Pending -> {
+        oppiaLogger.d(
+          "ResumeLessonActivity",
+          "Result is pending"
+        )
+        Profile.getDefaultInstance()
+      }
+      is AsyncResult.Success -> profileResult.value
+    }.readingTextSize
   }
 
   private fun getResumeLessonFragment(): ResumeLessonFragment? {
@@ -63,4 +138,12 @@ class ResumeLessonActivityPresenter @Inject constructor(
         R.id.resume_lesson_fragment_placeholder
       ) as ResumeLessonFragment?
   }
+
+  /** Set reading text size normal. */
+  fun setReadingTextSizeNormal() {
+    fontScaleConfigurationUtil.adjustFontScale(
+      context = activity,
+      ReadingTextSize.MEDIUM_TEXT_SIZE
+    )
+  }
 }

app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragment.kt

@@ -10,6 +10,7 @@ import org.oppia.android.app.fragment.InjectableFragment
 import org.oppia.android.app.model.ExplorationActivityParams
 import org.oppia.android.app.model.ExplorationCheckpoint
 import org.oppia.android.app.model.ProfileId
+import org.oppia.android.app.model.ReadingTextSize
 import org.oppia.android.app.model.ResumeLessonFragmentArguments
 import org.oppia.android.util.extensions.getProto
 import org.oppia.android.util.extensions.putProto
@@ -18,7 +19,9 @@ import javax.inject.Inject
 /** Fragment that allows the user to resume a saved exploration. */
 class ResumeLessonFragment : InjectableFragment() {
   companion object {
-    private const val ARGUMENTS_KEY = "ResumeExplorationFragment.arguments"
+
+    /** Arguments key for [ResumeLessonFragment]. */
+    const val RESUME_LESSON_FRAGMENT_ARGUMENTS_KEY = "ResumeLessonFragment.arguments"
 
     /** Creates new instance of [ResumeLessonFragment] for the provided parameters. */
     fun newInstance(
@@ -28,7 +31,8 @@ class ResumeLessonFragment : InjectableFragment() {
       storyId: String,
       explorationId: String,
       parentScreen: ExplorationActivityParams.ParentScreen,
-      checkpoint: ExplorationCheckpoint
+      checkpoint: ExplorationCheckpoint,
+      readingTextSize: ReadingTextSize
     ): ResumeLessonFragment {
       val args = ResumeLessonFragmentArguments.newBuilder().apply {
         this.profileId = profileId
@@ -38,10 +42,11 @@ class ResumeLessonFragment : InjectableFragment() {
         this.explorationId = explorationId
         this.parentScreen = parentScreen
         this.checkpoint = checkpoint
+        this.readingTextSize = readingTextSize
       }.build()
       return ResumeLessonFragment().apply {
         arguments = Bundle().apply {
-          putProto(ARGUMENTS_KEY, args)
+          putProto(RESUME_LESSON_FRAGMENT_ARGUMENTS_KEY, args)
         }
       }
     }
@@ -53,6 +58,7 @@ class ResumeLessonFragment : InjectableFragment() {
   override fun onAttach(context: Context) {
     super.onAttach(context)
     (fragmentComponent as FragmentComponentImpl).inject(this)
+    resumeLessonFragmentPresenter.handleAttach(context)
   }
 
   override fun onCreateView(
@@ -62,7 +68,10 @@ class ResumeLessonFragment : InjectableFragment() {
   ): View? {
     val args = checkNotNull(arguments) {
       "Expected arguments to be provided for fragment."
-    }.getProto(ARGUMENTS_KEY, ResumeLessonFragmentArguments.getDefaultInstance())
+    }.getProto(
+      RESUME_LESSON_FRAGMENT_ARGUMENTS_KEY,
+      ResumeLessonFragmentArguments.getDefaultInstance()
+    )
     return resumeLessonFragmentPresenter.handleOnCreate(
       inflater,
       container,

app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt

@@ -1,5 +1,6 @@
 package org.oppia.android.app.resumelesson
 
+import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -12,14 +13,17 @@ import org.oppia.android.app.model.EphemeralChapterSummary
 import org.oppia.android.app.model.ExplorationActivityParams
 import org.oppia.android.app.model.ExplorationCheckpoint
 import org.oppia.android.app.model.ProfileId
+import org.oppia.android.app.model.ResumeLessonFragmentArguments
 import org.oppia.android.app.translation.AppLanguageResourceHandler
+import org.oppia.android.app.utility.FontScaleConfigurationUtil
 import org.oppia.android.databinding.ResumeLessonFragmentBinding
 import org.oppia.android.domain.exploration.ExplorationDataController
 import org.oppia.android.domain.oppialogger.OppiaLogger
 import org.oppia.android.domain.topic.TopicController
 import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
+import org.oppia.android.util.extensions.getProto
 import org.oppia.android.util.gcsresource.DefaultResourceBucketName
 import org.oppia.android.util.parser.html.HtmlParser
 import javax.inject.Inject
@@ -31,6 +35,7 @@ class ResumeLessonFragmentPresenter @Inject constructor(
   private val resumeLessonViewModel: ResumeLessonViewModel,
   private val topicController: TopicController,
   private val explorationDataController: ExplorationDataController,
+  private val fontScaleConfigurationUtil: FontScaleConfigurationUtil,
   private val htmlParserFactory: HtmlParser.Factory,
   private val translationController: TranslationController,
   @DefaultResourceBucketName private val resourceBucketName: String,
@@ -55,6 +60,11 @@ class ResumeLessonFragmentPresenter @Inject constructor(
     getChapterSummary()
   }
 
+  /** Handles the [Fragment.onAttach] portion of [ResumeLessonFragment]'s lifecycle. */
+  fun handleAttach(context: Context) {
+    fontScaleConfigurationUtil.adjustFontScale(context, retrieveArguments().readingTextSize)
+  }
+
   /** Handles onCreateView() method of the [ResumeLessonFragment]. */
   fun handleOnCreate(
     inflater: LayoutInflater,
@@ -72,7 +82,6 @@ class ResumeLessonFragmentPresenter @Inject constructor(
       container,
       /* attachToRoot= */ false
     )
-
     this.profileId = profileId
     this.topicId = topicId
     this.classroomId = classroomId
@@ -110,10 +119,16 @@ class ResumeLessonFragmentPresenter @Inject constructor(
         parentScreen
       )
     }
-
     return binding.root
   }
 
+  private fun retrieveArguments(): ResumeLessonFragmentArguments {
+    return fragment.requireArguments().getProto(
+      ResumeLessonFragment.RESUME_LESSON_FRAGMENT_ARGUMENTS_KEY,
+      ResumeLessonFragmentArguments.getDefaultInstance()
+    )
+  }
+
   private fun subscribeToChapterSummary() {
     chapterSummaryLiveData.observe(
       fragment,

app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt

@@ -11,9 +11,11 @@ import org.oppia.android.app.hintsandsolution.RevealSolutionInterface
 import org.oppia.android.app.model.HelpIndex
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.QuestionPlayerActivityParams
+import org.oppia.android.app.model.ReadingTextSize
 import org.oppia.android.app.model.ScreenName.QUESTION_PLAYER_ACTIVITY
 import org.oppia.android.app.model.State
 import org.oppia.android.app.model.WrittenTranslationContext
+import org.oppia.android.app.player.exploration.DefaultFontSizeStateListener
 import org.oppia.android.app.player.state.listener.RouteToHintsAndSolutionListener
 import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
 import org.oppia.android.app.player.stopplaying.RestartPlayingSessionListener
@@ -41,6 +43,7 @@ class QuestionPlayerActivity :
   RevealHintListener,
   RevealSolutionInterface,
   HintsAndSolutionQuestionManagerListener,
+  DefaultFontSizeStateListener,
   ConceptCardListener {
 
   @Inject
@@ -57,6 +60,7 @@ class QuestionPlayerActivity :
 
   override fun onBackPressed() {
     showStopExplorationDialogFragment()
+    questionPlayerActivityPresenter.setReadingTextSizeNormal()
   }
 
   override fun restartSession() = questionPlayerActivityPresenter.restartSession()
@@ -130,4 +134,8 @@ class QuestionPlayerActivity :
   override fun stopSession() {
     questionPlayerActivityPresenter.stopTrainingSession()
   }
+
+  override fun onDefaultFontSizeLoaded(readingTextSize: ReadingTextSize) {
+    questionPlayerActivityPresenter.loadFragments(readingTextSize)
+  }
 }