diff --git a/WORKSPACE b/WORKSPACE index f3658f7c92c..0ee7cf91146 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,6 +15,22 @@ android_sdk_repository( build_tools_version = "29.0.2", ) +# Oppia's backend proto API definitions. +git_repository( + name = "oppia_proto_api", + commit = HTTP_DEPENDENCY_VERSIONS["oppia_proto_api"]["version"], + remote = "https://github.com/oppia/oppia-proto-api", + shallow_since = "1716846301 -0700", +) + +load("@oppia_proto_api//repo:deps.bzl", "initializeDepsForWorkspace") + +initializeDepsForWorkspace() + +load("@oppia_proto_api//repo:toolchains.bzl", "initializeToolchainsForWorkspace") + +initializeToolchainsForWorkspace() + # Add support for JVM rules: https://github.com/bazelbuild/rules_jvm_external http_archive( name = "rules_jvm_external", diff --git a/app/src/main/java/org/oppia/android/app/application/alpha/AlphaApplicationComponent.kt b/app/src/main/java/org/oppia/android/app/application/alpha/AlphaApplicationComponent.kt index 136fd1dbb9a..d4545931ca4 100644 --- a/app/src/main/java/org/oppia/android/app/application/alpha/AlphaApplicationComponent.kt +++ b/app/src/main/java/org/oppia/android/app/application/alpha/AlphaApplicationComponent.kt @@ -43,7 +43,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterAlphaModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.platformparameter.syncup.PlatformParameterSyncUpWorkerModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.util.accessibility.AccessibilityProdModule import org.oppia.android.util.caching.AssetModule @@ -82,7 +81,7 @@ import javax.inject.Singleton ImageParsingModule::class, HtmlParserEntityTypeModule::class, CachingModule::class, QuestionModule::class, AccessibilityProdModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, RatioInputModule::class, UncaughtExceptionLoggerModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, diff --git a/app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt b/app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt index 75d07359cd4..bc5ecdf8093 100644 --- a/app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt +++ b/app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt @@ -44,7 +44,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterAlphaKenyaMod import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.platformparameter.syncup.PlatformParameterSyncUpWorkerModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.util.accessibility.AccessibilityProdModule import org.oppia.android.util.caching.AssetModule @@ -83,7 +82,7 @@ import javax.inject.Singleton ImageParsingModule::class, HtmlParserEntityTypeModule::class, CachingModule::class, QuestionModule::class, AccessibilityProdModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, RatioInputModule::class, UncaughtExceptionLoggerModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigAlphaKenyaModule::class, diff --git a/app/src/main/java/org/oppia/android/app/application/beta/BetaApplicationComponent.kt b/app/src/main/java/org/oppia/android/app/application/beta/BetaApplicationComponent.kt index bbe79384e81..1b63f350433 100644 --- a/app/src/main/java/org/oppia/android/app/application/beta/BetaApplicationComponent.kt +++ b/app/src/main/java/org/oppia/android/app/application/beta/BetaApplicationComponent.kt @@ -43,7 +43,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.platformparameter.syncup.PlatformParameterSyncUpWorkerModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.util.accessibility.AccessibilityProdModule import org.oppia.android.util.caching.AssetModule @@ -82,7 +81,7 @@ import javax.inject.Singleton ImageParsingModule::class, HtmlParserEntityTypeModule::class, CachingModule::class, QuestionModule::class, AccessibilityProdModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, RatioInputModule::class, UncaughtExceptionLoggerModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, diff --git a/app/src/main/java/org/oppia/android/app/application/dev/DeveloperApplicationComponent.kt b/app/src/main/java/org/oppia/android/app/application/dev/DeveloperApplicationComponent.kt index 522e68679f4..4c938925cc8 100644 --- a/app/src/main/java/org/oppia/android/app/application/dev/DeveloperApplicationComponent.kt +++ b/app/src/main/java/org/oppia/android/app/application/dev/DeveloperApplicationComponent.kt @@ -44,7 +44,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.platformparameter.syncup.PlatformParameterSyncUpWorkerModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.util.accessibility.AccessibilityProdModule import org.oppia.android.util.caching.AssetModule @@ -83,7 +82,7 @@ import javax.inject.Singleton ImageParsingModule::class, HtmlParserEntityTypeModule::class, CachingModule::class, QuestionModule::class, DebugLogReportingModule::class, AccessibilityProdModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, - ViewBindingShimModule::class, PrimeTopicAssetsControllerModule::class, + ViewBindingShimModule::class, ExpirationMetaDataRetrieverModule::class, RatioInputModule::class, UncaughtExceptionLoggerModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/app/src/main/java/org/oppia/android/app/application/ga/GaApplicationComponent.kt b/app/src/main/java/org/oppia/android/app/application/ga/GaApplicationComponent.kt index b4b476bc6d3..23fcae14bc3 100644 --- a/app/src/main/java/org/oppia/android/app/application/ga/GaApplicationComponent.kt +++ b/app/src/main/java/org/oppia/android/app/application/ga/GaApplicationComponent.kt @@ -43,7 +43,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.platformparameter.syncup.PlatformParameterSyncUpWorkerModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.util.accessibility.AccessibilityProdModule import org.oppia.android.util.caching.AssetModule @@ -82,7 +81,7 @@ import javax.inject.Singleton ImageParsingModule::class, HtmlParserEntityTypeModule::class, CachingModule::class, QuestionModule::class, AccessibilityProdModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, RatioInputModule::class, UncaughtExceptionLoggerModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, diff --git a/app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt index 805a1268c13..3e2f8254d5d 100644 --- a/app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt @@ -31,7 +31,6 @@ import org.oppia.android.domain.locale.LocaleController import org.oppia.android.domain.onboarding.AppStartupStateController import org.oppia.android.domain.onboarding.DeprecationController import org.oppia.android.domain.oppialogger.OppiaLogger -import org.oppia.android.domain.topic.PrimeTopicAssetsController import org.oppia.android.domain.translation.TranslationController import org.oppia.android.util.data.AsyncResult import org.oppia.android.util.data.DataProvider @@ -56,7 +55,6 @@ class SplashActivityPresenter @Inject constructor( private val activity: AppCompatActivity, private val oppiaLogger: OppiaLogger, private val appStartupStateController: AppStartupStateController, - private val primeTopicAssetsController: PrimeTopicAssetsController, private val translationController: TranslationController, private val localeController: LocaleController, private val deprecationController: DeprecationController, @@ -77,8 +75,6 @@ class SplashActivityPresenter @Inject constructor( isOnBetaFlavor = currentBuildFlavor == BuildFlavor.BETA } - // Initiate download support before any additional processing begins. - primeTopicAssetsController.downloadAssets(R.style.OppiaAlertDialogTheme) subscribeToOnboardingFlow() } diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt index a94b4475087..52c2ad9af16 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt @@ -102,7 +102,6 @@ import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModul import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -904,7 +903,7 @@ class AdministratorControlsActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentTest.kt index 6d7e7b9ee87..836ddbd573c 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentTest.kt @@ -84,7 +84,6 @@ import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModul import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -604,7 +603,7 @@ class AdministratorControlsFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt index 1ceb6cd85ee..c7c95d45ac9 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt @@ -76,7 +76,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -293,7 +292,7 @@ class AppVersionActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivityTest.kt index 4a76dfd4479..4edd1897ff7 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivityTest.kt @@ -69,7 +69,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerFactory import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -216,7 +215,7 @@ class ProfileAndDeviceIdActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt index 5e41e379417..79202b3d6c7 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt @@ -98,7 +98,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorker import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerFactory import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.FakeAnalyticsEventLogger import org.oppia.android.testing.OppiaTestRule @@ -1127,7 +1126,7 @@ class ProfileAndDeviceIdFragmentTest { ImageClickInputModule::class, InteractionsModule::class, GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, - LogStorageModule::class, CachingTestModule::class, PrimeTopicAssetsControllerModule::class, + LogStorageModule::class, CachingTestModule::class, ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt index 60c1d8e03c9..f7488c7cfe1 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt @@ -81,7 +81,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu 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.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -517,7 +516,7 @@ class CompletedStoryListActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/customview/LessonThumbnailImageViewTest.kt b/app/src/sharedTest/java/org/oppia/android/app/customview/LessonThumbnailImageViewTest.kt index 7eb357dd46a..052c845ee8a 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/customview/LessonThumbnailImageViewTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/customview/LessonThumbnailImageViewTest.kt @@ -61,7 +61,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -165,7 +164,7 @@ class LessonThumbnailImageViewTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/MathExpressionInteractionsViewTest.kt b/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/MathExpressionInteractionsViewTest.kt index 606db46927f..861458835b0 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/MathExpressionInteractionsViewTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/MathExpressionInteractionsViewTest.kt @@ -78,7 +78,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.espresso.EditTextInputAction @@ -1855,7 +1854,7 @@ class MathExpressionInteractionsViewTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdaptersTest.kt index ade4a20211d..15101fcb697 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdaptersTest.kt @@ -63,7 +63,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestImageLoaderModule import org.oppia.android.testing.TestLogReportingModule @@ -156,7 +155,7 @@ class AppCompatCheckBoxBindingAdaptersTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdaptersTest.kt index 426294f59cf..075d4200ab1 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdaptersTest.kt @@ -64,7 +64,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.RunOn @@ -287,7 +286,7 @@ class CircularProgressIndicatorAdaptersTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/DrawableBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/DrawableBindingAdaptersTest.kt index 9817db99f6a..2886e506c45 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/DrawableBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/DrawableBindingAdaptersTest.kt @@ -67,7 +67,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestImageLoaderModule import org.oppia.android.testing.TestLogReportingModule @@ -176,7 +175,7 @@ class DrawableBindingAdaptersTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/ImageViewBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/ImageViewBindingAdaptersTest.kt index d5690443bad..471a63f3a81 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/ImageViewBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/ImageViewBindingAdaptersTest.kt @@ -71,7 +71,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -218,7 +217,7 @@ class ImageViewBindingAdaptersTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/MarginBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/MarginBindingAdaptersTest.kt index b720fc78a5d..c783ebc4ad2 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/MarginBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/MarginBindingAdaptersTest.kt @@ -75,7 +75,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -339,7 +338,7 @@ class MarginBindingAdaptersTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdaptersTest.kt index 0e7f32257a7..73c9d4f328e 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdaptersTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -494,7 +493,7 @@ class StateAssemblerMarginBindingAdaptersTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerPaddingBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerPaddingBindingAdaptersTest.kt index 104b314ef64..c1faa41958c 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerPaddingBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerPaddingBindingAdaptersTest.kt @@ -72,7 +72,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -492,7 +491,7 @@ class StateAssemblerPaddingBindingAdaptersTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/TextViewBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/TextViewBindingAdaptersTest.kt index 235498e6ef2..92725694b5e 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/TextViewBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/TextViewBindingAdaptersTest.kt @@ -65,7 +65,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestImageLoaderModule import org.oppia.android.testing.TestLogReportingModule @@ -325,7 +324,7 @@ class TextViewBindingAdaptersTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/ViewBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/ViewBindingAdaptersTest.kt index 716820377d4..b7257d821f8 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/ViewBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/ViewBindingAdaptersTest.kt @@ -69,7 +69,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -226,7 +225,7 @@ class ViewBindingAdaptersTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityTest.kt index e2c0034aad8..f045ad01538 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityTest.kt @@ -88,7 +88,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -327,7 +326,7 @@ class DeveloperOptionsActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsFragmentTest.kt index e20e3828a89..760f06b4017 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsFragmentTest.kt @@ -83,7 +83,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -648,7 +647,7 @@ class DeveloperOptionsFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt index 0c666f19607..a0333c681b9 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -258,7 +257,7 @@ class MarkChaptersCompletedActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt index af03c3a086e..b7d923488f9 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt @@ -78,7 +78,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.StoryProgressController import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule @@ -1009,7 +1008,7 @@ class MarkChaptersCompletedFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedActivityTest.kt index e36a5e93b11..57d4b167bb0 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedActivityTest.kt @@ -65,7 +65,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -189,7 +188,7 @@ class MarkStoriesCompletedActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedFragmentTest.kt index 489691717d9..9fb58116825 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedFragmentTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -556,7 +555,7 @@ class MarkStoriesCompletedFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedActivityTest.kt index 5e9cfb3fdc4..db021ab16b0 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedActivityTest.kt @@ -65,7 +65,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -189,7 +188,7 @@ class MarkTopicsCompletedActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedFragmentTest.kt index 47e4e0c33a0..92ac6758136 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedFragmentTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -537,7 +536,7 @@ class MarkTopicsCompletedFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsActivityTest.kt index a3a48b24828..75405e48c1f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsActivityTest.kt @@ -66,7 +66,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -178,7 +177,7 @@ class ViewEventLogsActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, DebugLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsFragmentTest.kt index c42f916f8fa..58df898c191 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsFragmentTest.kt @@ -79,7 +79,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.FakeFirestoreInstanceWrapperImpl import org.oppia.android.testing.OppiaTestRule @@ -741,7 +740,7 @@ class ViewEventLogsFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, TestLogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeActivityTest.kt index c163e91f5e0..cf3fd5cddc2 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeActivityTest.kt @@ -66,7 +66,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -180,7 +179,7 @@ class ForceNetworkTypeActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeFragmentTest.kt index 596ce0b7623..cee2ec92294 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeFragmentTest.kt @@ -70,7 +70,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -387,7 +386,7 @@ class ForceNetworkTypeFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserActivityTest.kt index c8c71821bc8..9362c614068 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserActivityTest.kt @@ -63,7 +63,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -166,7 +165,7 @@ class MathExpressionParserActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserFragmentTest.kt index b5d32fa77ee..86c8cdd4fec 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserFragmentTest.kt @@ -72,7 +72,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestImageLoaderModule import org.oppia.android.testing.TestLogReportingModule @@ -1406,7 +1405,7 @@ class MathExpressionParserFragmentTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt index ab857016665..f1a321959f6 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt @@ -76,7 +76,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -240,7 +239,7 @@ class FAQListFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQSingleActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQSingleActivityTest.kt index c3f85f719d8..60ab3bf4b6c 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQSingleActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQSingleActivityTest.kt @@ -72,7 +72,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -227,7 +226,7 @@ class FAQSingleActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/faq/FaqListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/faq/FaqListActivityTest.kt index 9b25a1320d4..545d5001f89 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/faq/FaqListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/faq/FaqListActivityTest.kt @@ -60,7 +60,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -154,7 +153,7 @@ class FaqListActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/help/HelpActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/HelpActivityTest.kt index f48c81b20ee..1955634e69f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/help/HelpActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/help/HelpActivityTest.kt @@ -59,7 +59,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -155,7 +154,7 @@ class HelpActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt index 74fbc2f0e70..e2c9aefe93e 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt @@ -89,7 +89,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.RunOn @@ -1435,7 +1434,7 @@ class HelpFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt index 0a4238a194c..5351a69914a 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt @@ -115,7 +115,6 @@ import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.spotlight.SpotlightStateController 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.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.BuildEnvironment @@ -2032,7 +2031,7 @@ class HomeActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt index e03c49a7ca7..0437b13fed7 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt @@ -105,7 +105,6 @@ import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_EXPLORATION_ID_0 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.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -1487,7 +1486,7 @@ class RecentlyPlayedFragmentTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/TopicSummaryViewModelTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/TopicSummaryViewModelTest.kt index 19d874cc4a9..f76258d8514 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/TopicSummaryViewModelTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/TopicSummaryViewModelTest.kt @@ -62,7 +62,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.translation.TranslationController import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule @@ -377,7 +376,7 @@ class TopicSummaryViewModelTest { QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/WelcomeViewModelTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/WelcomeViewModelTest.kt index 59ec6348510..0e629b199b2 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/WelcomeViewModelTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/WelcomeViewModelTest.kt @@ -60,7 +60,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -350,7 +349,7 @@ class WelcomeViewModelTest { QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModelTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModelTest.kt index 5fd5a452779..0328df9177c 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModelTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModelTest.kt @@ -62,7 +62,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.translation.TranslationController import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule @@ -363,7 +362,7 @@ class PromotedStoryListViewModelTest { QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModelTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModelTest.kt index 0ac61cb1caa..6b72c034fd5 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModelTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModelTest.kt @@ -60,7 +60,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.translation.TranslationController import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule @@ -389,7 +388,7 @@ class PromotedStoryViewModelTest { QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsActivityTest.kt index ff6d31f06d7..2e6890f426e 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsActivityTest.kt @@ -58,7 +58,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -147,7 +146,7 @@ class MyDownloadsActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentTest.kt index 447b3d33ed1..a839221dc36 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentTest.kt @@ -68,7 +68,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -226,7 +225,7 @@ class MyDownloadsFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/BetaNoticeDialogFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/notice/BetaNoticeDialogFragmentTest.kt index 423822f8d19..2155cb3d671 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/notice/BetaNoticeDialogFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/notice/BetaNoticeDialogFragmentTest.kt @@ -71,7 +71,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -235,7 +234,7 @@ class BetaNoticeDialogFragmentTest { ImageClickInputModule::class, InteractionsModule::class, GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, - LogStorageModule::class, PrimeTopicAssetsControllerModule::class, + LogStorageModule::class, ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigFastShowTestModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentTest.kt index af3c7d48a5f..161210eaddd 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentTest.kt @@ -70,7 +70,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -224,7 +223,7 @@ class ForcedAppDeprecationNoticeDialogFragmentTest { ImageClickInputModule::class, InteractionsModule::class, GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, - LogStorageModule::class, PrimeTopicAssetsControllerModule::class, + LogStorageModule::class, ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigFastShowTestModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/GeneralAvailabilityUpgradeNoticeDialogFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/notice/GeneralAvailabilityUpgradeNoticeDialogFragmentTest.kt index 171e62cd76c..328c63583ef 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/notice/GeneralAvailabilityUpgradeNoticeDialogFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/notice/GeneralAvailabilityUpgradeNoticeDialogFragmentTest.kt @@ -71,7 +71,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -242,7 +241,7 @@ class GeneralAvailabilityUpgradeNoticeDialogFragmentTest { ImageClickInputModule::class, InteractionsModule::class, GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, - LogStorageModule::class, PrimeTopicAssetsControllerModule::class, + LogStorageModule::class, ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigFastShowTestModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentTest.kt index 723ba24ae55..8ef96d1613f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentTest.kt @@ -71,7 +71,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -233,7 +232,7 @@ class OptionalAppDeprecationNoticeDialogFragmentTest { ImageClickInputModule::class, InteractionsModule::class, GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, - LogStorageModule::class, PrimeTopicAssetsControllerModule::class, + LogStorageModule::class, ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigFastShowTestModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentTest.kt index 16eda2a2b4b..630f1f84aac 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentTest.kt @@ -71,7 +71,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -215,7 +214,7 @@ class OsDeprecationNoticeDialogFragmentTest { ImageClickInputModule::class, InteractionsModule::class, GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, - LogStorageModule::class, PrimeTopicAssetsControllerModule::class, + LogStorageModule::class, ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigFastShowTestModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingActivityTest.kt index 10a388f6f4a..9fe6c366a73 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingActivityTest.kt @@ -59,7 +59,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -152,7 +151,7 @@ class OnboardingActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingFragmentTest.kt index 43dc8c7cef0..a8c1553549d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingFragmentTest.kt @@ -85,7 +85,6 @@ import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModul import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -707,7 +706,7 @@ class OnboardingFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt index d19b037818d..b526addc4bd 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt @@ -78,7 +78,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.RATIOS_TOPIC_ID import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule @@ -461,7 +460,7 @@ class OngoingTopicListActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageActivityTest.kt index 3a2e401d0c5..ecd0f9a6333 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageActivityTest.kt @@ -60,7 +60,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -161,7 +160,7 @@ class AppLanguageActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageFragmentTest.kt index cdb12ba202c..2ddd79c3b3e 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageFragmentTest.kt @@ -15,8 +15,6 @@ import androidx.test.espresso.matcher.ViewMatchers.isRoot import androidx.test.ext.junit.runners.AndroidJUnit4 import com.google.common.truth.Truth.assertThat import dagger.Component -import dagger.Module -import dagger.Provides import org.junit.After import org.junit.Before import org.junit.Rule @@ -70,7 +68,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.BuildEnvironment import org.oppia.android.testing.OppiaTestRule @@ -86,7 +83,6 @@ import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.accessibility.AccessibilityTestModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule @@ -288,14 +284,6 @@ class AppLanguageFragmentTest { ApplicationProvider.getApplicationContext().inject(this) } - @Module - class TestModule { - // Do not use caching to ensure URLs are always used as the main data source when loading audio. - @Provides - @CacheAssetsLocally - fun provideCacheAssetsLocally(): Boolean = false - } - // TODO(#59): Figure out a way to reuse modules instead of needing to re-declare them. @Singleton @Component( @@ -308,7 +296,7 @@ class AppLanguageFragmentTest { GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, ApplicationStartupListenerModule::class, RatioInputModule::class, HintsAndSolutionConfigModule::class, WorkManagerConfigurationModule::class, FirebaseLogUploaderModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageActivityTest.kt index 52be8c16782..5eec45d2441 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageActivityTest.kt @@ -60,7 +60,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -152,7 +151,7 @@ class AudioLanguageActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageFragmentTest.kt index c7b5bfe0d86..d234844d1ea 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageFragmentTest.kt @@ -14,8 +14,6 @@ import androidx.test.espresso.matcher.ViewMatchers.isRoot import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.ext.junit.runners.AndroidJUnit4 import dagger.Component -import dagger.Module -import dagger.Provides import org.junit.Before import org.junit.Rule import org.junit.Test @@ -71,7 +69,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -84,7 +81,6 @@ import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.accessibility.AccessibilityTestModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule @@ -280,14 +276,6 @@ class AudioLanguageFragmentTest { ApplicationProvider.getApplicationContext().inject(this) } - @Module - class TestModule { - // Do not use caching to ensure URLs are always used as the main data source when loading audio. - @Provides - @CacheAssetsLocally - fun provideCacheAssetsLocally(): Boolean = false - } - // TODO(#59): Figure out a way to reuse modules instead of needing to re-declare them. @Singleton @Component( @@ -300,7 +288,7 @@ class AudioLanguageFragmentTest { GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, ApplicationStartupListenerModule::class, RatioInputModule::class, HintsAndSolutionConfigModule::class, WorkManagerConfigurationModule::class, LogReportWorkerModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/OptionsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/OptionsActivityTest.kt index dd9d85926e2..47fe6666c82 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/OptionsActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/OptionsActivityTest.kt @@ -59,7 +59,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -155,7 +154,7 @@ class OptionsActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt index 8788ead2ab6..6973a6334d8 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt @@ -85,7 +85,6 @@ import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModul import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.BuildEnvironment import org.oppia.android.testing.OppiaTestRule @@ -631,7 +630,7 @@ class OptionsFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeActivityTest.kt index ee07540d885..9e21845de50 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeActivityTest.kt @@ -59,7 +59,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -152,7 +151,7 @@ class ReadingTextSizeActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeFragmentTest.kt index df07900e97a..97accf6d4b4 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeFragmentTest.kt @@ -17,8 +17,6 @@ import androidx.test.espresso.matcher.ViewMatchers.isRoot import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.ext.junit.runners.AndroidJUnit4 import dagger.Component -import dagger.Module -import dagger.Provides import org.hamcrest.Description import org.hamcrest.TypeSafeMatcher import org.junit.After @@ -74,7 +72,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -87,7 +84,6 @@ import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.accessibility.AccessibilityTestModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule @@ -283,14 +279,6 @@ class ReadingTextSizeFragmentTest { ApplicationProvider.getApplicationContext().inject(this) } - @Module - class TestModule { - // Do not use caching to ensure URLs are always used as the main data source when loading audio. - @Provides - @CacheAssetsLocally - fun provideCacheAssetsLocally(): Boolean = false - } - // TODO(#59): Figure out a way to reuse modules instead of needing to re-declare them. @Singleton @Component( @@ -303,7 +291,7 @@ class ReadingTextSizeFragmentTest { GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, ApplicationStartupListenerModule::class, RatioInputModule::class, HintsAndSolutionConfigModule::class, WorkManagerConfigurationModule::class, FirebaseLogUploaderModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/parser/HtmlParserTest.kt b/app/src/sharedTest/java/org/oppia/android/app/parser/HtmlParserTest.kt index 1ac4f3d429b..18dbb346651 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/parser/HtmlParserTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/parser/HtmlParserTest.kt @@ -98,7 +98,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.BuildEnvironment import org.oppia.android.testing.RunOn @@ -902,7 +901,7 @@ class HtmlParserTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt index 4f3fb329a19..4f16c244abb 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt @@ -83,7 +83,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.profile.ProfileManagementController import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.RunOn @@ -469,7 +468,7 @@ class AudioFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BottomSheetOptionsMenuTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BottomSheetOptionsMenuTest.kt index e378c5285bd..7fb19f1484f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BottomSheetOptionsMenuTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BottomSheetOptionsMenuTest.kt @@ -67,7 +67,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -178,7 +177,7 @@ class BottomSheetOptionsMenuTest { ImageClickInputModule::class, InteractionsModule::class, GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, - LogStorageModule::class, PrimeTopicAssetsControllerModule::class, + LogStorageModule::class, ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigFastShowTestModule::class, HintsAndSolutionProdModule::class, 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 856acf55f80..7bd81a986e5 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 @@ -119,7 +119,6 @@ import org.oppia.android.domain.topic.FRACTIONS_EXPLORATION_ID_0 import org.oppia.android.domain.topic.FRACTIONS_EXPLORATION_ID_1 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.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.RATIOS_EXPLORATION_ID_0 import org.oppia.android.domain.topic.RATIOS_STORY_ID_0 import org.oppia.android.domain.topic.RATIOS_TOPIC_ID @@ -2681,7 +2680,7 @@ class ExplorationActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt index 1c13ec60360..9d78a5d8add 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt @@ -139,7 +139,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu import org.oppia.android.domain.profile.ProfileManagementController import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_EXPLORATION_ID_1 -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_13 import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_2 import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_4 @@ -173,10 +172,8 @@ import org.oppia.android.testing.time.FakeOppiaClock import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.accessibility.AccessibilityTestModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadImagesFromAssets import org.oppia.android.util.caching.LoadLessonProtosFromAssets -import org.oppia.android.util.caching.TopicListToCache import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.EventLoggingConfigurationModule @@ -5295,14 +5292,6 @@ class StateFragmentTest { @Module class TestModule { - @Provides - @CacheAssetsLocally - fun provideCacheAssetsLocally(): Boolean = false - - @Provides - @TopicListToCache - fun provideTopicListToCache(): List = listOf() - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(testEnvironmentConfig: TestEnvironmentConfig): Boolean = @@ -5324,7 +5313,7 @@ class StateFragmentTest { ImageClickInputModule::class, InteractionsModule::class, GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, - LogStorageModule::class, PrimeTopicAssetsControllerModule::class, + LogStorageModule::class, ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigFastShowTestModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesActivityTest.kt index d8d95d2bab1..0a8a188d7a8 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesActivityTest.kt @@ -77,7 +77,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestImageLoaderModule import org.oppia.android.testing.TestLogReportingModule @@ -267,7 +266,7 @@ class PoliciesActivityTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesFragmentTest.kt index 07790dc33d8..b2dbeac200a 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesFragmentTest.kt @@ -89,7 +89,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestImageLoaderModule import org.oppia.android.testing.TestLogReportingModule @@ -347,7 +346,7 @@ class PoliciesFragmentTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt index 34dfb5f3b18..8e86e5b3162 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt @@ -93,7 +93,6 @@ import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModul import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -1783,7 +1782,7 @@ class AddProfileActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/AdminAuthActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/AdminAuthActivityTest.kt index cfabe083384..9565eb346fa 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profile/AdminAuthActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profile/AdminAuthActivityTest.kt @@ -79,7 +79,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -679,7 +678,7 @@ class AdminAuthActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/AdminPinActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/AdminPinActivityTest.kt index b6fdce97344..65271bf3b35 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profile/AdminPinActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profile/AdminPinActivityTest.kt @@ -88,7 +88,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -1097,7 +1096,7 @@ class AdminPinActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt index 90c78003600..ac5a4fded48 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt @@ -84,7 +84,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -1203,7 +1202,7 @@ class PinPasswordActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserActivityTest.kt index 74d2f607988..7a614bd8e83 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserActivityTest.kt @@ -59,7 +59,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -151,7 +150,7 @@ class ProfileChooserActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt index 5fff9c4006b..486696ac451 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt @@ -81,7 +81,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.profile.ProfileManagementController import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -516,7 +515,7 @@ class ProfileChooserFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfilePictureActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfilePictureActivityTest.kt index deb1c56251e..b76a7cd444b 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfilePictureActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfilePictureActivityTest.kt @@ -67,7 +67,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -207,7 +206,7 @@ class ProfilePictureActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressActivityTest.kt index 1cad2587804..f5a8f0327cf 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressActivityTest.kt @@ -59,7 +59,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -157,7 +156,7 @@ class ProfileProgressActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt index 2f83eb95f5d..48674129997 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt @@ -105,7 +105,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu 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.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -915,7 +914,7 @@ class ProfileProgressFragmentTest { ImageClickInputModule::class, InteractionsModule::class, GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, - LogStorageModule::class, CachingTestModule::class, PrimeTopicAssetsControllerModule::class, + LogStorageModule::class, CachingTestModule::class, ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt b/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt index c85a4d1c524..34043763783 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt @@ -95,7 +95,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -669,7 +668,7 @@ class BindableAdapterTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt index e1e8707c853..1fbafc05644 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt @@ -79,7 +79,6 @@ import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_EXPLORATION_ID_0 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.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -227,7 +226,7 @@ class ResumeLessonActivityTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt index cf138d0d1f3..580298cf992 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt @@ -78,7 +78,6 @@ import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_EXPLORATION_ID_0 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.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.RATIOS_EXPLORATION_ID_0 import org.oppia.android.domain.topic.RATIOS_STORY_ID_0 import org.oppia.android.domain.topic.RATIOS_TOPIC_ID @@ -307,7 +306,7 @@ class ResumeLessonFragmentTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt index 1b3a285f095..377b7ce6065 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt @@ -76,7 +76,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.profile.ProfileManagementController import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -359,7 +358,7 @@ class ProfileEditActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt index 72346233590..c84dcf7a4a2 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt @@ -81,7 +81,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.profile.ProfileManagementController import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -474,7 +473,7 @@ class ProfileEditFragmentTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListActivityTest.kt index ec65e61024a..fbbdf053490 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListActivityTest.kt @@ -59,7 +59,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -153,7 +152,7 @@ class ProfileListActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt index d94a0d75a11..859e0395e32 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt @@ -73,7 +73,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -382,7 +381,7 @@ class ProfileListFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameActivityTest.kt index 8aff6c18532..e10afd1c8a4 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameActivityTest.kt @@ -60,7 +60,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -178,7 +177,7 @@ class ProfileRenameActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentTest.kt index 77f2aa4d7d0..c83f50b1199 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentTest.kt @@ -75,7 +75,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -456,7 +455,7 @@ class ProfileRenameFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityTest.kt index 1e473a5e4a9..d209c9d2845 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityTest.kt @@ -61,7 +61,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -187,7 +186,7 @@ class ProfileResetPinActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentTest.kt index a78db5e7ce2..3e97d1bcbac 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentTest.kt @@ -76,7 +76,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -1019,7 +1018,7 @@ class ProfileResetPinFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt index 5fa6d2d41eb..9fffcb5bb70 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt @@ -90,7 +90,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.BuildEnvironment import org.oppia.android.testing.OppiaTestRule @@ -1232,7 +1231,7 @@ class SplashActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverTestModule::class, + ExpirationMetaDataRetrieverTestModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/spotlight/SpotlightFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/spotlight/SpotlightFragmentTest.kt index 35df5325f0e..d4b66ae4476 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/spotlight/SpotlightFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/spotlight/SpotlightFragmentTest.kt @@ -70,7 +70,6 @@ import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModul import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestImageLoaderModule import org.oppia.android.testing.TestLogReportingModule @@ -358,7 +357,7 @@ class SpotlightFragmentTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt index 1dda62f55f4..c75f0b4c2e6 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt @@ -78,7 +78,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_2 import org.oppia.android.domain.topic.TEST_STORY_ID_0 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 @@ -266,7 +265,7 @@ class StoryActivityTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, 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 3a9760cec83..66bd2a3aa3b 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 @@ -108,7 +108,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu 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.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.RATIOS_STORY_ID_0 import org.oppia.android.domain.topic.RATIOS_TOPIC_ID import org.oppia.android.domain.topic.TEST_STORY_ID_0 @@ -987,7 +986,7 @@ class StoryFragmentTest { GcsResourceModule::class, TestModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyActivityTest.kt index 61ace850d0e..3634f6f4a24 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyActivityTest.kt @@ -61,7 +61,6 @@ import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModul import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_2 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule @@ -180,7 +179,7 @@ class SurveyActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt index cf4de9db27c..b600558c0da 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt @@ -83,7 +83,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.survey.SurveyController -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_2 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule @@ -605,7 +604,7 @@ class SurveyFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt index 9e7aa64cd7e..2868bd62643 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt @@ -69,7 +69,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -224,7 +223,7 @@ class DragDropTestActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/FractionInputInteractionViewTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/FractionInputInteractionViewTestActivityTest.kt index fb4b7a677f4..45b86216d84 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/FractionInputInteractionViewTestActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/FractionInputInteractionViewTestActivityTest.kt @@ -68,7 +68,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.DisableAccessibilityChecks import org.oppia.android.testing.OppiaTestRule @@ -565,7 +564,7 @@ class FractionInputInteractionViewTestActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/ImageRegionSelectionInteractionViewTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/ImageRegionSelectionInteractionViewTest.kt index 86466c4f1c2..8d932d26bae 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/ImageRegionSelectionInteractionViewTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/ImageRegionSelectionInteractionViewTest.kt @@ -83,7 +83,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.RunOn @@ -443,7 +442,7 @@ class ImageRegionSelectionInteractionViewTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/InputInteractionViewTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/InputInteractionViewTestActivityTest.kt index 5b6cdd85319..44510d3b993 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/InputInteractionViewTestActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/InputInteractionViewTestActivityTest.kt @@ -68,7 +68,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.DisableAccessibilityChecks import org.oppia.android.testing.OppiaTestRule @@ -439,7 +438,7 @@ class InputInteractionViewTestActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt index 6ede2fb1889..4ea271422c2 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt @@ -95,7 +95,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.RunOn @@ -444,7 +443,7 @@ class NavigationDrawerActivityDebugTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt index 2ac71b84993..70aaa15c378 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt @@ -103,7 +103,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.RunOn @@ -1003,7 +1002,7 @@ class NavigationDrawerActivityProdTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/RatioInputInteractionViewTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/RatioInputInteractionViewTestActivityTest.kt index 3968ee5bda7..f766a7a1bb0 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/RatioInputInteractionViewTestActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/RatioInputInteractionViewTestActivityTest.kt @@ -75,7 +75,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.DisableAccessibilityChecks import org.oppia.android.testing.OppiaTestRule @@ -433,7 +432,7 @@ class RatioInputInteractionViewTestActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt index 906d24f97a1..8e71286fdd1 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt @@ -64,7 +64,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -199,7 +198,7 @@ class TestFontScaleConfigurationUtilActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/TextInputInteractionViewTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/TextInputInteractionViewTestActivityTest.kt index eb6af85cbb6..078853e8adf 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/TextInputInteractionViewTestActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/TextInputInteractionViewTestActivityTest.kt @@ -67,7 +67,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.DisableAccessibilityChecks import org.oppia.android.testing.OppiaTestRule @@ -232,7 +231,7 @@ class TextInputInteractionViewTestActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt index f59711ead38..efba70b62f0 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt @@ -68,7 +68,6 @@ import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModul import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -200,7 +199,7 @@ class TopicTestActivityForStoryTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListActivityTest.kt index b73ce7a0773..f0530ce0295 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListActivityTest.kt @@ -60,7 +60,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -166,7 +165,7 @@ class LicenseListActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListFragmentTest.kt index a8dd3ae36fd..09885e8ac1c 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListFragmentTest.kt @@ -75,7 +75,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -366,7 +365,7 @@ class LicenseListFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerActivityTest.kt index fb424fd2440..3ea236ab2cb 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerActivityTest.kt @@ -68,7 +68,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -270,7 +269,7 @@ class LicenseTextViewerActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerFragmentTest.kt index 07bb62e85c9..3844466c069 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerFragmentTest.kt @@ -65,7 +65,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -344,7 +343,7 @@ class LicenseTextViewerFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListActivityTest.kt index 0a2fd1f4fa4..f789fc779d9 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListActivityTest.kt @@ -60,7 +60,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -163,7 +162,7 @@ class ThirdPartyDependencyListActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListFragmentTest.kt index 419fa4515ef..80cd86cf6bc 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListFragmentTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -476,7 +475,7 @@ class ThirdPartyDependencyListFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt index a82efa5f8cb..dfe541ad7d9 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt @@ -78,7 +78,6 @@ import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.spotlight.SpotlightStateController 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.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.RunOn @@ -240,7 +239,7 @@ class TopicActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt index 875d5936cb5..c0fa5e63eb0 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt @@ -88,7 +88,6 @@ import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.spotlight.SpotlightStateController 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.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.RATIOS_STORY_ID_0 import org.oppia.android.domain.topic.RATIOS_TOPIC_ID import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule @@ -1010,7 +1009,7 @@ class TopicFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt index ac0c6ab72aa..1a2b0481674 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt @@ -94,7 +94,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.TEST_SKILL_ID_0 import org.oppia.android.domain.topic.TEST_SKILL_ID_1 import org.oppia.android.domain.translation.TranslationController @@ -115,10 +114,8 @@ import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.accessibility.AccessibilityTestModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadImagesFromAssets import org.oppia.android.util.caching.LoadLessonProtosFromAssets -import org.oppia.android.util.caching.TopicListToCache import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.EventLoggingConfigurationModule @@ -552,14 +549,6 @@ class ConceptCardFragmentTest { @Module class TestModule { - @Provides - @CacheAssetsLocally - fun provideCacheAssetsLocally(): Boolean = false - - @Provides - @TopicListToCache - fun provideTopicListToCache(): List = listOf() - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(testEnvironmentConfig: TestEnvironmentConfig): Boolean = @@ -583,7 +572,7 @@ class ConceptCardFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt index 9cfb0cd31d6..a815de78a00 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt @@ -83,7 +83,6 @@ import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModul import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.RATIOS_TOPIC_ID import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule @@ -484,7 +483,7 @@ class TopicInfoFragmentTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt index ed64716a398..54965e840e2 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt @@ -105,7 +105,6 @@ import org.oppia.android.domain.spotlight.SpotlightStateController import org.oppia.android.domain.topic.FRACTIONS_EXPLORATION_ID_0 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.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.RATIOS_STORY_ID_0 import org.oppia.android.domain.topic.RATIOS_TOPIC_ID import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule @@ -1176,7 +1175,7 @@ class TopicLessonsFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt index c4ec0d84a88..b2b4d5f6738 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt @@ -85,7 +85,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.spotlight.SpotlightStateController import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -448,7 +447,7 @@ class TopicPracticeFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt index 03423d24c83..61b68a1b66a 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt @@ -120,7 +120,6 @@ import org.oppia.android.domain.question.ViewHintScorePenalty import org.oppia.android.domain.question.WrongAnswerMasteryPenalty import org.oppia.android.domain.question.WrongAnswerScorePenalty import org.oppia.android.domain.topic.FRACTIONS_SKILL_ID_0 -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.translation.TranslationController import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.BuildEnvironment @@ -797,7 +796,7 @@ class QuestionPlayerActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, TestLogReportingModule::class, LogStorageModule::class, AccessibilityTestModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigFastShowTestModule::class, HintsAndSolutionProdModule::class, WorkManagerConfigurationModule::class, FirebaseLogUploaderModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt index de936dccb21..548b06cc94d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt @@ -86,7 +86,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.spotlight.SpotlightStateController import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -344,7 +343,7 @@ class TopicRevisionFragmentTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityTest.kt index d570e4ec204..29ab238fa23 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityTest.kt @@ -75,7 +75,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.translation.TranslationController import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.BuildEnvironment @@ -467,7 +466,7 @@ class RevisionCardActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, 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 5831cc043b5..8a051c466fb 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 @@ -94,7 +94,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.SUBTOPIC_TOPIC_ID import org.oppia.android.domain.topic.SUBTOPIC_TOPIC_ID_2 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 @@ -116,10 +115,8 @@ import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.accessibility.AccessibilityTestModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadImagesFromAssets import org.oppia.android.util.caching.LoadLessonProtosFromAssets -import org.oppia.android.util.caching.TopicListToCache import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.EventLoggingConfigurationModule @@ -755,14 +752,6 @@ class RevisionCardFragmentTest { @Module class TestModule { - @Provides - @CacheAssetsLocally - fun provideCacheAssetsLocally(): Boolean = false - - @Provides - @TopicListToCache - fun provideTopicListToCache(): List = listOf() - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(testEnvironmentConfig: TestEnvironmentConfig): Boolean = @@ -786,7 +775,7 @@ class RevisionCardFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/utility/RatioExtensionsTest.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/RatioExtensionsTest.kt index fa2d84e008c..bf574ee1c88 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/utility/RatioExtensionsTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/utility/RatioExtensionsTest.kt @@ -57,7 +57,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -151,7 +150,7 @@ class RatioExtensionsTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt index b583e012dc7..c73bc7cd385 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt @@ -71,7 +71,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -240,7 +239,7 @@ class WalkthroughActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt index 2b6ab7d39bc..cc05f433697 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt @@ -73,7 +73,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -286,7 +285,7 @@ class WalkthroughFinalFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt index ee17909aa1d..b15919a6a9a 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestImageLoaderModule @@ -89,10 +88,8 @@ import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.accessibility.AccessibilityTestModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadImagesFromAssets import org.oppia.android.util.caching.LoadLessonProtosFromAssets -import org.oppia.android.util.caching.TopicListToCache import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.EventLoggingConfigurationModule @@ -281,14 +278,6 @@ class WalkthroughTopicListFragmentTest { @Module class TestModule { - @Provides - @CacheAssetsLocally - fun provideCacheAssetsLocally(): Boolean = false - - @Provides - @TopicListToCache - fun provideTopicListToCache(): List = listOf() - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(testEnvironmentConfig: TestEnvironmentConfig): Boolean = @@ -312,7 +301,7 @@ class WalkthroughTopicListFragmentTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt index 288fa127272..4bcf05df001 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt @@ -69,7 +69,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule import org.oppia.android.testing.TestLogReportingModule @@ -209,7 +208,7 @@ class WalkthroughWelcomeFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt b/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt index 5d0844289a3..93492b7a700 100644 --- a/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt +++ b/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt @@ -61,7 +61,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -177,7 +176,7 @@ class ActivityIntentFactoriesTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverTestModule::class, + ExpirationMetaDataRetrieverTestModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterModuleTest.kt b/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterModuleTest.kt index d90f9471261..b3caf939c6d 100644 --- a/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterModuleTest.kt +++ b/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterModuleTest.kt @@ -62,7 +62,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -147,7 +146,7 @@ class ActivityRouterModuleTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverTestModule::class, + ExpirationMetaDataRetrieverTestModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterTest.kt b/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterTest.kt index f644125b802..018f6c22194 100644 --- a/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterTest.kt +++ b/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterTest.kt @@ -72,7 +72,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -197,7 +196,7 @@ class ActivityRouterTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverTestModule::class, + ExpirationMetaDataRetrieverTestModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt index afaedb709f7..f845e147edc 100644 --- a/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt @@ -64,7 +64,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.FakeAnalyticsEventLogger import org.oppia.android.testing.TestLogReportingModule @@ -215,7 +214,7 @@ class HomeActivityLocalTest { QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, diff --git a/app/src/test/java/org/oppia/android/app/parser/FractionParsingUiErrorTest.kt b/app/src/test/java/org/oppia/android/app/parser/FractionParsingUiErrorTest.kt index d22af58e95b..a29609a224a 100644 --- a/app/src/test/java/org/oppia/android/app/parser/FractionParsingUiErrorTest.kt +++ b/app/src/test/java/org/oppia/android/app/parser/FractionParsingUiErrorTest.kt @@ -56,7 +56,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -257,7 +256,7 @@ class FractionParsingUiErrorTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/test/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt b/app/src/test/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt index a7904d0d1cf..a9fcdf79edd 100644 --- a/app/src/test/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt @@ -80,7 +80,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.BuildEnvironment import org.oppia.android.testing.RunOn @@ -1066,7 +1065,7 @@ class ListItemLeadingMarginSpanTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/test/java/org/oppia/android/app/parser/StringToRatioParserTest.kt b/app/src/test/java/org/oppia/android/app/parser/StringToRatioParserTest.kt index b7d63c2d909..857d60e58b2 100644 --- a/app/src/test/java/org/oppia/android/app/parser/StringToRatioParserTest.kt +++ b/app/src/test/java/org/oppia/android/app/parser/StringToRatioParserTest.kt @@ -57,7 +57,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.assertThrows @@ -261,7 +260,7 @@ class StringToRatioParserTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt index 720d559a182..0cf238dc92e 100644 --- a/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu import org.oppia.android.domain.profile.ProfileManagementController import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.spotlight.SpotlightStateController -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_2 import org.oppia.android.domain.topic.TEST_STORY_ID_0 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 @@ -400,7 +399,7 @@ class ExplorationActivityLocalTest { QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, diff --git a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt index c5442bff54e..d92f2cdbcbf 100644 --- a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt @@ -128,7 +128,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_EXPLORATION_ID_1 -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_2 import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_5 import org.oppia.android.domain.topic.TEST_STORY_ID_0 @@ -158,10 +157,8 @@ import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.accessibility.AccessibilityTestModule import org.oppia.android.util.accessibility.FakeAccessibilityService import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadImagesFromAssets import org.oppia.android.util.caching.LoadLessonProtosFromAssets -import org.oppia.android.util.caching.TopicListToCache import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.EventLoggingConfigurationModule @@ -2905,14 +2902,6 @@ class StateFragmentLocalTest { fun provideLoadLessonProtosFromAssets(testEnvironmentConfig: TestEnvironmentConfig): Boolean = testEnvironmentConfig.isUsingBazel() - @Provides - @CacheAssetsLocally - fun provideCacheAssetsLocally(): Boolean = false - - @Provides - @TopicListToCache - fun provideTopicListToCache(): List = listOf() - @Provides @LoadImagesFromAssets fun provideLoadImagesFromAssets(): Boolean = false @@ -2931,7 +2920,7 @@ class StateFragmentLocalTest { GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt index 9ac373f8edd..08cdaebaa1e 100644 --- a/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt @@ -58,7 +58,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.FakeAnalyticsEventLogger import org.oppia.android.testing.TestLogReportingModule @@ -137,7 +136,7 @@ class ProfileChooserFragmentLocalTest { GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt index 2b60ef54096..b33bfd21057 100644 --- a/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt @@ -60,7 +60,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.FakeAnalyticsEventLogger import org.oppia.android.testing.TestLogReportingModule @@ -162,7 +161,7 @@ class StoryActivityLocalTest { GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt index b837db394bf..cc619e22643 100644 --- a/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt @@ -62,7 +62,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -170,7 +169,7 @@ class CompletedStoryListSpanTest { QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, diff --git a/app/src/test/java/org/oppia/android/app/testing/HomeSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/HomeSpanTest.kt index 1ed839774da..15ba67235c2 100644 --- a/app/src/test/java/org/oppia/android/app/testing/HomeSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/HomeSpanTest.kt @@ -62,7 +62,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -184,7 +183,7 @@ class HomeSpanTest { QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, diff --git a/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt index 6f4ecf14c9a..938f1b15315 100644 --- a/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt @@ -63,7 +63,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -181,7 +180,7 @@ class OngoingTopicListSpanTest { QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, diff --git a/app/src/test/java/org/oppia/android/app/testing/PlatformParameterIntegrationTest.kt b/app/src/test/java/org/oppia/android/app/testing/PlatformParameterIntegrationTest.kt index 68f5e78c518..1479b7ac0ba 100644 --- a/app/src/test/java/org/oppia/android/app/testing/PlatformParameterIntegrationTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/PlatformParameterIntegrationTest.kt @@ -79,7 +79,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu import org.oppia.android.domain.platformparameter.syncup.PlatformParameterSyncUpWorker import org.oppia.android.domain.platformparameter.syncup.PlatformParameterSyncUpWorkerFactory import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -353,7 +352,7 @@ class PlatformParameterIntegrationTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt index e0f11812c55..a2d51b9700e 100644 --- a/app/src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt @@ -61,7 +61,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -383,7 +382,7 @@ class ProfileChooserSpanTest { QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, diff --git a/app/src/test/java/org/oppia/android/app/testing/ProfileProgressSpanCountTest.kt b/app/src/test/java/org/oppia/android/app/testing/ProfileProgressSpanCountTest.kt index 4dd699158b9..a90ccb0e68a 100644 --- a/app/src/test/java/org/oppia/android/app/testing/ProfileProgressSpanCountTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/ProfileProgressSpanCountTest.kt @@ -62,7 +62,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -167,7 +166,7 @@ class ProfileProgressSpanCountTest { QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, diff --git a/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt index 8d05adc7ebf..ea864242469 100644 --- a/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt @@ -65,7 +65,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -308,7 +307,7 @@ class RecentlyPlayedSpanTest { QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, diff --git a/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt index 55574573642..5752b411ce5 100644 --- a/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt @@ -61,7 +61,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -167,7 +166,7 @@ class TopicRevisionSpanTest { QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, diff --git a/app/src/test/java/org/oppia/android/app/testing/activity/TestActivityTest.kt b/app/src/test/java/org/oppia/android/app/testing/activity/TestActivityTest.kt index 23e0211298b..c2a673eb4ea 100644 --- a/app/src/test/java/org/oppia/android/app/testing/activity/TestActivityTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/activity/TestActivityTest.kt @@ -58,7 +58,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -191,7 +190,7 @@ class TestActivityTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverTestModule::class, + ExpirationMetaDataRetrieverTestModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/app/src/test/java/org/oppia/android/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt index c9d01ffbce5..aebe473aca5 100644 --- a/app/src/test/java/org/oppia/android/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt @@ -68,7 +68,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -191,7 +190,7 @@ class AdministratorControlsFragmentTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt index 462d087efd6..721cca5d84e 100644 --- a/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt @@ -64,7 +64,6 @@ import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModul import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -226,7 +225,7 @@ class OptionsFragmentTest { GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, ApplicationStartupListenerModule::class, RatioInputModule::class, HintsAndSolutionConfigModule::class, NetworkConfigProdModule::class, WorkManagerConfigurationModule::class, LogReportWorkerModule::class, diff --git a/app/src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTest.kt b/app/src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTest.kt index 9e3c3edc499..1bab51614ef 100644 --- a/app/src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTest.kt @@ -59,7 +59,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -200,7 +199,7 @@ class PlayerSplitScreenTest { QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, diff --git a/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt b/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt index fd39ae0660e..14fa74c13ae 100644 --- a/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt @@ -65,7 +65,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_4 import org.oppia.android.domain.topic.TEST_STORY_ID_0 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 @@ -207,7 +206,7 @@ class StateFragmentAccessibilityTest { QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, CachingTestModule::class, RatioInputModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, diff --git a/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt index f4e4081e436..562e91a86f9 100644 --- a/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt @@ -57,7 +57,6 @@ import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModul import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.FakeAnalyticsEventLogger import org.oppia.android.testing.TestLogReportingModule @@ -151,7 +150,7 @@ class TopicInfoFragmentLocalTest { GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt index d48ad3f170c..5a7b0c92d7a 100644 --- a/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt @@ -57,7 +57,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.FakeAnalyticsEventLogger import org.oppia.android.testing.TestLogReportingModule @@ -153,7 +152,7 @@ class TopicLessonsFragmentLocalTest { GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class, diff --git a/app/src/test/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt index c5cfcca74d3..04a1c0859ff 100644 --- a/app/src/test/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt @@ -84,7 +84,6 @@ import org.oppia.android.domain.question.ViewHintMasteryPenalty import org.oppia.android.domain.question.ViewHintScorePenalty import org.oppia.android.domain.question.WrongAnswerMasteryPenalty import org.oppia.android.domain.question.WrongAnswerScorePenalty -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.TEST_SKILL_ID_1 import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule @@ -500,7 +499,7 @@ class QuestionPlayerActivityLocalTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, ApplicationStartupListenerModule::class, RatioInputModule::class, HintsAndSolutionConfigModule::class, NetworkConfigProdModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt index 8667a942f21..ed01d419abe 100644 --- a/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt @@ -58,7 +58,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.SUBTOPIC_TOPIC_ID import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.FakeAnalyticsEventLogger @@ -144,7 +143,7 @@ class RevisionCardActivityLocalTest { GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, ImageClickInputModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, + ExpirationMetaDataRetrieverModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/app/src/test/java/org/oppia/android/app/translation/ActivityLanguageLocaleHandlerTest.kt b/app/src/test/java/org/oppia/android/app/translation/ActivityLanguageLocaleHandlerTest.kt index 408d7df55fa..c60af9cf356 100644 --- a/app/src/test/java/org/oppia/android/app/translation/ActivityLanguageLocaleHandlerTest.kt +++ b/app/src/test/java/org/oppia/android/app/translation/ActivityLanguageLocaleHandlerTest.kt @@ -70,7 +70,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.translation.TranslationController import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule @@ -316,7 +315,7 @@ class ActivityLanguageLocaleHandlerTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverTestModule::class, + ExpirationMetaDataRetrieverTestModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/app/src/test/java/org/oppia/android/app/translation/AppLanguageResourceHandlerTest.kt b/app/src/test/java/org/oppia/android/app/translation/AppLanguageResourceHandlerTest.kt index e4283fedc76..e97ecb73b7d 100644 --- a/app/src/test/java/org/oppia/android/app/translation/AppLanguageResourceHandlerTest.kt +++ b/app/src/test/java/org/oppia/android/app/translation/AppLanguageResourceHandlerTest.kt @@ -63,7 +63,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.translation.TranslationController import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule @@ -609,7 +608,7 @@ class AppLanguageResourceHandlerTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverTestModule::class, + ExpirationMetaDataRetrieverTestModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/app/src/test/java/org/oppia/android/app/translation/AppLanguageWatcherMixinTest.kt b/app/src/test/java/org/oppia/android/app/translation/AppLanguageWatcherMixinTest.kt index f3231f3ac7e..2bb7f687b8c 100644 --- a/app/src/test/java/org/oppia/android/app/translation/AppLanguageWatcherMixinTest.kt +++ b/app/src/test/java/org/oppia/android/app/translation/AppLanguageWatcherMixinTest.kt @@ -68,7 +68,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.translation.TranslationController import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule @@ -298,7 +297,7 @@ class AppLanguageWatcherMixinTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverTestModule::class, + ExpirationMetaDataRetrieverTestModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/app/src/test/java/org/oppia/android/app/utility/datetime/DateTimeUtilTest.kt b/app/src/test/java/org/oppia/android/app/utility/datetime/DateTimeUtilTest.kt index ea9a9d89a34..c709292fa29 100644 --- a/app/src/test/java/org/oppia/android/app/utility/datetime/DateTimeUtilTest.kt +++ b/app/src/test/java/org/oppia/android/app/utility/datetime/DateTimeUtilTest.kt @@ -59,7 +59,6 @@ import org.oppia.android.domain.oppialogger.analytics.CpuPerformanceSnapshotterM import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -219,7 +218,7 @@ class DateTimeUtilTest { NumberWithUnitsRuleModule::class, NumericInputRuleModule::class, TextInputRuleModule::class, DragDropSortInputModule::class, ImageClickInputModule::class, RatioInputModule::class, HintsAndSolutionConfigModule::class, ExpirationMetaDataRetrieverModule::class, - GlideImageLoaderModule::class, PrimeTopicAssetsControllerModule::class, + GlideImageLoaderModule::class, HtmlParserEntityTypeModule::class, NetworkConnectionDebugUtilModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class, AssetModule::class, LocaleProdModule::class, ActivityRecreatorTestModule::class, diff --git a/app/src/test/java/org/oppia/android/app/utility/math/MathExpressionAccessibilityUtilTest.kt b/app/src/test/java/org/oppia/android/app/utility/math/MathExpressionAccessibilityUtilTest.kt index 97bff878691..3ad3164a1b1 100644 --- a/app/src/test/java/org/oppia/android/app/utility/math/MathExpressionAccessibilityUtilTest.kt +++ b/app/src/test/java/org/oppia/android/app/utility/math/MathExpressionAccessibilityUtilTest.kt @@ -76,7 +76,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -1326,7 +1325,7 @@ class MathExpressionAccessibilityUtilTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverTestModule::class, + ExpirationMetaDataRetrieverTestModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/NetworkModule.kt b/data/src/main/java/org/oppia/android/data/backends/gae/NetworkModule.kt index 95fd5d0a1a2..0ac58d8fe72 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/NetworkModule.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/NetworkModule.kt @@ -6,10 +6,8 @@ import com.google.common.base.Optional import dagger.Module import dagger.Provides import okhttp3.OkHttpClient -import org.oppia.android.data.backends.gae.api.ClassroomService import org.oppia.android.data.backends.gae.api.FeedbackReportingService import org.oppia.android.data.backends.gae.api.PlatformParameterService -import org.oppia.android.data.backends.gae.api.TopicService import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory import javax.inject.Singleton @@ -49,20 +47,6 @@ class NetworkModule { } else Optional.absent() } - @Provides - @Singleton - fun provideTopicService(@OppiaRetrofit retrofit: Optional): Optional { - return retrofit.map { it.create(TopicService::class.java) } - } - - @Provides - @Singleton - fun provideClassroomService( - @OppiaRetrofit retrofit: Optional - ): Optional { - return retrofit.map { it.create(ClassroomService::class.java) } - } - @Provides @Singleton fun provideFeedbackReportingService( diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/BUILD.bazel b/data/src/main/java/org/oppia/android/data/backends/gae/api/BUILD.bazel index c87c159e8d8..061847f486c 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/BUILD.bazel +++ b/data/src/main/java/org/oppia/android/data/backends/gae/api/BUILD.bazel @@ -8,15 +8,8 @@ load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "api", srcs = [ - "ClassroomService.kt", - "ConceptCardService.kt", - "ExplorationService.kt", "FeedbackReportingService.kt", "PlatformParameterService.kt", - "QuestionPlayerService.kt", - "StoryService.kt", - "SubtopicService.kt", - "TopicService.kt", ], custom_package = "org.oppia.android.data.backends.gae.api", visibility = ["//:oppia_api_visibility"], diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/ClassroomService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/ClassroomService.kt deleted file mode 100644 index 39b1afd32aa..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/ClassroomService.kt +++ /dev/null @@ -1,13 +0,0 @@ -package org.oppia.android.data.backends.gae.api - -import org.oppia.android.data.backends.gae.model.GaeClassroom -import retrofit2.Call -import retrofit2.http.GET -import retrofit2.http.Path - -/** Service that provides access to classroom endpoints. */ -interface ClassroomService { - - @GET("classroom_data_handler/{classroom_name}") - fun getClassroom(@Path("classroom_name") classroomName: String): Call -} diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/ConceptCardService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/ConceptCardService.kt deleted file mode 100644 index a23b7a3427c..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/ConceptCardService.kt +++ /dev/null @@ -1,13 +0,0 @@ -package org.oppia.android.data.backends.gae.api - -import org.oppia.android.data.backends.gae.model.GaeConceptCard -import retrofit2.Call -import retrofit2.http.GET -import retrofit2.http.Query - -/** Service that provides access to concept-card endpoints. */ -interface ConceptCardService { - - @GET("concept_card_handler/{comma_separated_skill_ids}") - fun getSkillContents(@Query("comma_separated_skill_ids") skillIds: String): Call -} diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/ExplorationService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/ExplorationService.kt deleted file mode 100755 index 1237fcb29a2..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/ExplorationService.kt +++ /dev/null @@ -1,15 +0,0 @@ -package org.oppia.android.data.backends.gae.api - -import org.oppia.android.data.backends.gae.model.GaeExplorationContainer -import retrofit2.Call -import retrofit2.http.GET -import retrofit2.http.Path - -/** Service that provides access to exploration endpoints. */ -interface ExplorationService { - - @GET("explorehandler/init/{exploration_id}") - fun getExplorationById( - @Path("exploration_id") explorationId: String - ): Call -} diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/QuestionPlayerService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/QuestionPlayerService.kt deleted file mode 100644 index b104b35ee81..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/QuestionPlayerService.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.oppia.android.data.backends.gae.api - -import org.oppia.android.data.backends.gae.model.GaeQuestionPlayer -import retrofit2.Call -import retrofit2.http.GET -import retrofit2.http.Query - -/** Service that provides access to question-player endpoints. */ -interface QuestionPlayerService { - - @GET("question_player_handler") - fun getQuestionPlayerBySkillIds( - @Query("skill_ids") skillIds: String, - @Query("question_count") questionCount: Int - ): Call -} diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/StoryService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/StoryService.kt deleted file mode 100644 index ca618a2688c..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/StoryService.kt +++ /dev/null @@ -1,18 +0,0 @@ -package org.oppia.android.data.backends.gae.api - -import org.oppia.android.data.backends.gae.model.GaeStory -import retrofit2.Call -import retrofit2.http.GET -import retrofit2.http.Path -import retrofit2.http.Query - -/** Service that provides access to story endpoints. */ -interface StoryService { - - @GET("story_data_handler/{story_id}") - fun getStory( - @Path("story_id") storyId: String, - @Query("user_id") userId: String?, - @Query("user") user: String? - ): Call -} diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/SubtopicService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/SubtopicService.kt deleted file mode 100644 index 3eaded654a3..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/SubtopicService.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.oppia.android.data.backends.gae.api - -import org.oppia.android.data.backends.gae.model.GaeSubtopic -import retrofit2.Call -import retrofit2.http.GET -import retrofit2.http.Path - -/** Service that provides access to subtopic endpoints. */ -interface SubtopicService { - - @GET("subtopic_data_handler/{topic_name}/{subtopic_id}") - fun getSubtopic( - @Path("topic_name") topicName: String, - @Path("subtopic_id") subtopicId: String - ): Call -} diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/TopicService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/TopicService.kt deleted file mode 100755 index 04248ea5d2c..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/TopicService.kt +++ /dev/null @@ -1,13 +0,0 @@ -package org.oppia.android.data.backends.gae.api - -import org.oppia.android.data.backends.gae.model.GaeTopic -import retrofit2.Call -import retrofit2.http.GET -import retrofit2.http.Path - -/** Service that provides access to topic endpoints. */ -interface TopicService { - - @GET("topic_data_handler/{topic_name}") - fun getTopicByName(@Path("topic_name") topicName: String): Call -} diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/BUILD.bazel b/data/src/main/java/org/oppia/android/data/backends/gae/model/BUILD.bazel index 301ffbe089b..16cdde248bf 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/BUILD.bazel +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/BUILD.bazel @@ -8,44 +8,12 @@ load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "model", srcs = [ - "GaeAnswerGroup.kt", - "GaeClassroom.kt", - "GaeConceptCard.kt", - "GaeCustomizationArgs.kt", - "GaeExpSummary.kt", - "GaeExploration.kt", - "GaeExplorationContainer.kt", "GaeFeedbackReport.kt", "GaeFeedbackReportingAppContext.kt", "GaeFeedbackReportingDeviceContext.kt", "GaeFeedbackReportingEntryPoint.kt", "GaeFeedbackReportingSystemContext.kt", - "GaeHint.kt", - "GaeInteractionInstance.kt", - "GaeOutcome.kt", - "GaeParamChange.kt", - "GaeParamSpec.kt", - "GaeQuestion.kt", - "GaeQuestionPlayer.kt", - "GaeRecordedVoiceovers.kt", - "GaeRuleSpec.kt", - "GaeSkillContents.kt", - "GaeSolution.kt", - "GaeState.kt", - "GaeStateClassifier.kt", - "GaeStory.kt", - "GaeStoryNode.kt", - "GaeStorySummary.kt", - "GaeSubtitledHtml.kt", - "GaeSubtopic.kt", - "GaeSubtopicPageContents.kt", - "GaeSubtopicSummary.kt", - "GaeTopic.kt", - "GaeTopicSummary.kt", "GaeUserSuppliedFeedback.kt", - "GaeVoiceover.kt", - "GaeWrittenTranslation.kt", - "GaeWrittenTranslations.kt", ], custom_package = "org.oppia.android.data.backends.gae.model", visibility = ["//:oppia_api_visibility"], diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeAnswerGroup.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeAnswerGroup.kt deleted file mode 100755 index 71317e86858..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeAnswerGroup.kt +++ /dev/null @@ -1,18 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for AnswerGroup model - * https://github.com/oppia/oppia/blob/15516a/core/domain/state_domain.py#L43 - */ -@JsonClass(generateAdapter = true) -data class GaeAnswerGroup( - - @Json(name = "tagged_skill_misconception_id") val taggedSkillMisconceptionId: String?, - @Json(name = "outcome") val outcome: GaeOutcome?, - @Json(name = "rule_specs") val ruleSpecs: List?, - @Json(name = "training_data") val trainingData: List - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeClassroom.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeClassroom.kt deleted file mode 100644 index 9d9a1363299..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeClassroom.kt +++ /dev/null @@ -1,15 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for Classroom model containing full information - * https://github.com/oppia/oppia/blob/77d6fd/core/controllers/classroom.py#L49 - */ -@JsonClass(generateAdapter = true) -data class GaeClassroom( - - @Json(name = "topic_summary_dicts") val topicSummaryDicts: List? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeConceptCard.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeConceptCard.kt deleted file mode 100644 index d50d816c8a8..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeConceptCard.kt +++ /dev/null @@ -1,15 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for ConceptCard model - * https://github.com/oppia/oppia/blob/b33aa9/core/controllers/concept_card_viewer.py#L30 - */ -@JsonClass(generateAdapter = true) -data class GaeConceptCard( - - @Json(name = "concept_card_dicts") val conceptCardDicts: List? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeCustomizationArgs.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeCustomizationArgs.kt deleted file mode 100755 index 1fd42f4bb84..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeCustomizationArgs.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for CustomizationArgs model - * https://github.com/oppia/oppia/blob/15516a/core/domain/param_domain.py#L99 - */ -@JsonClass(generateAdapter = true) -data class GaeCustomizationArgs( - - @Json(name = "parse_with_jinja") val isParseWithJinja: Boolean?, - @Json(name = "value") val value: Any? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExpSummary.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExpSummary.kt deleted file mode 100644 index 1c85bf5b94e..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExpSummary.kt +++ /dev/null @@ -1,25 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for ExpSummary model - * https://github.com/oppia/oppia/blob/b56a20/core/domain/summary_services.py#L340 - */ -@JsonClass(generateAdapter = true) -data class GaeExpSummary( - - @Json(name = "title") val title: String?, - @Json(name = "status") val status: String?, - @Json(name = "category") val category: String?, - @Json(name = "objective") val objective: String?, - @Json(name = "num_views") val numViews: Int?, - @Json(name = "activity_type") val activityType: String?, - @Json(name = "id") val id: String?, - @Json(name = "created_on_msec") val createdOnMsec: Double?, - @Json(name = "last_updated_msec") val lastUpdatedMsec: Double?, - @Json(name = "ratings") val ratings: Map?, - @Json(name = "tags") val tags: List? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExploration.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExploration.kt deleted file mode 100755 index 14d610d4e98..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExploration.kt +++ /dev/null @@ -1,21 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for Exploration model - * https://github.com/oppia/oppia/blob/15516a/core/domain/exp_domain.py#L3272 - */ -@JsonClass(generateAdapter = true) -data class GaeExploration( - - @Json(name = "states") val states: Map?, - @Json(name = "param_changes") val paramChanges: List?, - @Json(name = "param_specs") val paramSpecs: Map?, - @Json(name = "init_state_name") val initStateName: String?, - @Json(name = "objective") val objective: String?, - @Json(name = "correctness_feedback_enabled") val isCorrectnessFeedbackEnabled: Boolean?, - @Json(name = "title") val title: String? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExplorationContainer.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExplorationContainer.kt deleted file mode 100755 index 9a3491dc121..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExplorationContainer.kt +++ /dev/null @@ -1,34 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for ExplorationContainer model - * https://github.com/oppia/oppia/blob/15516a/core/controllers/reader.py#L245 - */ -@JsonClass(generateAdapter = true) -data class GaeExplorationContainer( - - @Json(name = "record_playthrough_probability") - val recordPlaythroughProbability: Float?, - @Json(name = "exploration_id") - val explorationId: String?, - @Json(name = "state_classifier_mapping") - val stateClassifierMapping: Map?, - @Json(name = "user_email") - val userEmail: String?, - @Json(name = "version") - val version: Int?, - @Json(name = "correctness_feedback_enabled") - val isCorrectnessFeedbackEnabled: Boolean?, - @Json(name = "username") - val username: String?, - @Json(name = "is_logged_in") - val isLoggedIn: Boolean?, - @Json(name = "exploration") - val exploration: GaeExploration?, - @Json(name = "session_id") - val sessionId: String? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeHint.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeHint.kt deleted file mode 100755 index 4802f860541..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeHint.kt +++ /dev/null @@ -1,15 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for Hint model - * https://github.com/oppia/oppia/blob/15516a/core/domain/state_domain.py#L163 - */ -@JsonClass(generateAdapter = true) -data class GaeHint( - - @Json(name = "hint_content") val hintContent: GaeSubtitledHtml? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeInteractionInstance.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeInteractionInstance.kt deleted file mode 100755 index dbc4e678562..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeInteractionInstance.kt +++ /dev/null @@ -1,21 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for InteractionInstance model - * https://github.com/oppia/oppia/blob/15516a/core/domain/state_domain.py#L277 - */ -@JsonClass(generateAdapter = true) -data class GaeInteractionInstance( - - @Json(name = "id") val id: String?, - @Json(name = "answer_groups") val answerGroups: List?, - @Json(name = "solution") val solution: GaeSolution?, - @Json(name = "confirmed_unclassified_answers") val confirmedUnclassifiedAnswers: List?, - @Json(name = "hints") val hints: List?, - @Json(name = "default_outcome") val outcome: GaeOutcome?, - @Json(name = "customization_args") val customizationArgs: Map? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeOutcome.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeOutcome.kt deleted file mode 100755 index 75566a5f225..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeOutcome.kt +++ /dev/null @@ -1,20 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for Outcome model - * https://github.com/oppia/oppia/blob/15516a/core/domain/state_domain.py#L533 - */ -@JsonClass(generateAdapter = true) -data class GaeOutcome( - - @Json(name = "dest") val dest: String?, - @Json(name = "refresher_exploration_id") val refresherExplorationId: String?, - @Json(name = "feedback") val feedback: GaeSubtitledHtml?, - @Json(name = "param_changes") val paramChanges: List?, - @Json(name = "missing_prerequisite_skill_id") val missingPrerequisiteSkillId: String?, - @Json(name = "labelled_as_correct") val isLabelledAsCorrect: Boolean? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamChange.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamChange.kt deleted file mode 100755 index 6e4f59be254..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamChange.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for ParamChange model - * https://github.com/oppia/oppia/blob/15516a/core/domain/param_domain.py#L149 - */ -@JsonClass(generateAdapter = true) -data class GaeParamChange( - - @Json(name = "generator_id") val generatorId: String?, - @Json(name = "name") val name: String?, - @Json(name = "customization_args") val customizationArgs: GaeCustomizationArgs? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamSpec.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamSpec.kt deleted file mode 100755 index b85870be504..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamSpec.kt +++ /dev/null @@ -1,15 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for ParamSpec model - * https://github.com/oppia/oppia/blob/15516a/core/domain/param_domain.py#L47 - */ -@JsonClass(generateAdapter = true) -data class GaeParamSpec( - - @Json(name = "obj_type") val objType: String? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestion.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestion.kt deleted file mode 100644 index f6bb8344394..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestion.kt +++ /dev/null @@ -1,18 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for Question model - * https://github.com/oppia/oppia/blob/b33aa9/core/domain/question_domain.py#L144 - */ -@JsonClass(generateAdapter = true) -data class GaeQuestion( - - @Json(name = "id") val id: String?, - @Json(name = "question_state_data") val state: GaeState?, - @Json(name = "version") val version: Int?, - @Json(name = "linked_skill_ids") val linkedSkillIds: List? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestionPlayer.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestionPlayer.kt deleted file mode 100644 index 445d4c3548b..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestionPlayer.kt +++ /dev/null @@ -1,15 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class model for Questions List - * https://github.com/oppia/oppia/blob/b33aa9/core/controllers/reader.py#L1008 - */ -@JsonClass(generateAdapter = true) -data class GaeQuestionPlayer( - - @Json(name = "question_dicts") val questions: List? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRecordedVoiceovers.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRecordedVoiceovers.kt deleted file mode 100755 index 38bfd33b17a..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRecordedVoiceovers.kt +++ /dev/null @@ -1,15 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for RecordedVoiceovers model - * https://github.com/oppia/oppia/blob/15516a/core/domain/state_domain.py#L967 - */ -@JsonClass(generateAdapter = true) -data class GaeRecordedVoiceovers( - - @Json(name = "voiceovers_mapping") val voiceoversMapping: Map>? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRuleSpec.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRuleSpec.kt deleted file mode 100755 index e088a75e06b..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRuleSpec.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for RuleSpec model - * https://github.com/oppia/oppia/blob/15516a/core/domain/state_domain.py#L1113 - */ -@JsonClass(generateAdapter = true) -data class GaeRuleSpec( - - @Json(name = "inputs") val inputs: Map?, - @Json(name = "rule_type") val ruleType: String? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSkillContents.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSkillContents.kt deleted file mode 100644 index 7b6249c5986..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSkillContents.kt +++ /dev/null @@ -1,18 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for SkillContents model - * https://github.com/oppia/oppia/blob/b33aa9/core/domain/skill_domain.py#L285 - */ -@JsonClass(generateAdapter = true) -data class GaeSkillContents( - - @Json(name = "explanation") val explanation: GaeSubtitledHtml?, - @Json(name = "worked_examples") val workedExamples: List?, - @Json(name = "recorded_voiceovers") val recordedVoiceovers: GaeRecordedVoiceovers?, - @Json(name = "written_translations") val writtenTranslations: GaeWrittenTranslations? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSolution.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSolution.kt deleted file mode 100755 index cb30bac73bc..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSolution.kt +++ /dev/null @@ -1,18 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for Solution model - * https://github.com/oppia/oppia/blob/15516a/core/domain/state_domain.py#L221 - */ -@JsonClass(generateAdapter = true) -data class GaeSolution( - - @Json(name = "interaction_id") val interactionId: String?, - @Json(name = "answer_is_exclusive") val isAnswerExclusive: Boolean?, - @Json(name = "correct_answer") val correctAnswer: String?, - @Json(name = "explanation") val explanation: GaeSubtitledHtml? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeState.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeState.kt deleted file mode 100755 index 941cdecd343..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeState.kt +++ /dev/null @@ -1,21 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for State model - * https://github.com/oppia/oppia/blob/15516a/core/domain/state_domain.py#L1774 - */ -@JsonClass(generateAdapter = true) -data class GaeState( - - @Json(name = "recorded_voiceovers") val recordedVoiceovers: GaeRecordedVoiceovers?, - @Json(name = "content") val content: GaeSubtitledHtml?, - @Json(name = "written_translations") val writtenTranslations: GaeWrittenTranslations?, - @Json(name = "param_changes") val paramChanges: List?, - @Json(name = "classifier_model_id") val classifierModelId: String?, - @Json(name = "interaction") val interactionInstance: GaeInteractionInstance?, - @Json(name = "solicit_answer_details") val isSolicitAnswerDetails: Boolean? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStateClassifier.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStateClassifier.kt deleted file mode 100755 index 1ebac543064..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStateClassifier.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for StateClassifier model - * https://github.com/oppia/oppia/blob/15516a/core/controllers/reader.py#L239 - */ -@JsonClass(generateAdapter = true) -data class GaeStateClassifier( - - @Json(name = "algorithm_id") val algorithmId: String?, - @Json(name = "classifier_data") val classifierData: Any?, - @Json(name = "data_schema_version") val dataSchemaVersion: Int? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStory.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStory.kt deleted file mode 100644 index d9e6d3a1446..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStory.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for Story model - * https://github.com/oppia/oppia/blob/b56a20/core/controllers/story_viewer.py#L47 - */ -@JsonClass(generateAdapter = true) -data class GaeStory( - - @Json(name = "story_title") val storyTitle: String?, - @Json(name = "story_description") val storyDescription: String?, - @Json(name = "story_nodes") val storyNodes: List? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStoryNode.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStoryNode.kt deleted file mode 100644 index 0af8d6db5c4..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStoryNode.kt +++ /dev/null @@ -1,24 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for StoryNode model - * https://github.com/oppia/oppia/blob/b56a20/core/domain/story_domain.py#L226 - */ -@JsonClass(generateAdapter = true) -data class GaeStoryNode( - - @Json(name = "id") val id: String?, - @Json(name = "title") val title: String?, - @Json(name = "destination_node_ids") val destinationNodeIds: List?, - @Json(name = "acquired_skill_ids") val acquiredSkillIds: List?, - @Json(name = "prerequisite_skill_ids") val prerequisiteSkillIds: List?, - @Json(name = "outline") val outline: String?, - @Json(name = "outline_is_finalized") val isOutlineFinalized: Boolean?, - @Json(name = "exploration_id") val explorationId: String?, - @Json(name = "exp_summary_dict") val explorationSummaryDict: GaeExpSummary?, - @Json(name = "completed") val isCompleted: Boolean? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStorySummary.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStorySummary.kt deleted file mode 100755 index a07193046af..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStorySummary.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for story summary model with minimum details - * https://github.com/oppia/oppia/blob/b33aa9/core/domain/story_domain.py#L1118 - */ -@JsonClass(generateAdapter = true) -data class GaeStorySummary( - - @Json(name = "id") val storyId: String?, - @Json(name = "title") val title: String?, - @Json(name = "description") val description: String? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtitledHtml.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtitledHtml.kt deleted file mode 100755 index eb4a4accf86..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtitledHtml.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for SubtitledHtml model - * https://github.com/oppia/oppia/blob/15516a/core/domain/state_domain.py#L1243 - */ -@JsonClass(generateAdapter = true) -data class GaeSubtitledHtml( - - @Json(name = "html") val html: String?, - @Json(name = "content_id") val contentId: String? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopic.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopic.kt deleted file mode 100644 index e40cc97e7d5..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopic.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for Subtopic model - * https://github.com/oppia/oppia/blob/b33aa9/core/controllers/subtopic_viewer.py#L31 - */ -@JsonClass(generateAdapter = true) -data class GaeSubtopic( - - @Json(name = "subtopic_title") val subtopicTitle: String?, - @Json(name = "page_contents") val pageContents: GaeSubtopicPageContents? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicPageContents.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicPageContents.kt deleted file mode 100644 index e8cf5a20a15..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicPageContents.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for SubtopicPageContents model - * https://github.com/oppia/oppia/blob/b33aa9/core/domain/subtopic_page_domain.py#L112 - */ -@JsonClass(generateAdapter = true) -data class GaeSubtopicPageContents( - - @Json(name = "subtitled_html") val content: GaeSubtitledHtml?, - @Json(name = "recorded_voiceovers") val recordedVoiceovers: GaeRecordedVoiceovers?, - @Json(name = "written_translations") val writtenTranslations: GaeWrittenTranslations? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicSummary.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicSummary.kt deleted file mode 100755 index 4e7bfe2e83b..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicSummary.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for Subtopic summary model - * https://github.com/oppia/oppia/blob/b33aa9/core/domain/topic_domain.py#L297 - */ -@JsonClass(generateAdapter = true) -data class GaeSubtopicSummary( - - @Json(name = "id") val subtopicId: String?, - @Json(name = "title") val title: String?, - @Json(name = "skill_ids") val skillIds: List? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopic.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopic.kt deleted file mode 100755 index 811a304490e..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopic.kt +++ /dev/null @@ -1,25 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for Topic model containing full information - * https://github.com/oppia/oppia/blob/b33aa9/core/controllers/topic_viewer.py#L45 - */ -@JsonClass(generateAdapter = true) -data class GaeTopic( - - @Json(name = "topic_id") val topicId: String?, - @Json(name = "topic_name") val topicName: String?, - @Json(name = "canonical_story_dicts") val canonicalStoryDicts: List?, - @Json(name = "additional_story_dicts") val additionalStoryDicts: List?, - /** A map of skill descriptions keyed by skill ID. */ - @Json(name = "skill_descriptions") val skillDescriptions: Map?, - /** degrees_of_mastery map has skill id as key and a float value. */ - /** A map of degree masteries keyed by skill ID. */ - @Json(name = "degrees_of_mastery") val degreesOfMastery: Map?, - @Json(name = "uncategorized_skill_ids") val uncategorizedSkillIds: List?, - @Json(name = "subtopics") val subtopics: List? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopicSummary.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopicSummary.kt deleted file mode 100644 index 81985fa2c8f..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopicSummary.kt +++ /dev/null @@ -1,24 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for TopicSummaryDict model containing full information - * https://github.com/oppia/oppia/blob/77d6fd/core/domain/topic_domain.py#L1178 - */ -@JsonClass(generateAdapter = true) -data class GaeTopicSummary( - - @Json(name = "version") val version: Int?, - @Json(name = "id") val id: String?, - @Json(name = "name") val name: String?, - @Json(name = "subtopic_count") val subtopic_count: Int?, - @Json(name = "canonical_story_count") val canonicalStoryCount: Int?, - @Json(name = "uncategorized_skill_count") val uncategorizedSkillCount: Int?, - @Json(name = "additional_story_count") val additionalStoryCount: Int?, - @Json(name = "total_skill_count") val totalSkillCount: Int?, - @Json(name = "topic_model_last_updated") val topicModelLastUpdated: Double?, - @Json(name = "topic_model_created_on") val topicModelCreatedOn: Double? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeVoiceover.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeVoiceover.kt deleted file mode 100755 index 9ef839aab7e..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeVoiceover.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for Voiceover model - * https://github.com/oppia/oppia/blob/15516a/core/domain/state_domain.py#L651 - */ -@JsonClass(generateAdapter = true) -data class GaeVoiceover( - - @Json(name = "file_size_bytes") val fileSizeBytes: Long?, - @Json(name = "needs_update") val isUpdateNeeded: Boolean?, - @Json(name = "filename") val filename: String? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslation.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslation.kt deleted file mode 100755 index 3a1a03a88ce..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslation.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for WrittenTranslation model - * https://github.com/oppia/oppia/blob/15516a/core/domain/state_domain.py#L749 - */ -@JsonClass(generateAdapter = true) -data class GaeWrittenTranslation( - - @Json(name = "html") val html: String?, - @Json(name = "needs_update") val isUpdateNeeded: Boolean? - -) diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslations.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslations.kt deleted file mode 100755 index 858c959e93e..00000000000 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslations.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.oppia.android.data.backends.gae.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -/** - * Data class for WrittenTranslations model - * https://github.com/oppia/oppia/blob/15516a/core/domain/state_domain.py#L803 - */ -@JsonClass(generateAdapter = true) -data class GaeWrittenTranslations( - - @Json(name = "translations_mapping") - val translationsMapping: Map>? - -) diff --git a/data/src/test/java/org/oppia/android/data/backends/gae/JsonPrefixNetworkInterceptorTest.kt b/data/src/test/java/org/oppia/android/data/backends/gae/JsonPrefixNetworkInterceptorTest.kt index dead9763549..6a9b2858427 100755 --- a/data/src/test/java/org/oppia/android/data/backends/gae/JsonPrefixNetworkInterceptorTest.kt +++ b/data/src/test/java/org/oppia/android/data/backends/gae/JsonPrefixNetworkInterceptorTest.kt @@ -6,16 +6,12 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import com.google.common.truth.Truth.assertThat import dagger.BindsInstance import dagger.Component -import dagger.Module -import dagger.Provides import org.json.JSONObject import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.oppia.android.testing.network.ApiMockLoader -import org.oppia.android.testing.network.MockTopicService import org.robolectric.annotation.LooperMode -import retrofit2.Retrofit import javax.inject.Inject import javax.inject.Singleton @@ -83,19 +79,9 @@ class JsonPrefixNetworkInterceptorTest { .inject(this) } - // TODO(#89): Move this to a common test application component. - @Module - class TestNetworkModule { - @Provides - @Singleton - fun provideMockTopicService(@OppiaRetrofit retrofit: Retrofit): MockTopicService { - return retrofit.create(MockTopicService::class.java) - } - } - // TODO(#89): Move this to a common test application component. @Singleton - @Component(modules = [TestNetworkModule::class, NetworkConfigProdModule::class]) + @Component(modules = [NetworkConfigProdModule::class]) interface TestApplicationComponent { @Component.Builder interface Builder { diff --git a/data/src/test/java/org/oppia/android/data/backends/gae/NetworkModuleTest.kt b/data/src/test/java/org/oppia/android/data/backends/gae/NetworkModuleTest.kt index 98b8bea04a0..4a842cbe7aa 100644 --- a/data/src/test/java/org/oppia/android/data/backends/gae/NetworkModuleTest.kt +++ b/data/src/test/java/org/oppia/android/data/backends/gae/NetworkModuleTest.kt @@ -14,10 +14,8 @@ import dagger.Provides import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.android.data.backends.gae.api.ClassroomService import org.oppia.android.data.backends.gae.api.FeedbackReportingService import org.oppia.android.data.backends.gae.api.PlatformParameterService -import org.oppia.android.data.backends.gae.api.TopicService import org.oppia.android.testing.robolectric.RobolectricModule import org.oppia.android.testing.threading.TestDispatcherModule import org.robolectric.annotation.Config @@ -51,30 +49,6 @@ class NetworkModuleTest { assertThat(getTestApplication().getRetrofit()).isAbsent() } - @Test - @Config(sdk = [Build.VERSION_CODES.LOLLIPOP]) - fun testTopicService_lollipop_isProvided() { - assertThat(getTestApplication().getTopicService()).isPresent() - } - - @Test - @Config(sdk = [Build.VERSION_CODES.KITKAT]) - fun testTopicService_kitkat_isEmpty() { - assertThat(getTestApplication().getTopicService()).isAbsent() - } - - @Test - @Config(sdk = [Build.VERSION_CODES.LOLLIPOP]) - fun testClassroomService_lollipop_isProvided() { - assertThat(getTestApplication().getClassroomService()).isPresent() - } - - @Test - @Config(sdk = [Build.VERSION_CODES.KITKAT]) - fun testClassroomService_kitkat_isEmpty() { - assertThat(getTestApplication().getClassroomService()).isAbsent() - } - @Test @Config(sdk = [Build.VERSION_CODES.LOLLIPOP]) fun testFeedbackReportingService_lollipop_isProvided() { @@ -138,8 +112,6 @@ class NetworkModuleTest { fun inject(networkModuleTest: NetworkModuleTest) @OppiaRetrofit fun getRetrofit(): Optional - fun getTopicService(): Optional - fun getClassroomService(): Optional fun getFeedbackReportingService(): Optional fun getPlatformParameterService(): Optional } @@ -156,8 +128,6 @@ class NetworkModuleTest { } fun getRetrofit() = component.getRetrofit() - fun getTopicService() = component.getTopicService() - fun getClassroomService() = component.getClassroomService() fun getFeedbackReportingService() = component.getFeedbackReportingService() fun getPlatformParameterService() = component.getPlatformParameterService() } diff --git a/data/src/test/java/org/oppia/android/data/backends/gae/RemoteAuthNetworkInterceptorTest.kt b/data/src/test/java/org/oppia/android/data/backends/gae/RemoteAuthNetworkInterceptorTest.kt index 2c1cb4b62d8..47ce78c0e08 100644 --- a/data/src/test/java/org/oppia/android/data/backends/gae/RemoteAuthNetworkInterceptorTest.kt +++ b/data/src/test/java/org/oppia/android/data/backends/gae/RemoteAuthNetworkInterceptorTest.kt @@ -20,7 +20,7 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.android.data.backends.gae.api.TopicService +import org.oppia.android.data.backends.gae.api.PlatformParameterService import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.robolectric.RobolectricModule import org.oppia.android.testing.threading.BackgroundTestDispatcher @@ -57,7 +57,7 @@ class RemoteAuthNetworkInterceptorTest { private lateinit var client: OkHttpClient - private lateinit var topicService: TopicService + private lateinit var platformParameterService: PlatformParameterService private val testVersionName = "1.0" @@ -80,7 +80,7 @@ class RemoteAuthNetworkInterceptorTest { @Test fun testNetworkInterceptor_withoutAnyHeaders_addsCorrectHeaders() { mockWebServer.enqueue(MockResponse().setBody("{}")) - val call = topicService.getTopicByName(topicName) + val call = platformParameterService.getPlatformParametersByVersion(testVersionName) val serviceRequest = call.request() assertThat(serviceRequest.header("api_key")).isNull() assertThat(serviceRequest.header("app_package_name")).isNull() @@ -156,7 +156,7 @@ class RemoteAuthNetworkInterceptorTest { .client(client) .build() - topicService = retrofit.create(TopicService::class.java) + platformParameterService = retrofit.create(PlatformParameterService::class.java) } private fun verifyRequestHeaders(headers: Headers?) { diff --git a/data/src/test/java/org/oppia/android/data/backends/gae/api/ClassroomServiceTest.kt b/data/src/test/java/org/oppia/android/data/backends/gae/api/ClassroomServiceTest.kt deleted file mode 100755 index ce78ebadbe1..00000000000 --- a/data/src/test/java/org/oppia/android/data/backends/gae/api/ClassroomServiceTest.kt +++ /dev/null @@ -1,92 +0,0 @@ -package org.oppia.android.data.backends.gae.api - -import android.app.Application -import android.content.Context -import androidx.test.core.app.ApplicationProvider -import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.google.common.truth.Truth.assertThat -import dagger.BindsInstance -import dagger.Component -import dagger.Module -import dagger.Provides -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.oppia.android.data.backends.gae.NetworkConfigProdModule -import org.oppia.android.data.backends.gae.NetworkModule -import org.oppia.android.data.backends.gae.XssiPrefix -import org.oppia.android.testing.network.MockClassroomService -import org.oppia.android.testing.network.RetrofitTestModule -import org.oppia.android.testing.robolectric.RobolectricModule -import org.oppia.android.testing.threading.TestDispatcherModule -import org.robolectric.annotation.LooperMode -import retrofit2.mock.MockRetrofit -import javax.inject.Inject -import javax.inject.Singleton - -/** - * Test for [ClassroomService] retrofit instance using [MockClassroomService] - */ -@RunWith(AndroidJUnit4::class) -@LooperMode(LooperMode.Mode.PAUSED) -class ClassroomServiceTest { - - @Inject - lateinit var mockRetrofit: MockRetrofit - - @field:[Inject XssiPrefix] - lateinit var xssiPrefix: String - - @Before - fun setUp() { - setUpTestApplicationComponent() - } - - @Test - fun testClassroomService_usingFakeJson_deserializationSuccessful() { - val delegate = mockRetrofit.create(ClassroomService::class.java) - val mockClassroomService = MockClassroomService(delegate, xssiPrefix) - - val classroom = mockClassroomService.getClassroom("Math") - val classroomResponse = classroom.execute() - - assertThat(classroomResponse.isSuccessful).isTrue() - assertThat(classroomResponse.body()!!.topicSummaryDicts?.get(0)?.name).isEqualTo("Math") - } - - private fun setUpTestApplicationComponent() { - DaggerClassroomServiceTest_TestApplicationComponent - .builder() - .setApplication(ApplicationProvider.getApplicationContext()).build().inject(this) - } - - // TODO(#89): Move this to a common test application component. - @Module - class TestModule { - @Provides - @Singleton - fun provideContext(application: Application): Context { - return application - } - } - - // TODO(#89): Move this to a common test application component. - @Singleton - @Component( - modules = [ - TestModule::class, NetworkModule::class, RobolectricModule::class, - RetrofitTestModule::class, NetworkConfigProdModule::class, TestDispatcherModule::class, - ] - ) - interface TestApplicationComponent { - @Component.Builder - interface Builder { - @BindsInstance - fun setApplication(application: Application): Builder - - fun build(): TestApplicationComponent - } - - fun inject(test: ClassroomServiceTest) - } -} diff --git a/data/src/test/java/org/oppia/android/data/backends/gae/api/ConceptCardServiceTest.kt b/data/src/test/java/org/oppia/android/data/backends/gae/api/ConceptCardServiceTest.kt deleted file mode 100755 index 980c2b01fdb..00000000000 --- a/data/src/test/java/org/oppia/android/data/backends/gae/api/ConceptCardServiceTest.kt +++ /dev/null @@ -1,98 +0,0 @@ -package org.oppia.android.data.backends.gae.api - -import android.app.Application -import android.content.Context -import androidx.test.core.app.ApplicationProvider -import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.google.common.truth.Truth.assertThat -import dagger.BindsInstance -import dagger.Component -import dagger.Module -import dagger.Provides -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.oppia.android.data.backends.gae.NetworkConfigProdModule -import org.oppia.android.data.backends.gae.NetworkModule -import org.oppia.android.data.backends.gae.XssiPrefix -import org.oppia.android.testing.network.MockConceptCardService -import org.oppia.android.testing.network.RetrofitTestModule -import org.oppia.android.testing.robolectric.RobolectricModule -import org.oppia.android.testing.threading.TestDispatcherModule -import org.robolectric.annotation.LooperMode -import retrofit2.mock.MockRetrofit -import javax.inject.Inject -import javax.inject.Singleton - -/** - * Test for [ConceptCardService] retrofit instance using [MockConceptCardService] - */ -@RunWith(AndroidJUnit4::class) -@LooperMode(LooperMode.Mode.PAUSED) -class ConceptCardServiceTest { - - @Inject - lateinit var mockRetrofit: MockRetrofit - - @field:[Inject XssiPrefix] - lateinit var xssiPrefix: String - - @Before - fun setUp() { - setUpTestApplicationComponent() - } - - @Test - fun testConceptCardService_usingFakeJson_deserializationSuccessful() { - val delegate = mockRetrofit.create(ConceptCardService::class.java) - val mockConceptCardService = MockConceptCardService(delegate, xssiPrefix) - - val skillIdList = ArrayList() - skillIdList.add("1") - skillIdList.add("2") - skillIdList.add("3") - - val skillIds = skillIdList.joinToString(separator = ", ") - val conceptCard = mockConceptCardService.getSkillContents(skillIds) - val conceptCardResponse = conceptCard.execute() - - assertThat(conceptCardResponse.isSuccessful).isTrue() - assertThat(conceptCardResponse.body()!!.conceptCardDicts!!.size).isEqualTo(1) - } - - private fun setUpTestApplicationComponent() { - DaggerConceptCardServiceTest_TestApplicationComponent - .builder() - .setApplication(ApplicationProvider.getApplicationContext()).build().inject(this) - } - - // TODO(#89): Move this to a common test application component. - @Module - class TestModule { - @Provides - @Singleton - fun provideContext(application: Application): Context { - return application - } - } - - // TODO(#89): Move this to a common test application component. - @Singleton - @Component( - modules = [ - TestModule::class, NetworkModule::class, TestDispatcherModule::class, - RetrofitTestModule::class, NetworkConfigProdModule::class, RobolectricModule::class - ] - ) - interface TestApplicationComponent { - @Component.Builder - interface Builder { - @BindsInstance - fun setApplication(application: Application): Builder - - fun build(): TestApplicationComponent - } - - fun inject(test: ConceptCardServiceTest) - } -} diff --git a/data/src/test/java/org/oppia/android/data/backends/gae/api/ExplorationServiceTest.kt b/data/src/test/java/org/oppia/android/data/backends/gae/api/ExplorationServiceTest.kt deleted file mode 100755 index 71da34bc623..00000000000 --- a/data/src/test/java/org/oppia/android/data/backends/gae/api/ExplorationServiceTest.kt +++ /dev/null @@ -1,92 +0,0 @@ -package org.oppia.android.data.backends.gae.api - -import android.app.Application -import android.content.Context -import androidx.test.core.app.ApplicationProvider -import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.google.common.truth.Truth.assertThat -import dagger.BindsInstance -import dagger.Component -import dagger.Module -import dagger.Provides -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.oppia.android.data.backends.gae.NetworkConfigProdModule -import org.oppia.android.data.backends.gae.NetworkModule -import org.oppia.android.data.backends.gae.XssiPrefix -import org.oppia.android.testing.network.MockExplorationService -import org.oppia.android.testing.network.RetrofitTestModule -import org.oppia.android.testing.robolectric.RobolectricModule -import org.oppia.android.testing.threading.TestDispatcherModule -import org.robolectric.annotation.LooperMode -import retrofit2.mock.MockRetrofit -import javax.inject.Inject -import javax.inject.Singleton - -/** - * Test for [ExplorationService] retrofit instance using [MockExplorationService] - */ -@RunWith(AndroidJUnit4::class) -@LooperMode(LooperMode.Mode.PAUSED) -class ExplorationServiceTest { - - @Inject - lateinit var mockRetrofit: MockRetrofit - - @field:[Inject XssiPrefix] - lateinit var xssiPrefix: String - - @Before - fun setUp() { - setUpTestApplicationComponent() - } - - @Test - fun testExplorationService_usingFakeJson_deserializationSuccessful() { - val delegate = mockRetrofit.create(ExplorationService::class.java) - val mockExplorationService = MockExplorationService(delegate, xssiPrefix) - - val explorationContainer = mockExplorationService.getExplorationById("4") - val explorationContainerResponse = explorationContainer.execute() - - assertThat(explorationContainerResponse.isSuccessful).isTrue() - assertThat(explorationContainerResponse.body()!!.explorationId).isEqualTo("4") - } - - private fun setUpTestApplicationComponent() { - DaggerExplorationServiceTest_TestApplicationComponent - .builder() - .setApplication(ApplicationProvider.getApplicationContext()).build().inject(this) - } - - // TODO(#89): Move this to a common test application component. - @Module - class TestModule { - @Provides - @Singleton - fun provideContext(application: Application): Context { - return application - } - } - - // TODO(#89): Move this to a common test application component. - @Singleton - @Component( - modules = [ - TestModule::class, NetworkModule::class, TestDispatcherModule::class, - RetrofitTestModule::class, NetworkConfigProdModule::class, RobolectricModule::class, - ] - ) - interface TestApplicationComponent { - @Component.Builder - interface Builder { - @BindsInstance - fun setApplication(application: Application): Builder - - fun build(): TestApplicationComponent - } - - fun inject(test: ExplorationServiceTest) - } -} diff --git a/data/src/test/java/org/oppia/android/data/backends/gae/api/QuestionPlayerServiceTest.kt b/data/src/test/java/org/oppia/android/data/backends/gae/api/QuestionPlayerServiceTest.kt deleted file mode 100755 index 81e5a5805b8..00000000000 --- a/data/src/test/java/org/oppia/android/data/backends/gae/api/QuestionPlayerServiceTest.kt +++ /dev/null @@ -1,97 +0,0 @@ -package org.oppia.android.data.backends.gae.api - -import android.app.Application -import android.content.Context -import androidx.test.core.app.ApplicationProvider -import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.google.common.truth.Truth.assertThat -import dagger.BindsInstance -import dagger.Component -import dagger.Module -import dagger.Provides -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.oppia.android.data.backends.gae.NetworkConfigProdModule -import org.oppia.android.data.backends.gae.NetworkModule -import org.oppia.android.data.backends.gae.XssiPrefix -import org.oppia.android.testing.network.MockQuestionPlayerService -import org.oppia.android.testing.network.RetrofitTestModule -import org.oppia.android.testing.robolectric.RobolectricModule -import org.oppia.android.testing.threading.TestDispatcherModule -import org.robolectric.annotation.LooperMode -import retrofit2.mock.MockRetrofit -import javax.inject.Inject -import javax.inject.Singleton - -/** - * Test for [QuestionPlayerService] retrofit instance using [MockQuestionPlayerService] - */ -@RunWith(AndroidJUnit4::class) -@LooperMode(LooperMode.Mode.PAUSED) -class QuestionPlayerServiceTest { - - @Inject - lateinit var mockRetrofit: MockRetrofit - - @field:[Inject XssiPrefix] - lateinit var xssiPrefix: String - - @Before - fun setUp() { - setUpTestApplicationComponent() - } - - @Test - fun testQuestionPlayerService_usingFakeJson_deserializationSuccessful() { - val delegate = mockRetrofit.create(QuestionPlayerService::class.java) - val mockQuestionPlayerService = MockQuestionPlayerService(delegate, xssiPrefix) - - val skillIdList = ArrayList() - skillIdList.add("1") - skillIdList.add("2") - skillIdList.add("3") - val skillIds = skillIdList.joinToString(separator = ", ") - val questionPlayer = mockQuestionPlayerService.getQuestionPlayerBySkillIds(skillIds, 10) - val questionPlayerResponse = questionPlayer.execute() - - assertThat(questionPlayerResponse.isSuccessful).isTrue() - assertThat(questionPlayerResponse.body()!!.questions!!.size).isEqualTo(1) - } - - private fun setUpTestApplicationComponent() { - DaggerQuestionPlayerServiceTest_TestApplicationComponent - .builder() - .setApplication(ApplicationProvider.getApplicationContext()).build().inject(this) - } - - // TODO(#89): Move this to a common test application component. - @Module - class TestModule { - @Provides - @Singleton - fun provideContext(application: Application): Context { - return application - } - } - - // TODO(#89): Move this to a common test application component. - @Singleton - @Component( - modules = [ - TestModule::class, NetworkModule::class, RobolectricModule::class, - RetrofitTestModule::class, NetworkConfigProdModule::class, TestDispatcherModule::class, - ] - ) - interface TestApplicationComponent { - @Component.Builder - interface Builder { - @BindsInstance - fun setApplication(application: Application): Builder - - fun build(): TestApplicationComponent - } - - fun inject(test: QuestionPlayerServiceTest) - } -} diff --git a/data/src/test/java/org/oppia/android/data/backends/gae/api/StoryServiceTest.kt b/data/src/test/java/org/oppia/android/data/backends/gae/api/StoryServiceTest.kt deleted file mode 100755 index 575dbaf4ca2..00000000000 --- a/data/src/test/java/org/oppia/android/data/backends/gae/api/StoryServiceTest.kt +++ /dev/null @@ -1,92 +0,0 @@ -package org.oppia.android.data.backends.gae.api - -import android.app.Application -import android.content.Context -import androidx.test.core.app.ApplicationProvider -import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.google.common.truth.Truth.assertThat -import dagger.BindsInstance -import dagger.Component -import dagger.Module -import dagger.Provides -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.oppia.android.data.backends.gae.NetworkConfigProdModule -import org.oppia.android.data.backends.gae.NetworkModule -import org.oppia.android.data.backends.gae.XssiPrefix -import org.oppia.android.testing.network.MockStoryService -import org.oppia.android.testing.network.RetrofitTestModule -import org.oppia.android.testing.robolectric.RobolectricModule -import org.oppia.android.testing.threading.TestDispatcherModule -import org.robolectric.annotation.LooperMode -import retrofit2.mock.MockRetrofit -import javax.inject.Inject -import javax.inject.Singleton - -/** - * Test for [StoryService] retrofit instance using [MockStoryService] - */ -@RunWith(AndroidJUnit4::class) -@LooperMode(LooperMode.Mode.PAUSED) -class StoryServiceTest { - - @Inject - lateinit var mockRetrofit: MockRetrofit - - @field:[Inject XssiPrefix] - lateinit var xssiPrefix: String - - @Before - fun setUp() { - setUpTestApplicationComponent() - } - - @Test - fun testStoryService_usingFakeJson_deserializationSuccessful() { - val delegate = mockRetrofit.create(StoryService::class.java) - val mockStoryService = MockStoryService(delegate, xssiPrefix) - - val story = mockStoryService.getStory("1", "randomUserId", "rt4914") - val storyResponse = story.execute() - - assertThat(storyResponse.isSuccessful).isTrue() - assertThat(storyResponse.body()!!.storyTitle).isEqualTo("Story 1") - } - - private fun setUpTestApplicationComponent() { - DaggerStoryServiceTest_TestApplicationComponent - .builder() - .setApplication(ApplicationProvider.getApplicationContext()).build().inject(this) - } - - // TODO(#89): Move this to a common test application component. - @Module - class TestModule { - @Provides - @Singleton - fun provideContext(application: Application): Context { - return application - } - } - - // TODO(#89): Move this to a common test application component. - @Singleton - @Component( - modules = [ - TestModule::class, NetworkModule::class, TestDispatcherModule::class, - RetrofitTestModule::class, NetworkConfigProdModule::class, RobolectricModule::class - ] - ) - interface TestApplicationComponent { - @Component.Builder - interface Builder { - @BindsInstance - fun setApplication(application: Application): Builder - - fun build(): TestApplicationComponent - } - - fun inject(test: StoryServiceTest) - } -} diff --git a/data/src/test/java/org/oppia/android/data/backends/gae/api/SubtopicServiceTest.kt b/data/src/test/java/org/oppia/android/data/backends/gae/api/SubtopicServiceTest.kt deleted file mode 100755 index c5a61ea08af..00000000000 --- a/data/src/test/java/org/oppia/android/data/backends/gae/api/SubtopicServiceTest.kt +++ /dev/null @@ -1,92 +0,0 @@ -package org.oppia.android.data.backends.gae.api - -import android.app.Application -import android.content.Context -import androidx.test.core.app.ApplicationProvider -import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.google.common.truth.Truth.assertThat -import dagger.BindsInstance -import dagger.Component -import dagger.Module -import dagger.Provides -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.oppia.android.data.backends.gae.NetworkConfigProdModule -import org.oppia.android.data.backends.gae.NetworkModule -import org.oppia.android.data.backends.gae.XssiPrefix -import org.oppia.android.testing.network.MockSubtopicService -import org.oppia.android.testing.network.RetrofitTestModule -import org.oppia.android.testing.robolectric.RobolectricModule -import org.oppia.android.testing.threading.TestDispatcherModule -import org.robolectric.annotation.LooperMode -import retrofit2.mock.MockRetrofit -import javax.inject.Inject -import javax.inject.Singleton - -/** - * Test for [SubtopicService] retrofit instance using [MockSubtopicService] - */ -@RunWith(AndroidJUnit4::class) -@LooperMode(LooperMode.Mode.PAUSED) -class SubtopicServiceTest { - - @Inject - lateinit var mockRetrofit: MockRetrofit - - @field:[Inject XssiPrefix] - lateinit var xssiPrefix: String - - @Before - fun setUp() { - setUpTestApplicationComponent() - } - - @Test - fun testSubtopicService_usingFakeJson_deserializationSuccessful() { - val delegate = mockRetrofit.create(SubtopicService::class.java) - val mockSubtopicService = MockSubtopicService(delegate, xssiPrefix) - - val subtopic = mockSubtopicService.getSubtopic("Subtopic 1", "randomId") - val subtopicResponse = subtopic.execute() - - assertThat(subtopicResponse.isSuccessful).isTrue() - assertThat(subtopicResponse.body()!!.subtopicTitle).isEqualTo("Subtopic 1") - } - - private fun setUpTestApplicationComponent() { - DaggerSubtopicServiceTest_TestApplicationComponent - .builder() - .setApplication(ApplicationProvider.getApplicationContext()).build().inject(this) - } - - // TODO(#89): Move this to a common test application component. - @Module - class TestModule { - @Provides - @Singleton - fun provideContext(application: Application): Context { - return application - } - } - - // TODO(#89): Move this to a common test application component. - @Singleton - @Component( - modules = [ - TestModule::class, NetworkModule::class, TestDispatcherModule::class, - RetrofitTestModule::class, NetworkConfigProdModule::class, RobolectricModule::class - ] - ) - interface TestApplicationComponent { - @Component.Builder - interface Builder { - @BindsInstance - fun setApplication(application: Application): Builder - - fun build(): TestApplicationComponent - } - - fun inject(test: SubtopicServiceTest) - } -} diff --git a/data/src/test/java/org/oppia/android/data/backends/gae/api/TopicServiceTest.kt b/data/src/test/java/org/oppia/android/data/backends/gae/api/TopicServiceTest.kt deleted file mode 100755 index 6380072a166..00000000000 --- a/data/src/test/java/org/oppia/android/data/backends/gae/api/TopicServiceTest.kt +++ /dev/null @@ -1,92 +0,0 @@ -package org.oppia.android.data.backends.gae.api - -import android.app.Application -import android.content.Context -import androidx.test.core.app.ApplicationProvider -import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.google.common.truth.Truth.assertThat -import dagger.BindsInstance -import dagger.Component -import dagger.Module -import dagger.Provides -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.oppia.android.data.backends.gae.NetworkConfigProdModule -import org.oppia.android.data.backends.gae.NetworkModule -import org.oppia.android.data.backends.gae.XssiPrefix -import org.oppia.android.testing.network.MockTopicService -import org.oppia.android.testing.network.RetrofitTestModule -import org.oppia.android.testing.robolectric.RobolectricModule -import org.oppia.android.testing.threading.TestDispatcherModule -import org.robolectric.annotation.LooperMode -import retrofit2.mock.MockRetrofit -import javax.inject.Inject -import javax.inject.Singleton - -/** - * Test for [TopicService] retrofit instance using [MockTopicService] - */ -@RunWith(AndroidJUnit4::class) -@LooperMode(LooperMode.Mode.PAUSED) -class TopicServiceTest { - - @Inject - lateinit var mockRetrofit: MockRetrofit - - @field:[Inject XssiPrefix] - lateinit var xssiPrefix: String - - @Before - fun setUp() { - setUpTestApplicationComponent() - } - - @Test - fun testTopicService_usingFakeJson_deserializationSuccessful() { - val delegate = mockRetrofit.create(TopicService::class.java) - val mockTopicService = MockTopicService(delegate, xssiPrefix) - - val topic = mockTopicService.getTopicByName("Topic1") - val topicResponse = topic.execute() - - assertThat(topicResponse.isSuccessful).isTrue() - assertThat(topicResponse.body()!!.topicName).isEqualTo("Topic1") - } - - private fun setUpTestApplicationComponent() { - DaggerTopicServiceTest_TestApplicationComponent - .builder() - .setApplication(ApplicationProvider.getApplicationContext()).build().inject(this) - } - - // TODO(#89): Move this to a common test application component. - @Module - class TestModule { - @Provides - @Singleton - fun provideContext(application: Application): Context { - return application - } - } - - // TODO(#89): Move this to a common test application component. - @Singleton - @Component( - modules = [ - TestModule::class, NetworkModule::class, TestDispatcherModule::class, - RetrofitTestModule::class, NetworkConfigProdModule::class, RobolectricModule::class - ] - ) - interface TestApplicationComponent { - @Component.Builder - interface Builder { - @BindsInstance - fun setApplication(application: Application): Builder - - fun build(): TestApplicationComponent - } - - fun inject(test: TopicServiceTest) - } -} diff --git a/domain/BUILD.bazel b/domain/BUILD.bazel index 770db0740c3..0ff999536a3 100755 --- a/domain/BUILD.bazel +++ b/domain/BUILD.bazel @@ -37,6 +37,9 @@ MIGRATED_PROD_FILES = glob([ DOMAIN_ASSETS = generate_assets_list_from_text_protos( name = "domain_assets", + classroom_list_file_names = [ + "classrooms", + ], exploration_file_names = [ "test_exp_id_2", "13", @@ -96,9 +99,6 @@ DOMAIN_ASSETS = generate_assets_list_from_text_protos( "GJ2rLXRKD5hw", "omzF4oqgeTXd", ], - topic_list_file_names = [ - "topics", - ], ) kt_android_library( @@ -141,7 +141,6 @@ kt_android_library( "//model/src/main/proto:question_java_proto_lite", "//model/src/main/proto:topic_java_proto_lite", "//third_party:androidx_work_work-runtime-ktx", - "//utility/src/main/java/org/oppia/android/util/caching:topic_list_to_cache", "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/extensions:bundle_extensions", "//utility/src/main/java/org/oppia/android/util/extensions:context_extensions", diff --git a/domain/domain_assets.bzl b/domain/domain_assets.bzl index 89a3ae008a3..39d7ea486c8 100644 --- a/domain/domain_assets.bzl +++ b/domain/domain_assets.bzl @@ -6,7 +6,7 @@ load("//model:text_proto_assets.bzl", "generate_proto_binary_assets") def generate_assets_list_from_text_protos( name, - topic_list_file_names, + classroom_list_file_names, topic_file_names, subtopic_file_names, story_file_names, @@ -17,7 +17,7 @@ def generate_assets_list_from_text_protos( Args: name: str. The name of this generation instance. This will be a prefix for derived targets. - topic_list_file_names: list of str. The list of topic list file names. + classroom_list_file_names: list of str. The classroom list file names. topic_file_names: list of str. The list of topic file names. subtopic_file_names: list of str. The list of subtopic file names. story_file_names: list of str. The list of story file names. @@ -29,10 +29,10 @@ def generate_assets_list_from_text_protos( """ return generate_proto_binary_assets( name = name, - names = topic_list_file_names, + names = classroom_list_file_names, proto_dep_name = "topic", - proto_type_name = "TopicIdList", - name_prefix = "topic_id_list", + proto_type_name = "ClassroomList", + name_prefix = "classroom_list", asset_dir = "src/main/assets", proto_dep_bazel_target_prefix = "//model/src/main/proto", proto_package = "model", diff --git a/domain/src/main/assets/classrooms.json b/domain/src/main/assets/classrooms.json new file mode 100644 index 00000000000..eb92a2f7094 --- /dev/null +++ b/domain/src/main/assets/classrooms.json @@ -0,0 +1,12 @@ +{ + "classrooms": [{ + "id": "test_classroom_id_0", + "topic_prerequisites": { + "test_topic_id_0": ["GJ2rLXRKD5hw"], + "test_topic_id_1": ["test_topic_id_0", "omzF4oqgeTXd"], + "test_topic_id_2": [], + "GJ2rLXRKD5hw": [], + "omzF4oqgeTXd": [] + } + }] +} diff --git a/domain/src/main/assets/classrooms.textproto b/domain/src/main/assets/classrooms.textproto new file mode 100644 index 00000000000..05b4af4eb0a --- /dev/null +++ b/domain/src/main/assets/classrooms.textproto @@ -0,0 +1,31 @@ +classrooms { + id: "test_classroom_id_0" + topic_prerequisites { + key: "test_topic_id_0" + value { + topic_ids: "GJ2rLXRKD5hw" + } + } + topic_prerequisites { + key: "test_topic_id_1" + value { + topic_ids: "test_topic_id_0" + topic_ids: "omzF4oqgeTXd" + } + } + topic_prerequisites { + key: "test_topic_id_2" + value { + } + } + topic_prerequisites { + key: "GJ2rLXRKD5hw" + value { + } + } + topic_prerequisites { + key: "omzF4oqgeTXd" + value { + } + } +} diff --git a/domain/src/main/assets/topics.json b/domain/src/main/assets/topics.json deleted file mode 100644 index 8deb9dfb368..00000000000 --- a/domain/src/main/assets/topics.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "topic_id_list": ["test_topic_id_0", "test_topic_id_1", "test_topic_id_2", "GJ2rLXRKD5hw", "omzF4oqgeTXd"] -} diff --git a/domain/src/main/assets/topics.textproto b/domain/src/main/assets/topics.textproto deleted file mode 100644 index 6a11c902a50..00000000000 --- a/domain/src/main/assets/topics.textproto +++ /dev/null @@ -1,5 +0,0 @@ -topic_ids: "test_topic_id_0" -topic_ids: "test_topic_id_1" -topic_ids: "test_topic_id_2" -topic_ids: "GJ2rLXRKD5hw" -topic_ids: "omzF4oqgeTXd" diff --git a/domain/src/main/java/org/oppia/android/domain/audio/AudioPlayerController.kt b/domain/src/main/java/org/oppia/android/domain/audio/AudioPlayerController.kt index b0c30755cfd..d9ac8e2691d 100644 --- a/domain/src/main/java/org/oppia/android/domain/audio/AudioPlayerController.kt +++ b/domain/src/main/java/org/oppia/android/domain/audio/AudioPlayerController.kt @@ -1,8 +1,6 @@ package org.oppia.android.domain.audio -import android.media.MediaDataSource import android.media.MediaPlayer -import android.os.Build import androidx.annotation.VisibleForTesting import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -14,8 +12,6 @@ import kotlinx.coroutines.launch import org.oppia.android.domain.oppialogger.OppiaLogger import org.oppia.android.domain.oppialogger.analytics.LearnerAnalyticsLogger import org.oppia.android.domain.oppialogger.exceptions.ExceptionsController -import org.oppia.android.util.caching.AssetRepository -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.data.AsyncResult import org.oppia.android.util.threading.BackgroundDispatcher import java.io.IOException @@ -34,11 +30,9 @@ import kotlin.concurrent.withLock @Singleton class AudioPlayerController @Inject constructor( private val oppiaLogger: OppiaLogger, - private val assetRepository: AssetRepository, private val exceptionsController: ExceptionsController, private val learnerAnalyticsLogger: LearnerAnalyticsLogger, - @BackgroundDispatcher private val backgroundDispatcher: CoroutineDispatcher, - @CacheAssetsLocally private val cacheAssetsLocally: Boolean + @BackgroundDispatcher private val backgroundDispatcher: CoroutineDispatcher ) { inner class AudioMutableLiveData : @@ -156,37 +150,7 @@ class AudioPlayerController @Inject constructor( private fun prepareDataSource(url: String) { try { - if (cacheAssetsLocally && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - val mediaDataSource: MediaDataSource = object : MediaDataSource() { - private val audioFileBuffer: ByteArray by lazy { - // Ensure that the download occurs off the main thread to avoid strict mode violations for - // cases when we need to stream audio. - assetRepository.loadRemoteBinaryAsset(url)() - } - - // https://medium.com/@jacks205/implementing-your-own-android-mediadatasource-e67adb070731. - override fun readAt(position: Long, buffer: ByteArray?, offset: Int, size: Int): Int { - checkNotNull(buffer) - val intPosition = position.toInt() - if (intPosition >= audioFileBuffer.size) { - return -1 - } - val availableData = audioFileBuffer.size - intPosition - val adjustedSize = size.coerceIn(0 until availableData) - audioFileBuffer.copyInto(buffer, offset, intPosition, intPosition + adjustedSize) - return adjustedSize - } - - override fun getSize(): Long { - return audioFileBuffer.size.toLong() - } - - override fun close() {} - } - mediaPlayer.setDataSource(mediaDataSource) - } else { - mediaPlayer.setDataSource(url) - } + mediaPlayer.setDataSource(url) mediaPlayer.prepareAsync() } catch (e: IOException) { exceptionsController.logNonFatalException(e) diff --git a/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsController.kt b/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsController.kt deleted file mode 100644 index ae12645932c..00000000000 --- a/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsController.kt +++ /dev/null @@ -1,18 +0,0 @@ -package org.oppia.android.domain.topic - -// TODO(#169): Remove this controller & download priming once downloads are properly supported. - -/** - * Controller for conditionally pre-priming assets to enable full download support. Whether - * downloading is enabled is gated by the [org.oppia.android.util.caching.CacheAssetsLocally] annotation. - */ -interface PrimeTopicAssetsController { - /** - * Initiates asset downloading in the background. UI affordances will be shown before and after - * priming, if it's enabled (otherwise nothing will show). - * - * @param dialogStyleResId the resource ID for the alert dialog style used for the dialog-based UI - * affordances - */ - fun downloadAssets(dialogStyleResId: Int) -} diff --git a/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerImpl.kt b/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerImpl.kt deleted file mode 100644 index 674a9970752..00000000000 --- a/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerImpl.kt +++ /dev/null @@ -1,514 +0,0 @@ -package org.oppia.android.domain.topic - -import android.annotation.SuppressLint -import android.app.Activity -import android.app.Application -import android.graphics.Typeface -import android.os.Bundle -import android.os.SystemClock -import android.text.Spannable -import android.text.style.ImageSpan -import android.util.TypedValue -import android.widget.LinearLayout -import android.widget.ProgressBar -import android.widget.TextView -import androidx.appcompat.app.AlertDialog -import androidx.appcompat.app.AppCompatActivity -import androidx.core.text.HtmlCompat -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Observer -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.asCoroutineDispatcher -import kotlinx.coroutines.async -import kotlinx.coroutines.launch -import org.oppia.android.app.model.AnswerGroup -import org.oppia.android.app.model.ChapterSummary -import org.oppia.android.app.model.ConceptCard -import org.oppia.android.app.model.Exploration -import org.oppia.android.app.model.Hint -import org.oppia.android.app.model.Interaction -import org.oppia.android.app.model.Outcome -import org.oppia.android.app.model.Question -import org.oppia.android.app.model.RevisionCard -import org.oppia.android.app.model.SchemaObject -import org.oppia.android.app.model.SchemaObject.ObjectTypeCase.SUBTITLED_HTML -import org.oppia.android.app.model.SchemaObjectList -import org.oppia.android.app.model.Solution -import org.oppia.android.app.model.State -import org.oppia.android.app.model.StorySummary -import org.oppia.android.app.model.SubtitledHtml -import org.oppia.android.app.model.Subtopic -import org.oppia.android.app.model.Topic -import org.oppia.android.domain.exploration.ExplorationRetriever -import org.oppia.android.domain.oppialogger.OppiaLogger -import org.oppia.android.domain.question.QuestionRetriever -import org.oppia.android.domain.util.JsonAssetRetriever -import org.oppia.android.util.caching.AssetRepository -import org.oppia.android.util.caching.TopicListToCache -import org.oppia.android.util.gcsresource.DefaultResourceBucketName -import org.oppia.android.util.gcsresource.QuestionResourceBucketName -import org.oppia.android.util.locale.OppiaLocale -import org.oppia.android.util.parser.html.ConceptCardHtmlParserEntityType -import org.oppia.android.util.parser.html.ExplorationHtmlParserEntityType -import org.oppia.android.util.parser.html.StoryHtmlParserEntityType -import org.oppia.android.util.parser.html.TopicHtmlParserEntityType -import org.oppia.android.util.parser.image.DefaultGcsPrefix -import org.oppia.android.util.parser.image.ImageDownloadUrlTemplate -import org.oppia.android.util.parser.image.ThumbnailDownloadUrlTemplate -import java.util.concurrent.Executors -import java.util.concurrent.atomic.AtomicBoolean -import java.util.concurrent.atomic.AtomicInteger -import javax.inject.Inject -import javax.inject.Singleton - -private const val CUSTOM_IMG_TAG = "oppia-noninteractive-image" -private const val REPLACE_IMG_TAG = "img" -private const val CUSTOM_IMG_FILE_PATH_ATTRIBUTE = "filepath-with-value" -private const val REPLACE_IMG_FILE_PATH_ATTRIBUTE = "src" - -/** - * Implementation of [PrimeTopicAssetsController] which primes assets & shows UI affordances before - * and after priming. - */ -@Singleton -class PrimeTopicAssetsControllerImpl @Inject constructor( - private val application: Application, - private val oppiaLogger: OppiaLogger, - private val assetRepository: AssetRepository, - private val topicController: TopicController, - private val jsonAssetRetriever: JsonAssetRetriever, - private val explorationRetriever: ExplorationRetriever, - private val questionRetriever: QuestionRetriever, - private val conceptCardRetriever: ConceptCardRetriever, - private val revisionCardRetriever: RevisionCardRetriever, - private val machineLocale: OppiaLocale.MachineLocale, - @DefaultGcsPrefix private val gcsPrefix: String, - @DefaultResourceBucketName private val gcsResource: String, - @QuestionResourceBucketName private val questionGcsResource: String, - @ImageDownloadUrlTemplate private val imageDownloadUrlTemplate: String, - @ThumbnailDownloadUrlTemplate private val thumbnailDownloadUrlTemplate: String, - @TopicListToCache private val topicListToCache: List, - @ExplorationHtmlParserEntityType private val explorationEntityType: String, - @ConceptCardHtmlParserEntityType private val conceptCardEntityType: String, - @TopicHtmlParserEntityType private val topicEntityType: String, - @StoryHtmlParserEntityType private val storyEntityType: String -) : PrimeTopicAssetsController { - - // NOTE TO DEVELOPERS: Don't ever do this. The application should use shared dispatchers to - // control resources & coordinate tests. This custom dispatcher is needed since priming is a - // dispatcher-intensive operation and using the shared background dispatcher ends up blocking the - // app UI, potentially in a breaking way. - private val extraDispatcher = Executors.newFixedThreadPool( - /* nThreads= */ 4 - ).asCoroutineDispatcher() - - // NOTE TO DEVELOPERS: Never do this. We should never hold activity references in singleton - // objects, even as weak references. This is being done to keep priming code isolated so that it's - // easier to remove after #169 is completed. - private val extraDispatcherScope = CoroutineScope(extraDispatcher) - private val primeDownloadStatus = MutableLiveData(PrimeAssetsStatus(0, 0)) - private val currentDownloadCount = AtomicInteger() - private val failedDownloadCount = AtomicInteger() - private val dialogShown = AtomicBoolean() - private val dialogDismissed = AtomicBoolean() - - override fun downloadAssets(dialogStyleResId: Int) { - prepareUiForDownloadStatusChanges(dialogStyleResId) - - // Ensure all JSON files are available in memory for quick retrieval. - val allFiles = mutableListOf() - allFiles.add("topics.json") - val topicIdJsonArray = jsonAssetRetriever - .loadJsonFromAsset("topics.json")!! - .getJSONArray("topic_id_list") - for (i in 0 until topicIdJsonArray.length()) { - allFiles.addAll(topicController.getJsonAssetFileNameList(topicIdJsonArray.optString(i))) - } - - val primeAssetJobs = allFiles.map { - extraDispatcherScope.async { - assetRepository.primeTextFileFromLocalAssets(it) - } - } - - // The following job encapsulates all startup loading. NB: We don't currently wait on this job - // to complete because it's fine to try to load the assets at the same time as priming the - // cache, and it's unlikely the user can get into an exploration fast enough to try to load an - // asset that would trigger a strict mode crash. - extraDispatcherScope.launch { - primeAssetJobs.forEach { it.await() } - - // Only download binary assets for configured topics. The others can still be streamed. - val topics = loadTopics(topicListToCache) - val explorationIds = topics.flatMap(::extractExplorationIds).toSet() - val skillIds = topics.flatMap(::extractSkillIds).toSet() - - val explorations = loadExplorations(explorationIds) - val questions = loadQuestions(skillIds) - val conceptCards = loadConceptCards(skillIds) - val revisionCards = loadRevisionCards(topics) - - val thumbnailUrls = topics.flatMap(::collectThumbnailUrls) - val explorationImageUrls = explorations.flatMap(::collectImageUrls) - val questionImageUrls = questions.flatMap(::collectImageUrls) - val conceptCardImageUrls = conceptCards.flatMap(::collectImageUrls) - val revisionCardImageUrls = revisionCards.flatMap(::collectImageUrls) - val imageUrls = ( - thumbnailUrls + - explorationImageUrls + - questionImageUrls + - conceptCardImageUrls + - revisionCardImageUrls - ).toSet() - oppiaLogger.d("AssetRepo", "Downloading up to ${imageUrls.size} images") - val startTime = SystemClock.elapsedRealtime() - val downloadUrls = imageUrls.filterNot(assetRepository::isRemoteBinaryAssetDownloaded) - val assetDownloadCount = downloadUrls.size - primeDownloadStatus.postValue( - PrimeAssetsStatus(currentDownloadCount.get(), assetDownloadCount) - ) - downloadUrls.map { url: String -> - extraDispatcherScope.async { - try { - assetRepository.primeRemoteBinaryAsset(url) - } catch (e: Exception) { - failedDownloadCount.incrementAndGet() - oppiaLogger.w("AssetRepo", "Failed to download $url because $e") - } - primeDownloadStatus.postValue( - PrimeAssetsStatus( - currentDownloadCount.incrementAndGet(), assetDownloadCount, failedDownloadCount.get() - ) - ) - } - }.forEach { it.await() } - val endTime = SystemClock.elapsedRealtime() - oppiaLogger.d( - "AssetRepo", - "Finished downloading voiceovers and images in ${endTime - startTime}ms" - ) - - // Send the final count since everything should be done now. This is redundant, but it's meant - // to make sure the dialog reaches a finalized state. - primeDownloadStatus.postValue(PrimeAssetsStatus(assetDownloadCount, assetDownloadCount)) - } - } - - private fun prepareUiForDownloadStatusChanges(dialogStyleResId: Int) { - // Reference: https://stackoverflow.com/a/37713320. - application.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks { - override fun onActivityPaused(activity: Activity) {} - override fun onActivityResumed(activity: Activity) {} - override fun onActivityStarted(activity: Activity) {} - override fun onActivityDestroyed(activity: Activity) {} - override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} - override fun onActivityStopped(activity: Activity) {} - override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) { - if (!dialogDismissed.get()) { - activity?.let { - val appCompatActivity = it as AppCompatActivity - primeDownloadStatus.observe( - appCompatActivity, - Observer { primeAssetsStatus -> - primeAssetsStatus?.let { status -> - if (status.totalDownloadCount > 0 && !dialogShown.get()) { - showProgressDialog(appCompatActivity, dialogStyleResId) - } - } - } - ) - } - } - } - }) - } - - @SuppressLint("SetTextI18n") // This is a temporary, alpha-release only feature. - private fun showProgressDialog(activity: Activity, dialogStyleResId: Int) { - // Programmatically create the layout to avoid resource deps and to keep priming isolated. - val layout = LinearLayout(activity) - layout.orientation = LinearLayout.VERTICAL - val textView = TextView(activity) - layout.addView(textView) - textView.text = "Downloading assets for offline support." - val resources = activity.resources - val marginPx = TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, 16f, resources.displayMetrics - ).toInt() - (textView.layoutParams as LinearLayout.LayoutParams).setMargins( - /* left= */ marginPx, /* top= */ marginPx, /* right= */ marginPx, /* bottom= */ marginPx - ) - textView.textSize = 14f - textView.typeface = Typeface.create("sans-serif", Typeface.NORMAL) - val progressBar = ProgressBar( - activity, /* attrs= */ null, android.R.attr.progressBarStyleHorizontal - ) - layout.addView(progressBar) - (progressBar.layoutParams as LinearLayout.LayoutParams).setMargins( - /* left= */ marginPx, /* top= */ 0, /* right= */ marginPx, /* bottom= */ 0 - ) - val dialog = AlertDialog.Builder(activity, dialogStyleResId) - .setView(layout) - .setPositiveButton("Close") { dialog, _ -> - dialogDismissed.set(true) - dialog.dismiss() - }.create() - dialog.setCanceledOnTouchOutside(false) - dialog.show() - dialogShown.set(true) - primeDownloadStatus.observeForever(object : Observer { - override fun onChanged(status: PrimeAssetsStatus?) { - status?.let { - progressBar.max = it.totalDownloadCount - if (it.currentDownloadCount > progressBar.progress) { - progressBar.progress = it.currentDownloadCount - } - if (it.currentDownloadCount == it.totalDownloadCount) { - if (it.failedDownloadCount > 0) { - textView.text = "Finished downloading, but some failed to download. Please try again." - } else { - textView.text = "Finished downloading assets for offline support." - } - primeDownloadStatus.removeObserver(this) - } - } - } - }) - } - - private fun loadTopics(topicIds: Collection): Collection { - // Ignore topics no longer on the device. - return topicIds.mapNotNull(topicController::retrieveTopic) - } - - private suspend fun loadExplorations(explorationIds: Collection) = - explorationIds.map { explorationRetriever.loadExploration(it) } - - private fun loadQuestions(skillIds: Collection): Collection { - return questionRetriever.loadQuestions(skillIds.toList()) - } - - private fun loadConceptCards(skillIds: Collection): Collection { - return skillIds.map(conceptCardRetriever::loadConceptCard) - } - - private fun loadRevisionCards(topics: Collection): List> { - return topics.flatMap { - loadRevisionCards(it.topicId to it.subtopicList.map(Subtopic::getSubtopicId)) - } - } - - private fun loadRevisionCards( - topicIdToSubtopicIds: Pair> - ): Collection> { - val topicId = topicIdToSubtopicIds.first - return topicIdToSubtopicIds.second.map { - topicId to revisionCardRetriever.loadRevisionCard(topicId, it) - } - } - - private fun extractExplorationIds(topic: Topic): List { - val chapters = topic.storyList.flatMap(StorySummary::getChapterList) - return chapters.map(ChapterSummary::getExplorationId) - } - - private fun extractSkillIds(topic: Topic): List { - return topic.subtopicList.flatMap(Subtopic::getSkillIdsList) - } - - private fun collectThumbnailUrls(topic: Topic): Collection { - val thumbnailUrls = mutableListOf() - val topicThumbnail = topic.topicThumbnail - if (topicThumbnail.thumbnailFilename.isNotBlank()) { - thumbnailUrls += getUriForThumbnail( - topic.topicId, topicEntityType, topicThumbnail.thumbnailFilename - ) - } - - for (storySummary in topic.storyList) { - val storyThumbnail = storySummary.storyThumbnail - if (storyThumbnail.thumbnailFilename.isNotBlank()) { - thumbnailUrls += getUriForThumbnail( - storySummary.storyId, storyEntityType, storyThumbnail.thumbnailFilename - ) - } - - for (chapterSummary in storySummary.chapterList) { - val chapterThumbnail = chapterSummary.chapterThumbnail - if (chapterThumbnail.thumbnailFilename.isNotBlank()) { - thumbnailUrls += getUriForThumbnail( - storySummary.storyId, storyEntityType, chapterThumbnail.thumbnailFilename - ) - } - } - } - - for (subtopic in topic.subtopicList) { - val subtopicThumbnail = subtopic.subtopicThumbnail - if (subtopicThumbnail.thumbnailFilename.isNotBlank()) { - thumbnailUrls += getUriForThumbnail( - topic.topicId, topicEntityType, subtopicThumbnail.thumbnailFilename - ) - } - } - - return thumbnailUrls - } - - private fun collectImageUrls(exploration: Exploration): Collection { - return collectImageUrls(exploration, exploration.id, explorationEntityType, ::getUriForImage) { - collectSubtitledHtmls(it.statesMap.values) - } - } - - private fun collectImageUrls(question: Question): Collection { - // TODO(#497): Update this to properly link to question assets. - val skillId = question.linkedSkillIdsList.firstOrNull() ?: "" - return collectImageUrls(question, skillId, "skill", ::getUriForQuestionImage) { - collectSubtitledHtmls(listOf(question.questionState)) - } - } - - private fun collectImageUrls(conceptCard: ConceptCard): Collection { - return collectImageUrls( - conceptCard, - conceptCard.skillId, - conceptCardEntityType, - ::getUriForImage, - ::collectSubtitledHtmls - ) - } - - private fun collectImageUrls( - topicIdToRevisionCard: Pair - ): Collection { - return collectImageUrls( - topicIdToRevisionCard.second, - topicIdToRevisionCard.first, - topicEntityType, - ::getUriForImage, - ::collectSubtitledHtmls - ) - } - - private fun collectImageUrls( - entity: T, - entityId: String, - entityType: String, - computeUriForImage: (String, String, String) -> String, - collectSubtitledHtmls: (T) -> Collection - ): Collection { - val subtitledHtmls = collectSubtitledHtmls(entity) - val imageSources = subtitledHtmls.flatMap(::getImageSourcesFromHtml) - return imageSources.toSet().map { imageSource -> - computeUriForImage(entityId, entityType, imageSource) - } - } - - private fun collectSubtitledHtmls(states: Iterable): Collection { - val stateContents = states.map(State::getContent) - val stateInteractions = states.map(State::getInteraction) - - // Retrieve choice options for multiple choice, item selection, and drag & drop sort. - val customizationArgsMapList = stateInteractions.map(Interaction::getCustomizationArgsMap) - val argsMapValues = customizationArgsMapList.mapNotNull { it["choices"] } - // Defaults to empty lists if the type of customization argument is not an object list. - val schemaObjectLists = argsMapValues.map(SchemaObject::getSchemaObjectList) - val schemaObjects = schemaObjectLists.flatMap(SchemaObjectList::getSchemaObjectList) - val subtitledHtmlObjects = schemaObjects.filter { it.objectTypeCase == SUBTITLED_HTML } - val customizationSubtitledHtmls = subtitledHtmlObjects.map(SchemaObject::getSubtitledHtml) - - val stateSolutions = - stateInteractions.map(Interaction::getSolution).map(Solution::getExplanation) - val stateHints = stateInteractions.flatMap( - Interaction::getHintList - ).map(Hint::getHintContent) - - val answerGroupOutcomes = - stateInteractions.flatMap(Interaction::getAnswerGroupsList).map(AnswerGroup::getOutcome) - val defaultOutcomes = stateInteractions.map(Interaction::getDefaultOutcome) - val outcomeFeedbacks = (answerGroupOutcomes + defaultOutcomes) - .map(Outcome::getFeedback) - - val allSubtitledHtmls = - stateContents + - customizationSubtitledHtmls + - stateSolutions + - stateHints + - outcomeFeedbacks - return allSubtitledHtmls.filter { it != SubtitledHtml.getDefaultInstance() } - } - - private fun collectSubtitledHtmls(conceptCard: ConceptCard): Collection { - return conceptCard.workedExampleList + conceptCard.explanation - } - - private fun collectSubtitledHtmls(revisionCard: RevisionCard): Collection { - return listOf(revisionCard.pageContents) - } - - private fun getImageSourcesFromHtml(subtitledHtml: SubtitledHtml): Collection { - val parsedHtml = parseHtml(replaceCustomOppiaImageTag(subtitledHtml.html)) - val imageSpans = parsedHtml.getSpans( - 0, - parsedHtml.length, - ImageSpan::class.java - ) - return imageSpans.toList().mapNotNull(ImageSpan::getSource) - } - - private fun parseHtml(html: String): Spannable { - return HtmlCompat.fromHtml(html, HtmlCompat.FROM_HTML_MODE_LEGACY) as Spannable - } - - private fun replaceCustomOppiaImageTag(html: String): String { - return html.replace(CUSTOM_IMG_TAG, REPLACE_IMG_TAG) - .replace(CUSTOM_IMG_FILE_PATH_ATTRIBUTE, REPLACE_IMG_FILE_PATH_ATTRIBUTE) - .replace(""", "") - } - - private fun getUriForImage(entityId: String, entityType: String, imageFileName: String): String { - return computeUrlForImageDownloads( - imageDownloadUrlTemplate, gcsResource, entityType, entityId, imageFileName - ) - } - - private fun getUriForQuestionImage( - entityId: String, - entityType: String, - imageFileName: String - ): String { - return computeUrlForImageDownloads( - imageDownloadUrlTemplate, questionGcsResource, entityType, entityId, imageFileName - ) - } - - private fun getUriForThumbnail( - entityId: String, - entityType: String, - imageFileName: String - ): String { - return computeUrlForImageDownloads( - thumbnailDownloadUrlTemplate, gcsResource, entityType, entityId, imageFileName - ) - } - - private fun computeUrlForImageDownloads( - template: String, - gcsBucket: String, - entityType: String, - entityId: String, - imageFileName: String - ): String { - val downloadUrlFile = machineLocale.run { - template.formatForMachines(entityType, entityId, imageFileName) - } - return "$gcsPrefix/$gcsBucket/$downloadUrlFile" - } - - private data class PrimeAssetsStatus( - val currentDownloadCount: Int, - val totalDownloadCount: Int, - val failedDownloadCount: Int = 0 - ) -} diff --git a/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerModule.kt b/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerModule.kt deleted file mode 100644 index c815aca413a..00000000000 --- a/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerModule.kt +++ /dev/null @@ -1,29 +0,0 @@ -package org.oppia.android.domain.topic - -import dagger.Module -import dagger.Provides -import org.oppia.android.util.caching.CacheAssetsLocally -import javax.inject.Provider - -/** - * Module for providing a [PrimeTopicAssetsController] depending on whether asset caching is enabled - * (see [CacheAssetsLocally] for specifics). - */ -@Module -class PrimeTopicAssetsControllerModule { - @Provides - fun providePrimeTopicAssetsController( - @CacheAssetsLocally cacheAssetsLocally: Boolean, - impl: Provider - ): PrimeTopicAssetsController { - return if (cacheAssetsLocally) { - impl.get() - } else { - object : PrimeTopicAssetsController { - override fun downloadAssets(dialogStyleResId: Int) { - // Do nothing since caching is disabled. - } - } - } - } -} diff --git a/domain/src/main/java/org/oppia/android/domain/topic/TopicListController.kt b/domain/src/main/java/org/oppia/android/domain/topic/TopicListController.kt index fee2a02022d..8936feb3d98 100644 --- a/domain/src/main/java/org/oppia/android/domain/topic/TopicListController.kt +++ b/domain/src/main/java/org/oppia/android/domain/topic/TopicListController.kt @@ -5,6 +5,9 @@ import org.json.JSONObject import org.oppia.android.app.model.ChapterPlayState import org.oppia.android.app.model.ChapterProgress import org.oppia.android.app.model.ChapterSummary +import org.oppia.android.app.model.ClassroomList +import org.oppia.android.app.model.ClassroomRecord +import org.oppia.android.app.model.ClassroomRecord.TopicIdList import org.oppia.android.app.model.ComingSoonTopicList import org.oppia.android.app.model.EphemeralTopicSummary import org.oppia.android.app.model.LessonThumbnail @@ -18,7 +21,6 @@ import org.oppia.android.app.model.StoryRecord import org.oppia.android.app.model.StorySummary import org.oppia.android.app.model.SubtitledHtml import org.oppia.android.app.model.Topic -import org.oppia.android.app.model.TopicIdList import org.oppia.android.app.model.TopicList import org.oppia.android.app.model.TopicPlayAvailability import org.oppia.android.app.model.TopicPlayAvailability.AvailabilityCase.AVAILABLE_TO_PLAY_IN_FUTURE @@ -44,8 +46,6 @@ import javax.inject.Singleton private const val ONE_WEEK_IN_DAYS = 7 private const val TOPIC_BG_COLOR = "#C6DCDA" -private const val BAKER_BG_COLOR = "#0F63A3" -private const val DUCK_BG_COLOR = "#05538F" private const val CHAPTER_BG_COLOR_1 = "#F8BF74" private const val CHAPTER_BG_COLOR_2 = "#D68F78" @@ -135,15 +135,11 @@ class TopicListController @Inject constructor( private fun createTopicList(contentLocale: OppiaLocale.ContentLocale): TopicList { return if (loadLessonProtosFromAssets) { - val topicIdList = - assetRepository.loadProtoFromLocalAssets( - assetName = "topics", - baseMessage = TopicIdList.getDefaultInstance() - ) + val topicIdList = loadCombinedClassroomTopicList() return TopicList.newBuilder().apply { // Only include topics currently playable in the topic list. addAllTopicSummary( - topicIdList.topicIdsList.map { + topicIdList.map { createEphemeralTopicSummary(it, contentLocale) }.filter { it.topicSummary.topicPlayAvailability.availabilityCase == AVAILABLE_TO_PLAY_NOW @@ -154,13 +150,10 @@ class TopicListController @Inject constructor( } private fun loadTopicListFromJson(contentLocale: OppiaLocale.ContentLocale): TopicList { - val topicIdJsonArray = jsonAssetRetriever - .loadJsonFromAsset("topics.json")!! - .getJSONArray("topic_id_list") + val topicIdList = loadCombinedClassroomTopicList() val topicListBuilder = TopicList.newBuilder() - for (i in 0 until topicIdJsonArray.length()) { - val ephemeralSummary = - createEphemeralTopicSummary(topicIdJsonArray.optString(i)!!, contentLocale) + for (topicId in topicIdList) { + val ephemeralSummary = createEphemeralTopicSummary(topicId, contentLocale) val topicPlayAvailability = ephemeralSummary.topicSummary.topicPlayAvailability // Only include topics currently playable in the topic list. if (topicPlayAvailability.availabilityCase == AVAILABLE_TO_PLAY_NOW) { @@ -171,12 +164,10 @@ class TopicListController @Inject constructor( } private fun computeComingSoonTopicList(): ComingSoonTopicList { - val topicIdJsonArray = jsonAssetRetriever - .loadJsonFromAsset("topics.json")!! - .getJSONArray("topic_id_list") + val topicIdList = loadCombinedClassroomTopicList() val comingSoonTopicListBuilder = ComingSoonTopicList.newBuilder() - for (i in 0 until topicIdJsonArray.length()) { - val upcomingTopicSummary = createUpcomingTopicSummary(topicIdJsonArray.optString(i)!!) + for (topicId in topicIdList) { + val upcomingTopicSummary = createUpcomingTopicSummary(topicId) // Only include topics currently not playable in the upcoming topic list. if (upcomingTopicSummary.topicPlayAvailability.availabilityCase == AVAILABLE_TO_PLAY_IN_FUTURE @@ -527,31 +518,12 @@ class TopicListController @Inject constructor( return TimeUnit.MILLISECONDS.toDays(oppiaClock.getCurrentTimeMs() - this.lastPlayedTimestamp) } - // TODO(#2550): Remove hardcoded order of topics. Compute list of suggested stories from backend structures /** * Returns a list of topic IDs for which the specified topic ID expects to be completed before * being suggested. */ - private fun retrieveTopicDependencies(topicId: String): List { - // The comments describe the correct dependencies, but those might not be available until the - // topic is introduced into the app. - return when (topicId) { - // TEST_TOPIC_ID_0 (depends on Fractions) - TEST_TOPIC_ID_0 -> listOf(FRACTIONS_TOPIC_ID) - // TEST_TOPIC_ID_1 (depends on TEST_TOPIC_ID_0,Ratios) - TEST_TOPIC_ID_1 -> listOf(TEST_TOPIC_ID_0, RATIOS_TOPIC_ID) - // Fractions (depends on A+S, Multiplication, Division) - FRACTIONS_TOPIC_ID -> listOf() - // Ratios (depends on A+S, Multiplication, Division) - RATIOS_TOPIC_ID -> listOf() - // Addition and Subtraction (depends on Place Values) - // Multiplication (depends on Addition and Subtraction) - // Division (depends on Multiplication) - // Expressions and Equations (depends on A+S, Multiplication, Division) - // Decimals (depends on A+S, Multiplication, Division) - else -> listOf() - } - } + private fun retrieveTopicDependencies(topicId: String): List = + loadClassroom().topicPrerequisitesMap.getValue(topicId).topicIdsList /* * Explanation for logic: @@ -577,14 +549,8 @@ class TopicListController @Inject constructor( contentLocale: OppiaLocale.ContentLocale ): List { return if (loadLessonProtosFromAssets) { - val topicIdList = - assetRepository.loadProtoFromLocalAssets( - assetName = "topics", - baseMessage = TopicIdList.getDefaultInstance() - ) - return computeSuggestedStoriesForTopicIds( - topicProgressList, topicIdList.topicIdsList, contentLocale - ) + val topicIdList = loadCombinedClassroomTopicList() + return computeSuggestedStoriesForTopicIds(topicProgressList, topicIdList, contentLocale) } else computeSuggestedStoriesFromJson(topicProgressList, contentLocale) } @@ -592,12 +558,8 @@ class TopicListController @Inject constructor( topicProgressList: List, contentLocale: OppiaLocale.ContentLocale ): List { - val topicIdJsonArray = jsonAssetRetriever - .loadJsonFromAsset("topics.json")!! - .getJSONArray("topic_id_list") // All topics that could potentially be recommended. - val topicIdList = - (0 until topicIdJsonArray.length()).map { topicIdJsonArray[it].toString() } + val topicIdList = loadCombinedClassroomTopicList() return computeSuggestedStoriesForTopicIds(topicProgressList, topicIdList, contentLocale) } @@ -830,6 +792,53 @@ class TopicListController @Inject constructor( .setChapterPlayState(nextChapterProgress?.chapterPlayState ?: ChapterPlayState.NOT_STARTED) .build() } + + // TODO(#5344): Remove this in favor of per-classroom data handling. + private fun loadClassroom(): ClassroomRecord { + return if (loadLessonProtosFromAssets) { + return assetRepository.loadProtoFromLocalAssets( + assetName = "classrooms", + baseMessage = ClassroomList.getDefaultInstance() + ).classroomsList.single() // Only one record is currently expected. + } else loadClassroomFromJson() + } + + // TODO(#5344): Remove this in favor of per-classroom data handling. + private fun loadClassroomFromJson(): ClassroomRecord { + val classroomsObj = jsonAssetRetriever.loadJsonFromAsset("classrooms.json") + checkNotNull(classroomsObj) { "Failed to load classrooms.json." } + val classroomArray = classroomsObj.optJSONArray("classrooms") + checkNotNull(classroomArray) { "classrooms.json missing classrooms array." } + check(classroomArray.length() == 1) { "Expected classrooms.json to have one single classroom." } + val classroom = checkNotNull(classroomArray.optJSONObject(0)) { "Expected non-null classroom." } + val topicPrereqsObj = checkNotNull(classroom.optJSONObject("topic_prerequisites")) { + "Expected classroom to have non-null topic_prerequisites." + } + val topicPrereqs = topicPrereqsObj.keys().asSequence().associateWith { topicId -> + val topicIdArray = checkNotNull(topicPrereqsObj.optJSONArray(topicId)) { + "Expected topic $topicId to have a non-null string list." + } + return@associateWith List(topicIdArray.length()) { index -> + checkNotNull(topicIdArray.optString(index)) { + "Expected topic $topicId to have non-null string at index $index." + } + } + } + return ClassroomRecord.newBuilder().apply { + this.id = checkNotNull(classroom.optString("id")) { "Expected classroom to have ID." } + this.putAllTopicPrerequisites( + topicPrereqs.mapValues { (_, topicIds) -> + TopicIdList.newBuilder().apply { + addAllTopicIds(topicIds) + }.build() + } + ) + }.build() + } + + // TODO(#5344): Remove this in favor of per-classroom data handling. + private fun loadCombinedClassroomTopicList(): List = + loadClassroom().topicPrerequisitesMap.keys.toList() } internal fun createTopicThumbnailFromJson(topicJsonObject: JSONObject): LessonThumbnail { @@ -877,7 +886,7 @@ internal fun createTopicThumbnail0(): LessonThumbnail { internal fun createTopicThumbnail1(): LessonThumbnail { return LessonThumbnail.newBuilder() .setThumbnailGraphic(LessonThumbnailGraphic.DUCK_AND_CHICKEN) - .setBackgroundColorRgb(Color.parseColor(DUCK_BG_COLOR)) + .setBackgroundColorRgb(Color.parseColor(TOPIC_BG_COLOR)) .build() } @@ -891,7 +900,7 @@ internal fun createTopicThumbnail2(): LessonThumbnail { internal fun createTopicThumbnail3(): LessonThumbnail { return LessonThumbnail.newBuilder() .setThumbnailGraphic(LessonThumbnailGraphic.BAKER) - .setBackgroundColorRgb(Color.parseColor(BAKER_BG_COLOR)) + .setBackgroundColorRgb(Color.parseColor(TOPIC_BG_COLOR)) .build() } @@ -905,7 +914,7 @@ internal fun createDefaultStoryThumbnail(): LessonThumbnail { internal fun createStoryThumbnail0(): LessonThumbnail { return LessonThumbnail.newBuilder() .setThumbnailGraphic(LessonThumbnailGraphic.DUCK_AND_CHICKEN) - .setBackgroundColorRgb(0x0F63A3) + .setBackgroundColorRgb(0xa5d3ec) .build() } @@ -926,7 +935,7 @@ internal fun createStoryThumbnail2(): LessonThumbnail { internal fun createStoryThumbnail3(): LessonThumbnail { return LessonThumbnail.newBuilder() .setThumbnailGraphic(LessonThumbnailGraphic.BAKER) - .setBackgroundColorRgb(0x0F63A3) + .setBackgroundColorRgb(0xa5a2d3) .build() } @@ -947,7 +956,7 @@ internal fun createChapterThumbnail0(): LessonThumbnail { internal fun createChapterThumbnail1(): LessonThumbnail { return LessonThumbnail.newBuilder() .setThumbnailGraphic(LessonThumbnailGraphic.DUCK_AND_CHICKEN) - .setBackgroundColorRgb(Color.parseColor(DUCK_BG_COLOR)) + .setBackgroundColorRgb(Color.parseColor(CHAPTER_BG_COLOR_2)) .build() } @@ -968,21 +977,21 @@ internal fun createChapterThumbnail3(): LessonThumbnail { internal fun createChapterThumbnail4(): LessonThumbnail { return LessonThumbnail.newBuilder() .setThumbnailGraphic(LessonThumbnailGraphic.BAKER) - .setBackgroundColorRgb(Color.parseColor(BAKER_BG_COLOR)) + .setBackgroundColorRgb(Color.parseColor(CHAPTER_BG_COLOR_1)) .build() } internal fun createChapterThumbnail5(): LessonThumbnail { return LessonThumbnail.newBuilder() .setThumbnailGraphic(LessonThumbnailGraphic.DUCK_AND_CHICKEN) - .setBackgroundColorRgb(Color.parseColor(DUCK_BG_COLOR)) + .setBackgroundColorRgb(Color.parseColor(CHAPTER_BG_COLOR_2)) .build() } internal fun createChapterThumbnail8(): LessonThumbnail { return LessonThumbnail.newBuilder() .setThumbnailGraphic(LessonThumbnailGraphic.DUCK_AND_CHICKEN) - .setBackgroundColorRgb(Color.parseColor(DUCK_BG_COLOR)) + .setBackgroundColorRgb(Color.parseColor(CHAPTER_BG_COLOR_1)) .build() } diff --git a/domain/src/test/java/org/oppia/android/domain/devoptions/ModifyLessonProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/devoptions/ModifyLessonProgressControllerTest.kt index 68f21c6ca95..8039a9d77de 100644 --- a/domain/src/test/java/org/oppia/android/domain/devoptions/ModifyLessonProgressControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/devoptions/ModifyLessonProgressControllerTest.kt @@ -31,7 +31,6 @@ import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClock import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadLessonProtosFromAssets import org.oppia.android.util.data.DataProvidersInjector import org.oppia.android.util.data.DataProvidersInjectorProvider @@ -422,10 +421,6 @@ class ModifyLessonProgressControllerTest { @Provides fun provideGlobalLogLevel(): LogLevel = LogLevel.VERBOSE - @CacheAssetsLocally - @Provides - fun provideCacheAssetsLocally(): Boolean = false - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(testEnvironmentConfig: TestEnvironmentConfig): Boolean = diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt index ba20f90e61b..330ae280b21 100644 --- a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt @@ -59,9 +59,7 @@ import org.oppia.android.testing.threading.TestCoroutineDispatchers import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadLessonProtosFromAssets -import org.oppia.android.util.caching.TopicListToCache import org.oppia.android.util.data.DataProvidersInjector import org.oppia.android.util.data.DataProvidersInjectorProvider import org.oppia.android.util.locale.LocaleProdModule @@ -372,14 +370,6 @@ class ExplorationDataControllerTest { @Provides fun provideGlobalLogLevel(): LogLevel = LogLevel.VERBOSE - @CacheAssetsLocally - @Provides - fun provideCacheAssetsLocally(): Boolean = false - - @Provides - @TopicListToCache - fun provideTopicListToCache(): List = listOf() - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(testEnvironmentConfig: TestEnvironmentConfig): Boolean = diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt index e133773b295..a6b797562e4 100644 --- a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt @@ -100,9 +100,7 @@ import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClock import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadLessonProtosFromAssets -import org.oppia.android.util.caching.TopicListToCache import org.oppia.android.util.data.DataProvidersInjector import org.oppia.android.util.data.DataProvidersInjectorProvider import org.oppia.android.util.locale.LocaleProdModule @@ -3320,14 +3318,6 @@ class ExplorationProgressControllerTest { @Provides fun provideGlobalLogLevel(): LogLevel = LogLevel.VERBOSE - @CacheAssetsLocally - @Provides - fun provideCacheAssetsLocally(): Boolean = false - - @Provides - @TopicListToCache - fun provideTopicListToCache(): List = listOf() - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(testEnvironmentConfig: TestEnvironmentConfig): Boolean = diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationStorageModuleTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationStorageModuleTest.kt index 24efcad8d3e..589c9fed830 100644 --- a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationStorageModuleTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationStorageModuleTest.kt @@ -27,7 +27,6 @@ import org.oppia.android.testing.robolectric.RobolectricModule import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadLessonProtosFromAssets import org.oppia.android.util.data.DataProvidersInjector import org.oppia.android.util.data.DataProvidersInjectorProvider @@ -97,10 +96,6 @@ class ExplorationStorageModuleTest { @Provides fun provideGlobalLogLevel(): LogLevel = LogLevel.VERBOSE - @CacheAssetsLocally - @Provides - fun provideCacheAssetsLocally(): Boolean = false - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(testEnvironmentConfig: TestEnvironmentConfig): Boolean = diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/ExplorationCheckpointControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/ExplorationCheckpointControllerTest.kt index bfef2cedd25..67f800e1c94 100644 --- a/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/ExplorationCheckpointControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/ExplorationCheckpointControllerTest.kt @@ -64,9 +64,7 @@ import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClock import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadLessonProtosFromAssets -import org.oppia.android.util.caching.TopicListToCache import org.oppia.android.util.data.DataProvider import org.oppia.android.util.data.DataProvidersInjector import org.oppia.android.util.data.DataProvidersInjectorProvider @@ -970,14 +968,6 @@ class ExplorationCheckpointControllerTest { @Provides fun provideGlobalLogLevel(): LogLevel = LogLevel.VERBOSE - @CacheAssetsLocally - @Provides - fun provideCacheAssetsLocally(): Boolean = false - - @Provides - @TopicListToCache - fun provideTopicListToCache(): List = listOf() - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(testEnvironmentConfig: TestEnvironmentConfig): Boolean = diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/testing/ExplorationStorageTestModuleTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/testing/ExplorationStorageTestModuleTest.kt index 79177b89022..f7351b8d327 100644 --- a/domain/src/test/java/org/oppia/android/domain/exploration/testing/ExplorationStorageTestModuleTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/exploration/testing/ExplorationStorageTestModuleTest.kt @@ -28,7 +28,6 @@ import org.oppia.android.testing.robolectric.RobolectricModule import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadLessonProtosFromAssets import org.oppia.android.util.data.DataProvidersInjector import org.oppia.android.util.data.DataProvidersInjectorProvider @@ -98,10 +97,6 @@ class ExplorationStorageTestModuleTest { @Provides fun provideGlobalLogLevel(): LogLevel = LogLevel.VERBOSE - @CacheAssetsLocally - @Provides - fun provideCacheAssetsLocally(): Boolean = false - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(testEnvironmentConfig: TestEnvironmentConfig): Boolean = diff --git a/domain/src/test/java/org/oppia/android/domain/spotlight/SpotlightStateControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/spotlight/SpotlightStateControllerTest.kt index 2a1ecdde597..a6d69f7e768 100644 --- a/domain/src/test/java/org/oppia/android/domain/spotlight/SpotlightStateControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/spotlight/SpotlightStateControllerTest.kt @@ -50,9 +50,7 @@ import org.oppia.android.testing.threading.TestCoroutineDispatchers import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadLessonProtosFromAssets -import org.oppia.android.util.caching.TopicListToCache import org.oppia.android.util.data.DataProvidersInjector import org.oppia.android.util.data.DataProvidersInjectorProvider import org.oppia.android.util.locale.LocaleProdModule @@ -333,14 +331,6 @@ class SpotlightStateControllerTest { @Provides fun provideGlobalLogLevel(): LogLevel = LogLevel.VERBOSE - @CacheAssetsLocally - @Provides - fun provideCacheAssetsLocally(): Boolean = false - - @Provides - @TopicListToCache - fun provideTopicListToCache(): List = listOf() - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(testEnvironmentConfig: TestEnvironmentConfig): Boolean = diff --git a/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressControllerTest.kt index 41ce616f733..ac37fe5a6e0 100644 --- a/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressControllerTest.kt @@ -27,7 +27,6 @@ import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClock import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.data.DataProvidersInjector import org.oppia.android.util.data.DataProvidersInjectorProvider import org.oppia.android.util.locale.LocaleProdModule @@ -316,10 +315,6 @@ class StoryProgressControllerTest { @GlobalLogLevel @Provides fun provideGlobalLogLevel(): LogLevel = LogLevel.VERBOSE - - @CacheAssetsLocally - @Provides - fun provideCacheAssetsLocally(): Boolean = false } // TODO(#89): Move this to a common test application component. 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 de4e9fa5cea..02cd5660933 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 @@ -47,9 +47,7 @@ import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClock import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadLessonProtosFromAssets -import org.oppia.android.util.caching.TopicListToCache import org.oppia.android.util.data.AsyncResult import org.oppia.android.util.data.DataProvidersInjector import org.oppia.android.util.data.DataProvidersInjectorProvider @@ -1140,14 +1138,6 @@ class TopicControllerTest { @Provides fun provideGlobalLogLevel(): LogLevel = LogLevel.VERBOSE - @CacheAssetsLocally - @Provides - fun provideCacheAssetsLocally(): Boolean = false - - @Provides - @TopicListToCache - fun provideTopicListToCache(): List = listOf() - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(testEnvironmentConfig: TestEnvironmentConfig): Boolean = diff --git a/domain/src/test/java/org/oppia/android/domain/topic/TopicListControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/TopicListControllerTest.kt index 316f9957b8d..28bcf2e44cd 100644 --- a/domain/src/test/java/org/oppia/android/domain/topic/TopicListControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/topic/TopicListControllerTest.kt @@ -36,9 +36,7 @@ import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClock import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.caching.AssetRepository -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadLessonProtosFromAssets -import org.oppia.android.util.caching.TopicListToCache import org.oppia.android.util.caching.testing.FakeAssetRepository import org.oppia.android.util.data.DataProvidersInjector import org.oppia.android.util.data.DataProvidersInjectorProvider @@ -859,14 +857,6 @@ class TopicListControllerTest { @Provides fun provideGlobalLogLevel(): LogLevel = LogLevel.VERBOSE - @Provides - @CacheAssetsLocally - fun provideCacheAssetsLocally(): Boolean = false - - @Provides - @TopicListToCache - fun provideTopicListToCache(): List = listOf() - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(testEnvironmentConfig: TestEnvironmentConfig): Boolean = diff --git a/domain/src/test/java/org/oppia/android/domain/util/StateRetrieverTest.kt b/domain/src/test/java/org/oppia/android/domain/util/StateRetrieverTest.kt index 3f499f34b02..b0a2d882258 100644 --- a/domain/src/test/java/org/oppia/android/domain/util/StateRetrieverTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/util/StateRetrieverTest.kt @@ -28,7 +28,6 @@ import org.oppia.android.testing.robolectric.RobolectricModule import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.EnableConsoleLog import org.oppia.android.util.logging.EnableFileLog @@ -689,10 +688,6 @@ class StateRetrieverTest { @GlobalLogLevel @Provides fun provideGlobalLogLevel(): LogLevel = LogLevel.VERBOSE - - @CacheAssetsLocally - @Provides - fun provideCacheAssetsLocally(): Boolean = false } // TODO(#89): Move this to a common test application component. diff --git a/instrumentation/src/java/org/oppia/android/instrumentation/application/TestApplicationComponent.kt b/instrumentation/src/java/org/oppia/android/instrumentation/application/TestApplicationComponent.kt index fe588b21105..da1c997fc18 100644 --- a/instrumentation/src/java/org/oppia/android/instrumentation/application/TestApplicationComponent.kt +++ b/instrumentation/src/java/org/oppia/android/instrumentation/application/TestApplicationComponent.kt @@ -43,7 +43,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.platformparameter.syncup.PlatformParameterSyncUpWorkerModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.firebase.TestAuthenticationModule import org.oppia.android.util.accessibility.AccessibilityProdModule @@ -84,7 +83,7 @@ import javax.inject.Singleton QuestionModule::class, DebugLogReportingModule::class, AccessibilityProdModule::class, ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class, - ViewBindingShimModule::class, PrimeTopicAssetsControllerModule::class, + ViewBindingShimModule::class, ExpirationMetaDataRetrieverModule::class, RatioInputModule::class, UncaughtExceptionLoggerModule::class, ApplicationStartupListenerModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/model/src/main/proto/BUILD.bazel b/model/src/main/proto/BUILD.bazel index e512512b10f..83fc35a5664 100644 --- a/model/src/main/proto/BUILD.bazel +++ b/model/src/main/proto/BUILD.bazel @@ -101,24 +101,30 @@ java_lite_proto_library( deps = [":interaction_object_proto"], ) +java_proto_library( + name = "interaction_object_java_proto", + visibility = ["//scripts:oppia_script_library_visibility"], + deps = [":interaction_object_proto"], +) + oppia_proto_library( name = "languages_proto", srcs = ["languages.proto"], visibility = ["//:oppia_api_visibility"], ) -java_proto_library( - name = "languages_java_proto", - visibility = ["//scripts:oppia_script_library_visibility"], - deps = [":languages_proto"], -) - java_lite_proto_library( name = "languages_java_proto_lite", visibility = ["//:oppia_api_visibility"], deps = [":languages_proto"], ) +java_proto_library( + name = "languages_java_proto", + visibility = ["//scripts:oppia_script_library_visibility"], + deps = [":languages_proto"], +) + oppia_proto_library( name = "screens_proto", srcs = ["screens.proto"], @@ -142,6 +148,12 @@ java_lite_proto_library( deps = [":math_proto"], ) +java_proto_library( + name = "math_java_proto", + visibility = ["//scripts:oppia_script_library_visibility"], + deps = [":math_proto"], +) + oppia_proto_library( name = "onboarding_proto", srcs = ["onboarding.proto"], @@ -201,6 +213,12 @@ java_lite_proto_library( deps = [":subtitled_html_proto"], ) +java_proto_library( + name = "subtitled_html_java_proto", + visibility = ["//scripts:oppia_script_library_visibility"], + deps = [":subtitled_html_proto"], +) + oppia_proto_library( name = "subtitled_unicode_proto", srcs = ["subtitled_unicode.proto"], @@ -213,6 +231,12 @@ java_lite_proto_library( deps = [":subtitled_unicode_proto"], ) +java_proto_library( + name = "subtitled_unicode_java_proto", + visibility = ["//scripts:oppia_script_library_visibility"], + deps = [":subtitled_unicode_proto"], +) + oppia_proto_library( name = "test_proto", srcs = ["test.proto"], @@ -234,6 +258,12 @@ java_lite_proto_library( deps = [":thumbnail_proto"], ) +java_proto_library( + name = "thumbnail_java_proto", + visibility = ["//scripts:oppia_script_library_visibility"], + deps = [":thumbnail_proto"], +) + oppia_proto_library( name = "translation_proto", srcs = ["translation.proto"], @@ -247,6 +277,12 @@ java_lite_proto_library( deps = [":translation_proto"], ) +java_proto_library( + name = "translation_java_proto", + visibility = ["//scripts:oppia_script_library_visibility"], + deps = [":translation_proto"], +) + oppia_proto_library( name = "version_proto", srcs = ["version.proto"], @@ -270,6 +306,12 @@ java_lite_proto_library( deps = [":voiceover_proto"], ) +java_proto_library( + name = "voiceover_java_proto", + visibility = ["//scripts:oppia_script_library_visibility"], + deps = [":voiceover_proto"], +) + oppia_proto_library( name = "feedback_reporting_proto", srcs = ["feedback_reporting.proto"], @@ -319,6 +361,12 @@ java_lite_proto_library( deps = [":topic_proto"], ) +java_proto_library( + name = "topic_java_proto", + visibility = ["//scripts:oppia_script_library_visibility"], + deps = [":topic_proto"], +) + oppia_proto_library( name = "exploration_proto", srcs = ["exploration.proto"], @@ -338,6 +386,12 @@ java_lite_proto_library( deps = [":exploration_proto"], ) +java_proto_library( + name = "exploration_java_proto", + visibility = ["//scripts:oppia_script_library_visibility"], + deps = [":exploration_proto"], +) + oppia_proto_library( name = "platform_parameter_proto", srcs = ["platform_parameter.proto"], diff --git a/model/src/main/proto/topic.proto b/model/src/main/proto/topic.proto index b71bdda02dc..004980d147a 100755 --- a/model/src/main/proto/topic.proto +++ b/model/src/main/proto/topic.proto @@ -547,10 +547,38 @@ message EphemeralRevisionCard { WrittenTranslationContext written_translation_context = 2; } -// Corresponds to a local file cataloging all topics available to load. -message TopicIdList { - // The list of IDs corresponding to topics available on the local filesystem. - repeated string topic_ids = 1; +// Corresponds to a local file cataloging all available classrooms in the app. +message ClassroomList { + // The list of classrooms available to the app. + repeated ClassroomRecord classrooms = 1; +} + +// Corresponds to a loadable classroom. +message ClassroomRecord { + // The classroom's ID. + string id = 1; + + // Mapping from content_id to a TranslationMapping for each SubtitledHtml in this classroom that + // has a corresponding translation. + map written_translations = 2; + + // The title of the classroom. + SubtitledHtml translatable_title = 3; + + // The thumbnail corresponding to this classroom. + LessonThumbnail classroom_thumbnail = 4; + + // A map from topic ID to a TopicIdList indicating the prerequisite topics to suggest to the user + // before they play the topic given by the key. Note that the keys of this map indicate the + // complete list of topics contained within this classroom. The prerequisite list of topics may + // include topics outside of this classroom. + map topic_prerequisites = 5; + + // Represents a list of topic IDs (to be used in the context of topic deps in a classroom). + message TopicIdList { + // A list of topics IDs. + repeated string topic_ids = 1; + } } // Corresponds to a local file cataloging all concept cards available to load. diff --git a/scripts/assets/kdoc_validity_exemptions.textproto b/scripts/assets/kdoc_validity_exemptions.textproto index 94f9f14c159..99c88f6dd6e 100644 --- a/scripts/assets/kdoc_validity_exemptions.textproto +++ b/scripts/assets/kdoc_validity_exemptions.textproto @@ -283,14 +283,7 @@ exempted_file_path: "app/src/sharedTest/java/org/oppia/android/app/utility/Drawa exempted_file_path: "app/src/sharedTest/java/org/oppia/android/app/utility/EspressoTestsMatchers.kt" exempted_file_path: "app/src/sharedTest/java/org/oppia/android/app/utility/OrientationChangeAction.kt" exempted_file_path: "app/src/sharedTest/java/org/oppia/android/app/utility/TabMatcher.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/api/ClassroomService.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/api/ConceptCardService.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/api/ExplorationService.kt" exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/api/FeedbackReportingService.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/api/QuestionPlayerService.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/api/StoryService.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/api/SubtopicService.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/api/TopicService.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/audio/AudioPlayerController.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/audio/CellularAudioDialogController.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/classify/ClassificationResult.kt" diff --git a/scripts/assets/test_file_exemptions.textproto b/scripts/assets/test_file_exemptions.textproto index 86ce00bb2a4..0dfcb399f6b 100644 --- a/scripts/assets/test_file_exemptions.textproto +++ b/scripts/assets/test_file_exemptions.textproto @@ -615,44 +615,12 @@ exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/Cons exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/NetworkApiKey.kt" exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/OppiaRetrofit.kt" exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/XssiPrefix.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeAnswerGroup.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeClassroom.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeConceptCard.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeCustomizationArgs.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExpSummary.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExploration.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExplorationContainer.kt" exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReport.kt" exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingAppContext.kt" exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingDeviceContext.kt" exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingEntryPoint.kt" exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingSystemContext.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeHint.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeInteractionInstance.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeOutcome.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamChange.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamSpec.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestion.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestionPlayer.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRecordedVoiceovers.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRuleSpec.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSkillContents.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSolution.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeState.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStateClassifier.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStory.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStoryNode.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStorySummary.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtitledHtml.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopic.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicPageContents.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicSummary.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopic.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopicSummary.kt" exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeUserSuppliedFeedback.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeVoiceover.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslation.kt" -exempted_file_path: "data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslations.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/auth/FirebaseAuthInstance.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/auth/FirebaseAuthInstanceWrapper.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/auth/FirebaseAuthInstanceWrapperImpl.kt" diff --git a/testing/src/main/java/org/oppia/android/testing/network/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/network/BUILD.bazel index 185cb9a268b..26769e83181 100644 --- a/testing/src/main/java/org/oppia/android/testing/network/BUILD.bazel +++ b/testing/src/main/java/org/oppia/android/testing/network/BUILD.bazel @@ -9,15 +9,8 @@ kt_android_library( name = "network", testonly = True, srcs = [ - "MockClassroomService.kt", - "MockConceptCardService.kt", - "MockExplorationService.kt", "MockFeedbackReportingService.kt", "MockPlatformParameterService.kt", - "MockQuestionPlayerService.kt", - "MockStoryService.kt", - "MockSubtopicService.kt", - "MockTopicService.kt", ], visibility = ["//:oppia_testing_visibility"], deps = [ diff --git a/testing/src/main/java/org/oppia/android/testing/network/MockClassroomService.kt b/testing/src/main/java/org/oppia/android/testing/network/MockClassroomService.kt deleted file mode 100755 index 0766c1812e8..00000000000 --- a/testing/src/main/java/org/oppia/android/testing/network/MockClassroomService.kt +++ /dev/null @@ -1,40 +0,0 @@ -package org.oppia.android.testing.network - -import com.squareup.moshi.JsonAdapter -import com.squareup.moshi.Moshi -import org.oppia.android.data.backends.gae.JsonPrefixNetworkInterceptor -import org.oppia.android.data.backends.gae.api.ClassroomService -import org.oppia.android.data.backends.gae.model.GaeClassroom -import retrofit2.Call -import retrofit2.mock.BehaviorDelegate - -/** - * Mock ClassroomService with dummy data from [classroom.json] - */ -class MockClassroomService( - private val delegate: BehaviorDelegate, - private val xssiPrefix: String -) : ClassroomService { - override fun getClassroom(classroomName: String): Call { - val classroom = createMockGaeClassroom() - return delegate.returningResponse(classroom).getClassroom(classroomName) - } - - /** - * This function creates a mock GaeClassroom with data from dummy json. - * @return GaeClassroom: GaeClassroom with mock data - */ - private fun createMockGaeClassroom(): GaeClassroom { - val networkInterceptor = JsonPrefixNetworkInterceptor(xssiPrefix) - var classroomResponseWithXssiPrefix = - xssiPrefix + ApiMockLoader.getFakeJson("classroom.json") - classroomResponseWithXssiPrefix = - networkInterceptor.removeXssiPrefix(classroomResponseWithXssiPrefix) - - val moshi = Moshi.Builder().build() - val adapter: JsonAdapter = moshi.adapter(GaeClassroom::class.java) - val mockGaeClassroom = adapter.fromJson(classroomResponseWithXssiPrefix) - - return mockGaeClassroom!! - } -} diff --git a/testing/src/main/java/org/oppia/android/testing/network/MockConceptCardService.kt b/testing/src/main/java/org/oppia/android/testing/network/MockConceptCardService.kt deleted file mode 100644 index c1978a7e4ba..00000000000 --- a/testing/src/main/java/org/oppia/android/testing/network/MockConceptCardService.kt +++ /dev/null @@ -1,41 +0,0 @@ -package org.oppia.android.testing.network - -import com.squareup.moshi.JsonAdapter -import com.squareup.moshi.Moshi -import org.oppia.android.data.backends.gae.JsonPrefixNetworkInterceptor -import org.oppia.android.data.backends.gae.api.ConceptCardService -import org.oppia.android.data.backends.gae.model.GaeConceptCard -import retrofit2.Call -import retrofit2.mock.BehaviorDelegate - -/** - * Mock ConceptCardService with dummy data from [concept_card.json] - */ -class MockConceptCardService( - private val delegate: BehaviorDelegate, - private val xssiPrefix: String -) : ConceptCardService { - override fun getSkillContents(skillIds: String): Call { - val conceptCard = createMockGaeConceptCard() - return delegate.returningResponse(conceptCard).getSkillContents(skillIds) - } - - /** - * This function creates a mock GaeConceptCard with data from dummy json. - * @return GaeConceptCard: GaeConceptCard with mock data - */ - private fun createMockGaeConceptCard(): GaeConceptCard { - val networkInterceptor = JsonPrefixNetworkInterceptor(xssiPrefix) - var conceptCardResponseWithXssiPrefix = - xssiPrefix + ApiMockLoader.getFakeJson("concept_card.json") - - conceptCardResponseWithXssiPrefix = - networkInterceptor.removeXssiPrefix(conceptCardResponseWithXssiPrefix) - - val moshi = Moshi.Builder().build() - val adapter: JsonAdapter = moshi.adapter(GaeConceptCard::class.java) - val mockGaeConceptCard = adapter.fromJson(conceptCardResponseWithXssiPrefix) - - return mockGaeConceptCard!! - } -} diff --git a/testing/src/main/java/org/oppia/android/testing/network/MockExplorationService.kt b/testing/src/main/java/org/oppia/android/testing/network/MockExplorationService.kt deleted file mode 100755 index a8059d0ddb1..00000000000 --- a/testing/src/main/java/org/oppia/android/testing/network/MockExplorationService.kt +++ /dev/null @@ -1,41 +0,0 @@ -package org.oppia.android.testing.network - -import com.squareup.moshi.JsonAdapter -import com.squareup.moshi.Moshi -import org.oppia.android.data.backends.gae.JsonPrefixNetworkInterceptor -import org.oppia.android.data.backends.gae.api.ExplorationService -import org.oppia.android.data.backends.gae.model.GaeExplorationContainer -import retrofit2.Call -import retrofit2.mock.BehaviorDelegate - -/** - * Mock ExplorationService with dummy data from [exploration.json] - */ -class MockExplorationService( - private val delegate: BehaviorDelegate, - private val xssiPrefix: String -) : ExplorationService { - override fun getExplorationById(explorationId: String): Call { - val explorationContainer = createMockGaeExplorationContainer() - return delegate.returningResponse(explorationContainer).getExplorationById(explorationId) - } - - /** - * This function creates a mock GaeExplorationContainer with data from dummy json. - * @return GaeExplorationContainer: GaeExplorationContainer with mock data - */ - private fun createMockGaeExplorationContainer(): GaeExplorationContainer { - val networkInterceptor = JsonPrefixNetworkInterceptor(xssiPrefix) - var explorationResponseWithXssiPrefix = - xssiPrefix + ApiMockLoader.getFakeJson("exploration.json") - explorationResponseWithXssiPrefix = - networkInterceptor.removeXssiPrefix(explorationResponseWithXssiPrefix) - - val moshi = Moshi.Builder().build() - val adapter: JsonAdapter = - moshi.adapter(GaeExplorationContainer::class.java) - val mockGaeExplorationContainer = adapter.fromJson(explorationResponseWithXssiPrefix) - - return mockGaeExplorationContainer!! - } -} diff --git a/testing/src/main/java/org/oppia/android/testing/network/MockQuestionPlayerService.kt b/testing/src/main/java/org/oppia/android/testing/network/MockQuestionPlayerService.kt deleted file mode 100644 index d3a3e1b03a5..00000000000 --- a/testing/src/main/java/org/oppia/android/testing/network/MockQuestionPlayerService.kt +++ /dev/null @@ -1,45 +0,0 @@ -package org.oppia.android.testing.network - -import com.squareup.moshi.JsonAdapter -import com.squareup.moshi.Moshi -import org.oppia.android.data.backends.gae.JsonPrefixNetworkInterceptor -import org.oppia.android.data.backends.gae.api.QuestionPlayerService -import org.oppia.android.data.backends.gae.model.GaeQuestionPlayer -import retrofit2.Call -import retrofit2.mock.BehaviorDelegate - -/** - * Mock QuestionPlayerService with dummy data from [question_player.json] - */ -class MockQuestionPlayerService( - private val delegate: BehaviorDelegate, - private val xssiPrefix: String -) : QuestionPlayerService { - override fun getQuestionPlayerBySkillIds( - skillIds: String, - questionCount: Int - ): Call { - val questionPlayer = createMockGaeQuestionPlayer() - return delegate.returningResponse(questionPlayer) - .getQuestionPlayerBySkillIds(skillIds, questionCount) - } - - /** - * This function creates a mock GaeQuestionPlayer with data from dummy json. - * @return GaeQuestionPlayer: GaeQuestionPlayer with mock data - */ - private fun createMockGaeQuestionPlayer(): GaeQuestionPlayer { - val networkInterceptor = JsonPrefixNetworkInterceptor(xssiPrefix) - var questionPlayerResponseWithXssiPrefix = - xssiPrefix + ApiMockLoader.getFakeJson("question_player.json") - - questionPlayerResponseWithXssiPrefix = - networkInterceptor.removeXssiPrefix(questionPlayerResponseWithXssiPrefix) - - val moshi = Moshi.Builder().build() - val adapter: JsonAdapter = moshi.adapter(GaeQuestionPlayer::class.java) - val mockGaeQuestionPlayer = adapter.fromJson(questionPlayerResponseWithXssiPrefix) - - return mockGaeQuestionPlayer!! - } -} diff --git a/testing/src/main/java/org/oppia/android/testing/network/MockStoryService.kt b/testing/src/main/java/org/oppia/android/testing/network/MockStoryService.kt deleted file mode 100644 index 65bace690b1..00000000000 --- a/testing/src/main/java/org/oppia/android/testing/network/MockStoryService.kt +++ /dev/null @@ -1,40 +0,0 @@ -package org.oppia.android.testing.network - -import com.squareup.moshi.JsonAdapter -import com.squareup.moshi.Moshi -import org.oppia.android.data.backends.gae.JsonPrefixNetworkInterceptor -import org.oppia.android.data.backends.gae.api.StoryService -import org.oppia.android.data.backends.gae.model.GaeStory -import retrofit2.Call -import retrofit2.mock.BehaviorDelegate - -/** - * Mock StoryService with dummy data from [story.json] - */ -class MockStoryService( - private val delegate: BehaviorDelegate, - private val xssiPrefix: String -) : StoryService { - override fun getStory(storyId: String, userId: String?, user: String?): Call { - val story = createMockGaeStory() - return delegate.returningResponse(story).getStory(storyId, userId, user) - } - - /** - * This function creates a mock GaeStory with data from dummy json. - * @return GaeStory: GaeStory with mock data - */ - private fun createMockGaeStory(): GaeStory { - val networkInterceptor = JsonPrefixNetworkInterceptor(xssiPrefix) - var storyResponseWithXssiPrefix = - xssiPrefix + ApiMockLoader.getFakeJson("story.json") - - storyResponseWithXssiPrefix = networkInterceptor.removeXssiPrefix(storyResponseWithXssiPrefix) - - val moshi = Moshi.Builder().build() - val adapter: JsonAdapter = moshi.adapter(GaeStory::class.java) - val mockGaeStory = adapter.fromJson(storyResponseWithXssiPrefix) - - return mockGaeStory!! - } -} diff --git a/testing/src/main/java/org/oppia/android/testing/network/MockSubtopicService.kt b/testing/src/main/java/org/oppia/android/testing/network/MockSubtopicService.kt deleted file mode 100644 index 96a66b7858a..00000000000 --- a/testing/src/main/java/org/oppia/android/testing/network/MockSubtopicService.kt +++ /dev/null @@ -1,41 +0,0 @@ -package org.oppia.android.testing.network - -import com.squareup.moshi.JsonAdapter -import com.squareup.moshi.Moshi -import org.oppia.android.data.backends.gae.JsonPrefixNetworkInterceptor -import org.oppia.android.data.backends.gae.api.SubtopicService -import org.oppia.android.data.backends.gae.model.GaeSubtopic -import retrofit2.Call -import retrofit2.mock.BehaviorDelegate - -/** - * Mock SubtopicService with dummy data from [subtopic.json] - */ -class MockSubtopicService( - private val delegate: BehaviorDelegate, - private val xssiPrefix: String -) : SubtopicService { - override fun getSubtopic(topicName: String, subtopicId: String): Call { - val subtopic = createMockGaeSubtopic() - return delegate.returningResponse(subtopic).getSubtopic(topicName, subtopicId) - } - - /** - * This function creates a mock GaeSubtopic with data from dummy json. - * @return GaeSubtopic: GaeSubtopic with mock data - */ - private fun createMockGaeSubtopic(): GaeSubtopic { - val networkInterceptor = JsonPrefixNetworkInterceptor(xssiPrefix) - var subtopicResponseWithXssiPrefix = - xssiPrefix + ApiMockLoader.getFakeJson("subtopic.json") - - subtopicResponseWithXssiPrefix = - networkInterceptor.removeXssiPrefix(subtopicResponseWithXssiPrefix) - - val moshi = Moshi.Builder().build() - val adapter: JsonAdapter = moshi.adapter(GaeSubtopic::class.java) - val mockGaeSubtopic = adapter.fromJson(subtopicResponseWithXssiPrefix) - - return mockGaeSubtopic!! - } -} diff --git a/testing/src/main/java/org/oppia/android/testing/network/MockTopicService.kt b/testing/src/main/java/org/oppia/android/testing/network/MockTopicService.kt deleted file mode 100644 index 31c62f2add3..00000000000 --- a/testing/src/main/java/org/oppia/android/testing/network/MockTopicService.kt +++ /dev/null @@ -1,40 +0,0 @@ -package org.oppia.android.testing.network - -import com.squareup.moshi.JsonAdapter -import com.squareup.moshi.Moshi -import org.oppia.android.data.backends.gae.JsonPrefixNetworkInterceptor -import org.oppia.android.data.backends.gae.api.TopicService -import org.oppia.android.data.backends.gae.model.GaeTopic -import retrofit2.Call -import retrofit2.mock.BehaviorDelegate - -/** - * Mock TopicService with dummy data from [topic.json] - */ -class MockTopicService( - private val delegate: BehaviorDelegate, - private val xssiPrefix: String -) : TopicService { - override fun getTopicByName(topicName: String): Call { - val topic = createMockGaeTopic() - return delegate.returningResponse(topic).getTopicByName(topicName) - } - - /** - * This function creates a mock GaeTopic with data from dummy json. - * @return GaeTopic: GaeTopic with mock data - */ - private fun createMockGaeTopic(): GaeTopic { - val networkInterceptor = JsonPrefixNetworkInterceptor(xssiPrefix) - var topicResponseWithXssiPrefix = - xssiPrefix + ApiMockLoader.getFakeJson("topic.json") - - topicResponseWithXssiPrefix = networkInterceptor.removeXssiPrefix(topicResponseWithXssiPrefix) - - val moshi = Moshi.Builder().build() - val adapter: JsonAdapter = moshi.adapter(GaeTopic::class.java) - val mockGaeTopic = adapter.fromJson(topicResponseWithXssiPrefix) - - return mockGaeTopic!! - } -} diff --git a/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleCustomContextTest.kt b/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleCustomContextTest.kt index b5076ee912e..57a3bd0babf 100644 --- a/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleCustomContextTest.kt +++ b/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleCustomContextTest.kt @@ -58,7 +58,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -257,7 +256,7 @@ class InitializeDefaultLocaleRuleCustomContextTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverTestModule::class, + ExpirationMetaDataRetrieverTestModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleOmissionTest.kt b/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleOmissionTest.kt index 8bf8b9194db..c90ef4ab183 100644 --- a/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleOmissionTest.kt +++ b/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleOmissionTest.kt @@ -55,7 +55,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.assertThrows @@ -133,7 +132,7 @@ class InitializeDefaultLocaleRuleOmissionTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverTestModule::class, + ExpirationMetaDataRetrieverTestModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleTest.kt b/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleTest.kt index 3a8f7eaf441..a3518296ea9 100644 --- a/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleTest.kt +++ b/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleTest.kt @@ -59,7 +59,6 @@ import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule import org.oppia.android.domain.platformparameter.PlatformParameterModule import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.firebase.TestAuthenticationModule @@ -137,7 +136,7 @@ class InitializeDefaultLocaleRuleTest { GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverTestModule::class, + ExpirationMetaDataRetrieverTestModule::class, ViewBindingShimModule::class, RatioInputModule::class, NetworkConfigProdModule::class, ApplicationStartupListenerModule::class, HintsAndSolutionConfigModule::class, LogReportWorkerModule::class, WorkManagerConfigurationModule::class, diff --git a/testing/src/test/java/org/oppia/android/testing/lightweightcheckpointing/ExplorationCheckpointTestHelperTest.kt b/testing/src/test/java/org/oppia/android/testing/lightweightcheckpointing/ExplorationCheckpointTestHelperTest.kt index 7d0750962e4..40c87c049d0 100644 --- a/testing/src/test/java/org/oppia/android/testing/lightweightcheckpointing/ExplorationCheckpointTestHelperTest.kt +++ b/testing/src/test/java/org/oppia/android/testing/lightweightcheckpointing/ExplorationCheckpointTestHelperTest.kt @@ -47,9 +47,7 @@ import org.oppia.android.testing.threading.TestDispatcherModule import org.oppia.android.testing.time.FakeOppiaClock import org.oppia.android.testing.time.FakeOppiaClockModule import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadLessonProtosFromAssets -import org.oppia.android.util.caching.TopicListToCache import org.oppia.android.util.data.DataProvidersInjector import org.oppia.android.util.data.DataProvidersInjectorProvider import org.oppia.android.util.locale.LocaleProdModule @@ -239,14 +237,6 @@ class ExplorationCheckpointTestHelperTest { @Provides fun provideGlobalLogLevel(): LogLevel = LogLevel.VERBOSE - @CacheAssetsLocally - @Provides - fun provideCacheAssetsLocally(): Boolean = false - - @Provides - @TopicListToCache - fun provideTopicListToCache(): List = listOf() - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(testEnvironmentConfig: TestEnvironmentConfig): Boolean = diff --git a/third_party/BUILD.bazel b/third_party/BUILD.bazel index d3b80abccd6..b5d742b46f7 100644 --- a/third_party/BUILD.bazel +++ b/third_party/BUILD.bazel @@ -82,6 +82,19 @@ android_library( ], ) +alias( + name = "oppia_proto_api_protos", + actual = "@oppia_proto_api//:android_protos", + visibility = ["//scripts:oppia_script_library_visibility"], +) + +alias( + name = "oppia_proto_api_java_protos", + testonly = True, + actual = "@oppia_proto_api//:android_java_protos", + visibility = ["//scripts:oppia_script_library_visibility"], +) + # Creates an alias for Guava Android to support maven_install's override of Guava. This ensures that # Guava-Android is always used in builds, even if dependencies request a newer version of Guava-JRE. android_library( diff --git a/third_party/versions.bzl b/third_party/versions.bzl index 324422685b4..021b3bb0618 100644 --- a/third_party/versions.bzl +++ b/third_party/versions.bzl @@ -136,6 +136,9 @@ HTTP_DEPENDENCY_VERSIONS = { "sha": "9425a423a4cb9d9db0356300722d9bd8e634cf539f29d97bb84f457cccd16eb8", "version": "31.0.1", }, + "oppia_proto_api": { + "version": "9cf993ea0b798a67b3faa21c690c30b9027fb371", + }, "protobuf_tools": { "sha": "efcb0b9004200fce79de23be796072a055105273905a5a441dbb5a979d724d20", "version": "3.11.0", diff --git a/utility/src/main/java/org/oppia/android/util/caching/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/caching/BUILD.bazel index 2fad5f70d6c..19ce083f201 100644 --- a/utility/src/main/java/org/oppia/android/util/caching/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/caching/BUILD.bazel @@ -18,7 +18,6 @@ kt_android_library( kt_android_library( name = "annotations", srcs = [ - "CacheAssetsLocally.kt", "LoadImagesFromAssets.kt", "LoadLessonProtosFromAssets.kt", ], @@ -52,7 +51,6 @@ kt_android_library( deps = [ ":annotations", ":asset_repository", - ":topic_list_to_cache", "//:dagger", ], ) @@ -68,14 +66,3 @@ kt_android_library( "//:dagger", ], ) - -kt_android_library( - name = "topic_list_to_cache", - srcs = [ - "TopicListToCache.kt", - ], - visibility = ["//:oppia_api_visibility"], - deps = [ - "//third_party:javax_inject_javax_inject", - ], -) diff --git a/utility/src/main/java/org/oppia/android/util/caching/CacheAssetsLocally.kt b/utility/src/main/java/org/oppia/android/util/caching/CacheAssetsLocally.kt deleted file mode 100644 index 38bb3b50816..00000000000 --- a/utility/src/main/java/org/oppia/android/util/caching/CacheAssetsLocally.kt +++ /dev/null @@ -1,8 +0,0 @@ -package org.oppia.android.util.caching - -import javax.inject.Qualifier - -/** - * Corresponds to an injectable boolean indicating whether lesson assets should be cached locally. - */ -@Qualifier annotation class CacheAssetsLocally diff --git a/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt b/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt index 0979764b659..d7c8505300d 100644 --- a/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt +++ b/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt @@ -3,20 +3,9 @@ package org.oppia.android.util.caching import dagger.Module import dagger.Provides -private const val FRACTIONS_TOPIC = "GJ2rLXRKD5hw" -private const val RATIOS_TOPIC = "omzF4oqgeTXd" - /** Provides dependencies corresponding to the app's caching policies. */ @Module class CachingModule { - @Provides - @CacheAssetsLocally - fun provideCacheAssetsLocally(): Boolean = false - - @Provides - @TopicListToCache - fun provideTopicListToCache() = listOf(FRACTIONS_TOPIC, RATIOS_TOPIC) - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(): Boolean = false diff --git a/utility/src/main/java/org/oppia/android/util/caching/TopicListToCache.kt b/utility/src/main/java/org/oppia/android/util/caching/TopicListToCache.kt deleted file mode 100644 index a3241720f8d..00000000000 --- a/utility/src/main/java/org/oppia/android/util/caching/TopicListToCache.kt +++ /dev/null @@ -1,6 +0,0 @@ -package org.oppia.android.util.caching - -import javax.inject.Qualifier - -/** Corresponds to an injectable list of topic IDs to cache if [CacheAssetsLocaly] is true. */ -@Qualifier annotation class TopicListToCache diff --git a/utility/src/main/java/org/oppia/android/util/caching/testing/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/caching/testing/BUILD.bazel index bf50d54f406..01a0c65eaa5 100644 --- a/utility/src/main/java/org/oppia/android/util/caching/testing/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/caching/testing/BUILD.bazel @@ -14,7 +14,6 @@ kt_android_library( deps = [ "//:dagger", "//utility/src/main/java/org/oppia/android/util/caching:annotations", - "//utility/src/main/java/org/oppia/android/util/caching:topic_list_to_cache", ], ) diff --git a/utility/src/main/java/org/oppia/android/util/caching/testing/CachingTestModule.kt b/utility/src/main/java/org/oppia/android/util/caching/testing/CachingTestModule.kt index 5fce7d5fc8f..0d21c77be7f 100644 --- a/utility/src/main/java/org/oppia/android/util/caching/testing/CachingTestModule.kt +++ b/utility/src/main/java/org/oppia/android/util/caching/testing/CachingTestModule.kt @@ -2,10 +2,8 @@ package org.oppia.android.util.caching.testing import dagger.Module import dagger.Provides -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadImagesFromAssets import org.oppia.android.util.caching.LoadLessonProtosFromAssets -import org.oppia.android.util.caching.TopicListToCache /** * Provides test dependencies corresponding to the app's caching policies. In particular, this @@ -13,14 +11,6 @@ import org.oppia.android.util.caching.TopicListToCache */ @Module class CachingTestModule { - @Provides - @CacheAssetsLocally - fun provideCacheAssetsLocally(): Boolean = false - - @Provides - @TopicListToCache - fun provideTopicListToCache(): List = listOf() - @Provides @LoadLessonProtosFromAssets fun provideLoadLessonProtosFromAssets(): Boolean = false diff --git a/utility/src/main/java/org/oppia/android/util/parser/image/GlideImageLoader.kt b/utility/src/main/java/org/oppia/android/util/parser/image/GlideImageLoader.kt index 7fd1cfa7f1f..1d0092b9330 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/image/GlideImageLoader.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/image/GlideImageLoader.kt @@ -12,7 +12,6 @@ import com.bumptech.glide.load.engine.Resource import com.bumptech.glide.load.resource.SimpleResource import com.bumptech.glide.request.RequestOptions import org.oppia.android.util.caching.AssetRepository -import org.oppia.android.util.caching.CacheAssetsLocally import org.oppia.android.util.caching.LoadImagesFromAssets import org.oppia.android.util.parser.math.MathModel import org.oppia.android.util.parser.svg.BlockPictureDrawable @@ -28,7 +27,6 @@ import javax.inject.Singleton @Singleton class GlideImageLoader @Inject constructor( context: Context, - @CacheAssetsLocally private val cacheAssetsLocally: Boolean, @LoadImagesFromAssets private val loadImagesFromAssets: Boolean, private val assetRepository: AssetRepository ) : ImageLoader { @@ -101,11 +99,6 @@ class GlideImageLoader @Inject constructor( } private fun loadImage(imageUrl: String): Any = when { - cacheAssetsLocally -> object : ImageAssetFetcher { - override fun fetchImage(): ByteArray = assetRepository.loadRemoteBinaryAsset(imageUrl)() - - override fun getImageIdentifier(): String = imageUrl - } loadImagesFromAssets -> object : ImageAssetFetcher { override fun fetchImage(): ByteArray = assetRepository.loadImageAssetFromLocalAssets(imageUrl)()