From 65f44edfa2023087b190e1ebdd973176b4a8449d Mon Sep 17 00:00:00 2001 From: Vishwajith-Shettigar Date: Wed, 24 Jul 2024 09:37:41 +0530 Subject: [PATCH] Resolved conflicts --- .../android/app/resumelesson/ResumeLessonActivityPresenter.kt | 2 +- .../android/app/topic/revisioncard/RevisionCardFragmentTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt index 24a0ab3e374..210d49c887c 100644 --- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt @@ -52,7 +52,7 @@ class ResumeLessonActivityPresenter @Inject constructor( R.layout.resume_lesson_activity ) this.profileId = profileId - this.classroomId=classroomId + this.classroomId = classroomId this.topicId = topicId this.storyId = storyId this.explorationId = explorationId diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt index 44e37b99068..2fa83f33009 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt @@ -65,8 +65,8 @@ import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionMo import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.revisioncard.RevisionCardActivity.Companion.createRevisionCardActivityIntent import org.oppia.android.app.translation.testing.ActivityRecreatorTestModule -import org.oppia.android.app.utility.FontSizeMatcher.Companion.withFontSize import org.oppia.android.app.utility.EspressoTestsMatchers.hasProtoExtra +import org.oppia.android.app.utility.FontSizeMatcher.Companion.withFontSize import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.data.backends.gae.NetworkConfigProdModule import org.oppia.android.data.backends.gae.NetworkModule